Cardboard as a material (CleverRaven#37764)

* Added cardboard material

* Added cardboard to misc repair kit

* Added cardboard as an item

* Replaced paper with cardboard in item materials

* Added cardboard to uncraft recipes

* Changed fletching requirement

* Reverted changes from conflict

* Raised weight/dropped charge amount

* Dropped amount needed for recipes

* Adjusted deconstruction recipes

data/json/items/armor/eyewear.json

@@ -9,7 +9,7 @@
     "volume": "250 ml",
     "price": 2500,
     "to_hit": -2,
-    "material": [ "paper" ],
+    "material": [ "cardboard" ],
     "symbol": "[",
     "looks_like": "sunglasses",
     "color": "light_gray",

data/json/items/comestibles/other.json

@@ -237,6 +237,24 @@
     "charges": 50,
     "fun": -20
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "cardboard",
+    "name": "cardboard",
+    "looks_like": "paper",
+    "category": "spare_parts",
+    "weight": "10 g",
+    "color": "brown",
+    "comestible_type": "FOOD",
+    "symbol": "`",
+    "description": "A piece of cardboard.",
+    "price": 0,
+    "material": "cardboard",
+    "volume": "250 ml",
+    "freezing_point": -490,
+    "charges": 10,
+    "fun": -20
+  },
   {
     "type": "COMESTIBLE",
     "id": "can_beans",

data/json/items/containers.json

@@ -294,7 +294,7 @@
     "weight": "151 g",
     "volume": "1 L",
     "price": 0,
-    "material": "paper",
+    "material": "cardboard",
     "symbol": ")",
     "color": "brown",
     "contains": "1 L"
@@ -309,7 +309,7 @@
     "volume": "2 L",
     "//": "Volume is much lower than the actual volume of a box this size because presumably if it's in your pack, it isn't empty and full of air; and if it's in your hands, it's irrelevant what the volume is.",
     "price": 0,
-    "material": "paper",
+    "material": "cardboard",
     "symbol": ")",
     "color": "brown",
     "contains": "3 L"
@@ -324,7 +324,7 @@
     "volume": "3 L",
     "//": "Volume is much lower than the actual volume of a box this size because presumably if it's in your pack, it isn't empty and full of air; and if it's in your hands, it's irrelevant what the volume is.",
     "price": 0,
-    "material": "paper",
+    "material": "cardboard",
     "symbol": ")",
     "color": "brown",
     "contains": "5 L",

data/json/items/fluff.json

@@ -22,7 +22,7 @@
     "weight": "50 g",
     "volume": "100 ml",
     "price": 2000,
-    "material": [ "paper" ],
+    "material": [ "cardboard" ],
     "symbol": ",",
     "color": "red",
     "flags": [ "NO_REPAIR" ],

data/json/items/tool/fire.json

@@ -122,7 +122,7 @@
     "weight": "10 g",
     "volume": 0,
     "price": 10,
-    "material": "paper",
+    "material": "cardboard",
     "symbol": ",",
     "color": "blue",
     "initial_charges": 20,

data/json/items/tool/workshop.json

@@ -503,7 +503,7 @@
       {
         "type": "repair_item",
         "item_action_type": "repair_metal",
-        "materials": [ "acidchitin", "bone", "chitin", "paper", "wood", "kevlar_rigid" ],
+        "materials": [ "acidchitin", "bone", "chitin", "paper", "cardboard", "wood", "kevlar_rigid" ],
         "skill": "fabrication",
         "tool_quality": 5,
         "cost_scaling": 0.1,

data/json/materials.json

@@ -922,6 +922,28 @@
     "burn_data": [ { "fuel": 10, "smoke": 1, "burn": 10 }, { "fuel": 8, "smoke": 1, "burn": 20 }, { "fuel": 5, "smoke": 1, "burn": 50 } ],
     "burn_products": [ [ "ash", 0.013 ] ]
   },
+  {
+    "type": "material",
+    "ident": "cardboard",
+    "name": "Cardboard",
+    "density": 2,
+    "specific_heat_liquid": 1.34,
+    "specific_heat_solid": 1.34,
+    "latent_heat": 333,
+    "bash_resist": 1,
+    "cut_resist": 1,
+    "acid_resist": 1,
+    "fire_resist": 0,
+    "elec_resist": 2,
+    "chip_resist": 0,
+    "repaired_with": "cardboard",
+    "salvaged_into": "cardboard",
+    "dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
+    "bash_dmg_verb": "ripped",
+    "cut_dmg_verb": "cut",
+    "burn_data": [ { "fuel": 10, "smoke": 1, "burn": 10 }, { "fuel": 8, "smoke": 1, "burn": 20 }, { "fuel": 5, "smoke": 1, "burn": 50 } ],
+    "burn_products": [ [ "ash", 0.013 ] ]
+  },
   {
     "type": "material",
     "ident": "dry_plant",

data/json/recipes/recipe_ammo.json

@@ -903,6 +903,7 @@
         [ "pine_bough", 1 ],
         [ "rag", 1 ],
         [ "paper", 5 ],
+        [ "cardboard", 1 ],
         [ "rolling_paper", 30 ],
         [ "wrapper", 5 ],
         [ "withered", 2 ],

data/json/recipes/recipe_deconstruction.json

@@ -3210,21 +3210,21 @@
     "type": "uncraft",
     "time": "2 m 3 s",
     "qualities": [ { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "paper", 35 ] ] ]
+    "components": [ [ [ "cardboard", 15 ] ] ]
   },
   {
     "result": "box_medium",
     "type": "uncraft",
     "time": "4 m",
     "qualities": [ { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "paper", 70 ] ] ]
+    "components": [ [ [ "cardboard", 85 ] ] ]
   },
   {
     "result": "box_large",
     "type": "uncraft",
     "time": "6 m",
     "qualities": [ { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "paper", 105 ] ] ]
+    "components": [ [ [ "cardboard", 125 ] ] ]
   },
   {
     "result": "washing_machine",
@@ -3417,7 +3417,7 @@
     "result": "styrofoam_cup",
     "type": "uncraft",
     "time": "6 s",
-    "components": [ [ [ "paper", 10 ] ], [ [ "plastic_chunk", 2 ] ] ],
+    "components": [ [ [ "cardboard", 2 ] ], [ [ "plastic_chunk", 2 ] ] ],
     "flags": [ "BLIND_EASY" ]
   },
   {

data/json/requirements/materials.json

@@ -151,10 +151,9 @@
       [
         [ "feather", 10 ],
         [ "duct_tape", 40 ],
-        [ "paper", 40 ],
+        [ "cardboard", 10 ],
         [ "bag_plastic", 1 ],
         [ "bottle_plastic_small", 1 ],
-        [ "box_small", 1 ],
         [ "plastic_chunk", 1 ],
         [ "aluminum_foil", 40 ],
         [ "cash_card", 2 ]