Merge pull request #6 from CleverRaven/master

BackToRootsJune15

.clang-tidy

@@ -1,4 +1,74 @@
-Checks: 'clang-diagnostic-*,modernize-use-using'
+Checks: "\
+bugprone-*,\
+clang-diagnostic-*,\
+misc-*,\
+modernize-*,\
+performance-*,\
+readability-*,\
+-bugprone-forwarding-reference-overload,\
+-bugprone-inaccurate-erase,\
+-bugprone-incorrect-roundings,\
+-bugprone-integer-division,\
+-bugprone-macro-parentheses,\
+-bugprone-misplaced-widening-cast,\
+-bugprone-narrowing-conversions,\
+-bugprone-string-integer-assignment,\
+-bugprone-too-small-loop-variable,\
+-bugprone-undefined-memory-manipulation,\
+-bugprone-unused-return-value,\
+-bugprone-use-after-move,\
+-misc-definitions-in-headers,\
+-misc-non-private-member-variables-in-classes,\
+-misc-redundant-expression,\
+-misc-static-assert,\
+-misc-unconventional-assign-operator,\
+-modernize-avoid-c-arrays,\
+-modernize-deprecated-headers,\
+-modernize-loop-convert,\
+-modernize-make-unique,\
+-modernize-pass-by-value,\
+-modernize-raw-string-literal,\
+-modernize-return-braced-init-list,\
+-modernize-use-auto,\
+-modernize-use-default-member-init,\
+-modernize-use-emplace,\
+-modernize-use-equals-default,\
+-modernize-use-equals-delete,\
+-modernize-use-nullptr,\
+-modernize-use-override,\
+-modernize-use-transparent-functors,\
+-performance-for-range-copy,\
+-performance-inefficient-vector-operation,\
+-performance-move-const-arg,\
+-performance-noexcept-move-constructor,\
+-performance-implicit-conversion-in-loop,\
+-performance-inefficient-algorithm,\
+-performance-inefficient-string-concatenation,\
+-performance-type-promotion-in-math-fn,\
+-performance-unnecessary-copy-initialization,\
+-performance-unnecessary-value-param,\
+-readability-avoid-const-params-in-decls,\
+-readability-braces-around-statements,\
+-readability-const-return-type,\
+-readability-else-after-return,\
+-readability-function-size,\
+-readability-implicit-bool-conversion,\
+-readability-inconsistent-declaration-parameter-name,\
+-readability-isolate-declaration,\
+-readability-magic-numbers,\
+-readability-named-parameter,\
+-readability-non-const-parameter,\
+-readability-container-size-empty,\
+-readability-redundant-control-flow,\
+-readability-redundant-declaration,\
+-readability-redundant-member-init,\
+-readability-redundant-preprocessor,\
+-readability-redundant-string-init,\
+-readability-simplify-boolean-expr,\
+-readability-static-accessed-through-instance,\
+-readability-string-compare,\
+-readability-uppercase-literal-suffix,\
+"
 WarningsAsErrors: '*'
 HeaderFilterRegex: '(src|test).*'
 FormatStyle:     none

build-scripts/requirements.sh

@@ -21,6 +21,8 @@ if just_json; then
     export CODE_COVERAGE=""
 fi
 
+set -x
+
 if [ -n "${CODE_COVERAGE}" ]; then
   travis_retry pip install --user pyyaml cpp-coveralls
   export CXXFLAGS="$CXXFLAGS --coverage"

data/json/flags.json

@@ -547,5 +547,17 @@
     "type": "json_flag",
     "context": [ "BIONIC" ],
     "description": "This bionic can provide power to powered armor."
+  },
+  {
+    "id": "PERMANENT",
+    "type": "json_flag",
+    "context": [ "SPELL" ],
+    "description": "This makes the spell's effects permanent."
+  },
+  {
+    "id": "IGNORE_WALLS",
+    "type": "json_flag",
+    "context": [ "SPELL" ],
+    "description": "This makes the spell's Area of Effect ignore walls."
   }
 ]

data/json/furniture.json

@@ -692,13 +692,15 @@
     "id": "f_bathtub",
     "name": "bathtub",
     "symbol": "~",
-    "description": "You could lay in and take a soothing bath.  Only if water was running.",
+    "description": "You could lay in and take a soothing bath, if there were running water. The plug is intact, so you could use it to store liquids.",
     "color": "white",
     "move_cost_mod": 2,
     "coverage": 30,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MOUNTABLE" ],
     "max_volume": 800,
+    "examine_action": "keg",
+    "keg_capacity": 600,
     "bash": {
       "str_min": 12,
       "str_max": 50,
@@ -3451,7 +3453,9 @@
   },
   {
     "type": "furniture",
-    "id": "f_floor_canvas",
+    "id": "f_punching_bag",
+    "aliases": "f_floor_canvas",
+    "looks_like": "f_floor_canvas",
     "name": "heavy punching bag",
     "description": "Punch Punch!  Exercise those arms!  Main selling point: it doesn't fight back!",
     "symbol": "0",

data/json/item_actions.json

@@ -514,6 +514,11 @@
     "id": "FLU_VACCINE",
     "name": "Inject"
   },
+  {
+    "type": "item_action",
+    "id": "FOODPERSON",
+    "name": "Activate"
+  },
   {
     "type": "item_action",
     "id": "FUNGICIDE",

data/json/item_groups.json

@@ -180,6 +180,7 @@
       [ "55gal_drum", 1 ],
       [ "flyer", 10 ],
       [ "one_year_old_newspaper", 2 ],
+      [ "foodperson_mask", 1 ],
       [ "months_old_newspaper", 3 ],
       [ "weeks_old_newspaper", 4 ],
       [ "newest_newspaper", 5 ],
@@ -203,6 +204,7 @@
       [ "colamdew", 35 ],
       [ "television", 30 ],
       [ "clock", 10 ],
+      [ "fp_loyalty_card", 5 ],
       [ "cola", 70 ],
       [ "choc_drink", 10 ],
       { "item": "cola", "prob": 20, "container-item": "bottle_plastic" },
@@ -1149,6 +1151,7 @@
       [ "kimono", 2 ],
       [ "yukata", 6 ],
       [ "haori", 2 ],
+      [ "foodperson_mask", 1 ],
       [ "hakama", 4 ],
       [ "eclipse_glasses", 1 ],
       [ "thermos", 20 ]
@@ -2551,6 +2554,7 @@
       [ "meth", 2 ],
       [ "heroin", 1 ],
       [ "wrapper", 50 ],
+      [ "fp_loyalty_card", 5 ],
       [ "string_6", 2 ],
       [ "chain", 20 ],
       [ "glass_sheet", 5 ],
@@ -2600,6 +2604,7 @@
       [ "straw_doll", 1 ],
       [ "striped_shirt", 1 ],
       [ "striped_pants", 1 ],
+      [ "foodperson_mask", 1 ],
       [ "razor_blade", 10 ],
       [ "survnote", 5 ],
       [ "eclipse_glasses", 1 ],
@@ -4117,6 +4122,7 @@
       [ "can_sealer", 5 ],
       [ "knuckle_brass", 15 ],
       [ "platinum_small", 10 ],
+      [ "foodperson_mask", 10 ],
       [ "gold_small", 10 ],
       [ "silver_small", 20 ],
       [ "cane", 10 ],
@@ -4566,7 +4572,8 @@
       [ "tourist_table", 5 ],
       [ "chem_hexamine", 5 ],
       [ "esbit_stove", 10 ],
-      [ "mess_tin", 10 ]
+      [ "mess_tin", 10 ],
+      [ "angular_grinder", 4 ]
     ]
   },
   {
@@ -4722,7 +4729,9 @@
       [ "chem_hexamine", 4 ],
       [ "esbit_stove", 8 ],
       [ "bottle_folding", 6 ],
-      [ "mess_tin", 8 ]
+      [ "mess_tin", 8 ],
+      [ "metal_file", 5 ],
+      [ "pin_reamer", 3 ]
     ]
   },
   {
@@ -6378,6 +6387,7 @@
       [ "file", 10 ],
       [ "child_book", 2 ],
       [ "lsd", 1 ],
+      [ "foodperson_mask", 1 ],
       [ "55gal_drum", 10 ],
       [ "30gal_drum", 15 ],
       [ "toolbox", 1 ],
@@ -8032,6 +8042,7 @@
       [ "acorns", 2 ],
       [ "pinecone", 3 ],
       [ "flyer", 1 ],
+      [ "fp_loyalty_card", 1 ],
       [ "one_year_old_newspaper", 1 ],
       [ "months_old_newspaper", 2 ],
       [ "weeks_old_newspaper", 3 ],
@@ -8058,6 +8069,7 @@
       [ "string_6", 1 ],
       [ "cig_butt", 4 ],
       [ "string_36", 1 ],
+      [ "foodperson_mask", 1 ],
       [ "steel_lump", 1 ],
       [ "steel_chunk", 1 ],
       { "item": "scrap", "prob": 2, "count-min": 1, "count-max": 10 },
@@ -9328,7 +9340,9 @@
       [ "hammer", 20 ],
       [ "screwdriver", 20 ],
       [ "lighter", 25 ],
-      [ "pockknife", 15 ]
+      [ "pockknife", 15 ],
+      [ "metal_file", 15 ],
+      [ "pin_reamer", 10 ]
     ]
   },
   {
@@ -9690,6 +9704,7 @@
       [ "ceramic_shard", 15 ],
       [ "stick", 95 ],
       [ "joint_roach", 5 ],
+      [ "fp_loyalty_card", 1 ],
       [ "pipe", 20 ],
       [ "bag_plastic", 10 ],
       [ "bottle_plastic", 10 ],
@@ -9767,6 +9782,7 @@
       [ "arm", 5 ],
       [ "leg", 5 ],
       [ "fetus", 5 ],
+      [ "foodperson_mask", 1 ],
       [ "human_brain_embalmed", 5 ],
       [ "many_years_old_newspaper", 2 ],
       [ "years_old_newspaper", 2 ],

data/json/itemgroups/ammo.json

@@ -9,6 +9,8 @@
       [ "380_JHP", 20 ],
       [ "38_fmj", 25 ],
       [ "38_special", 25 ],
+      [ "357mag_fmj", 15 ],
+      [ "357mag_jhp", 15 ],
       [ "357sig_jhp", 25 ],
       [ "357sig_fmj", 25 ],
       [ "40sw", 40 ],
@@ -68,6 +70,8 @@
       [ "reloaded_38_fmj", 30 ],
       [ "reloaded_38_special", 80 ],
       [ "reloaded_38_super", 40 ],
+      [ "reloaded_357mag_fmj", 30 ],
+      [ "reloaded_357mag_jhp", 30 ],
       [ "reloaded_380_JHP", 10 ],
       [ "reloaded_380_FMJ", 15 ],
       [ "reloaded_380_p", 5 ],

data/json/itemgroups/books.json

@@ -52,7 +52,8 @@
       [ "manual_ninjutsu", 100 ],
       [ "manual_pankration", 5 ],
       [ "manual_silat", 100 ],
-      [ "manual_taekwondo", 100 ]
+      [ "manual_taekwondo", 100 ],
+      [ "manual_wingchun", 100 ]
     ]
   },
   {
@@ -569,6 +570,7 @@
       [ "manual_niten", 1 ],
       [ "manual_sojutsu", 1 ],
       [ "manual_capoeira", 1 ],
+      [ "manual_wingchun", 3 ],
       { "group": "rare_martial_arts_books", "prob": 6 }
     ]
   },
@@ -600,7 +602,8 @@
       [ "mag_unarmed", 20 ],
       [ "manual_brawl", 10 ],
       [ "mag_cutting", 5 ],
-      [ "textbook_weapeast", 1 ]
+      [ "textbook_weapeast", 1 ],
+      [ "manual_wingchun", 3 ]
     ]
   },
   {

data/json/itemgroups/locations.json

@@ -610,6 +610,38 @@
     "type": "item_group",
     "items": [ [ "oj", 35 ], [ "cooked_pumpkin", 25 ], [ "bread", 10 ], [ "fruit_waffles", 5 ], [ "grahmcrackers", 5 ] ]
   },
+  {
+    "id": "gym",
+    "type": "item_group",
+    "items": [
+      [ "water_clean", 12 ],
+      [ "lemonade", 12 ],
+      [ "sports_drink", 12 ],
+      [ "V8", 12 ],
+      [ "tank_top", 30 ],
+      [ "towel", 40 ],
+      [ "under_armor_shorts", 20 ],
+      [ "under_armor", 20 ],
+      [ "protein_shake", 8 ],
+      [ "tshirt", 30 ],
+      [ "sneakers", 30 ],
+      [ "hot_pants", 14 ],
+      [ "undershirt", 30 ],
+      [ "hoodie", 20 ],
+      [ "shorts", 30 ],
+      [ "coke", 3 ],
+      [ "longshirt", 30 ],
+      [ "bandages", 10 ],
+      [ "heatpack", 10 ],
+      [ "gum", 12 ],
+      [ "soap", 10 ],
+      [ "sports_bra", 30 ],
+      [ "briefs", 30 ],
+      [ "yoghurt", 12 ],
+      [ "vitamins", 10 ],
+      [ "aspirin", 10 ]
+    ]
+  },
   {
     "type": "item_group",
     "id": "ss_merch_1",