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.

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

Pruning the old to-hit syntax - Part 9 #76327

Merged
merged 13 commits into from
Oct 24, 2024
11 changes: 3 additions & 8 deletions data/json/items/armor/cardboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
"material_thickness": 5,
"environmental_protection": 1,
"techniques": [ "WBLOCK_1" ],
"flags": [ "WATER_DISSOLVE", "VARSIZE", "HARD", "PSYSHIELD_PARTIAL", "FRAGILE" ],
"melee_damage": { "bash": 0 }
"flags": [ "WATER_DISSOLVE", "VARSIZE", "HARD", "PSYSHIELD_PARTIAL", "FRAGILE" ]
},
{
"id": "armor_cardboard",
Expand All @@ -36,7 +35,6 @@
"volume": "17500 ml",
"price": "0 cent",
"price_postapoc": "0 cent",
"to_hit": -5,
"material": [ "cardboard", "paper" ],
"symbol": "[",
"color": "brown_yellow",
Expand Down Expand Up @@ -72,8 +70,7 @@
"coverage": 100,
"encumbrance": 23
}
],
"melee_damage": { "bash": 0 }
]
},
{
"id": "armor_cardboard_cuirass",
Expand All @@ -86,16 +83,14 @@
"volume": "6 L",
"price": "0 cent",
"price_postapoc": "0 cent",
"to_hit": -5,
"material": [ "cardboard", "paper" ],
"symbol": "[",
"color": "brown_yellow",
"longest_side": "60 cm",
"warmth": 15,
"material_thickness": 6,
"flags": [ "WATER_DISSOLVE", "FRAGILE_MELEE", "VARSIZE", "OUTER", "HARD" ],
"armor": [ { "encumbrance": 12, "coverage": 90, "covers": [ "torso" ] } ],
"melee_damage": { "bash": 0 }
"armor": [ { "encumbrance": 12, "coverage": 90, "covers": [ "torso" ] } ]
},
{
"id": "cardboard_crown",
Expand Down
2 changes: 0 additions & 2 deletions data/json/items/armor/exotic.json
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@
"volume": "250 ml",
"price": "10 USD",
"price_postapoc": "50 cent",
"to_hit": -1,
"material": [ "plastic", "steel" ],
"symbol": ",",
"color": "red",
Expand Down Expand Up @@ -365,7 +364,6 @@
"volume": "1 L",
"price": "49 USD",
"price_postapoc": "7 USD 50 cent",
"to_hit": -3,
"material": [ "monolith" ],
"symbol": "[",
"color": "dark_gray",
Expand Down
1 change: 0 additions & 1 deletion data/json/items/armor/eyewear.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@
"volume": "250 ml",
"price": "14 USD",
"price_postapoc": "5 USD",
"to_hit": -3,
"material": [ "plastic" ],
"symbol": "[",
"looks_like": "glasses_safety",
Expand Down
10 changes: 2 additions & 8 deletions data/json/items/armor/head_attachments.json
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@
"material": [ "plastic", "steel", "glass" ],
"symbol": "[",
"color": "dark_gray",
"to_hit": -3,
"charges_per_use": 1,
"ammo": "battery",
"use_action": {
Expand Down Expand Up @@ -278,7 +277,6 @@
"material": [ "plastic", "steel", "glass" ],
"symbol": "[",
"color": "dark_gray",
"to_hit": -3,
"charges_per_use": 1,
"ammo": "battery",
"use_action": {
Expand Down Expand Up @@ -345,7 +343,6 @@
"material": [ "plastic", "steel", "glass" ],
"symbol": "[",
"color": "dark_gray",
"to_hit": -3,
"charges_per_use": 1,
"ammo": "battery",
"use_action": {
Expand Down Expand Up @@ -482,11 +479,10 @@
"category": "armor",
"name": { "str": "mild steel chainmail partial aventail" },
"description": "A wide chainmail ring designed to attach to a cap helmet, hanging down to extend protection to the face and neck.",
"weight": "1000 g",
"weight": "1 kg",
"volume": "300 ml",
"price": "50 USD 12 cent",
"price_postapoc": "10 USD",
"to_hit": -1,
"material": [ "lc_steel_chain" ],
"symbol": "[",
"warmth": 3,
Expand Down Expand Up @@ -627,7 +623,6 @@
"volume": "450 ml",
"price": "50 USD 12 cent",
"price_postapoc": "13 USD",
"to_hit": -1,
"material": [ "lc_steel_chain" ],
"symbol": "[",
"warmth": 3,
Expand Down Expand Up @@ -763,11 +758,10 @@
"category": "armor",
"name": { "str": "mild steel armored face mask" },
"description": "A metal face mask designed to attach to a cap helmet to protect the lower half. This is a crude, dull facsimile of the original masterpieces made of mild steel.",
"weight": "2000 g",
"weight": "2 kg",
"volume": "300 ml",
"price": "50 USD 12 cent",
"price_postapoc": "13 USD",
"to_hit": -1,
"material": [ "lc_steel" ],
"symbol": "[",
"warmth": 3,
Expand Down
59 changes: 29 additions & 30 deletions data/json/items/armor/helmets.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@
"volume": "1 L",
"price": "40 USD",
"price_postapoc": "2 USD 50 cent",
"to_hit": 1,
"material": [ "plastic_pad", "leather" ],
"symbol": "[",
"looks_like": "balclava",
Expand Down Expand Up @@ -168,7 +167,7 @@
"longest_side": "28 cm",
"price": "150 USD",
"price_postapoc": "15 USD",
"to_hit": -1,
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"material": [ "kevlar_rigid", "plastic" ],
"symbol": "[",
"looks_like": "hat_hard",
Expand Down Expand Up @@ -255,7 +254,7 @@
"transparent": true
}
],
"melee_damage": { "bash": 2 }
"melee_damage": { "bash": 1 }
},
{
"id": "helmet_army_outdated",
Expand All @@ -270,7 +269,7 @@
"price": "200 USD",
"//": "assuming this is an antique and not a cheap replica",
"price_postapoc": "12 USD",
"to_hit": -1,
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"material": [ "hc_steel", "plastic", "leather" ],
"repairs_with": [ "hc_steel" ],
"symbol": "[",
Expand Down Expand Up @@ -349,7 +348,7 @@
"volume": "2250 ml",
"price": "250 USD",
"price_postapoc": "25 USD",
"to_hit": -1,
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"material": [ "kevlar_rigid", "plastic" ],
"symbol": "[",
"looks_like": "helmet_motor",
Expand Down Expand Up @@ -377,7 +376,7 @@
"inherits_flags": false
}
],
"melee_damage": { "bash": 2 }
"melee_damage": { "bash": 1 }
},
{
"id": "tac_helmet",
Expand All @@ -389,7 +388,7 @@
"volume": "1850 ml",
"price": "200 USD",
"price_postapoc": "20 USD",
"to_hit": -1,
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"material": [ "kevlar_rigid", "plastic" ],
"symbol": "[",
"looks_like": "tac_fullhelmet",
Expand Down Expand Up @@ -476,7 +475,7 @@
"transparent": true
}
],
"melee_damage": { "bash": 2 }
"melee_damage": { "bash": 1 }
},
{
"id": "firehelmet",
Expand All @@ -489,7 +488,7 @@
"longest_side": "30 cm",
"price": "240 USD",
"price_postapoc": "5 USD",
"to_hit": 1,
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"material": [ "plastic", "nomex" ],
"symbol": "[",
"looks_like": "cowboy_hat",
Expand Down Expand Up @@ -517,7 +516,7 @@
"specifically_covers": [ "head_ear_l", "head_ear_r", "head_nape" ]
}
],
"melee_damage": { "bash": 2 }
"melee_damage": { "bash": 1 }
},
{
"id": "helmet_ball",
Expand All @@ -529,7 +528,6 @@
"volume": "1750 ml",
"price": "31 USD",
"price_postapoc": "2 USD 50 cent",
"to_hit": -1,
"material": [ "plastic", "plastic_pad" ],
"symbol": "[",
"looks_like": "hat_hard",
Expand Down Expand Up @@ -560,8 +558,7 @@
"covers": [ "head" ],
"specifically_covers": [ "head_ear_l", "head_ear_r" ]
}
],
"melee_damage": { "bash": 2 }
]
},
{
"id": "helmet_aztec",
Expand All @@ -577,8 +574,8 @@
"price": "150 USD",
"price_postapoc": "12 USD 50 cent",
"material": [ "wood", "cotton" ],
"to_hit": -1,
"melee_damage": { "bash": 6 },
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"melee_damage": { "bash": 1 },
"techniques": [ "WBLOCK_1" ],
"warmth": 15,
"flags": [ "VARSIZE", "STURDY", "PADDED", "WATERPROOF", "NO_REPAIR" ],
Expand Down Expand Up @@ -669,7 +666,8 @@
"material_thickness": 4,
"techniques": [ "WBLOCK_1" ],
"flags": [ "VARSIZE", "STURDY" ],
"melee_damage": { "bash": 3 }
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"melee_damage": { "bash": 1 }
},
{
"id": "xl_helmet_barbute",
Expand Down Expand Up @@ -1220,16 +1218,14 @@
"volume": "250 ml",
"price": "10 USD",
"price_postapoc": "50 cent",
"to_hit": -1,
"material": [ "cotton" ],
"symbol": "[",
"looks_like": "balclava",
"color": "green",
"warmth": 30,
"material_thickness": 0.5,
"flags": [ "VARSIZE", "SKINTIGHT" ],
"armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ],
"melee_damage": { "bash": 1 }
"armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ]
},
{
"id": "helmet_motor",
Expand All @@ -1242,7 +1238,7 @@
"longest_side": "33 cm",
"price": "325 USD",
"price_postapoc": "7 USD 50 cent",
"to_hit": -1,
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"material": [ "plastic", "hard_plastic_transp", "epoxy", "plastic_pad" ],
"symbol": "[",
"color": "dark_gray",
Expand Down Expand Up @@ -1319,7 +1315,7 @@
"environmental_protection": 1,
"techniques": [ "WBLOCK_1" ],
"flags": [ "WATERPROOF", "STURDY", "PADDED", "SUN_GLASSES" ],
"melee_damage": { "bash": 2 }
"melee_damage": { "bash": 1 }
},
{
"id": "helmet_motor_raised",
Expand All @@ -1334,7 +1330,7 @@
"longest_side": "33 cm",
"price": "325 USD",
"price_postapoc": "7 USD 50 cent",
"to_hit": -1,
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"material": [ "plastic", "epoxy" ],
"symbol": "[",
"color": "dark_gray",
Expand Down Expand Up @@ -1389,7 +1385,7 @@
"environmental_protection": 1,
"techniques": [ "WBLOCK_1" ],
"flags": [ "WATERPROOF", "STURDY", "PADDED" ],
"melee_damage": { "bash": 2 }
"melee_damage": { "bash": 1 }
},
{
"id": "helmet_riding",
Expand Down Expand Up @@ -1710,6 +1706,7 @@
"environmental_protection": 1,
"techniques": [ "WBLOCK_1" ],
"flags": [ "VARSIZE", "STURDY" ],
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"melee_damage": { "bash": 3 }
},
{
Expand Down Expand Up @@ -1765,7 +1762,8 @@
"environmental_protection": 1,
"techniques": [ "WBLOCK_1" ],
"flags": [ "VARSIZE", "STURDY" ],
"melee_damage": { "bash": 1 }
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"melee_damage": { "bash": 2 }
},
{
"id": "xl_helmet_kettle",
Expand All @@ -1785,7 +1783,7 @@
"volume": "2750 ml",
"price": "350 USD",
"price_postapoc": "5 USD",
"to_hit": -1,
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"material": [ "budget_steel", "cotton" ],
"symbol": "[",
"looks_like": "helmet_plate",
Expand All @@ -1804,7 +1802,7 @@
"encumbrance_modifiers": [ "IMBALANCED" ]
}
],
"melee_damage": { "bash": 1 }
"melee_damage": { "bash": 2 }
},
{
"id": "xl_helmet_scrap",
Expand Down Expand Up @@ -1865,6 +1863,7 @@
"encumbrance": 10
}
],
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"melee_damage": { "bash": 3 }
},
{
Expand Down Expand Up @@ -1907,6 +1906,7 @@
"encumbrance_modifiers": [ "RESTRICTS_NECK", "WELL_SUPPORTED" ]
}
],
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"melee_damage": { "bash": 3 }
},
{
Expand Down Expand Up @@ -1944,6 +1944,7 @@
"specifically_covers": [ "head_crown", "head_forehead" ]
}
],
"to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
"melee_damage": { "bash": 2 }
},
{
Expand All @@ -1956,7 +1957,7 @@
"volume": "1750 ml",
"price": "240 USD",
"price_postapoc": "35 USD",
"to_hit": -3,
"to_hit": { "grip": "none", "length": "hand", "surface": "point", "balance": "clumsy" },
"material": [ "leather", "iron" ],
"symbol": "[",
"looks_like": "helmet_plate",
Expand Down Expand Up @@ -2917,7 +2918,6 @@
"volume": "1850 ml",
"price": "60 USD",
"price_postapoc": "10 USD",
"to_hit": -1,
"material": [ "plastic", "plastic_pad" ],
"symbol": "[",
"looks_like": "helmet_army",
Expand Down Expand Up @@ -3010,8 +3010,7 @@
"flag_restriction": [ "HELMET_HEAD_ATTACHMENT" ],
"transparent": true
}
],
"melee_damage": { "bash": 1 }
]
},
{
"id": "lc_helmet_turban",
Expand Down
Loading
Loading