Merge pull request #7 from CleverRaven/master

Bring up to date
CleverRaven · Dec 16, 2018 · 2fa1dfe · 2fa1dfe
2 parents db7f6a5 + aed6232
commit 2fa1dfe
Show file tree

Hide file tree

Showing 193 changed files with 29,740 additions and 14,249 deletions.
diff --git a/.gitignore b/.gitignore
@@ -89,6 +89,7 @@ nbproject/
 # vim files
 *.vim
 *.session
+.ycm_extra_conf.py
 
 # taskwarrior files
 *.task*
@@ -136,6 +137,9 @@ msvc-full-features/PredictedInputCache_Debug_x64.dat
 *cppcheck.xml
 *.cppcheck
 
+# clang tooling
+compile_commands.json
+
 # IDA database
 Cataclysm.i64
 Cataclysm.id*

diff --git a/COMPILING.md b/COMPILING.md
@@ -121,7 +121,7 @@ Dependencies:
 
 Install:
 
-    sudo apt-get install libncurses5-dev libncursesw5-dev build-essential
+    sudo apt-get install libncurses5-dev libncursesw5-dev build-essential astyle
 
 ### Building
 

diff --git a/build-scripts/build.sh b/build-scripts/build.sh
@@ -30,4 +30,5 @@ else
     then
         run_tests ./tests/cata_test $MODS
     fi
+    build-scripts/lint-json.sh
 fi
diff --git a/build-scripts/lint-json.sh b/build-scripts/lint-json.sh
@@ -0,0 +1 @@
+find . -name *json -type f -exec python -m json.tool {} >/dev/null \;
diff --git a/data/changelog.txt b/data/changelog.txt
diff --git a/data/json/bionics.json b/data/json/bionics.json
@@ -1083,7 +1083,8 @@
     "type": "bionic",
     "name": "Titanium Skeletal Bracing",
     "description": "Titanium bracing has been installed onto your elbows, knees, and spine, making them far better at handling strain.  Your carrying capacity is increased by 20 kilograms, or about 44 pounds.",
-    "occupied_bodyparts": [ [ "TORSO", 8 ], [ "ARM_L", 3 ], [ "ARM_R", 3 ], [ "LEG_L", 3 ], [ "LEG_R", 3 ] ]
+    "occupied_bodyparts": [ [ "TORSO", 8 ], [ "ARM_L", 3 ], [ "ARM_R", 3 ], [ "LEG_L", 3 ], [ "LEG_R", 3 ] ],
+    "flags": [ "BIONIC_NPC_USABLE" ]
   },
   {
     "id": "bio_shock_absorber",

diff --git a/data/json/furniture.json b/data/json/furniture.json
@@ -974,7 +974,8 @@
         { "item": "scrap", "count": [ 2, 8 ] },
         { "item": "cable", "charges": [ 1, 3 ] },
         { "item": "hose", "count": 1 },
-        { "item": "cu_pipe", "count": [ 2, 5 ] }
+        { "item": "cu_pipe", "count": [ 2, 5 ] },
+        { "item": "motor_tiny", "count": 1 }
       ]
     },
     "max_volume": 4000,
@@ -991,7 +992,8 @@
         { "item": "cable", "charges": [ 1, 2 ] },
         { "item": "hose", "count": 1 },
         { "item": "cu_pipe", "count": [ 2, 4 ] },
-        { "item": "scrap_copper", "count": [ 1, 2 ] }
+        { "item": "scrap_copper", "count": [ 1, 2 ] },
+        { "item": "motor_tiny", "prob": 25 }
       ]
     }
   },
@@ -1015,7 +1017,8 @@
         { "item": "cable", "charges": [ 1, 3 ] },
         { "item": "hose", "count": 1 },
         { "item": "glass_sheet", "count": 1 },
-        { "item": "cu_pipe", "count": [ 3, 6 ] }
+        { "item": "cu_pipe", "count": [ 3, 6 ] },
+        { "item": "motor_tiny", "count": 1 }
       ]
     },
     "max_volume": 5000,
@@ -1033,7 +1036,8 @@
         { "item": "hose", "count": 1 },
         { "item": "cu_pipe", "count": [ 1, 4 ] },
         { "item": "scrap_copper", "count": [ 0, 2 ] },
-        { "item": "glass_shard", "count": [ 3, 6 ] }
+        { "item": "glass_shard", "count": [ 3, 6 ] },
+        { "item": "motor_tiny", "prob": 25 }
       ]
     }
   },

diff --git a/data/json/item_category.json b/data/json/item_category.json
@@ -3,54 +3,60 @@
     "id": "guns",
     "type": "ITEM_CATEGORY",
     "name": "GUNS",
-    "sort_rank": -22
+    "sort_rank": -23
   },
   {
     "id": "magazines",
     "type": "ITEM_CATEGORY",
     "name": "MAGAZINES",
-    "sort_rank": -21
+    "sort_rank": -22
   },
   {
     "id": "ammo",
     "type": "ITEM_CATEGORY",
     "name": "AMMO",
-    "sort_rank": -20
+    "sort_rank": -21
   },
   {
     "id": "weapons",
     "type": "ITEM_CATEGORY",
     "name": "WEAPONS",
-    "sort_rank": -19
+    "sort_rank": -20
   },
   {
     "id": "tools",
     "type": "ITEM_CATEGORY",
     "name": "TOOLS",
-    "sort_rank": -18
+    "sort_rank": -19
   },
   {
     "id": "clothing",
     "type": "ITEM_CATEGORY",
     "name": "CLOTHING",
-    "sort_rank": -17
+    "sort_rank": -18
   },
   {
     "id": "food",
     "type": "ITEM_CATEGORY",
     "name": "FOOD",
-    "sort_rank": -16
+    "sort_rank": -17
   },
   {
     "id": "drugs",
     "type": "ITEM_CATEGORY",
     "name": "DRUGS",
-    "sort_rank": -15
+    "sort_rank": -16
   },
   {
     "id": "books",
     "type": "ITEM_CATEGORY",
     "name": "BOOKS",
+    "sort_rank": -15
+  },
+  {
+    "id": "maps",
+    "type": "ITEM_CATEGORY",
+    "name": "MAPS",
     "sort_rank": -14
   },
   {

diff --git a/data/json/item_groups.json b/data/json/item_groups.json
@@ -164,6 +164,7 @@
       ["alternator_motorbike", 6],
       ["alternator_car", 6],
       ["alternator_truck", 6],
+      ["alternator_bicycle", 4],
       ["foot_crank", 10],
       ["55gal_drum", 1],
       ["flyer", 10],
@@ -1572,6 +1573,7 @@
       ["portable_game", 8],
       ["game_watch", 2],
       ["roadmap", 40],
+      ["trailmap", 20],
       ["file", 10],
       ["touristmap", 20],
       ["restaurantmap", 20],
@@ -1669,6 +1671,7 @@
       [ "flyer", 10 ],
       [ "mag_fabrication", 30 ],
       [ "mag_tailor", 25 ],
+      [ "trailmap", 10 ],
       [ "survnote", 1 ]
     ]
   },{
@@ -2364,7 +2367,9 @@
       ["straw_basket", 1],
       ["straw_hat", 5],
       ["l-stick", 1],
-      ["tourist_table", 30]
+      ["tourist_table", 30],
+      ["trailmap", 5],
+      ["chem_hexamine", 5]
     ]
   },{
     "type" : "item_group",
@@ -2570,7 +2575,8 @@
       ["iceaxe", 30],
       ["powered_earmuffs", 80],
       ["bandolier_wrist", 100],
-      ["tourist_table", 20]
+      ["tourist_table", 20],
+      ["chem_hexamine", 5]
     ]
   },{
     "type" : "item_group",
@@ -3154,6 +3160,7 @@
     "id" : "traveler",
     "items":[
       ["roadmap", 6],
+      ["trailmap", 6],
       ["touristmap", 4],
       ["lighter", 60],
       ["cig", 40],
@@ -5124,6 +5131,7 @@
       ["alternator_motorbike", 6],
       ["alternator_car", 6],
       ["alternator_truck", 6],
+      ["alternator_bicycle", 4],
       ["generator_7500w", 3],
       ["storage_battery", 6],
       ["solar_panel", 3],
@@ -7868,6 +7876,7 @@
       ["inhaler", 5],
       ["knife_swissarmy", 5],
       ["roadmap", 1],
+      ["trailmap", 1],
       ["touristmap", 1],
       ["eclipse_glasses", 1],
       ["thermos", 5]
@@ -9130,7 +9139,8 @@
       ["weed", 10],
       ["joint", 10],
       ["smart_phone", 20],
-      ["camera", 20]
+      ["camera", 20],
+      ["chem_hexamine", 5]
     ]
   },{
     "type" : "item_group",
@@ -9210,6 +9220,7 @@
       ["permanent_marker", 50],
       ["scissors", 25],
       ["roadmap", 10],
+      ["trailmap", 20],
       ["touristmap", 5],
       ["restaurantmap", 5],
       ["magnifying_glass", 25],
@@ -9344,6 +9355,7 @@
       [ "touristmap", 25 ],
       [ "restaurantmap", 25 ],
       [ "roadmap", 25 ],
+      [ "trailmap", 25 ],
       [ "modern_tanner", 20 ],
       [ "pocket_survival", 20 ],
       [ "flyer", 40 ],
@@ -9760,6 +9772,7 @@
       [ "mag_tailor", 15 ],
       [ "survnote", 3 ],
       [ "touristmap", 3 ],
+      [ "trailmap", 3 ],
       [ "phonebook", 60 ],
       [ "holybook_bible1", 1 ],
       [ "holybook_bible2", 1 ],

diff --git a/data/json/items/armor.json b/data/json/items/armor.json
@@ -3146,7 +3146,7 @@
     "type": "ARMOR",
     "name": "monocle",
     "//": "DDA monocle is optical-grade.  Costume ones go for about $10.",
-    "description": "An essential article of the gentleman's apparel.  Also corrects near-sightedness.  You can use this to focus sunlight.",
+    "description": "An essential article of the gentleman's apparel.  Also corrects near-sightedness.  The concave lenses diffuse the sunlight, rendering them useless for starting fires.",
     "weight": 16,
     "volume": 0,
     "price": 4000,
@@ -3159,7 +3159,7 @@
     "material_thickness": 1,
     "environmental_protection": 1,
     "use_action": { "type": "firestarter", "moves": 1000, "moves_slow": 25000, "need_sunlight": true },
-    "flags": [ "SUPER_FANCY", "FIRESTARTER", "FIX_NEARSIGHT" ]
+    "flags": [ "SUPER_FANCY", "FIX_NEARSIGHT" ]
   },
   {
     "id": "glasses_reading",

diff --git a/data/json/items/book/maps.json b/data/json/items/book/maps.json
@@ -0,0 +1,100 @@
+[
+  {
+    "abstract": "abstractmap",
+    "type": "GENERIC",
+    "category": "maps",
+    "name": "abstract map",
+    "description": "seeing this is a bug",
+    "weight": 30,
+    "volume": 1,
+    "price": 1000,
+    "to_hit": -1,
+    "material": "paper",
+    "symbol": ";",
+    "color": "light_gray"
+  },
+  {
+    "id": "militarymap",
+    "copy-from": "abstractmap",
+    "type": "GENERIC",
+    "name": "military operations map",
+    "description": "This is a printed topographical map of the local area.  Originally of military origin, it details the locations of evacuation centers and military facilities.  Using it will add points of interest to your map.",
+    "color": "green",
+    "use_action": {
+      "type": "reveal_map",
+      "radius": 180,
+      "terrain": [ "hiway", "road", "bridge", "fema_entrance", "bunker", "outpost", "silo", "shelter", "police" ],
+      "message": "You add roads and restaurants to your map."
+    }
+  },
+  {
+    "id": "survivormap",
+    "copy-from": "abstractmap",
+    "type": "GENERIC",
+    "name": "survivor's map",
+    "description": "This is a hand-drawn map of the local area.  Whomever created it has marked down the locations of nearby supply sources including gun stores and gas stations.  Using it will add points of interest to your map.",
+    "color": "white",
+    "use_action": {
+      "type": "reveal_map",
+      "radius": 180,
+      "terrain": [ "hiway", "road", "bridge", "s_pharm", "s_gun", "s_grocery", "mil_surplus", "s_gas" ],
+      "message": "You add roads and possible supply points to your map."
+    }
+  },
+  {
+    "id": "roadmap",
+    "copy-from": "abstractmap",
+    "type": "GENERIC",
+    "name": "road map",
+    "description": "This is a road map for the local area.  Listing information on civic sites like hospitals and police stations, it can be used to add points of interest to your map.",
+    "color": "yellow",
+    "use_action": {
+      "type": "reveal_map",
+      "radius": 180,
+      "terrain": [ "hiway", "road", "bridge", "shelter", "hospital", "school", "police", "sub_station", "bank" ],
+      "message": "You add roads and points of interest to your map."
+    }
+  },
+  {
+    "id": "trailmap",
+    "copy-from": "abstractmap",
+    "type": "GENERIC",
+    "name": "trail guide",
+    "description": "This is a printed guide to the best local trails.  It has general details about the trails, trailhead amenities, suggestions for the best thru-hikes, and advice on interacting with local wildlife in a responsible and respectful manner.",
+    "color": "green",
+    "use_action": {
+      "type": "reveal_map",
+      "radius": 180,
+      "terrain": [ "forest_trail", "trailhead" ],
+      "message": "You add trails and trailheads to your map."
+    }
+  },
+  {
+    "id": "touristmap",
+    "copy-from": "abstractmap",
+    "type": "GENERIC",
+    "name": "tourist guide",
+    "description": "This is glossy printed pamphlet for tourists that details local hotels and attractions.",
+    "color": "blue",
+    "use_action": {
+      "type": "reveal_map",
+      "radius": 180,
+      "terrain": [ "hiway", "road", "bridge", "hotel_tower", "s_restaurant", "cathedral", "s_restaurant_fast", "megastore", "museum" ],
+      "message": "You add roads and tourist attractions to your map."
+    }
+  },
+  {
+    "id": "restaurantmap",
+    "copy-from": "abstractmap",
+    "type": "GENERIC",
+    "name": "restaurant guide",
+    "description": "This is glossy printed pamphlet that details dining establishments in the local area.  Printed by the Chamber of Commerce, it lists the addresses of all the best diners and bars.  Using it will add points of interest to your map.",
+    "color": "pink",
+    "use_action": {
+      "type": "reveal_map",
+      "radius": 180,
+      "terrain": [ "hiway", "road", "bridge", "s_restaurant_coffee", "s_restaurant", "bar", "s_pizza_parlor", "s_restaurant_fast" ],
+      "message": "You add roads and restaurants to your map."
+    }
+  }
+]
diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
@@ -951,5 +951,19 @@
     "weight" : 1,
     "ammo_type" : "components",
     "count" : 100
-   }
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "ether",
+    "category": "chems",
+    "price": 10,
+    "name": "ether",
+    "name_plural": "ether",
+    "symbol": "!",
+    "color": "white",
+    "container": "bottle_glass",
+    "description": "Diethyl ether largely supplanted the use of chloroform as a general anesthetic due to ether's more favorable therapeutic index, that is, a greater difference between an effective dose and a potentially toxic dose.",
+    "volume": "1 ml",
+    "phase": "liquid"
+  }
 ]