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 000000000..8b0566ccc Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/hand_feed.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/guns.json b/data/.wolf3d/N3Ddata.cdogscpn/guns.json index 9b488c717..fb2736ef7 100644 --- a/data/.wolf3d/N3Ddata.cdogscpn/guns.json +++ b/data/.wolf3d/N3Ddata.cdogscpn/guns.json @@ -2,14 +2,14 @@ "Version": 3, "Guns": [ { - "Pic": "knife", - "Icon": "knife", + "Pic": "", + "Icon": "hand_feed", "Name": "Hand", - "Bullet": "knife", + "Bullet": "hand_feed", "Cost": 0, "Lock": 30, "Sound": "", - "SwitchSound": "knife_switch", + "SwitchSound": "hand_feed", "CanShoot": false, "Auto": true }, diff --git a/graphics/fist.png b/graphics/fist.png index c4e027f76..df960b5c3 100644 Binary files a/graphics/fist.png and b/graphics/fist.png differ diff --git a/graphics/fist.txt b/graphics/fist.txt deleted file mode 100644 index f42712ce7..000000000 --- a/graphics/fist.txt +++ /dev/null @@ -1,4 +0,0 @@ -CC0 Hand Wear Icons by AntumDeluge -https://opengameart.org/content/cc0-hand-wear-icons - -http://creativecommons.org/publicdomain/zero/1.0/ \ No newline at end of file diff --git a/src/cdogs/map_wolf.c b/src/cdogs/map_wolf.c index 9c9bc4419..8837ed41e 100644 --- a/src/cdogs/map_wolf.c +++ b/src/cdogs/map_wolf.c @@ -165,7 +165,7 @@ static const char *soundsSOD[] = { static const char *soundsN3D[] = { // 0-9 "chars/alert/antelope", "chars/alert/bear", "pickup", "chars/alert/camel", - "door_close", "cantaloupe", "cantaloupe_feeder", "goat_kick", "gulp?", + "door_close", "cantaloupe", "cantaloupe_feeder", "goat_kick", "hits/food", "chars/die/animal", // 10-19 "chars/alert/elephant", "1up", "super_feeder", "chars/alert/giraffe",