Merge branch 'master' into experimental

Muffindrake · Sep 14, 2017 · 54e8b53 · 54e8b53
2 parents e410f6e + 3505803
commit 54e8b53
Show file tree

Hide file tree

Showing 32 changed files with 1,159 additions and 598 deletions.
diff --git a/astyle_blacklist b/astyle_blacklist
@@ -3,7 +3,6 @@ src/advanced_inv.cpp
 src/animation.cpp
 src/artifact.cpp
 src/auto_pickup.cpp
-src/ballistics.cpp
 src/bionics.cpp
 src/calendar.cpp
 src/catacharset.cpp
@@ -82,7 +81,6 @@ src/sdltiles.cpp
 src/simplexnoise.cpp
 src/skill.cpp
 src/sounds.cpp
-src/string_id_null_ids.cpp
 src/ui.cpp
 src/vehicle.cpp
 src/veh_interact.cpp
@@ -137,10 +135,8 @@ tests/invlet_test.cpp
 tests/line_test.cpp
 tests/map_iterator_test.cpp
 tests/monster_test.cpp
-tests/new_character_test.cpp
 tests/player_test.cpp
 tests/savegame_test.cpp
 tests/shadowcasting_test.cpp
 tests/vehicle_efficiency.cpp
 tests/visitable_remove.cpp
-tests/test_statistics.h
diff --git a/data/json/item_groups.json b/data/json/item_groups.json
@@ -1134,7 +1134,7 @@
     ]
   },{
     "type" : "item_group",
-    "id" : "vending_food",
+    "id" : "vending_food_items",
     "items":[
       ["chips", 65],
       ["fried_seeds", 25],
@@ -1163,7 +1163,7 @@
     ]
     },{
     "type" : "item_group",
-    "id" : "vending_drink",
+    "id" : "vending_drink_items",
     "items":[
       ["water_clean", 90],
       ["water_mineral", 10],

diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json
@@ -1,4 +1,28 @@
 [
+  {
+    "id": "basement_op_guns",
+    "type": "item_group",
+    "//": "Hardcoded gunsafe itemgroup for basement_junk in mapgen_functions.cpp .",
+    "magazine": 100,
+    "items": [
+      {
+        "distribution": [
+          {
+            "collection": [
+              { "item": "usp_9mm" },
+              { "item": "usp9mag" },
+              { "item": "9mmP", "charges-min": 30, "charges-max": 50 },
+              { "item": "suppressor" },
+              { "item": "small_repairkit" },
+              { "item": "briefcase" },
+              { "item": "cash_card", "charges-min": 50000, "charges-max": 90000 }
+            ], "prob": 50
+          },
+          { "group": "guns_survival", "prob": 50 }
+        ]
+      }
+    ]
+  },
   {
     "id" : "cop_armory",
     "type" : "item_group",

diff --git a/data/json/itemgroups/vending_machines.json b/data/json/itemgroups/vending_machines.json
@@ -0,0 +1,40 @@
+[
+  {
+    "type" : "item_group",
+    "id" : "default_vending_machine",
+    "entries":[
+        { "group": "vending_drink", "prob": 50},
+        { "group": "vending_drink", "prob": 50}
+    ]
+  },{
+     "type" : "item_group",
+    "subtype" : "collection",
+    "id" : "vending_food",
+    "entries":[
+        { "group": "vending_food_items", "count-min": 5, "count-max": 20 },
+        { "group": "vending_food_items", "prob": 66, "count-min": 5, "count-max": 25 },
+        { "group": "vending_food_items", "prob": 20, "count-min": 5, "count-max": 25 }
+    ]
+  },{
+    "type" : "item_group",
+    "subtype" : "collection",
+    "id" : "vending_drink",
+    "entries":[
+        { "group": "vending_drink_items", "count-min": 5, "count-max": 20 },
+        { "group": "vending_drink_items", "prob": 66, "count-min": 5, "count-max": 25 },
+        { "group": "vending_drink_items", "prob": 20, "count-min": 5, "count-max": 25 }
+    ]
+  },{
+    "type" : "item_group",
+    "subtype" : "collection",
+    "id" : "vending_ammo",
+    "entries":[
+        { "group": "ammo_pistol_common", "count-min": 3, "count-max": 8 },
+        { "group": "ammo_rifle_common", "prob": 50, "count-min": 2, "count-max": 6 },
+        { "group": "ammo_shotgun_common", "prob": 50, "count-min": 2, "count-max": 6 },
+        { "group": "ammo_pistol_rare", "prob": 20, "count-min": 1, "count-max": 2 },
+        { "group": "ammo_rifle_rare", "prob": 20, "count-min": 1, "count-max": 2 },
+        { "group": "ammo_shotgun_rare", "prob": 20, "count-min": 1, "count-max": 2 }
+    ]
+  }
+]
diff --git a/data/json/mapgen/gunstore_home_defense.json b/data/json/mapgen/gunstore_home_defense.json
@@ -64,6 +64,9 @@
         "r": "f_rack",
         "u": "f_vending_reinforced"
       },
+      "vendingmachines": {
+        "u": { "item_group": "vending_ammo", "reinforced": true }
+      },
       "toilets": {
         ";": {}
       },
@@ -80,15 +83,7 @@
         { "group": "guns_shotgun_common", "x": 15, "y": [ 9, 10 ], "chance": 75 },
         { "group": "guns_rifle_common", "x": 16, "y": [ 9, 10 ], "chance": 75 },
         { "group": "mags_common", "x": [ 14, 16 ], "y": 12, "chance": 100, "repeat": [ 1, 4 ] },
-        { "group": "mags_rare", "x": [ 14, 16 ], "y": 13, "chance": 75, "repeat": [ 1, 3 ] },
-        { "group": "ammo_pistol_common", "x": 3, "y": 10, "chance": 100, "repeat": [ 3, 15 ] },
-        { "group": "ammo_rifle_common", "x": 3, "y": 12, "chance": 100, "repeat": [ 1, 8 ] },
-        { "group": "ammo_shotgun_rare", "x": 3, "y": 12, "chance": 50, "repeat": [ 1, 5 ] },
-        { "group": "ammo_shotgun_common", "x": 3, "y": 12, "chance": 100, "repeat": [ 1, 8 ] },
-        { "group": "ammo_pistol_common", "x": 20, "y": 10, "chance": 100, "repeat": [ 3, 15 ] },
-        { "group": "ammo_rifle_common", "x": 20, "y": 12, "chance": 100, "repeat": [ 1, 8 ] },
-        { "group": "ammo_rifle_rare", "x": 20, "y": 12, "chance": 50, "repeat": [ 1, 5 ] },
-        { "group": "ammo_shotgun_common", "x": 20, "y": 12, "chance": 100, "repeat": [ 1, 8 ] }
+        { "group": "mags_rare", "x": [ 14, 16 ], "y": 13, "chance": 75, "repeat": [ 1, 3 ] }
       ]
     }
   }

diff --git a/data/json/mapgen/s_gun0.json b/data/json/mapgen/s_gun0.json
@@ -21,15 +21,15 @@
         "  |{....#...........{|  ",
         "  |{............{{{{{|  ",
         "  |-:::::::::::------|  ",
-        "  |..................|  ",
+        "  |l.................|  ",
         "  |--#--#--#--#--#--+|  ",
         "  |..................|  ",
         "  |..................|  ",
         "  |..................|  ",
         "  |..................|  ",
         "  |..................|  ",
-        "  |..................|  ",
-        "  --------------------  "
+        "  |ssssssssssssssssss|  ",
+        "  ====================  "
       ],
       "place_terrain": [
         { "ter": "t_door_metal_pickable", "x": [ 11, 14 ], "y": 6 },
@@ -43,12 +43,17 @@
         "-": "t_wall",
         ".": "t_floor",
         ":": "t_window_bars_alarm",
+        "=": "t_strconc_wall",
         "_": "t_pavement",
+        "l": "t_floor",
+        "s": "t_floor",
         "{": "t_floor",
         "|": "t_wall"
       },
       "furniture": {
         "#": "f_counter",
+        "l": "f_locker",
+        "s": "f_sandbag_wall",
         "{": "f_rack"
       },
       "place_loot": [
@@ -85,7 +90,9 @@
         { "group": "guns_pistol_rare", "x": 8, "y": 16, "chance": 20, "ammo": 75, "magazine": 100 },
         { "group": "guns_pistol_obscure", "x": 11, "y": 16, "chance": 20, "ammo": 100, "magazine": 100 },
         { "group": "guns_pistol_rare", "x": 14, "y": 16, "chance": 20, "ammo": 75, "magazine": 100 },
-        { "group": "guns_pistol_common", "x": 17, "y": 16, "chance": 20, "ammo": 25, "magazine": 100 }
+        { "group": "guns_pistol_common", "x": 17, "y": 16, "chance": 20, "ammo": 25, "magazine": 100 },
+        { "item": "ear_plugs", "x": 2, "y": 14, "chance": 50, "repeat": 2 },
+        { "item": "powered_earmuffs", "x": 2, "y": 14, "chance": 30 }
       ],
       "place_monsters": [
         { "monster": "GROUP_ZOMBIE", "x": [ 0, 0 ], "y": [ 23, 23 ], "chance": 2, "repeat": [ 2, 3 ] }

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -312,6 +312,7 @@
                     "matches"
                 ],
                 "entries": [
+                    { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
                     { "item": "m1911", "ammo-item": "45_acp", "charges": 7, "container-item": "holster" },
                     { "item": "45_acp", "charges": 23 },
                     { "item": "garand", "ammo-item": "3006", "charges": 8, "contents-item": "shoulder_strap" },
@@ -716,6 +717,7 @@
                     "binoculars"
                 ],
                 "entries": [
+                    { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
                     { "item": "knife_combat", "container-item": "sheath" },
                     { "item": "m4a1", "ammo-item": "223", "charges": 30, "contents-item": "shoulder_strap" }
                 ]
@@ -785,6 +787,7 @@
                     "boots_combat"
                 ],
                 "entries": [
+                    { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
                     { "item": "kukri", "container-item": "sheath" },
                     { "item": "rm2000_smg", "ammo-item": "8mm_fmj", "charges": 25, "contents-item": [ "shoulder_strap", "suppressor" ] },
                     { "item": "8mm_fmj", "charges": 55 }
@@ -1189,6 +1192,7 @@
                     "whistle"
                 ],
                 "entries": [
+                    { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
                     { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" },
                     { "item": "45_acp", "charges": 18 }
                 ]
@@ -1295,6 +1299,7 @@
                     "flashbang"
                 ],
                 "entries": [
+                    { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
                     { "item": "usp_9mm", "ammo-item": "9mm", "charges": 15, "container-item": "sholster" },
                     { "item": "hk_mp5", "ammo-item": "9mm", "charges": 30, "contents-item": "shoulder_strap" },
                     { "item": "9mm", "charges": 55 }
@@ -1353,6 +1358,7 @@
                     "baton"
                 ],
                 "entries": [
+                    { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
                     { "item": "usp_9mm", "ammo-item": "9mmfmj", "charges": 15, "container-item": "sholster" },
                     { "item": "9mmfmj", "charges": 35 },
                     { "item": "ksg", "ammo-item": "shot_00", "charges": 7, "contents-item": "shoulder_strap" },
@@ -1405,6 +1411,7 @@
                     "wristwatch"
                 ],
                 "entries": [
+                    { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
                     { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" },
                     { "item": "45_acp", "charges": 18 },
                     { "item": "remington_700", "ammo-item": "3006", "charges": 4, "contents-item": [ "shoulder_strap", "rifle_scope" ] },
@@ -1611,6 +1618,7 @@
                     "hat_hunting"
                 ],
                 "entries": [
+                    { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
                     { "item": "shotgun_d", "ammo-item": "shot_00", "charges": 2, "contents-item": "shoulder_strap" },
                     { "item": "shot_00", "charges": 12, "container-item": "bandolier_shotgun" },
                     { "item": "shot_00", "charges": 6 },
@@ -1654,6 +1662,7 @@
                     "hat_hunting"
                 ],
                 "entries": [
+                    { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
                     { "item": "remington_700", "ammo-item": "270", "charges": 4, "contents-item": "shoulder_strap" },
                     { "item": "270", "charges": 16, "container-item": "bandolier_rifle" },
                     { "item": "sheath", "contents-item": "knife_hunting" }
@@ -2973,6 +2982,7 @@
                     "pocketwatch"
                 ],
                 "entries": [
+                    { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
                     { "item": "halligan", "container-item": "fireman_belt" }
                 ]
             },
@@ -4086,6 +4096,7 @@
                     "quikclot"
                 ],
                 "entries": [
+                    { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
                     { "item": "knife_combat", "container-item": "sheath" },
                     { "item": "m4a1", "ammo-item": "556", "contents-item": "shoulder_strap" },
                     { "item": "stanag30", "ammo-item": "556", "count": 2 }
@@ -5052,21 +5063,26 @@
             "description": "You're a miner, not a minor!  Your canteen is dry, your jackhammer is out of gas, and you're on your last pair of batteries for your mining helmet...",
             "points": 0,
             "items": {
-                "both": [
-                    "socks",
-                    "boots_steel",
-                    "gloves_work",
-                    "knee_pads",
-                    "miner_hat",
-                    "jumpsuit",
-                    "mask_gas",
-                    "jackhammer",
-                    "canteen",
-                    "e_tool",
-                    "tool_belt",
-                    "mbag",
-                    "matches"
-                ],
+                "both": {
+                    "items": [
+                        "socks",
+                        "boots_steel",
+                        "gloves_work",
+                        "knee_pads",
+                        "miner_hat",
+                        "jumpsuit",
+                        "mask_gas",
+                        "jackhammer",
+                        "canteen",
+                        "e_tool",
+                        "tool_belt",
+                        "mbag",
+                        "matches"
+                    ],
+                    "entries": [
+                        { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }
+                    ]
+                },
                 "male": [
                     "boxer_shorts"
                 ],

diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json
@@ -452,7 +452,7 @@
     [
       [ "stick", 2 ],
       [ "broom", 2 ],
-      [ "2x4", 1 ],
+      [ "2x4", 2 ],
       [ "bee_sting", 2 ]
     ],
     [
@@ -493,7 +493,7 @@
     [
       [ "stick", 2 ],
       [ "broom", 2 ],
-      [ "2x4", 1 ],
+      [ "2x4", 2 ],
       [ "bee_sting", 2 ]
     ],
     [
@@ -548,7 +548,7 @@
     [
       [ "stick", 2 ],
       [ "broom", 2 ],
-      [ "2x4", 1 ],
+      [ "2x4", 2 ],
       [ "bee_sting", 2 ]
     ],
     [

diff --git a/data/json/terrain.json b/data/json/terrain.json
@@ -3468,7 +3468,7 @@
     },{
         "type" : "terrain",
         "id" : "t_underbrush_harvested_spring",
-        "name": "foliage",
+        "name": "underbrush",
         "symbol": "#",
         "color": "green",
         "move_cost": 6,
@@ -3487,7 +3487,7 @@
     },{
         "type" : "terrain",
         "id" : "t_underbrush_harvested_summer",
-        "name": "foliage",
+        "name": "underbrush",
         "symbol": "#",
         "color": "green",
         "move_cost": 6,
@@ -3506,7 +3506,7 @@
     },{
         "type" : "terrain",
         "id" : "t_underbrush_harvested_autumn",
-        "name": "foliage",
+        "name": "underbrush",
         "symbol": "#",
         "color": "green",
         "move_cost": 6,
@@ -3525,7 +3525,7 @@
     },{
         "type" : "terrain",
         "id" : "t_underbrush_harvested_winter",
-        "name": "foliage",
+        "name": "underbrush",
         "symbol": "#",
         "color": "green",
         "move_cost": 6,

diff --git a/data/json/uncraft/ammo/762x25.json b/data/json/uncraft/ammo/762x25.json
@@ -4,13 +4,15 @@
     "copy-from": "ammo_cartridge",
     "type": "uncraft",
     "using": [ [ "ammo_762_25", 1 ], [ "ammo_bullet", 2 ] ],
+    "tools": [ [ [ "puller", -1 ] ] ],
     "components": [ [ [ "gunpowder", 4 ] ] ]
   },
   {
     "result": "762_25hot",
     "copy-from": "ammo_cartridge",
     "type": "uncraft",
     "using": [ [ "ammo_762_25", 1 ], [ "ammo_bullet", 2 ] ],
+    "tools": [ [ [ "puller", -1 ] ] ],
     "components": [ [ [ "gunpowder", 5 ] ] ]
   }
 ]