Merge pull request #3 from CleverRaven/master

2

.travis.yml

@@ -159,7 +159,7 @@ jobs:
           sources: [*apt_sources, llvm-toolchain-trusty-5.0]
 
     # Clang 6.0
-    - env: CLANG=clang++-6.0 CXXFLAGS=-Wno-error=unused-command-line-argument SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag"
+    - env: CLANG=clang++-6.0 CXXFLAGS=-Wno-error=unused-command-line-argument SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items"
       dist: trusty
       compiler: clang
       addons: &clang60

data/json/bionics.json

@@ -1008,7 +1008,7 @@
     "id": "bio_tools",
     "type": "bionic",
     "name": "Integrated Toolset",
-    "description": "Surgically implanted in your hands and fingers is a complete tool set - screwdriver, hammer, wrench, and heating elements.  You can use this in place of many tools when crafting.",
+    "description": "Surgically implanted in your hands and fingers is a complete tool set - screwdriver, hammer, wrench, hacksaw, wood saw, boltcutters, drill and heating elements.  You can use this in place of many tools when crafting.",
     "occupied_bodyparts": [ [ "HAND_L", 3 ], [ "HAND_R", 3 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
     "fake_item": "toolset"

data/json/game_balance.json

@@ -138,5 +138,12 @@
     "info": "Enables sleep deprivation mechanics. If true, stimulants will only help you so far, and you might have to enforce proper sleep hygiene for a while.",
     "stype": "bool",
     "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "CBM_SLOTS_ENABLED",
+    "info": "Enables CBM slots mechanics. If true CBM slots are enabled.",
+    "stype": "bool",
+    "value": false
   }
 ]

data/json/item_groups.json

@@ -3504,7 +3504,7 @@
       [ "novel_swash", 30 ],
       [ "manual_fencing", 9 ],
       [ "manual_niten", 9 ],
-      [ "manual_sojutsu", 9 ],	  
+      [ "manual_sojutsu", 9 ],
       [ "novel_samurai", 30 ],
       [ "plays_book", 30 ],
       [ "poetry_book", 30 ],

data/json/items/ammo/460.json

@@ -12,7 +12,7 @@
     "copy-from": "44magnum",
     "type": "AMMO",
     "name": ".460 Rowland",
-    "description": ".460 Rowland ammunition with 185gr JHP bullets.  The .460 Rowland round is designed to emulate hard-hitting .44 magnum in common autoloading pistols. Like the .44, .460 rowland has exceptional power - and recoil. It is almost dimensionally identical to .45ACP, save for having a longer case and deeper seated bullets to prevent ammunition mix-ups.",
+    "description": ".460 Rowland ammunition with 185gr JHP bullets.  The .460 Rowland round is designed to emulate hard-hitting .44 magnum in common autoloading pistols.  Like the .44, .460 Rowland has exceptional power - and recoil.  It is almost dimensionally identical to .45ACP, save for having a longer case and deeper seated bullets to prevent ammunition mix-ups.",
     "ammo_type": "460",
     "casing": "460_casing",
     "proportional": { "range": 0.95, "damage": 0.95, "pierce": 0.95, "recoil": 0.95 }

data/json/items/bionics.json

@@ -794,7 +794,7 @@
     "copy-from": "bionic_general",
     "type": "BIONIC_ITEM",
     "name": "Integrated Toolset CBM",
-    "description": "Implanted in your hands and fingers is a complete tool set - screwdriver, hammer, wrench, and heating elements.  You can use this in place of many tools when crafting.",
+    "description": "Surgically implanted in your hands and fingers is a complete tool set - screwdriver, hammer, wrench, hacksaw, wood saw, boltcutters, drill and heating elements.  You can use this in place of many tools when crafting.",
     "price": 800000,
     "difficulty": 6
   },

data/json/items/comestibles/junkfood.json

@@ -1099,7 +1099,7 @@
   {
     "type": "COMESTIBLE",
     "id": "hotdogs_frozen",
-    "name": "uncooked hot dogs",
+    "name": "uncooked hot dog",
     "name_plural": "uncooked hot dogs",
     "weight": 43,
     "color": "red",
@@ -1133,7 +1133,7 @@
   {
     "type": "COMESTIBLE",
     "id": "hotdogs_cooked",
-    "name": "cooked hot dogs",
+    "name": "cooked hot dog",
     "name_plural": "cooked hot dogs",
     "weight": 383,
     "color": "red",
@@ -1149,7 +1149,7 @@
     "volume": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 12,
-    "vitmins": [ [ "vitC", 20 ], [ "calcium", 5 ], [ "iron", 3 ] ],
+    "vitamins": [ [ "vitC", 20 ], [ "calcium", 5 ], [ "iron", 3 ] ],
     "rot_spawn": "GROUP_CARRION",
     "rot_spawn_chance": 15
   },

data/json/items/comestibles/meat_dishes_human.json

@@ -207,7 +207,7 @@
     "id": "mann_bratwurst",
     "copy-from": "bratwurst_sausage",
     "name": "Mannbrat",
-    "description": "A type of German sausage made of finely chopped humans and meant to be pan fried or roasted.  Better eat it hot and fresh.  By the way, use any human available. Germans are not mandatory.",
+    "description": "A type of German sausage made of finely chopped humans and meant to be pan fried or roasted.  Better eat it hot and fresh.  By the way, use any human available.  Germans are not mandatory.",
     "material": "hflesh"
   },
   {

data/json/items/generic/casing.json

@@ -143,8 +143,8 @@
     "id": "460_casing",
     "copy-from": "casing",
     "type": "GENERIC",
-    "name": ".460 rowland casing",
-    "description": "An empty casing from a .460 Rowland round. It looks deceptively like a .45ACP casing.",
+    "name": ".460 Rowland casing",
+    "description": "An empty casing from a .460 Rowland round.  It looks deceptively like a .45ACP casing.",
     "weight": 4,
     "volume": "6ml"
   },

data/json/items/gun/9mm.json

@@ -157,13 +157,13 @@
       [ "46", [ "hk46mag", "hk46bigmag" ] ],
       [ "57", [ "fn57mag" ] ]
     ]
-  },  
+  },
   {
     "id": "hk_mp5sd",
     "copy-from": "hk_mp5",
     "type": "GUN",
     "name": "H&K MP5SD",
-    "description": "Despite its integrated silencer element, it has the same length and shape as an unsilenced submachine gun. Unlike most conventional silenced submachine guns, it fires standard ammunition types with the same effect. The use of special subsonic ammunition is not necessary. The integrated silencer element suppresses the muzzle flash extremely effectively, as a result of which the weapon is also excellent for night operations using low-light amplifiers. No wonder the MP5SD is one of the most accurate silenced submachine guns of its type.",
+    "description": "Despite its integrated silencer element, it has the same length and shape as an unsilenced submachine gun.  Unlike most conventional silenced submachine guns, it fires standard ammunition types with the same effect.  The use of special subsonic ammunition is not necessary.  The integrated silencer element suppresses the muzzle flash extremely effectively, as a result of which the weapon is also excellent for night operations using low-light amplifiers.  No wonder the MP5SD is one of the most accurate silenced submachine guns of its type.",
     "price": 3000000,
     "valid_mod_locations": [ [ "accessories", 3 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
     "modes": [

data/json/items/gunmod/mechanism.json

@@ -42,7 +42,7 @@
     "id": "llink",
     "type": "GUNMOD",
     "name": "lightning link",
-    "description": "Originally designed for the Colt SP-1, this 'reproduction' is intended to convert an AR-15 into a full-auto only rifle. Once the necessary modifications are made and the link is in place, semi-auto is disabled and full-auto is enabled. Reliability and precision suffer greatly due to questionable craftsmanship and lack of unobtainium SP-1 parts.",
+    "description": "Originally designed for the Colt SP-1, this 'reproduction' is intended to convert an AR-15 into a full-auto only rifle.  Once the necessary modifications are made and the link is in place, semi-auto is disabled and full-auto is enabled.  Reliability and precision suffer greatly due to questionable craftsmanship and lack of unobtainium SP-1 parts.",
     "weight": 60,
     "volume": 1,
     "integral_volume": 0,

data/json/items/tool/science.json

@@ -162,7 +162,7 @@
     "type": "TOOL",
     "category": "tools",
     "name": "small glass tube",
-    "description": "This is a small glass tube. What more could you possibly want to know about it?",
+    "description": "This is a small glass tube.  What more could you possibly want to know about it?",
     "weight": 1,
     "volume": 0.1,
     "price": 10,

data/json/items/tool_armor.json

@@ -1450,7 +1450,7 @@
             "max_volume": 4,
             "flags": [ "SHEATH_KNIFE", "SHEATH_SWORD" ]
         } ],
-        "qualities": [["HAMMER", 3], ["SAW_M", 2], ["SAW_W", 2], ["WRENCH", 2], ["AXE", 1],
+        "qualities": [["HAMMER", 3], [ "PRY", 1 ], ["SAW_M", 2], ["SAW_W", 2], ["WRENCH", 2], ["AXE", 1], 
         ["SCREW", 1], ["HAMMER_FINE", 1], ["SAW_M_FINE", 1], ["WRENCH_FINE", 1], ["SCREW_FINE", 1]]
     },
     {

data/json/items/tools.json

@@ -4210,6 +4210,7 @@
     "qualities": [
       [ "HAMMER_FINE", 1 ],
       [ "HAMMER", 3 ],
+      [ "PRY", 1 ],
       [ "SAW_M_FINE", 1 ],
       [ "SAW_M", 2 ],
       [ "WRENCH_FINE", 1 ],
@@ -4734,7 +4735,7 @@
     "initial_charges": 100,
     "max_charges": 200,
     "charges_per_use": 50,
-    "qualities": [ [ "CHISEL", 3 ], [ "HAMMER_FINE", 1 ], [ "HAMMER", 3 ] ],
+    "qualities": [ [ "CHISEL", 3 ], [ "HAMMER_FINE", 1 ], [ "HAMMER", 3 ], [ "PRY", 1 ] ],
     "use_action": "MISC_REPAIR"
   },
   {
@@ -6415,6 +6416,7 @@
     "qualities": [
       [ "HAMMER_FINE", 1 ],
       [ "HAMMER", 3 ],
+      [ "PRY", 1 ],
       [ "SAW_M_FINE", 1 ],
       [ "SAW_M", 2 ],
       [ "SAW_W", 1 ],
@@ -7449,6 +7451,7 @@
       [ "AXE", 1 ],
       [ "WRENCH", 2 ],
       [ "SCREW", 1 ],
+      [ "PRY", 1 ],
       [ "HAMMER_FINE", 1 ],
       [ "SAW_M_FINE", 1 ],
       [ "WRENCH_FINE", 1 ],

data/json/mapgen/bank.json

@@ -192,6 +192,5 @@
     },
        "place_monster": [ { "monster": "mon_secubot", "x": [ 7, 18 ], "y": [ 7, 18 ], "chance": 30, "repeat": 4 } ]
       }
-
   }
 ]

data/json/mapgen/evac_center.json

@@ -705,7 +705,6 @@
           "x": 8,
           "y": 5
         },
-
         {
           "class": "old_guard_rep",
           "x": 19,
@@ -715,7 +714,6 @@
           "class": "arsonist",
           "x": 11,
           "y": 7
-
         }
       ]
     }

data/json/mapgen/teashop.json

@@ -296,7 +296,6 @@
        "}": { "item": "displays", "chance": 30, "repeat": [ 1, 3 ]  },
        "C": { "item": "chair_extra", "chance": 20, "repeat": [ 1, 2 ]  },
        "c": { "item": "chair_torso", "chance": 10, "repeat": [ 1, 3 ]  }
-
       },
       "place_signs": [ { "signage": "The Green Leaf Tea Shop", "x": 4, "y": 0 } ]
     }

data/json/martialarts.json

@@ -1036,7 +1036,10 @@
                 "buff_duration" : 2,
                 "max_stacks" : 1,
                 "bonus_blocks" : -1,
-                "mult_bonuses" : [["damage", "cut", 1.1]]
+                "mult_bonuses" : [
+                    ["damage", "cut", 1.1],
+                    ["damage", "stab", 1.1]
+                ]
             }
         ],
         "techniques" : [

data/json/monsters/insect_spider.json

@@ -146,10 +146,11 @@
     "hp": 10,
     "speed": 50,
     "material": [ "iflesh" ],
+    "diff": 1,
     "symbol": "a",
     "color": "brown",
-    "aggression": 100,
-    "morale": 100,
+    "aggression": -99,
+    "morale": -8,
     "melee_skill": 3,
     "melee_dice": 2,
     "melee_dice_sides": 3,
@@ -160,7 +161,7 @@
     "upgrades": { "age_grow": 7, "into": "mon_giant_cockroach" },
     "death_function": [ "NORMAL" ],
     "special_attacks": [ [ "EAT_FOOD", 120 ] ],
-    "flags": [ "SEES", "HEARS", "SMELLS", "CLIMBS" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "LARVA", "CLIMBS" ]
   },
   {
     "id": "mon_pregnant_giant_cockroach",

data/json/monsters/reptile_amphibian.json

@@ -32,7 +32,7 @@
     "id": "mon_gator",
     "type": "MONSTER",
     "name": "sewer gator",
-    "description": "In the late 20th century there was an urban legend about pet alligators getting flushed down the toilet and growing to adulthood in sewers.  This large specimen doesn't look like it is used to humans as anything other than a meal.",
+    "description": "In the late 20th century there was an urban legend about pet alligators getting flushed down the toilet and growing to adulthood in sewers.  This large specimen doesn't look like it sees humans as anything other than a meal.",
     "default_faction": "gator",
     "categories": [ "WILDLIFE" ],
     "species": [ "REPTILE" ],

data/json/mutations.json

@@ -105,6 +105,7 @@
         "points" : 2,
         "description" : "Your metabolism is a little slower, and you require less food than most.",
         "starting_trait" : true,
+        "cancels" : ["MET_RAT"],
         "types" : ["METABOLISM"],
         "changes_to" : [ "GIZZARD", "COLDBLOOD" ],
         "category" : ["FISH", "BIRD", "INSECT", "TROGLOBITE"],
@@ -1110,7 +1111,7 @@
         "name" : "Genetic Downward Spiral",
         "points" : -12,
         "purifiable" : false,
-        "description" : "The events of the Cataclysm have damaged your DNA beyond repair. You mutate frequently, and all mutations you receive (from any source) are negative.",
+        "description" : "The events of the Cataclysm have damaged your DNA beyond repair.  You mutate frequently, and all mutations you receive (from any source) are negative.",
         "starting_trait" : true,
 		"cancels" : ["ROBUST"],
         "valid" : false
@@ -5765,14 +5766,6 @@
         "valid" : false,
         "description" : "Crafting and construction requirements bugger off with this one.  Apply with care.",
         "debug" : true
-    },{
-      "type" : "mutation",
-      "id" : "DEBUG_CBM_SLOTS",
-      "name" : "Debug CBM Slots Limits",
-      "points" : 99,
-      "valid" : false,
-      "description" : "Limitate the number of bionics which you're able to install in your body.",
-      "debug" : true
     },{
         "type" : "mutation",
         "id" : "DEBUG_MIND_CONTROL",

data/json/npcs/BG_trait_groups.json

@@ -106,7 +106,12 @@
     "type": "trait_group",
     "id": "BG_survival_story_POLICE",
     "subtype": "distribution",
-    "traits": [ { "group": "BG_survival_story_UNIVERSAL" }, { "trait": "BGSS_Cop_1" }, { "trait": "BGSS_Cop_2" } ]
+    "traits": [
+      { "group": "BG_survival_story_UNIVERSAL" },
+      { "trait": "BGSS_Cop_1" },
+      { "trait": "BGSS_Cop_2" },
+      { "trait": "BGSS_Cop_3" }
+    ]
   },
   {
     "//": "This group is for NPCs that should be doing their homework instead of hunting zombies.",

data/json/npcs/BG_traits.json

@@ -390,6 +390,17 @@
     "purifiable": false,
     "flags": [ "BG_SURVIVAL_STORY" ]
   },
+  {
+    "type": "mutation",
+    "id": "BGSS_Cop_3",
+    "name": "Survivor Story",
+    "points": 0,
+    "description": "cop3",
+    "player_display": false,
+    "valid": false,
+    "purifiable": false,
+    "flags": [ "BG_SURVIVAL_STORY" ]
+  },
   {
     "type": "mutation",
     "id": "BGSS_Hunter_1",

data/json/npcs/Backgrounds/backgrounds_table_of_contents.json

@@ -219,6 +219,12 @@
         "condition": { "npc_has_trait": "BGSS_Cop_2" },
         "switch": true
       },
+      {
+        "text": "<BGSS_intro_question>",
+        "topic": "BGSS_COP_3_STORY1",
+        "condition": { "npc_has_trait": "BGSS_Cop_3" },
+        "switch": true
+      },
       {
         "text": "<BGSS_intro_question>",
         "topic": "BGSS_HUNTER_1_STORY1",

data/json/npcs/Backgrounds/cop_3.json

@@ -0,0 +1,48 @@
+[
+  {
+    "id": "BGSS_COP_3_STORY1",
+    "type": "talk_topic",
+    "dynamic_line": "Before <the_cataclysm>, I was a cop.  I got shot just a couple days before everything went down... I made a bad call in a drug bust and a scumbag got me right in the gut, it was barely stopped by my vest.  I took some pretty bad internal bruising.  I never thought getting shot would save my life, but I was off duty recuperating when the worst of it hit.",
+    "responses": [
+      {
+        "text": "What did you do when you found out about the cataclysm?",
+        "condition": { "not": { "days_since_cataclysm": 90 } },
+        "effect": { "npc_add_effect": "BGSS_Cop_3_earlymeeting", "duration": "PERMANENT" },
+        "//": "If you talk to this NPC any time before day 90, the game flags him as an NPC you met 'early' and never gives you the 'late' convo options",
+        "topic": "BGSS_COP_3_STORY2"
+      },
+      {
+        "text": "What did you do when you found out about the cataclysm?",
+        "condition": { "days_since_cataclysm": 90 },
+        "topic": "BGSS_COP_3_STORY2"
+      },
+      { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking>", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "type": "effect_type",
+    "id": "BGSS_Cop_3_earlymeeting",
+    "//": "Defined here because this should be the only time this effect is referenced."
+  },
+  {
+    "id": "BGSS_COP_3_STORY2",
+    "type": "talk_topic",
+    "dynamic_line": "At first I wanted to help.  The riots, fighting in the streets, it was too much for me to just sit in my house and hear about it on the news.  Then a buddy of mine called me from just off the front lines.  He'd been hurt and he wasn't making much sense, but what he told me... well, you can imagine the kind of stuff he told me.  Everything the worst of the internet was making up, and more.  Instead of packing up to try to volunteer back onto active duty, I took his advice and packed up to leave.  My house was on the edge of town and the riots hadn't reached it yet, but from what I'd heard it was smarter to get out than to hold tight.  I slipped out that night, took my quad out, and camped a few days in the woods, waiting for it to blow over.  It never did.",
+    "responses": [
+      {
+        "text": "What was it like, surviving out there with an injury?",
+        "condition": { "not": { "npc_has_effect": "BGSS_Cop_3_earlymeeting" } },
+        "topic": "BGSS_COP_3_STORY3"
+      },
+      { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking>", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "id": "BGSS_COP_3_STORY3",
+    "type": "talk_topic",
+    "dynamic_line": "Honestly, probably better than it sounds.  I had a good bug-out bag, a nice tent, a lot of good stuff.  I hadn't suffered any internal organ damage, my stomach muscles were just really badly bruised, and I'd already had some good time to recover.  I think it kept me from doing anything too stupid, and believe me there was a high chance of that.  For a long time I had these Rambo visions of rushing into town and saving everyone, but I was still too immobile.  By the time I had my strength back, it wasn't an option... we were well into the rushing into town for supplies phase.  The closest I got to saving any old friends was putting down the monsters wearing their faces.",
+    "responses": [ { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" }, { "text": "<end_talking>", "topic": "TALK_DONE" } ]
+  }
+]