CleverRaven · I-am-Erk · Nov 21, 2019 · Nov 22, 2019 · Nov 23, 2019 · Nov 27, 2019
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -162,6 +162,16 @@ android {
         }
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+
+    flavorDimensions "version"
+
+    productFlavors {
+        experimental {
+            dimension "version"
+            applicationIdSuffix ".experimental"
+        }
+    }
+
     signingConfigs {
         if (keystoreProperties.getProperty('storeFile') != null) {
             if (file(keystoreProperties.getProperty('storeFile')).exists()) {
@@ -221,7 +231,7 @@ android {
             variant.outputs.each { output ->
                 def outputFile = output.outputFile
                 if (outputFile != null && outputFile.name.endsWith(".aar")) {
-                    def fileName = "com.cleverraven.cataclysmdda.aar";
+                    def fileName = "$applicationId.aar";
                     output.outputFile = new File(outputFile.parent, fileName);
                 }
             }

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -41,5 +41,5 @@ deps=./deps.zip
 override_version=
 
 # This property controls path where overriden version number header should be generated
-# You can override this from the command line by passing "-pversion_header_path=#"
+# You can override this from the command line by passing "-Pversion_header_path=#"
 version_header_path=app/jni/src/version.h
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -701,11 +701,6 @@
     "id": "ELECTRIC_IMMUNE",
     "type": "json_flag"
   },
-  {
-    "id": "NO_CRAFT_INHERIT",
-    "type": "json_flag",
-    "//": "Crafted items with this flag won't inherit flags with craft_inherit from their components."
-  },
   {
     "id": "HIDDEN_HALLU",
     "type": "json_flag",
@@ -725,6 +720,7 @@
     "type": "json_flag",
     "context": [ "COMESTIBLE" ],
     "craft_inherit": true,
+    "taste_mod": -5,
     "//": "Has a bad taste or texture that can't be covered up through cooking.",
     "info": "This food is <bad>unappetizing</bad> in a way that <bad>can't be covered up by most cooking</bad>."
   },

diff --git a/data/json/itemgroups/SUS_specific_use_storage_items.json b/data/json/itemgroups/SUS_specific_use_storage_items.json
@@ -1,4 +1,89 @@
 [
+  {
+    "id": "SUS_evac_shelter_locker",
+    "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": "Each locker contains by spec one jacket, one blanket, one gas mask, a flashlight, a plastic bowl and utensils, a lighter, and two bottles of water.  Not every locker is fully stocked.",
+    "subtype": "collection",
+    "items": [
+      [ "evac_pamphlet", 99 ],
+      [ "jacket_evac", 75 ],
+      [ "emer_blanket", 75 ],
+      [ "mask_gas", 5 ],
+      [ "flashlight", 50 ],
+      [ "lighter", 20 ],
+      { "item": "water_clean", "count": 2, "prob": 80 },
+      { "item": "protein_bar_evac", "count": 3 },
+      {
+        "collection": [ { "item": "plastic_spoon" }, { "item": "plastic_knife" }, { "item": "plastic_fork" }, { "item": "bowl_plastic" } ],
+        "prob": 90
+      }
+    ]
+  },
+  {
+    "id": "SUS_evac_shelter_cabinet",
+    "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": "The cabinets contain a stock of delicious evac protein bars, and may contain clean water, cans of food, and spare blankets.",
+    "subtype": "collection",
+    "items": [
+      {
+        "distribution": [
+          {
+            "collection": [ { "item": "emer_blanket", "count": 5, "prob": 80 }, { "item": "jacket_evac", "count": 5, "prob": 80 } ],
+            "prob": 30
+          },
+          { "item": "water_clean", "count": 12, "prob": 20 },
+          { "item": "protein_bar_evac", "count": 24, "prob": 60 },
+          {
+            "collection": [
+              { "item": "extinguisher", "prob": 70 },
+              { "item": "1st_aid", "count": [ 1, 3 ], "prob": 85 },
+              { "item": "two_way_radio", "prob": 65 },
+              { "item": "light_disposable_cell", "count": [ 2, 4 ], "prob": 65 },
+              { "item": "electric_lantern", "prob": 35 }
+            ],
+            "prob": 10
+          },
+          {
+            "collection": [
+              { "item": "detergent", "count": [ 1, 2 ] },
+              { "item": "brush", "prob": 85 },
+              { "item": "bleach", "prob": 65 },
+              { "item": "ammonia", "prob": 35 }
+            ],
+            "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_opener", "prob": 90 }
+            ],
+            "prob": 5
+          }
+        ]
+      },
+      [ "evac_pamphlet", 15 ]
+    ]
+  },
+  {
+    "id": "SUS_evac_shelter_sink",
+    "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": "The cabinets contain a stock of delicious evac protein bars, and may contain clean water, cans of food, and spare blankets.",
+    "subtype": "collection",
+    "items": [
+      { "item": "soap", "count": [ 1, 2 ] },
+      [ "brush", 90 ],
+      [ "bleach", 45 ],
+      [ "ammonia", 25 ],
+      [ "1st_aid", 60 ],
+      { "item": "paper", "count": [ 1, 3 ] },
+      [ "evac_pamphlet", 10 ]
+    ]
+  },
   {
     "id": "SUS_silverware",
     "type": "item_group",

diff --git a/data/json/itemgroups/collections_trades.json b/data/json/itemgroups/collections_trades.json
@@ -14,31 +14,36 @@
     "type": "item_group",
     "id": "mischw",
     "//": "A general hardware group for retail, workshops, etc., with an odd assortment of extra items.",
+    "//2": "often spawns a box to hold everything, sometimes a plastic sheet to cover it, and then some stuff in the box.",
+    "subtype": "collection",
     "items": [
-      { "group": "tools_general", "prob": 90 },
-      { "group": "supplies_hardware", "prob": 50 },
-      { "group": "hardware_clothing", "prob": 20 },
-      { "group": "hardware_bulk", "prob": 10 },
-      { "group": "hardware_books", "prob": 10 },
-      [ "survnote", 1 ],
-      [ "box_medium", 2 ],
-      [ "box_large", 2 ],
-      [ "plastic_sheet", 2 ],
-      [ "machete", 5 ],
-      [ "boots_combat", 10 ],
-      [ "boots_hiking", 5 ],
-      [ "runner_bag", 3 ],
-      [ "bb", 8 ],
-      [ "bbgun", 10 ],
-      [ "beartrap", 3 ],
-      [ "radio", 20 ],
-      [ "hotplate", 10 ],
-      [ "extinguisher", 20 ],
-      [ "cable", 60 ],
-      [ "sm_extinguisher", 10 ],
-      [ "grapnel", 1 ],
-      [ "misc_repairkit", 5 ],
-      [ "knitting_needles", 1 ]
+      { "distribution": [ [ "box_medium", 75 ], [ "box_large", 25 ] ], "prob": 60 },
+      [ "plastic_sheet", 25 ],
+      {
+        "distribution": [
+          { "group": "tools_general", "prob": 90 },
+          { "group": "supplies_hardware", "prob": 50 },
+          { "group": "hardware_clothing", "prob": 20 },
+          { "group": "hardware_bulk", "prob": 10 },
+          { "group": "hardware_books", "prob": 10 },
+          [ "survnote", 1 ],
+          [ "machete", 5 ],
+          [ "boots_combat", 10 ],
+          [ "boots_hiking", 5 ],
+          [ "runner_bag", 3 ],
+          [ "bb", 8 ],
+          [ "bbgun", 10 ],
+          [ "beartrap", 3 ],
+          [ "radio", 20 ],
+          [ "hotplate", 10 ],
+          [ "extinguisher", 20 ],
+          [ "cable", 60 ],
+          [ "sm_extinguisher", 10 ],
+          [ "grapnel", 1 ],
+          [ "misc_repairkit", 5 ],
+          [ "knitting_needles", 1 ]
+        ]
+      }
     ]
   },
   {

diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
@@ -2461,7 +2461,7 @@
       [ "survnote", 5 ],
       [ "eclipse_glasses", 1 ],
       [ "plastic_sheet", 5 ],
-      [ "box_medium", 5 ],
+      [ "box_medium", 15 ],
       [ "thermos", 30 ],
       { "group": "tinware", "prob": 15 }
     ]
@@ -6411,8 +6411,8 @@
       { "group": "tinware", "prob": 3 },
       [ "can_drink_unsealed", 2 ],
       [ "can_food_unsealed", 1 ],
-      [ "box_small", 2 ],
-      [ "box_medium", 1 ],
+      [ "box_small", 5 ],
+      [ "box_medium", 3 ],
       [ "box_large", 1 ],
       [ "plastic_sheet", 1 ],
       [ "jug_plastic", 1 ],

diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json
@@ -191,9 +191,9 @@
       [ "rope_30", 35 ],
       [ "circsaw_blade", 8 ],
       [ "glass_sheet", 5 ],
-      [ "box_small", 2 ],
-      [ "box_medium", 2 ],
-      [ "box_large", 2 ],
+      [ "box_small", 10 ],
+      [ "box_medium", 10 ],
+      [ "box_large", 10 ],
       [ "plastic_sheet", 30 ],
       { "item": "pipe", "prob": 20, "count": [ 5, 10 ] },
       { "item": "nail", "prob": 60, "count": [ 2, 4 ] },

diff --git a/data/json/items/armor.json b/data/json/items/armor.json
@@ -2712,7 +2712,7 @@
     "material_thickness": 1,
     "environmental_protection": 1,
     "qualities": [ [ "GLARE", 1 ] ],
-    "flags": [ "FANCY", "WATER_FRIENDLY", "SUN_GLASSES" ]
+    "flags": [ "FANCY", "WATER_FRIENDLY", "SUN_GLASSES", "FRAGILE" ]
   },
   {
     "id": "fanny",
@@ -3020,7 +3020,7 @@
     "material_thickness": 1,
     "environmental_protection": 1,
     "qualities": [ [ "GLARE", 1 ] ],
-    "flags": [ "WATER_FRIENDLY", "SUN_GLASSES", "VARSIZE", "OUTER" ]
+    "flags": [ "WATER_FRIENDLY", "SUN_GLASSES", "VARSIZE", "OUTER", "FRAGILE" ]
   },
   {
     "id": "flag_shirt",
@@ -3293,7 +3293,7 @@
     "material_thickness": 1,
     "environmental_protection": 1,
     "use_action": { "type": "firestarter", "moves": 1000, "moves_slow": 25000, "need_sunlight": true },
-    "flags": [ "WATER_FRIENDLY", "FIRESTARTER", "FIX_NEARSIGHT", "FIX_FARSIGHT" ]
+    "flags": [ "WATER_FRIENDLY", "FIRESTARTER", "FIX_NEARSIGHT", "FIX_FARSIGHT", "FRAGILE" ]
   },
   {
     "id": "glasses_eye",
@@ -3313,7 +3313,7 @@
     "coverage": 75,
     "material_thickness": 1,
     "environmental_protection": 1,
-    "flags": [ "WATER_FRIENDLY", "FIX_NEARSIGHT" ]
+    "flags": [ "WATER_FRIENDLY", "FIX_NEARSIGHT", "FRAGILE" ]
   },
   {
     "id": "glasses_monocle",
@@ -3333,7 +3333,7 @@
     "coverage": 20,
     "material_thickness": 1,
     "environmental_protection": 1,
-    "flags": [ "SUPER_FANCY", "FIX_NEARSIGHT" ]
+    "flags": [ "SUPER_FANCY", "FIX_NEARSIGHT", "FRAGILE" ]
   },
   {
     "id": "glasses_reading",
@@ -3354,7 +3354,7 @@
     "material_thickness": 1,
     "environmental_protection": 1,
     "use_action": { "type": "firestarter", "moves": 1000, "moves_slow": 25000, "need_sunlight": true },
-    "flags": [ "WATER_FRIENDLY", "FIRESTARTER", "FIX_FARSIGHT" ]
+    "flags": [ "WATER_FRIENDLY", "FIRESTARTER", "FIX_FARSIGHT", "FRAGILE" ]
   },
   {
     "id": "glasses_safety",
@@ -8621,7 +8621,7 @@
     "material_thickness": 1,
     "environmental_protection": 1,
     "qualities": [ [ "GLARE", 1 ] ],
-    "flags": [ "WATER_FRIENDLY", "SUN_GLASSES" ]
+    "flags": [ "WATER_FRIENDLY", "SUN_GLASSES", "FRAGILE" ]
   },
   {
     "id": "survivor_belt_notools",

diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
@@ -257,7 +257,7 @@
     "calories": 25,
     "fun": 0,
     "healthy": 0,
-    "flags": [ "NUTRIENT_OVERRIDE", "NO_CRAFT_INHERIT" ]
+    "flags": [ "NUTRIENT_OVERRIDE" ]
   },
   {
     "id": "offal",
@@ -355,8 +355,7 @@
     "quench": -5,
     "fun": 4,
     "calories": 348,
-    "vitamins": [ [ "vitA", 0 ], [ "vitC", 0 ], [ "calcium", 2 ], [ "iron", 26 ], [ "vitB", 35 ] ],
-    "flags": "NO_CRAFT_INHERIT"
+    "vitamins": [ [ "vitA", 0 ], [ "vitC", 0 ], [ "calcium", 2 ], [ "iron", 26 ], [ "vitB", 35 ] ]
   },
   {
     "id": "salted_fish",

diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json
@@ -7,7 +7,7 @@
     "copy-from": "milk",
     "spoils_in": "12 hours",
     "price": 19,
-    "parasites": 11,
+    "contamination": 5,
     "description": "This is raw, unhomogenized and unpasteurized milk from a cow.  It couldn't be any fresher unless you drank it straight from the cow, which might upset it.  Depending on your dietary sensibilities, you might want to pasteurize or even boil this before drinking."
   },
   {
@@ -188,7 +188,6 @@
     "weight": "34 g",
     "color": "yellow",
     "spoils_in": "180 days",
-    "stim": 1,
     "container": "wrapper",
     "comestible_type": "FOOD",
     "symbol": "%",
@@ -211,7 +210,6 @@
     "weight": "30 g",
     "color": "yellow",
     "spoils_in": "28 days",
-    "stim": 1,
     "container": "bag_plastic",
     "comestible_type": "FOOD",
     "symbol": "%",

diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json
@@ -217,7 +217,6 @@
     "name_plural": "molasses",
     "weight": "89 g",
     "color": "brown",
-    "stim": 3,
     "container": "jar_glass",
     "comestible_type": "DRINK",
     "symbol": "~",
@@ -254,7 +253,6 @@
     "charges": 48,
     "healthy": 1,
     "fun": -20,
-    "stim": 1,
     "phase": "liquid"
   },
   {