Merge pull request #31 from CleverRaven/master

Jsonize crafting skill penalty from mutations (CleverRaven#36565)

build-scripts/build.sh

@@ -145,7 +145,7 @@ then
     cd android
     # Specify dumb terminal to suppress gradle's constatnt output of time spent building, which
     # fills the log with nonsense.
-    TERM=dumb ./gradlew assembleRelease -Pj=$num_jobs -Plocalize=false -Pabi32=false -Pabi64=true -Pdeps=/home/travis/build/CleverRaven/Cataclysm-DDA/android/app/deps.zip
+    TERM=dumb ./gradlew assembleRelease -Pj=$num_jobs -Plocalize=false -Pabi_arm_32=false -Pabi_arm_64=true -Pdeps=/home/travis/build/CleverRaven/Cataclysm-DDA/android/app/deps.zip
 else
     make -j "$num_jobs" RELEASE=1 CCACHE=1 BACKTRACE=1 CROSS="$CROSS_COMPILATION" LINTJSON=0
 

build-scripts/mod_test_blacklist

@@ -1,7 +1,5 @@
-aftershock
 blazemod
 crt_expansion
-generic_guns
 Graphical_Overmap
 mapgen_demo
 more_locations

data/json/itemgroups/SUS/domestic.json

@@ -609,35 +609,63 @@
     ]
   },
   {
-    "id": "SUS_bathroom_toiletries",
+    "id": "SUS_bathroom_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": "This is a category for all the items which appear in bathrooms, which are NOT immediately useful medicines. This list is created in part to not ruin player's chances of finding antibiotics, antifungals and asprin, as it suppliments the current bathroom drops instead of replacing. Item probabilities are loosely based on how likely families would take an item with them when evacuating.",
+    "//2": "This group is for a bathroom sink.",
     "subtype": "collection",
     "entries": [
       { "item": "soap_holder", "prob": 40 },
-      { "item": "soap", "count": [ 1, 4 ], "prob": 60 },
+      { "item": "soap", "count": [ 1, 4 ], "prob": 90 },
+      { "item": "razor_shaving", "count": [ 1, 2 ], "prob": 20 },
       { "item": "bleach", "prob": 15 },
       { "item": "ammonia", "prob": 20 },
-      { "item": "razor_shaving", "count": [ 1, 2 ], "prob": 75 },
-      { "item": "shavingkit", "prob": 1 },
-      { "item": "mirror", "prob": 25 },
-      { "item": "toothbrush_plain", "count": [ 1, 3 ], "prob": 45 },
-      { "item": "hairbrush", "count": [ 1, 2 ], "prob": 60 },
+      { "item": "toothbrush_plain", "count": [ 1, 3 ], "prob": 45 }
+    ]
+  },
+  {
+    "id": "SUS_hair_drawer",
+    "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 group is for a drawer for haircare tools.",
+    "subtype": "collection",
+    "entries": [
+      { "item": "hairbrush", "count": [ 1, 2 ], "prob": 90 },
+      { "item": "comb_pocket", "count": [ 1, 2 ], "prob": 75 },
       { "item": "curler_hair", "prob": 25 },
-      { "item": "string_floss", "count": [ 1, 2 ], "prob": 50 },
-      { "item": "comb_pocket", "count": [ 1, 2 ], "prob": 55 },
-      { "item": "plunger_toilet", "prob": 90 },
-      { "item": "plunger_futuristic", "prob": 20 },
-      { "item": "cu_pipe", "prob": 10 },
-      { "item": "hose", "prob": 10 },
-      { "item": "sponge", "count": [ 1, 3 ], "prob": 75 },
-      { "item": "candle", "count": [ 1, 2 ], "prob": 20 },
-      { "item": "matches", "prob": 10 },
-      { "item": "toilet_paper", "prob": 80 },
       { "item": "hair_dryer", "prob": 60 },
-      { "item": "curling_iron", "prob": 50 },
-      { "item": "brush_toilet", "prob": 75 }
+      { "item": "curling_iron", "prob": 20 }
+    ]
+  },
+  {
+    "id": "SUS_toilet",
+    "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 group is for things you often find stored on or next to a toilet.",
+    "subtype": "collection",
+    "entries": [
+      { "distribution": [ { "item": "plunger_toilet", "prob": 90 }, { "item": "plunger_futuristic", "prob": 10 } ] },
+      { "item": "brush_toilet", "prob": 75 },
+      { "item": "toilet_paper", "prob": 80 }
+    ]
+  },
+  {
+    "id": "SUS_bathroom_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": "This group is for a bathroom cabinet.",
+    "subtype": "collection",
+    "entries": [
+      { "item": "soap", "count": [ 1, 4 ], "prob": 70 },
+      {
+        "distribution": [ { "item": "razor_shaving", "count": [ 1, 2 ], "prob": 50 }, { "item": "shavingkit", "prob": 50 } ],
+        "prob": 75
+      },
+      { "item": "mirror", "prob": 25 },
+      { "item": "string_floss", "count": [ 1, 2 ], "prob": 60 },
+      { "item": "sponge", "count": [ 1, 3 ], "prob": 75 },
+      { "collection": [ { "item": "candle", "count": [ 1, 2 ] }, { "item": "matches" } ], "prob": 20 },
+      { "item": "toilet_paper", "prob": 80 }
     ]
   }
 ]

data/json/itemgroups/item_groups.json

@@ -1407,6 +1407,7 @@
       [ "10gal_hat", 4 ],
       [ "bb", 8 ],
       [ "bolt_steel", 7 ],
+      [ "bolt_cf", 5 ],
       [ "bbgun", 10 ],
       [ "crossbow", 2 ],
       [ "mag_survival", 40 ],
@@ -2315,6 +2316,7 @@
       [ "hat_boonie", 10 ],
       [ "helmet_riot", 25 ],
       [ "bolt_steel", 7 ],
+      [ "bolt_cf", 5 ],
       [ "shot_00", 8 ],
       [ "shot_flechette", 3 ],
       [ "20x66_shot", 4 ],

data/json/itemgroups/main.json

@@ -260,7 +260,8 @@
       [ "arrow_field_point_fletched", 50 ],
       [ "arrow_cf", 100 ],
       [ "bolt_wood", 100 ],
-      [ "bolt_wood_bodkin", 50 ]
+      [ "bolt_wood_bodkin", 50 ],
+      [ "bolt_cf", 100 ]
     ]
   }
 ]

data/json/items/crossbows.json

@@ -219,6 +219,28 @@
     "count": 10,
     "effects": [ "RECOVER_45", "NOGIB" ]
   },
+  {
+    "type": "AMMO",
+    "id": "bolt_cf",
+    "price": 2000,
+    "name": "carbon fiber hunting bolt",
+    "symbol": "=",
+    "color": "green",
+    "looks_like": "bolt_steel",
+    "description": "A fletched carbon fiber crossbow bolt shaft with an expanding broadhead tip.  Deals impressive damage to targets.  Stands a good chance of remaining intact once fired.",
+    "material": [ "kevlar_rigid", "steel" ],
+    "volume": "250 ml",
+    "weight": "30 g",
+    "bashing": 1,
+    "ammo_type": "bolt",
+    "prop_damage": 1.35,
+    "range": 4,
+    "dispersion": 50,
+    "loudness": 0,
+    "count": 10,
+    "stack_size": 10,
+    "effects": [ "RECOVER_30" ]
+  },
   {
     "type": "AMMO",
     "id": "bolt_explosive",