Merge pull request #1 from CleverRaven/master

Update forked repo

data/json/effects.json

@@ -1600,6 +1600,19 @@
     "max_intensity": 3,
     "scaling_mods": { "h_mod_min": [ -5 ] }
   },
+  {
+    "type": "effect_type",
+    "id": "bad_food_ennui",
+    "name": [ "Gross food", "Demoralizing food", "Depressing food" ],
+    "desc": [
+      "The food you eat is disgusting.",
+      "Eating nothing but disgusting rations is starting to get you down.",
+      "Sure, you survived, but what kind of survival is this, eating these disgusting rations day in and day out?"
+    ],
+    "max_intensity": 3,
+    "//": "No morale_mod is currently possible in effects, for some reason.  As soon as it's implemented, it goes here.",
+    "rating": "bad"
+  },
   {
     "type": "effect_type",
     "id": "cough_suppress"

data/json/furniture_and_terrain/furniture-fakes.json

@@ -23,14 +23,14 @@
     "required_str": 0,
     "deconstruct": { "items": [  ] },
     "bash": { "str_min": 0, "str_max": 0, "items": [  ] },
-    "flags": [ "PLACE_ITEM", "TRANSPARENT", "EASY_DECONSTRUCT" ],
+    "flags": [ "PLACE_ITEM", "TRANSPARENT", "EASY_DECONSTRUCT", "NOCOLLIDE" ],
     "examine_action": "workbench",
     "workbench": { "multiplier": 0.7, "mass": 1000000, "volume": "1000L" }
   },
   {
     "type": "furniture",
     "id": "f_no_item",
-    "//": "This is used in a hack to clear furniture with the keg iexamine of all items execept the stored liquid before usage.",
+    "//": "This is used in a hack to clear furniture with the keg iexamine of all items except the stored liquid before usage.",
     "name": "seeing this is a bug",
     "description": "Seeing this is a bug.  If seen, please report and destroy.",
     "symbol": "#",

data/json/itemgroups/SUS_specific_use_storage_items.json

@@ -9,13 +9,52 @@
       [ "evac_pamphlet", 99 ],
       [ "jacket_evac", 75 ],
       [ "emer_blanket", 75 ],
-      [ "mask_gas", 5 ],
+      [ "mask_gas", 2 ],
       [ "flashlight", 50 ],
+      [ "light_disposable_cell", 10 ],
       [ "lighter", 20 ],
-      { "item": "water_clean", "count": 2, "prob": 80 },
-      { "item": "protein_bar_evac", "count": 3 },
+      { "item": "water_clean", "count": [ 1, 2 ], "prob": 80 },
+      { "item": "protein_bar_evac", "count": [ 2, 3 ] },
       {
-        "collection": [ { "item": "plastic_spoon" }, { "item": "plastic_knife" }, { "item": "plastic_fork" }, { "item": "bowl_plastic" } ],
+        "collection": [
+          { "item": "plastic_spoon", "prob": 90 },
+          { "item": "plastic_knife", "prob": 90 },
+          { "item": "plastic_fork", "prob": 90 },
+          { "item": "bowl_plastic", "prob": 90 }
+        ],
+        "prob": 90
+      }
+    ]
+  },
+  {
+    "id": "SUS_evac_shelter_locker_used",
+    "type": "item_group",
+    "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
+    "//2": "This locker has been picked through by an evacuee already. Not everyone wants the jacket, plenty leave the blanket or the gas mask, but the useful stuff is usually gone.  Some people left junk behind.",
+    "subtype": "collection",
+    "items": [
+      [ "evac_pamphlet", 95 ],
+      [ "jacket_evac", 15 ],
+      [ "emer_blanket", 45 ],
+      [ "mask_gas", 1 ],
+      [ "flashlight", 10 ],
+      [ "wrapper", 50 ],
+      [ "survnote", 5 ],
+      [ "plastic_shopping_bag", 5 ],
+      [ "box_small", 5 ],
+      [ "bag_plastic", 5 ],
+      [ "bowl_plastic", 5 ],
+      [ "can_food_unsealed", 5 ],
+      [ "can_opener", 3 ],
+      { "item": "bottle_plastic", "count": [ 1, 2 ], "prob": 50 },
+      { "item": "protein_bar_evac", "count": [ 2, 3 ], "prob": 70 },
+      {
+        "collection": [
+          { "item": "plastic_spoon", "prob": 70 },
+          { "item": "plastic_knife", "prob": 70 },
+          { "item": "plastic_fork", "prob": 70 },
+          { "item": "bowl_plastic", "prob": 50 }
+        ],
         "prob": 90
       }
     ]
@@ -30,15 +69,18 @@
       {
         "distribution": [
           {
-            "collection": [ { "item": "emer_blanket", "count": 5, "prob": 80 }, { "item": "jacket_evac", "count": 5, "prob": 80 } ],
+            "collection": [
+              { "item": "emer_blanket", "count": [ 5, 10 ], "prob": 80 },
+              { "item": "jacket_evac", "count": [ 5, 10 ], "prob": 80 }
+            ],
             "prob": 30
           },
-          { "item": "water_clean", "count": 12, "prob": 20 },
-          { "item": "protein_bar_evac", "count": 24, "prob": 60 },
+          { "item": "water_clean", "count": [ 6, 12 ], "prob": 20 },
+          { "item": "protein_bar_evac", "count": [ 20, 24 ], "prob": 60 },
           {
             "collection": [
               { "item": "extinguisher", "prob": 70 },
-              { "item": "1st_aid", "count": [ 1, 3 ], "prob": 85 },
+              { "item": "1st_aid", "count": [ 1, 3 ], "prob": 65 },
               { "item": "two_way_radio", "prob": 65 },
               { "item": "light_disposable_cell", "count": [ 2, 4 ], "prob": 65 },
               { "item": "electric_lantern", "prob": 35 }
@@ -47,18 +89,81 @@
           },
           {
             "collection": [
-              { "item": "detergent", "count": [ 1, 2 ] },
+              { "item": "detergent", "count": [ 0, 2 ] },
+              { "item": "brush", "prob": 85 },
+              { "item": "bleach", "prob": 45 },
+              { "item": "ammonia", "prob": 15 }
+            ],
+            "prob": 15
+          },
+          {
+            "collection": [
+              { "item": "can_beans", "count": [ 8, 12 ], "prob": 50 },
+              { "item": "can_tomato", "count": [ 8, 12 ], "prob": 40 },
+              { "item": "soup_chicken", "count": [ 8, 12 ], "prob": 20 },
+              { "item": "can_opener", "prob": 90 }
+            ],
+            "prob": 5
+          }
+        ]
+      },
+      [ "evac_pamphlet", 15 ]
+    ]
+  },
+  {
+    "id": "SUS_evac_shelter_cabinet_used",
+    "type": "item_group",
+    "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
+    "//2": "These cabinets have been picked over by a previous flood of evacuees, but plenty of good stuff could still be left.",
+    "subtype": "collection",
+    "items": [
+      {
+        "distribution": [
+          {
+            "collection": [
+              { "item": "emer_blanket", "count": [ 1, 10 ], "prob": 60 },
+              { "item": "jacket_evac", "count": [ 1, 10 ], "prob": 50 }
+            ],
+            "prob": 30
+          },
+          {
+            "collection": [
+              { "item": "water_clean", "count": [ 1, 6 ], "prob": 60 },
+              { "item": "bottle_plastic", "count": [ 1, 6 ], "prob": 90 }
+            ],
+            "prob": 50
+          },
+          { "item": "protein_bar_evac", "count": [ 1, 23 ], "prob": 60 },
+          {
+            "collection": [
+              { "item": "extinguisher", "prob": 50 },
+              { "item": "1st_aid", "prob": 5 },
+              { "item": "two_way_radio", "prob": 25 },
+              { "item": "electric_lantern", "prob": 5 }
+            ],
+            "prob": 10
+          },
+          {
+            "collection": [
+              { "item": "detergent", "count": [ 0, 2 ] },
               { "item": "brush", "prob": 85 },
-              { "item": "bleach", "prob": 65 },
-              { "item": "ammonia", "prob": 35 }
+              { "item": "bleach", "charges-min": 1, "prob": 45 },
+              { "item": "box_small", "prob": 5 },
+              { "item": "bag_plastic", "prob": 5 },
+              { "item": "bowl_plastic", "prob": 5 },
+              { "item": "ammonia", "charges-min": 1, "prob": 15 }
             ],
             "prob": 15
           },
           {
             "collection": [
-              { "item": "can_beans", "count": 12, "prob": 50 },
-              { "item": "can_tomato", "count": 12, "prob": 40 },
-              { "item": "soup_chicken", "count": 12, "prob": 20 },
+              { "item": "can_beans", "count": [ 1, 2 ], "prob": 10 },
+              { "item": "can_tomato", "count": [ 1, 2 ], "prob": 5 },
+              { "item": "soup_chicken", "count": [ 1, 2 ], "prob": 2 },
+              { "item": "box_small", "prob": 5 },
+              { "item": "bag_plastic", "prob": 5 },
+              { "item": "bowl_plastic", "prob": 5 },
+              { "item": "can_food_unsealed", "count": [ 1, 30 ], "prob": 90 },
               { "item": "can_opener", "prob": 90 }
             ],
             "prob": 5

data/json/itemgroups/gear.json

@@ -14,11 +14,7 @@
       [ "joint", 10 ],
       [ "ref_lighter", 50 ],
       [ "matches", 50 ],
-      [ "ecig", 15 ],
-      [ "chaw", 5 ],
-      [ "cigar", 5 ],
-      [ "advanced_ecig", 10 ],
-      [ "nicotine_liquid", 25 ],
+      { "group": "tobacco_products", "prob": 60 },
       [ "permanent_marker", 10 ],
       [ "dog_whistle", 5 ],
       [ "multitool", 1 ],