Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Aftershock] Remove Habitat Block palette and expand Habitat Structure palettes. #74326

Merged
merged 2 commits into from
Jun 5, 2024
Merged

[Aftershock] Remove Habitat Block palette and expand Habitat Structure palettes. #74326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a658af
Remove habitat block palette and instead expand base palettes. Audit …
QuillInkwell Jun 5, 2024
ea683f7
Lint JSON
QuillInkwell Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 26 additions & 35 deletions data/mods/Aftershock/maps/mapgen/freight_transport.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
" ",
" ",
" ñññññññññññ ",
" -_-_- -__- ññññññ ñññññññ ",
" ---Foj----II--- -_- --!-- -__-__- ",
" ---yh...U-LL..qq---I---...-----G.H.G-- ",
" #.#yh.,ss-E...,.....q-l...l-22-G.,.G---- ",
" ---B.....!..f-_---..q-l...l-..---1---hc_ ",
" --!--ee-,hS_3!.1,..!..,..-....5..!.,c_ ",
" ---$.$----..f-_---7.q-l....!....,..--hc_ ",
" -)-)- -))- ññññññ ñññññññ ",
" ---Foj----II--- -)- --!-- -))-))- ",
" ---yh...U-LL..qq---I---...-----ä.â.ä-- ",
" #.#yh.,ss-E...,.....q-l...l-éé-ä.,.ä---- ",
" ---á.....!..f-)---..q-l...l-..---1---hc) ",
" --!--ee-,h❺)ê!.1,..!..,..-....5..!.,c) ",
" ---S.S----..f-)---7.q-l....!....,..--hc) ",
" #.#.,.-OP-E...,.....q-l....-6f4....f---- ",
" ---$$.!,i-LL..qq---I---...-----fL.fE-- ",
" ---w-T----II--- -_- --!-- -__-__- ",
" -_-_- -__- ññññññ ñññññññ ",
" ---SS.!,❸-LL..qq---I---...-----fL.fE-- ",
" ---W-~----II--- -)- --!-- -))-))- ",
" -)-)- -))- ññññññ ñññññññ ",
" ñññññññññññ ",
" ",
" ",
Expand All @@ -31,39 +31,30 @@
" ",
" "
],
"palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing", "afs_habitat_residential_furnishing" ],
"terrain": {
"ñ": "t_afs_broken_treads",
"1": "t_door_metal_locked",
"_": "t_reinforced_glass_shutter_open",
"3": "t_nuclear_reactor"
},
"palettes": [
"afs_habitat_structure",
"afs_habitat_mech_furnishing",
"afs_habitat_residential_furnishing",
"afs_habitat_life_support"
],
"terrain": { "ñ": "t_afs_broken_treads", "1": "t_door_metal_locked", "ê": "t_nuclear_reactor" },
"furniture": {
"I": "f_sealed_intermodal_crate",
"$": "f_sleep_pod",
"e": "f_entertainment_center",
"4": "f_monomolecularsaw",
"6": "f_3dprinter",
"2": "f_drone_recharge_station",
"H": "f_exo_gantry",
"G": "f_rack",
"B": "f_bookcase",
"T": "f_habitat_bathroom",
"S": "f_atmospheric_control",
"i": "f_water_heater",
"w": "f_habitat_storage_board"
"é": "f_drone_recharge_station",
"â": "f_exo_gantry",
"ä": "f_rack",
"á": "f_bookcase"
},
"liquids": { "i": { "liquid": "water_clean", "amount": [ 0, 100 ] } },
"place_item": [ { "item": "television", "repeat": 1, "x": 10, "y": 10 } ],
"items": {
"3": { "item": "nuclear_reactor" },
"2": { "item": "old_industrial_bot_storage", "chance": 20 },
"H": { "item": "afs_exosuit_worker", "chance": 60 },
"G": { "item": "afs_civilian_armory", "chance": 80, "repeat": [ 1, 3 ] },
"ê": { "item": "nuclear_reactor" },
"é": { "item": "old_industrial_bot_storage", "chance": 20 },
"â": { "item": "afs_exosuit_worker", "chance": 60 },
"ä": { "item": "afs_civilian_armory", "chance": 80, "repeat": [ 1, 3 ] },
"I": { "item": "afs_crate_civ_rand" },
"B": { "item": "homebooks", "repeat": [ 2, 3 ] },
"F": { "item": "afs_old_food_storage", "chance": 60 },
"w": { "item": "afs_colonist_outfit", "chance": 60 }
"á": { "item": "homebooks", "repeat": [ 2, 3 ] }
},
"place_monster": [
{ "group": "AFS_GROUP_ROBOT_LOW_RISK", "x": [ 7, 23 ], "y": [ 7, 13 ], "pack_size": [ 1, 4 ], "chance": 40 },
Expand Down
148 changes: 61 additions & 87 deletions data/mods/Aftershock/maps/mapgen/general_store.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,64 +9,54 @@
" ",
" ///// ",
" //nn.! ",
" /L.,.! ",
" /L.../ A ",
" /l.'.! ",
" /l.../ 5 ",
" ///!!//=/////=///// ",
" /.......nllll.nBBB// ",
" /..,......,.....,..# ",
" =.......neeee.nttt// ",
" =.......ngggg.nppp/ ",
" /ccccc....,.....,.= ",
" /..,.C./ffff//+//+/ ",
" /nrrr/+//////,./,./ ",
" //////..ge.i/nb/nb/ ",
" /.,.+..,ge,I/////// ",
" #.s./p..ge...+,.<// ",
" /$DD/p......////// ",
" /////p...Iii/ ",
" ''''//111//// ",
" ''''''''''''' ",
" ''''''''''''' ",
" ''''''''''' ",
" /.......nllll.nâââ// ",
" /..'......'.....'..# ",
" =.......néééé.nííí// ",
" =.......nêêêê.näää/ ",
" /jjjjj....'.....'.= ",
" /..'.J./áááá//+//+/ ",
" /nííí/+//////'./'./ ",
" //////..êé.3/n~/n~/ ",
" /.'.+..'êé'4/////// ",
" #.s./ä..êé...+'.<// ",
" /2kk/ä......////// ",
" /////ä...433/ ",
" °°°°//111//// ",
" °°°°°°°°°°°°° ",
" °°°°°°°°°°°°° ",
" °°°°°°°°°°° ",
" ",
" "
],
"palettes": [ "afs_habitat_structure" ],
"terrain": { "'": "t_thconc_floor_no_roof", "1": "t_door_metal_locked", "A": "t_atm", ",": "t_metal_floor_olight_inactive" },
"palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing" ],
"terrain": { "1": "t_door_metal_locked", "5": "t_atm" },
"//": "An Electronic safe would be prefered but the gunsafe furniture is hardcoded to say do you want to hack this gunsafe?",
"furniture": {
"â": "f_bookcase",
"á": "f_display_fridge",
"ä": "f_rack",
"é": "f_rack",
"ê": "f_rack",
"ë": "f_rack",
"í": "f_rack",
"s": "f_stool",
"y": "f_table",
"b": "f_habitat_bathroom",
"r": "f_rack",
"$": "f_safe_l",
"L": "f_locker",
"c": "f_counter",
"C": "f_counter_gate_c",
"D": "f_desk",
"R": "f_warehouse_shelf",
"B": "f_bookcase",
"f": "f_display_fridge",
"n": "f_screenmirror",
"I": "f_sealed_intermodal_crate",
"i": "f_intermodal_crate_open",
"p": "f_rack",
"e": "f_rack",
"g": "f_rack",
"l": "f_rack",
"t": "f_rack"
"2": "f_safe_l",
"3": "f_intermodal_crate_open",
"4": "f_sealed_intermodal_crate"
},
"items": {
"B": { "item": "magazines", "chance": 80, "repeat": [ 1, 5 ] },
"p": { "item": "softdrugs", "chance": 80, "repeat": [ 1, 4 ] },
"e": { "item": "consumer_electronics", "chance": 60, "repeat": [ 1, 3 ] },
"L": { "item": "afs_frontier_cryo_g", "chance": 50 },
"g": { "item": "afs_old_food_storage", "chance": 60, "repeat": [ 1, 2 ] },
"$": { "item": "afs_cash_safe" },
"f": { "item": "afs_old_beverage_storage", "chance": 60, "repeat": [ 1, 5 ] },
"l": { "item": "afs_frontier_cryo_g", "chance": 40 },
"t": { "item": "tools_common_small", "chance": 70, "repeat": [ 1, 3 ] },
"r": { "item": "afs_tools_structural_repair", "chance": 25, "repeat": [ 1, 2 ] }
"á": { "item": "afs_old_beverage_storage", "chance": 60, "repeat": [ 1, 5 ] },
"â": { "item": "magazines", "chance": 80, "repeat": [ 1, 5 ] },
"ä": { "item": "softdrugs", "chance": 80, "repeat": [ 1, 4 ] },
"é": { "item": "consumer_electronics", "chance": 60, "repeat": [ 1, 3 ] },
"ê": { "item": "afs_old_food_storage", "chance": 60, "repeat": [ 1, 2 ] },
"ë": { "item": "tools_common_small", "chance": 70, "repeat": [ 1, 3 ] },
"í": { "item": "afs_tools_structural_repair", "chance": 25, "repeat": [ 1, 2 ] },
"2": { "item": "afs_cash_safe" },
"4": { "item": "afs_crate_civ_rand" }
},
"place_loot": [ { "group": "afs_register_random", "x": [ 3, 6 ], "y": 10, "repeat": 1 } ],
"place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 20 } ],
Expand All @@ -81,51 +71,35 @@
"fill_ter": "t_metal_floor",
"rows": [
" ",
" ''''' ",
" '''''' ",
" '''''' ",
" '''''' ",
" ''''''''''''''''''' ",
" ''//=////==///==//'' ",
" '//kk/B..h.h..vqq//' ",
" '/$.h/B..yyy.....d/' ",
" '/y,.+...yyy...,.U= ",
" '/$.W/...h.h./foUU/ ",
" '/////ch..,..////// ",
" '/y.W/.rrrrr..+.b/' ",
" '/$,.+.rsssr.l/wP/' ",
" '/..h/.rrrrr.////// ",
" '//kk/..eee..+,.>// ",
" ''//=//!////////// ",
" ''''''/.,SO/' ",
" ''//#///' ",
" ££££££ ",
" £££££££ ",
" £££££££ ",
" £££££££ ",
" £££££££££££££££££££ ",
" ££//=////==///==//££ ",
" £//kk/á..h.h..vqq//£ ",
" £/S.h/á..yyy.....2/£ ",
" £/y'.+...yyy...'.U= ",
" £/S.W/...h.h./Fojj/ ",
" £/////ch..'..////// ",
" £/y.W/.11111..+'~/£ ",
" £/S'.+.1sss1.l/❹❸/£ ",
" £/..h/.11111.////// ",
" £//kk/..eee..+'.>// ",
" ££//=//!////////// ",
" £££££/.'❺❶/£ ",
" ££//#///£ ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "afs_habitat_structure", "afs_habitat_residential_furnishing" ],
"terrain": { " ": "t_open_air", "'": "t_flat_roof", "r": "t_carpet_red", ",": "t_metal_floor_olight_inactive" },
"furniture": {
"b": "f_habitat_bathroom",
"e": "f_entertainment_center",
"d": "f_dishwasher",
"$": "f_sleep_pod",
"B": "f_bookcase",
"f": "f_fridge",
"w": "f_water_heater",
"P": "f_water_purifier",
"O": "f_ECU",
"S": "f_atmospheric_control"
},
"liquids": { "w": { "liquid": "water_clean", "amount": [ 0, 100 ] } },
"palettes": [ "afs_habitat_structure", "afs_habitat_residential_furnishing", "afs_habitat_life_support", "afs_habitat_exterior" ],
"terrain": { " ": "t_open_air", "1": "t_carpet_red" },
"furniture": { "2": "f_dishwasher", "á": "f_bookcase" },
"place_item": [ { "item": "television", "repeat": 1, "x": 11, "y": 15 } ],
"items": {
"B": { "item": "homebooks", "repeat": [ 2, 3 ] },
"f": { "item": "afs_old_food_storage", "chance": 60 },
"q": { "item": "afs_old_food_storage", "chance": 60 }
},
"items": { "á": { "item": "homebooks", "repeat": [ 2, 3 ] }, "q": { "item": "afs_old_food_storage", "chance": 60 } },
"place_nested": [ { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 0 } ]
}
},
Expand Down
Loading
Loading