Skip to content

Commit

Permalink
Wrist fixes (#57057)
Browse files Browse the repository at this point in the history
  • Loading branch information
Termineitor244 authored Apr 23, 2022
1 parent 9e87626 commit 40b0260
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
12 changes: 6 additions & 6 deletions data/json/items/armor/jewelry.json
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@
"armor": [
{
"encumbrance": 0,
"coverage": 0,
"coverage": 20,
"covers": [ "hand_l", "hand_r" ],
"specifically_covers": [ "hand_wrist_l", "hand_wrist_r" ]
}
Expand Down Expand Up @@ -858,7 +858,7 @@
"sided": true,
"armor": [
{
"encumbrance": 0,
"encumbrance": 20,
"coverage": 0,
"covers": [ "hand_l", "hand_r" ],
"specifically_covers": [ "hand_wrist_l", "hand_wrist_r" ]
Expand Down Expand Up @@ -984,7 +984,7 @@
"color": "yellow",
"sided": true,
"flags": [ "WATCH", "ALARMCLOCK", "FANCY", "BELTED", "FRAGILE", "ALLOWS_NATURAL_ATTACKS", "OVERSIZE" ],
"armor": [ { "coverage": 5, "covers": [ "hand_l", "hand_r" ], "specifically_covers": [ "hand_wrist_l", "hand_wrist_r" ] } ]
"armor": [ { "coverage": 50, "covers": [ "hand_l", "hand_r" ], "specifically_covers": [ "hand_wrist_l", "hand_wrist_r" ] } ]
},
{
"id": "tieclip",
Expand Down Expand Up @@ -2482,7 +2482,7 @@
"color": "red",
"sided": true,
"flags": [ "FANCY", "NO_WEAR_EFFECT" ],
"armor": [ { "coverage": 0, "covers": [ "hand_l", "hand_r" ], "specifically_covers": [ "hand_fingers_l", "hand_fingers_r" ] } ]
"armor": [ { "coverage": 20, "covers": [ "hand_l", "hand_r" ], "specifically_covers": [ "hand_wrist_l", "hand_wrist_r" ] } ]
},
{
"id": "amethyst_gold_bracelet",
Expand Down Expand Up @@ -2614,7 +2614,7 @@
"color": "red",
"sided": true,
"flags": [ "FANCY", "NO_WEAR_EFFECT" ],
"armor": [ { "coverage": 0, "covers": [ "hand_l", "hand_r" ], "specifically_covers": [ "hand_fingers_l", "hand_fingers_r" ] } ]
"armor": [ { "coverage": 20, "covers": [ "hand_l", "hand_r" ], "specifically_covers": [ "hand_wrist_l", "hand_wrist_r" ] } ]
},
{
"id": "amethyst_silver_bracelet",
Expand Down Expand Up @@ -2776,7 +2776,7 @@
"color": "red",
"sided": true,
"flags": [ "FANCY", "BELTED", "NO_WEAR_EFFECT" ],
"armor": [ { "coverage": 0, "covers": [ "hand_l", "hand_r" ], "specifically_covers": [ "hand_wrist_l", "hand_wrist_r" ] } ]
"armor": [ { "coverage": 20, "covers": [ "hand_l", "hand_r" ], "specifically_covers": [ "hand_wrist_l", "hand_wrist_r" ] } ]
},
{
"id": "amethyst_platinum_bracelet",
Expand Down
9 changes: 8 additions & 1 deletion data/json/items/tool/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,14 @@
"material_thickness": 1,
"techniques": [ "WBLOCK_1" ],
"flags": [ "ALLOWS_NATURAL_ATTACKS", "BELT_CLIP", "BELTED", "FRAGILE", "OVERSIZE", "RAIN_PROTECT" ],
"armor": [ { "encumbrance": 40, "coverage": 5, "covers": [ "hand_l", "hand_r" ] } ]
"armor": [
{
"encumbrance": 25,
"coverage": 50,
"covers": [ "hand_l", "hand_r" ],
"specifically_covers": [ "hand_wrist_l", "hand_wrist_r" ]
}
]
},
{
"id": "testflames",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@
"default_magazine": "light_minus_battery_cell"
}
],
"armor": [ { "coverage": 15, "covers": [ "hand_l", "hand_r" ] } ]
"armor": [ { "coverage": 100, "covers": [ "hand_l", "hand_r" ], "specifically_covers": [ "hand_wrist_l", "hand_wrist_r" ] } ]
},
{
"type": "TOOL_ARMOR",
Expand Down

0 comments on commit 40b0260

Please sign in to comment.