Merge pull request #167 from CleverRaven/master

Merge pull request CleverRaven#40358 from jbytheway/generalize_reduce…

.travis.yml

@@ -42,7 +42,7 @@ branches:
 # - SANITIZE=address
 # - LOCALIZE=0
 # - A clang-tidy run (now switched to GitHub workflow)
-# - Tests with important mods enabled (Magiclysm, RL_Classes)
+# - Tests with important mods enabled (Magiclysm)
 # We try to minimize the number of builds subject to those constraints.
 
 # To see what toolchains are available, consult the following:
@@ -54,8 +54,8 @@ jobs:
     # Initial test stage, if this fails everything else is canceled.
     - stage: Test
       # Clang is consistently the fastest to build, so use it for the initial test.
-      env: CLANG=clang++-3.8 MODS=--mods=RL_Classes TEST_STAGE=1 CXXFLAGS="-Wno-error=unused-command-line-argument -D__extern_always_inline='extern __always_inline'"
-      name: "Clang 3.8 Make build with curses, style check and RL_Classes test"
+      env: CLANG=clang++-3.8 TEST_STAGE=1 CXXFLAGS="-Wno-error=unused-command-line-argument -D__extern_always_inline='extern __always_inline'"
+      name: "Clang 3.8 Make build with curses and style check"
       compiler: clang
       addons: &clang38
         apt:

data/json/furniture_and_terrain/terrain-liquids.json

@@ -7,7 +7,7 @@
     "symbol": "~",
     "color": "light_blue",
     "move_cost": 5,
-    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "FISHABLE" ],
+    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "FISHABLE", "SHALLOW_WATER" ],
     "connects_to": "WATER",
     "examine_action": "water_source"
   },
@@ -22,7 +22,7 @@
     "color": "light_blue",
     "move_cost": 5,
     "roof": "t_rock_roof",
-    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "FISHABLE", "INDOORS" ],
+    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "FISHABLE", "INDOORS", "SHALLOW_WATER" ],
     "connects_to": "WATER",
     "examine_action": "water_source"
   },
@@ -63,7 +63,7 @@
     "color": "light_blue",
     "looks_like": "t_water_sh",
     "move_cost": 5,
-    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "FISHABLE" ],
+    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "FISHABLE", "SHALLOW_WATER" ],
     "connects_to": "WATER",
     "examine_action": "water_source"
   },
@@ -78,7 +78,7 @@
     "looks_like": "t_water_sh",
     "move_cost": 5,
     "roof": "t_rock_roof",
-    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "FISHABLE", "INDOORS" ],
+    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "FISHABLE", "INDOORS", "SHALLOW_WATER" ],
     "connects_to": "WATER",
     "examine_action": "water_source"
   },
@@ -91,7 +91,7 @@
     "symbol": "~",
     "color": "light_blue",
     "move_cost": 6,
-    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "FISHABLE", "CURRENT" ],
+    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "FISHABLE", "CURRENT", "SHALLOW_WATER" ],
     "connects_to": "WATER",
     "examine_action": "water_source"
   },
@@ -106,7 +106,7 @@
     "color": "light_blue",
     "move_cost": 6,
     "roof": "t_rock_roof",
-    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "FISHABLE", "CURRENT", "INDOORS" ],
+    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "FISHABLE", "CURRENT", "INDOORS", "SHALLOW_WATER" ],
     "connects_to": "WATER",
     "examine_action": "water_source"
   },
@@ -147,7 +147,7 @@
     "looks_like": "t_water_sh",
     "color": "light_blue",
     "move_cost": 5,
-    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "SALT_WATER", "FISHABLE" ],
+    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "SALT_WATER", "FISHABLE", "SHALLOW_WATER" ],
     "connects_to": "WATER",
     "examine_action": "water_source"
   },
@@ -162,7 +162,7 @@
     "looks_like": "t_swater_sh",
     "move_cost": 5,
     "roof": "t_rock_roof",
-    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "SALT_WATER", "FISHABLE", "INDOORS" ],
+    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "SALT_WATER", "FISHABLE", "INDOORS", "SHALLOW_WATER" ],
     "connects_to": "WATER",
     "examine_action": "water_source"
   },
@@ -175,7 +175,7 @@
     "looks_like": "t_water_dp",
     "color": "blue",
     "move_cost": 8,
-    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "SALT_WATER", "DEEP_WATER", "FISHABLE" ],
+    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "SALT_WATER", "DEEP_WATER", "FISHABLE", "SHALLOW_WATER" ],
     "connects_to": "WATER",
     "examine_action": "water_source"
   },
@@ -215,7 +215,7 @@
     "looks_like": "t_water_pool",
     "color": "light_blue",
     "move_cost": 5,
-    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "INDOORS" ],
+    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "INDOORS", "SHALLOW_WATER" ],
     "examine_action": "water_source"
   },
   {
@@ -239,7 +239,7 @@
     "looks_like": "t_water_pool",
     "color": "light_blue",
     "move_cost": 5,
-    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE" ],
+    "flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "SHALLOW_WATER" ],
     "examine_action": "water_source"
   },
   {
@@ -251,7 +251,7 @@
     "looks_like": "t_water_murky",
     "color": "light_green",
     "move_cost": 6,
-    "flags": [ "TRANSPARENT", "SWIMMABLE" ],
+    "flags": [ "TRANSPARENT", "SWIMMABLE", "SHALLOW_WATER" ],
     "examine_action": "water_source"
   },
   {

data/json/game_balance.json

@@ -76,27 +76,6 @@
     "stype": "bool",
     "value": false
   },
-  {
-    "type": "EXTERNAL_OPTION",
-    "name": "FILTHY_CLOTHES",
-    "info": "If true, zombies will drop filthy clothing.",
-    "stype": "bool",
-    "value": true
-  },
-  {
-    "type": "EXTERNAL_OPTION",
-    "name": "FILTHY_MORALE",
-    "info": "Morale penalty for filthy clothing.  If true, wearing filthy clothing will cause morale penalties.  Doesn't make sense if FILTHY_CLOTHES option is false.",
-    "stype": "bool",
-    "value": true
-  },
-  {
-    "type": "EXTERNAL_OPTION",
-    "name": "FILTHY_WOUNDS",
-    "info": "Infected wounds from filthy clothing.  If true, getting hit in a body part covered in filthy clothing may cause infections.  Doesn't make sense if FILTHY_CLOTHES option is false.",
-    "stype": "bool",
-    "value": true
-  },
   {
     "type": "EXTERNAL_OPTION",
     "name": "MANUAL_BIONIC_INSTALLATION",
@@ -153,13 +132,6 @@
     "stype": "int",
     "value": 0
   },
-  {
-    "type": "EXTERNAL_OPTION",
-    "name": "MAX_HARVEST_COUNT",
-    "info": "The maximum amount of produce that can be harvested from a plant.",
-    "stype": "int",
-    "value": 12
-  },
   {
     "type": "EXTERNAL_OPTION",
     "name": "DISABLE_ROBOT_RESPONSE",

data/json/itemgroups/Food/food.json

@@ -448,6 +448,7 @@
     "entries": [
       { "group": "candy_chocolate", "prob": 620 },
       { "group": "salty_snacks", "prob": 595 },
+      { "item": "foodplace_snack_bar", "prob": 5 },
       { "item": "pemmican", "prob": 5 },
       { "item": "granola", "prob": 10 },
       { "item": "cookies", "prob": 80 },

data/json/items/comestibles/other.json

@@ -467,6 +467,25 @@
     "charges": 4,
     "fun": 2
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "foodplace_snack_bar",
+    "name": { "str_sp": "Foodplace's appropriate snack™" },
+    "weight": "12g",
+    "color": "magenta",
+    "comestible_type": "FOOD",
+    "container": "wrapper",
+    "symbol": "f",
+    "calories": 12,
+    "description": "Real foodstuff now in a pocket size format!",
+    "price": 50,
+    "price_postapoc": 500,
+    "material": "foodplace_foodstuff",
+    "volume": "12 ml",
+    "flags": [ "EDIBLE_FROZEN", "IRREPLACEABLE_CONSUMABLE" ],
+    "addiction_potential": 1,
+    "fun": 1
+  },
   {
     "type": "COMESTIBLE",
     "id": "lentils_cooked",

data/json/martialarts.json

@@ -415,7 +415,10 @@
       "shillelagh_fake",
       "shillelagh_weighted",
       "sword_cane",
-      "umbrella"
+      "umbrella",
+      "estoc",
+      "estoc_inferior",
+      "estoc_fake"
     ]
   },
   {

data/json/npcs/NC_TRUE_FOODPERSON.json

@@ -11,6 +11,7 @@
       { "item": "dress_shirt" },
       { "item": "chestguard_hard" },
       { "item": "cape_fp" },
+      { "item": "fanny" },
       { "item": "armguard_hard" },
       { "item": "legguard_hard" },
       { "item": "gloves_rubber" },
@@ -29,8 +30,8 @@
     "subtype": "collection",
     "entries": [
       { "item": "medium_disposable_cell", "prob": 90 },
-      { "group": "snacks_fancy", "prob": 30, "charges": 2 },
-      { "group": "snacks", "prob": 20, "charges": 2 }
+      { "item": "foodplace_snack_bar", "container-item": "fanny" },
+      { "item": "foodplace_snack_bar" }
     ]
   }
 ]

data/json/professions.json

@@ -692,14 +692,13 @@
           "legguard_hard",
           "gloves_rubber",
           "socks",
-          "mbag",
           "chestguard_hard",
           "boots_rubber"
         ],
         "entries": [
           { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "foodperson_mask" },
-          { "group": "snacks_fancy" },
-          { "group": "snacks" },
+          { "item": "foodplace_snack_bar", "container-item": "fanny" },
+          { "item": "foodplace_snack_bar" },
           { "item": "bat", "custom-flags": [ "auto_wield" ] }
         ]
       }