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

Add new locations to Aftershock #73988

Merged
merged 17 commits into from
May 23, 2024
Merged

Add new locations to Aftershock #73988

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8b61515
Add Shuttle Landing Pad Mapgen to Aftershock Exo Planet
QuillInkwell May 15, 2024
8a7baff
Update shuttlepad layout and add sealed shipping crates to Aftershock.
QuillInkwell May 20, 2024
30c3ddd
Add Malamute Freight Transport to Aftershock
QuillInkwell May 21, 2024
c70bc16
Update freight transport. Increase monster spawns and alter layout sl…
QuillInkwell May 21, 2024
debc044
Format JSON to match style guides
QuillInkwell May 21, 2024
614444a
Restore deleted shuttlepad
QuillInkwell May 21, 2024
b3a8362
Fix broken broken JSON and remove unimplemented mapgen Aftershock
QuillInkwell May 21, 2024
d86e249
Fix typo
QuillInkwell May 21, 2024
0963e5c
Lint JSON
QuillInkwell May 21, 2024
f4d4027
Fix description on sealed intermodal crate
QuillInkwell May 21, 2024
8a2cf0a
Add General Store to Aftershock Exoplanet
QuillInkwell May 22, 2024
c7d5720
Lint general store JSON
QuillInkwell May 22, 2024
71e97f5
Fix description on Open Intermodal crate
QuillInkwell May 22, 2024
7ad154d
Minor Updates to Mapgen Aftershock
QuillInkwell May 22, 2024
59f80f8
Add lights to Aftershock Mapgen.
QuillInkwell May 22, 2024
cc95ce8
Fix General Store second floor generating ground instead of air
QuillInkwell May 22, 2024
2bf61b4
Remove water spawn in colonist wardrobe Aftershock
QuillInkwell May 22, 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
45 changes: 45 additions & 0 deletions data/mods/Aftershock/itemgroups/sealed_crates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
[
{
"type": "item_group",
"id": "afs_crate_civ_rand",
"//": "Genral civilian goods weighted for rarity",
"subtype": "distribution",
"entries": [
{ "group": "afs_crate_food", "prob": 4 },
{ "group": "afs_crate_clothing", "prob": 2 },
{ "group": "afs_crate_medical", "prob": 1 },
{ "group": "afs_civilian_armory", "prob": 1, "count": [ 2, 5 ] }
]
},
{
"type": "item_group",
"id": "afs_crate_food",
"subtype": "collection",
"//": "Perserved food shipped in from off world.",
"entries": [
{ "group": "afs_stored_meals", "prob": 50, "count": [ 3, 8 ] },
{ "group": "afs_dry_goods", "prob": 100, "count": [ 3, 5 ] }
]
},
{
"type": "item_group",
"id": "afs_crate_clothing",
"subtype": "collection",
"//": "Multiple sets of clothing goods. Increased likelyhood of a bag due the difficulty of getting into a crate in the first place.",
"entries": [
{ "group": "afs_colonist_outfit", "prob": 100, "count": [ 3, 6 ] },
{ "group": "afs_colonist_bags", "prob": 80, "count": [ 1, 2 ] }
]
},
{
"type": "item_group",
"id": "afs_crate_medical",
"subtype": "collection",
"//": "Civilian Grade Medical supplies with a low chance of rare medical goods.",
"entries": [
{ "group": "drugs_pharmacy", "prob": 100, "count": [ 3, 6 ] },
{ "item": "afs_synth_blood", "prob": 30, "count": [ 1, 3 ] },
{ "item": "afs_medigel", "prob": 60, "count": [ 1, 3 ] }
]
}
]
11 changes: 11 additions & 0 deletions data/mods/Aftershock/maps/city_buildings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,16 @@
{ "point": [ 0, 0, 1 ], "overmap": "afs_shelter_1_roof_north" }
],
"locations": [ "land" ]
},
{
"id": "afs_shuttle_pad",
"type": "city_building",
"overmaps": [
{ "point": [ 1, 0, 0 ], "overmap": "afs_shuttle_pad_a1_south" },
{ "point": [ 0, 0, 0 ], "overmap": "afs_shuttle_pad_a2_south" },
QuillInkwell marked this conversation as resolved.
Show resolved Hide resolved
{ "point": [ 1, 0, 1 ], "overmap": "afs_shuttle_pad_a1_roof_south" },
{ "point": [ 0, 0, 1 ], "overmap": "afs_shuttle_pad_a2_roof_south" }
QuillInkwell marked this conversation as resolved.
Show resolved Hide resolved
],
"locations": [ "land" ]
}
]
47 changes: 47 additions & 0 deletions data/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,5 +186,52 @@
{ "item": "circuit", "count": [ 0, 1 ] }
]
}
},
{
"type": "furniture",
"id": "f_intermodal_crate_open",
"name": "intermodal shipping crate",
"description": "A sealed metal crate used to ferry cargo to and from orbit. This one appears to be open.",
"required_str": 12,
QuillInkwell marked this conversation as resolved.
Show resolved Hide resolved
"symbol": "O",
"bgcolor": "brown",
"move_cost_mod": -1,
"coverage": 60,
"flags": [ "TRANSPARENT", "MOUNTABLE", "SHORT", "SMALL_HIDE", "PLACE_ITEM", "CONTAINER" ],
"bash": {
QuillInkwell marked this conversation as resolved.
Show resolved Hide resolved
"str_min": 40,
"str_max": 200,
"sound": "screeching metal!",
"sound_fail": "whump!",
"items": [
{ "item": "steel_chunk", "count": [ 1, 5 ] },
{ "item": "scrap", "count": [ 1, 5 ] },
{ "item": "afs_circuitry_1", "count": [ 1, 2 ] }
]
}
},
{
"type": "furniture",
"id": "f_sealed_intermodal_crate",
"name": "sealed intermodal crate",
"description": "A sealed metal crate used to ferry cargo to and from orbit. This one appears to be secured with an electic lock.",
"required_str": 12,
QuillInkwell marked this conversation as resolved.
Show resolved Hide resolved
"symbol": "O",
"bgcolor": "brown",
"move_cost_mod": -1,
"coverage": 60,
"oxytorch": { "result": "f_intermodal_crate_open", "duration": "14 seconds" },
"flags": [ "TRANSPARENT", "MOUNTABLE", "SHORT", "SMALL_HIDE", "PLACE_ITEM", "CONTAINER", "SEALED" ],
"bash": {
QuillInkwell marked this conversation as resolved.
Show resolved Hide resolved
"str_min": 40,
"str_max": 200,
"sound": "screeching metal!",
"sound_fail": "whump!",
"items": [
{ "item": "steel_chunk", "count": [ 1, 5 ] },
{ "item": "scrap", "count": [ 1, 5 ] },
{ "item": "afs_circuitry_1", "count": [ 1, 2 ] }
]
}
}
]
22 changes: 22 additions & 0 deletions data/mods/Aftershock/maps/furniture_and_terrain/terrain_spaceship.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,28 @@
]
}
},
{
"type": "terrain",
"id": "t_afs_broken_treads",
"name": "broken treads",
"description": "A large set of broken and frozen over vehicle treads.",
"flags": [ "NOITEM", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND", "TRANSPARENT", "SHORT" ],
"symbol": "LINE_OXOX",
"color": "white",
"move_cost": 5,
QuillInkwell marked this conversation as resolved.
Show resolved Hide resolved
"bash": {
"str_min": 100,
"str_max": 400,
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_null",
"items": [
{ "item": "afs_material_2", "count": [ 1, 2 ] },
{ "item": "afs_material_1", "count": [ 2, 8 ] },
{ "item": "scrap", "count": [ 6, 24 ] }
]
}
},
{
"type": "terrain",
"id": "t_afs_gun_ship_hull_wall",
Expand Down
121 changes: 121 additions & 0 deletions data/mods/Aftershock/maps/mapgen/freight_transport.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "afs_freight_transport_a1", "afs_freight_transport_a2" ] ],
"object": {
"fill_ter": "t_metal_floor",
"rows": [
" ",
" ",
" ",
" ",
" ñññññññññññ ",
" -_-_- -__- ññññññ ñññññññ ",
" ---ojU----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-.hc_3!.1...!.....-....5..!..c_ ",
" ---$.$----..f-_---7.q-l....!.......--hc_ ",
" #.#...-Ti-E.........q-l....-6f4....f---- ",
" ---$$.!..-LL..qq---I---...-----fL.fE-- ",
" ---W-S----II--- -_- --!-- -__-__- ",
" -_-_- -__- ññññññ ñññññññ ",
" ñññññññññññ ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"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"
},
"furniture": {
"I": "f_sealed_intermodal_crate",
"$": "f_sleep_pod",
"S": "f_shower",
"T": "f_toilet",
"i": "f_sink",
"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"
},
"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 ] },
"I": { "item": "afs_crate_civ_rand" },
"B": { "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 },
{ "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 3 ], "pack_size": [ 1, 4 ], "chance": 50 },
{ "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 17, 23 ], "pack_size": [ 1, 2 ], "chance": 100 },
{ "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 24, 47 ], "y": [ 17, 23 ], "pack_size": [ 1, 2 ], "chance": 70 }
],
"computers": {
"7": {
"name": "MALAMUTE REACTOR CONTROL",
"security": 5,
"options": [ { "name": "UNLOCK REACTOR DOORS", "action": "unlock" } ],
"failures": [ { "action": "shutdown" }, { "action": "alarm" } ]
},
"5": {
"name": "MALAMUTE ARMORY CONTROL",
"security": 3,
"options": [ { "name": "UNLOCK ARMORY DOORS", "action": "unlock" } ],
"failures": [ { "action": "shutdown" }, { "action": "alarm" } ]
}
}
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "afs_freight_transport_roof_a1", "afs_freight_transport_roof_a2" ] ],
"object": {
"fill_ter": "t_metal_floor",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ..... .... ",
" ............... ... ..... ....... ",
" ..&................................... ",
" .==A.....MM............===A............. ",
" ..&..............................MM..... ",
" .....................XX.........X..... ",
" ..&..............................MM..... ",
" .==A.....MM............===A............. ",
" ..&................................... ",
" ............... ... ..... ....... ",
" ..... .... ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
}
]
77 changes: 77 additions & 0 deletions data/mods/Aftershock/maps/mapgen/shuttle_pad.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "afs_shuttle_pad_a1", "afs_shuttle_pad_a2" ] ],
"object": {
"fill_ter": "t_metal_floor",
"rows": [
" ",
" ññññññññññññññññññññññññññññññññññññ////////// ",
" ñ //E&qq/v.h/ ",
" ñ $$$$$ $$$$ $$$$ $$ $$$$$$$$ #...ö.+.kk/ ",
" ñ $$''''e''''''''''''''''e''''''$$//&.qq/.../ ",
" ñ $'''''' '''' ' '''''e ' '''$ //+////+// ",
" ñ $'''''' '' ''' '''' ''' '''$ =..../..l/ ",
" ñ '''$$'' ''''$$''''' ''$$''' =ccc./..l/ ",
" ñ $'''$''' '''''''' ''''' ''$''' /===//!/// ",
" ñ $''' ''' '' '' ''' ''''''$ /./ ñ ",
" ñ $'''' ''''' ''''''''''''''''''$'' '''/!/ ñ ",
" ñ $'' ''' '''$$''' ''' ''''$''' '' '' ñ ",
" ñ $' ''' ''$$'' ''' ''''$'' ''''' ñ ",
" ñ $''''''''' ' '''''''''''' ' $'''''' ' ñ ",
" ñ '''' ''''' '''''' '' ''' '' ' ñ ",
" ñ '''$' ' ''''''''' '''''$'''$ '' ñ ",
" ñ '''$$''''' ''$$''''''' '$$'''$ ''e ''' ñ ",
" ñ $''''' ''''' ''' '' ''' '' ''' 'e '' ' ñ ",
" ñ $''''' '''''' '' '' '''$ ''e'''' ñ ",
" ñ $$''''' ''''' '' ''' ''ee ''''$$ ''' '' ñ ",
" ñ $$$$ $$$$$ $$$$$$$ $$$$$$$ '' ñ ",
" ñ ''' ñ ",
" ññññññññññññññññññññññññññññññññññññññññ'''ñññ ",
" "
],
"palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing" ],
"terrain": { "'": "t_thconc_floor_no_roof", "$": "t_sidewalk", "ñ": "t_chainfence" },
"furniture": { "&": "f_sealed_intermodal_crate", "e": "f_intermodal_crate_open" },
"items": { "&": [ { "item": "afs_crate_civ_rand" } ] },
"monster": { "ö": { "monster": "mon_skitterbot" } },
"place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 2, 22 ], "y": [ 2, 22 ], "pack_size": [ 1, 2 ], "chance": 50 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "afs_shuttle_pad_a1_roof", "afs_shuttle_pad_a2_roof" ] ],
"object": {
"fill_ter": "t_flat_roof",
"rows": [
" ",
" .......... ",
" ........X.. ",
" ....&&..... ",
" ........... ",
" ..A....... ",
" ..A=...... ",
" .......... ",
" .......... ",
" ... ",
" ... ",
" ... ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
}
]
QuillInkwell marked this conversation as resolved.
Show resolved Hide resolved
15 changes: 15 additions & 0 deletions data/mods/Aftershock/maps/overmap_specials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,5 +231,20 @@
"city_sizes": [ 0, -1 ],
"occurrences": [ 1, 1 ],
"flags": [ "GLOBALLY_UNIQUE", "MAN_MADE", "EXOPLANET" ]
},
{
"type": "overmap_special",
"id": "frieght transport",
"overmaps": [
{ "point": [0, 0, 0], "overmap": "afs_freight_transport_a1_north" },
{ "point": [1, 0, 0], "overmap": "afs_freight_transport_a2_north" },
{ "point": [0, 0, 1], "overmap": "afs_freight_transport_roof_a1_north" },
{ "point": [1, 0, 1], "overmap": "afs_freight_transport_roof_a2_north" }
],
"locations": [ "open_air", "land" ],
"city_distance": [ 35, -1 ],
"city_sizes": [ 1, 12 ],
"occurrences": [ 0, 2 ],
"flags": [ "MAN_MADE", "EXOPLANET" ]
QuillInkwell marked this conversation as resolved.
Show resolved Hide resolved
}
]
Loading
Loading