Skip to content

Commit

Permalink
Allow steel and superalloy lining for more items (#3228)
Browse files Browse the repository at this point in the history
  • Loading branch information
chaosvolt authored Sep 24, 2023
1 parent 7ac04c1 commit 9609715
Show file tree
Hide file tree
Showing 14 changed files with 44 additions and 0 deletions.
2 changes: 2 additions & 0 deletions data/json/items/armor/arms_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@
"covers": [ "arms" ],
"coverage": 30,
"material_thickness": 5,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "WATER_FRIENDLY", "BELTED" ]
},
{
Expand All @@ -266,6 +267,7 @@
"warmth": 10,
"material_thickness": 3,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "STURDY", "BELTED", "WATER_FRIENDLY" ]
}
]
1 change: 1 addition & 0 deletions data/json/items/armor/boots.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
"warmth": 35,
"material_thickness": 3,
"environmental_protection": 8,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
},
{
Expand Down
1 change: 1 addition & 0 deletions data/json/items/armor/cloaks.json
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@
"warmth": 35,
"material_thickness": 2,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "OUTER" ]
},
{
Expand Down
11 changes: 11 additions & 0 deletions data/json/items/armor/coats.json
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@
"warmth": 15,
"material_thickness": 2,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "POCKETS", "OUTER" ]
},
{
Expand Down Expand Up @@ -437,6 +438,7 @@
"storage": "1250 ml",
"warmth": 25,
"material_thickness": 3,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "OUTER", "VARSIZE" ]
},
{
Expand Down Expand Up @@ -481,6 +483,7 @@
"storage": "1 L",
"warmth": 35,
"material_thickness": 4,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "POCKETS", "OUTER" ]
},
{
Expand Down Expand Up @@ -509,6 +512,7 @@
"text": "A jacket made from denim. Provides decent protection from cuts. This one is haphazardly covered with patches featuring metal band logos."
}
],
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "POCKETS", "OUTER" ]
},
{
Expand Down Expand Up @@ -623,6 +627,7 @@
"encumbrance": 10,
"warmth": 10,
"material_thickness": 3,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "STURDY" ]
},
{
Expand All @@ -643,6 +648,7 @@
"coverage": 80,
"warmth": 5,
"material_thickness": 2,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "STURDY" ]
},
{
Expand Down Expand Up @@ -686,6 +692,7 @@
"coverage": 80,
"warmth": 5,
"material_thickness": 2,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "STURDY" ]
},
{
Expand Down Expand Up @@ -868,6 +875,7 @@
"warmth": 15,
"material_thickness": 2,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "POCKETS", "OUTER" ]
},
{
Expand Down Expand Up @@ -978,6 +986,7 @@
"warmth": 15,
"material_thickness": 2,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "POCKETS", "OUTER" ]
},
{
Expand Down Expand Up @@ -1131,6 +1140,7 @@
"warmth": 15,
"material_thickness": 2,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "POCKETS", "OUTER" ]
},
{
Expand Down Expand Up @@ -1278,6 +1288,7 @@
"storage": "2 L",
"warmth": 30,
"material_thickness": 2,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "POCKETS", "SUPER_FANCY" ]
},
{
Expand Down
4 changes: 4 additions & 0 deletions data/json/items/armor/gloves.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"warmth": 25,
"material_thickness": 4,
"environmental_protection": 6,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "STURDY", "WATERPROOF" ]
},
{
Expand Down Expand Up @@ -142,6 +143,7 @@
"warmth": 15,
"material_thickness": 3,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "STURDY" ]
},
{
Expand All @@ -164,6 +166,7 @@
"warmth": 15,
"material_thickness": 3,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "STURDY" ]
},
{
Expand Down Expand Up @@ -709,6 +712,7 @@
"warmth": 25,
"material_thickness": 3,
"environmental_protection": 5,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "WATERPROOF", "STURDY" ]
},
{
Expand Down
3 changes: 3 additions & 0 deletions data/json/items/armor/helmets.json
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@
"warmth": 35,
"material_thickness": 3,
"environmental_protection": 4,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "WATERPROOF", "SUN_GLASSES" ]
},
{
Expand Down Expand Up @@ -540,6 +541,7 @@
"warmth": 40,
"material_thickness": 3,
"environmental_protection": 7,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "STURDY", "WATERPROOF", "SUN_GLASSES" ]
},
{
Expand Down Expand Up @@ -701,6 +703,7 @@
"encumbrance": 20,
"warmth": 15,
"material_thickness": 3,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "FANCY", "STAB" ]
},
{
Expand Down
5 changes: 5 additions & 0 deletions data/json/items/armor/legs_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
"encumbrance": 3,
"warmth": 10,
"material_thickness": 3,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "OUTER" ]
},
{
Expand All @@ -108,6 +109,7 @@
"storage": "500 ml",
"warmth": 20,
"material_thickness": 2,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE" ]
},
{
Expand All @@ -127,6 +129,7 @@
"covers": [ "legs" ],
"coverage": 30,
"material_thickness": 5,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "WATER_FRIENDLY", "BELTED" ]
},
{
Expand Down Expand Up @@ -278,6 +281,7 @@
"warmth": 12,
"material_thickness": 3,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "RAINPROOF", "STURDY" ]
},
{
Expand All @@ -300,6 +304,7 @@
"warmth": 35,
"material_thickness": 3,
"environmental_protection": 2,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "WATERPROOF" ]
},
{
Expand Down
3 changes: 3 additions & 0 deletions data/json/items/armor/legs_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
"storage": "500 ml",
"warmth": 10,
"material_thickness": 3,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "POCKETS" ]
},
{
Expand All @@ -164,6 +165,7 @@
"storage": "500 ml",
"warmth": 10,
"material_thickness": 3,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "POCKETS", "FANCY" ]
},
{
Expand Down Expand Up @@ -361,6 +363,7 @@
"storage": "2500 ml",
"warmth": 20,
"material_thickness": 2,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "POCKETS" ]
},
{
Expand Down
2 changes: 2 additions & 0 deletions data/json/items/armor/masks.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
"warmth": 5,
"material_thickness": 1,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "WATER_FRIENDLY" ]
},
{
Expand All @@ -193,6 +194,7 @@
"warmth": 5,
"material_thickness": 3,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "WATER_FRIENDLY", "STURDY" ]
},
{
Expand Down
4 changes: 4 additions & 0 deletions data/json/items/armor/suits_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"warmth": 30,
"material_thickness": 2,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "SKINTIGHT" ]
},
{
Expand Down Expand Up @@ -67,6 +68,7 @@
"warmth": 50,
"material_thickness": 5,
"environmental_protection": 2,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "OUTER" ]
},
{
Expand Down Expand Up @@ -187,6 +189,7 @@
"warmth": 50,
"material_thickness": 7,
"environmental_protection": 2,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "OUTER" ]
},
{
Expand All @@ -208,6 +211,7 @@
"encumbrance": 20,
"warmth": 50,
"material_thickness": 3,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE" ]
},
{
Expand Down
2 changes: 2 additions & 0 deletions data/json/items/armor/suits_protection.json
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,7 @@
"storage": "7500 ml",
"warmth": 15,
"material_thickness": 4,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"environmental_protection": 3,
"flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ]
},
Expand Down Expand Up @@ -707,6 +708,7 @@
"storage": "2500 ml",
"warmth": 25,
"material_thickness": 2,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "FANCY", "POCKETS" ]
},
{
Expand Down
3 changes: 3 additions & 0 deletions data/json/items/armor/torso_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"encumbrance": 20,
"warmth": 20,
"material_thickness": 8,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "STURDY" ]
},
{
Expand Down Expand Up @@ -329,6 +330,7 @@
"warmth": 15,
"material_thickness": 4,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "STURDY" ]
},
{
Expand All @@ -353,6 +355,7 @@
"warmth": 35,
"material_thickness": 4,
"environmental_protection": 2,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "WATERPROOF" ]
},
{
Expand Down
2 changes: 2 additions & 0 deletions data/json/items/armor/torso_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"warmth": 15,
"material_thickness": 3,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "POCKETS", "BELTED", "WATER_FRIENDLY" ]
},
{
Expand Down Expand Up @@ -234,6 +235,7 @@
"storage": "2250 ml",
"warmth": 30,
"material_thickness": 3,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "OUTER", "POCKETS", "HOOD" ]
},
{
Expand Down
1 change: 1 addition & 0 deletions data/json/items/armor/undergarment.json
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@
"warmth": 25,
"material_thickness": 3,
"environmental_protection": 1,
"valid_mods": [ "steel_padded", "alloy_padded" ],
"flags": [ "VARSIZE", "FANCY", "SKINTIGHT" ]
},
{
Expand Down

0 comments on commit 9609715

Please sign in to comment.