From 5bc4aee0932c1f0c6204afb11d411e8b0c86ea9b Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Mon, 17 Apr 2023 21:14:22 -0700 Subject: [PATCH] Jet Gun: heats up half as fast --- README.md | 1 + scripts/zm/_zm_reimagined.gsc | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e6d1009d..842b3c9b 100644 --- a/README.md +++ b/README.md @@ -226,6 +226,7 @@ * Awards points for kills * Cools down twice as fast * Cools down while not holding weapon +* Heats up half as fast * Heats up when firing while meleeing * No longer kills when not firing * No longer automatically switched to weapon when picked up diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index cd9a34f2..d0395896 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -3102,7 +3102,7 @@ jetgun_heatval_changes() vars["prev_heatval"] = 0; vars["cooldown_amount"] = 0.1; - vars["overheat_amount"] = 0.85; + vars["melee_overheat_amount"] = 0.475; while(1) { @@ -3122,7 +3122,11 @@ jetgun_heatval_changes() } else if(self getCurrentWeapon() == "jetgun_zm" && self attackButtonPressed() && self isMeleeing()) { - self.jetgun_heatval += vars["overheat_amount"]; + self.jetgun_heatval += vars["melee_overheat_amount"]; + } + else if(self getCurrentWeapon() == "jetgun_zm" && self attackButtonPressed()) + { + self.jetgun_heatval -= abs(vars["diff_heatval"]) / 2; } else if(vars["diff_heatval"] < 0) {