From 96097159139cad7661a5d0698f5a02fed2955d59 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sat, 23 Sep 2023 19:27:06 -0500 Subject: [PATCH] Allow steel and superalloy lining for more items (#3228) --- data/json/items/armor/arms_armor.json | 2 ++ data/json/items/armor/boots.json | 1 + data/json/items/armor/cloaks.json | 1 + data/json/items/armor/coats.json | 11 +++++++++++ data/json/items/armor/gloves.json | 4 ++++ data/json/items/armor/helmets.json | 3 +++ data/json/items/armor/legs_armor.json | 5 +++++ data/json/items/armor/legs_clothes.json | 3 +++ data/json/items/armor/masks.json | 2 ++ data/json/items/armor/suits_clothes.json | 4 ++++ data/json/items/armor/suits_protection.json | 2 ++ data/json/items/armor/torso_armor.json | 3 +++ data/json/items/armor/torso_clothes.json | 2 ++ data/json/items/armor/undergarment.json | 1 + 14 files changed, 44 insertions(+) diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json index e1036d965564..9939017eb0b4 100644 --- a/data/json/items/armor/arms_armor.json +++ b/data/json/items/armor/arms_armor.json @@ -244,6 +244,7 @@ "covers": [ "arms" ], "coverage": 30, "material_thickness": 5, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "WATER_FRIENDLY", "BELTED" ] }, { @@ -266,6 +267,7 @@ "warmth": 10, "material_thickness": 3, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "STURDY", "BELTED", "WATER_FRIENDLY" ] } ] diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index 057582940306..3a5e3b9cc9c3 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -81,6 +81,7 @@ "warmth": 35, "material_thickness": 3, "environmental_protection": 8, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] }, { diff --git a/data/json/items/armor/cloaks.json b/data/json/items/armor/cloaks.json index ff16debbe66c..467926fd205b 100644 --- a/data/json/items/armor/cloaks.json +++ b/data/json/items/armor/cloaks.json @@ -224,6 +224,7 @@ "warmth": 35, "material_thickness": 2, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "OUTER" ] }, { diff --git a/data/json/items/armor/coats.json b/data/json/items/armor/coats.json index 36187eb99fab..dceeb33781e3 100644 --- a/data/json/items/armor/coats.json +++ b/data/json/items/armor/coats.json @@ -220,6 +220,7 @@ "warmth": 15, "material_thickness": 2, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "POCKETS", "OUTER" ] }, { @@ -437,6 +438,7 @@ "storage": "1250 ml", "warmth": 25, "material_thickness": 3, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "OUTER", "VARSIZE" ] }, { @@ -481,6 +483,7 @@ "storage": "1 L", "warmth": 35, "material_thickness": 4, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "POCKETS", "OUTER" ] }, { @@ -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" ] }, { @@ -623,6 +627,7 @@ "encumbrance": 10, "warmth": 10, "material_thickness": 3, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "STURDY" ] }, { @@ -643,6 +648,7 @@ "coverage": 80, "warmth": 5, "material_thickness": 2, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "STURDY" ] }, { @@ -686,6 +692,7 @@ "coverage": 80, "warmth": 5, "material_thickness": 2, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "STURDY" ] }, { @@ -868,6 +875,7 @@ "warmth": 15, "material_thickness": 2, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "POCKETS", "OUTER" ] }, { @@ -978,6 +986,7 @@ "warmth": 15, "material_thickness": 2, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "POCKETS", "OUTER" ] }, { @@ -1131,6 +1140,7 @@ "warmth": 15, "material_thickness": 2, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "POCKETS", "OUTER" ] }, { @@ -1278,6 +1288,7 @@ "storage": "2 L", "warmth": 30, "material_thickness": 2, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "POCKETS", "SUPER_FANCY" ] }, { diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json index bb77b6f635ca..5c7fa1f77fdd 100644 --- a/data/json/items/armor/gloves.json +++ b/data/json/items/armor/gloves.json @@ -85,6 +85,7 @@ "warmth": 25, "material_thickness": 4, "environmental_protection": 6, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "STURDY", "WATERPROOF" ] }, { @@ -142,6 +143,7 @@ "warmth": 15, "material_thickness": 3, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "STURDY" ] }, { @@ -164,6 +166,7 @@ "warmth": 15, "material_thickness": 3, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "STURDY" ] }, { @@ -709,6 +712,7 @@ "warmth": 25, "material_thickness": 3, "environmental_protection": 5, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "WATERPROOF", "STURDY" ] }, { diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json index 067f2952b365..5f7e59151f2e 100644 --- a/data/json/items/armor/helmets.json +++ b/data/json/items/armor/helmets.json @@ -495,6 +495,7 @@ "warmth": 35, "material_thickness": 3, "environmental_protection": 4, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "WATERPROOF", "SUN_GLASSES" ] }, { @@ -540,6 +541,7 @@ "warmth": 40, "material_thickness": 3, "environmental_protection": 7, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "STURDY", "WATERPROOF", "SUN_GLASSES" ] }, { @@ -701,6 +703,7 @@ "encumbrance": 20, "warmth": 15, "material_thickness": 3, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "FANCY", "STAB" ] }, { diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json index 0dc31bf6b615..712a955efe36 100644 --- a/data/json/items/armor/legs_armor.json +++ b/data/json/items/armor/legs_armor.json @@ -86,6 +86,7 @@ "encumbrance": 3, "warmth": 10, "material_thickness": 3, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "OUTER" ] }, { @@ -108,6 +109,7 @@ "storage": "500 ml", "warmth": 20, "material_thickness": 2, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE" ] }, { @@ -127,6 +129,7 @@ "covers": [ "legs" ], "coverage": 30, "material_thickness": 5, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "WATER_FRIENDLY", "BELTED" ] }, { @@ -278,6 +281,7 @@ "warmth": 12, "material_thickness": 3, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "RAINPROOF", "STURDY" ] }, { @@ -300,6 +304,7 @@ "warmth": 35, "material_thickness": 3, "environmental_protection": 2, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "WATERPROOF" ] }, { diff --git a/data/json/items/armor/legs_clothes.json b/data/json/items/armor/legs_clothes.json index 9f931d1b76c5..37bd04cb8873 100644 --- a/data/json/items/armor/legs_clothes.json +++ b/data/json/items/armor/legs_clothes.json @@ -141,6 +141,7 @@ "storage": "500 ml", "warmth": 10, "material_thickness": 3, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "POCKETS" ] }, { @@ -164,6 +165,7 @@ "storage": "500 ml", "warmth": 10, "material_thickness": 3, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "POCKETS", "FANCY" ] }, { @@ -361,6 +363,7 @@ "storage": "2500 ml", "warmth": 20, "material_thickness": 2, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "POCKETS" ] }, { diff --git a/data/json/items/armor/masks.json b/data/json/items/armor/masks.json index 2b8b4c96dd18..6b719727f4e3 100644 --- a/data/json/items/armor/masks.json +++ b/data/json/items/armor/masks.json @@ -169,6 +169,7 @@ "warmth": 5, "material_thickness": 1, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "WATER_FRIENDLY" ] }, { @@ -193,6 +194,7 @@ "warmth": 5, "material_thickness": 3, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "WATER_FRIENDLY", "STURDY" ] }, { diff --git a/data/json/items/armor/suits_clothes.json b/data/json/items/armor/suits_clothes.json index 32d72c56292d..053893911ab1 100644 --- a/data/json/items/armor/suits_clothes.json +++ b/data/json/items/armor/suits_clothes.json @@ -20,6 +20,7 @@ "warmth": 30, "material_thickness": 2, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "SKINTIGHT" ] }, { @@ -67,6 +68,7 @@ "warmth": 50, "material_thickness": 5, "environmental_protection": 2, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "OUTER" ] }, { @@ -187,6 +189,7 @@ "warmth": 50, "material_thickness": 7, "environmental_protection": 2, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "OUTER" ] }, { @@ -208,6 +211,7 @@ "encumbrance": 20, "warmth": 50, "material_thickness": 3, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE" ] }, { diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index e30b6d2c580c..86c5c8638bdf 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -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" ] }, @@ -707,6 +708,7 @@ "storage": "2500 ml", "warmth": 25, "material_thickness": 2, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "FANCY", "POCKETS" ] }, { diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json index a1ed7f388dc7..dc5fa5791b02 100644 --- a/data/json/items/armor/torso_armor.json +++ b/data/json/items/armor/torso_armor.json @@ -40,6 +40,7 @@ "encumbrance": 20, "warmth": 20, "material_thickness": 8, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "STURDY" ] }, { @@ -329,6 +330,7 @@ "warmth": 15, "material_thickness": 4, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "WATERPROOF", "RAINPROOF", "STURDY" ] }, { @@ -353,6 +355,7 @@ "warmth": 35, "material_thickness": 4, "environmental_protection": 2, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "WATERPROOF" ] }, { diff --git a/data/json/items/armor/torso_clothes.json b/data/json/items/armor/torso_clothes.json index 5eb4bdd58178..c5a0bdba2344 100644 --- a/data/json/items/armor/torso_clothes.json +++ b/data/json/items/armor/torso_clothes.json @@ -20,6 +20,7 @@ "warmth": 15, "material_thickness": 3, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "POCKETS", "BELTED", "WATER_FRIENDLY" ] }, { @@ -234,6 +235,7 @@ "storage": "2250 ml", "warmth": 30, "material_thickness": 3, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "OUTER", "POCKETS", "HOOD" ] }, { diff --git a/data/json/items/armor/undergarment.json b/data/json/items/armor/undergarment.json index 15409eda6e07..261fa5e89047 100644 --- a/data/json/items/armor/undergarment.json +++ b/data/json/items/armor/undergarment.json @@ -328,6 +328,7 @@ "warmth": 25, "material_thickness": 3, "environmental_protection": 1, + "valid_mods": [ "steel_padded", "alloy_padded" ], "flags": [ "VARSIZE", "FANCY", "SKINTIGHT" ] }, {