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

Maleclypse · Sep 15, 2021 · 577024f · 577024f
2 parents 06fb883 + 6470ad4
commit 577024f
Show file tree

Hide file tree

Showing 124 changed files with 1,857 additions and 1,092 deletions.
diff --git a/.github/vcpkg_triplets/x64-windows-static.cmake b/.github/vcpkg_triplets/x64-windows-static.cmake
@@ -0,0 +1,5 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_BUILD_TYPE release)
diff --git a/.github/vcpkg_triplets/x64-windows.cmake b/.github/vcpkg_triplets/x64-windows.cmake
@@ -0,0 +1,5 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE dynamic)
+
+set(VCPKG_BUILD_TYPE release)
diff --git a/.github/workflows/msvc-full-features.yml b/.github/workflows/msvc-full-features.yml
@@ -0,0 +1,91 @@
+name: Cataclysm Windows build
+
+on:
+  push:
+    branches:
+    - master
+    paths-ignore:
+    - 'android/**'
+    - 'build-data/osx/**'
+    - 'doc/**'
+    - 'doxygen_doc/**'
+    - 'lgtm/**'
+    - 'msvc-object_creator/**'
+    - 'tools/**'
+    - 'utilities/**'
+  pull_request:
+    branches:
+    - master
+    paths-ignore:
+    - 'android/**'
+    - 'build-data/osx/**'
+    - 'doc/**'
+    - 'doxygen_doc/**'
+    - 'lgtm/**'
+    - 'msvc-object_creator/**'
+    - 'tools/**'
+    - 'utilities/**'
+
+env:
+  # There's not enough disk space to build both release and debug versions of
+  # our dependencies, so we hack the triplet file to build only release versions
+  # Have to use github.workspace because runner namespace isn't available yet.
+  VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}\.github\vcpkg_triplets
+
+jobs:
+  build_catatclysm:
+    name: Build
+    runs-on: windows-2019
+
+    steps:
+    - name: checkout repository
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
+
+    - name: Add msbuild to PATH
+      uses: microsoft/[email protected]
+
+    - name: Restore artifacts, or run vcpkg, build and cache artifacts
+      uses: lukka/run-vcpkg@main
+      id: runvcpkg
+      with:
+        additionalCachedPaths: '${{ runner.workspace }}/Cataclysm-DDA/msvc-full-features/vcpkg_installed'
+        appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}
+        setupOnly: true
+        vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
+        # We have to use at least this version of vcpkg to include fixes for yasm-tool's
+        # availability only as an x86 host tool. Keep it in sync with the builtin-baseline
+        # field in vcpkg.json. Caching happens as a post-action which runs at the end of
+        # the whole workflow, after vcpkg install happens during msbuild run.
+        vcpkgGitCommitId: '49b67d9cb856424ff69f10e7721aec5299624268'
+
+    - name: Integrate vcpkg
+      run: |
+        vcpkg integrate install
+
+    - name: Build
+      run: |
+          cd msvc-full-features
+          msbuild -m -p:Configuration=Release -p:Platform=x64 -target:Cataclysm-vcpkg-static Cataclysm-vcpkg-static.sln
+
+    - name: Dump logs if build failed
+      if: failure()
+      run: |
+        echo =================================================
+        Get-ChildItem "${{ runner.workspace }}/Cataclysm-DDA/msvc-full-features/vcpkg_installed" -Recurse
+        echo =================================================
+        Get-ChildItem "${{ runner.workspace }}/b/vcpkg/buildtrees" |
+        Foreach-Object {
+            Get-ChildItem $_.FullName -Filter *.log |
+            Foreach-Object {
+              echo =================================================
+              echo $_.FullName
+              echo =================================================
+              type $_.FullName
+            }
+        }
+
+    - name: Clean
+      run: |
+          Get-ChildItem -Path Cataclysm-lib-vcpkg-static-Release-x64.* | Foreach-Object { rm $_.FullName }
diff --git a/.github/workflows/object_creator.yml b/.github/workflows/object_creator.yml
@@ -0,0 +1,91 @@
+name: ObjectCreator Windows build
+
+on:
+  push:
+    branches:
+    - master
+    paths-ignore:
+    - 'android/**'
+    - 'build-data/osx/**'
+    - 'doc/**'
+    - 'doxygen_doc/**'
+    - 'lgtm/**'
+    - 'tools/**'
+    - 'utilities/**'
+  pull_request:
+    branches:
+    - master
+    paths-ignore:
+    - 'android/**'
+    - 'build-data/osx/**'
+    - 'doc/**'
+    - 'doxygen_doc/**'
+    - 'lgtm/**'
+    - 'tools/**'
+    - 'utilities/**'
+
+env:
+  # There's not enough disk space to build both release and debug versions of
+  # our dependencies, so we hack the triplet file to build only release versions
+  # Have to use github.workspace because runner namespace isn't available yet.
+  VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}\.github\vcpkg_triplets
+
+jobs:
+  build_object_creator:
+    name: Build
+    runs-on: windows-2019
+
+    steps:
+    - name: checkout repository
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
+
+    - name: Add msbuild to PATH
+      uses: microsoft/[email protected]
+
+    - name: Restore artifacts, or run vcpkg, build and cache artifacts
+      uses: lukka/run-vcpkg@main
+      id: runvcpkg
+      with:
+        additionalCachedPaths: '${{ runner.workspace }}/Cataclysm-DDA/msvc-full-features/vcpkg_installed;${{ runner.workspace }}/Cataclysm-DDA/msvc-object_creator/vcpkg_installed'
+        appendedCacheKey: ${{ hashFiles( '$msvc-full-features/vcpkg.json', 'msvc-object_creator/vcpkg.json',  '.github/vcpkg_triplets/**' ) }}
+        setupOnly: true
+        vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
+        # We have to use at least this version of vcpkg to include fixes for yasm-tool's
+        # availability only as an x86 host tool. Keep it in sync with the builtin-baseline
+        # field in vcpkg.json. Caching happens as a post-action which runs at the end of
+        # the whole workflow, after vcpkg install happens during msbuild run.
+        vcpkgGitCommitId: '49b67d9cb856424ff69f10e7721aec5299624268'
+
+    - name: Integrate vcpkg
+      run: |
+        vcpkg integrate install
+
+    - name: Build
+      run: |
+          cd msvc-object_creator
+          msbuild -m -p:Configuration=Release -p:Platform=x64 ObjectCreator-vcpkg-static.sln
+
+    - name: Dump logs if build failed
+      if: failure()
+      run: |
+        echo =================================================
+        Get-ChildItem "${{ runner.workspace }}/Cataclysm-DDA/msvc-full-features/vcpkg_installed" -Recurse
+        echo =================================================
+        Get-ChildItem "${{ runner.workspace }}/Cataclysm-DDA/msvc-object_creator/vcpkg_installed" -Recurse
+        echo =================================================
+        Get-ChildItem "${{ runner.workspace }}/b/vcpkg/buildtrees" |
+        Foreach-Object {
+            Get-ChildItem $_.FullName -Filter *.log |
+            Foreach-Object {
+              echo =================================================
+              echo $_.FullName
+              echo =================================================
+              type $_.FullName
+            }
+        }
+
+    - name: Clean
+      run: |
+          Get-ChildItem -Path Cataclysm-lib-vcpkg-static-Release-x64.*,ObjectCreator-vcpkg-static-Release-x64.* | Foreach-Object { rm $_.FullName }
diff --git a/data/json/effects.json b/data/json/effects.json
@@ -632,6 +632,7 @@
     "int_add_val": 1,
     "int_decay_step": -1,
     "int_decay_tick": 90,
+    "int_decay_remove": true,
     "resist_traits": [ "ELFA_NV" ],
     "base_mods": { "per_mod": [ -3, 0 ] },
     "scaling_mods": { "per_mod": [ -2, -1 ] }

diff --git a/data/json/items/ammo/nail.json b/data/json/items/ammo/nail.json
@@ -34,6 +34,6 @@
     "range": 3,
     "damage": { "damage_type": "bullet", "amount": 3, "armor_penetration": 1 },
     "dispersion": 180,
-    "effects": [ "NON_FOULING" ]
+    "effects": [ "NON_FOULING", "HURT_WHEN_WIELDED" ]
   }
 ]
diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
@@ -307,6 +307,46 @@
     "fun": 0,
     "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE", "BAD_TASTE" ]
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "meat_mutant_tainted",
+    "copy-from": "mutant_meat",
+    "name": { "str": "chunk of tainted mutant meat", "str_pl": "chunks of tainted mutant meat" },
+    "color": "magenta",
+    "snippet_category": "tainted_mutant_meat_desc",
+    "looks_like": "meat",
+    "cooks_like": "meat_mutant_tainted_cooked",
+    "spoils_in": "4 hours",
+    "use_action": [ "POISON" ],
+    "price": 0,
+    "price_postapoc": 5,
+    "fun": -15,
+    "flags": [ "TRADER_AVOID", "SMOKABLE", "BAD_TASTE", "RAW" ],
+    "smoking_result": "meat_mutant_tainted_smoked"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "meat_mutant_tainted_cooked",
+    "copy-from": "meat_mutant_tainted",
+    "name": { "str": "cooked tainted mutant meat" },
+    "snippet_category": "cooked_tainted_mutant_meat_desc",
+    "looks_like": "meat_cooked",
+    "parasites": 0,
+    "proportional": { "price_postapoc": 1.5, "fun": 0.7 },
+    "extend": { "flags": [ "EATEN_HOT" ] },
+    "delete": { "flags": [ "RAW" ] }
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "meat_mutant_tainted_smoked",
+    "copy-from": "meat_mutant_tainted_cooked",
+    "name": { "str": "smoked tainted mutant meat" },
+    "description": "Rotten mutatant meat that has been heavily smoked for preservation.",
+    "spoils_in": "24 days",
+    "quench": -1,
+    "proportional": { "price_postapoc": 1.8, "fun": 0.7 },
+    "extend": { "flags": [ "EATEN_HOT", "SMOKED" ] }
+  },
   {
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",

diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -454,6 +454,7 @@
   },
   {
     "type": "COMESTIBLE",
+    "comestible_type": "FOOD",
     "id": "soybean",
     "name": { "str_sp": "soybeans" },
     "volume": "250 ml",
@@ -474,6 +475,7 @@
   },
   {
     "type": "COMESTIBLE",
+    "comestible_type": "FOOD",
     "id": "raw_edamame",
     "name": { "str": "raw edamame" },
     "volume": "250 ml",

diff --git a/data/json/items/fluff.json b/data/json/items/fluff.json
@@ -268,7 +268,7 @@
     "sided": true,
     "material_thickness": 2,
     "flags": [ "OVERSIZE", "BELTED", "RESTRICT_HANDS", "WATER_FRIENDLY" ],
-    "armor": [ { "coverage": 10, "covers": [ "arm_l", "arm_r", "hand_l", "hand_r" ] } ]
+    "armor": [ { "encumbrance": 45, "coverage": 10, "covers": [ "arm_l", "arm_r", "hand_l", "hand_r" ] } ]
   },
   {
     "type": "GENERIC",

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -732,6 +732,7 @@
     "material": [ "steel" ],
     "weight": "302 g",
     "volume": "500 ml",
+    "flags": [ "HURT_WHEN_WIELDED" ],
     "to_hit": -2
   },
   {
@@ -2873,6 +2874,7 @@
     "stack_size": 50,
     "material": [ "steel" ],
     "symbol": ".",
+    "flags": [ "HURT_WHEN_WIELDED" ],
     "color": "white",
     "ammo_type": "components"
   },

diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
@@ -1241,6 +1241,7 @@
     "to_hit": 1,
     "material": [ "plastic" ],
     "symbol": "[",
+    "looks_like": "mask_dust",
     "color": "light_gray",
     "warmth": 10,
     "material_thickness": 2,