Hand feed weapon #712

cxong · Jul 16, 2024 · fce6e41 · fce6e41
1 parent 0b7b636
commit fce6e41
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
diff --git a/graphics/fist.txt b/graphics/fist.txt
diff --git 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",