Merge pull request #9 from CleverRaven/master

BackToRootsJan18

.clang-tidy

@@ -1,6 +1,15 @@
+# Enable some categories of checks and then disable individual ones.
+# The disabled checks that appear as part of the initial alphabetical section
+# enabling categories (e.g. cert-err58-cpp) are ones that do not make sense for
+# this codebase and we do not intend to fix.  The disabled checks appearing
+# thereafter in a separate alphabetical list have yet to be triaged.  We may
+# fix their errors or recategorise them as checks we don't care about.
 Checks: "\
 bugprone-*,\
+cert-*,\
+-cert-err58-cpp,\
 clang-diagnostic-*,\
+llvm-namespace-comment,\
 misc-*,\
 modernize-*,\
 performance-*,\
@@ -17,6 +26,19 @@ readability-*,\
 -bugprone-undefined-memory-manipulation,\
 -bugprone-unused-return-value,\
 -bugprone-use-after-move,\
+-cert-dcl03-c,\
+-cert-dcl16-c,\
+-cert-dcl21-cpp,\
+-cert-dcl50-cpp,\
+-cert-dcl58-cpp,\
+-cert-dcl59-cpp,\
+-cert-env33-c,\
+-cert-err34-c,\
+-cert-flp30-c,\
+-cert-msc30-c,\
+-cert-msc32-c,\
+-cert-msc50-cpp,\
+-cert-msc51-cpp,\
 -misc-definitions-in-headers,\
 -misc-non-private-member-variables-in-classes,\
 -misc-redundant-expression,\

data/help/texts.json

@@ -194,7 +194,7 @@
       "It's a good idea to pull the handbrake - \"s\" - when parking, just to be safe. If you want to get out, hit the lights, toggle cruise control, turn the engine on or off, or otherwise use the vehicle controls, press <press_control_vehicle> to bring up the \"Vehicle Controls\" menu, which has options for things you'd do from the driver's seat.",
       "Examining (<press_examine>) a vehicle brings up the vehicle interaction window.  The left pane shows a top-down view of your vehicle and each part of it.  The middle pane shows a summmary of the vehicle's engines, batteries, storage tanks, weapons, and seating.  The right panel is context sensitive, but normally has descriptions of the vehicle parts in the tile highlighted in the vehicle view on the left.",
       "Across the bottom are a summary of the most important parameters of your vehicle.  Safe speed is how fast you can drive without damaging the engine and maximum speed is how fast you can drive at the engine's maximum output.  Acceleration is how fast your vehicle can increase speed each turn.  Cargo volume is how much cargo you can store and how much stuff you have in your vehicle, mass is how much the vehicle weighs, and the Status and Wheels give a summary of the vehicle condition and wheel condition.  There are also fuel indicators on the lower right that give an estimate of how quickly your fuel will run out.",
-      "Air drag, water drag, rolling drag, and static drag are all values that influence your vehicle's safe and maximum speed.  The interaction of drag and engine power is complicated, but generally speaking, more powerful engines will make your vehicle go faster but aslo consume fuel faster.",
+      "Air drag, water drag, rolling drag, and static drag are all values that influence your vehicle's safe and maximum speed.  The interaction of drag and engine power is complicated, but generally speaking, more powerful engines will make your vehicle go faster but also consume fuel faster.",
       "Air drag increases as your vehicle gets wider or has more parts that increase the vehicle's height like full boards, aisles, or turrets.  It also increases as the vehicle has a less aerodynamic profile, such as having exposed passengers or full boards at the front of the vehicle.  Air drag strongly influences vehicle speed, especially at high speeds.",
       "Rolling drag increases with vehicle weight and wheel count.  Rigid wheels have less rolling drag per wheel than inflatable wheels, but weigh more so rolling drag may still increase when moving from inflatable wheels to rigid wheels.  Tank treads have enormous rolling resistance and are very heavy, so tanks have a lot of rolling resistance.  Rolling drag influences vehicle speed, but less than air drag does, especially at high speeds.",
       "Vehicles that can move in water have a water drag.  Water drag increases with vehicle width and draft, and draft increases with vehicle weight but is reduced by adding more boat boards and by widening or lengthening the vehicle.  Water drag has enormous effect on vehicle speed in the water.  See the section on water vehicles for more about draft and water drag.",

data/json/construction.json

@@ -1252,7 +1252,7 @@
     "time": "150 m",
     "components": [ [ [ "wire", 20 ] ], [ [ "steel_chunk", 3 ], [ "scrap", 12 ] ], [ [ "pipe", 20 ] ] ],
     "pre_note": "Needs to be supported on both sides by fencing, walls, etc.",
-    "pre_special": "check_support",
+    "pre_special": "check_empty",
     "post_terrain": "t_chaingate_c"
   },
   {
@@ -1286,7 +1286,7 @@
     "time": "45 m",
     "components": [ [ [ "wire", 10 ] ], [ [ "2x4", 5 ] ], [ [ "nail", 20 ] ], [ [ "hinge", 2 ] ] ],
     "pre_note": "Needs to be supported on both sides by fencing, walls, etc.",
-    "pre_special": "check_support",
+    "pre_special": "check_empty",
     "post_terrain": "t_chickenwire_gate_c"
   },
   {

data/json/item_groups.json

@@ -2546,6 +2546,8 @@
   {
     "type": "item_group",
     "id": "trash",
+    "ammo": 20,
+    "magazine": 50,
     "items": [
       [ "plastic_shopping_bag", 35 ],
       [ "iodine", 5 ],
@@ -7823,7 +7825,8 @@
       [ "football_armor", 18 ],
       [ "jacket_leather", 12 ],
       [ "jacket_jean", 8 ],
-      [ "jacket_flannel", 6 ]
+      [ "jacket_flannel", 6 ],
+      [ "cuirass_scrap", 12 ]
     ]
   },
   {
@@ -7837,6 +7840,7 @@
       [ "winter_pants_army", 10 ],
       [ "bunker_pants", 14 ],
       [ "pants_leather", 18 ],
+      [ "legguard_scrap", 12 ],
       [ "skirt", 6 ],
       [ "kilt", 1 ]
     ]
@@ -7861,6 +7865,7 @@
       [ "vambrace_larmor", 6 ],
       [ "armguard_chitin", 1 ],
       [ "armguard_bone", 6 ],
+      [ "armguard_scrap", 12 ],
       [ "gloves_fur", 4 ],
       [ "gloves_leather", 22 ],
       [ "gloves_work", 22 ],
@@ -7879,6 +7884,7 @@
       [ "boots_fsurvivor", 2 ],
       [ "boots_h20survivor", 1 ],
       [ "boots", 20 ],
+      [ "boots_scrap", 12 ],
       [ "boots_steel", 28 ],
       [ "boots_hiking", 24 ],
       [ "knee_high_boots", 8 ],
@@ -7914,6 +7920,7 @@
       [ "firehelmet", 2 ],
       [ "helmet_barbute", 1 ],
       [ "helmet_plate", 1 ],
+      [ "helmet_scrap", 12 ],
       [ "bondage_mask", 1 ],
       [ "survivor_goggles", 10 ],
       [ "hood_rain", 14 ]
@@ -8090,6 +8097,8 @@
   {
     "type": "item_group",
     "id": "arcade_prizes",
+    "ammo": 75,
+    "magazine": 100,
     "items": [
       [ "bbgun", 30 ],
       [ "bb", 30 ],
@@ -8237,6 +8246,8 @@
   {
     "type": "item_group",
     "id": "antique",
+    "ammo": 75,
+    "magazine": 100,
     "items": [
       [ "oxylamp", 50 ],
       [ "cow_bell", 15 ],
@@ -9693,6 +9704,8 @@
   {
     "type": "item_group",
     "id": "roof_trash",
+    "ammo": 20,
+    "magazine": 50,
     "items": [
       [ "plastic_shopping_bag", 15 ],
       [ "bum_wine", 15 ],

data/json/itemgroups/gear.json

@@ -2,6 +2,8 @@
   {
     "type": "item_group",
     "id": "everyday_gear",
+    "ammo": 75,
+    "magazine": 100,
     "//": "Small common items carried in a person's pockets, purse, etc. Cash card at roughly 50%.",
     "items": [
       { "item": "cash_card", "prob": 1600, "charges-min": 0, "charges-max": 50000 },

data/json/itemgroups/mall_item_groups.json

@@ -68,6 +68,8 @@
   {
     "id": "music_shop",
     "type": "item_group",
+    "ammo": 75,
+    "magazine": 100,
     "items": [ { "group": "ammo_any_batteries_full", "prob": 50 }, [ "radio", 30 ], [ "mp3", 30 ] ]
   },
   {
@@ -91,6 +93,8 @@
   {
     "id": "toy_store",
     "type": "item_group",
+    "ammo": 75,
+    "magazine": 100,
     "items": [
       [ "portable_game", 60 ],
       [ "bat", 60 ],
@@ -210,6 +214,8 @@
   {
     "id": "key_shop",
     "type": "item_group",
+    "ammo": 75,
+    "magazine": 100,
     "items": [
       [ "screwdriver", 40 ],
       [ "hammer", 35 ],
@@ -252,6 +258,8 @@
   {
     "id": "cell_shop",
     "type": "item_group",
+    "ammo": 75,
+    "magazine": 100,
     "items": [
       [ "portable_game", 20 ],
       [ "antenna", 25 ],
@@ -269,6 +277,8 @@
   {
     "id": "beauty",
     "type": "item_group",
+    "ammo": 75,
+    "magazine": 100,
     "items": [
       [ "mag_glam", 40 ],
       [ "mag_beauty", 30 ],