mirror of
https://github.com/cxong/cdogs-sdl.git
synced 2025-07-23 07:23:01 +02:00
Hand feed weapon #712
This commit is contained in:
2
.github/workflows/cmake.yml
vendored
2
.github/workflows/cmake.yml
vendored
@@ -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'
|
||||
|
2
.github/workflows/cmake.yml.cmake
vendored
2
.github/workflows/cmake.yml.cmake
vendored
@@ -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'
|
||||
|
@@ -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,
|
||||
|
BIN
data/.wolf3d/N3Ddata.cdogscpn/graphics/hand_feed.png
Normal file
BIN
data/.wolf3d/N3Ddata.cdogscpn/graphics/hand_feed.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 348 B |
@@ -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
|
||||
},
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 238 B |
@@ -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/
|
@@ -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",
|
||||
|
Reference in New Issue
Block a user