Skip to content

Commit

Permalink
Merge pull request #77812 from ampersand55/pen_impale
Browse files Browse the repository at this point in the history 
Change spear techniques from impaling strike to penetrating strike
  • Loading branch information
Anton Burmistrov authored Nov 21, 2024
2 parents 17d354b + c2d4b75 commit cf615e3
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 20 deletions.
40 changes: 20 additions & 20 deletions data/json/items/melee/spears_and_polearms.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"color": "brown",
"symbol": "/",
"material": [ "wood" ],
"techniques": [ "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"volume": "1750 ml",
"longest_side": "180 cm",
"to_hit": { "grip": "solid", "length": "long", "surface": "point", "balance": "neutral" },
Expand Down Expand Up @@ -99,7 +99,7 @@
"symbol": "/",
"looks_like": "spear_wood",
"material": [ "wood" ],
"techniques": [ "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"volume": "1250 ml",
"longest_side": "180 cm",
"to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "good" },
Expand Down Expand Up @@ -178,7 +178,7 @@
"symbol": "/",
"color": "brown",
"looks_like": "spear_steel",
"techniques": [ "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"qualities": [ [ "COOK", 1 ] ],
"use_action": [ "HEAT_SOLID_ITEMS" ],
"flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "FRAGILE_MELEE", "SHEATH_SPEAR" ],
Expand Down Expand Up @@ -213,7 +213,7 @@
"symbol": "/",
"color": "brown",
"looks_like": "spear_steel",
"techniques": [ "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"qualities": [ [ "CUT", 1 ], [ "COOK", 1 ], [ "BUTCHER", -28 ] ],
"use_action": [ "HEAT_SOLID_ITEMS" ],
"flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ],
Expand All @@ -231,7 +231,7 @@
"symbol": "/",
"looks_like": "spear_steel",
"material": [ "steel", "wood" ],
"techniques": [ "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"volume": "1350 ml",
"longest_side": "180 cm",
"to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "good" },
Expand All @@ -258,7 +258,7 @@
"symbol": "/",
"color": "brown",
"looks_like": "spear_steel",
"techniques": [ "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"qualities": [ [ "COOK", 1 ] ],
"use_action": [ "HEAT_SOLID_ITEMS" ],
"flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ],
Expand All @@ -276,7 +276,7 @@
"symbol": "/",
"looks_like": "spear_steel",
"material": [ "steel", "wood" ],
"techniques": [ "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"volume": "1350 ml",
"longest_side": "180 cm",
"to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "good" },
Expand Down Expand Up @@ -319,7 +319,7 @@
"color": "light_red",
"symbol": "/",
"material": [ "copper", "wood" ],
"techniques": [ "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"volume": "1350 ml",
"longest_side": "180 cm",
"to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "good" },
Expand All @@ -340,7 +340,7 @@
"color": "light_gray",
"symbol": "/",
"material": [ "steel", "wood" ],
"techniques": [ "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"volume": "1350 ml",
"longest_side": "180 cm",
"to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "good" },
Expand Down Expand Up @@ -381,7 +381,7 @@
"looks_like": "spear_pipe",
"symbol": "/",
"material": [ "steel" ],
"techniques": [ "WBLOCK_1", "IMPALE" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"volume": "1130 ml",
"longest_side": "180 cm",
"to_hit": { "grip": "solid", "length": "long", "surface": "point", "balance": "neutral" },
Expand All @@ -402,7 +402,7 @@
"color": "light_gray",
"symbol": "/",
"material": [ "steel" ],
"techniques": [ "WBLOCK_1", "IMPALE" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"volume": "1135 ml",
"longest_side": "180 cm",
"to_hit": { "grip": "solid", "length": "long", "surface": "point", "balance": "neutral" },
Expand Down Expand Up @@ -487,7 +487,7 @@
"symbol": "/",
"looks_like": "spear_steel",
"material": [ "steel", "wood" ],
"techniques": [ "WBLOCK_1", "IMPALE" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"volume": "3 L",
"longest_side": "250 cm",
"to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "neutral" },
Expand Down Expand Up @@ -664,7 +664,7 @@
"symbol": "/",
"color": "brown",
"looks_like": "pike",
"techniques": [ "IMPALE", "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"qualities": [ [ "COOK", 1 ] ],
"use_action": [ "HEAT_SOLID_ITEMS" ],
"flags": [ "DURABLE_MELEE", "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
Expand All @@ -687,7 +687,7 @@
"symbol": "/",
"color": "brown",
"looks_like": "pike",
"techniques": [ "IMPALE", "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"qualities": [ [ "COOK", 1 ] ],
"use_action": [ "HEAT_SOLID_ITEMS" ],
"flags": [ "DURABLE_MELEE", "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
Expand All @@ -709,7 +709,7 @@
"symbol": "/",
"color": "brown",
"looks_like": "pike_copper",
"techniques": [ "IMPALE", "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"qualities": [ [ "COOK", 1 ] ],
"use_action": [ "HEAT_SOLID_ITEMS" ],
"flags": [ "DURABLE_MELEE", "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
Expand All @@ -731,7 +731,7 @@
"material": [ "steel", "wood" ],
"symbol": "/",
"color": "brown",
"techniques": [ "IMPALE", "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"qualities": [ [ "COOK", 1 ] ],
"use_action": [ "HEAT_SOLID_ITEMS" ],
"flags": [ "DURABLE_MELEE", "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
Expand Down Expand Up @@ -800,7 +800,7 @@
"material": [ "bronze", "wood" ],
"symbol": "/",
"color": "yellow",
"techniques": [ "WBLOCK_1", "IMPALE" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"qualities": [ [ "COOK", 1 ] ],
"use_action": [ "HEAT_SOLID_ITEMS" ],
"flags": [ "SPEAR", "REACH_ATTACK", "DURABLE_MELEE", "SHEATH_SPEAR", "NONCONDUCTIVE", "POLEARM" ],
Expand All @@ -822,7 +822,7 @@
"symbol": "/",
"color": "yellow",
"looks_like": "spear_dory",
"techniques": [ "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"qualities": [ [ "COOK", 1 ] ],
"use_action": [ "HEAT_SOLID_ITEMS" ],
"flags": [ "SPEAR", "REACH_ATTACK", "DURABLE_MELEE", "SHEATH_SPEAR", "NONCONDUCTIVE" ],
Expand Down Expand Up @@ -886,7 +886,7 @@
"ascii_picture": "spear_stone",
"symbol": "/",
"color": "light_gray",
"techniques": [ "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"qualities": [ [ "COOK", 1 ] ],
"use_action": [ "HEAT_SOLID_ITEMS" ],
"flags": [ "SPEAR", "REACH_ATTACK", "SHEATH_SPEAR" ],
Expand All @@ -909,7 +909,7 @@
"symbol": "/",
"color": "light_gray",
"looks_like": "spear_stone",
"techniques": [ "WBLOCK_1" ],
"techniques": [ "WBLOCK_1", "PENETRATE" ],
"qualities": [ [ "COOK", 1 ] ],
"use_action": [ "HEAT_SOLID_ITEMS" ],
"flags": [ "SPEAR", "REACH_ATTACK", "SHEATH_SPEAR" ],
Expand Down
16 changes: 16 additions & 0 deletions data/json/techniques.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,22 @@
"description": "Attack target and another one behind it, crit only, min 4 melee",
"attack_vectors": [ "vector_null" ]
},
{
"type": "technique",
"id": "PENETRATE",
"name": "Penetrating Strike",
"melee_allowed": true,
"skill_requirements": [ { "name": "melee", "level": 4 } ],
"crit_tec": true,
"mult_bonuses": [
{ "stat": "arpen", "type": "bash", "scale": 1.3 },
{ "stat": "arpen", "type": "cut", "scale": 1.3 },
{ "stat": "arpen", "type": "stab", "scale": 1.3 }
],
"messages": [ "You find a weak spot in %s's armor", "<npcname> finds a weak spot in %s's armor!" ],
"description": "30% armor penetration, crit only, min 4 melee",
"attack_vectors": [ "vector_null" ]
},
{
"type": "technique",
"id": "BRUTAL",
Expand Down

0 comments on commit cf615e3

Please sign in to comment.