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

feat(balance): finish extending ranged bash info to windows, doors, and other half-implemented terrain; some window fixes #4219

Merged
merged 1 commit into from
Feb 18, 2024
Merged

feat(balance): finish extending ranged bash info to windows, doors, and other half-implemented terrain; some window fixes #4219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion data/json/furniture_and_terrain/furniture-plumbing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@
{ "item": "pipe", "count": [ 0, 2 ] },
{ "item": "hose", "count": 1 },
{ "item": "water_faucet", "count": 1 }
]
],
"ranged": { "reduction": [ 8, 15 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" }
},
"deconstruct": {
"items": [
Expand Down
3 changes: 2 additions & 1 deletion data/json/furniture_and_terrain/furniture-triffid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"str_max": 60,
"sound": "smash",
"sound_fail": "whump.",
"items": [ { "item": "splinter", "count": [ 10, 15 ] } ]
"items": [ { "item": "splinter", "count": [ 10, 15 ] } ],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 60, "block_unaimed_chance": "50%" }
}
},
{
Expand Down
97 changes: 64 additions & 33 deletions data/json/furniture_and_terrain/terrain-doors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,7 @@
"sound_vol": 20,
"sound_fail_vol": 14,
"ter_set": "t_thconc_floor",
"items": [ { "item": "glass_shard", "count": [ 3, 6 ] }, { "item": "wire", "prob": 20 }, { "item": "scrap", "count": [ 3, 5 ] } ],
"//": "reduction and destroy_threshold both match str_min for ballistic/reinforced glass doors",
"ranged": { "reduction": [ 40, 40 ], "reduction_laser": [ 0, 8 ], "destroy_threshold": 40 }
"items": [ { "item": "glass_shard", "count": [ 3, 6 ] }, { "item": "wire", "prob": 20 }, { "item": "scrap", "count": [ 3, 5 ] } ]
}
},
{
Expand Down Expand Up @@ -266,7 +264,8 @@
{ "item": "wood_panel", "prob": 10 },
{ "item": "splinter", "count": [ 1, 2 ] },
{ "item": "nail", "charges": [ 0, 2 ] }
]
],
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 }
}
},
{
Expand Down Expand Up @@ -304,7 +303,8 @@
{ "item": "wood_panel", "prob": 10 },
{ "item": "splinter", "count": [ 1, 2 ] },
{ "item": "nail", "charges": [ 0, 2 ] }
]
],
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 }
}
},
{
Expand Down Expand Up @@ -342,7 +342,8 @@
{ "item": "wood_panel", "prob": 10 },
{ "item": "splinter", "count": [ 1, 2 ] },
{ "item": "nail", "charges": [ 0, 2 ] }
]
],
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 }
}
},
{
Expand Down Expand Up @@ -380,7 +381,8 @@
{ "item": "wood_panel", "prob": 10 },
{ "item": "splinter", "count": [ 1, 2 ] },
{ "item": "nail", "charges": [ 0, 2 ] }
]
],
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 }
}
},
{
Expand Down Expand Up @@ -418,7 +420,8 @@
{ "item": "wood_panel", "prob": 10 },
{ "item": "splinter", "count": [ 1, 2 ] },
{ "item": "nail", "charges": [ 0, 2 ] }
]
],
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 }
}
},
{
Expand Down Expand Up @@ -602,7 +605,8 @@
{ "item": "nail", "charges": [ 1, 4 ] },
{ "item": "splinter", "count": [ 1, 4 ] },
{ "item": "hinge", "count": [ 1, 2 ] }
]
],
"ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -638,7 +642,8 @@
{ "item": "nail", "charges": [ 1, 4 ] },
{ "item": "splinter", "count": [ 1, 4 ] },
{ "item": "hinge", "count": [ 1, 2 ] }
]
],
"ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -674,7 +679,8 @@
{ "item": "nail", "charges": [ 1, 4 ] },
{ "item": "splinter", "count": [ 1, 4 ] },
{ "item": "hinge", "count": [ 1, 2 ] }
]
],
"ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -710,7 +716,8 @@
{ "item": "nail", "charges": [ 1, 4 ] },
{ "item": "splinter", "count": [ 1, 4 ] },
{ "item": "hinge", "count": [ 1, 2 ] }
]
],
"ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -834,7 +841,9 @@
"sound_vol": 16,
"sound_fail_vol": 10,
"ter_set": "t_door_red_frame",
"items": [ { "item": "glass_shard", "count": [ 3, 6 ] } ]
"items": [ { "item": "glass_shard", "count": [ 3, 6 ] } ],
"//": "reduction and destroy_threshold are lower for plain glass",
"ranged": { "reduction": [ 1, 6 ], "reduction_laser": [ 0, 5 ], "destroy_threshold": 6 }
}
},
{
Expand Down Expand Up @@ -882,7 +891,9 @@
"sound_vol": 16,
"sound_fail_vol": 10,
"ter_set": "t_door_white_frame",
"items": [ { "item": "glass_shard", "count": [ 3, 6 ] } ]
"items": [ { "item": "glass_shard", "count": [ 3, 6 ] } ],
"//": "reduction and destroy_threshold are lower for plain glass",
"ranged": { "reduction": [ 1, 6 ], "reduction_laser": [ 0, 5 ], "destroy_threshold": 6 }
}
},
{
Expand All @@ -906,7 +917,9 @@
"sound_vol": 16,
"sound_fail_vol": 10,
"ter_set": "t_door_gray_frame",
"items": [ { "item": "glass_shard", "count": [ 3, 6 ] } ]
"items": [ { "item": "glass_shard", "count": [ 3, 6 ] } ],
"//": "reduction and destroy_threshold are lower for plain glass",
"ranged": { "reduction": [ 1, 6 ], "reduction_laser": [ 0, 5 ], "destroy_threshold": 6 }
}
},
{
Expand Down Expand Up @@ -1041,7 +1054,8 @@
{ "item": "2x4", "prob": 25 },
{ "item": "splinter", "count": [ 1, 2 ] },
{ "item": "nail", "charges": [ 0, 2 ] }
]
],
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 }
}
},
{
Expand Down Expand Up @@ -1114,7 +1128,8 @@
{ "item": "nail", "charges": [ 1, 4 ] },
{ "item": "splinter", "count": [ 1, 4 ] },
{ "item": "hinge", "count": [ 1, 2 ] }
]
],
"ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -1152,7 +1167,8 @@
{ "item": "nail", "charges": [ 1, 4 ] },
{ "item": "splinter", "count": [ 1, 4 ] },
{ "item": "hinge", "count": [ 1, 2 ] }
]
],
"ranged": { "reduction": [ 3, 5 ], "destroy_threshold": 70, "block_unaimed_chance": "50%" }
}
},
{
Expand Down Expand Up @@ -1295,7 +1311,8 @@
{ "item": "2x4", "count": [ 1, 4 ] },
{ "item": "splinter", "count": [ 2, 4 ] },
{ "item": "nail", "charges": [ 4, 12 ] }
]
],
"ranged": { "reduction": [ 9, 18 ], "destroy_threshold": 100 }
}
},
{
Expand Down Expand Up @@ -1331,7 +1348,8 @@
{ "item": "nail", "charges": [ 4, 18 ] },
{ "item": "splinter", "count": [ 2, 4 ] },
{ "item": "hinge", "count": [ 0, 1 ] }
]
],
"ranged": { "reduction": [ 6, 12 ], "destroy_threshold": 90, "block_unaimed_chance": "75%" }
}
},
{
Expand Down Expand Up @@ -1394,7 +1412,8 @@
{ "item": "wood_panel", "prob": 10 },
{ "item": "splinter", "count": [ 1, 2 ] },
{ "item": "nail", "charges": [ 0, 2 ] }
]
],
"ranged": { "reduction": [ 4, 8 ], "destroy_threshold": 80 }
},
"pry": {
"success_message": "You pry open the door.",
Expand Down Expand Up @@ -1650,7 +1669,8 @@
{ "item": "rope_makeshift_6", "count": [ 0, 1 ] },
{ "item": "withered", "count": [ 2, 12 ] },
{ "item": "splinter", "count": [ 5, 10 ] }
]
],
"ranged": { "reduction": [ 2, 4 ], "destroy_threshold": 20 }
}
},
{
Expand Down Expand Up @@ -1907,7 +1927,8 @@
{ "item": "2x4", "count": [ 1, 3 ] },
{ "item": "nail", "charges": [ 2, 10 ] },
{ "item": "splinter", "count": [ 1, 2 ] }
]
],
"ranged": { "reduction": [ 8, 15 ], "destroy_threshold": 80 }
}
},
{
Expand Down Expand Up @@ -1965,7 +1986,7 @@
{ "item": "splinter", "count": 1 },
{ "item": "hinge", "count": [ 0, 1 ] }
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 50 }
"ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 50 }
}
},
{
Expand Down Expand Up @@ -1995,7 +2016,8 @@
{ "item": "nail", "charges": [ 2, 20 ] },
{ "item": "splinter", "count": 1 },
{ "item": "hinge", "count": [ 1, 2 ] }
]
],
"ranged": { "reduction": [ 5, 10 ], "destroy_threshold": 40 }
}
},
{
Expand Down Expand Up @@ -2026,7 +2048,8 @@
{ "item": "scrap", "count": [ 12, 24 ] },
{ "item": "steel_plate", "prob": 75 },
{ "item": "hinge", "count": [ 1, 3 ] }
]
],
"ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 250 }
}
},
{
Expand All @@ -2047,7 +2070,8 @@
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_mdoor_frame",
"items": [ { "item": "scrap", "count": [ 12, 24 ] }, { "item": "steel_plate", "prob": 75 } ]
"items": [ { "item": "scrap", "count": [ 12, 24 ] }, { "item": "steel_plate", "prob": 75 } ],
"ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 250 }
}
},
{
Expand Down Expand Up @@ -2087,7 +2111,8 @@
{ "item": "scrap", "count": [ 12, 24 ] },
{ "item": "steel_plate", "prob": 75 },
{ "item": "hinge", "count": [ 1, 3 ] }
]
],
"ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 250 }
}
},
{
Expand Down Expand Up @@ -2165,7 +2190,8 @@
{ "item": "scrap", "count": [ 12, 24 ] },
{ "item": "steel_plate", "prob": 75 },
{ "item": "hinge", "count": [ 1, 3 ] }
]
],
"ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 250 }
}
},
{
Expand Down Expand Up @@ -2222,7 +2248,8 @@
{ "item": "scrap", "count": [ 12, 24 ] },
{ "item": "steel_plate", "prob": 75 },
{ "item": "hinge", "count": [ 1, 3 ] }
]
],
"ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 250 }
}
},
{
Expand Down Expand Up @@ -2308,7 +2335,8 @@
{ "item": "scrap", "count": [ 12, 24 ] },
{ "item": "steel_plate", "prob": 75 },
{ "item": "hinge", "count": [ 1, 3 ] }
]
],
"ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 250 }
},
"pry": {
"success_message": "You pry open the door.",
Expand Down Expand Up @@ -2475,7 +2503,9 @@
"sound_vol": 16,
"sound_fail_vol": 10,
"ter_set": "t_thconc_floor",
"items": [ { "item": "glass_shard", "count": [ 3, 6 ] } ]
"items": [ { "item": "glass_shard", "count": [ 3, 6 ] } ],
"//": "reduction and destroy_threshold are lower for plain glass",
"ranged": { "reduction": [ 1, 6 ], "reduction_laser": [ 0, 5 ], "destroy_threshold": 6 }
}
},
{
Expand Down Expand Up @@ -2593,7 +2623,8 @@
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_mdoor_frame",
"items": [ { "item": "scrap", "count": [ 12, 24 ] }, { "item": "steel_plate", "prob": 75 } ]
"items": [ { "item": "scrap", "count": [ 12, 24 ] }, { "item": "steel_plate", "prob": 75 } ],
"ranged": { "reduction": [ 40, 80 ], "destroy_threshold": 250 }
}
},
{
Expand Down
Loading
Loading