Merge pull request #38 from CleverRaven/master

SUS Bathroom Dec 31st

.travis.yml

@@ -197,7 +197,7 @@ jobs:
       compiler: clang
       addons: &clang60
         apt:
-          packages: ["clang-6.0", "g++-multilib", "libc6-dbg", "g++-6", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
+          packages: ["clang-6.0", "g++-multilib", "libc6-dbg", "g++-6", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev", "libpulse-dev", "libpulse0=1:8.0-0ubuntu3.10", "libpulse-mainloop-glib0=1:8.0-0ubuntu3.10"]
           sources: [*apt_sources, llvm-toolchain-xenial-6.0]
 
     - env: CLANG=clang++-7

CMakeLists.txt

@@ -19,6 +19,7 @@ option(USE_HOME_DIR "Use user's home directory for save files."   "ON")
 option(LOCALIZE     "Support for language localizations. Also enable UTF support."   "ON")
 option(LANGUAGES    "Compile localization files for specified languages."   "")
 option(DYNAMIC_LINKING "Use dynamic linking. Or use static to remove MinGW dependency instead."   "ON")
+option(JSON_FORMAT  "Build JSON formatter" "OFF")
 option(CATA_CLANG_TIDY_PLUGIN "Build Cata's custom clang-tidy plugin" "OFF")
 set(CATA_CLANG_TIDY_INCLUDE_DIR "" CACHE STRING "Path to internal clang-tidy headers required for plugin (e.g. ClangTidy.h)")
 set(CATA_CHECK_CLANG_TIDY "" CACHE STRING "Path to check_clang_tidy.py for plugin tests")
@@ -354,6 +355,9 @@ if (NOT MSVC)
     add_subdirectory(src/chkjson)
 endif()
 add_subdirectory(tests)
+if (JSON_FORMAT)
+    add_subdirectory(tools/format)
+endif()
 if (CATA_CLANG_TIDY_PLUGIN)
     add_subdirectory(tools/clang-tidy-plugin)
 endif()

Makefile

@@ -101,6 +101,9 @@ DEBUGSYMS = -g
 #OTHERS = -O3
 #DEFINES = -DNDEBUG
 
+# Tells ccache to keep comments, as they can be meaningful to the compiler (as to suppress warnings).
+export CCACHE_COMMENTS=1
+
 # Disable debug. Comment this out to get logging.
 #DEFINES = -DENABLE_LOGGING
 

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/construction.json

@@ -3236,5 +3236,16 @@
     "components": [ [ [ "log", 1 ] ] ],
     "pre_special": "check_empty",
     "post_terrain": "f_logstool"
+  },
+  {
+    "type": "construction",
+    "description": "Build Decorative Tree",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "20 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
+    "components": [ [ [ "stick", 4 ], [ "log", 1 ] ], [ [ "nail", 20 ] ], [ [ "pine_bough", 8 ] ] ],
+    "pre_special": "check_empty",
+    "post_terrain": "f_decorative_tree"
   }
 ]

data/json/flags.json

@@ -391,6 +391,12 @@
     "//": "Prevents the item from participating in the encumbrance system when worn.",
     "info": "It seems <info>partially intangible</info>, and can occupy the same space as other things when worn."
   },
+  {
+    "id": "SHEATH_AXE",
+    "type": "json_flag",
+    "context": [ "GENERIC", "TOOL" ],
+    "//": "This item can be stored in a sheath of the appropriate size."
+  },
   {
     "id": "SHEATH_KNIFE",
     "type": "json_flag",

data/json/furniture_and_terrain/furniture-decorative.json

@@ -205,5 +205,39 @@
         { "item": "pipe", "count": [ 0, 1 ] }
       ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_winter_wreath",
+    "name": "pine wreath",
+    "description": "A decorative wreath for the winter holidays.",
+    "symbol": "o",
+    "color": "light_green",
+    "move_cost_mod": -1,
+    "required_str": 10,
+    "flags": [ "PLACE_ITEM" ]
+  },
+  {
+    "type": "furniture",
+    "id": "f_decorative_tree",
+    "name": "decorative tree",
+    "description": "A decorative tree for the winter holidays.",
+    "symbol": "+",
+    "color": "light_green",
+    "looks_like": "t_tree_pine",
+    "move_cost_mod": -1,
+    "required_str": 10,
+    "flags": [ "BLOCKSDOOR", "PLACE_ITEM", "EASY_DECONSTRUCT" ],
+    "bash": {
+      "str_min": 20,
+      "str_max": 40,
+      "sound": "smash!",
+      "sound_fail": "thump.",
+      "items": [
+        { "item": "pine_bough", "count": [ 4, 6 ] },
+        { "item": "nail", "count": [ 5, 14 ] },
+        { "item": "stick", "count": [ 1, 3 ] }
+      ]
+    }
   }
 ]

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/itemgroups/monster_drops_advtech.json

@@ -66,53 +66,6 @@
     "id": "molebot",
     "items": [ [ "spiked_plate", 15 ], [ "hard_plate", 30 ], [ "robot_controls", 5 ] ]
   },
-  {
-    "type": "item_group",
-    "id": "tripod",
-    "items": [
-      { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 },
-      [ "kevlar_plate", 10 ],
-      [ "ceramic_armor", 15 ],
-      [ "alloy_plate", 10 ],
-      [ "robot_controls", 3 ]
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "chickenbot",
-    "items": [
-      [ "robot_controls", 5 ],
-      [ "ai_module", 5 ],
-      [ "sensor_module", 5 ],
-      [ "memory_module", 5 ],
-      [ "pathfinding_module", 5 ],
-      [ "identification_module", 5 ],
-      [ "reverse_jointed_legs", 40 ],
-      [ "chickenbot_chassis", 40 ],
-      [ "targeting_module", 5 ],
-      [ "gun_module", 30 ],
-      [ "mark19", 5 ],
-      [ "tazer", 5 ],
-      [ "m249", 5 ],
-      [ "storage_battery", 5 ],
-      [ "plut_cell", 5 ],
-      [ "mil_plate", 2 ]
-    ]
-  },
-  {
-    "type": "item_group",
-    "id": "tankbot",
-    "items": [
-      [ "tazer", 3 ],
-      { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 },
-      [ "556", 8 ],
-      [ "alloy_plate", 10 ],
-      [ "kevlar_plate", 10 ],
-      [ "ceramic_armor", 10 ],
-      [ "hard_plate", 30 ],
-      [ "robot_controls", 5 ]
-    ]
-  },
   {
     "type": "item_group",
     "id": "turret",

data/json/itemgroups/obsolete.json

@@ -13,5 +13,52 @@
     "id": "elec_parts",
     "type": "item_group",
     "items": [ { "group": "supplies_electronics", "prob": 100 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "chickenbot",
+    "items": [
+      [ "robot_controls", 5 ],
+      [ "ai_module", 5 ],
+      [ "sensor_module", 5 ],
+      [ "memory_module", 5 ],
+      [ "pathfinding_module", 5 ],
+      [ "identification_module", 5 ],
+      [ "reverse_jointed_legs", 40 ],
+      [ "chickenbot_chassis", 40 ],
+      [ "targeting_module", 5 ],
+      [ "gun_module", 30 ],
+      [ "mark19", 5 ],
+      [ "tazer", 5 ],
+      [ "m249", 5 ],
+      [ "storage_battery", 5 ],
+      [ "plut_cell", 5 ],
+      [ "mil_plate", 2 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "tankbot",
+    "items": [
+      [ "tazer", 3 ],
+      { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 },
+      [ "556", 8 ],
+      [ "alloy_plate", 10 ],
+      [ "kevlar_plate", 10 ],
+      [ "ceramic_armor", 10 ],
+      [ "hard_plate", 30 ],
+      [ "robot_controls", 5 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "tripod",
+    "items": [
+      { "item": "flamethrower", "prob": 1, "charges-min": 0, "charges-max": 3000 },
+      [ "kevlar_plate", 10 ],
+      [ "ceramic_armor", 15 ],
+      [ "alloy_plate", 10 ],
+      [ "robot_controls", 3 ]
+    ]
   }
 ]

data/json/itemgroups/science_and_tech.json

@@ -139,12 +139,9 @@
       [ "schematics_eyebot", 50 ],
       [ "schematics_secubot", 50 ],
       [ "schematics_skitterbot", 50 ],
-      [ "schematics_chickenbot", 5 ],
       [ "schematics_hazmatbot", 50 ],
       [ "schematics_riotbot", 50 ],
       [ "schematics_sciencebot", 10 ],
-      [ "schematics_tankbot", 5 ],
-      [ "schematics_tripod", 5 ],
       [ "schematics_molebot", 20 ],
       [ "schematics_dispatch", 25 ],
       [ "schematics_dispatch_military", 20 ],

data/json/itemgroups/tools.json

@@ -16,7 +16,8 @@
       [ "hand_drill", 20 ],
       [ "nailgun", 100 ],
       [ "chisel", 10 ],
-      [ "toolbox", 15 ]
+      [ "toolbox", 12 ],
+      [ "toolbox_workshop", 3 ]
     ]
   },
   {
@@ -30,7 +31,8 @@
       [ "elec_jackhammer", 40 ],
       [ "metal_smoother", 90 ],
       [ "jackhammer", 40 ],
-      [ "toolbox", 25 ],
+      [ "toolbox", 20 ],
+      [ "toolbox_workshop", 5 ],
       [ "recharge_station", 10 ],
       [ "angular_grinder", 30 ]
     ]
@@ -193,7 +195,8 @@
       { "group": "tools_common", "prob": 100 },
       { "group": "tools_lighting", "prob": 50 },
       { "group": "tools_tailor", "prob": 50 },
-      [ "toolbox", 5 ]
+      [ "toolbox", 4 ],
+      [ "toolbox_workshop", 1 ]
     ]
   },
   {