Merge pull request #5 from CleverRaven/master

merge

.clang-tidy

@@ -16,7 +16,6 @@ misc-*,\
 modernize-*,\
 performance-*,\
 readability-*,\
--bugprone-incorrect-roundings,\
 -bugprone-integer-division,\
 -bugprone-macro-parentheses,\
 -bugprone-misplaced-widening-cast,\
@@ -52,7 +51,6 @@ readability-*,\
 -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,\
@@ -63,7 +61,6 @@ readability-*,\
 -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,\
@@ -79,11 +76,8 @@ readability-*,\
 -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,\
 "
 WarningsAsErrors: '*'
 HeaderFilterRegex: '(src|test).*'

.github/pull_request_template.md

@@ -1,6 +1,8 @@
 <!--
 ### How to use
 Leave the headings unless they don't apply to your PR, replace commented out text (surrounded with <!–– and ––>) with text describing your PR.
+NOTE: Please grant permission for repository maintainers to edit your PR.
+It is EXTREMELY common for PRs to be held up due to trivial changes being requested and the author being unavailable to make them.
 -->
 
 #### Summary

.github/stale.yml

@@ -0,0 +1,70 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 30
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 30
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - <Bug>
+  - <Bugfix>
+  - "<Crash / Freeze>"
+  - "Organization: Bounty"
+  - "(P1 - Critical)"
+  - "(P2 - High)"
+  - "(P3 - Medium)"
+  - "(P4 - Low)"
+  - "(P5 - Long-term)"
+  - "(S2 - Confirmed)"
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: true
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: true
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+closeComment: >
+  This issue has been automatically closed due to lack of activity. This does
+  not mean that we do not value the issue. Feel free to request that it be
+  re-opened if you are going to actively work on it
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 1
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed

.gitignore

@@ -129,6 +129,12 @@ Cataclysm.dmg
 /tests/shadowcasting_test
 /tests/data/jsionized_overmap.sav
 
+# temporary files generated by tools/reduce_tests.sh
+/list_of_tests
+/list_of_tests.ok
+/log
+/multidelta.log
+
 # static library used to link the test executable
 cataclysm.a
 

LICENSE.txt

@@ -4,6 +4,8 @@ The Square font (data/font/square.ttf) is copyright Wouter van Oortmerssen, lice
 
 GNU Unifont (data/font/unitfont.ttf) is licensed under GNU General Public License v2+ with the GNU font embedding exception. Visit http://unifoundry.com/LICENSE.txt for details.
 
-CATCH unit-test framework is licensed under the Boost Software License. Visit https://github.com/philsquared/Catch/blob/master/LICENSE.txt to read the license.
+CATCH unit-test framework (tests/catch/catch.hpp) is licensed under the Boost Software License. Visit https://github.com/philsquared/Catch/blob/master/LICENSE.txt to read the license.
+
+PLF List and PLF Colony (src/list.h, src/colony.h) are licensed under the zLib license (https://www.zlib.net/zlib_license.html).
 
 getpost (tools/json_tools/format/getpost.h) is licensed under the MIT license, see file for text of license.

data/json/clothing_mods.json

@@ -0,0 +1,54 @@
+[
+  {
+    "type": "clothing_mod",
+    "id": "leather_padded",
+    "flag": "leather_padded",
+    "item": "leather",
+    "implement_prompt": "Pad with leather",
+    "destroy_prompt": "Destroy leather padding",
+    "mod_value": [
+      { "type": "bash", "value": 1, "proportion": [ "thickness", "coverage" ] },
+      { "type": "cut", "value": 1, "proportion": [ "thickness", "coverage" ] },
+      { "type": "encumbrance", "value": 2, "round_up": true, "proportion": [ "thickness", "coverage" ] }
+    ]
+  },
+  {
+    "type": "clothing_mod",
+    "id": "kevlar_padded",
+    "flag": "kevlar_padded",
+    "item": "kevlar_plate",
+    "implement_prompt": "Pad with Kevlar",
+    "destroy_prompt": "Destroy Kevlar padding",
+    "mod_value": [
+      { "type": "bash", "value": 1, "proportion": [ "thickness", "coverage" ] },
+      { "type": "cut", "value": 2, "proportion": [ "thickness", "coverage" ] },
+      { "type": "encumbrance", "value": 2, "round_up": true, "proportion": [ "thickness", "coverage" ] }
+    ]
+  },
+  {
+    "type": "clothing_mod",
+    "id": "furred",
+    "flag": "furred",
+    "item": "fur",
+    "implement_prompt": "Line it with fur",
+    "destroy_prompt": "Destroy fur lining",
+    "mod_value": [
+      { "type": "encumbrance", "value": 1 },
+      { "type": "encumbrance", "value": 4, "proportion": [ "coverage" ] },
+      { "type": "warmth", "value": 35, "proportion": [ "coverage" ] }
+    ]
+  },
+  {
+    "type": "clothing_mod",
+    "id": "wooled",
+    "flag": "wooled",
+    "item": "felt_patch",
+    "implement_prompt": "Line it with wool",
+    "destroy_prompt": "Destroy wool lining",
+    "mod_value": [
+      { "type": "encumbrance", "value": 1 },
+      { "type": "encumbrance", "value": 3, "proportion": [ "coverage" ] },
+      { "type": "warmth", "value": 20, "proportion": [ "coverage" ] }
+    ]
+  }
+]

data/json/construction.json

@@ -49,7 +49,7 @@
     "category": "DIG",
     "required_skills": [ [ "survival", 1 ] ],
     "time": "30 m",
-    "components": [ [ [ "glass_shard", 20 ] ] ],
+    "components": [ [ [ "glass_shard", 168 ] ] ],
     "pre_terrain": "t_pit",
     "post_terrain": "t_pit_glass"
   },
@@ -2008,7 +2008,7 @@
   },
   {
     "type": "construction",
-    "description": "Paint Wall white",
+    "description": "Paint Wall White",
     "category": "DECORATE",
     "required_skills": [ [ "fabrication", 0 ] ],
     "time": "40 m",
@@ -2915,5 +2915,32 @@
     "qualities": [ { "id": "DIG", "level": 2 } ],
     "pre_flags": [ "DIGGABLE", "FLAT" ],
     "post_terrain": "t_pit"
+  },
+  {
+    "type": "construction",
+    "description": "Build Arc Furnace",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 3 ] ],
+    "time": "120 m",
+    "qualities": [
+      [ { "id": "HAMMER", "level": 2 } ],
+      [ { "id": "SAW_M", "level": 1 } ],
+      [ { "id": "WELD", "level": 2 } ],
+      [ { "id": "DRILL", "level": 3 } ],
+      [ { "id": "WRENCH", "level": 2 } ]
+    ],
+    "components": [
+      [ [ "fire_brick", 40 ] ],
+      [ [ "cu_pipe", 4 ] ],
+      [ [ "cable", 12 ] ],
+      [ [ "pipe", 4 ] ],
+      [ [ "hand_vice", 1 ] ],
+      [ [ "motor_tiny", 1 ] ],
+      [ [ "medium_storage_battery", 2 ] ],
+      [ [ "frame", 1 ] ],
+      [ [ "mortar_build", 10 ] ]
+    ],
+    "pre_special": "check_empty",
+    "post_terrain": "f_arcfurnace_empty"
   }
 ]