Vegan Trait (CleverRaven#66511)

* Create polymer_plant * Merge branch 'master' of https://github.com/Paprika-H/Cataclysm-DDA * Update character_attire.cpp * Update mutations.json * Update character_attire.cpp * faux fur gloves * faux fur feet styuff * faux fur scarfs * faux fur boots recipes * Update hands.json * Update feet.json * Update hands.json * Update character_attire.cpp * Update flag.h * Update flag.cpp * Update consumption.cpp * Update flags.json * Update dairy.json * Update consumption.cpp * Update flag.cpp * Update consumption.cpp * Update flags.json * Update boots.json * Update gloves.json * Update suits_protection.json * Update suit.json * Update flag.h * Update flag.cpp * Update flags.json * Update dairy.json * Update character_attire.cpp * Update consumption.cpp * Update suits_protection.json * Update scarfs.json * Update legs_armor.json * Update legs_armor.json * Update legs.json * Update legs_armor.json * Update holster.json * Update storage.json * Update holster.json * Update holster.json * Update holster.json * Update scarfs.json * Update scarfs.json * Update legs.json * Update nested.json * Update suits_protection.json * Update wheat.json * Update legs.json * Update legs.json * Update mutations.json * Delete polymer_plant * Update boots.json * Update gloves.json * Update holster.json * Update scarfs.json * Update feet.json * Update hands.json * Update legs.json * Update storage.json * lint * Update scarfs.json * Update feet.json * Update mutations.json * Update holster.json * Update holster.json * Update consumption.cpp * Update flag.cpp * Update character_attire.cpp * Update holster.json * Update storage.json * Update nested.json * Update consumption.cpp * Update character_attire.cpp * Update consumption.cpp * .22 ar * Update magazines.json * Update magazines.json * Update magazines.json * Update magazines.json * Update mechanism.json * Update 22.json * .22 ar * Update gunmod.json * lint * Update gunmod.json * Update magazines.json * Update 22.json * Update mechanism.json * Update data/json/mutations/mutations.json Co-authored-by: NetSysFire <[email protected]> * Update character_attire.cpp * Update holster.json * Update item_factory.cpp * Update holster.json * Update nested.json * Update storage.json * Update nested.json * Update holster.json * Update holster.json * Update gear.json * Update gunstore.json * Update military.json * Update clothing.json * Update locations.json * Update item_factory.cpp * Update item_factory.cpp * Update holster.json * Update storage.json * Update sheath.json * Update storage.json * Update holster.json * Update storage.json * Update storage.json * Update storage.json * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update nested.json * Update holster.json * Update boots.json * Update legs_armor.json * Update consumption.cpp * Update consumption.cpp * Update character_attire.cpp * Update sheath.json * Update suits_protection.json * Update legs.json * Update holster.json * Update holster.json * Apply suggestions from code review Co-authored-by: David Seguin <[email protected]> * Update src/consumption.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Ferride <[email protected]> Co-authored-by: NetSysFire <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: David Seguin <[email protected]>
hexagonrecursion · Jun 29, 2023 · f0cadfe · f0cadfe
1 parent eee86cb
commit f0cadfe
Show file tree

Hide file tree

Showing 27 changed files with 856 additions and 18 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -1185,6 +1185,10 @@
     "id": "ALLERGEN_WOOL",
     "type": "json_flag"
   },
+  {
+    "id": "ANIMAL_PRODUCT",
+    "type": "json_flag"
+  },
   {
     "id": "ALWAYS_TWOHAND",
     "info": "<bad>You must</bad> have two free hands to wield this item.",

diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -2859,7 +2859,7 @@
       [ "glasses_bal", 30 ],
       [ "sheath", 10 ],
       [ "bootsheath", 8 ],
-      [ "holster", 15 ],
+      [ "nylon_holster", 15 ],
       [ "sholster", 10 ],
       [ "shoulder_holster", 1 ],
       [ "bandolier_shotgun", 8 ],
@@ -2971,7 +2971,8 @@
       [ "motorbike_armor", 5 ],
       [ "motorbike_pants", 5 ],
       [ "motorbike_boots", 5 ],
-      [ "holster", 8 ],
+      [ "holster", 3 ],
+      [ "nylon_holster", 5 ],
       [ "sholster", 4 ],
       [ "shoulder_holster", 1 ],
       [ "bootstrap", 3 ],
@@ -3341,7 +3342,8 @@
       [ "wristwatch", 24 ],
       [ "diving_watch", 16 ],
       [ "pocketwatch", 14 ],
-      [ "holster", 14 ],
+      [ "holster", 6 ],
+      [ "nylon_holster", 8 ],
       [ "bandana", 18 ],
       [ "scarf", 26 ],
       [ "long_knit_scarf", 15 ],
@@ -4429,7 +4431,8 @@
       { "item": "gartersheath2", "prob": 10 },
       { "item": "sheath", "prob": 80 },
       { "item": "back_holster", "prob": 10 },
-      { "item": "holster", "prob": 30 },
+      { "item": "holster", "prob": 10 },
+      { "item": "nylon_holster", "prob": 20 },
       { "item": "sholster", "prob": 10 },
       { "item": "shoulder_holster", "prob": 1 },
       { "item": "bholster", "prob": 10 },

diff --git a/data/json/itemgroups/Clothing_Gear/gear.json b/data/json/itemgroups/Clothing_Gear/gear.json
@@ -18,7 +18,8 @@
       [ "holo_sight", 20 ],
       [ "balclava", 10 ],
       [ "balaclava_cut_resistant", 5 ],
-      [ "holster", 15 ],
+      [ "nylon_holster", 10 ],
+      [ "holster", 5 ],
       [ "bandolier_shotgun", 15 ],
       [ "torso_bandolier_shotgun", 8 ],
       [ "kevlar", 20 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1620,7 +1620,8 @@
       { "item": "file", "prob": 25 },
       { "item": "baton", "prob": 20 },
       { "item": "kevlar", "prob": 15 },
-      { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster", "prob": 10 },
+      { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster", "prob": 4 },
+      { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "nylon_holster", "prob": 6 },
       { "item": "survnote", "prob": 10 },
       { "item": "family_photo", "prob": 10 },
       { "item": "tazer", "prob": 5 }

diff --git a/data/json/itemgroups/SUS/gunstore.json b/data/json/itemgroups/SUS/gunstore.json
@@ -119,7 +119,8 @@
       { "item": "knee_pads", "prob": 20 },
       { "item": "kevlar", "prob": 5 },
       { "item": "elbow_pads", "prob": 20 },
-      { "item": "holster", "prob": 45 },
+      { "item": "nylon_holster", "prob": 25 },
+      { "item": "holster", "prob": 20 },
       { "item": "sholster", "prob": 20 },
       { "item": "shoulder_holster", "prob": 5 },
       { "item": "boots_combat", "prob": 10 },

diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json
@@ -488,7 +488,7 @@
     "id": "infantry_officer_gear",
     "subtype": "collection",
     "entries": [
-      { "item": "holster", "contents-group": "military_standard_pistols", "prob": 90 },
+      { "item": "nylon_holster", "contents-group": "military_standard_pistols", "prob": 90 },
       { "item": "id_military", "prob": 90 }
     ]
   },
@@ -604,7 +604,7 @@
       { "item": "gloves_fingerless", "prob": 20 },
       { "item": "glasses_safety", "prob": 40 },
       { "item": "hat_boonie", "prob": 10 },
-      { "item": "holster", "prob": 15 },
+      { "item": "nylon_holster", "prob": 15 },
       { "item": "sholster", "prob": 10 },
       { "item": "bandolier_shotgun", "prob": 12 },
       { "item": "torso_bandolier_shotgun", "prob": 8 },

diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
@@ -445,6 +445,73 @@
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
     "extend": { "flags": [ "UNDERSIZE" ] }
   },
+  {
+    "id": "boots_faux_fur",
+    "type": "ARMOR",
+    "name": { "str": "pair of faux fur boots", "str_pl": "pairs of faux fur boots" },
+    "description": "Boots lined with fur for warmth.",
+    "weight": "1890 g",
+    "volume": "4500 ml",
+    "price": 14000,
+    "price_postapoc": 750,
+    "to_hit": -1,
+    "material": [ "cotton", "faux_fur" ],
+    "symbol": "[",
+    "looks_like": "boots",
+    "color": "brown",
+    "warmth": 40,
+    "material_thickness": 3,
+    "environmental_protection": 2,
+    "flags": [ "VARSIZE", "WATERPROOF" ],
+    "armor": [
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [
+          "foot_toes_r",
+          "foot_toes_l",
+          "foot_ankle_r",
+          "foot_ankle_l",
+          "foot_heel_r",
+          "foot_heel_l",
+          "foot_arch_r",
+          "foot_arch_l"
+        ],
+        "material": [
+          { "type": "cotton", "covered_by_mat": 100, "thickness": 1.5 },
+          { "type": "faux_fur", "covered_by_mat": 100, "thickness": 1.5 }
+        ],
+        "encumbrance": 20,
+        "coverage": 100
+      },
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [ "foot_sole_r", "foot_sole_l" ],
+        "material": [
+          { "type": "leather", "covered_by_mat": 100, "thickness": 0.1 },
+          { "type": "rubber", "covered_by_mat": 100, "thickness": 4.0 }
+        ],
+        "coverage": 100
+      }
+    ],
+    "melee_damage": { "bash": 1 }
+  },
+  {
+    "id": "xl_boots_faux_fur",
+    "type": "ARMOR",
+    "name": { "str": "pair of XL faux fur boots", "str_pl": "pairs of XL faux fur boots" },
+    "copy-from": "boots_faux_fur",
+    "proportional": { "weight": 1.15, "volume": 1.15 },
+    "extend": { "flags": [ "OVERSIZE" ] }
+  },
+  {
+    "id": "xs_boots_faux_fur",
+    "type": "ARMOR",
+    "copy-from": "boots_faux_fur",
+    "looks_like": "boots_fur",
+    "name": { "str": "pair of XS faux fur boots", "str_pl": "pairs of XS faux fur boots" },
+    "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
+    "extend": { "flags": [ "UNDERSIZE" ] }
+  },
   {
     "id": "boots_hiking",
     "type": "ARMOR",
@@ -1343,6 +1410,24 @@
     "flags": [ "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ],
     "armor": [ { "encumbrance": 5, "coverage": 65, "covers": [ "foot_l", "foot_r" ] } ]
   },
+  {
+    "id": "footrags_faux_fur",
+    "type": "ARMOR",
+    "name": { "str": "pair of faux fur foot wraps", "str_pl": "pairs of faux fur foot wraps" },
+    "description": "Faux fur patches tied around your feet.  Not much of an improvement over being barefoot, but still better than nothing.",
+    "weight": "135 g",
+    "volume": "500 ml",
+    "price": 700,
+    "price_postapoc": 50,
+    "material": [ "faux_fur" ],
+    "symbol": "[",
+    "looks_like": "socks_wool",
+    "color": "brown",
+    "warmth": 18,
+    "material_thickness": 1.5,
+    "flags": [ "OVERSIZE", "ALLOWS_NATURAL_ATTACKS" ],
+    "armor": [ { "encumbrance": 5, "coverage": 65, "covers": [ "foot_l", "foot_r" ] } ]
+  },
   {
     "id": "footrags_leather",
     "type": "ARMOR",

diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json
@@ -635,6 +635,41 @@
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
     "extend": { "flags": [ "UNDERSIZE" ] }
   },
+  {
+    "id": "gloves_faux_fur",
+    "type": "ARMOR",
+    "name": { "str": "pair of faux fur gloves", "str_pl": "pairs of faux fur gloves" },
+    "description": "A pair of warm faux fur gloves.",
+    "weight": "410 g",
+    "volume": "1 L",
+    "price": 4000,
+    "price_postapoc": 250,
+    "to_hit": 1,
+    "material": [ "faux_fur" ],
+    "symbol": "[",
+    "looks_like": "fire_gauntlets",
+    "color": "brown",
+    "warmth": 55,
+    "material_thickness": 3,
+    "armor": [ { "encumbrance": 30, "coverage": 95, "covers": [ "hand_l", "hand_r" ] } ]
+  },
+  {
+    "id": "xl_gloves_faux_fur",
+    "type": "ARMOR",
+    "name": { "str": "pair of XL faux fur gloves", "str_pl": "pairs of XL faux fur gloves" },
+    "copy-from": "gloves_faux_fur",
+    "proportional": { "weight": 1.6, "volume": 1.6 },
+    "extend": { "flags": [ "OVERSIZE" ] }
+  },
+  {
+    "id": "xs_gloves_faux_fur",
+    "type": "ARMOR",
+    "copy-from": "gloves_faux_fur",
+    "looks_like": "gloves_fur",
+    "name": { "str": "pair of XS faux fur gloves", "str_pl": "pairs of XS fur gloves" },
+    "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
+    "extend": { "flags": [ "UNDERSIZE" ] }
+  },
   {
     "id": "glove_jackson",
     "type": "ARMOR",