diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index ae25a2434b212..8f1a806f91d07 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -1447,7 +1447,7 @@ { "id": "dress_shoes", "type": "item_group", - "items": [ [ "dress_shoes", 50 ], [ "heels", 50 ], [ "leathersandals", 20 ] ] + "items": [ [ "dress_shoes", 50 ], [ "heels", 50 ], [ "espadrilles", 20 ] ] }, { "id": "wedding_dresses", @@ -1781,6 +1781,7 @@ [ "boots_western", 10 ], [ "clogs", 1 ], [ "leathersandals", 10 ], + [ "espadrilles", 5 ], [ "rollerskates", 1 ], [ "roller_blades", 5 ], [ "roller_shoes_off", 1 ], @@ -2084,6 +2085,7 @@ [ "boots_western", 60 ], [ "clogs", 60 ], [ "leathersandals", 100 ], + [ "espadrilles", 50 ], [ "rollerskates", 10 ], [ "roller_blades", 20 ], [ "roller_shoes_off", 10 ], @@ -2686,7 +2688,7 @@ [ "wetsuit_booties_thick", 5 ], [ "bastsandals", 5 ], [ "straw_sandals", 5 ], - [ "leathersandals", 5 ] + [ "espadrilles", 5 ] ] }, { @@ -4358,7 +4360,8 @@ { "item": "straw_sandals", "prob": 20 }, { "item": "flip_flops", "prob": 40 }, { "item": "flip_flops_exp", "prob": 5 }, - { "item": "leathersandals", "prob": 35 } + { "item": "leathersandals", "prob": 35 }, + { "item": "espadrilles", "prob": 20 } ], "prob": 60 }, diff --git a/data/json/itemgroups/Clothing_Gear/gear_civilian.json b/data/json/itemgroups/Clothing_Gear/gear_civilian.json index 2efb910a59f4c..267679cd6e1d5 100644 --- a/data/json/itemgroups/Clothing_Gear/gear_civilian.json +++ b/data/json/itemgroups/Clothing_Gear/gear_civilian.json @@ -219,7 +219,7 @@ { "item": "flip_flops", "prob": 35 }, { "item": "flip_flops_exp", "prob": 5 }, { "item": "leathersandals", "prob": 40 }, - { "item": "straw_sandals", "prob": 20 }, + { "item": "espadrilles", "prob": 20 }, { "item": "bastsandals", "prob": 20 }, { "item": "sneakers_steel", "prob": 20 }, { "item": "knee_high_boots", "prob": 20 }, diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json index cecb0afb994b2..03c2dedf95c8d 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json +++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json @@ -549,6 +549,7 @@ [ "alarmclock", 5 ], [ "bagh_nakha", 2 ], [ "leathersandals", 10 ], + [ "espadrilles", 5 ], [ "maid_dress", 3 ], [ "maid_dress_short", 3 ], [ "maid_hat", 3 ], diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json index d51af3664e7ec..5e62c9609dad3 100644 --- a/data/json/itemgroups/Locations_MapExtras/mansion.json +++ b/data/json/itemgroups/Locations_MapExtras/mansion.json @@ -933,6 +933,7 @@ [ "shark_plushie", 10 ], [ "bottle_plastic", 30 ], [ "leathersandals", 30 ], + [ "espadrilles", 15 ], [ "leather_belt", 30 ], [ "bag_plastic", 30 ], [ "shot_hull", 30 ], diff --git a/data/json/itemgroups/activities_hobbies.json b/data/json/itemgroups/activities_hobbies.json index db6ee25aae32f..41002f9c4a862 100644 --- a/data/json/itemgroups/activities_hobbies.json +++ b/data/json/itemgroups/activities_hobbies.json @@ -419,6 +419,7 @@ [ "whistle", 20 ], [ "charcoal", 20 ], [ "leathersandals", 10 ], + [ "espadrilles", 5 ], [ "bullwhip", 1 ], [ "grapnel", 1 ], [ "razor_blade", 9 ], diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json index eca5df2d1d11a..cbbcaa3db41cf 100644 --- a/data/json/itemgroups/collections_domestic.json +++ b/data/json/itemgroups/collections_domestic.json @@ -630,6 +630,7 @@ { "item": "smoxygen_tank", "prob": 1, "charges": [ 0, 24 ] }, { "group": "religious_books", "prob": 38 }, { "item": "leathersandals", "prob": 25 }, + { "item": "espadrilles", "prob": 15 }, { "item": "phonebook", "prob": 5 }, { "item": "survnote", "prob": 1 }, { "group": "toy_radio_car", "prob": 2 }, @@ -1218,6 +1219,7 @@ { "group": "religious_books", "prob": 38 }, { "item": "mouthpiece", "prob": 1 }, { "item": "leathersandals", "prob": 25 }, + { "item": "espadrilles", "prob": 15 }, { "item": "survnote", "prob": 2 }, { "item": "mask_guy_fawkes", "prob": 5 }, { "item": "magnifying_glass", "prob": 2 }, diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index 9a6f0e53618ac..415c942b6eee9 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -3384,5 +3384,54 @@ "name": { "str": "tempered steel sabaton" }, "proportional": { "weight": 1.25, "volume": 1.25 }, "extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] } + }, + { + "id": "espadrilles", + "category": "armor", + "type": "ARMOR", + "name": { "str_sp": "espadrilles" }, + "description": "Originating from the Pyrenees and made from a rope sole and cloth, these shoes are perfect for the hot weather, sipping Sangria and dodging tourists.", + "looks_like": "leathersandals", + "price": "20 USD", + "price_postapoc": "10 USD", + "symbol": "[", + "volume": "600 ml", + "weight": "500 g", + "flags": [ "VARSIZE" ], + "warmth": 2, + "armor": [ + { + "layers": [ "NORMAL" ], + "encumbrance": 4, + "coverage": 100, + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_toes_r", "foot_toes_l", "foot_heel_r", "foot_heel_l" ], + "material": [ { "type": "cotton", "thickness": 1 } ] + }, + { + "layers": [ "NORMAL" ], + "encumbrance": 0, + "coverage": 100, + "covers": [ "foot_l", "foot_r" ], + "specifically_covers": [ "foot_arch_r", "foot_arch_l", "foot_sole_r", "foot_sole_l" ], + "material": [ { "type": "dry_plant", "thickness": 6 } ] + } + ] + }, + { + "id": "xl_espadrilles", + "copy-from": "espadrilles", + "type": "ARMOR", + "name": { "str_sp": "espadrilles" }, + "extend": { "flags": [ "PREFIX_XL", "OVERSIZE" ] }, + "proportional": { "weight": 1.5, "volume": 1.5 } + }, + { + "id": "xs_espadrilles", + "copy-from": "espadrilles", + "type": "ARMOR", + "name": { "str_sp": "espadrilles" }, + "extend": { "flags": [ "PREFIX_XS", "UNDERSIZE" ] }, + "proportional": { "weight": 0.5, "volume": 0.5 } } ] diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json index 4e697fa0c912a..a482bdba6748c 100644 --- a/data/json/recipes/armor/feet.json +++ b/data/json/recipes/armor/feet.json @@ -1955,5 +1955,61 @@ ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ] + }, + { + "result": "espadrilles", + "type": "recipe", + "activity_level": "NO_EXERCISE", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_FEET", + "skill_used": "tailor", + "difficulty": 2, + "time": "3 h", + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 2 } ], + "using": [ [ "tailoring_cotton", 1 ] ], + "proficiencies": [ { "proficiency": "prof_basketweaving" } ], + "components": [ [ [ "filament", 900, "LIST" ] ] ] + }, + { + "copy-from": "espadrilles", + "result": "espadrilles", + "id_suffix": "from_rope", + "type": "recipe", + "time": "2 h", + "components": [ [ [ "rope_natural_short", 1, "LIST" ] ] ], + "byproducts": [ [ "string_36", 3 ] ] + }, + { + "copy-from": "espadrilles", + "result": "xl_espadrilles", + "type": "recipe", + "using": [ [ "tailoring_cotton", 1.5 ] ], + "components": [ [ [ "filament", 1200, "LIST" ] ] ] + }, + { + "copy-from": "xl_espadrilles", + "result": "xl_espadrilles", + "id_suffix": "from_rope", + "type": "recipe", + "time": "2 h", + "components": [ [ [ "rope_natural_short", 1, "LIST" ] ] ], + "byproducts": [ [ "string_36", 2 ] ] + }, + { + "copy-from": "espadrilles", + "result": "xs_espadrilles", + "type": "recipe", + "using": [ [ "tailoring_cotton", 1 ] ], + "components": [ [ [ "filament", 600, "LIST" ] ] ] + }, + { + "copy-from": "xs_espadrilles", + "result": "xs_espadrilles", + "id_suffix": "from_rope", + "type": "recipe", + "time": "2 h", + "components": [ [ [ "rope_natural_short", 1, "LIST" ] ] ], + "byproducts": [ [ "string_36", 4 ] ] } ]