Add Dual Silencers

.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' }" | 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' }" | Add-Content .\${{env.FOLDER_NAME}}\Config.ps1
 
     - name: Compile windows dlls
       working-directory: ${{env.GITHUB_WORKSPACE}}

workspace/Build-Models.ps1

@@ -93,14 +93,14 @@ try {
     } else {
     Invert-Skin $binDir "p_9mmhandgun" $modelsdir\hd
     Invert-Skin $binDir "p_9mmhandguns" $modelsdir\hd
+    Invert-Skin $binDir "p_9mmhandgun" $modelsdir
+    Invert-Skin $binDir "p_9mmhandguns" $modelsdir
     Invert-Skin $binDir "p_crossbow" $modelsdir\hd
     Invert-Skin $binDir "p_grenade" $modelsdir\hd
     Invert-Skin $binDir "p_knife" $modelsdir\hd
     Invert-Skin $binDir "p_rpg" $modelsdir\hd
     Invert-Skin $binDir "p_tripmine" $modelsdir\hd
     Invert-Skin $binDir "rpgrocket" $modelsdir\hd
-    Invert-Skin $binDir "v_9mmhandgun" $modelsdir\hd
-    Invert-Skin $binDir "v_9mmhandguns" $modelsdir\hd
     Invert-Skin $binDir "v_chumtoad" $modelsdir\hd
     Invert-Skin $binDir "v_crossbow" $modelsdir\hd
     Invert-Skin $binDir "v_crowbar" $modelsdir\hd
@@ -114,8 +114,6 @@ try {
     Invert-Skin $binDir "v_sniperrifle" $modelsdir\hd
     Invert-Skin $binDir "p_sniperrifle" $modelsdir\hd
     Invert-Skin $binDir "w_sniperrifle" $modelsdir\hd
-    Invert-Skin $binDir "p_9mmhandgun" $modelsdir
-    Invert-Skin $binDir "p_9mmhandguns" $modelsdir
     Invert-Skin $binDir "p_chumtoad" $modelsdir
     Invert-Skin $binDir "p_crossbow" $modelsdir
     Invert-Skin $binDir "p_crowbar" $modelsdir
@@ -128,8 +126,6 @@ try {
     Invert-Skin $binDir "p_tripmine" $modelsdir
     Invert-Skin $binDir "p_vest" $modelsdir
     Invert-Skin $binDir "rpgrocket" $modelsdir
-    Invert-Skin $binDir "v_9mmhandgun" $modelsdir
-    Invert-Skin $binDir "v_9mmhandguns" $modelsdir
     Invert-Skin $binDir "v_chumtoad" $modelsdir
     Invert-Skin $binDir "v_crossbow" $modelsdir
     Invert-Skin $binDir "v_crowbar" $modelsdir
@@ -309,6 +305,12 @@ try {
     Invert-Skin $binDir "p_zapgun" $modelsdir
     Invert-Skin $binDir "w_zapgun" $modelsdir
     Invert-Skin $binDir "w_tombstone" $modelsdir
+    Invert-Skin $binDir "v_dual_handgun" $modelsdir $redistdir\models
+    Invert-Skin $binDir "v_dual_handgun" $modelsdir\hd $redisthddir\models
+    Invert-Skin $binDir "p_dual_handgun" $modelsdir
+    Invert-Skin $binDir "p_dual_handgun" $modelsdir\hd $redisthddir\models
+    Invert-Skin $binDir "w_dual_handgun" $modelsdir
+    Invert-Skin $binDir "w_dual_handgun" $modelsdir\hd $redisthddir\models
 
     Compile-Player "alpina" $binDir $modelsdir $redistDir
     Compile-Player "army" $binDir $modelsdir $redistDir
@@ -338,10 +340,6 @@ try {
     Compile-Model $binDir "v_shotgun" $modelsdir\hd $redisthddir\models
     Compile-Model $binDir "v_vest_radio" $modelsdir $redistDir\models
     Compile-Model $binDir "v_vest_radio" $modelsdir\hd $redisthddir\models
-    Compile-Model $binDir "v_9mmhandgun" $modelsdir $redistDir\models
-    Compile-Model $binDir "v_9mmhandgun" $modelsdir\hd $redisthddir\models
-    Compile-Model $binDir "v_9mmhandguns" $modelsdir\hd $redisthddir\models
-    Compile-Model $binDir "v_9mmhandguns" $modelsdir $redistDir\models
     Compile-Model $binDir "v_grenade" $modelsdir\hd $redisthddir\models
     Compile-Model $binDir "w_grenade" $modelsdir\hd $redisthddir\models
     Compile-Model $binDir "v_grenade" $modelsdir $redistDir\models
@@ -492,6 +490,8 @@ try {
     Compile-Model $binDir "w_tombstone" $modelsdir $redistdir\models
     Compile-Model $binDir "v_forcegrab" $modelsdir $redistdir\models
     Compile-Model $binDir "panthereye" $modelsdir $redistdir\models
+    Compile-Model $binDir "v_dual_handgun" $modelsdir $redistdir\models
+    Compile-Model $binDir "v_dual_handgun" $modelsdir\hd $redisthddir\models
     }
 }
 catch

workspace/Build-Sprites.ps1

@@ -76,7 +76,9 @@ try {
     Compile-Sprite $binDir "640hudof13" $spritesDir $redistDir\sprites
     Compile-Sprite $binDir "640hudof14" $spritesDir $redistDir\sprites
     Compile-Sprite $binDir "640hudof15" $spritesDir $redistDir\sprites
+    Compile-Sprite $binDir "640hudof15" $spritesDir\hd $redisthddir\sprites
     Compile-Sprite $binDir "640hudof16" $spritesDir $redistDir\sprites
+    Compile-Sprite $binDir "640hudof16" $spritesDir\hd $redisthddir\sprites
     Compile-Sprite $binDir "snowballhit" $spritesDir $redistdir\sprites
     Compile-Sprite $binDir "gunsmoke" $spritesDir $redistdir\sprites
     Compile-Sprite $binDir "smokeball2" $spritesDir $redistdir\sprites

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'
+    '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'
     'hlDir' = 'C:\xash3d-fwgs-win32-i386'
     'hlExe' = 'xash3d.exe'
     'gameParameters' = '-console -dev 5 -log -windowed -width 640 -height 480'

workspace/manifest

@@ -87,6 +87,7 @@ events\dual_hornetgun.sc
 events\fingergun.sc
 events\zapgun.sc
 events\vehicle.sc
+events\dual_glock.sc
 gfx
 gfx\env
 gfx\env\cirdaymont1bk.tga
@@ -338,8 +339,6 @@ models\props\skeleton.mdl
 models\v_9mmAR.mdl
 models\v_shotgun.mdl
 models\v_vest_radio.mdl
-models\v_9mmhandgun.mdl
-models\v_9mmhandguns.mdl
 models\v_grenade.mdl
 models\w_grenade.mdl
 models\v_knife.mdl
@@ -435,6 +434,7 @@ models\v_zapgun.mdl
 models\w_tombstone.mdl
 models\v_forcegrab.mdl
 models\panthereye.mdl
+models\v_dual_handgun.mdl
 modes
 modes\jvs.txt
 modes\lms.txt
@@ -1072,6 +1072,7 @@ sprites\weapon_dual_chaingun.txt
 sprites\weapon_dual_hornetgun.txt
 sprites\weapon_fingergun.txt
 sprites\weapon_zapgun.txt
+sprites\weapon_dual_glock.txt
 sprites\ice_nuke2.spr
 sprites\nuke2.spr
 sprites\ice_hotglow.spr

workspace/manifest_hd

@@ -2,8 +2,6 @@ models
 models\v_9mmAR.mdl
 models\v_shotgun.mdl
 models\v_vest_radio.mdl
-models\v_9mmhandgun.mdl
-models\v_9mmhandguns.mdl
 models\v_grenade.mdl
 models\w_grenade.mdl
 models\v_knife.mdl
@@ -59,8 +57,11 @@ models\v_dual_chaingun.mdl
 models\v_dual_hgun.mdl
 models\v_fingergun.mdl
 models\v_zapgun.mdl
+models\v_dual_handgun.mdl
 sound
 sound\knife_miss2.wav
 sprites
 sprites\640hud1.spr
 sprites\640hud4.spr
+sprites\640hudof15.spr
+sprites\640hudof16.spr