Skip to content

Commit

Permalink
Hub 01 Renovations (CleverRaven#56942)
Browse files Browse the repository at this point in the history
* Add EOC elevators to Hub01

* Hub01 renovations

* Update Mercenary and caravan placements

* SHOULLD_NOT_SPAWN flag for non spawning fill terrain

* Update data/json/mapgen/robofachq_static.json

Co-authored-by: casswedson <[email protected]>

Co-authored-by: casswedson <[email protected]>
  • Loading branch information
John-Candlebury and casswedson authored Apr 21, 2022
1 parent 7bada03 commit cc09934
Show file tree
Hide file tree
Showing 8 changed files with 556 additions and 153 deletions.
24 changes: 24 additions & 0 deletions data/json/furniture_and_terrain/terrain-floors-outdoors.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,30 @@
"items": [ { "item": "rock", "count": [ 2, 10 ] } ]
}
},
{
"type": "terrain",
"id": "t_strconc_floor_no_roof",
"name": "reinforced concrete floor",
"description": "Extremely resilient floor made from carefully placed rebar and poured concrete, capable of providing protection from the elements. As for the matching roof, it still requires supporting walls, otherwise it may very well cave in.",
"looks_like": "t_strconc_floor",
"symbol": ".",
"color": "cyan",
"connects_to": "CONCRETE",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
"bash": {
"sound": "SMASH!",
"ter_set": "t_null",
"str_min": 150,
"str_max": 400,
"str_min_supported": 200,
"items": [
{ "item": "rock", "count": [ 10, 22 ] },
{ "item": "scrap", "count": [ 10, 12 ] },
{ "item": "rebar", "count": [ 0, 4 ] }
]
}
},
{
"type": "terrain",
"id": "t_concrete",
Expand Down
98 changes: 98 additions & 0 deletions data/json/furniture_and_terrain/terrain-mechanisms.json
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,104 @@
]
}
},
{
"type": "terrain",
"id": "t_elevator_control_robofac_up",
"name": "elevator controls",
"description": "This is the control face for an elevator. You could press the appropriate button to take you to your choice of floor.",
"symbol": "6",
"color": "light_blue",
"move_cost": 0,
"coverage": 50,
"roof": "t_flat_roof",
"flags": [ "NOITEM", "INDOORS" ],
"examine_action": {
"type": "effect_on_condition",
"effect_on_conditions": [
{
"id": "EOC_ROBOFAC_ELEVATOR_UP",
"condition": { "u_has_trait": "PROF_HUB01_ANCILLIARY" },
"effect": [
{ "u_location_variable": { "u_val": "robofac_elevator_up" }, "z_adjust": 1 },
{ "u_message": "The elevator starts moving before you can touch the panel.", "popup": true },
{ "u_teleport": { "u_val": "robofac_elevator_up" } }
],
"false_effect": {
"u_message": "The control panels' screen flashes before displaying \"UNAUTHORIZED\" in bold red letters.",
"popup": true
}
}
]
},
"bash": {
"str_min": 40,
"str_max": 150,
"sound": "crunch!",
"sound_fail": "whack!",
"ter_set": "t_console_broken",
"items": [
{ "item": "processor", "prob": 25 },
{ "item": "RAM", "count": [ 0, 2 ], "prob": 50 },
{ "item": "cable", "charges": [ 1, 2 ], "prob": 50 },
{ "item": "small_lcd_screen", "prob": 25 },
{ "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 },
{ "item": "circuit", "count": [ 0, 2 ], "prob": 50 },
{ "item": "power_supply", "prob": 25 },
{ "item": "amplifier", "prob": 25 },
{ "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 },
{ "item": "scrap", "count": [ 2, 6 ], "prob": 50 }
]
}
},
{
"type": "terrain",
"id": "t_elevator_control_robofac_down",
"name": "elevator controls",
"description": "This is the control face for an elevator. You could press the appropriate button to take you to your choice of floor.",
"symbol": "6",
"color": "light_blue",
"move_cost": 0,
"coverage": 50,
"roof": "t_flat_roof",
"flags": [ "NOITEM", "INDOORS" ],
"examine_action": {
"type": "effect_on_condition",
"effect_on_conditions": [
{
"id": "EOC_ROBOFAC_ELEVATOR_DOWN",
"condition": { "u_has_trait": "PROF_HUB01_ANCILLIARY" },
"effect": [
{ "u_location_variable": { "u_val": "robofac_elevator_down" }, "z_adjust": -1 },
{ "u_message": "The elevator starts moving before you can touch the panel.", "popup": true },
{ "u_teleport": { "u_val": "robofac_elevator_down" } }
],
"false_effect": {
"u_message": "The control panels' screen flashes before displaying \"UNAUTHORIZED\" in bold red letters.",
"popup": true
}
}
]
},
"bash": {
"str_min": 40,
"str_max": 150,
"sound": "crunch!",
"sound_fail": "whack!",
"ter_set": "t_console_broken",
"items": [
{ "item": "processor", "prob": 25 },
{ "item": "RAM", "count": [ 0, 2 ], "prob": 50 },
{ "item": "cable", "charges": [ 1, 2 ], "prob": 50 },
{ "item": "small_lcd_screen", "prob": 25 },
{ "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 },
{ "item": "circuit", "count": [ 0, 2 ], "prob": 50 },
{ "item": "power_supply", "prob": 25 },
{ "item": "amplifier", "prob": 25 },
{ "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 },
{ "item": "scrap", "count": [ 2, 6 ], "prob": 50 }
]
}
},
{
"type": "terrain",
"id": "t_elevator_control_off",
Expand Down
Loading

0 comments on commit cc09934

Please sign in to comment.