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

fix: don't assign piercing damage to weapons that were previously cutting #4217

Merged
merged 1 commit into from
Feb 10, 2024
Merged

fix: don't assign piercing damage to weapons that were previously cutting #4217

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
12 changes: 6 additions & 6 deletions data/json/items/melee/spears_and_polearms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
"color": "light_gray",
"techniques": "WBLOCK_1",
"qualities": [ [ "CUT", 1 ], [ "BUTCHER", -42 ] ],
"flags": [ "REACH_ATTACK", "POLEARM", "NONCONDUCTIVE", "SHEATH_SPEAR", "FRAGILE_MELEE", "SPEAR", "STAB" ]
"flags": [ "REACH_ATTACK", "POLEARM", "NONCONDUCTIVE", "SHEATH_SPEAR", "FRAGILE_MELEE", "SPEAR" ]
},
{
"id": "glaive",
Expand All @@ -348,7 +348,7 @@
"price": "500 USD",
"material": [ "steel", "wood" ],
"qualities": [ [ "CUT", 1 ], [ "BUTCHER", -28 ] ],
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "SPEAR", "STAB" ],
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "SPEAR" ],
"techniques": [ "WIDE", "WBLOCK_1" ],
"weight": "2100 g",
"volume": "2500 ml",
Expand All @@ -372,7 +372,7 @@
"bashing": 7,
"cutting": 45,
"qualities": [ [ "CUT", 1 ], [ "BUTCHER", -24 ] ],
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "SPEAR", "STAB" ],
"flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "SPEAR" ],
"price": "800 USD",
"price_postapoc": "95 USD"
},
Expand All @@ -385,7 +385,7 @@
"material": [ "budget_steel", "wood" ],
"bashing": 29,
"cutting": 11,
"flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "SPEAR", "STAB" ],
"flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "SPEAR" ],
"price_postapoc": "15 USD"
},
{
Expand All @@ -399,7 +399,7 @@
"bashing": 12,
"cutting": 2,
"to_hit": 1,
"flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ],
"flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "FRAGILE_MELEE", "SPEAR" ],
"price": "80 USD",
"price_postapoc": "5 USD",
"qualities": [ ]
Expand Down Expand Up @@ -589,6 +589,6 @@
"symbol": "/",
"color": "yellow",
"techniques": [ "WBLOCK_1", "DEF_DISARM" ],
"flags": [ "DURABLE_MELEE", "POLEARM", "REACH_ATTACK", "ALWAYS_TWOHAND", "NONCONDUCTIVE", "SHEATH_SPEAR", "SPEAR", "STAB" ]
"flags": [ "DURABLE_MELEE", "POLEARM", "REACH_ATTACK", "ALWAYS_TWOHAND", "NONCONDUCTIVE", "SHEATH_SPEAR", "SPEAR" ]
}
]
4 changes: 2 additions & 2 deletions data/mods/Magiclysm/items/alchemy_items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
"to_hit": -1,
"material": [ "flesh" ],
"cutting": 7,
"flags": [ "SPEAR", "SHEATH_KNIFE" ]
"flags": [ "STAB", "SHEATH_KNIFE" ]
},
{
"type": "GENERIC",
Expand Down Expand Up @@ -250,7 +250,7 @@
"material": [ "flesh" ],
"volume": "250 ml",
"cutting": 8,
"flags": [ "SPEAR", "SHEATH_KNIFE" ],
"flags": [ "STAB", "SHEATH_KNIFE" ],
"price": "15 USD"
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Magiclysm/items/enchanted_melee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@
"color": "light_gray",
"techniques": [ "WBLOCK_1", "IMPALE" ],
"qualities": [ [ "COOK", 1 ] ],
"flags": [ "SPEAR", "REACH_ATTACK", "DURABLE_MELEE", "SHEATH_SPEAR", "TRADER_AVOID", "MAGIC_FOCUS" ]
"flags": [ "STAB", "SPEAR", "REACH_ATTACK", "DURABLE_MELEE", "SHEATH_SPEAR", "TRADER_AVOID", "MAGIC_FOCUS" ]
},
{
"id": "rune_technomancer_weapon",
Expand Down
1 change: 1 addition & 0 deletions data/mods/Magiclysm/items/ethereal_items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@
"flags": [
"UNBREAKABLE_MELEE",
"REACH_ATTACK",
"STAB",
"SPEAR",
"NONCONDUCTIVE",
"SHEATH_SPEAR",
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Magiclysm/items/weapons.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"techniques": [ "WBLOCK_2", "DEF_DISARM", "IMPALE" ],
"volume": "3 L",
"cutting": 29,
"flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "DURABLE_MELEE", "SHEATH_SPEAR" ],
"flags": [ "STAB", "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "DURABLE_MELEE", "SHEATH_SPEAR" ],
"price": "150 USD"
},
{
Expand All @@ -38,7 +38,7 @@
"description": "This weapon measures about 3 feet in length and is fletched like an arrow for better accuracy. The business end of the javelin has wicked-looking barbs which could cause significant bleeding.",
"weight": "2500 g",
"volume": "2830 ml",
"flags": [ "SPEAR", "SHEATH_SPEAR", "JAVELIN", "TRADER_AVOID", "NO_REPAIR" ]
"flags": [ "STAB", "SHEATH_SPEAR", "JAVELIN", "TRADER_AVOID", "NO_REPAIR" ]
},
{
"id": "lizardfolk_javelin_gun",
Expand Down
4 changes: 2 additions & 2 deletions data/mods/TEST_DATA/items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
"symbol": ";",
"color": "yellow",
"qualities": [ [ "SCREW", 2 ], [ "SCREW_FINE", 1 ], [ "WRENCH", 1 ], [ "PRY", 2 ], [ "LOCKPICK", 30 ] ],
"flags": [ "SPEAR", "BELT_CLIP" ]
"flags": [ "STAB", "BELT_CLIP" ]
},
{
"id": "test_soldering_iron",
Expand Down Expand Up @@ -219,7 +219,7 @@
},
{ "flame": false, "type": "cauterize" }
],
"flags": [ "SPEAR", "BELT_CLIP", "ALLOWS_REMOTE_USE" ],
"flags": [ "STAB", "BELT_CLIP", "ALLOWS_REMOTE_USE" ],
"magazines": [
[
"battery",
Expand Down
Loading