Merge pull request #387 from solidi/fix-rockets

Fix rocketcrowbar rockets and meleedrop cvar
solidi · Sep 1, 2024 · 92502e7 · 92502e7
2 parents b5a0e23 + 3fdd256
commit 92502e7
Show file tree

Hide file tree

Showing 7 changed files with 2,819 additions and 2,812 deletions.
diff --git a/workspace/models/assassin/assassin.smd b/workspace/models/assassin/assassin.smd
diff --git a/workspace/plan/roadmap.md b/workspace/plan/roadmap.md
@@ -105,6 +105,7 @@ To faithfully recreate the Cold Ice 1.75 experience that works in Half-Life Gold
     1. [x] Third Fire Options through Reload
         1. [x] Sniper on Knife
 1. Game Mechanics
+    1. [ ] Respawn bar or counter on HUD after death like roblox
     1. [ ] Position next to objective?
     1. [x] [func_vehicle](https://gitlab.com/hlrally/src) and (https://github.com/bacontsu/halflife-car)
     1. [x] "[Force grip](https://twitter.com/DokuGamesLTD/status/1802028387826811369)" / [Steal / Throw Weapon](https://twitter.com/DokuGamesLTD/status/1802337752450543945), [nano wire](https://twitter.com/DokuGamesLTD/status/1797776517088325993) mechanism?
@@ -215,6 +216,8 @@ To faithfully recreate the Cold Ice 1.75 experience that works in Half-Life Gold
     1. [ ] New Life Launcher program?
     1. [ ] [Inno Setup](https://github.com/N7P0L3ON/Flatline-Arena-Master/commit/5158ce7977d7a0a5ba5ff9bc2d6dcce5350b1697) install script
 1. Game Modes
+    1. [ ] [Busting makes me feel good](https://github.com/ValveSoftware/halflife/blob/def1e48342df280c58593fe5ba88ed709c429f94/dlls/gamerules.h#L363), [rules explained](https://twitter.com/brokenphilip/status/1728360893132812320).
+    1. [ ] Chilling - plyers equipped with vice only, kill themself. Typing increases health, using voice as well Frags awarded if reach 200 health.
     1. [ ] Dog tag - on being killed everyone drops a dog tag, that lasts for 10 seconds. On pickup the dogdag gives a buff let's say random one from movement speed, to ammo regen, or health and battery. The goal of the gamemode is to pickup a number of those, let's say 50 and after that the game ends. (Napoleon)
     1. [ ] Frosted gamemode - you fight like normal, but you have a freeze timer. Like 10 seconds on one place you're frozen; additionally 30 seconds with no kill and you die. On kill the timer is reset. (Napoleon)
     1. [ ] [Loot mode](https://www.youtube.com/watch?v=OXdnKdBK1yg&t=1490s) - start with no weapons, weapons spawn random, one loot item, to be brought back to drop off (snow_camp square)
@@ -453,6 +456,7 @@ 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. [ ] 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. [ ] datacore (crystalcore)

diff --git a/workspace/redist/config.cfg b/workspace/redist/config.cfg
@@ -34,7 +34,8 @@ bind "d" "+moveright"
 bind "e" "+use"
 bind "f" "impulse 100"
 bind "o" "impulse 216"
-bind "p" "+voicerecord"
+bind "p" "impulse 207"
+bind "l" "+voicerecord"
 bind "q" "impulse 209"
 bind "r" "+reload"
 bind "s" "+back"
@@ -182,7 +183,6 @@ bind "i" "+ironsight"
 bind "j" "drop_rune"
 bind "k" "impulse 206"
 bind "n" "impulse 205"
-bind "p" "impulse 207"
 bind "m" "impulse 208"
 cl_icemodels "2"
 cl_oldscoreboard "1"

diff --git a/workspace/redist/gfx/shell/kb_def.lst b/workspace/redist/gfx/shell/kb_def.lst
@@ -1,4 +1,4 @@
-"k"				"+voicerecord"
+"l"				"+voicerecord"
 "w"				"+forward"
 "UPARROW"		"+forward"
 "s"				"+back"

diff --git a/workspace/redist/readme.txt b/workspace/redist/readme.txt
@@ -45,6 +45,7 @@ Beta 5 Features:
     - Notify HUD when obtaining handgun
     - Freezegun does not freeze its owner
     - Reduced freezegun speed and power
+    - Improved rocketcrowbar rocket launching
 - Soundtrack
     - Includes 14 new tracks, each map plays a set track
 - Map Changes
@@ -103,6 +104,7 @@ Beta 5 Features:
         - Increased cool flesh time to live
         - Fixed lightsout environment light remaining dark
         - Removed dont shoot explosion during spawn protection
+        - Rocket launchers support autoaim
 - Game Mode Changes
     - Added round wins to the scoreboard
     - LMS gamemode groups active players on scoreboard
@@ -153,6 +155,7 @@ Beta 5 Features:
     - Fixed sticking leg kick
     - Fixed button select sound
     - Fixed voice tracks playing after weapon is holstered
+    - Fixed meleedrop cvar, default is now off
 
 Beta 4 Features:
 

diff --git a/workspace/redist/settings.scr b/workspace/redist/settings.scr
@@ -477,7 +477,7 @@ DESCRIPTION SERVER_OPTIONS
 	{
 		"#Ice_MeleeDrop"
 		{ BOOL }
-		{ "1" }
+		{ "0" }
 	}
 
 	"mp_ctfspawn1"

diff --git a/workspace/src b/workspace/src
-Original file line number
+Diff line change
@@ Expand Up / @@ -477,7 +477,7 @@ DESCRIPTION SERVER_OPTIONS @@
     	{
     		"#Ice_MeleeDrop"
     		{ BOOL }
-    		{ "1" }
+    		{ "0" }
     	}
     	"mp_ctfspawn1"
@@ Expand Down @@
+0 −1		dlls/dual_glock.cpp
+37 −35		dlls/dual_rpg.cpp
+2 −1		dlls/game.cpp
+1 −1		dlls/nuke.cpp
+11 −8		dlls/rocket_crowbar.cpp
+42 −49		dlls/rpg.cpp
+6 −6		dlls/weapons.cpp
+4 −4		dlls/weapons.h