Merge branch 'master' into counter-fix

CataclysmWin.cbp

@@ -481,6 +481,7 @@
 		<Unit filename="src/map.cpp" />
 		<Unit filename="src/map.h" />
 		<Unit filename="src/map_selector.h" />
+		<Unit filename="src/map_selector.cpp" />
 		<Unit filename="src/mapbuffer.cpp" />
 		<Unit filename="src/mapbuffer.h" />
 		<Unit filename="src/mapdata.cpp" />
@@ -539,8 +540,6 @@
 		<Unit filename="src/name.cpp" />
 		<Unit filename="src/name.h" />
 		<Unit filename="src/newcharacter.cpp" />
-		<Unit filename="src/nonplayer.cpp" />
-		<Unit filename="src/nonplayer.h" />
 		<Unit filename="src/npc.cpp" />
 		<Unit filename="src/npc.h" />
 		<Unit filename="src/npcmove.cpp" />
@@ -616,6 +615,8 @@
 		<Unit filename="src/uistate.h" />
 		<Unit filename="src/veh_interact.cpp" />
 		<Unit filename="src/veh_interact.h" />
+		<Unit filename="src/vehicle_selector.h" />
+		<Unit filename="src/vehicle_selector.cpp" />
 		<Unit filename="src/veh_type.cpp" />
 		<Unit filename="src/veh_type.h" />
 		<Unit filename="src/vehicle.cpp" />

astyled_whitelist

@@ -33,7 +33,6 @@ src/monmove.cpp
 src/morale.cpp
 src/mtype.cpp
 src/name.cpp
-src/nonplayer.cpp
 src/pathfinding.cpp
 src/posix_time.cpp
 src/profession.cpp
@@ -97,6 +96,7 @@ src/int_id.h
 src/item_action.h
 src/item_factory.h
 src/item_location.h
+src/item_location.cpp
 src/item_stack.h
 src/iuse_software.h
 src/iuse_software_kitten.h
@@ -122,7 +122,6 @@ src/mongroup.h
 src/morale.h
 src/mutation.h
 src/name.h
-src/nonplayer.h
 src/omdata.h
 src/options.h
 src/overmap_types.h
@@ -155,3 +154,7 @@ src/version.h
 src/weather.h
 src/weighted_list.h
 src/worldfactory.h
+src/map_selector.h
+src/map_selector.cpp
+src/vehicle_selector.h
+src/vehicle_selector.cpp

data/json/effects.json

@@ -1473,12 +1473,12 @@
         "type": "effect_type",
         "id": "corroding",
         "name": ["Corroding"],
-        "desc": ["You're covered in acid!  It hurts and further lowers your resistance to acid."],
+        "desc": ["You're covered in acid!"],
         "apply_message": "You're covered in acid!",
         "rating": "bad",
-        "max_duration": 5,
+        "max_duration": 30,
         "max_intensity": 5,
-        "int_dur_factor": 1,
+        "int_dur_factor": 5,
         "base_mods": {
             "hurt_min": [1],
             "hurt_chance": [1],

data/json/item_groups.json

@@ -1843,7 +1843,7 @@
     "items" : [
       ["2x4", 100],
       ["rock", 70],
-      ["coal", 20],
+      ["coal_lump", 20],
       ["material_shrd_limestone", 70],
       ["fertilizer_commercial", 100],
       ["material_quicklime", 70],
@@ -2681,8 +2681,6 @@
       ["barrel_rifled", 5],
       ["barrel_ported", 5],
       ["muzzle_brake", 2],
-      ["conversion_battle", 1],
-      ["conversion_sniper", 1],
       ["mn_ebr_kit", 1],
       ["tuned_mechanism", 2],
       ["match_trigger", 3],
@@ -2832,8 +2830,6 @@
       ["barrel_rifled", 10],
       ["barrel_ported", 10],
       ["muzzle_brake", 5],
-      ["conversion_battle", 1],
-      ["conversion_sniper", 1],
       ["mn_ebr_kit", 1],
       ["stabilizer", 4],
       ["blowback", 3],
@@ -4759,6 +4755,7 @@
       ["pocketwatch", 5],
       ["sf_watch", 10],
       ["survnote", 3],
+      ["stillsuit", 5],
       ["l-stick", 1]
     ]
   },{
@@ -4829,6 +4826,7 @@
       ["huge_crossbow", 2],
       ["quiver", 2],
       ["quiver_large", 1],
+      ["baldric", 4],
       ["nodachi", 1],
       ["armor_lightplate", 1],
       ["armor_samurai", 1],
@@ -4846,6 +4844,7 @@
       ["textbook_weapeast", 5],
       ["textbook_armwest", 5],
       ["textbook_armeast", 5],
+      ["textbook_armschina", 5],
       ["q_staff", 10],
       ["i_staff", 5],
       ["sword_bayonet", 10],
@@ -4923,8 +4922,6 @@
       ["deagle_44", 2],
       ["lemat_revolver", 1],
       ["m1911", 5],
-      ["conversion_battle", 1],
-      ["conversion_sniper", 1],
       ["mn_ebr_kit", 1],
       ["tuned_mechanism", 2],
       ["match_trigger", 3],
@@ -5149,6 +5146,7 @@
       ["grapnel", 1],
       ["razor_blade", 6],
       ["scabbard", 4],
+      ["baldric", 4],
       ["bscabbard", 4],
       ["sheath", 6],
       ["bootsheath", 6],
@@ -6848,6 +6846,7 @@
       ["glowstick", 60],
       ["handflare", 40],
       ["tongs", 5],
+      ["stillsuit", 1],	
       ["tool_belt", 10],
       ["slingpack", 5],
       ["quiver", 3],
@@ -6953,7 +6952,7 @@
       ["pickaxe", 2],
       ["rock", 40],
       ["toolbox", 5],
-      ["coal", 20],
+      ["coal_lump", 20],
       ["material_shrd_limestone", 40],
       ["chem_rdx", 5],
       ["chem_hmtd", 10],
@@ -8362,6 +8361,7 @@
       ["textbook_weapeast", 2],
       ["textbook_armwest", 2],
       ["textbook_armeast", 2],
+      ["textbook_armschina", 2],
       ["radio_book", 22],
       ["radio_car_box", 1],
       ["radiocontrol", 5]
@@ -9093,8 +9093,10 @@
       ["kris", 2],
       ["rapier", 2],
       ["glaive", 2],
+      ["naginata", 2],
       ["estoc", 2],
       ["estoc_fake", 6],
+      ["qiang", 3],
       ["halberd", 2],
       ["halberd_fake", 7],
       ["katana_fake", 4],
@@ -9103,6 +9105,9 @@
       ["zweihander_inferior", 8],
       ["cutlass_fake", 4],
       ["cutlass_inferior", 8],
+      ["jian", 2],
+      ["jian_fake", 4],
+      ["jian_inferior", 8],
       ["scimitar", 4],
       ["scimitar_fake", 8],
       ["arming_sword", 4],
@@ -9233,6 +9238,10 @@
       ["longsword", 2],
       ["longsword_fake", 8],
       ["longsword_inferior", 10],
+      ["qiang", 3],
+      ["jian", 2],
+      ["jian_fake", 8],
+      ["jian_inferior", 10],
       ["rapier", 4],
       ["rapier_fake", 8],
       ["estoc", 3],
@@ -9251,6 +9260,7 @@
       ["q_staff", 8],
       ["i_staff", 6],
       ["glaive", 3],
+      ["naginata", 2],
       ["halberd", 2],
       ["halberd_fake", 6],
       ["battleaxe", 2],