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

Adds fragile melee flag to fake weapons and chainsaws #39959

Merged
merged 2 commits into from
Apr 27, 2020
Merged

Adds fragile melee flag to fake weapons and chainsaws #39959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24da506
Adds fragile melee flag to fake weapons and chainsaws
Brian-Otten Apr 27, 2020
aad2554
Apply suggestions from code review
kevingranade Apr 27, 2020
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
11 changes: 6 additions & 5 deletions data/json/items/melee/bludgeons.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
"price": 1050,
"price_postapoc": 500,
"material": [ "aluminum", "wood" ],
"flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ],
"flags": [ "NONCONDUCTIVE", "SHEATH_AXE", "FRAGILE_MELEE" ],
"techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
"weight": "2068 g",
"volume": "3250 ml",
Expand Down Expand Up @@ -228,7 +228,7 @@
"price_postapoc": 500,
"material": "wood",
"techniques": [ "RAPID", "WBLOCK_2", "SWEEP" ],
"flags": [ "SHEATH_SWORD" ],
"flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ],
"weight": "680 g",
"volume": "2 L",
"bashing": 13,
Expand Down Expand Up @@ -596,7 +596,7 @@
"price": 4000,
"price_postapoc": 500,
"material": [ "wood", "aluminum" ],
"flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "SPEAR", "ALWAYS_TWOHAND" ],
"flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "SPEAR", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ],
"techniques": [ "WBLOCK_1", "SWEEP" ],
"weight": "2700 g",
"volume": "3750 ml",
Expand Down Expand Up @@ -636,7 +636,7 @@
"looks_like": "mace",
"material": [ "aluminum", "wood" ],
"techniques": [ "SWEEP" ],
"flags": [ "NONCONDUCTIVE" ],
"flags": [ "NONCONDUCTIVE", "FRAGILE_MELEE" ],
"volume": "1250 ml",
"bashing": 15,
"price": 10000,
Expand Down Expand Up @@ -730,7 +730,7 @@
"volume": "1500 ml",
"bashing": 26,
"cutting": 1,
"flags": [ "SPEAR", "NONCONDUCTIVE" ],
"flags": [ "SPEAR", "NONCONDUCTIVE", "FRAGILE_MELEE" ],
"price": 12000,
"price_postapoc": 500
},
Expand Down Expand Up @@ -941,6 +941,7 @@
"price": 2500,
"material": "wood",
"techniques": [ "WBLOCK_1", "SWEEP" ],
"flags": [ "FRAGILE_MELEE" ],
"weight": "850 g",
"volume": "1500 ml",
"bashing": 26,
Expand Down
6 changes: 3 additions & 3 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 @@ -291,7 +291,7 @@
"description": "This is a dull, cheaply made replica of a polearm with an axe blade, a spike, and other fun things attached to a long stick.",
"price": 5000,
"material": [ "wood", "aluminum" ],
"flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
"flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ],
"techniques": [ "WBLOCK_1", "SWEEP" ],
"weight": "1644 g",
"volume": "3750 ml",
Expand Down Expand Up @@ -369,7 +369,7 @@
"bashing": 12,
"cutting": 2,
"to_hit": 1,
"flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
"flags": [ "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ],
"price": 8000,
"price_postapoc": 500
},
Expand Down Expand Up @@ -510,7 +510,7 @@
"looks_like": "pike",
"techniques": [ "IMPALE", "WBLOCK_1" ],
"qualities": [ [ "COOK", 1 ] ],
"flags": [ "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ]
"flags": [ "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ]
},
{
"id": "pike_inferior",
Expand Down
34 changes: 17 additions & 17 deletions data/json/items/melee/swords_and_blades.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@
"price": 10000,
"price_postapoc": 50,
"material": "aluminum",
"flags": [ "SHEATH_SWORD" ],
"flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ],
"techniques": [ "WBLOCK_2" ],
"weight": "414 g",
"volume": "2 L",
Expand Down Expand Up @@ -455,7 +455,7 @@
"price_postapoc": 50,
"material": "aluminum",
"techniques": [ "WBLOCK_2" ],
"flags": [ "SHEATH_SWORD" ],
"flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ],
"weight": "586 g",
"volume": "2 L",
"bashing": 6,
Expand Down Expand Up @@ -512,7 +512,7 @@
"price_postapoc": 50,
"material": "aluminum",
"techniques": [ "WBLOCK_2", "PRECISE" ],
"flags": [ "SHEATH_SWORD" ],
"flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ],
"weight": "939 g",
"volume": "2750 ml",
"bashing": 13,
Expand Down Expand Up @@ -570,7 +570,7 @@
"price": 13000,
"price_postapoc": 100,
"material": "aluminum",
"flags": [ "SHEATH_SWORD" ],
"flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ],
"techniques": [ "WBLOCK_2" ],
"weight": "939 g",
"volume": "2750 ml",
Expand Down Expand Up @@ -610,7 +610,7 @@
"price": 10000,
"price_postapoc": 50,
"material": "aluminum",
"flags": [ "SHEATH_SWORD" ],
"flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ],
"techniques": [ "WBLOCK_2" ],
"weight": "704 g",
"volume": "2 L",
Expand Down Expand Up @@ -871,7 +871,7 @@
"looks_like": "tanto",
"techniques": "RAPID",
"qualities": [ [ "CUT", 1 ], [ "BUTCHER", 5 ] ],
"flags": [ "STAB", "SHEATH_KNIFE" ]
"flags": [ "STAB", "SHEATH_KNIFE", "FRAGILE_MELEE" ]
},
{
"id": "tanto_inferior",
Expand Down Expand Up @@ -924,7 +924,7 @@
"price": 15000,
"price_postapoc": 250,
"material": "aluminum",
"flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND" ],
"flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ],
"techniques": [ "WBLOCK_1", "RAPID", "WIDE" ],
"weight": "1882 g",
"volume": "3250 ml",
Expand Down Expand Up @@ -1185,7 +1185,7 @@
"price_postapoc": 50,
"material": "aluminum",
"techniques": "WBLOCK_2",
"flags": [ "SHEATH_SWORD" ],
"flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ],
"weight": "634 g",
"volume": "1750 ml",
"bashing": 12,
Expand Down Expand Up @@ -1263,7 +1263,7 @@
"price_postapoc": 50,
"material": "aluminum",
"techniques": [ "RAPID", "WBLOCK_2" ],
"flags": [ "SHEATH_SWORD" ],
"flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ],
"weight": "753 g",
"volume": "2 L",
"bashing": 11,
Expand Down Expand Up @@ -1301,7 +1301,7 @@
"price": 8000,
"price_postapoc": 50,
"material": "aluminum",
"flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND" ],
"flags": [ "SHEATH_SWORD", "ALWAYS_TWOHAND", "FRAGILE_MELEE" ],
"techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
"weight": "3176 g",
"volume": "3250 ml",
Expand Down Expand Up @@ -1340,7 +1340,7 @@
"price": 12000,
"price_postapoc": 50,
"material": "aluminum",
"flags": [ "SHEATH_SWORD" ],
"flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ],
"techniques": "WBLOCK_2",
"weight": "753 g",
"volume": "1750 ml",
Expand All @@ -1366,7 +1366,7 @@
"symbol": "/",
"color": "dark_gray",
"techniques": [ "WBLOCK_2", "RAPID" ],
"flags": [ "SHEATH_SWORD" ]
"flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ]
},
{
"id": "rapier_fake",
Expand All @@ -1379,7 +1379,7 @@
"price_postapoc": 50,
"material": "aluminum",
"techniques": [ "RAPID", "WBLOCK_2", "PRECISE" ],
"flags": [ "SHEATH_SWORD" ],
"flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ],
"weight": "660 g",
"volume": "1500 ml",
"bashing": 4,
Expand All @@ -1398,7 +1398,7 @@
"price_postapoc": 50,
"material": "aluminum",
"techniques": [ "RAPID", "WBLOCK_2" ],
"flags": [ "SHEATH_SWORD" ],
"flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ],
"weight": "557 g",
"volume": "1500 ml",
"bashing": 8,
Expand Down Expand Up @@ -1441,7 +1441,7 @@
"volume": "750 ml",
"bashing": 2,
"cutting": 2,
"flags": [ "SHEATH_SWORD" ],
"flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ],
"to_hit": 1,
"category": "weapons"
},
Expand Down Expand Up @@ -1502,7 +1502,7 @@
"turns_per_charge": 1,
"charges_per_use": 0,
"qualities": [ [ "AXE", 3 ], [ "BUTCHER", -250 ] ],
"flags": [ "MESSY", "HURT_WHEN_PULLED", "DURABLE_MELEE", "TRADER_AVOID", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ]
"flags": [ "MESSY", "HURT_WHEN_PULLED", "FRAGILE_MELEE", "TRADER_AVOID", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ]
},
{
"id": "ecs_lajatang_off",
Expand Down Expand Up @@ -1541,7 +1541,7 @@
"charges_per_use": 0,
"revert_to": "ecs_lajatang_off",
"use_action": "ECS_LAJATANG_ON",
"flags": [ "MESSY", "HURT_WHEN_PULLED", "DURABLE_MELEE", "TRADER_AVOID", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
"flags": [ "MESSY", "HURT_WHEN_PULLED", "FRAGILE_MELEE", "TRADER_AVOID", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
"magazine_well": 4
},
{
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/woodworking.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"techniques": "SWEEP",
"qualities": [ [ "AXE", 4 ], [ "BUTCHER", -100 ] ],
"use_action": "CHAINSAW_ON",
"flags": [ "MESSY", "TRADER_AVOID", "NONCONDUCTIVE", "POWERED" ]
"flags": [ "MESSY", "TRADER_AVOID", "NONCONDUCTIVE", "POWERED", "FRAGILE_MELEE" ]
},
{
"id": "circsaw_off",
Expand Down Expand Up @@ -180,7 +180,7 @@
"revert_to": "elec_chainsaw_off",
"qualities": [ [ "AXE", 4 ], [ "BUTCHER", -100 ] ],
"use_action": "ELEC_CHAINSAW_ON",
"flags": [ "MESSY", "TRADER_AVOID", "NONCONDUCTIVE", "POWERED" ],
"flags": [ "MESSY", "TRADER_AVOID", "NONCONDUCTIVE", "POWERED", "FRAGILE_MELEE" ],
"magazine_well": 2
},
{
Expand Down