Skip to content

Commit

Permalink
Riot armor nerf (#62395)
Browse files Browse the repository at this point in the history
* balence

* small

* Update data/json/items/armor/suits_protection.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* lint

* tests

* Revert "tests"

This reverts commit 5cba5bd.

* back to 2 on limb lowers

* 1.75

* 85 -> 80 coverage

* back to 2 for limbs

* tests

* tests

* Update data/json/items/armor/suits_protection.json

Co-authored-by: I-am-Erk <[email protected]>

* Update data/json/items/armor/torso_armor.json

Co-authored-by: I-am-Erk <[email protected]>

* values

* Update data/json/items/armor/torso_armor.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* less coverage

* coverage

* coverage

* enc

* lower thickness

* 1.75 mm

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: I-am-Erk <[email protected]>
  • Loading branch information
3 people authored Dec 8, 2022
1 parent 6e4b17f commit 04ce720
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 29 deletions.
4 changes: 2 additions & 2 deletions data/json/items/armor/arms_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -1704,8 +1704,8 @@
"encumbrance": 3,
"coverage": 90,
"material": [
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
{ "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 5 },
{ "type": "thermo_resin", "covered_by_mat": 90, "thickness": 1.75 }
],
"specifically_covers": [ "arm_lower_l", "arm_lower_r", "arm_elbow_l", "arm_elbow_r" ]
}
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/armor/legs_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -1639,8 +1639,8 @@
"encumbrance": 3,
"coverage": 90,
"material": [
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
{ "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 5 },
{ "type": "thermo_resin", "covered_by_mat": 90, "thickness": 1.75 }
],
"specifically_covers": [ "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r" ]
},
Expand Down
25 changes: 11 additions & 14 deletions data/json/items/armor/suits_protection.json
Original file line number Diff line number Diff line change
Expand Up @@ -1377,30 +1377,30 @@
"use_action": [ { "type": "attach_molle", "size": 6 }, { "type": "detach_molle" } ],
"armor": [
{
"encumbrance": 7,
"coverage": 95,
"encumbrance": 6,
"coverage": 75,
"covers": [ "torso" ],
"material": [
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 8 },
{ "type": "thermo_resin", "covered_by_mat": 85, "thickness": 2.5 }
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 7 },
{ "type": "thermo_resin", "covered_by_mat": 90, "thickness": 1.75 }
]
},
{
"covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
"encumbrance": 4,
"coverage": 90,
"material": [
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
{ "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 5 },
{ "type": "thermo_resin", "covered_by_mat": 90, "thickness": 1.75 }
],
"specifically_covers": [ "arm_lower_l", "arm_lower_r", "arm_elbow_l", "arm_elbow_r", "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r" ]
},
{
"covers": [ "arm_l", "arm_r", "leg_l", "leg_r", "foot_l", "foot_r" ],
"coverage": 85,
"coverage": 65,
"material": [
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
{ "type": "thermo_resin", "covered_by_mat": 85, "thickness": 1.5 }
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 5 },
{ "type": "thermo_resin", "covered_by_mat": 90, "thickness": 1.5 }
],
"specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r", "leg_upper_l", "leg_upper_r" ]
},
Expand All @@ -1413,11 +1413,8 @@
},
{
"covers": [ "leg_l", "leg_r" ],
"coverage": 95,
"material": [
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
{ "type": "thermo_resin", "covered_by_mat": 20, "thickness": 1.5 }
],
"coverage": 30,
"material": [ { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 7 } ],
"specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
}
]
Expand Down
19 changes: 8 additions & 11 deletions data/json/items/armor/torso_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -2069,31 +2069,28 @@
"use_action": [ { "type": "attach_molle", "size": 6 }, { "type": "detach_molle" } ],
"armor": [
{
"encumbrance": 7,
"coverage": 95,
"encumbrance": 6,
"coverage": 75,
"covers": [ "torso" ],
"material": [
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 8 },
{ "type": "thermo_resin", "covered_by_mat": 85, "thickness": 2.5 }
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 7 },
{ "type": "thermo_resin", "covered_by_mat": 90, "thickness": 2 }
]
},
{
"covers": [ "arm_l", "arm_r", "leg_l", "leg_r" ],
"encumbrance": 2,
"coverage": 85,
"coverage": 65,
"material": [
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
{ "type": "thermo_resin", "covered_by_mat": 85, "thickness": 1.5 }
{ "type": "thermo_resin", "covered_by_mat": 90, "thickness": 1.5 }
],
"specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r", "leg_upper_l", "leg_upper_r" ]
},
{
"covers": [ "leg_l", "leg_r" ],
"coverage": 100,
"material": [
{ "type": "plastic_pad", "covered_by_mat": 100, "thickness": 6 },
{ "type": "thermo_resin", "covered_by_mat": 20, "thickness": 1.5 }
],
"coverage": 30,
"material": [ { "type": "plastic_pad", "covered_by_mat": 100, "thickness": 7 } ],
"specifically_covers": [ "leg_hip_l", "leg_hip_r" ]
}
]
Expand Down

0 comments on commit 04ce720

Please sign in to comment.