From 57806860efba9df01e38af2eddc863a1f9d9503f Mon Sep 17 00:00:00 2001 From: FuelType-Memes Date: Sun, 22 Dec 2019 14:53:33 +0300 Subject: [PATCH 1/8] Add ankle socks --- data/json/itemgroups/clothing.json | 7 +++++-- data/json/itemgroups/item_groups.json | 7 +++++-- data/json/itemgroups/locations.json | 1 + data/json/items/armor.json | 19 +++++++++++++++++++ data/json/npcs/items_generic.json | 5 +++-- data/json/professions.json | 18 +++++++++--------- data/json/recipes/armor/feet.json | 11 +++++++++++ 7 files changed, 53 insertions(+), 15 deletions(-) diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index c9bd632092ddd..319f08aec5c0c 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -921,6 +921,7 @@ [ "snuggie", 5 ], [ "flyer", 10 ], [ "socks", 70 ], + [ "socks_ankle", 50 ], [ "socks_wool", 30 ], [ "pocketwatch", 5 ], [ "flask_hip", 2 ], @@ -966,6 +967,7 @@ "items": [ [ "sneakers", 80 ], [ "socks", 70 ], + [ "socks_ankle", 50 ], [ "tights", 20 ], [ "stockings", 20 ], [ "knee_high_boots", 20 ], @@ -1253,7 +1255,7 @@ { "type": "item_group", "id": "shoestore_accessories", - "items": [ [ "socks", 100 ], [ "thermal_socks", 25 ], [ "socks_wool", 50 ], [ "string_36", 200 ] ] + "items": [ [ "socks", 100 ], [ "socks_ankle", 75 ], [ "thermal_socks", 25 ], [ "socks_wool", 50 ], [ "string_36", 200 ] ] }, { "type": "item_group", @@ -2377,6 +2379,7 @@ [ "boy_shorts", 25 ], [ "bra", 25 ], [ "socks", 45 ], + [ "socks_ankle", 30 ], [ "stockings", 20 ], [ "hat_cotton", 35 ], [ "copper_bracelet", 10 ], @@ -2576,7 +2579,7 @@ "type": "item_group", "//": "unisex socks", "subtype": "distribution", - "items": [ { "item": "socks", "prob": 70 }, { "item": "socks_wool", "prob": 30 }, { "item": "thermal_socks", "prob": 10 } ] + "items": [ { "item": "socks", "prob": 70 }, { "item": "socks_ankle", "prob": 50 }, { "item": "socks_wool", "prob": 30 }, { "item": "thermal_socks", "prob": 10 } ] }, { "id": "scarfs_unisex", diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index 98e30a2f5d352..807d559c0a10a 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -740,6 +740,7 @@ [ "tieclip", 3 ], [ "collarpin", 3 ], [ "socks", 70 ], + [ "socks_ankle", 50 ], [ "briefcase", 5 ], [ "mocassins", 5 ], [ "boots_western", 4 ], @@ -1265,7 +1266,8 @@ [ "football_armor", 10 ], [ "helmet_football", 10 ], [ "sneakers", 80 ], - [ "socks", 70 ], + [ "socks", 50 ], + [ "socks_ankle", 70 ], [ "stockings", 20 ], [ "tshirt", 80 ], [ "longshirt", 70 ], @@ -1555,7 +1557,8 @@ [ "disc_golf", 10 ], [ "basketball", 20 ], [ "sneakers", 80 ], - [ "socks", 70 ], + [ "socks", 50 ], + [ "socks_ankle", 70 ], [ "tshirt", 80 ], [ "longshirt", 50 ], [ "tank_top", 50 ], diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json index d56b6023cadd9..a4f7ab3ea5171 100644 --- a/data/json/itemgroups/locations.json +++ b/data/json/itemgroups/locations.json @@ -2704,6 +2704,7 @@ [ "coat_lab", 40 ], [ "boots_steel", 5 ], [ "socks", 70 ], + [ "socks_ankle", 50 ], [ "mocassins", 20 ], [ "bandana", 35 ], [ "glasses_eye", 90 ], diff --git a/data/json/items/armor.json b/data/json/items/armor.json index c26e39682a163..2e97eed1a883b 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -8291,6 +8291,25 @@ "material_thickness": 1, "flags": [ "VARSIZE", "SKINTIGHT" ] }, + { + "id": "socks_ankle", + "type": "ARMOR", + "name": "pair of ankle socks", + "name_plural": "pairs of ankle socks", + "description": "Short socks, commonly used for sports. These are designed to protect your feet from friction, not temperature", + "weight": "25 g", + "volume": "200 ml", + "price": 100, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "socks", + "color": "light_gray", + "covers": [ "FEET" ], + "coverage": 80, + "warmth": 0, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT" ] + }, { "id": "socks_bag", "type": "ARMOR", diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json index ac7a201b27a6b..c68493e638455 100644 --- a/data/json/npcs/items_generic.json +++ b/data/json/npcs/items_generic.json @@ -26,12 +26,12 @@ { "type": "item_group", "id": "npc_underwear_feet_male", - "items": [ [ "socks", 80 ], [ "socks_wool", 20 ], [ "null", 5 ] ] + "items": [ [ "socks", 80 ], [ "socks_ankle", 60 ], [ "socks_wool", 20 ], [ "null", 5 ] ] }, { "type": "item_group", "id": "npc_underwear_feet_female", - "items": [ [ "socks", 50 ], [ "socks_wool", 10 ], [ "stockings", 20 ], [ "tights", 20 ], [ "null", 5 ] ] + "items": [ [ "socks", 50 ], [ "socks_ankle", 30 ], [ "socks_wool", 10 ], [ "stockings", 20 ], [ "tights", 20 ], [ "null", 5 ] ] }, { "type": "item_group", @@ -1008,6 +1008,7 @@ [ "smrifle_primer", 2 ], [ "soap", 10 ], [ "socks", 10 ], + [ "socks_ankle", 10 ], [ "socks_wool", 10 ], [ "solder_wire", 5 ], [ "soldering_iron", 5 ], diff --git a/data/json/professions.json b/data/json/professions.json index 5bbe9d7edec91..c2abf199a61b8 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -586,7 +586,7 @@ "skills": [ { "level": 2, "name": "dodge" }, { "level": 3, "name": "throw" } ], "items": { "both": { - "items": [ "tank_top", "jersey", "b_shorts", "socks", "sneakers", "basketball", "sports_drink" ], + "items": [ "tank_top", "jersey", "b_shorts", "socks_ankle", "sneakers", "basketball", "sports_drink" ], "entries": [ { "group": "charged_cell_phone" } ] }, "male": [ "boxer_shorts" ], @@ -638,7 +638,7 @@ "folding_bicycle", "under_armor_shorts", "under_armor", - "socks", + "socks_ankle", "sneakers", "sports_drink", "wristwatch", @@ -1687,7 +1687,7 @@ "CBMs": [ "bio_str_enhancer", "bio_adrenaline", "bio_hydraulics", "bio_metabolics", "bio_power_storage_mkII" ], "items": { "both": [ - "socks", + "socks_ankle", "under_armor_shorts", "under_armor", "tshirt", @@ -1711,7 +1711,7 @@ "CBMs": [ "bio_adrenaline", "bio_torsionratchet", "bio_power_storage_mkII", "bio_jointservo" ], "items": { "both": [ - "socks", + "socks_ankle", "under_armor_shorts", "under_armor", "tshirt", @@ -2677,7 +2677,7 @@ "description": "You were on your way to the dojo for your first lesson when the world ended. And you really wanted to learn how to swim, too.", "points": -1, "items": { - "both": [ "karate_gi", "judo_belt_white", "mouthpiece", "socks", "sneakers" ], + "both": [ "karate_gi", "judo_belt_white", "mouthpiece", "socks_ankle", "sneakers" ], "male": [ "boxer_shorts" ], "female": [ "sports_bra", "boy_shorts" ] } @@ -2691,7 +2691,7 @@ "traits": [ "PROF_MA_ORANGE" ], "skills": [ { "level": 2, "name": "melee" }, { "level": 2, "name": "unarmed" }, { "level": 2, "name": "dodge" } ], "items": { - "both": [ "karate_gi", "judo_belt_orange", "mouthpiece", "socks", "sneakers" ], + "both": [ "karate_gi", "judo_belt_orange", "mouthpiece", "socks_ankle", "sneakers" ], "male": [ "boxer_shorts" ], "female": [ "sports_bra", "boy_shorts" ] } @@ -3329,7 +3329,7 @@ "skills": [ { "level": 1, "name": "dodge" }, { "level": 1, "name": "throw" } ], "items": { "both": { - "items": [ "tshirt", "jacket_light", "jeans", "socks", "lowtops", "slingpack", "juice" ], + "items": [ "tshirt", "jacket_light", "jeans", "socks_ankle", "lowtops", "slingpack", "juice" ], "entries": [ { "group": "charged_cell_phone" } ] }, "male": [ "briefs" ], @@ -3432,7 +3432,7 @@ "skills": [ { "level": 2, "name": "dodge" }, { "level": 2, "name": "speech" } ], "items": { "both": { - "items": [ "baseball", "bat", "whistle", "tank_top", "shorts", "socks", "sneakers", "runner_bag", "wristwatch" ], + "items": [ "baseball", "bat", "whistle", "tank_top", "shorts", "socks_ankle", "sneakers", "runner_bag", "wristwatch" ], "entries": [ { "group": "charged_cell_phone" } ] }, "male": [ "briefs" ], @@ -3524,7 +3524,7 @@ "skills": [ { "level": 4, "name": "dodge" } ], "items": { "both": { - "items": [ "tshirt", "hoodie", "pants_cargo", "socks", "sneakers", "runner_bag", "wristwatch" ], + "items": [ "tshirt", "hoodie", "pants_cargo", "socks_ankle", "sneakers", "runner_bag", "wristwatch" ], "entries": [ { "group": "charged_cell_phone" } ] }, "male": [ "briefs" ], diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 1b131cdf0187c..865ef4fb3d9aa 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -422,6 +422,17 @@ "qualities": [ { "id": "KNIT", "level": 1 } ], "components": [ [ [ "yarn", 75 ] ] ] }, + { + "result": "socks_ankle", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_FEET", + "skill_used": "tailor", + "time": "8 m", + "autolearn": true, + "using": [ [ "sewing_standard", 4 ] ], + "components": [ [ [ "rag", 1 ] ] ] + }, { "result": "stockings", "type": "recipe", From 4cb74c7939290c0e92ea3a5a915b4242819318ef Mon Sep 17 00:00:00 2001 From: FuelType-Memes Date: Sun, 22 Dec 2019 15:11:03 +0300 Subject: [PATCH 2/8] Fix warmth --- data/json/items/armor.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/armor.json b/data/json/items/armor.json index 2e97eed1a883b..67442ea0ed65b 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -8306,7 +8306,6 @@ "color": "light_gray", "covers": [ "FEET" ], "coverage": 80, - "warmth": 0, "material_thickness": 1, "flags": [ "VARSIZE", "SKINTIGHT" ] }, From 06a0365868884cb6eb4e905709cd1c64aa17ba6b Mon Sep 17 00:00:00 2001 From: FuelType-Memes Date: Sun, 22 Dec 2019 15:44:24 +0300 Subject: [PATCH 3/8] Fix merge conflict --- data/json/items/armor/boots.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index 5561d6f8b1be6..7a4270f2bea8c 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -1278,6 +1278,24 @@ "material_thickness": 1, "flags": [ "VARSIZE", "SKINTIGHT" ] }, + { + "id": "socks_ankle", + "type": "ARMOR", + "name": "pair of ankle socks", + "name_plural": "pairs of ankle socks", + "description": "Short socks, commonly used for sports. These are designed to protect your feet from friction, not temperature", + "weight": "25 g", + "volume": "200 ml", + "price": 100, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "socks", + "color": "light_gray", + "covers": [ "FEET" ], + "coverage": 80, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT" ] + }, { "id": "socks_bag", "type": "ARMOR", From 41c45f10ff485dfee674dfd3f8b90619296157ec Mon Sep 17 00:00:00 2001 From: FuelType-Memes Date: Sun, 22 Dec 2019 18:59:40 +0300 Subject: [PATCH 4/8] Use the same req as basic socks --- data/json/recipes/armor/feet.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 865ef4fb3d9aa..6860d1d423fe5 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -428,10 +428,10 @@ "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_FEET", "skill_used": "tailor", - "time": "8 m", + "time": "10 m", "autolearn": true, "using": [ [ "sewing_standard", 4 ] ], - "components": [ [ [ "rag", 1 ] ] ] + "components": [ [ [ "rag", 2 ] ] ] }, { "result": "stockings", From a5afdf32953e748d1f9ffe22f790dae230a2cf70 Mon Sep 17 00:00:00 2001 From: molkero Date: Sun, 22 Dec 2019 16:22:18 +0200 Subject: [PATCH 5/8] Remove .0000000x from weights --- data/mods/blazemod/blaze_blob.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/mods/blazemod/blaze_blob.json b/data/mods/blazemod/blaze_blob.json index ed88a914200db..f11aff69e9fc2 100644 --- a/data/mods/blazemod/blaze_blob.json +++ b/data/mods/blazemod/blaze_blob.json @@ -5,7 +5,7 @@ "category": "veh_parts", "name": "Gelatinous track", "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": "32368.000000000004 g", + "weight": "32368 g", "volume": "50 L", "price": 25500, "to_hit": -3, @@ -22,7 +22,7 @@ "category": "veh_parts", "name": "Oozing track", "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": "32368.000000000004 g", + "weight": "32368 g", "volume": "50 L", "price": 25500, "to_hit": -3, @@ -39,7 +39,7 @@ "category": "veh_parts", "name": "Gray track", "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": "32368.000000000004 g", + "weight": "32368 g", "volume": "50 L", "price": 25500, "to_hit": -3, @@ -1197,7 +1197,7 @@ "name": "growing viscous mass", "name_plural": "growing viscous mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "8140.000000000001 g", + "weight": "8140 g", "volume": "3 L", "price": 100, "to_hit": -2, From 93598b14c00fede1253b25b254690e15ca89f1c5 Mon Sep 17 00:00:00 2001 From: molkero Date: Sun, 22 Dec 2019 16:28:00 +0200 Subject: [PATCH 6/8] Remove .0000000x from weights --- data/mods/blazemod/blaze_other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/blazemod/blaze_other.json b/data/mods/blazemod/blaze_other.json index d26996aeb11b6..aa719cf24fc00 100644 --- a/data/mods/blazemod/blaze_other.json +++ b/data/mods/blazemod/blaze_other.json @@ -131,7 +131,7 @@ "category": "veh_parts", "name": "Rubber Caterpillar Track", "description": "A short, interlocking set of hard rubber tracks reinforced by stiff wire held in place by a set of smaller wheels. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": "32368.000000000004 g", + "weight": "32368 g", "volume": "50 L", "price": 25500, "to_hit": -3, From 43603cf84c7043e96ef217a82b8be669558e89b4 Mon Sep 17 00:00:00 2001 From: FuelType-Memes Date: Sun, 22 Dec 2019 19:16:26 +0300 Subject: [PATCH 7/8] Remove .0000000x from weights --- data/mods/blazemod/blaze_blob.json | 8 ++++---- data/mods/blazemod/blaze_other.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/mods/blazemod/blaze_blob.json b/data/mods/blazemod/blaze_blob.json index ed88a914200db..f11aff69e9fc2 100644 --- a/data/mods/blazemod/blaze_blob.json +++ b/data/mods/blazemod/blaze_blob.json @@ -5,7 +5,7 @@ "category": "veh_parts", "name": "Gelatinous track", "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": "32368.000000000004 g", + "weight": "32368 g", "volume": "50 L", "price": 25500, "to_hit": -3, @@ -22,7 +22,7 @@ "category": "veh_parts", "name": "Oozing track", "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": "32368.000000000004 g", + "weight": "32368 g", "volume": "50 L", "price": 25500, "to_hit": -3, @@ -39,7 +39,7 @@ "category": "veh_parts", "name": "Gray track", "description": "A short, interlocking set of tracks created out of some of your monstrosity blob based parts. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": "32368.000000000004 g", + "weight": "32368 g", "volume": "50 L", "price": 25500, "to_hit": -3, @@ -1197,7 +1197,7 @@ "name": "growing viscous mass", "name_plural": "growing viscous mass", "description": "Not quite fully grown, this blob requires nourishment to fully develop.", - "weight": "8140.000000000001 g", + "weight": "8140 g", "volume": "3 L", "price": 100, "to_hit": -2, diff --git a/data/mods/blazemod/blaze_other.json b/data/mods/blazemod/blaze_other.json index d26996aeb11b6..aa719cf24fc00 100644 --- a/data/mods/blazemod/blaze_other.json +++ b/data/mods/blazemod/blaze_other.json @@ -131,7 +131,7 @@ "category": "veh_parts", "name": "Rubber Caterpillar Track", "description": "A short, interlocking set of hard rubber tracks reinforced by stiff wire held in place by a set of smaller wheels. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.", - "weight": "32368.000000000004 g", + "weight": "32368 g", "volume": "50 L", "price": 25500, "to_hit": -3, From 7bce6e5578a90302238c8e02de478345fdf30f5a Mon Sep 17 00:00:00 2001 From: FuelType-Memes Date: Sat, 28 Dec 2019 21:28:44 +0300 Subject: [PATCH 8/8] Linting --- data/json/itemgroups/clothing.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index 319f08aec5c0c..f9193e119fae6 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -2579,7 +2579,12 @@ "type": "item_group", "//": "unisex socks", "subtype": "distribution", - "items": [ { "item": "socks", "prob": 70 }, { "item": "socks_ankle", "prob": 50 }, { "item": "socks_wool", "prob": 30 }, { "item": "thermal_socks", "prob": 10 } ] + "items": [ + { "item": "socks", "prob": 70 }, + { "item": "socks_ankle", "prob": 50 }, + { "item": "socks_wool", "prob": 30 }, + { "item": "thermal_socks", "prob": 10 } + ] }, { "id": "scarfs_unisex",