Merge remote-tracking branch 'origin/master' into play_2021

* origin/master: (23 commits) No sentinel for closest_enemy_to_friendly_distance (CleverRaven#50037) Base NPC auto-eating on hunger, not stored kCal (CleverRaven#49494) More agressive skipping of duplicate workflows (CleverRaven#50042) Update Tilesets 21-07-19 (CleverRaven#50041) Make apply_light_arc() use castLight() (CleverRaven#49183) Butchering use best tool in crafting radius (CleverRaven#48930) fix complaints (CleverRaven#50036) Vehicle plates recipe rework (CleverRaven#49947) Fix zombie grabs and bites (CleverRaven#49948) Refactor the json files relative to the three rigs among Aftershock and BlazeIndustries (CleverRaven#49977) Changed Humvee jerrycans to use JP8 fuel lab nested chunks 2 (CleverRaven#49991) Lab nests 1 (CleverRaven#49990) Move ACT_READ from activity_handler to activity_actor (CleverRaven#46304) Sunlight angle (CleverRaven#48090) Mention checks in PR template Translate monster death function messages Avoid extra zombie revives from one corpse modular lab parking lot vehicles: helicopters do not have 100% load in idle() ...
pjf · Jul 19, 2021 · 0099439 · 0099439
2 parents 9bc2d0a + 73a5d89
commit 0099439
Show file tree

Hide file tree

Showing 104 changed files with 18,073 additions and 12,469 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,5 +1,10 @@
 <!-- HOW TO USE: Under each "#### Heading" below, enter information relevant to your pull request.
-Leave the headings unless they don't apply to your PR, and remove the comment blocks (surrounded with <!–– and ––>) when you are done.
+Leave the headings unless they don't apply to your PR.
+
+Please read carefully and don't delete the comments delimited by "< !--" and "-- >"
+Once a pull request is submitted automatic stylistic and consistency checks will be performed on the PR's changes.
+The results of these can be either seen under the "Files changed" section of a PR or in the check's details.
+
 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

diff --git a/.github/workflows/CBA.yml b/.github/workflows/CBA.yml
@@ -4,36 +4,30 @@ on:
   push:
     branches:
     - master
-    - 0.F-dev
-    paths:
-    - '**.cpp'
-    - '**.h'
-    - '**.c'
-    - '**/CMakeLists.txt'
-    - '**/Makefile'
-    - '**.hpp'
-    - '**.cmake'
-    - '.github/workflows/CBA.yml'
   pull_request:
     branches:
     - master
-    - 0.F-dev
-    paths:
-    - '**.cpp'
-    - '**.h'
-    - '**.c'
-    - '**/CMakeLists.txt'
-    - '**/Makefile'
-    - '**.hpp'
-    - '**.cmake'
-    - '.github/workflows/CBA.yml'
 
 
 jobs:
+  skip-duplicates:
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          cancel_others: 'true'
+          paths: '[ "**.cpp", "**.h", "**.c", "**/CMakeLists.txt", "**/Makefile", "**.hpp", "**.cmake", ".github/workflows/CBA.yml" ]'
+
   build:
+    needs: skip-duplicates
+    if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' }}
 
-    runs-on: ubuntu-latest
-
+    runs-on: ubuntu-latest    
     steps:
     - name: checkout repository
       uses: actions/checkout@v1

diff --git a/.github/workflows/astyle.yml b/.github/workflows/astyle.yml
@@ -13,6 +13,7 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@master
         with:
+          cancel_others: 'true'
           paths: '["**.cpp", "**.h", "**.c"]'
   astyle-code:
     name: astyle check

diff --git a/.github/workflows/basic-build.yml b/.github/workflows/basic-build.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   skip-duplicates:
-    continue-on-error: false
+    continue-on-error: true
     runs-on: ubuntu-latest
     # Map a step output to a job output
     outputs:
@@ -19,6 +19,7 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@master
         with:
+          cancel_others: 'true'
           paths_ignore: '["android/**", "build-data/osx/**", "doc/**", "doxygen_doc/**", "lgtm/**", "msvc-**", "object_creator/**", "tools/**", "utilities/**"]'
   basic-build:
     needs: skip-duplicates

diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
@@ -4,30 +4,28 @@ on:
   push:
     branches:
     - master
-    - 0.F-dev
-    paths:
-    - '**.cpp'
-    - '**.h'
-    - '**.c'
-    - '**/CMakeLists.txt'
-    - '**/Makefile'
-    - '**.hpp'
-    - '**.cmake'
+
   pull_request:
     branches:
     - master
-    - 0.F-dev
-    paths:
-    - '**.cpp'
-    - '**.h'
-    - '**.c'
-    - '**/CMakeLists.txt'
-    - '**/Makefile'
-    - '**.hpp'
-    - '**.cmake'
 
 jobs:
+  skip-duplicates:
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    # Map a step output to a job output
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          cancel_others: 'true'
+          paths: '[ "**.cpp", "**.h", "**.c", "**/CMakeLists.txt", "**/Makefile", "**.hpp", "**.cmake" ]'
   build:
+    needs: skip-duplicates
+    if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' }}
+
     runs-on: ubuntu-20.04
     env:
         CMAKE: 1

diff --git a/.github/workflows/json.yml b/.github/workflows/json.yml
@@ -4,7 +4,7 @@ on: pull_request
 
 jobs:
   skip-duplicates:
-    continue-on-error: false
+    continue-on-error: true
     runs-on: ubuntu-latest
     # Map a step output to a job output
     outputs:
@@ -13,6 +13,7 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@master
         with:
+          cancel_others: 'true'
           paths: '["**.json"]'
   style-json:
     name: JSON style check

diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   skip-duplicates:
-    continue-on-error: false
+    continue-on-error: true
     runs-on: ubuntu-latest
     # Map a step output to a job output
     outputs:
@@ -19,6 +19,7 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@master
         with:
+          cancel_others: 'true'
           paths_ignore: '["android/**", "build-data/osx/**", "doc/**", "doxygen_doc/**", "lgtm/**", "msvc-**", "object_creator/**", "tools/**", "utilities/**"]'
   varied_builds:
     needs: skip-duplicates

diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_cargo.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_cargo.json
@@ -0,0 +1,82 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "//": "A nested map for lab cargo areas.  Includes cold fields.",
+    "nested_mapgen_id": "lab_cargo_5x5",
+    "object": {
+      "mapgensize": [ 5, 5 ],
+      "rotation": [ 0, 3 ],
+      "rows": [
+        "     ",
+        "     ",
+        "  ^  ",
+        "     ",
+        "     "
+      ],
+      "palettes": [ "lab_common_palette" ],
+      "furniture": { "^": [ [ "f_vent_cold_air2_stream", 30 ], [ "f_vent_cold_air2_stream", 30 ] ] },
+      "place_nested": [ { "chunks": [ [ "null", 50 ], [ "surface_sub_f_crate", 50 ] ], "x": [ 0, 4 ], "y": [ 0, 4 ], "repeat": [ 2, 10 ] } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "//": "A nested map for lab cargo research areas.  Includes hot fields.",
+    "nested_mapgen_id": "lab_cargo_5x5",
+    "object": {
+      "mapgensize": [ 5, 5 ],
+      "rotation": [ 0, 3 ],
+      "rows": [
+        "     ",
+        "     ",
+        "  ^  ",
+        "     ",
+        "     "
+      ],
+      "palettes": [ "lab_common_palette" ],
+      "furniture": { "^": [ [ "f_vent_hot_air2_blast", 30 ], [ "f_vent_hot_air2_stream", 30 ] ] },
+      "place_nested": [ { "chunks": [ [ "null", 50 ], [ "surface_sub_f_crate", 50 ] ], "x": [ 0, 4 ], "y": [ 0, 4 ], "repeat": [ 2, 10 ] } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "//": "A nested map for lab cargo research areas.",
+    "nested_mapgen_id": "lab_cargo_5x5",
+    "object": {
+      "mapgensize": [ 5, 5 ],
+      "rotation": [ 0, 3 ],
+      "rows": [
+        "     ",
+        "     ",
+        "  ^  ",
+        "     ",
+        "     "
+      ],
+      "palettes": [ "lab_common_palette" ],
+      "place_nested": [ { "chunks": [ [ "null", 50 ], [ "surface_sub_f_crate", 50 ] ], "x": [ 0, 4 ], "y": [ 0, 4 ], "repeat": [ 2, 10 ] } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "//": "A nested map for lab cargo research areas.",
+    "nested_mapgen_id": "lab_cargo_5x5",
+    "object": {
+      "mapgensize": [ 5, 5 ],
+      "rotation": [ 0, 3 ],
+      "rows": [
+        "   z ",
+        "     ",
+        "  ^  ",
+        " z   ",
+        "     "
+      ],
+      "palettes": [ "lab_common_palette" ],
+      "place_monster": [ { "monster": "mon_zombie_static", "x": 2, "y": 2 } ],
+      "items": { "z": { "item": "batteries", "chance": 100 } },
+      "place_nested": [ { "chunks": [ [ "null", 50 ], [ "surface_sub_f_crate", 50 ] ], "x": [ 0, 4 ], "y": [ 0, 4 ], "repeat": [ 1, 3 ] } ]
+    }
+  }
+]