Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

SuddenEyePuncture · Jun 17, 2021 · 8ab4eef · 8ab4eef
2 parents f08ea6c + 2c1eab2
commit 8ab4eef
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 77 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master, 0.8-branch, 0.9-branch, 0.A-branch, 0.B-branch, 0.C-branch, 0.D-branch, 0.E-branch, gh-pages ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '31 12 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'cpp', 'javascript', 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    #- name: Autobuild
+    #  uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    - run: |
+       make RELEASE=1 RUNTESTS=0
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff --git a/data/json/furniture_and_terrain/terrain-windows.json b/data/json/furniture_and_terrain/terrain-windows.json
@@ -334,7 +334,6 @@
     "move_cost": 0,
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "FLAMMABLE", "ALARMED", "NOITEM", "BARRICADABLE_WINDOW", "CONNECT_TO_WALL", "BLOCK_WIND", "WINDOW" ],
-    "deconstruct": { "ter_set": "t_window_empty", "items": [ { "item": "glass_sheet", "count": 2 } ] },
     "bash": {
       "str_min": 3,
       "str_max": 6,
@@ -357,10 +356,6 @@
     "coverage": 95,
     "roof": "t_flat_roof",
     "flags": [ "FLAMMABLE", "NOITEM", "ALARMED", "WALL", "BARRICADABLE_WINDOW", "BLOCK_WIND", "REDUCE_SCENT", "WINDOW" ],
-    "deconstruct": {
-      "ter_set": "t_window_empty",
-      "items": [ { "item": "glass_sheet", "count": 2 }, { "item": "duct_tape", "charges": [ 15, 25 ] } ]
-    },
     "bash": {
       "str_min": 6,
       "str_max": 12,
@@ -598,10 +593,6 @@
     "move_cost": 0,
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "NOITEM", "CONNECT_TO_WALL", "THIN_OBSTACLE", "WINDOW" ],
-    "deconstruct": {
-      "ter_set": "t_window_no_curtains",
-      "items": [ { "item": "sheet_metal_small", "count": [ 4, 6 ] }, { "item": "rebar", "count": [ 6, 8 ] } ]
-    },
     "bash": {
       "str_min": 60,
       "str_max": 250,
@@ -627,10 +618,6 @@
     "move_cost": 0,
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT", "BLOCK_WIND", "ALARMED", "CONNECT_TO_WALL", "WINDOW" ],
-    "deconstruct": {
-      "ter_set": "t_window_alarm",
-      "items": [ { "item": "sheet_metal_small", "count": [ 4, 6 ] }, { "item": "rebar", "count": [ 6, 8 ] } ]
-    },
     "bash": {
       "str_min": 3,
       "str_max": 6,
@@ -665,17 +652,6 @@
     "curtain_transform": "t_window_bars",
     "examine_action": "curtains",
     "open": "t_window_bars_domestic",
-    "deconstruct": {
-      "ter_set": "t_window",
-      "items": [
-        { "item": "stick", "count": 1 },
-        { "item": "sheet", "count": 2 },
-        { "item": "nail", "charges": [ 3, 4 ] },
-        { "item": "string_36", "count": 1 },
-        { "item": "sheet_metal_small", "count": [ 4, 6 ] },
-        { "item": "rebar", "count": [ 6, 8 ] }
-      ]
-    },
     "bash": {
       "str_min": 3,
       "str_max": 6,
@@ -715,17 +691,6 @@
     "curtain_transform": "t_window_bars",
     "examine_action": "curtains",
     "close": "t_window_bars_curtains",
-    "deconstruct": {
-      "ter_set": "t_window",
-      "items": [
-        { "item": "stick", "count": 1 },
-        { "item": "sheet", "count": 2 },
-        { "item": "nail", "charges": [ 3, 4 ] },
-        { "item": "string_36", "count": 1 },
-        { "item": "sheet_metal_small", "count": [ 4, 6 ] },
-        { "item": "rebar", "count": [ 6, 8 ] }
-      ]
-    },
     "bash": {
       "str_min": 3,
       "str_max": 6,
@@ -850,10 +815,6 @@
       "REDUCE_SCENT",
       "WINDOW"
     ],
-    "deconstruct": {
-      "ter_set": "t_window_reinforced",
-      "items": [ { "item": "pipe", "count": 12 }, { "item": "sheet_metal_small", "count": 40 } ]
-    },
     "bash": {
       "str_min": 50,
       "str_max": 75,
@@ -882,17 +843,6 @@
     "curtain_transform": "t_metal_grate_window",
     "examine_action": "curtains",
     "open": "t_metal_grate_window_with_curtain_open",
-    "deconstruct": {
-      "ter_set": "t_window_reinforced",
-      "items": [
-        { "item": "pipe", "count": [ 10, 12 ] },
-        { "item": "sheet_metal_small", "count": [ 30, 40 ] },
-        { "item": "stick", "count": 1 },
-        { "item": "sheet", "count": 2 },
-        { "item": "nail", "charges": [ 3, 4 ] },
-        { "item": "string_36", "count": 1 }
-      ]
-    },
     "bash": {
       "str_min": 50,
       "str_max": 75,
@@ -921,17 +871,6 @@
     "curtain_transform": "t_metal_grate_window",
     "examine_action": "curtains",
     "close": "t_metal_grate_window_with_curtain",
-    "deconstruct": {
-      "ter_set": "t_window_reinforced",
-      "items": [
-        { "item": "pipe", "count": [ 10, 12 ] },
-        { "item": "sheet_metal_small", "count": [ 30, 40 ] },
-        { "item": "stick", "count": 1 },
-        { "item": "sheet", "count": 2 },
-        { "item": "nail", "charges": [ 3, 4 ] },
-        { "item": "string_36", "count": 1 }
-      ]
-    },
     "bash": {
       "str_min": 50,
       "str_max": 75,
@@ -958,10 +897,6 @@
     "move_cost": 0,
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "NOITEM", "CONNECT_TO_WALL", "BARRICADABLE_WINDOW", "THIN_OBSTACLE", "WINDOW" ],
-    "deconstruct": {
-      "ter_set": "t_window_reinforced_noglass",
-      "items": [ { "item": "pipe", "count": [ 10, 12 ] }, { "item": "sheet_metal_small", "count": [ 30, 40 ] } ]
-    },
     "bash": {
       "str_min": 50,
       "str_max": 75,
@@ -990,17 +925,6 @@
     "curtain_transform": "t_metal_grate_window_noglass",
     "examine_action": "curtains",
     "open": "t_metal_grate_window_with_curtain_open_noglass",
-    "deconstruct": {
-      "ter_set": "t_window_reinforced_noglass",
-      "items": [
-        { "item": "pipe", "count": [ 10, 12 ] },
-        { "item": "sheet_metal_small", "count": [ 30, 40 ] },
-        { "item": "stick", "count": 1 },
-        { "item": "sheet", "count": 2 },
-        { "item": "nail", "charges": [ 3, 4 ] },
-        { "item": "string_36", "count": 1 }
-      ]
-    },
     "bash": {
       "str_min": 50,
       "str_max": 75,

diff --git a/src/newcharacter.cpp b/src/newcharacter.cpp
@@ -230,6 +230,8 @@ void avatar::randomize( const bool random_scenario, points_left &points, bool pl
     // to many points, therefore they are added back.
     points.stat_points += 8 * 4;
 
+    set_body();
+
     int num_gtraits = 0;
     int num_btraits = 0;
     int tries = 0;
@@ -387,7 +389,6 @@ void avatar::randomize( const bool random_scenario, points_left &points, bool pl
         randomize_cosmetic_trait( type_facial_hair );
     }
 
-    set_body();
 }
 
 void avatar::add_profession_items()