add turtleneck sweaters and shirts (#45565)

* turtlenecks are cool they're just neat
CleverRaven · Nov 25, 2020 · e440b19 · e440b19
1 parent 39cc5ca
commit e440b19
Show file tree

Hide file tree

Showing 3 changed files with 128 additions and 0 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -317,6 +317,7 @@
               { "item": "jacket_light", "prob": 40 },
               { "item": "jacket_windbreaker", "prob": 20 },
               { "item": "sweater", "prob": 50 },
+              { "item": "turtleneck", "prob": 30 },
               { "item": "trenchcoat", "prob": 10 }
             ],
             "prob": 30
@@ -1168,6 +1169,8 @@
       [ "tank_top", 50 ],
       [ "sweatshirt", 75 ],
       [ "sweater", 75 ],
+      [ "turtleneck", 25 ],
+      [ "turtleneck_shirt", 25 ],
       [ "hoodie", 65 ],
       [ "jacket_light", 50 ],
       [ "jacket_windbreaker", 25 ],
@@ -1318,6 +1321,8 @@
       [ "tank_top", 50 ],
       [ "sweatshirt", 75 ],
       [ "sweater", 75 ],
+      [ "turtleneck", 25 ],
+      [ "turtleneck_shirt", 25 ],
       [ "hoodie", 65 ],
       [ "under_armor", 20 ],
       [ "jersey", 40 ],
@@ -1666,6 +1671,8 @@
       { "item": "boy_shorts", "prob": 25 },
       { "item": "sweatshirt", "prob": 75 },
       { "item": "sweater", "prob": 75 },
+      { "item": "turtleneck", "prob": 25 },
+      { "item": "turtleneck_shirt", "prob": 25 },
       { "item": "hoodie", "prob": 65 },
       { "item": "jacket_light", "prob": 50 },
       { "item": "jacket_windbreaker", "prob": 25 },
@@ -1855,6 +1862,8 @@
       [ "dress", 70 ],
       [ "sweatshirt", 75 ],
       [ "sweater", 75 ],
+      [ "turtleneck", 25 ],
+      [ "turtleneck_shirt", 25 ],
       [ "hoodie", 65 ],
       [ "jumpsuit", 20 ],
       [ "badge_doctor", 10 ],
@@ -2602,6 +2611,8 @@
       [ "boy_shorts", 25 ],
       [ "sweatshirt", 75 ],
       [ "sweater", 75 ],
+      [ "turtleneck", 40 ],
+      [ "turtleneck_shirt", 25 ],
       [ "hoodie", 65 ],
       [ "jacket_light", 50 ],
       [ "jacket_windbreaker", 25 ],
@@ -2812,6 +2823,8 @@
       { "item": "thermal_shirt", "prob": 20 },
       { "item": "sleeveless_tunic", "prob": 10 },
       { "item": "sweater", "prob": 40 },
+      { "item": "turtleneck", "prob": 15 },
+      { "item": "turtleneck_shirt", "prob": 15 },
       { "item": "sweatshirt", "prob": 50 },
       { "item": "tank_top", "prob": 30 },
       { "item": "tshirt", "prob": 80 },

diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
@@ -2528,6 +2528,90 @@
     "covers": [ "head", "mouth", "torso", "arm_l", "arm_r", "leg_l", "leg_r", "hand_l", "hand_r", "foot_l", "foot_r" ],
     "warmth": 60
   },
+  {
+    "id": "turtleneck",
+    "type": "TOOL_ARMOR",
+    "name": { "str": "turtleneck" },
+    "description": "A tasteful wool turtleneck, modeled after cashmere.  Unemcumbering and warm, but lacking storage.",
+    "weight": "478 g",
+    "volume": "2500 ml",
+    "price": 5000,
+    "material": [ "wool" ],
+    "symbol": "[",
+    "looks_like": "sweater",
+    "color": "white",
+    "covers": [ "torso", "arm_l", "arm_r", "mouth" ],
+    "coverage": 95,
+    "encumbrance": 8,
+    "warmth": 35,
+    "material_thickness": 2,
+    "use_action": { "target": "turtleneck_rolled", "msg": "You adjust the neck and collar of the turtleneck.", "type": "transform" },
+    "flags": [ "VARSIZE", "FANCY", "ALLOWS_NATURAL_ATTACKS" ]
+  },
+  {
+    "id": "turtleneck_rolled",
+    "type": "TOOL_ARMOR",
+    "name": { "str": "turtleneck (rolled)" },
+    "description": "This wool turtleneck's neck is rolled out of the way of the mouth.",
+    "weight": "478 g",
+    "volume": "2500 ml",
+    "price": 5000,
+    "material": [ "wool" ],
+    "symbol": "[",
+    "looks_like": "sweater",
+    "color": "white",
+    "covers": [ "torso", "arm_l", "arm_r" ],
+    "coverage": 95,
+    "encumbrance": 8,
+    "warmth": 35,
+    "material_thickness": 2,
+    "use_action": { "target": "turtleneck", "msg": "You adjust the neck and collar of the turtleneck.", "type": "transform" },
+    "flags": [ "VARSIZE", "FANCY", "ALLOWS_NATURAL_ATTACKS" ]
+  },
+  {
+    "id": "turtleneck_shirt",
+    "type": "TOOL_ARMOR",
+    "name": { "str": "turtleneck shirt" },
+    "description": "A tasteful cotton turtleneck shirt, thick for a shirt, thin for a sweater and completely lacking storage.",
+    "weight": "300 g",
+    "volume": "2000 ml",
+    "price": 2000,
+    "material": [ "cotton" ],
+    "symbol": "[",
+    "looks_like": "sweater",
+    "color": "white",
+    "covers": [ "torso", "arm_l", "arm_r", "mouth" ],
+    "coverage": 95,
+    "encumbrance": 4,
+    "warmth": 20,
+    "material_thickness": 2,
+    "use_action": {
+      "target": "turtleneck_shirt_rolled",
+      "msg": "You adjust the neck and collar of the turtleneck shirt.",
+      "type": "transform"
+    },
+    "flags": [ "VARSIZE", "FANCY", "ALLOWS_NATURAL_ATTACKS" ]
+  },
+  {
+    "id": "turtleneck_shirt_rolled",
+    "type": "TOOL_ARMOR",
+    "name": { "str": "turtleneck shirt (rolled)" },
+    "description": "This turtleneck shirt's neck is rolled out of the way of the mouth.",
+    "weight": "300 g",
+    "volume": "2000 ml",
+    "price": 2000,
+    "material": [ "cotton" ],
+    "symbol": "[",
+    "looks_like": "sweater",
+    "color": "white",
+    "covers": [ "torso", "arm_l", "arm_r" ],
+    "coverage": 95,
+    "encumbrance": 4,
+    "warmth": 20,
+    "material_thickness": 2,
+    "use_action": { "target": "turtleneck_shirt", "msg": "You adjust the neck and collar of the turtleneck shirt.", "type": "transform" },
+    "flags": [ "VARSIZE", "FANCY", "ALLOWS_NATURAL_ATTACKS" ]
+  },
   {
     "type": "TOOL_ARMOR",
     "id": "mask_ski",

diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json
@@ -1205,6 +1205,37 @@
     "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
     "using": [ [ "tailoring_wool_knitting", 550 ] ]
   },
+  {
+    "result": "turtleneck",
+    "type": "recipe",
+    "activity_level": "NO_EXERCISE",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_TORSO",
+    "skill_used": "tailor",
+    "difficulty": 3,
+    "time": "7 h",
+    "autolearn": true,
+    "reversible": true,
+    "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ], [ "mag_beauty", 1 ] ],
+    "qualities": [ { "id": "KNIT", "level": 1 } ],
+    "proficiencies": [ { "proficiency": "prof_knitting" }, { "proficiency": "prof_knitting_speed" } ],
+    "using": [ [ "tailoring_wool_knitting", 620 ] ]
+  },
+  {
+    "result": "turtleneck_shirt",
+    "type": "recipe",
+    "activity_level": "NO_EXERCISE",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_TORSO",
+    "skill_used": "tailor",
+    "difficulty": 3,
+    "time": "5 h",
+    "autolearn": true,
+    "reversible": true,
+    "book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ], [ "mag_beauty", 1 ] ],
+    "using": [ [ "sewing_standard", 20 ] ],
+    "components": [ [ [ "rag", 14 ] ] ]
+  },
   {
     "result": "tank_top",
     "type": "recipe",