From 0cf0e572abefec3ff0632703d44323964cf2f56e Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 6 May 2021 19:08:34 -0700
Subject: Port to Bright Nights Merge in new mod data (sans the erotic stuff)

---
 armor.json | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

(limited to 'armor.json')

diff --git a/armor.json b/armor.json
index d04c1ad..50818d1 100644
--- a/armor.json
+++ b/armor.json
@@ -91,6 +91,27 @@
     "material_thickness": 1,
     "flags": ["VARSIZE", "SUPER_FANCY"]
   },
+  {
+    "id": "maid_dress_french_shoggoth",
+    "type": "ARMOR",
+    "category": "clothing",
+    "looks_like": "maid_dress_french",
+    "name": { "str": "strange French maid dress", "str_pl": "strange French maid dresses" },
+    "description": "A French maid dress in the modern style, black with a frilly white apron. Doesn't cover much past the thigh or shoulder. Something seems off about it.",
+    "weight": "100 g",
+    "volume": "250 ml",
+    "price": "50 USD",
+    "material": [ "cotton" ],
+    "symbol": "[",
+    "color": "blue",
+    "covers": ["TORSO", "ARMS", "LEGS"],
+    "coverage": 0,
+    "encumbrance": 0,
+    "storage": "0",
+    "warmth": 20,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "SUPER_FANCY", "OVERSIZE", "STURDY" ]
+  },
   {
     "id": "kawaii_maid_dress",
     "type": "ARMOR",
@@ -197,6 +218,26 @@
     "material_thickness": 1,
     "flags": [ "VARSIZE", "HELMET_COMPAT" ]
   },
+  {
+    "id": "maid_cap_shoggoth",
+    "type": "ARMOR",
+    "looks_like": "kawaii_maid_hat",
+    "category": "armor",
+    "name": { "str": "strange maid headband" },
+    "description": "A black headband with white lace trim, worn by maids. Something seems off about it.",
+    "weight": "50 g",
+    "volume": "250 ml",
+    "price": "20 USD",
+    "material": [ "cotton" ],
+    "symbol": "[",
+    "color": "white",
+    "covers": [ "head" ],
+    "coverage": 0,
+    "encumbrance": 0,
+    "warmth": 15,
+    "material_thickness": 1,
+    "flags": [ "VARSIZE", "FANCY", "SKINTIGHT" ]
+  },
   {
     "id": "kawaii_maid_hat",
     "type": "ARMOR",
@@ -204,7 +245,7 @@
     "description": "A black headband with white lace trim, worn by maids.",
     "weight": "150 g",
     "volume": "250 ml",
-    "price": 2500,
+    "price": "25 USD",
     "material": [ "cotton" ],
     "symbol": "[",
     "color": "white",
-- 
cgit v1.2.1