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

Don't allow new items to use legacy int to_hit #74597

Merged
merged 26 commits into from
Jul 20, 2024
Merged

Don't allow new items to use legacy int to_hit #74597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
877c95c
Remove "to_hit": -2 (-2 is the "new" default (it was meant to be alre…
Procyonae Jun 15, 2024
1566d4b
Make new to_hit mandatory
Procyonae Jun 15, 2024
df68d16
Add to_hits to items without defined to_hits that are intended as wea…
Procyonae Jun 16, 2024
d835b84
Make the doc links actual md links
Procyonae Jun 16, 2024
f240e70
Make the length field prefer metric (given that's what all the items …
Procyonae Jun 16, 2024
8fd4410
Deal with mods with just a few missing to_hit s now
Procyonae Jun 16, 2024
0974850
Initial blacklist
Procyonae Jun 16, 2024
e2d0d62
Fix inheritance falsely flagging stuff
Procyonae Jun 16, 2024
a406090
Remake the initial blacklists
Procyonae Jun 16, 2024
c0fdfd4
Fix a couple of GAME_BALANCE references
Procyonae Jun 16, 2024
bf31ac2
Merge branch 'master' into EnforceNewToHit
Procyonae Jun 16, 2024
db919a0
Add obsoleted guns
Procyonae Jun 16, 2024
92df285
Appease clang and improve error formatting
Procyonae Jun 16, 2024
042c0e9
Remove more explicit new defaults
Procyonae Jun 20, 2024
5589cd9
Merge branch 'master' into EnforceNewToHit
Procyonae Jun 20, 2024
2575323
Even more explicit defaults
Procyonae Jun 22, 2024
299d38c
Merge branch 'master' into EnforceNewToHit
Procyonae Jun 29, 2024
221edcd
Dealing with more stuff that's been moved to the obsoleted folder
Procyonae Jun 29, 2024
ee09308
Begins dealing with #74600
Procyonae Jul 4, 2024
4c3e315
continue fixing the dps test issues
GuardianDll Jul 19, 2024
04b85e7
Merge branch 'master' into EnforceNewToHit
GuardianDll Jul 19, 2024
e26a976
more fixes
GuardianDll Jul 19, 2024
c7163ab
more fixes
GuardianDll Jul 19, 2024
4651216
Merge branch 'CleverRaven:master' into EnforceNewToHit
GuardianDll Jul 19, 2024
7d509e8
more test fixes
GuardianDll Jul 20, 2024
d0a4db8
more fixes
GuardianDll Jul 20, 2024
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
15 changes: 5 additions & 10 deletions data/json/artifact/artifact_item_types.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
"material": [ "anomaly" ],
"symbol": "O",
"volume": "35 ml",
"weight": "50 g",
"to_hit": -2
"weight": "50 g"
},
{
"id": "art_lamp",
Expand All @@ -47,8 +46,7 @@
"material": [ "anomaly" ],
"symbol": "[",
"volume": "1 L",
"weight": "80 g",
"to_hit": -2
"weight": "80 g"
},
{
"id": "art_snake",
Expand Down Expand Up @@ -86,8 +84,7 @@
"material": [ "anomaly" ],
"symbol": "O",
"volume": "76 ml",
"weight": "125 g",
"to_hit": -2
"weight": "125 g"
},
{
"id": "art_napkin",
Expand All @@ -111,7 +108,6 @@
"symbol": "O",
"volume": "1 L",
"weight": "800 g",
"to_hit": -2,
"melee_damage": { "cut": 3 }
},
{
Expand Down Expand Up @@ -214,8 +210,7 @@
"material": [ "anomaly" ],
"symbol": "C",
"volume": "35 ml",
"weight": "50 g",
"to_hit": -2
"weight": "50 g"
},
{
"id": "art_robe",
Expand Down Expand Up @@ -342,14 +337,14 @@
"volume": "500 ml",
"longest_side": "25 cm",
"price": "30 USD",
"to_hit": { "grip": "solid", "length": "hand", "surface": "line", "balance": "neutral" },
"material": [ "wood", "steel" ],
"symbol": ";",
"color": "light_gray",
"techniques": [ "WBLOCK_1" ],
"qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 11 ] ],
"weapon_category": [ "KNIVES" ],
"flags": [ "SHEATH_KNIFE", "TRADER_AVOID" ],
"to_hit": -2,
"melee_damage": { "bash": 2, "stab": 13 }
},
{
Expand Down
2 changes: 0 additions & 2 deletions data/json/items/ammo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,6 @@
"range": 12,
"dispersion": 14,
"loudness": 0,
"to_hit": -2,
"recovery_chance": 99,
"effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
"melee_damage": { "cut": 9 }
Expand Down Expand Up @@ -1524,7 +1523,6 @@
"//": "300g / 8.8g/ml = ~34.1ml. Add 10% to take an uneven chunk into account = 37.5ml rounded upwards to 38ml.",
"price": "1 USD 69 cent",
"price_postapoc": "1 USD",
"to_hit": -2,
"material": [ "bronze" ],
"symbol": ",",
"color": "yellow",
Expand Down
2 changes: 0 additions & 2 deletions data/json/items/armor/arms_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@
"weight": "400 g",
"volume": "1500 ml",
"price_postapoc": "1 USD",
"to_hit": -2,
"material": [ "cotton" ],
"symbol": "[",
"looks_like": "arm_warmers",
Expand Down Expand Up @@ -1708,7 +1707,6 @@
"weight": "500 g",
"volume": "500 ml",
"price_postapoc": "10 USD",
"to_hit": -2,
"material": [ "cotton", "leather" ],
"symbol": "[",
"looks_like": "armguard_soft",
Expand Down
5 changes: 0 additions & 5 deletions data/json/items/armor/bespoke_armor/custom_gloves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"volume": "750 ml",
"price": "180 USD",
"price_postapoc": "20 USD",
"to_hit": 2,
"material": [ "kevlar", "cotton" ],
"symbol": "[",
"looks_like": "gloves_survivor",
Expand Down Expand Up @@ -47,7 +46,6 @@
"volume": "700 ml",
"price": "160 USD",
"price_postapoc": "20 USD",
"to_hit": 2,
"material": [ "kevlar", "cotton" ],
"symbol": "[",
"color": "green",
Expand Down Expand Up @@ -97,7 +95,6 @@
"volume": "700 ml",
"price": "160 USD",
"price_postapoc": "20 USD",
"to_hit": 2,
"material": [ "kevlar", "leather" ],
"symbol": "[",
"color": "brown",
Expand Down Expand Up @@ -146,7 +143,6 @@
"volume": "750 ml",
"price": "180 USD",
"price_postapoc": "20 USD",
"to_hit": 2,
"material": [ "kevlar", "leather" ],
"symbol": "[",
"looks_like": "fire_gauntlets",
Expand Down Expand Up @@ -183,7 +179,6 @@
"volume": "1250 ml",
"price": "180 USD",
"price_postapoc": "25 USD",
"to_hit": 2,
"material": [ "kevlar", "fur" ],
"symbol": "[",
"looks_like": "gloves_winter",
Expand Down
2 changes: 0 additions & 2 deletions data/json/items/armor/bespoke_armor/cuttingroom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@
"volume": "1 L",
"price": "180 USD",
"price_postapoc": "30 USD",
"to_hit": 2,
"material": [ "kevlar", "steel" ],
"symbol": "[",
"looks_like": "fire_gauntlets",
Expand Down Expand Up @@ -186,7 +185,6 @@
"volume": "1 L",
"price": "180 USD",
"price_postapoc": "25 USD",
"to_hit": 2,
"material": [ "kevlar_layered", "nomex" ],
"symbol": "[",
"looks_like": "fire_gauntlets",
Expand Down
1 change: 0 additions & 1 deletion data/json/items/armor/bespoke_armor/utility.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@
"volume": "250 ml",
"price": "75 USD",
"price_postapoc": "30 USD",
"to_hit": -2,
"material": [ "hard_plastic_transp", "leather_treated" ],
"symbol": "[",
"looks_like": "glasses_bal",
Expand Down
17 changes: 0 additions & 17 deletions data/json/items/armor/boots.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"volume": "250 ml",
"price": "30 USD",
"price_postapoc": "50 cent",
"to_hit": -2,
"material": [ "cotton" ],
"symbol": "[",
"looks_like": "flip_flops",
Expand Down Expand Up @@ -159,7 +158,6 @@
"volume": "3500 ml",
"price": "130 USD",
"price_postapoc": "15 USD",
"to_hit": 2,
"symbol": "[",
"looks_like": "boots_steel",
"color": "dark_gray",
Expand Down Expand Up @@ -668,7 +666,6 @@
"volume": "3250 ml",
"price": "500 USD",
"price_postapoc": "60 USD",
"to_hit": -2,
"symbol": "[",
"looks_like": "boots_steel",
"color": "light_gray",
Expand Down Expand Up @@ -733,7 +730,6 @@
"volume": "3500 ml",
"price": "80 USD",
"price_postapoc": "5 USD",
"to_hit": 2,
"symbol": "[",
"looks_like": "boots",
"color": "dark_gray",
Expand Down Expand Up @@ -841,7 +837,6 @@
"volume": "750 ml",
"price": "4 USD",
"price_postapoc": "2 USD",
"to_hit": -2,
"symbol": "[",
"looks_like": "lc_sabaton",
"material": [ "lc_steel" ],
Expand Down Expand Up @@ -1197,7 +1192,6 @@
"volume": "1250 ml",
"price": "40 USD",
"price_postapoc": "1 USD 50 cent",
"to_hit": -2,
"material": [ "wood" ],
"symbol": "[",
"looks_like": "leathersandals",
Expand Down Expand Up @@ -1375,7 +1369,6 @@
"volume": "250 ml",
"price": "5 USD",
"price_postapoc": "50 cent",
"to_hit": -2,
"symbol": "[",
"looks_like": "sneakers",
"color": "blue",
Expand Down Expand Up @@ -1406,7 +1399,6 @@
"volume": "250 ml",
"price": "105 USD",
"price_postapoc": "50 cent",
"to_hit": -2,
"material": [ "rubber", "leather" ],
"symbol": "[",
"looks_like": "flip_flops",
Expand Down Expand Up @@ -1530,7 +1522,6 @@
"volume": "1 L",
"price": "65 USD",
"price_postapoc": "50 cent",
"to_hit": -2,
"symbol": "[",
"looks_like": "clogs",
"color": "yellow",
Expand Down Expand Up @@ -1566,7 +1557,6 @@
"volume": "750 ml",
"price": "40 USD",
"price_postapoc": "50 cent",
"to_hit": -2,
"material": [ "leather" ],
"symbol": "[",
"looks_like": "dress_shoes",
Expand Down Expand Up @@ -1763,7 +1753,6 @@
"volume": "250 ml",
"price": "40 USD",
"price_postapoc": "2 USD 50 cent",
"to_hit": -2,
"symbol": "[",
"looks_like": "flip_flops",
"color": "brown",
Expand Down Expand Up @@ -1803,7 +1792,6 @@
"volume": "750 ml",
"price": "15 USD",
"price_postapoc": "2 USD 50 cent",
"to_hit": -2,
"symbol": "[",
"looks_like": "sneakers",
"color": "dark_gray",
Expand Down Expand Up @@ -1931,7 +1919,6 @@
"volume": "3750 ml",
"price": "85 USD",
"price_postapoc": "25 USD",
"to_hit": -2,
"material": [ "plastic", "cotton" ],
"symbol": "[",
"looks_like": "rollerskates",
Expand Down Expand Up @@ -1980,7 +1967,6 @@
"volume": "3 L",
"price": "85 USD",
"price_postapoc": "15 USD",
"to_hit": -2,
"material": [ "leather", "steel" ],
"symbol": "[",
"looks_like": "roller_blades",
Expand Down Expand Up @@ -2163,7 +2149,6 @@
"volume": "250 ml",
"price": "6 USD",
"price_postapoc": "50 cent",
"to_hit": -2,
"material": [ "cotton" ],
"symbol": "[",
"looks_like": "socks_wool",
Expand Down Expand Up @@ -2251,7 +2236,6 @@
"volume": "500 ml",
"price": "20 USD",
"price_postapoc": "50 cent",
"to_hit": -2,
"symbol": "[",
"looks_like": "leathersandals",
"color": "light_gray",
Expand Down Expand Up @@ -3296,7 +3280,6 @@
"volume": "750 ml",
"price": "400 USD",
"price_postapoc": "30 USD",
"to_hit": -2,
"symbol": "[",
"looks_like": "boots_steel",
"material": [ "lc_steel" ],
Expand Down
1 change: 0 additions & 1 deletion data/json/items/armor/cloaks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1614,7 +1614,6 @@
"volume": "6 L",
"price": "500 USD",
"price_postapoc": "3 USD",
"to_hit": -2,
"material": [ "cotton" ],
"symbol": "]",
"looks_like": "cloak",
Expand Down
2 changes: 0 additions & 2 deletions data/json/items/armor/coats.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,6 @@
"volume": "2250 ml",
"price": "25 USD",
"price_postapoc": "1 USD",
"to_hit": -2,
"material": [ "cotton" ],
"symbol": "[",
"looks_like": "coat_winter",
Expand Down Expand Up @@ -387,7 +386,6 @@
"volume": "6750 ml",
"price": "140 USD",
"price_postapoc": "7 USD 50 cent",
"to_hit": -2,
"material": [ "cotton" ],
"symbol": "[",
"looks_like": "coat_rain",
Expand Down
Loading
Loading