From fce6e414c1721a6eb7f9552cc3d7b997c8c73db5 Mon Sep 17 00:00:00 2001 From: Cong Date: Tue, 16 Jul 2024 23:08:24 +1000 Subject: [PATCH] Hand feed weapon #712 --- .github/workflows/cmake.yml | 2 +- .github/workflows/cmake.yml.cmake | 2 +- data/.wolf3d/N3Ddata.cdogscpn/bullets.json | 8 +++++--- .../N3Ddata.cdogscpn/graphics/hand_feed.png | Bin 0 -> 348 bytes data/.wolf3d/N3Ddata.cdogscpn/guns.json | 8 ++++---- graphics/fist.png | Bin 5423 -> 238 bytes graphics/fist.txt | 4 ---- src/cdogs/map_wolf.c | 2 +- 8 files changed, 12 insertions(+), 14 deletions(-) create mode 100644 data/.wolf3d/N3Ddata.cdogscpn/graphics/hand_feed.png delete mode 100644 graphics/fist.txt diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 9b2132945..a6ee55945 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -117,7 +117,7 @@ jobs: working-directory: ${{github.workspace}} # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: ctest -C ${{env.BUILD_TYPE}} -VV -S + run: ctest -C ${{env.BUILD_TYPE}} -VV - name: Download DLLs on tags (Windows) if: startsWith(github.ref, 'refs/tags/') && matrix.os == 'windows-latest' diff --git a/.github/workflows/cmake.yml.cmake b/.github/workflows/cmake.yml.cmake index bccda6a2f..09f4f2c40 100644 --- a/.github/workflows/cmake.yml.cmake +++ b/.github/workflows/cmake.yml.cmake @@ -117,7 +117,7 @@ jobs: working-directory: ${{github.workspace}} # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: ctest -C ${{env.BUILD_TYPE}} -VV -S + run: ctest -C ${{env.BUILD_TYPE}} -VV - name: Download DLLs on tags (Windows) if: startsWith(github.ref, 'refs/tags/') && matrix.os == 'windows-latest' diff --git a/data/.wolf3d/N3Ddata.cdogscpn/bullets.json b/data/.wolf3d/N3Ddata.cdogscpn/bullets.json index 1e7275b45..9d240c87c 100644 --- a/data/.wolf3d/N3Ddata.cdogscpn/bullets.json +++ b/data/.wolf3d/N3Ddata.cdogscpn/bullets.json @@ -2,11 +2,11 @@ "Version": 5, "Bullets": [ { - "Name": "knife", + "Name": "hand_feed", "Power": 8, "Hit": { "Flesh": { - "Sound": "hits/knife_flesh" + "Sound": "hand_feed" } }, "Special": { @@ -27,7 +27,9 @@ "OutOfRangeSpark": "spark", "WallMark": "bullet_hole", "Hit": { - "Flesh": {} + "Flesh": { + "Sound": "hits/food" + } }, "Speed": 35000, "Range": 1, diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/hand_feed.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/hand_feed.png new file mode 100644 index 0000000000000000000000000000000000000000..8b0566ccc3308794dade3ef68bafe526a86d7a24 GIT binary patch literal 348 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