Merge pull request #5 from CleverRaven/master

BackToRootsJune14
Inglonias · Jun 15, 2019 · e16a5fa · e16a5fa
2 parents 5c7c8d9 + a6cb1c7
commit e16a5fa
Show file tree

Hide file tree

Showing 167 changed files with 56,708 additions and 14,160 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -1750,6 +1750,124 @@
     "pre_special": "check_empty",
     "post_terrain": "f_wardrobe"
   },
+  {
+    "type": "construction",
+    "description": "Build Safe",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 9 ] ],
+    "time": "420 m",
+    "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "SCREW", "level": 1 } ], [ { "id": "SMOOTH", "level": 2 } ] ],
+    "using": [ [ "welding_standard", 15 ] ],
+    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "components": [
+      [ [ "hdframe", 1 ] ],
+      [ [ "steel_lump", 2 ], [ "steel_chunk", 8 ], [ "scrap", 40 ] ],
+      [ [ "sheet_metal", 2 ] ],
+      [ [ "rebar", 16 ] ],
+      [ [ "concrete", 6 ] ],
+      [ [ "water", 4 ], [ "water_clean", 4 ] ],
+      [ [ "cargo_lock", 1 ] ],
+      [ [ "hard_plate", 1 ] ]
+    ],
+    "pre_special": "check_empty",
+    "post_terrain": "f_safe_o"
+  },
+  {
+    "type": "construction",
+    "description": "Build Dumpster",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 6 ] ],
+    "time": "180 m",
+    "qualities": [ [ { "id": "SAW_M", "level": 1 } ] ],
+    "using": [ [ "welding_standard", 15 ] ],
+    "components": [ [ [ "frame", 4 ] ], [ [ "sheet_metal", 16 ] ], [ [ "steel_lump", 2 ], [ "steel_chunk", 8 ], [ "scrap", 40 ] ] ],
+    "pre_special": "check_empty",
+    "post_terrain": "f_dumpster"
+  },
+  {
+    "type": "construction",
+    "description": "Build Mailbox",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 4 ] ],
+    "time": "60 m",
+    "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "HAMMER", "level": 2 } ] ],
+    "using": [ [ "welding_standard", 1 ] ],
+    "components": [ [ [ "sheet_metal", 1 ] ], [ [ "2x4", 2 ] ], [ [ "nail", 5 ] ] ],
+    "pre_special": "check_empty",
+    "post_terrain": "f_mailbox"
+  },
+  {
+    "type": "construction",
+    "description": "Build Bar Door",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 6 ] ],
+    "time": "180 m",
+    "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "SCREW", "level": 1 } ] ],
+    "using": [ [ "welding_standard", 8 ] ],
+    "components": [ [ [ "rebar", 16 ] ], [ [ "sheet_metal_small", 12 ] ] ],
+    "pre_terrain": "t_mdoor_frame",
+    "post_terrain": "t_door_bar_c"
+  },
+  {
+    "type": "construction",
+    "description": "Install Bars Onto Window",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 5 ] ],
+    "time": "90 m",
+    "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "SCREW", "level": 1 } ] ],
+    "using": [ [ "welding_standard", 4 ] ],
+    "components": [ [ [ "rebar", 8 ] ], [ [ "sheet_metal_small", 6 ] ] ],
+    "pre_terrain": "t_window",
+    "post_terrain": "t_window_bars"
+  },
+  {
+    "type": "construction",
+    "description": "Install Bars Onto Window",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 5 ] ],
+    "time": "90 m",
+    "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "SCREW", "level": 1 } ] ],
+    "using": [ [ "welding_standard", 4 ] ],
+    "components": [ [ [ "rebar", 8 ] ], [ [ "sheet_metal_small", 6 ] ] ],
+    "pre_terrain": "t_window_no_curtains",
+    "post_terrain": "t_window_bars"
+  },
+  {
+    "type": "construction",
+    "description": "Install Bars Onto Window",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 5 ] ],
+    "time": "90 m",
+    "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "SCREW", "level": 1 } ] ],
+    "using": [ [ "welding_standard", 3 ] ],
+    "components": [ [ [ "rebar", 8 ] ], [ [ "sheet_metal_small", 6 ] ] ],
+    "pre_terrain": "t_window_alarm",
+    "post_terrain": "t_window_bars_alarm"
+  },
+  {
+    "type": "construction",
+    "description": "Build Large Metal Support",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 9 ] ],
+    "time": "600 m",
+    "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "WRENCH", "level": 1 } ], [ { "id": "SCREW", "level": 1 } ] ],
+    "using": [ [ "welding_standard", 20 ] ],
+    "components": [ [ [ "frame", 10 ] ] ],
+    "pre_terrain": "t_concrete",
+    "post_terrain": "t_support_l"
+  },
+  {
+    "type": "construction",
+    "description": "Build Small Metal Support",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 8 ] ],
+    "time": "240 m",
+    "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "WRENCH", "level": 1 } ], [ { "id": "SCREW", "level": 1 } ] ],
+    "using": [ [ "welding_standard", 10 ] ],
+    "components": [ [ [ "pipe", 18 ] ] ],
+    "pre_terrain": "t_concrete",
+    "post_terrain": "t_support_s"
+  },
   {
     "type": "construction",
     "description": "Paint Grass White",

diff --git a/data/json/flags.json b/data/json/flags.json
@@ -257,6 +257,12 @@
     "context": [ "COMESTIBLE" ],
     "description": "forces calories and vitamins to be the ones defined in the json, instead of inheriting from ingredients"
   },
+  {
+    "id": "PLANTABLE_SEED",
+    "type": "json_flag",
+    "context": [ "COMESTIBLE" ],
+    "info": "You could probably <color_brown>plant</color> these."
+  },
   {
     "id": "MELTS",
     "type": "json_flag",

diff --git a/data/json/furniture.json b/data/json/furniture.json
@@ -2114,7 +2114,11 @@
       "str_max": 200,
       "sound": "screeching metal!",
       "sound_fail": "whump!",
-      "items": [ { "item": "steel_chunk", "count": [ 1, 5 ] }, { "item": "scrap", "count": [ 1, 5 ] } ]
+      "items": [
+        { "item": "steel_chunk", "count": [ 1, 5 ] },
+        { "item": "scrap", "count": [ 1, 5 ] },
+        { "item": "rock", "count": [ 1, 2 ] }
+      ]
     }
   },
   {
@@ -2135,7 +2139,11 @@
       "str_max": 200,
       "sound": "screeching metal!",
       "sound_fail": "whump!",
-      "items": [ { "item": "steel_chunk", "count": [ 1, 5 ] }, { "item": "scrap", "count": [ 1, 5 ] } ]
+      "items": [
+        { "item": "steel_chunk", "count": [ 1, 5 ] },
+        { "item": "scrap", "count": [ 1, 5 ] },
+        { "item": "rock", "count": [ 1, 2 ] }
+      ]
     }
   },
   {
@@ -2156,7 +2164,11 @@
       "str_max": 200,
       "sound": "screeching metal!",
       "sound_fail": "whump!",
-      "items": [ { "item": "steel_chunk", "count": [ 1, 5 ] }, { "item": "scrap", "count": [ 1, 5 ] } ]
+      "items": [
+        { "item": "steel_chunk", "count": [ 1, 5 ] },
+        { "item": "scrap", "count": [ 1, 5 ] },
+        { "item": "rock", "count": [ 1, 2 ] }
+      ]
     }
   },
   {
@@ -2176,7 +2188,11 @@
       "str_max": 200,
       "sound": "screeching metal!",
       "sound_fail": "whump!",
-      "items": [ { "item": "steel_chunk", "count": [ 1, 5 ] }, { "item": "scrap", "count": [ 1, 5 ] } ]
+      "items": [
+        { "item": "steel_chunk", "count": [ 1, 5 ] },
+        { "item": "scrap", "count": [ 1, 5 ] },
+        { "item": "rock", "count": [ 1, 2 ] }
+      ]
     }
   },
   {
@@ -2197,7 +2213,11 @@
       "str_max": 200,
       "sound": "screeching metal!",
       "sound_fail": "whump!",
-      "items": [ { "item": "steel_chunk", "count": [ 1, 5 ] }, { "item": "scrap", "count": [ 1, 5 ] } ]
+      "items": [
+        { "item": "steel_chunk", "count": [ 1, 5 ] },
+        { "item": "scrap", "count": [ 1, 5 ] },
+        { "item": "rock", "count": [ 1, 2 ] }
+      ]
     }
   },
   {
@@ -2218,7 +2238,11 @@
       "str_max": 200,
       "sound": "screeching metal!",
       "sound_fail": "whump!",
-      "items": [ { "item": "steel_chunk", "count": [ 1, 5 ] }, { "item": "scrap", "count": [ 1, 5 ] } ]
+      "items": [
+        { "item": "steel_chunk", "count": [ 1, 5 ] },
+        { "item": "scrap", "count": [ 1, 5 ] },
+        { "item": "rock", "count": [ 1, 2 ] }
+      ]
     }
   },
   {

diff --git a/data/json/items/armor.json b/data/json/items/armor.json
@@ -10022,7 +10022,7 @@
     "type": "ARMOR",
     "category": "armor",
     "name": "XL survivor suit",
-    "description": "A massive home-built combination armor made from a bulletproof vest and a reinforced leather jumpsuit.  Protects from the elements as well as from harm.",
+    "description": "A massive hand-built combination armor made from a bulletproof vest and a reinforced leather jumpsuit.  Protects from the elements as well as from harm.",
     "weight": 12400,
     "volume": 72,
     "price": 150000,
@@ -10036,7 +10036,31 @@
     "encumbrance": 35,
     "storage": 34,
     "warmth": 15,
-    "material_thickness": 3,
+    "material_thickness": 4,
+    "environmental_protection": 3,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ]
+  },
+  {
+    "id": "xlhsurvivor_suit",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": "XL heavy survivor suit",
+    "description": "A massive, heavy, hand-built combination armor made from a reinforced bulletproof vest and a metal-plated leather jumpsuit.  Protects from the elements as well as from harm.",
+    "looks_like": "hsurvivor_suit",
+    "weight": 16500,
+    "volume": 75,
+    "price": 200000,
+    "to_hit": -3,
+    "bashing": 6,
+    "material": [ "kevlar", "steel", "leather" ],
+    "symbol": "[",
+    "color": "dark_gray",
+    "covers": [ "LEGS", "TORSO", "ARMS" ],
+    "coverage": 100,
+    "encumbrance": 45,
+    "storage": 30,
+    "warmth": 15,
+    "material_thickness": 6,
     "environmental_protection": 3,
     "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ]
   },

diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json
@@ -356,5 +356,38 @@
       "flags": [ "MAG_COMPACT" ]
     },
     "flags": [ "STURDY", "OUTER" ]
+  },
+  {
+    "id": "xlkevlar",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": "XL kevlar vest",
+    "description": "A massive, hand-built kevlar vest based on the design of existing bullet resistant vests.  It has four pouches capable of carrying magazines.",
+    "looks_like": "modularvest",
+    "weight": 5148,
+    "volume": 43,
+    "price": 200000,
+    "to_hit": -3,
+    "bashing": 6,
+    "material": [ "kevlar" ],
+    "symbol": "[",
+    "color": "light_gray",
+    "covers": [ "TORSO" ],
+    "coverage": 85,
+    "encumbrance": 17,
+    "storage": 10,
+    "warmth": 15,
+    "material_thickness": 4,
+    "use_action": {
+      "type": "holster",
+      "holster_prompt": "Stash ammo",
+      "holster_msg": "You stash your %s.",
+      "multi": 4,
+      "min_volume": 1,
+      "max_volume": 4,
+      "draw_cost": 60,
+      "flags": [ "MAG_COMPACT" ]
+    },
+    "flags": [ "OVERSIZE", "STURDY", "OUTER" ]
   }
 ]
diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json
@@ -567,8 +567,9 @@
   {
     "type": "COMESTIBLE",
     "id": "neccowafers",
-    "name": "Necco wafer",
-    "weight": 46,
+    "name": "Necco wafers",
+    "name_plural": "Necco wafers",
+    "weight": 60,
     "color": "magenta",
     "spoils_in": "180 days",
     "stim": 1,
@@ -581,7 +582,7 @@
     "description": "A handful of candy wafers, in assorted flavors: orange, lemon, lime, clove, chocolate, wintergreen, cinnamon, and licorice.  Yum!",
     "price": 100,
     "material": "junk",
-    "volume": 0,
+    "volume": "40 ml",
     "flags": [ "EDIBLE_FROZEN" ],
     "fun": 4
   },

diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -378,7 +378,8 @@
     "description": "Light brown beans, they have many uses, mildly toxic and not recommended, but you could eat them raw.",
     "price": 90,
     "fun": -5,
-    "vitamins": [ [ "iron", 25 ], [ "vitC", 1 ], [ "calcium", 3 ] ]
+    "vitamins": [ [ "iron", 25 ], [ "vitC", 1 ], [ "calcium", 3 ] ],
+    "flags": "NUTRIENT_OVERRIDE"
   },
   {
     "type": "COMESTIBLE",
@@ -394,7 +395,8 @@
     "description": "Light green raw edamame still in its pod, you should boil or freeze these, or you could eat them while they are still toxic.",
     "price": 150,
     "fun": 1,
-    "vitamins": [ [ "iron", 26 ], [ "vitC", 16 ], [ "calcium", 6 ] ]
+    "vitamins": [ [ "iron", 26 ], [ "vitC", 16 ], [ "calcium", 6 ] ],
+    "flags": "NUTRIENT_OVERRIDE"
   },
   {
     "type": "COMESTIBLE",