Skip to content

Commit

Permalink
fix: irradiator_1 mapgen (#3753)
Browse files Browse the repository at this point in the history 
* Fix irradiator_1 mapgen

* Add GROUP_ZOMBIE_NUCLEAR_INDUSTRY

* Create irradiator_palette.json

* style(autofix.ci): automated formatting

* mistake

* Fix irradiator_1 mapgen

* "z" standing tank

* Fix irradiator_1 mapgen

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
@0Monet @autofix-ci
0Monet and autofix-ci[bot] authored Nov 26, 2023
1 parent fe4b379 commit 620e2a6
Show file tree
Hide file tree
Showing 3 changed files with 180 additions and 165 deletions.
233 changes: 68 additions & 165 deletions data/json/mapgen/irradiator_1.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
[
{
"type": "monstergroup",
"name": "GROUP_ZOMBIE_NUCLEAR_INDUSTRY",
"default": "mon_zombie_technician",
"monsters": [
{ "monster": "mon_zombie_technician", "freq": 200, "cost_multiplier": 3 },
{ "monster": "mon_zombie_hazmat", "freq": 250, "cost_multiplier": 3 },
{ "monster": "mon_zombie_electric", "freq": 100, "cost_multiplier": 5 },
{ "monster": "mon_skitterbot", "freq": 100, "cost_multiplier": 5 },
{ "monster": "mon_zombie_cop", "freq": 100, "cost_multiplier": 5 }
]
},
{
"id": "radiation_equipment",
"type": "item_group",
Expand Down Expand Up @@ -98,7 +86,7 @@
"'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'",
"'f***************************mmmmmmmmmmm******************************f'",
"'f**|--------------------------------------------------------------|**f'",
"'f**|qq c|c c|c c|c | f cc fTTf cc f |XXXX5XXXXXXXXXXXXX|**f'",
"'f**|qq c|c c|c c|c | f cc fzzf cc f |XXXX5XXXXXXXXXXXXX|**f'",
"'f**|- c|c c|c c|c | mmmm f ffff f mmmm |XM )!!!!!!!!!QX|**f'",
"'f**|qq c|c c|c c|c | mm/m G G m/mm |XM )!UUUUUUPPPX|**f'",
"'f**|qq c|c c|c c|c | mmmm f h f mmmm |XM )!UUUUUUPPPX|**f'",
Expand All @@ -108,7 +96,7 @@
"'f**|MMMMMMMM4 4ZZPPPZZPPP|**f'",
"'f**|M PP N PPPXXXXXXX4NXXXXXXXXPPP N xP|**f'",
"'f**|MP PPPPP|----==-------XXXXXXXXNXXXXXXXX-----==-----|PPZPPPZPPP|**f'",
"'f**|TTTTTTTT| C K KXXXXXXX!Q!!!!!Q!XXXXXX J |TTTTTTTTTT|**f'",
"'f**|kkkkkkkk| C K KXXXXXXX!Q!!!!!Q!XXXXXX J |TTTTTTTTTT|**f'",
"'f**|--------4 C K KKKXCCMMCX!!UUUUU!!XMMCCX J J C 4----------|**f'",
"'f**|( N C K KXCXXXCX!!UUUUU!!XCXXCX J J C N (|**f'",
"'f**| CCCCCCCMCC C CC1 XXCCCCCC3CCCCCCX 2 M CCMCCCCCCCCC |**f'",
Expand All @@ -120,7 +108,7 @@
"'f**| C |---------------- |A h M| |--------| >>QQ| C |**f'",
"'f**| C |^ ^| |AAA MMMMM| |.......^|c >QQ| C |**f'",
"'f**| C |] x|x x|x ]| |---N------------| |. |c > >| C |**f'",
"'f**| C |] hd|dh hd|dh ]| |##| 4|rG Gr|B B| |. htth |dh >Q>| C |**f'",
"'f**| C |] hd|dh hd|dh ]| |nn| 4|rG Gr|B B| |. htth |dh >Q>| C |**f'",
"'f**| C |] x|x x|x ]| | |Y----))--|B B| |. htth |------| C |**f'",
"'f**| C |] hd|dh hd|dh ]| |F | 4dh hd|B B| + ^|< + ?| C |**f'",
"'f**| C |] x|x x|x ]| |V |YRRxR4Y6R|-+-| | oaao + |--| C |**f'",
Expand Down Expand Up @@ -161,99 +149,13 @@
"'f**L____________________Ls##ssss##ss##ssss##sL____________________L**f'",
"'f**L___________________Lss--w=w---DD---w=w--ssL___________________L**f'",
"'fsss__________________Lssswdh ^hx xhA hdwsssL__________________sssf'",
"'fs(s__________________Ls(swxh hd dh hxws(sL__________________s(sf'",
"'fsbs__________________Lsbswxh hd dh hxwsbsL__________________sbsf'",
"'fsss__________________Lsss--w-w---DD---w-w--sssL__________________sssf'",
"'ffffGGGGGGGGGGGGGGGGGGffffffffffffGGffffffffffffGGGGGGGGGGGGGGGGGGffff'",
"[[[[L__________________LssssssssssssssssssssssssL__________________L[[[[",
"[[[[L__________________LssssssssssssssssssssssssL__________________L[[[["
"uuuuL__________________LssssssssssssssssssssssssL__________________Luuuu",
"uuuuL__________________LssssssssssssssssssssssssL__________________Luuuu"
],
"terrain": {
"*": [
"t_grass",
"t_grass",
"t_dirt",
"t_shrub_rose",
"t_shrub_lilac",
"t_tree_young",
"t_shrub_hydrangea",
"t_grass_long",
"t_woodchips",
"t_moss",
"t_grass_long",
"t_grass_dead"
],
"'": [ "t_fence_barbed" ],
"X": [ "t_strconc_wall" ],
"+": [ "t_door_c" ],
"-": [ "t_strconc_wall" ],
",": [ "t_strconc_floor" ],
"Q": [ "t_strconc_floor" ],
"=": [ "t_door_locked_alarm" ],
"D": [ "t_reinforced_door_glass_c" ],
"G": [ "t_chaingate_l" ],
"L": [ "t_pavement_y" ],
"O": [ "t_wall_glass" ],
"C": [ "t_conveyor" ],
"_": [ "t_pavement" ],
"f": [ "t_chainfence_h" ],
"s": [ "t_sidewalk" ],
"w": [ "t_window" ],
"x": [ "t_console_broken" ],
"|": [ "t_strconc_wall" ],
"U": [ "t_water_pool" ],
"R": [ "t_reinforced_glass_shutter_open" ],
"m": [ "t_oil_circ_brkr_s", "t_station_disc", "t_switchgear_s", "t_potential_trans", "t_current_trans", "t_lgtn_arrest" ],
"M": [ "t_machinery_heavy" ],
"e": [ "t_gates_mech_control" ],
"#": [ "t_sidewalk" ],
"P": [ "t_sewage_pump", "t_sewage_pipe", "t_sewage_pipe", "t_sewage_pipe" ],
"Y": [ "t_door_metal_locked" ],
"y": [ "t_door_metal_o" ],
"N": [ "t_door_metal_locked" ],
"%": [ "t_grate" ],
"/": [ "t_plut_generator" ],
"}": [ "t_ladder_up" ],
")": [ "t_reinforced_glass" ],
"!": [ "t_thconc_floor" ],
"0": [ "t_console" ],
"1": [ "t_floor_red" ],
"2": [ "t_floor_green" ],
"3": [ "t_rad_platform" ],
"4": [ "t_card_industrial" ],
"5": [ "t_console" ],
"6": [ "t_console" ],
"7": [ "t_console" ]
},
"furniture": {
"#": [ "f_bench" ],
"S": [ "f_locker" ],
"A": [ "f_locker" ],
"j": [ "f_locker" ],
"T": [ "f_standing_tank" ],
"^": [ "f_indoor_plant", "f_indoor_plant_y" ],
"a": [ "f_table" ],
"c": [ "f_utility_shelf" ],
"d": [ "f_desk" ],
"g": [ "f_shower" ],
"h": [ "f_chair" ],
"o": [ "f_sofa" ],
"r": [ "f_rack" ],
"t": [ "f_table" ],
"Q": [ "f_air_filter" ],
"Z": [ "f_water_purifier" ],
"B": [ "f_bed", "f_dresser", "f_glass_cabinet" ],
"<": [ "f_sink" ],
"K": [ "f_crate_c", "f_rack", "f_glass_fridge", "f_crate_o" ],
"J": [ "f_crate_c", "f_rack", "f_glass_fridge", "f_crate_o" ],
"q": [ "f_crate_c", "f_utility_shelf" ],
"W": [ "f_crate_c", "f_utility_shelf" ],
"[": [ "f_dumpster" ],
"]": [ "f_bookcase", "f_filing_cabinet" ],
"?": [ "f_toilet" ],
">": [ "f_vent_pipe" ],
".": [ "f_oven", "f_counter", "f_fridge", "f_freezer", "f_trashcan", "f_cupboard" ],
"{": [ "f_washer", "f_dryer" ]
},
"palettes": [ "irradiator_palette" ],
"computers": {
"0": {
"name": "Irradiation Facility Operation Console",
Expand Down Expand Up @@ -297,7 +199,6 @@
"failures": [ { "action": "alarm" }, { "action": "damage" } ]
}
},
"toilets": { "?": { } },
"vendingmachines": { "V": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
"items": {
"S": { "item": "clothing_outdoor_set", "chance": 50 },
Expand Down Expand Up @@ -325,9 +226,13 @@
{ "group": "ammo_pistol_common", "x": 39, "y": 26, "chance": 100, "repeat": [ 1, 5 ] },
{ "group": "prison_armor", "x": 39, "y": 26, "chance": 50, "repeat": [ 1, 2 ] }
],
"liquids": { "T": { "liquid": "water_clean", "amount": [ 200, 600 ] } },
"liquids": { "T": { "liquid": "water_clean", "amount": [ 200, 600 ] }, "k": { "liquid": "water", "amount": [ 200, 600 ] } },
"fields": { "U": { "field": "fd_nuke_gas", "intensity": 3, "age": 990 }, "/": { "field": "fd_shock_vent" } },
"monster": { "(": { "monster": "mon_turret_light" }, "!": { "monster": "mon_hazmatbot", "chance": 5 } },
"monster": {
"(": { "monster": "mon_turret_light" },
"b": { "monster": "mon_turret_light" },
"!": { "monster": "mon_hazmatbot", "chance": 5 }
},
"monsters": {
"h": { "monster": "GROUP_ZOMBIE", "chance": 50 },
"o": { "monster": "GROUP_ZOMBIE", "chance": 50 },
Expand Down Expand Up @@ -355,7 +260,7 @@
"fuel": -1,
"rotation": 90,
"status": -1,
"x": 10,
"x": 11,
"y": 62
},
{ "vehicle": "industrial_transport", "chance": 25, "fuel": -1, "rotation": 90, "status": 0, "x": 20, "y": 62 },
Expand Down Expand Up @@ -387,56 +292,56 @@
" ",
" ",
" ",
" |------------------------------------------------------------3 ",
" 5............................................................5 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |....}.......................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |......................................................&.&...3 ",
" |...................................................AAA&.&...3 ",
" |......................................................&.&...3 ",
" |...................................................AAA&.&...3 ",
" |......................................................&.&...3 ",
" |...................................................AAA&.&...3 ",
" |......................................................&.&...3 ",
" |...................................................AAA&.&...3 ",
" |......................................................&.&...3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |............................................................3 ",
" |.................................................RR.........3 ",
" |.................................................RR.........3 ",
" |............................................................3 ",
" |..CC.......SSSSS.SSSSS.SSSSS.SSSSS...........D........D.....3 ",
" |..CC.......SSSSS.SSSSS.SSSSS.SSSSS..........................3 ",
" 5............................................................5 ",
" |------------------------------------------------------------3 ",
" ---------------------------------------------------------------- ",
" 5..............................................................5 ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -.....}........................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -.......................................................&.&....- ",
" -....................................................AAA&.&....- ",
" -.......................................................&.&....- ",
" -....................................................AAA&.&....- ",
" -.......................................................&.&....- ",
" -....................................................AAA&.&....- ",
" -.......................................................&.&....- ",
" -....................................................AAA&.&....- ",
" -.......................................................&.&....- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..............................................................- ",
" -..................................................RR..........- ",
" -..................................................RR..........- ",
" -..............................................................- ",
" -...CC.......SSSSS.SSSSS.SSSSS.SSSSS...........D........D......- ",
" -...CC.......SSSSS.SSSSS.SSSSS.SSSSS...........................- ",
" 5..............................................................5 ",
" ---------------------------------------------------------------- ",
" ",
" ",
" ",
Expand All @@ -449,20 +354,18 @@
" ",
" ",
" ",
" |----------------3 ",
" |................3 ",
" |................5 ",
" |----------------3 ",
" ------------------ ",
" -................- ",
" -................5 ",
" ------------------ ",
" ",
" ",
" "
],
"terrain": {
".": "t_flat_roof",
" ": "t_open_air",
"|": "t_gutter_west",
"-": "t_gutter_south",
"3": "t_gutter_east",
"5": "t_gutter_drop",
"}": "t_ladder_down",
"R": "t_radio_tower"
Expand Down
Loading

0 comments on commit 620e2a6

Please sign in to comment.