Merge pull request #149 from CleverRaven/master

Merge pull request CleverRaven#39645 from Brian-Otten/melee-weapon-ba…

CMakeLists.txt

@@ -21,6 +21,7 @@ option(LOCALIZE     "Support for language localizations. Also enable UTF support
 option(LANGUAGES    "Compile localization files for specified languages."   "")
 option(DYNAMIC_LINKING "Use dynamic linking. Or use static to remove MinGW dependency instead."   "ON")
 option(JSON_FORMAT  "Build JSON formatter" "OFF")
+option(CATA_CCACHE  "Try to find and build with ccache" "ON")
 option(CATA_CLANG_TIDY_PLUGIN "Build Cata's custom clang-tidy plugin" "OFF")
 set(CATA_CLANG_TIDY_INCLUDE_DIR "" CACHE STRING "Path to internal clang-tidy headers required for plugin (e.g. ClangTidy.h)")
 set(CATA_CHECK_CLANG_TIDY "" CACHE STRING "Path to check_clang_tidy.py for plugin tests")
@@ -392,9 +393,9 @@ ADD_CUSTOM_TARGET(uninstall
 )
 
 find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
+if(CCACHE_FOUND AND CATA_CCACHE)
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
     set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-endif(CCACHE_FOUND)
+endif()
 
 # vim:noet

data/core/basic.json

@@ -10,8 +10,7 @@
     "type": "COMESTIBLE",
     "comestible_type": "DRINK",
     "category": "food",
-    "name": "water",
-    "name_plural": "water",
+    "name": { "str_sp": "water" },
     "description": "Water, the stuff of life, the best thirst-quencher available.  It would be safer to drink once purified.",
     "weight": 250,
     "volume": 1,

data/json/achievements.json

@@ -0,0 +1,15 @@
+[
+  {
+    "id": "achievement_kill_zombie",
+    "type": "achievement",
+    "description": "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",
+    "time_constraint": { "since": "game_start", "is": "<=", "target": "1 minute" },
+    "requirements": [ { "event_statistic": "num_avatar_kills", "is": ">=", "target": 1 } ]
+  }
+]

data/json/itemgroups/Food/food.json

@@ -498,6 +498,7 @@
       { "item": "yoghurt", "prob": 40 },
       { "item": "pudding", "prob": 50 },
       { "item": "V8", "prob": 15 },
+      { "item": "foodplace_food", "prob": 8 },
       { "item": "sandwich_t", "prob": 30 },
       { "item": "sandwich_pb", "prob": 30 },
       { "item": "sandwich_pbj", "prob": 30 },
@@ -760,6 +761,7 @@
       { "item": "cheeseburger", "prob": 35 },
       { "item": "hotdogs_frozen", "prob": 12 },
       { "item": "hotdogs_cooked", "prob": 35 },
+      { "item": "foodplace_food", "prob": 8 },
       { "item": "chili", "prob": 20 },
       { "item": "chilidogs", "prob": 20 },
       { "item": "fries", "prob": 80 },

data/json/itemgroups/Locations_MapExtras/Arsonist_stock.json

@@ -0,0 +1,17 @@
+[
+  {
+    "type": "item_group",
+    "id": "NC_ARSONIST_STOCK",
+    "subtype": "collection",
+    "items": [
+      { "item": "molotov", "count": 50 },
+      { "item": "pipebomb", "count": 50 },
+      { "item": "fuse", "count": 20 },
+      { "item": "FMCNote", "count": 3 },
+      { "item": "nail", "count": 5 },
+      { "item": "rebar_rail", "count": 5 },
+      { "item": "textbook_anarch", "count": 1 },
+      { "item": "fertilizer_commercial", "count": 1 }
+    ]
+  }
+]

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -2152,6 +2152,7 @@
       [ "cotton_ball", 50 ],
       [ "1st_aid", 35 ],
       [ "survival_kit", 35 ],
+      [ "premium_survival_kit", 8 ],
       [ "saline", 10 ],
       [ "vitamins", 75 ],
       [ "gummy_vitamins", 25 ],

data/json/itemgroups/Locations_MapExtras/locations_commercial.json

@@ -666,6 +666,7 @@
       [ "flashlight", 40 ],
       [ "heavy_flashlight", 30 ],
       [ "survival_kit", 35 ],
+      [ "premium_survival_kit", 8 ],
       [ "mess_kit", 9 ],
       [ "popcan_stove", 2 ],
       [ "denat_alcohol", 2 ],

data/json/itemgroups/activities_hobbies.json

@@ -331,7 +331,8 @@
       [ "esbit_stove", 10 ],
       [ "bottle_folding", 10 ],
       [ "mess_tin", 10 ],
-      [ "survival_kit", 30 ]
+      [ "survival_kit", 30 ],
+      [ "premium_survival_kit", 3 ]
     ]
   }
 ]

data/json/itemgroups/food_service.json

@@ -760,6 +760,7 @@
       [ "currywurst", 5 ],
       [ "macaroni_cooked", 5 ],
       [ "lasagne", 5 ],
+      [ "foodplace_food", 2 ],
       [ "spaghetti_pesto", 5 ],
       [ "glazed_tenderloin", 5 ]
     ]
@@ -781,6 +782,7 @@
       [ "tomato", 20 ],
       [ "lettuce", 15 ],
       [ "zucchini", 15 ],
+      [ "foodplace_food", 20 ],
       [ "onion", 15 ],
       [ "chili_pepper", 15 ],
       [ "carrot", 15 ],
@@ -842,6 +844,7 @@
       [ "spaghetti_raw", 20 ],
       [ "lasagne_raw", 20 ],
       [ "macaroni_raw", 20 ],
+      [ "foodplace_food", 5 ],
       [ "knife_butcher", 10 ]
     ]
   },

data/json/itemgroups/misc.json

@@ -143,6 +143,24 @@
       { "item": "water_clean", "count": 2, "charges": 2, "container-item": "bottle_plastic" }
     ]
   },
+  {
+    "id": "premium_contents",
+    "type": "item_group",
+    "subtype": "collection",
+    "//": "Items generated from a premium survival kit",
+    "items": [
+      { "item": "knife_folding" },
+      { "item": "flint_steel" },
+      { "item": "whistle_multitool" },
+      { "item": "bottle_folding" },
+      { "item": "light_plus_battery_cell", "charges": 150, "container-item": "flashlight" },
+      { "item": "picklocks" },
+      { "item": "lifestraw" },
+      { "item": "pocket_survival" },
+      { "item": "solarpack" },
+      { "item": "handflare", "count": 4 }
+    ]
+  },
   {
     "id": "horse_gear",
     "type": "item_group",

data/json/items/ammo.json

@@ -240,7 +240,7 @@
     "category": "spare_parts",
     "price": 250,
     "price_postapoc": 0,
-    "name": { "str": "plutonium slurry" },
+    "name": { "str_sp": "plutonium slurry" },
     "symbol": "=",
     "color": "green",
     "description": "Highly radioactive slurry.  It is probably best to get far away from this.",

data/json/items/ammo/20x66mm.json

@@ -102,7 +102,7 @@
     "id": "20x66_inc",
     "copy-from": "20x66_shot",
     "type": "AMMO",
-    "name": { "str": "20x66mm incendiary" },
+    "name": { "str": "20x66mm incendiary", "str_pl": "20x66mm incendiaries" },
     "description": "20x66mm caseless shotgun rounds, incendiary type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 10500,
     "price_postapoc": 5000,

data/json/items/ammo/50.json

@@ -36,7 +36,7 @@
     "id": "50match",
     "copy-from": "50bmg",
     "type": "AMMO",
-    "name": { "str": ".50 BMG Match" },
+    "name": { "str": ".50 BMG Match", "str_pl": ".50 BMG Matches" },
     "description": ".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for long-range competition shooting or other precision rifle use.",
     "count": 10,
     "relative": { "damage": { "damage_type": "stab", "amount": 2, "armor_penetration": -4 } },

data/json/items/ammo/8x40mm.json

@@ -12,7 +12,7 @@
   {
     "id": "8mm_caseless",
     "type": "AMMO",
-    "name": { "str": "8x40mm caseless" },
+    "name": { "str_sp": "8x40mm caseless" },
     "//": "Cased ammo tends to be roughly $1/shot, more or less.  Rivtech ammo, being New and Proprietary and Expensive, $2-2.50 or so.",
     "description": "8x40mm caseless rounds.  Proprietary ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "weight": "12 g",