Add vice

solidi · Nov 21, 2024 · 5b28279 · 5b28279
1 parent 4dfb490
commit 5b28279
Show file tree

Hide file tree

Showing 54 changed files with 53,012 additions and 5 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -27,7 +27,7 @@ jobs:
     - name: Write Config File
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: |
-        "`$Config = @{ 'projectName' = '${{env.GAME_TITLE}}'`r`n'defintions' = 'VEST;SILENCER;CLUSTER_GRENADES;CROWBAR;KNIFE;RPG;TRIPMINE;CHUMTOAD;SNIPER_RIFLE;BOLT_GUN;RAILGUN;CANNON;DECOY;MAG60;CHAINGUN;GLAUNCHER;SMG;USAS;FISTS;WRENCH;SNOWBALL;CHAINSAW;_12GAUGE;REVOLVER;EGON;M16;SHOTGUN;NUKE;GAUSS;HIVEHAND;SNARK;DEAGLE;DUALDEAGLE;DUALRPG;DUALSMG;DUALWRENCH;DUALUSAS;FREEZEGUN;DUALMAG60;ROCKETCROWBAR;DUALRAILGUN;GRAVITYGUN;FLAMETHROWER;DUALFLAMETHROWER;ASHPOD;SAWEDOFF;DUALSAWEDOFF;DUALCHAINGUN;DUALHIVEHAND;FINGERGUN;ZAPGUN;DUALGLOCK' }" | Add-Content .\${{env.FOLDER_NAME}}\Config.ps1
+        "`$Config = @{ 'projectName' = '${{env.GAME_TITLE}}'`r`n'defintions' = 'VEST;SILENCER;CLUSTER_GRENADES;CROWBAR;KNIFE;RPG;TRIPMINE;CHUMTOAD;SNIPER_RIFLE;BOLT_GUN;RAILGUN;CANNON;DECOY;MAG60;CHAINGUN;GLAUNCHER;SMG;USAS;FISTS;WRENCH;SNOWBALL;CHAINSAW;_12GAUGE;REVOLVER;EGON;M16;SHOTGUN;NUKE;GAUSS;HIVEHAND;SNARK;DEAGLE;DUALDEAGLE;DUALRPG;DUALSMG;DUALWRENCH;DUALUSAS;FREEZEGUN;DUALMAG60;ROCKETCROWBAR;DUALRAILGUN;GRAVITYGUN;FLAMETHROWER;DUALFLAMETHROWER;ASHPOD;SAWEDOFF;DUALSAWEDOFF;DUALCHAINGUN;DUALHIVEHAND;FINGERGUN;ZAPGUN;DUALGLOCK;VICE' }" | Add-Content .\${{env.FOLDER_NAME}}\Config.ps1
 
     - name: Compile windows dlls
       working-directory: ${{env.GITHUB_WORKSPACE}}

diff --git a/workspace/Build-Models.ps1 b/workspace/Build-Models.ps1
@@ -494,6 +494,8 @@ try {
     Compile-Model $binDir "v_dual_handgun" $modelsdir\hd $redisthddir\models
     Compile-Model $binDir "w_items" $modelsdir $redistdir\models
     Compile-Model $binDir "w_items" $modelsdir\hd $redisthddir\models
+    Compile-Model $binDir "v_vice" $modelsdir $redistdir\models
+    Compile-Model $binDir "v_vice_light" $modelsdir $redistdir\models
     Compile-Model $binDir "coldspot" $modelsdir $redistdir\models
     }
 }

diff --git a/workspace/Build-Sound.ps1 b/workspace/Build-Sound.ps1
@@ -174,6 +174,8 @@ Compile-Sound $binDir $redistDir $soundDir "heavenly-choir-crowd-react-w.mp3" 1.
 Compile-Sound $binDir $redistDir $soundDir "ode-to-joy.mp3" 1.0 "sound\odetojoy.wav" "wav"
 Compile-Sound $binDir $redistDir $soundDir "nap-kehn-storie.mp3" 2.0 "sound\napkin_story.wav" "wav"
 Compile-Sound $binDir $redistDir $soundDir "engineer_gunslinger.mp3" 1.0 "sound\dual_sawedoff_selected.wav" "wav"
+Compile-Sound $binDir $redistDir $soundDir "Smoking_Sound_Effect.mp3" 1.0 "sound\smoking.wav" "wav" 5 9
+Compile-Sound $binDir $redistDir $soundDir "Drinking_Sound_Effect.mp3" 1.0 "sound\drinking.wav" "wav" 1 4
 }
 catch
 {

diff --git a/workspace/README.md b/workspace/README.md
@@ -24,7 +24,7 @@ $Config = @{
     'gameFolder' = 'ice_beta5'
     'binDir' = 'Z:\workspace\bin'
     'msBuild' = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild'
-    'defintions' = 'VEST;SILENCER;CLUSTER_GRENADES;CROWBAR;KNIFE;RPG;TRIPMINE;CHUMTOAD;SNIPER_RIFLE;BOLT_GUN;RAILGUN;CANNON;DECOY;MAG60;CHAINGUN;GLAUNCHER;SMG;USAS;FISTS;WRENCH;SNOWBALL;CHAINSAW;_12GAUGE;REVOLVER;EGON;M16;SHOTGUN;NUKE;GAUSS;HIVEHAND;SNARK;DEAGLE;DUALDEAGLE;DUALRPG;DUALSMG;DUALWRENCH;DUALUSAS;FREEZEGUN;DUALMAG60;ROCKETCROWBAR;DUALRAILGUN;GRAVITYGUNFLAMETHROWER;DUALFLAMETHROWER;ASHPOD;SAWEDOFF;DUALSAWEDOFF;DUALCHAINGUN;DUALHIVEHAND;FINGERGUN;ZAPGUN;DUALGLOCK'
+    'defintions' = 'VEST;SILENCER;CLUSTER_GRENADES;CROWBAR;KNIFE;RPG;TRIPMINE;CHUMTOAD;SNIPER_RIFLE;BOLT_GUN;RAILGUN;CANNON;DECOY;MAG60;CHAINGUN;GLAUNCHER;SMG;USAS;FISTS;WRENCH;SNOWBALL;CHAINSAW;_12GAUGE;REVOLVER;EGON;M16;SHOTGUN;NUKE;GAUSS;HIVEHAND;SNARK;DEAGLE;DUALDEAGLE;DUALRPG;DUALSMG;DUALWRENCH;DUALUSAS;FREEZEGUN;DUALMAG60;ROCKETCROWBAR;DUALRAILGUN;GRAVITYGUNFLAMETHROWER;DUALFLAMETHROWER;ASHPOD;SAWEDOFF;DUALSAWEDOFF;DUALCHAINGUN;DUALHIVEHAND;FINGERGUN;ZAPGUN;DUALGLOCK;VICE'
     'hlDir' = 'C:\xash3d-fwgs-win32-i386'
     'hlExe' = 'xash3d.exe'
     'gameParameters' = '-console -dev 5 -log -windowed -width 640 -height 480'

diff --git a/workspace/grave-bot-src b/workspace/grave-bot-src
diff --git a/workspace/manifest b/workspace/manifest
@@ -88,6 +88,7 @@ events\fingergun.sc
 events\zapgun.sc
 events\vehicle.sc
 events\dual_glock.sc
+events\vice.sc
 gfx
 gfx\env
 gfx\env\cirdaymont1bk.tga
@@ -457,6 +458,8 @@ models\panthereye.mdl
 models\v_dual_handgun.mdl
 models\w_items.mdl
 models\coldspot.mdl
+models\v_vice.mdl
+models\v_vice_light.mdl
 modes
 modes\jvs.txt
 modes\lms.txt
@@ -1015,6 +1018,8 @@ sound\heaven.wav
 sound\sprayer.wav
 sound\napkin_story.wav
 sound\dual_sawedoff_selected.wav
+sound\smoking.wav
+sound\drinking.wav
 sprites
 sprites\defroster
 sprites\defroster\beamlight1.spr
@@ -1102,6 +1107,7 @@ sprites\weapon_dual_hornetgun.txt
 sprites\weapon_fingergun.txt
 sprites\weapon_zapgun.txt
 sprites\weapon_dual_glock.txt
+sprites\weapon_vice.txt
 sprites\ice_nuke2.spr
 sprites\nuke2.spr
 sprites\ice_hotglow.spr
+2 −1		dlls/bot_weapons.h
+64 −0		dlls/bot_weapons_hldm.cpp
+1 −0		dlls/linkfunc.cpp