Skip to content

Commit

Permalink
Port abandoned textile mill again (cataclysmbnteam#2522)
Browse files Browse the repository at this point in the history 
* feat: port abandoned textile mill (DDA-57892)

Co-authored-by: Incroppism <100336898+Incroppism@users.noreply.github.com>
Co-authored-by: snipercup <50166150+snipercup@users.noreply.github.com>

* fix: add `t_strconc_floor_roofless`

---------

Co-authored-by: scarf <greenscarf005@gmail.com>
Co-authored-by: snipercup <50166150+snipercup@users.noreply.github.com>
  • Loading branch information
@Incroppism @scarf005 @snipercup
3 people authored Apr 2, 2023
1 parent c3726d9 commit 45939d4
Show file tree
Hide file tree
Showing 8 changed files with 414 additions and 0 deletions.
23 changes: 23 additions & 0 deletions data/json/furniture_and_terrain/terrain-floors-outdoors.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,29 @@
"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.",
"symbol": ".",
"color": "cyan",
"move_cost": 2,
"looks_like": "t_strconc_floor",
"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
45 changes: 45 additions & 0 deletions data/json/itemgroups/trash_and_debris.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,5 +198,50 @@
{ "item": "wire", "prob": 5 },
{ "item": "splinter", "prob": 20 }
]
},
{
"id": "collapsed_building_rubble",
"type": "item_group",
"subtype": "collection",
"//": "A building has collapsed. Perhaps from a bomb, perhaps from a fire",
"//2": "This stuff survived and lies inside the ruins but is really crude and damaged.",
"items": [
{ "item": "string_36", "prob": 2, "count": [ 5, 40 ], "damage-min": 0, "damage-max": 3 },
{ "item": "frame", "prob": 2, "count": [ 0, 1 ], "damage-min": 0, "damage-max": 3 },
{ "item": "hdframe", "prob": 2, "count": [ 0, 1 ], "damage-min": 0, "damage-max": 3 },
{ "item": "metal_tank", "prob": 2, "count": [ 0, 1 ], "damage-min": 0, "damage-max": 3 },
{ "item": "screen_mesh", "prob": 2, "count": [ 1, 2 ], "damage-min": 0, "damage-max": 3 },
{ "item": "metal_tank_little", "prob": 2, "count": [ 0, 1 ], "damage-min": 0, "damage-max": 3 },
{ "item": "water_faucet", "prob": 2, "count": [ 1, 2 ], "damage-min": 0, "damage-max": 3 },
{ "item": "peephole", "prob": 2, "count": [ 0, 1 ], "damage-min": 0, "damage-max": 3 },
{ "item": "cu_pipe", "prob": 2, "count": [ 2, 4 ], "damage-min": 0, "damage-max": 3 },
{ "item": "chain", "prob": 2, "count": [ 0, 1 ], "damage-min": 0, "damage-max": 3 },
{ "item": "rope_6", "prob": 2, "count": [ 1, 2 ], "damage-min": 0, "damage-max": 3 },
{ "item": "rope_30", "prob": 2, "count": [ 0, 1 ], "damage-min": 0, "damage-max": 3 },
{ "item": "rebar", "prob": 8, "count": [ 2, 6 ], "damage-min": 0, "damage-max": 3 },
{ "item": "brick", "prob": 20, "count": [ 10, 20 ], "damage-min": 0, "damage-max": 3 },
{ "item": "pipe", "prob": 5, "count": [ 2, 6 ], "damage-min": 0, "damage-max": 3 },
{ "item": "nail", "prob": 2, "count": [ 0, 1 ], "charges-min": 3, "charges-max": 15 },
{ "item": "wire", "prob": 3, "count": [ 2, 6 ], "damage-min": 0, "damage-max": 3 },
{ "item": "charcoal", "prob": 3, "charges": [ 3, 7 ] },
{ "item": "scrap_copper", "prob": 2, "count": [ 2, 4 ], "damage-min": 0, "damage-max": 3 },
{ "item": "sheet_metal", "prob": 2, "count": [ 1, 4 ], "damage-min": 0, "damage-max": 3 },
{ "item": "sheet_metal_small", "prob": 2, "count": [ 1, 4 ], "damage-min": 0, "damage-max": 3 },
{ "item": "spike", "prob": 5, "count": [ 2, 4 ], "damage-min": 0, "damage-max": 3 },
{ "item": "hinge", "prob": 2, "count": [ 1, 2 ], "damage-min": 0, "damage-max": 3 },
{ "item": "steel_lump", "prob": 5, "count": [ 2, 5 ] },
{ "item": "steel_chunk", "prob": 5, "count": [ 5, 10 ] }
]
},
{
"id": "collapsed_building_outside",
"type": "item_group",
"subtype": "collection",
"//": "A building has collapsed. Perhaps from a bomb, perhaps from a fire",
"//2": "This is the stuff that fell outside and lies on the ground in the open.",
"items": [
{ "item": "rebar", "prob": 2, "count": [ 5, 10 ], "damage-min": 0, "damage-max": 3 },
{ "item": "brick", "prob": 20, "count": [ 15, 30 ], "damage-min": 0, "damage-max": 3 }
]
}
]
182 changes: 182 additions & 0 deletions data/json/mapgen/abandoned_textile_mill/abandoned_textile_mill_a.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "abandoned_textile_mill_0_1", "abandoned_textile_mill_0_2", "abandoned_textile_mill_0_3" ] ],
"object": {
"fill_ter": "t_region_groundcover_barren",
"rows": [
" ========== ",
" ===== =]======]= ===== ",
" =]*]= =*======*= =]*]= ",
" =========* *=========]======]=========* *========= ",
" ===]*]*]*]+]*]*]*]*]*]]+]]]]]*]*]*]*]*]+]*]*]*]*]= ",
" ==--------------------]-------------------------*= ",
" ==--------------------]-------------------------]= ",
" ==--------------------]-------------------------*= ",
" =]-]-]-]-]-]-]-]-]-]--]-]-]-]-]-]-]-]-]-]-]-]-]-]= ",
" =*--------------------]-------------------------*= ",
" =]--------------------]-------------------------]= ",
" =*--------------------]-------------------------*= ",
" =]-]-]-]-]-]-]-]-]-]--]-]-]-]-]-]-]-]-]-]-]-]-]-]= ",
" =*--------------------+-------------------------*= ",
" =]--------------------]-------------------------]= ",
" =*--------------------]-------------------------*= ",
" =]-]-]-]-]-]-]-]-]-]--]-]-]-]-]-]-]-]-]-]-]-]-]-]= ",
" =*--------------------]-------------------------*= ",
" =]--------------------]-------------------------]= ",
" ===*--------------------]-------------------------*=== ",
" =]*]+]*]*]*]*]*]*]*]*]*]]+]]]]]*]*]*]*]*]*]*]*]*]+]*]= ",
" =* *==========================================* *= ",
" =]*]*]= =]*]*]= ",
" ======= ======= "
],
"palettes": [ "abandoned_textile_mill" ],
"place_monsters": [
{ "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 21 ], "density": 0.15 },
{ "monster": "GROUP_ZOMBIE", "x": [ 27, 34 ], "y": [ 9, 21 ], "density": 0.3 },
{ "monster": "GROUP_ZOMBIE", "x": [ 48, 59 ], "y": [ 9, 19 ], "density": 0.15 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "abandoned_textile_mill_1_1", "abandoned_textile_mill_1_2", "abandoned_textile_mill_1_3" ] ],
"object": {
"fill_ter": "t_open_air",
"rows": [
" ",
" ",
" ]*] * * ]*] ",
" * * ] ] * * ",
" ]*]*]*]]]*]*] ]*]]]]]]]]*]*] ]*]]]*]*]*]*] ",
" * ",
" ] ",
" * ",
" ] ] ",
" * ",
" ] ",
" * ",
" ] ",
" * ",
" ] ] ",
" * * ",
" ] ] ",
" * * ",
" ] ] ",
" * * ",
" ]*]+]*]*] ]*]*]*]*]]] ]*]*] ]*]+]*] ",
" * * * * ",
" ]*]*] ]*]*] ",
" "
],
"palettes": [ "abandoned_textile_mill" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "abandoned_textile_mill_2_1", "abandoned_textile_mill_2_2", "abandoned_textile_mill_2_3" ] ],
"object": {
"fill_ter": "t_open_air",
"rows": [
" ",
" ",
" ]*] ]*] ",
" * * * * ",
" ]*]]]*] ]]]]]]]]*] ]*]]]*] ]*] ",
" * ",
" ] ",
" ",
" ] ",
" * ",
" ] ",
" * ",
" ] ",
" ",
" ",
" ",
" ",
" ",
" ] ] ",
" * * ",
" ]*]+]*]*] ]*]*] ]*] ]*]+]*] ",
" * * * * ",
" ]*]*] ]*]*] ",
" "
],
"palettes": [ "abandoned_textile_mill" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "abandoned_textile_mill_3_1", "abandoned_textile_mill_3_2", "abandoned_textile_mill_3_3" ] ],
"object": {
"fill_ter": "t_open_air",
"rows": [
" ",
" ",
" ]*] ]*] ",
" * * * * ",
" ]]] ]]] ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ]*]+] ]+]*] ",
" * * * * ",
" ]*]*] ]*]*] ",
" "
],
"palettes": [ "abandoned_textile_mill" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "abandoned_textile_mill_4_1", "abandoned_textile_mill_4_2", "abandoned_textile_mill_4_3" ] ],
"object": {
"fill_ter": "t_open_air",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ]*]+] ]+]*] ",
" * * * * ",
" ]*]*] ]*]*] ",
" "
],
"palettes": [ "abandoned_textile_mill" ]
}
}
]
76 changes: 76 additions & 0 deletions data/json/mapgen/abandoned_textile_mill/abandoned_textile_mill_b.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "abandoned_textile_mill_b_0_1", "abandoned_textile_mill_b_0_2" ] ],
"object": {
"fill_ter": "t_region_groundcover_barren",
"rows": [
" ",
" ",
" ",
" ========================================= ",
" =]*]*]*]*]*]*]*]*]*]]+]]]]*]*]*]*]*]*]*]= ",
" =*-----------------]-----]-------------*= ",
" =]-----------------]-----]-------------]= ",
" =*-----------------]-----]-------------*= ",
" =]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]= ",
" =*-----------------]-----]-------------*= ",
" =]-----------------+-----+-------------]= ",
" =*-----------------]-----]-------------*= ",
" =]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]= ",
" =*-----------------]-----]-------------*= ",
" =]-----------------]-----]-------------]= ",
" =*-----------------]-----]-------------*= ",
" =]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]-]= ",
" =*-----------------]-----]-------------*= ",
" =]-----------------]-----+-------------]= ",
" =*-----------------]-----]-------------*= ",
" =]*]*]*]*]*]*]*]*]*]]+]]]]*]*]*]*]*]*]*]= ",
" ",
" ",
" "
],
"palettes": [ "abandoned_textile_mill" ],
"place_monsters": [
{ "monster": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 21 ], "density": 0.15 },
{ "monster": "GROUP_ZOMBIE", "x": [ 27, 34 ], "y": [ 9, 21 ], "density": 0.3 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "abandoned_textile_mill_b_1_1", "abandoned_textile_mill_b_1_2" ] ],
"object": {
"fill_ter": "t_open_air",
"rows": [
" ",
" ",
" ",
" ",
" ]*] ]]+]]]] ]*] ",
" * ] ] * ",
" ] ] ] ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ] ] ] ",
" * ] * ",
" ]*] ]]+]]]] ]*] ",
" ",
" ",
" "
],
"palettes": [ "abandoned_textile_mill" ]
}
}
]
Loading

0 comments on commit 45939d4

Please sign in to comment.