From f990303846f1774378ab0cda56e615de6284f840 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Sun, 12 May 2024 09:36:33 -0700
Subject: [PATCH] Set new dvars

---
 README.md                                |  3 +++
 scripts/zm/_zm_reimagined.gsc            | 19 ++++++++++---
 scripts/zm/replaced/_zm.gsc              | 34 ------------------------
 scripts/zm/replaced/_zm_perk_vulture.gsc | 22 ---------------
 4 files changed, 19 insertions(+), 59 deletions(-)

diff --git a/README.md b/README.md
index 7f837418..248cd903 100644
--- a/README.md
+++ b/README.md
@@ -529,13 +529,16 @@
 * Heats up half as fast
 * Cools down twice as fast
 * Cools down while not holding weapon
+* No longer spins up while meleeing
 * No longer kills when not firing
+* No longer changes player vertical velocity while firing
 * No longer automatically switched to weapon when picked up
 * No longer disassembles when overheated
 * Weapon is taken when overheated
 * Buildable table model no longer shows when player has weapon
 * Added heat percentage on HUD
 * Changed weapon name from "Thrustodyne Aeronautics Model 23" to "Jet Gun"
+* Fixed spin dial being inaccurate
 * Fixed HUD icon fading after firing
 
 #### Sliquifier
diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc
index ec989dfa..31cb5c14 100644
--- a/scripts/zm/_zm_reimagined.gsc
+++ b/scripts/zm/_zm_reimagined.gsc
@@ -590,6 +590,11 @@ set_dvars()
 
 	setDvar("g_friendlyfireDist", 0);
 
+	setDvar("bg_jetgun_disable_spin_while_meleeing", 1);
+	setDvar("bg_jetgun_disable_z_thrust", 1);
+
+	setDvar("bg_fallDamageScale", 0);
+
 	setDvar("perk_weapRateEnhanced", 0);
 
 	setDvar("riotshield_melee_damage_scale", 1);
@@ -600,9 +605,6 @@ set_dvars()
 
 	setDvar("r_fog", 0);
 
-	setDvar("sv_patch_zm_weapons", 1);
-	setDvar("sv_fix_zm_weapons", 0);
-
 	setDvar("sv_voice", 2);
 	setDvar("sv_voiceQuality", 9);
 
@@ -635,6 +637,17 @@ set_client_dvars()
 	self setClientDvar("cg_enemyNameFadeIn", 0);
 	self setClientDvar("cg_enemyNameFadeOut", 250);
 
+	self setClientDvar("cg_sonarAttachmentSpeedDelay", 0.1);
+	self setClientDvar("cg_sonarAttachmentMaxSpeed", 6);
+	self setClientDvar("cg_sonarAttachmentSightCheck", 1);
+	self setClientDvar("cg_sonarAttachmentFullscreenColorFix", 1);
+
+	self setClientDvar("bg_jetgun_disable_spin_while_meleeing", 1);
+	self setClientDvar("bg_jetgun_disable_z_thrust", 1);
+	self setClientDvar("cg_jetgun_fix_spin_dial", 1);
+
+	self setClientDvar("bg_fallDamageScale", 0);
+
 	self setClientDvar("waypointOffscreenPointerDistance", 30);
 	self setClientDvar("waypointOffscreenPadTop", 32);
 	self setClientDvar("waypointOffscreenPadBottom", 32);
diff --git a/scripts/zm/replaced/_zm.gsc b/scripts/zm/replaced/_zm.gsc
index f731c695..313eef61 100644
--- a/scripts/zm/replaced/_zm.gsc
+++ b/scripts/zm/replaced/_zm.gsc
@@ -2246,40 +2246,6 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
 				return 0;
 			}
 		}
-
-		vars = [];
-
-		if (!self hasPerk("specialty_flakjacket"))
-		{
-			// remove fall damage being based off max health
-			vars["ratio"] = self.maxhealth / 100;
-			idamage = int(idamage / vars["ratio"]);
-
-			// increase fall damage beyond 110
-			vars["max_damage"] = 110;
-
-			if (idamage >= vars["max_damage"])
-			{
-				vars["velocity"] = abs(self.fall_velocity);
-				vars["min_velocity"] = getDvarInt("bg_fallDamageMinHeight") * 3.25;
-				vars["max_velocity"] = getDvarInt("bg_fallDamageMaxHeight") * 2.5;
-
-				if (self.divetoprone)
-				{
-					vars["min_velocity"] = getDvarInt("dtp_fall_damage_min_height") * 4.5;
-					vars["max_velocity"] = getDvarInt("dtp_fall_damage_max_height") * 2.75;
-				}
-
-				idamage = int(((vars["velocity"] - vars["min_velocity"]) / (vars["max_velocity"] - vars["min_velocity"])) * vars["max_damage"]);
-
-				if (idamage < vars["max_damage"])
-				{
-					idamage = vars["max_damage"];
-				}
-			}
-
-			finaldamage = idamage;
-		}
 	}
 
 	if (smeansofdeath == "MOD_PROJECTILE" || smeansofdeath == "MOD_PROJECTILE_SPLASH" || smeansofdeath == "MOD_GRENADE" || smeansofdeath == "MOD_GRENADE_SPLASH")
diff --git a/scripts/zm/replaced/_zm_perk_vulture.gsc b/scripts/zm/replaced/_zm_perk_vulture.gsc
index 7189fc7e..3c0c8bce 100644
--- a/scripts/zm/replaced/_zm_perk_vulture.gsc
+++ b/scripts/zm/replaced/_zm_perk_vulture.gsc
@@ -108,7 +108,6 @@ vulture_perk_ir_think()
 	self endon("disconnect");
 	self endon("vulture_perk_lost");
 
-	self setclientdvar("cg_sonarAttachmentSpeedDelay", 0.1);
 	prev_val = 0;
 
 	while (1)
@@ -142,27 +141,6 @@ vulture_perk_ir_is_valid()
 		return 0;
 	}
 
-	zombies = getaispeciesarray(level.zombie_team, "all");
-
-	if (isdefined(level.sloth))
-	{
-		zombies = add_to_array(zombies, level.sloth, 0);
-	}
-
-	foreach (zombie in zombies)
-	{
-		if (zombie damageconetrace(self getplayercamerapos(), self))
-		{
-			normal = vectornormalize(zombie getcentroid() - self getplayercamerapos());
-			dot = vectordot(anglestoforward(self.angles), normal);
-
-			if (dot >= 0.5)
-			{
-				return 0;
-			}
-		}
-	}
-
 	return 1;
 }