Maid clothes improvements 3 (#53071)

Co-authored-by: Dillon Matchett <[email protected]>
CleverRaven · Dec 12, 2021 · b6e6cc8 · b6e6cc8
1 parent 01705f6
commit b6e6cc8
Show file tree

Hide file tree

Showing 11 changed files with 87 additions and 14 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -1277,6 +1277,7 @@
       [ "clogs", 2 ],
       [ "wristwatch", 15 ],
       [ "maid_dress", 3 ],
+      [ "maid_dress_short", 3 ],
       [ "maid_hat", 3 ],
       [ "knitting_needles", 1 ],
       [ "survnote", 1 ],
@@ -1840,6 +1841,7 @@
       { "item": "postman_shirt", "prob": 5 },
       { "item": "postman_hat", "prob": 5 },
       { "item": "maid_dress", "prob": 3 },
+      { "item": "maid_dress_short", "prob": 3 },
       { "item": "maid_hat", "prob": 3 },
       { "item": "halter_top", "prob": 50 },
       { "item": "linuxtshirt", "prob": 20 },
@@ -2730,6 +2732,7 @@
       [ "samghati", 1 ],
       [ "jersey", 40 ],
       [ "maid_dress", 3 ],
+      [ "maid_dress_short", 3 ],
       [ "halter_top", 50 ],
       [ "linuxtshirt", 20 ],
       [ "kilt", 2 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -511,6 +511,7 @@
       [ "bagh_nakha", 2 ],
       [ "leathersandals", 10 ],
       [ "maid_dress", 3 ],
+      [ "maid_dress_short", 3 ],
       [ "maid_hat", 3 ],
       [ "miner_hat", 3 ],
       [ "grapnel", 1 ],
@@ -1519,6 +1520,7 @@
     "items": [
       [ "corset", 20 ],
       [ "corset_waist", 10 ],
+      [ "maid_dress_short", 20 ],
       { "item": "vibrator", "prob": 20, "charges": [ 0, 100 ] },
       [ "leather_cat_tail", 20 ],
       [ "leather_cat_ears", 20 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
@@ -348,7 +348,8 @@
       [ "tux", 10 ],
       [ "gown", 5 ],
       [ "dress_wedding", 5 ],
-      [ "maid_dress", 35 ],
+      [ "maid_dress", 25 ],
+      [ "maid_dress_short", 25 ],
       [ "postman_shirt", 50 ],
       [ "postman_shorts", 30 ],
       [ "robe", 45 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -14,7 +14,7 @@
       { "group": "female_underwear", "prob": 90, "damage": [ 0, 4 ] },
       { "group": "shoes_maid", "prob": 30, "damage": [ 0, 4 ] },
       { "item": "maid_hat", "prob": 50, "damage": [ 0, 4 ] },
-      { "item": "maid_dress", "prob": 100, "damage": [ 0, 4 ] },
+      { "group": "mansion_maid_dress", "prob": 100, "damage": [ 0, 4 ] },
       { "group": "corpse_female" }
     ]
   },
@@ -1525,7 +1525,8 @@
     "type": "item_group",
     "subtype": "distribution",
     "items": [
-      [ "maid_dress", 90 ],
+      [ "maid_dress", 70 ],
+      [ "maid_dress_short", 30 ],
       [ "maid_hat", 90 ],
       [ "suit", 80 ],
       [ "pocketwatch", 30 ],
@@ -1635,6 +1636,12 @@
       [ "heels", 10 ]
     ]
   },
+  {
+    "id": "mansion_maid_dress",
+    "type": "item_group",
+    "subtype": "distribution",
+    "items": [ [ "maid_dress", 80 ], [ "maid_dress_short", 20 ] ]
+  },
   {
     "id": "gear_butler",
     "type": "item_group",

diff --git a/data/json/itemgroups/Locations_MapExtras/private_resort_item_groups.json b/data/json/itemgroups/Locations_MapExtras/private_resort_item_groups.json
@@ -77,7 +77,7 @@
         "distribution": [ { "item": "dress_shoes", "prob": 10 }, { "group": "shoes_womens", "prob": 90 } ],
         "prob": 90
       },
-      { "item": "maid_dress" },
+      { "group": "private_resort_maid_dress", "prob": 100 },
       { "item": "maid_hat", "prob": 66 }
     ]
   },
@@ -181,5 +181,11 @@
       { "item": "PR24-retracted", "prob": 50 },
       { "item": "shot_beanbag", "prob": 50 }
     ]
+  },
+  {
+    "id": "private_resort_maid_dress",
+    "type": "item_group",
+    "subtype": "distribution",
+    "items": [ [ "maid_dress", 20 ], [ "maid_dress_short", 80 ] ]
   }
 ]
diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -985,6 +985,7 @@
       { "item": "smoxygen_tank", "prob": 2, "charges": [ 0, 12 ] },
       { "item": "alarmclock", "prob": 30 },
       { "item": "maid_dress", "prob": 3 },
+      { "item": "maid_dress_short", "prob": 3 },
       { "item": "maid_hat", "prob": 3 },
       { "group": "religious_books", "prob": 38 },
       { "item": "mouthpiece", "prob": 1 },

diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json
@@ -665,14 +665,20 @@
     "material": [ "cotton" ],
     "symbol": "[",
     "looks_like": "gloves_light",
-    "color": "light_blue",
+    "color": "white",
     "armor": [
       { "covers": [ "hand_l", "hand_r" ], "coverage": 100, "encumbrance": 2 },
-      { "covers": [ "arm_l", "arm_r" ], "coverage": 50, "encumbrance": 2 }
+      {
+        "covers": [ "arm_l", "arm_r" ],
+        "specifically_covers": [ "arm_elbow_l", "arm_elbow_r", "arm_lower_l", "arm_lower_r" ],
+        "coverage": 100,
+        "encumbrance": 2
+      },
+      { "covers": [ "arm_l", "arm_r" ], "specifically_covers": [ "arm_upper_l", "arm_upper_r" ], "coverage": 50 }
     ],
-    "warmth": 20,
+    "warmth": 10,
     "material_thickness": 0.2,
-    "flags": [ "VARSIZE" ]
+    "flags": [ "VARSIZE", "SKINTIGHT" ]
   },
   {
     "id": "mittens",

diff --git a/data/json/items/armor/hats.json b/data/json/items/armor/hats.json
@@ -464,10 +464,10 @@
     "symbol": "[",
     "looks_like": "hat_cotton",
     "color": "white",
-    "warmth": 10,
+    "warmth": 2,
     "material_thickness": 0.05,
     "flags": [ "VARSIZE" ],
-    "armor": [ { "encumbrance": 10, "coverage": 25, "covers": [ "head" ] } ]
+    "armor": [ { "coverage": 25, "covers": [ "head" ] } ]
   },
   {
     "id": "porkpie",

diff --git a/data/json/items/armor/torso_clothes.json b/data/json/items/armor/torso_clothes.json
@@ -503,9 +503,9 @@
     "looks_like": "dress",
     "color": "blue",
     "armor": [
-      { "covers": [ "torso" ], "coverage": 75, "encumbrance": [ 5, 7 ] },
-      { "covers": [ "leg_l", "leg_r" ], "coverage": 75, "encumbrance": [ 5, 5 ] },
-      { "covers": [ "arm_l", "arm_r" ], "coverage": 75, "encumbrance": [ 5, 5 ] }
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 5, 7 ] },
+      { "covers": [ "leg_l", "leg_r" ], "coverage": 95, "encumbrance": [ 5, 5 ] },
+      { "covers": [ "arm_l", "arm_r" ], "coverage": 95, "encumbrance": [ 5, 5 ] }
     ],
     "pocket_data": [
       {
@@ -520,6 +520,41 @@
     "material_thickness": 0.1,
     "flags": [ "VARSIZE" ]
   },
+  {
+    "id": "maid_dress_short",
+    "repairs_like": "trenchcoat",
+    "type": "ARMOR",
+    "name": { "str_sp": "Short french maid clothes" },
+    "description": "The French maid dress, black with a frilly white apron.  This version is much lighter and shorter than normal.",
+    "weight": "60 g",
+    "volume": "250 ml",
+    "price": 5000,
+    "price_postapoc": 50,
+    "material": [ "cotton" ],
+    "symbol": "[",
+    "looks_like": "maid_dress",
+    "color": "dark_gray",
+    "armor": [
+      { "covers": [ "torso" ], "specifically_covers": [ "torso_lower" ], "coverage": 100, "encumbrance": 4 },
+      { "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ], "coverage": 20 },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "specifically_covers": [ "leg_hip_l", "leg_hip_r" ],
+        "coverage": 100,
+        "encumbrance": 2
+      },
+      { "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_upper_l", "leg_upper_r" ], "coverage": 50 },
+      {
+        "covers": [ "arm_l", "arm_r" ],
+        "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r" ],
+        "coverage": 15,
+        "encumbrance": 2
+      }
+    ],
+    "warmth": 2,
+    "material_thickness": 0.1,
+    "flags": [ "VARSIZE" ]
+  },
   {
     "id": "polo_shirt",
     "repairs_like": "tshirt",

diff --git a/data/json/monsterdrops/feral_humans.json b/data/json/monsterdrops/feral_humans.json
@@ -169,7 +169,7 @@
                 "distribution": [
                   {
                     "collection": [
-                      { "item": "maid_dress", "prob": 100, "damage": [ 1, 4 ] },
+                      { "group": "mansion_maid_dress", "prob": 100, "damage": [ 1, 4 ] },
                       { "item": "maid_hat", "prob": 80, "damage": [ 1, 4 ] },
                       { "item": "long_glove_white", "prob": 60, "damage": [ 1, 4 ] },
                       {

diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json
@@ -1440,6 +1440,18 @@
     "book_learn": [ [ "mag_animecon", 1 ] ],
     "using": [ [ "sewing_standard", 15 ], [ "fabric_standard_nostretch", 10 ] ]
   },
+  {
+    "result": "maid_dress_short",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_TORSO",
+    "skill_used": "tailor",
+    "difficulty": 3,
+    "time": "3 h",
+    "reversible": true,
+    "book_learn": [ [ "mag_animecon", 1 ] ],
+    "using": [ [ "sewing_standard", 15 ], [ "fabric_standard_nostretch", 6 ] ]
+  },
   {
     "result": "sweater",
     "type": "recipe",