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] Shuttlepad Salvor Encampment mapgen #79257

Merged
merged 9 commits into from
Jan 20, 2025
+656 −18
Merged

[Aftershock] Shuttlepad Salvor Encampment mapgen #79257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7c22b86
More forms of lights
QuillInkwell Jan 19, 2025
1002f0c
Add Shuttlepad mapgen
QuillInkwell Jan 19, 2025
fe3a124
Heated floors added to structures that would logically have active cl…
QuillInkwell Jan 19, 2025
57dfe94
Minor Fixes and Map Tweaks
QuillInkwell Jan 19, 2025
2c1a2d9
More minor fixes and map corrections
QuillInkwell Jan 19, 2025
56b1583
More Mapgen Updates
QuillInkwell Jan 20, 2025
5e20072
Adjust Map Items Spawns
QuillInkwell Jan 20, 2025
8401332
Fix machine spawning with wrong terrain
QuillInkwell Jan 20, 2025
ff1263e
Lint
QuillInkwell Jan 20, 2025
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
99 changes: 97 additions & 2 deletions data/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_floor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
{
"type": "terrain",
"id": "t_metal_floor_olight_inactive",
"name": "metal floor, with inactive overhead light",
"name": "metal floor, inactive overhead light",
"description": "High-quality and tough checkered metal flooring to reduce the risk of slips and falls, with a still-functioning inactive light attached to the ceiling above.",
"looks_like": "t_metal_floor_olight",
"symbol": ".",
Expand All @@ -99,7 +99,7 @@
{
"type": "terrain",
"id": "t_linoleum_white_olight_inactive",
"name": "linoleum tile",
"name": "linoleum tile, inactive overhead light",
"description": "A section of flooring made out of a tough, rubbery material. Colored a simple white. There is a still-functioning inactive light attached to the ceiling above.",
"looks_like": "t_linoleum_whitefloor_olight",
"symbol": ".",
Expand All @@ -119,5 +119,100 @@
"ter_set": "t_linoleum_white",
"items": [ { "item": "glass_shard", "count": [ 8, 16 ] } ]
}
},
{
"type": "terrain",
"id": "t_strconc_floor_olight_inactive",
"name": "strong concrete floor, inactive overhead light",
"description": "An extremely resilient floor made from carefully placed rebar and poured concrete, with a still-functioning inactive light attached to the ceiling above.",
"looks_like": "t_strconc_floor_olight",
"symbol": ".",
"color": "white",
"move_cost": 2,
"roof": "t_concrete_roof",
"flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT", "ROAD" ],
"connect_groups": [ "CONCRETE", "INDOORFLOOR" ],
"connects_to": "CONCRETE",
"bash": {
"str_min": 4,
"str_max": 12,
"sound": "glass breaking!",
"sound_fail": "whack!",
"sound_vol": 16,
"sound_fail_vol": 10,
"ter_set": "t_strconc_floor",
"items": [ { "item": "glass_shard", "count": [ 8, 16 ] } ]
},
"shoot": { "chance_to_hit": 0, "reduce_damage": [ 0, 0 ], "reduce_damage_laser": [ 0, 0 ], "destroy_damage": [ 2, 8 ] }
},
{
"type": "terrain",
"id": "t_thconc_floor_olight_inactive",
"name": "concrete floor, inactive overhead light",
"description": "A bare and cold concrete floor with a still-functioning inactive light attached to the ceiling above.",
"looks_like": "t_thconc_floor_olight",
"symbol": ".",
"color": "white",
"move_cost": 2,
"roof": "t_concrete_roof",
"flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT", "ROAD" ],
"connect_groups": [ "CONCRETE", "INDOORFLOOR" ],
"connects_to": "CONCRETE",
"bash": {
"str_min": 4,
"str_max": 12,
"sound": "glass breaking!",
"sound_fail": "whack!",
"sound_vol": 16,
"sound_fail_vol": 10,
"ter_set": "t_thconc_floor",
"items": [ { "item": "glass_shard", "count": [ 8, 16 ] } ]
},
"shoot": { "chance_to_hit": 0, "reduce_damage": [ 0, 0 ], "reduce_damage_laser": [ 0, 0 ], "destroy_damage": [ 2, 8 ] }
},
{
"type": "terrain",
"id": "t_scrap_floor_olight",
"name": "simple metal floor, overhead light",
"description": "A crudely welded-together metal floor with steel trusses and supporting girders. Can support a roof. A still-functioning light hangs from the ceiling above.",
"looks_like": "t_scrap_floor",
"symbol": ".",
"color": "cyan",
"light_emitted": 120,
"move_cost": 2,
"roof": "t_metal_flat_roof",
"connect_groups": "INDOORFLOOR",
"flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ],
"bash": {
"str_min": 50,
"str_max": 400,
"sound": "SMASH!",
"ter_set": "t_scrap_floor",
"str_min_supported": 100,
"items": [ { "item": "steel_chunk", "count": [ 5, 11 ] } ]
},
"shoot": { "chance_to_hit": 0, "reduce_damage": [ 0, 0 ], "reduce_damage_laser": [ 0, 0 ], "destroy_damage": [ 2, 8 ] }
},
{
"type": "terrain",
"id": "t_scrap_floor_olight_inactive",
"name": "simple metal floor, inactive overhead light",
"description": "A crudely welded-together metal floor with steel trusses and supporting girders. Can support a roof. A still-functioning inactive light hangs from the ceiling above.",
"looks_like": "t_scrap_floor_olight",
"symbol": ".",
"color": "cyan",
"move_cost": 2,
"roof": "t_metal_flat_roof",
"connect_groups": "INDOORFLOOR",
"flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ],
"bash": {
"str_min": 50,
"str_max": 400,
"sound": "SMASH!",
"ter_set": "t_scrap_floor",
"str_min_supported": 100,
"items": [ { "item": "steel_chunk", "count": [ 5, 11 ] } ]
},
"shoot": { "chance_to_hit": 0, "reduce_damage": [ 0, 0 ], "reduce_damage_laser": [ 0, 0 ], "destroy_damage": [ 2, 8 ] }
}
]
22 changes: 11 additions & 11 deletions data/mods/Aftershock/maps/mapgen/landing_pad.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
"object": {
"fill_ter": "t_strconc_floor_heated",
"rows": [
" ",
" .. ",
" . |||||||||| ",
" ñññ 9 ||||8 8|7l|~||||ññ ",
" ñññññññññññññññññññ 9 ñññ||||8,8|7l|~||||ññ ",
" ñ . |h|)4)|,,|3|@| ñ ",
" ñ ............. .. |y6,6,6,6,63,5 ñ ",
" ñ..0...000........ .. |oÑ,,,,,,,,|@| ñ ",
" ñ..0...000..00.... 9 |||||||||)!||||| ñ ",
" ñ................. .. |,,| ñ ",
" ñ..00..000..00.... .. |||)!||| ñ ",
" ñ..00..00...00.... .. |W,,,,,| ñ ",
" ñ......00...00.... .. |||||,,6jú,| ñ ",
" ñ..00............. 9.........3.63,,,jjj| ñ ",
" ñ..00..0.0..00.... í.........=..=,,6,,Ú| ñ ",
" ....0...000..00.... 9 |||||||||)!||||| ñ ",
".................... .. |,,| ñ ",
". ...00..000..00.... .. |||)!||| ñ ",
".....00..00...00.... .. |W,,,,,| ñ ",
" ........00...00.... .. |||||,,6jú,| ñ ",
". ...00............. 9.........3.63,,,jjj| ñ ",
".....00..0.0..00.... í.........=..=,,6,,Ú| ñ ",
" ñ..00..0.0..00......... 9 |||||n,,,,n| ñ ",
" ñ ............. ..... ||====|| ñ ",
" ñ 9.. | | ñ ",
Expand Down Expand Up @@ -47,7 +47,7 @@
"Ú": "t_intermodal_crate_scripted_source",
"4": "t_door_metal_locked",
"5": "t_wall_prefab_glass_shutters",
"6": "t_linoleum_whitefloor_olight",
"6": "t_strconc_floor_olight",
"9": "t_region_groundcover_urban"
},
"furniture": { "Ñ": "f_habitat_storage_board", "7": "f_ECU", "8": "f_rack", "9": "f_micro_terraforming_mill_active" },
Expand Down Expand Up @@ -88,7 +88,7 @@
" "
],
"palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing" ],
"terrain": { " ": "t_open_air" }
"terrain": { " ": "t_open_air", "p": "t_metal_floor" }
}
},
{
Expand Down
Loading
Loading