Merge remote-tracking branch 'upstream/master'

data/json/furniture.json

@@ -1335,9 +1335,9 @@
     "description": "Stores your trash.",
     "symbol": "{",
     "color": "green",
-    "move_cost_mod": -1,
+    "move_cost_mod": 3,
     "required_str": 16,
-    "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR" ],
+    "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "HIDE_PLACE" ],
     "bash": {
       "str_min": 8,
       "str_max": 45,
@@ -3363,7 +3363,16 @@
     "required_str": -1,
     "deconstruct": { "items": [ { "item": "pillow", "count": 19 }, { "item": "blanket", "count": 3 } ] },
     "max_volume": 4000,
-    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "REDUCE_SCENT", "EASY_DECONSTRUCT", "BASHABLE" ],
+    "flags": [
+      "TRANSPARENT",
+      "FLAMMABLE_ASH",
+      "PLACE_ITEM",
+      "ORGANIC",
+      "REDUCE_SCENT",
+      "EASY_DECONSTRUCT",
+      "BASHABLE",
+      "HIDE_PLACE"
+    ],
     "bash": {
       "str_min": 1,
       "str_max": 1,

data/json/itemgroups/guns.json

@@ -112,7 +112,8 @@
     "items": [
       [ "hk_mp7", 100 ],
       [ "needlegun", 30 ],
-      [ "rm2000_smg", 50 ]
+      [ "rm2000_smg", 50 ],
+      [ "hk_mp5sd", 75 ]
     ]
   },
   {

data/json/items/armor.json

@@ -7330,9 +7330,9 @@
     "material": [ "leather" ],
     "symbol": "[",
     "color": "brown",
-    "covers": [ "TORSO" ],
-    "coverage": 5,
-    "encumbrance": 2,
+    "covers": [ "LEG_EITHER" ],
+    "coverage": 10,
+    "encumbrance": 3,
     "material_thickness": 1,
     "use_action": { "type": "bandolier", "capacity": 20, "ammo": [ "arrow", "bolt" ], "draw_cost": 20 },
     "flags": [ "WAIST", "OVERSIZE", "WATER_FRIENDLY" ]
@@ -7349,8 +7349,8 @@
     "material": [ "wood" ],
     "symbol": "[",
     "color": "light_gray",
-    "covers": [ "TORSO" ],
-    "coverage": 5,
+    "covers": [ "LEG_EITHER" ],
+    "coverage": 10,
     "encumbrance": 10,
     "material_thickness": 1,
     "use_action": { "type": "bandolier", "capacity": 20, "ammo": [ "arrow", "bolt" ], "draw_cost": 20 },

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

@@ -157,6 +157,21 @@
       [ "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.",
+    "price": 3000000,
+    "valid_mod_locations": [ [ "accessories", 3 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
+    "modes": [
+      [ "DEFAULT", "semi-auto", 1 ],
+      [ "BURST", "3 rd.", 3 ],
+      [ "AUTO", "auto", 12 ]
+      ],
+    "built_in_mods": [ "mp5sd_suppressor" ]
   },
   {
     "id": "ksub2000",

data/json/items/gunmod/magazine.json

@@ -13,11 +13,11 @@
     "color": "green",
     "location": "magazine",
     "mod_targets": [ "pistol", "rifle" ],
-    "acceptable_ammo": [ "9mm", "45", "223" ],
+    "acceptable_ammo": [ "9mm", "460", "223" ],
     "install_time": 60000,
     "magazine_adaptor": [
       [ "9mm", [ "lw21mag" ] ],
-      [ "45", [ "lw12mag" ] ],
+      [ "460", [ "lw12mag" ] ],
       [ "223", [ "lw223mag", "lw223bigmag" ] ]
     ],
     "min_skills": [ [ "weapon", 4 ], [ "mechanics", 3 ] ],

data/json/items/gunmod/muzzle.json

@@ -110,6 +110,21 @@
     "handling_modifier": 2,
     "loudness_modifier": -50
   },
+  {
+    "id": "mp5sd_suppressor",
+    "copy-from": "suppressor",
+    "type": "GUNMOD",
+    "name": "mp5sd integral suppressor",
+    "description": "The integrated suppressor for the mp5sd.",
+    "damage_modifier": -7,
+    "weight": 250,
+    "integral_volume": 0,
+    "loudness_modifier": -100,
+    "range_modifier": -1,
+    "dispersion_modifier": 0,
+    "location": "barrel",
+    "flags": [ "IRREMOVABLE" ]
+  },
   {
     "id": "suppressor_compact",
     "type": "GUNMOD",

data/json/mapgen/evac_center.json

@@ -272,7 +272,7 @@
         { "item": "allclothes", "x": [ 8, 17 ], "y": [ 16, 16 ], "chance": 60 },
         { "item": "trash", "x": [ 13, 14 ], "y": 21, "chance": 60, "repeat": [ 1, 2 ] }
       ],
-      "place_npcs": [ { "class": "guard", "x": 19, "y": 21 } ]
+      "place_npcs": [ { "class": "refugee_JennyForcette", "x": 8, "y": 8 }, { "class": "guard", "x": 19, "y": 21 } ]
     }
   },
   {

data/json/npcs/Backgrounds/criminal_1.json

@@ -13,7 +13,31 @@
     "id": "BGSS_CRIMINAL_1_STORY2",
     "type": "talk_topic",
     "dynamic_line": "It was just <swear> chaos on the streets, man.  But I'm used to chaos.  You don't live as long as I've lived and not know how to keep away from a fight you can't win.  Biggest worry wasn't the zombies and the monsters, honestly.  It was the fuckin' police robots.  They knew I was in violation, and they kept trying to arrest me.",
-    "//": "TK, this story not done.",
-    "responses": [ { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" }, { "text": "<end_talking>", "topic": "TALK_DONE" } ]
+    "responses": [
+      { "text": "How did you keep from getting arrested?", "topic": "BGSS_CRIMINAL_1_STORY3" },
+      { "text": "What were you in for in the first place?", "topic": "BGSS_CRIMINAL_1_PAROLE" },
+      { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking>", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "id": "BGSS_CRIMINAL_1_STORY3",
+    "type": "talk_topic",
+    "dynamic_line": "Kept outta their line of sight, is a big part of it.  Don't let those <swear> flyin' cameras get you, you know?  If they do, they call for backup from the big guns, and then, well, I hope you like gettin' tazed and shoved in the back of a van.  I kept my head down until I got past the worst of it, but then one of the <swear> eyebots recognized me and I had to book it.  I was just lucky the bots it called had blown their wad on some giant-ass slime beast and were tryin' to get me with their short range shit.  I wound up on the edge of town layin' low under an abandoned RV for a few hours, then slipped out in the night.",
+    "responses": [
+      { "text": "What were you in for in the first place?", "topic": "BGSS_CRIMINAL_1_PAROLE" },
+      { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking>", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "id": "BGSS_CRIMINAL_1_PAROLE",
+    "type": "talk_topic",
+    "dynamic_line": "Bullshit, that's what.  The assholes busted me on possession, wasn't even my fuckin' stash.  I don't do crack, man, that shit's nasty, I was just carryin' it for my buddy Johnny.  Y'know, this might be a <swear> hellhole now, but if I've seen the last power-trippin' asshole cop, it might all be worth it.",
+    "responses": [
+      { "text": "What were you saying before?", "topic": "TALK_NONE" },
+      { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking>", "topic": "TALK_DONE" }
+    ]
   }
 ]

data/json/npcs/Backgrounds/grad_student_1.json

@@ -2,8 +2,43 @@
   {
     "id": "BGSS_GRAD_STUDENT_1_STORY1",
     "type": "talk_topic",
-    "dynamic_line": "I'm not from around here...  You can probably tell from the accent, I'm from the UK.  I was a PhD candidate at Dartmouth.  I was halfway to MIT for a conference when <the_cataclysm> stopped me.  I was staying at a flee-ridden little motel on the side of the road.  When I got up for whatever was going to pass for breakfast, the fat bloody proprietor was sitting at his desk, wearing the same grubby clothes from the night before.  I thought he had just slept there, but when he looked at me...  well, you know what those Zed-eyes look like.  He lunged, and I reacted without thinking.  Smacked him on the head with my tablet.",
-    "//": "TK, this story not done.",
-    "responses": [ { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" }, { "text": "<end_talking>", "topic": "TALK_DONE" } ]
+    "dynamic_line": "I'm not from around here...  You can probably tell from the accent, I'm from the UK.  I was here doing my PhD at Dartmouth.  I was halfway to MIT for a conference when <the_cataclysm> stopped me.  I was staying at a flea-ridden little motel on the side of the road.  When I got up for whatever was going to pass for breakfast, the fat bloody proprietor was sitting at his desk, wearing the same grubby clothes from the night before.  I thought he had just slept there, but when he looked at me...  well, you know what those Zed-eyes look like.  He lunged, and I reacted without thinking.  Smacked him on the head with my tablet, again and again, until he stopped coming for me.  I never thought I had anything like that in me.",
+    "responses": [
+      { "text": "What did you do next?", "topic": "BGSS_GRAD_STUDENT_1_STORY2" },
+      { "text": "What were you studying?", "topic": "BGSS_GRAD_STUDENT_1_FIELD" },
+      { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking>", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "id": "BGSS_GRAD_STUDENT_1_STORY2",
+    "type": "talk_topic",
+    "dynamic_line": "I wandered for a little while around the grounds, letting the adrenaline fade, hoping for some kind of idea what to do.  I was out in the middle of nowhere, and I didn't know the area at all.  I wasn't certain if I should head back to Hanover, and try to get my belongings, or stay out where I was.  Finally, I decided to rest a while until I knew what was going on.  The internet told me most of what I needed; I'm sure you saw Twitter in those days.  Even if I'd thought it wise to go back all the way to New Hampshire, I was far too scared.",
+    "responses": [
+      { "text": "Something must have driven you out of the motel.", "topic": "BGSS_GRAD_STUDENT_1_STORY3" },
+      { "text": "What were you studying?", "topic": "BGSS_GRAD_STUDENT_1_FIELD" },
+      { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking>", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "id": "BGSS_GRAD_STUDENT_1_STORY3",
+    "type": "talk_topic",
+    "dynamic_line": "Yes.  Simple hunger.  The vending machines sold only peanuts and biscuits.  I wasn't about to rely on that for survival.  I stayed long enough to realize no one was going to come for me, then packed up what I could and drove off.  Eventually my car was caught in a downpour of acid rain that stripped the tires and left me to carry on on foot, living the life of a hunter gatherer.  Honestly, I think I eat better this way than I did as a grad student.",
+    "responses": [
+      { "text": "What were you studying?", "topic": "BGSS_GRAD_STUDENT_1_FIELD" },
+      { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking>", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "id": "BGSS_GRAD_STUDENT_1_FIELD",
+    "type": "talk_topic",
+    "dynamic_line": "I was in biochemistry.  Specifically, if you're interested, I was studying the folding of non-standard nucleic acids into enzyme-like structures.  It sounds more interesting than it was; most of my time was spent cursing at computer screens and wishing we had more information on threose chains at unusual temperatures and pressures for modeling.",
+    "responses": [
+      { "text": "What were you saying before?", "topic": "TALK_NONE" },
+      { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking>", "topic": "TALK_DONE" }
+    ]
   }
 ]