Merge branch 'master' into npc-json

Conflicts:
	src/init.cpp

CataclysmWin.cbp

@@ -601,6 +601,8 @@
 		<Unit filename="src/savegame_legacy.cpp" />
 		<Unit filename="src/scenario.cpp" />
 		<Unit filename="src/scenario.h" />
+		<Unit filename="src/scent_map.cpp" />
+		<Unit filename="src/scent_map.h" />
 		<Unit filename="src/sdltiles.cpp" />
 		<Unit filename="src/shadowcasting.h" />
 		<Unit filename="src/simplexnoise.cpp" />

astyled_whitelist

@@ -57,6 +57,8 @@ src/profession.cpp
 src/recipe_dictionary.cpp
 src/rng.cpp
 src/scenario.cpp
+src/scent_map.cpp
+src/scent_map.h
 src/speech.cpp
 src/start_location.cpp
 src/submap.cpp

data/json/bionics.json

@@ -595,8 +595,8 @@
         "occupied_bodyparts": [
             [ "TORSO", 10 ]
         ],
-        "act_cost": 125,
-        "description": "Inside your body is a fleet of tiny dormant robots.  Once charged from your energy banks, they will flit about your body, repairing damage and stopping bleeding."
+        "toggled": true,
+        "description": "Inside your body is a fleet of tiny dormant robots.  While activated they will flit about your body, repairing damage and stopping bleeding at the cost of power."
     },{
         "type": "bionic",
         "id": "bio_heatsink",
@@ -803,7 +803,7 @@
             [ "HAND_L", 5 ]
         ],
         "act_cost": 50,
-        "description": "Your left arm has been replaced by a heavy-duty fusion blaster!  You may use your energy banks to fire a damaging heat ray. However, you are unable to use or carry two-handed items, and your strength limits what you can use with your one hand."
+        "description": "Your left arm has been replaced by a heavy-duty fusion blaster!  You may use your energy banks to fire a damaging heat ray.  However, you are unable to use or carry two-handed items, and your strength limits what you can use with your one hand."
     },{
         "type": "bionic",
         "id": "bio_laser",

data/json/construction.json

@@ -2083,17 +2083,7 @@
         "category" : "OTHER",
         "difficulty" : 0,
         "time" : 10,
-        "components" : [
-            [
-                [ "frame", 1 ],
-                [ "hdframe", 1 ],
-                [ "frame_wood", 1 ],
-                [ "xlframe", 1 ],
-                [ "frame_wood_light", 1 ],
-                [ "foldwoodframe", 1 ],
-                [ "foldframe", 1 ]
-            ]
-        ],
+        "//": "no components required, they are filled in at runtime based on the vehicle parts that can be used to start a vehicle",
         "pre_special" : "check_empty",
         "post_special" : "done_vehicle"
     },{

data/json/effects.json

@@ -1560,7 +1560,7 @@
         "desc": [ "A lack of vitamin A in your diet will progressively worsen your vision." ],
         "apply_message": "You beging struggling to make out the finer details.",
         "remove_message": "Your normal visual accuity returns.",
-        "decay_messages": [ 
+        "decay_messages": [
           [ "Your vitamin A deficiency is nearly resolved.", "good" ],
           [ "Your vision improves as your Vitamin A deficiency improves.", "good" ]
         ],

data/json/furniture.json

@@ -1124,7 +1124,7 @@
         "bgcolor": "brown",
         "move_cost_mod": -1,
         "required_str": 14,
-        "flags": ["TRANSPARENT", "CONTAINER", "SEALED", "ALLOW_FIELD_EFFECT", "FLAMMABLE", "PLACE_ITEM", 
+        "flags": ["TRANSPARENT", "CONTAINER", "SEALED", "ALLOW_FIELD_EFFECT", "FLAMMABLE", "PLACE_ITEM",
                   "ORGANIC", "MOUNTABLE", "SHORT"],
         "deconstruct": {
             "items": [

data/json/items/ammo/545x39.json

@@ -23,7 +23,6 @@
     "effects": [ "COOKOFF" ]
   },
   {
-
     "id": "545_ap",
     "copy-from": "545",
     "type": "AMMO",

data/json/items/ammo/5x50.json

@@ -1,5 +1,5 @@
 [
-  {   
+  {
     "id": "5x50dart",
     "type": "AMMO",
     "name": "RA110 5x50mm flechette",
@@ -21,7 +21,7 @@
     "recoil": 60,
     "effects": ["COOKOFF", "NEVER_MISFIRES"]
   },
-  {   
+  {
     "id": "5x50heavy",
     "copy-from": "5x50dart",
     "type": "AMMO",

data/json/items/ammo/9x18.json

@@ -1,5 +1,5 @@
 [
-  {   
+  {
     "id": "9x18mm",
     "type": "AMMO",
     "name": "9x18mm 57-N-181S",
@@ -22,7 +22,7 @@
     "recoil": 185,
     "effects": [ "COOKOFF" ]
   },
-  {   
+  {
     "id": "9x18mmP2",
     "copy-from": "9x18mm",
     "type": "AMMO",
@@ -38,7 +38,7 @@
         "recoil": 30
     }
   },
-  {   
+  {
     "id": "9x18mmfmj",
     "copy-from": "9x18mm",
     "type": "AMMO",

data/json/items/ammo/metal_rail.json

@@ -1,6 +1,6 @@
 
 [
-  {   
+  {
     "type": "AMMO",
     "id": "rebar_rail",
     "name": "rebar rail",
@@ -23,7 +23,7 @@
     "recoil": 300,
     "effects": [ "RECYCLED" ]
   },
-  {   
+  {
     "id": "steel_rail",
     "copy-from": "rebar_rail",
     "type": "AMMO",

data/json/items/armor.json

@@ -2272,7 +2272,7 @@
         "price" : 1500,
         "material" : ["cotton", "plastic"],
         "volume" : 3,
-        "warmth" : 15,
+        "warmth" : 5,
         "encumbrance" : 0,
         "flags" : ["VARSIZE","WATER_FRIENDLY"],
         "coverage" : 80,

data/json/items/comestibles.json

@@ -2426,8 +2426,8 @@
         "description" : "This is a serving of crisply brined and canned fish.  Tasty and nutritious.",
         "price" : 250, "//" : "Two charges per jar.",
         "material" : "flesh",
-        "volume" : 2,
-        "charges" : 2,
+        "volume" : 1,
+        "stack_size" : 2,
         "fun" : 7
     },
     {
@@ -2447,8 +2447,8 @@
         "description" : "Low-sodium preserved fish.  It was boiled and canned.  Contains most of the nutrition, but little of the savor of cooked fish.",
         "price" : 250,
         "material" : "flesh",
-        "volume" : 2,
-        "charges" : 1,
+        "volume" : 1,
+        "stack_size" : 2,
         "fun" : 2
     },
     {
@@ -8442,8 +8442,7 @@
         "description" : "Low-sodium preserved meat.  It was boiled and canned.  Contains most of the nutrition, but little of the savor of cooked meat.",
         "price" : 250,
         "material" : "flesh",
-        "volume" : 2,
-        "charges" : 1,
+        "volume" : 1,
         "stack_size" : 2,
         "fun" : 2
     },
@@ -8464,8 +8463,7 @@
         "description" : "This mushy pile of vegetable matter was boiled and canned in an earlier life.  Better eat it before it oozes through your fingers.",
         "price" : 250,
         "material" : "veggy",
-        "volume" : 2,
-        "charges" : 1,
+        "volume" : 1,
         "stack_size" : 2,
         "fun" : 0
     },
@@ -8486,8 +8484,7 @@
         "description" : "This sodden mass of preserved fruit was boiled and canned in an earlier life.  Bland, mushy and losing color.",
         "price" : 220,
         "material" : "fruit",
-        "volume" : 2,
-        "charges" : 1,
+        "volume" : 1,
         "stack_size" : 2,
         "fun" : 1
     },
@@ -8508,8 +8505,7 @@
         "description" : "Low-sodium preserved human meat.  It was boiled and canned.  Contains most of the nutrition, but little of the savor of cooked meat.",
         "price" : 0,
         "material" : "hflesh",
-        "volume" : 2,
-        "charges" : 1,
+        "volume" : 1,
         "stack_size" : 2,
         "fun" : 2
     },
@@ -8873,8 +8869,7 @@
         "price" : 450,
         "material" : "veggy",
         "volume" : 1,
-        "charges" : 1,
-        "stack_size" : 4,
+        "charges" : 2,
         "fun" : -2
     },
     {
@@ -9444,7 +9439,7 @@
         "price" : 250,
         "material" : "veggy",
         "volume" : 1,
-        "charges" : 2,
+        "stack_size" : 2,
         "fun" : 7
     },
     {
@@ -9463,7 +9458,7 @@
         "price" : 250,
         "material" : "flesh",
         "volume" : 1,
-        "charges" : 2,
+        "stack_size" : 2,
         "fun" : 6
     },
     {
@@ -9481,8 +9476,8 @@
         "description" : "This is a serving of crisply brined and canned human flesh.  Tasty and nutritious if you're into that sort of thing.",
         "price" : 0,
         "material" : "hflesh",
-        "volume" : 4,
-        "charges" : 2,
+        "volume" : 1,
+        "stack_size" : 2,
         "fun" : 6
     },
     {   "type" : "AMMO",
@@ -11485,8 +11480,7 @@
         "description" : "Canned tomato.  A staple in many pantries, and useful for many recipes.",
         "price" : 350,
         "material" : "veggy",
-        "volume" : 2,
-        "charges" : 1,
+        "volume" : 1,
         "stack_size" : 2,
         "fun" : 0
     },

data/json/items/comestibles/mutagen.json

@@ -25,7 +25,7 @@
         "type" : "COMESTIBLE",
         "name" : "abstract mutagen flavor",
         "addiction_potential" : 2
-    },    
+    },
     {
         "id" : "mutagen_alpha",
         "copy-from" : "mutagen_flavor",

data/json/items/comestibles/seed.json

@@ -14,7 +14,7 @@
         "symbol": ".",
         "color": "brown"
     },
-    {   
+    {
         "id": "seed_blackberries",
         "copy-from": "seed",
         "type": "COMESTIBLE",
@@ -75,7 +75,7 @@
             "grow": 120
         }
     },
-    {   
+    {
         "id": "seed_raspberries",
         "copy-from": "seed",
         "type": "COMESTIBLE",

data/json/items/magazine/762x25.json

@@ -1,5 +1,4 @@
 [
-
   {
     "id": "ppshmag",
     "type": "MAGAZINE",

data/json/items/ranged.json

@@ -798,65 +798,6 @@
     "reload": 150,
     "valid_mod_locations": [[ "accessories", 4 ],[ "grip", 1 ],[ "mechanism", 4 ],[ "sights", 1 ]]
   },
-  {
-    "id": "rebar_rifle",
-    "type": "GUN",
-    "symbol": "(",
-    "color": "brown",
-    "name": "ferromagnetic rail rifle",
-    "description": "A single-shot, electrically propelled, steel rail launcher handcrafted from scrap.  The hypervelocity metal stake that it fires is accelerated to the point of spontaneous combustion by a Lorentz force generated by electromagnetic induction, powered by a standard UPS.",
-    "price": 550000,
-    "material": ["steel", "wood"],
-    "ammo_effects": ["INCENDIARY", "TRAIL"],
-    "flags": ["RELOAD_ONE"],
-    "ups_charges": 40,
-    "skill": "rifle",
-    "ammo": "metal_rail",
-    "weight": 4213,
-    "volume": 10,
-    "bashing": 10,
-    "cutting": 0,
-    "to_hit": -3,
-    "dispersion": 90,
-    "sight_dispersion": 150,
-    "aim_speed" : 0,
-    "recoil": 60,
-    "durability": 6,
-    "clip_size": 1,
-    "reload": 200,
-    "valid_mod_locations": [[ "grip", 1 ],[ "stock", 1 ],[ "sights", 1 ]]
-  },
-  {
-    "id": "heavy_rail_rifle",
-    "type": "GUN",
-    "symbol": "(",
-    "color": "dark_gray",
-    "name": "heavy rail rifle",
-    "name_plural": "heavy rail rifles",
-    "description": "This overpowered and overengineered variant of the ferromagnetic rail rifle was designed to deliver electromagnetically-driven obliteration right through whatever obstacles that lies in front of it, be it buildings, vehicles or hordes of walking dead.  However, the hefty bulk and weight of this weapon compared to most contemporary rifles makes it somewhat cumbersome to wield; not to mention that it consumes UPS charges at a tremendous rate, making it impractical for use in prolonged engagements.",
-    "price": 900000,
-    "material": ["steel", "plastic"],
-    "ammo_effects": ["INCENDIARY", "TRAIL"],
-    "flags": ["RELOAD_ONE"],
-    "ups_charges": 100,
-    "skill": "rifle",
-    "ammo": "metal_rail",
-    "weight": 11500,
-    "volume": 18,
-    "bashing": 12,
-    "cutting": 0,
-    "to_hit": -1,
-    "ranged_damage" : 40,
-    "range" : 40,
-    "dispersion": 100,
-    "sight_dispersion": 150,
-    "aim_speed" : 6,
-    "recoil": 300,
-    "durability": 7,
-    "clip_size": 10,
-    "reload": 200,
-    "valid_mod_locations": [["accessories", 4],["grip", 1],["rail", 1],["sights", 1],["stock", 1],["underbarrel", 1]]
-  },
   {
     "id": "m107a1",
     "type": "GUN",