Add the cowboy mutator

Add bond sfx support
solidi · Sep 29, 2024 · 196c695 · 196c695
1 parent 076f0f1
commit 196c695
Show file tree

Hide file tree

Showing 15 changed files with 6,174 additions and 66 deletions.
diff --git a/workspace/Build-Sound.ps1 b/workspace/Build-Sound.ps1
@@ -173,6 +173,7 @@ Compile-Sound $binDir $redistDir $soundDir "064-laser-thum_hYpSdXS.mp3" 1.0 "sou
 Compile-Sound $binDir $redistDir $soundDir "heavenly-choir-crowd-react-w.mp3" 1.0 "sound\heaven.wav" "wav"
 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"
 }
 catch
 {

diff --git a/workspace/manifest b/workspace/manifest
@@ -993,6 +993,7 @@ sound\odetojoy.wav
 sound\heaven.wav
 sound\sprayer.wav
 sound\napkin_story.wav
+sound\dual_sawedoff_selected.wav
 sprites
 sprites\defroster
 sprites\defroster\beamlight1.spr

diff --git a/workspace/models/hats/cowboyhat.smd b/workspace/models/hats/cowboyhat.smd
diff --git a/workspace/models/hats/hair.bmp b/workspace/models/hats/hair.bmp
diff --git a/workspace/models/hats/hat.bmp b/workspace/models/hats/hat.bmp
diff --git a/workspace/models/hats/hats.qc b/workspace/models/hats/hats.qc
@@ -32,6 +32,7 @@ studio "piratehat"
 studio "marshmellowhat"
 studio "jackhat"
 studio "pumpkinhat"
+studio "cowboyhat"
 }
 
 $texrendermode "pirate_hat.bmp" "masked" 

diff --git a/workspace/models/hd/v_dual_handgun/v_dual_handgun.qc b/workspace/models/hd/v_dual_handgun/v_dual_handgun.qc
@@ -184,6 +184,7 @@ $sequence "RELOAD" "RELOAD" fps 39 {
 $sequence "draw_lowkey" "DEPLOY" fps 114 { event 5004 0 "default_draw.wav" } { event 5004 15 "default_draw.wav" } 
 $sequence "draw" "DEPLOY" fps 114 { event 5004 0 "default_draw.wav" } { event 5005 2 "handgun_selected.wav" } { event 5004 15 "default_draw.wav" } 
 $sequence "HOLSTER" "HOLSTER" fps 114 
+$sequence "HOLSTER_BOND" "HOLSTER" fps 114 { event 5005 0 "handgun_bond.wav" }
 $sequence "FIRE_BOTH" "FIRE_BOTH" fps 30 { event 5001 0 "31" } { event 5001 4 "31" }
 $sequence "IDLE_LEFTEMPTY" "IDLE_LEFTEMPTY" fps 30 loop 
 $sequence "FIRE_LEFT_LEFTEMPTY" "FIRE_LEFT_LEFTEMPTY" fps 30 

diff --git a/workspace/models/v_dual_handgun/v_dual_handgun.qc b/workspace/models/v_dual_handgun/v_dual_handgun.qc
@@ -184,6 +184,7 @@ $sequence "RELOAD" "RELOAD" fps 39 {
 $sequence "draw_lowkey" "DEPLOY" fps 114 { event 5004 0 "default_draw.wav" } { event 5004 15 "default_draw.wav" } 
 $sequence "draw" "DEPLOY" fps 114 { event 5004 0 "default_draw.wav" } { event 5005 2 "handgun_selected.wav" } { event 5004 15 "default_draw.wav" } 
 $sequence "HOLSTER" "HOLSTER" fps 114 
+$sequence "HOLSTER_BOND" "HOLSTER" fps 114 { event 5005 0 "handgun_bond.wav" }
 $sequence "FIRE_BOTH" "FIRE_BOTH" fps 30 { event 5001 0 "31" } { event 5001 4 "31" }
 $sequence "IDLE_LEFTEMPTY" "IDLE_LEFTEMPTY" fps 30 loop 
 $sequence "FIRE_LEFT_LEFTEMPTY" "FIRE_LEFT_LEFTEMPTY" fps 30 

diff --git a/workspace/plan/roadmap.md b/workspace/plan/roadmap.md
@@ -468,10 +468,12 @@ To faithfully recreate the Cold Ice 1.75 experience that works in Half-Life Gold
     1. [ ] Add map name to the scoreboard
     1. [ ] Slanted health and armor sprites like [Operation: Black Mesa Blue Shift](https://gamerant.com/half-life-black-mesa-blue-shift-opposing-force-campaigns-screenshots/)
 1. Maps
+    1. [ ] rapidcore (icecore)
+    1. [ ] RATS styled map
+    1. [ ] UT Phobos like map, but around an ice planet or moon like Europa
     1. [ ] extend depot with another area, possibly creating a circle for the train.
     1. [ ] Finish arena, texture in Cold Ice style
     1. [ ] Frozen Lake map idea
-    1. [ ] rapidcore (icecore)
     1. [ ] Add info_intermission points
     1. [ ] Realign large blue crate textures so detailed textures is left to right
     1. [ ] Clip sky in Focus

diff --git a/workspace/redist/readme.txt b/workspace/redist/readme.txt
@@ -93,6 +93,7 @@ Beta 5 Features:
         - "napkinstory" - the legend reduced to two words
         - "minime" - players are half the size
         - "paper" - players are flat
+        - "cowboy" - cowboy hats with dual cannons!
     - Gamemode Changes
         - Show game rules on connection
         - Disable numerous Mutators from gungame
@@ -988,6 +989,7 @@ Server:
     - "bighead" - players heads are very large
     - "chumxplode" - a killer chumtoad appears directly after an explosion
     - "coolflesh" - gibs stay longer, pick up gibs to eat and gain a healthkit worth of repair
+    - "cowboy" - cowboy hats with dual cannons!
     - "crate" - boxwars in the 2020's.
     - "credits" - show all contributors in an endless loop.
     - "dealter" - dealing with farts, of course
@@ -1189,3 +1191,4 @@ Thanks To:
 - FWGS team for the func_vehicle implementation https://github.com/FWGS/hlsdk-portable
 - Monster panthereye monster code by Alan https://github.com/Magic-Nipples
 - Ian Prest for the github keyboard layout editor http://www.keyboard-layout-editor.com
+- Galy Raffo for the cowboy hat https://gamebanana.com/mods/380978
diff --git a/workspace/redist/settings.scr b/workspace/redist/settings.scr
@@ -65,69 +65,70 @@ DESCRIPTION SERVER_OPTIONS
 			"chumxplode" "9"
 			"closeup" "10"
 			"coolflesh" "11"
-			"crate" "12"
-			"credits" "13"
-			"dealter" "14"
-			"dontshoot" "15"
-			"explosiveai (sp only)" "16"
-			"fastweapons" "17"
-			"firestarter" "18"
-			"fog" "19"
-			"goldenguns" "20"
-			"grenades" "21"
-			"ice" "22"
-			"infiniteammo" "23"
-			"instagib" "24"
-			"inverse" "25"
-			"invisible" "26"
-			"itemsexplode" "27"
-			"jack" "28"
-			"jeepathon" "29"
-			"jope" "30"
-			"lightsout" "31"
-			"longjump" "32"
-			"loopback" "33"
-			"marshmellow" "34"
-			"maxpack (mp only)" "35"
-			"megarun" "36"
-			"mirror" "37"
-			"minime" "38"
-			"napkinstory" "39"
-			"noclip" "40"
-			"noreload" "41"
-			"notify" "42"
-			"notthebees" "43"
-			"oldtime" "44"
-			"paintball" "45"
-			"paper" "46"
-			"piratehat" "47"
-			"plumber" "48"
-			"portal" "49"
-			"pumpkin" "50"
-			"pushy" "51"
-			"railguns" "52"
-			"randomweapon" "53"
-			"ricochet" "54"
-			"rocketbees" "55"
-			"rocketcrowbar" "56"
-			"rockets" "57"
-			"sanic" "58"
-			"santahat" "59"
-			"sildenafil" "60"
-			"slowbullets" "61"
-			"slowmo (sp only)" "62"
-			"slowweapons" "63"
-			"snowballs" "64"
-			"speedup (sp only)" "65"
-			"stahp" "66"
-			"superjump" "67"
-			"thirdperson" "68"
-			"three" "69"
-			"toilet" "70"
-			"topsyturvy (sp only)" "71"
-			"turrets" "72"
-			"vested" "73"
-			"volatile" "74"
+			"cowboy" "12"
+			"crate" "13"
+			"credits" "14"
+			"dealter" "15"
+			"dontshoot" "16"
+			"explosiveai (sp only)" "17"
+			"fastweapons" "18"
+			"firestarter" "19"
+			"fog" "20"
+			"goldenguns" "21"
+			"grenades" "22"
+			"ice" "23"
+			"infiniteammo" "24"
+			"instagib" "25"
+			"inverse" "26"
+			"invisible" "27"
+			"itemsexplode" "28"
+			"jack" "29"
+			"jeepathon" "30"
+			"jope" "31"
+			"lightsout" "32"
+			"longjump" "33"
+			"loopback" "34"
+			"marshmellow" "35"
+			"maxpack (mp only)" "36"
+			"megarun" "37"
+			"mirror" "38"
+			"minime" "39"
+			"napkinstory" "40"
+			"noclip" "41"
+			"noreload" "42"
+			"notify" "43"
+			"notthebees" "44"
+			"oldtime" "45"
+			"paintball" "46"
+			"paper" "47"
+			"piratehat" "48"
+			"plumber" "49"
+			"portal" "50"
+			"pumpkin" "51"
+			"pushy" "52"
+			"railguns" "53"
+			"randomweapon" "54"
+			"ricochet" "55"
+			"rocketbees" "56"
+			"rocketcrowbar" "57"
+			"rockets" "58"
+			"sanic" "59"
+			"santahat" "60"
+			"sildenafil" "61"
+			"slowbullets" "62"
+			"slowmo (sp only)" "63"
+			"slowweapons" "64"
+			"snowballs" "65"
+			"speedup (sp only)" "66"
+			"stahp" "67"
+			"superjump" "68"
+			"thirdperson" "69"
+			"three" "70"
+			"toilet" "71"
+			"topsyturvy (sp only)" "72"
+			"turrets" "73"
+			"vested" "74"
+			"volatile" "75"
 		}
 		{ "1" }
 	}

diff --git a/workspace/sound/engineer_gunslinger.mp3 b/workspace/sound/engineer_gunslinger.mp3
diff --git a/workspace/sprites/gameicons5/gameicons5.bmp b/workspace/sprites/gameicons5/gameicons5.bmp
diff --git a/workspace/sprites/hud.txt b/workspace/sprites/hud.txt
@@ -1,4 +1,4 @@
-304
+305
 selection		320 320hud1	160	160	80	20
 
 bucket1			320 320hud2	108	16	12	12
@@ -306,6 +306,7 @@ rocketbees	640 gameicons5	192	64	64	64
 napkinstory	640 gameicons5	0	128	64	64
 minime	640 gameicons5	64	128	64	64
 paper	640 gameicons5	128	128	64	64
+cowboy	640 gameicons5	192	128	64	64
 
 // Runes
 rune_frag	640 640hudrunes	0	0	64	64

diff --git a/workspace/src b/workspace/src
+3 −0		cl_dll/StudioModelRenderer.cpp
+1 −0		cl_dll/ev_hldm.cpp
+1 −0		cl_dll/vgui_TeamFortressViewport.cpp
+64 −63		common/const.h
+13 −0		dlls/client.cpp
+1 −0		dlls/dual_glock.cpp
+9 −0		dlls/gamerules.cpp
+3 −0		dlls/gungame_gamerules.cpp
+3 −0		dlls/instagib_gamerules.cpp
+1 −0		dlls/multiplay_gamerules.cpp
+18 −15		dlls/player.cpp
+2 −1		dlls/wpn_shared/hl_wpn_glock.cpp