Merge pull request #153 from CleverRaven/master

Merge pull request CleverRaven#39885 from jbytheway/fix_clang_build

.gitignore

@@ -132,6 +132,7 @@ Cataclysm.dmg
 /tests/map_iterator_test
 /tests/shadowcasting_test
 /tests/data/jsionized_overmap.sav
+/test_user_dir
 
 # temporary files generated by tools/reduce_tests.sh
 /list_of_tests

data/json/achievements.json

@@ -2,34 +2,63 @@
   {
     "id": "achievement_kill_zombie",
     "type": "achievement",
-    "description": "One down, billions to go\u2026",
+    "name": "One down, billions to go\u2026",
     "requirements": [ { "event_statistic": "num_avatar_zombie_kills", "is": ">=", "target": 1 } ]
   },
   {
     "id": "achievement_kill_in_first_minute",
     "type": "achievement",
-    "description": "Rude awakening",
+    "name": "Rude awakening",
     "time_constraint": { "since": "game_start", "is": "<=", "target": "1 minute" },
     "requirements": [ { "event_statistic": "num_avatar_kills", "is": ">=", "target": 1 } ]
   },
+  {
+    "id": "achievement_survive_one_day",
+    "type": "achievement",
+    "name": "The first day of the rest of their unlives",
+    "time_constraint": { "since": "game_start", "is": ">=", "target": "1 day" },
+    "requirements": [ { "event_statistic": "num_avatar_wake_ups", "is": "anything" } ]
+  },
   {
     "id": "achievement_marathon",
     "type": "achievement",
-    "description": "Pheidippides was a hack",
-    "//": "Run a marathon...plus a little bit more.",
+    "name": "Pheidippides was a hack",
+    "description": "Run a marathon…plus a little bit more.",
     "requirements": [ { "event_statistic": "num_moves_ran", "is": ">=", "target": 42196 } ]
   },
   {
     "id": "achievement_walk_1000_miles",
     "type": "achievement",
-    "description": "Please don't fall down at my door",
-    "//": "Walk 500 miles, then walk 500 more.",
+    "name": "Please don't fall down at my door",
+    "description": "Walk 500 miles, then walk 500 more.",
     "requirements": [ { "event_statistic": "num_moves_walked", "is": ">=", "target": 1609340 } ]
   },
   {
     "id": "achievement_traverse_sharp_terrain",
     "type": "achievement",
-    "description": "Every rose has its thorn",
+    "name": "Every rose has its thorn",
     "requirements": [ { "event_statistic": "num_moves_sharp_terrain", "is": ">=", "target": 100 } ]
+  },
+  {
+    "id": "achievement_swim_merit_badge",
+    "type": "achievement",
+    "name": "Swimming merit badge",
+    "requirements": [
+      { "event_statistic": "num_moves_swam", "is": ">=", "target": 10000 },
+      { "event_statistic": "num_moves_swam_underwater", "is": ">=", "target": 1000 },
+      { "event_statistic": "min_move_underwater_z", "is": "<=", "target": -5 }
+    ]
+  },
+  {
+    "id": "achievement_reach_max_z_level",
+    "type": "achievement",
+    "name": "Ain't no mountain high enough",
+    "requirements": [ { "event_statistic": "max_move_z", "is": ">=", "target": 10 } ]
+  },
+  {
+    "id": "achievement_reach_min_z_level",
+    "type": "achievement",
+    "name": "Ain't no valley low enough",
+    "requirements": [ { "event_statistic": "min_move_z", "is": "<=", "target": -10 } ]
   }
 ]

data/json/items/ammo.json

@@ -289,7 +289,7 @@
     "range": 10,
     "dispersion": 14,
     "loudness": 0,
-    "to_hit": -2,
+    "to_hit": -1,
     "effects": [ "NEVER_MISFIRES", "NON-FOULING", "RECOVER_80" ],
     "qualities": [ [ "HAMMER", 1 ] ]
   },

data/json/items/generic.json

@@ -505,6 +505,7 @@
     "material": "gold",
     "weight": "1500 g",
     "volume": "250 ml",
+    "to_hit": -2,
     "bashing": 9
   },
   {
@@ -522,7 +523,7 @@
     "volume": "750 ml",
     "bashing": 6,
     "cutting": 8,
-    "to_hit": -2,
+    "to_hit": -1,
     "qualities": [ [ "BUTCHER", -38 ] ]
   },
   {
@@ -632,7 +633,7 @@
     "weight": "908 g",
     "volume": "1500 ml",
     "bashing": 12,
-    "to_hit": 2,
+    "to_hit": -1,
     "qualities": [ [ "HAMMER", 1 ] ]
   },
   {
@@ -692,7 +693,6 @@
     "weight": "751 g",
     "volume": "750 ml",
     "bashing": 8,
-    "to_hit": 3,
     "flags": [ "TRADER_AVOID" ]
   },
   {

data/json/items/generic/dining_kitchen.json

@@ -591,7 +591,6 @@
     "name": { "str": "rolling pin" },
     "description": "A stout piece of hardwood, turned and sanded smooth, with rounded handles at the ends.  This timeless kitchen tool also doubles as a very effective club.",
     "weight": "725 g",
-    "to_hit": 1,
     "color": "brown",
     "symbol": "/",
     "material": [ "wood" ],
@@ -641,6 +640,7 @@
     "weight": "750 g",
     "volume": "2 L",
     "bashing": 6,
+    "to_hit": -2,
     "container_data": { "contains": "2 L", "watertight": true }
   },
   {
@@ -699,10 +699,10 @@
     "copy-from": "base_cookpot",
     "material": "iron",
     "color": "dark_gray",
-    "proportional": { "to_hit": 2 },
     "weight": "2628 g",
     "volume": "1 L",
     "bashing": 12,
+    "to_hit": -3,
     "container_data": { "contains": "1 L", "watertight": true },
     "delete": { "qualities": [ [ "COOK", 3 ] ] },
     "extend": { "qualities": [ [ "HAMMER", 1 ], [ "COOK", 2 ] ] }
@@ -717,10 +717,10 @@
     "material": "steel",
     "color": "light_gray",
     "looks_like": "pan",
-    "proportional": { "to_hit": 2 },
     "weight": "528 g",
     "volume": "1 L",
     "bashing": 8,
+    "to_hit": -2,
     "container_data": { "contains": "2 L", "watertight": true },
     "delete": { "qualities": [ [ "COOK", 3 ] ] },
     "extend": { "qualities": [ [ "COOK", 2 ] ] }
@@ -735,10 +735,10 @@
     "material": "copper",
     "color": "light_red",
     "looks_like": "pan",
-    "proportional": { "to_hit": 2 },
     "weight": "628 g",
     "volume": "1 L",
     "bashing": 7,
+    "to_hit": -2,
     "container_data": { "contains": "1 L", "watertight": true },
     "delete": { "qualities": [ [ "COOK", 3 ] ] },
     "extend": { "qualities": [ [ "COOK", 2 ] ] }