Skip to content

Commit

Permalink
initial commit
Browse files Browse the repository at this point in the history 
https: //github.com/CleverRaven/Cataclysm-DDA/pull/51516
https: //github.com/CleverRaven/Cataclysm-DDA/pull/51476
https: //github.com/CleverRaven/Cataclysm-DDA/pull/63534
Co-Authored-By: John Bytheway <52664+jbytheway@users.noreply.github.com>
Co-Authored-By: Eric Pierce <238395+wapcaplet@users.noreply.github.com>
  • Loading branch information
@Zlorthishen @jbytheway @wapcaplet
3 people committed Apr 6, 2024
1 parent eb8f15c commit f0d183f
Show file tree
Hide file tree
Showing 6 changed files with 356 additions and 5 deletions.
62 changes: 61 additions & 1 deletion data/json/furniture_and_terrain/furniture-industrial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,5 +210,65 @@
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" }
}
}
},
{
"type": "furniture",
"id": "f_electrical_conduit",
"name": "electrical conduit",
"looks_like": "f_cable_connector",
"description": "A thick bundle of electrical wiring protected by a metal conduit.",
"symbol": "|",
"color": "light_gray",
"move_cost_mod": 1,
"required_str": -1,
"flags": [ "TRANSPARENT", "NOCOLLIDE" ],
"bash": {
"str_min": 10,
"str_max": 100,
"sound": "smash!",
"sound_fail": "thunk!",
"items": [
{ "item": "scrap", "count": [ 1, 4 ] },
{ "item": "scrap_copper", "count": [ 10, 20 ] },
{ "item": "cable", "charges": [ 20, 100 ] },
{ "item": "pipe", "count": [ 1, 2 ] }
]
},
"deconstruct": {
"items": [
{ "item": "cable", "charges": [ 200, 800 ] },
{ "item": "pipe", "count": [ 2, 4 ] }
]
}
},
{
"type": "furniture",
"id": "f_capacitor",
"name": "capacitor bank",
"looks_like": "f_machinery_electronic",
"description": "A bank of heavy metal cylinders connected by large wires.",
"symbol": "=",
"color": "light_blue",
"move_cost_mod": 4,
"coverage": 40,
"required_str": -1,
"flags": [ "TRANSPARENT", "MOUNTABLE" ],
"bash": {
"str_min": 25,
"str_max": 200,
"explosive": 15,
"sound": "metal screeching!",
"sound_fail": "crash!",
"items": [
{ "item": "scrap", "count": [ 1, 4 ] },
{ "item": "cable", "charges": [ 100, 800 ] },
{ "item": "pipe", "count": [ 0, 4 ] },
{ "item": "circuit", "count": [ 0, 5 ] },
{ "item": "e_scrap", "count": [ 2, 8 ] },
{ "item": "amplifier", "count": [ 0, 4 ] },
{ "item": "power_supply", "count": [ 0, 2 ] },
{ "item": "metal_tank_little", "count": [ 0, 6 ] }
]
}
}
]
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/furniture-roof.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,5 +140,5 @@
"items": [ { "item": "sheet_metal_small", "count": [ 1, 5 ] }, { "item": "scrap", "count": [ 3, 6 ] } ],
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 12, "block_unaimed_chance": "25%" }
}
}
}
]
41 changes: 39 additions & 2 deletions data/json/furniture_and_terrain/terrain-zlevel-transitions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,27 @@
"pry_items": [ { "item": "manhole_cover" } ]
}
},

{
"type": "terrain",
"id": "t_ladder_up_down",
"name": "ladder",
"description": "A ladder leading up and down.",
"symbol": "H",
"color": "dark_gray",
"move_cost": 2,
"flags": [ "TRANSPARENT", "GOES_UP", "GOES_DOWN", "PLACE_ITEM", "DIFFICULT_Z" ],
"bash": {
"str_min": 25,
"str_max": 150,
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_floor",
"items": [ { "item": "steel_chunk", "count": [ 1, 6 ] }, { "item": "scrap", "count": [ 3, 12 ] } ]
}
},


{
"type": "terrain",
"id": "t_ladder_up",
Expand All @@ -172,7 +193,15 @@
"symbol": "<",
"color": "dark_gray",
"move_cost": 2,
"flags": [ "TRANSPARENT", "GOES_UP", "PLACE_ITEM", "DIFFICULT_Z" ]
"flags": [ "TRANSPARENT", "GOES_UP", "PLACE_ITEM", "DIFFICULT_Z" ],
"bash": {
"str_min": 25,
"str_max": 150,
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_floor",
"items": [ { "item": "steel_chunk", "count": [ 1, 6 ] }, { "item": "scrap", "count": [ 3, 12 ] } ]
}
},
{
"type": "terrain",
Expand All @@ -182,7 +211,15 @@
"symbol": ">",
"color": "dark_gray",
"move_cost": 2,
"flags": [ "TRANSPARENT", "GOES_DOWN", "PLACE_ITEM", "DIFFICULT_Z" ]
"flags": [ "TRANSPARENT", "GOES_DOWN", "PLACE_ITEM", "DIFFICULT_Z" ],
"bash": {
"str_min": 25,
"str_max": 150,
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_floor",
"items": [ { "item": "steel_chunk", "count": [ 1, 6 ] }, { "item": "scrap", "count": [ 3, 12 ] } ]
}
},
{
"type": "terrain",
Expand Down
218 changes: 218 additions & 0 deletions data/json/mapgen/wind_turbine.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": "wind_turbine_ground",
"object": {
"fill_ter": "t_metal_floor_no_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" #X# ",
" ##-## ",
" #S-H# ",
" ##-## ",
" ### ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"terrain": {
" ": "t_region_groundcover",
"H": "t_ladder_up",
"-": "t_metal_floor_no_roof",
"#": "t_wall_metal",
"S": "t_switchgear_l",
"X": "t_door_metal_locked"
}
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "wind_turbine_pillar",
"object": {
"fill_ter": "t_open_air",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ### ",
" ## ## ",
" #I H# ",
" ## ## ",
" ### ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"terrain": {
" ": "t_open_air",
"H": "t_ladder_up_down",
"=": "t_metal_floor_no_roof",
"I": "t_metal_floor_no_roof",
"#": "t_wall_metal"
},
"furniture": { "I": "f_electrical_conduit" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "wind_turbine_pillar_platform",
"object": {
"fill_ter": "t_open_air",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ### ",
" ##=## ",
" #I=H# ",
" ##=## ",
" ### ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"terrain": {
" ": "t_open_air",
"H": "t_ladder_up_down",
"=": "t_metal_floor_no_roof",
"I": "t_metal_floor_no_roof",
"#": "t_wall_metal"
},
"furniture": { "I": "f_electrical_conduit" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "wind_turbine_nacelle",
"object": {
"fill_ter": "t_open_air",
"rows": [
" ",
" ",
" ",
" ",
" ",
" | ",
" #|# ",
" ##|## ",
" #+|+# ",
" #+|+# ",
" #&&&# ",
" #I|H# ",
" #E|=# ",
" #C&&# ",
" #C&&# ",
" ##### ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"furniture": { "I": "f_electrical_conduit","C": "f_capacitor" },
"terrain": {
" ": "t_open_air",
"H": "t_ladder_up_down",
"+": "t_machinery_light",
"C": "t_metal_floor_no_roof",
"=": "t_metal_floor_no_roof",
"&": "t_generator_broken",
"E": "t_machinery_electronic",
"|": "t_machinery_heavy",
"I": "t_metal_floor_no_roof",
"#": "t_wall_metal"
}
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "wind_turbine_roof",
"object": {
"fill_ter": "t_open_air",
"rows": [
" ",
" ",
" ",
" ",
" ",
" = ",
" === ",
" ===== ",
" ===== ",
" ===== ",
" ===== ",
" ===H= ",
" ===== ",
" ===== ",
" =?=?= ",
" ===== ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"terrain": {
" ": "t_open_air",
"H": "t_ladder_down",
"+": "t_open_air",
"=": "t_metal_floor_no_roof",
">": "t_metal_floor_no_roof",
"?": "t_metal_floor_no_roof"
},
"furniture": { "?": "f_cellphone_booster" }
}
}
]
24 changes: 23 additions & 1 deletion data/json/overmap/overmap_special/specials.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6737,5 +6737,27 @@
"city_distance": [ 10, 40 ],
"city_sizes": [ 5, -1 ],
"flags": [ "CLASSIC", "MAN_MADE", "UNIQUE" ]
}
},
{
"type": "overmap_special",
"id": "Wind Turbine",
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "wind_turbine_ground_north" },
{ "point": [ 0, 0, 1 ], "overmap": "wind_turbine_pillar_north" },
{ "point": [ 0, 0, 2 ], "overmap": "wind_turbine_pillar_north" },
{ "point": [ 0, 0, 3 ], "overmap": "wind_turbine_pillar_platform_north" },
{ "point": [ 0, 0, 4 ], "overmap": "wind_turbine_pillar_north" },
{ "point": [ 0, 0, 5 ], "overmap": "wind_turbine_pillar_north" },
{ "point": [ 0, 0, 6 ], "overmap": "wind_turbine_pillar_north" },
{ "point": [ 0, 0, 7 ], "overmap": "wind_turbine_pillar_platform_north" },
{ "point": [ 0, 0, 8 ], "overmap": "wind_turbine_nacelle_north" },
{ "point": [ 0, 0, 9 ], "overmap": "wind_turbine_roof_north" }
],

"connections": [ { "point": [ 0, -1, 0 ], "connection": "local_road", "from": [ 0, 0, 0 ] } ],
"locations": [ "field" ],
"city_distance": [ 8, 40 ],
"occurrences": [ 20, 30 ],
"flags": [ "CLASSIC", "WILDERNESS" ]
}
]
Loading

0 comments on commit f0d183f

Please sign in to comment.