From 9415b0244642f204036166a4ad0939661d4f7a07 Mon Sep 17 00:00:00 2001 From: LegendaryGuard Date: Sat, 27 Feb 2021 15:02:48 +0100 Subject: [PATCH] Improving a bit the things for the sake of Mario's thread in the Merge request --- bal-wep-mario.cfg | 14 +++++++------- bal-wep-nexuiz25.cfg | 14 +++++++------- bal-wep-samual.cfg | 14 +++++++------- bal-wep-xdf.cfg | 14 +++++++------- bal-wep-xonotic.cfg | 14 +++++++------- qcsrc/common/weapons/weapon/devastator.qc | 23 +++++++++++------------ qcsrc/common/weapons/weapon/devastator.qh | 14 +++++++------- 7 files changed, 53 insertions(+), 54 deletions(-) diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg index 753548eaa..f8c7a20a7 100644 --- a/bal-wep-mario.cfg +++ b/bal-wep-mario.cfg @@ -398,13 +398,13 @@ set g_balance_devastator_guiderate 90 set g_balance_devastator_guideratedelay 0.01 set g_balance_devastator_guidestop 0 set g_balance_devastator_health 30 -set g_balance_devastator_homing_missile_speed 500 -set g_balance_devastator_homing_missile_speed_accel 1.025 -set g_balance_devastator_homing_missile_speed_accel2 1.05 -set g_balance_devastator_homing_missile_speed_decel 0.9 -set g_balance_devastator_homing_missile_speed_max 1000 -set g_balance_devastator_homing_missile_speed_turnrate 0.25 -set g_balance_devastator_homing_missile_active 0 +set g_balance_devastator_homing_speed 500 +set g_balance_devastator_homing_speed_accel 1.025 +set g_balance_devastator_homing_speed_accel2 1.05 +set g_balance_devastator_homing_speed_decel 0.9 +set g_balance_devastator_homing_speed_max 1000 +set g_balance_devastator_homing_speed_turnrate 0.25 +set g_balance_devastator_homing 0 set g_balance_devastator_lifetime 10 set g_balance_devastator_radius 110 set g_balance_devastator_refire 1.1 diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg index 9981f1af7..4d6ff3f03 100644 --- a/bal-wep-nexuiz25.cfg +++ b/bal-wep-nexuiz25.cfg @@ -398,13 +398,13 @@ set g_balance_devastator_guiderate 90 set g_balance_devastator_guideratedelay 0.01 set g_balance_devastator_guidestop 0 set g_balance_devastator_health 40 -set g_balance_devastator_homing_missile_speed 500 -set g_balance_devastator_homing_missile_speed_accel 1.025 -set g_balance_devastator_homing_missile_speed_accel2 1.05 -set g_balance_devastator_homing_missile_speed_decel 0.9 -set g_balance_devastator_homing_missile_speed_max 1000 -set g_balance_devastator_homing_missile_speed_turnrate 0.25 -set g_balance_devastator_homing_missile_active 0 +set g_balance_devastator_homing_speed 500 +set g_balance_devastator_homing_speed_accel 1.025 +set g_balance_devastator_homing_speed_accel2 1.05 +set g_balance_devastator_homing_speed_decel 0.9 +set g_balance_devastator_homing_speed_max 1000 +set g_balance_devastator_homing_speed_turnrate 0.25 +set g_balance_devastator_homing 0 set g_balance_devastator_lifetime 30 set g_balance_devastator_radius 150 set g_balance_devastator_refire 1 diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg index 6a0b8e05d..6b5f08147 100644 --- a/bal-wep-samual.cfg +++ b/bal-wep-samual.cfg @@ -398,13 +398,13 @@ set g_balance_devastator_guiderate 70 set g_balance_devastator_guideratedelay 0.01 set g_balance_devastator_guidestop 0 set g_balance_devastator_health 30 -set g_balance_devastator_homing_missile_speed 500 -set g_balance_devastator_homing_missile_speed_accel 1.025 -set g_balance_devastator_homing_missile_speed_accel2 1.05 -set g_balance_devastator_homing_missile_speed_decel 0.9 -set g_balance_devastator_homing_missile_speed_max 1000 -set g_balance_devastator_homing_missile_speed_turnrate 0.25 -set g_balance_devastator_homing_missile_active 0 +set g_balance_devastator_homing_speed 500 +set g_balance_devastator_homing_speed_accel 1.025 +set g_balance_devastator_homing_speed_accel2 1.05 +set g_balance_devastator_homing_speed_decel 0.9 +set g_balance_devastator_homing_speed_max 1000 +set g_balance_devastator_homing_speed_turnrate 0.25 +set g_balance_devastator_homing 0 set g_balance_devastator_lifetime 10 set g_balance_devastator_radius 110 set g_balance_devastator_refire 1.2 diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg index c63343e3a..f50c2800e 100644 --- a/bal-wep-xdf.cfg +++ b/bal-wep-xdf.cfg @@ -398,13 +398,13 @@ set g_balance_devastator_guiderate 0 set g_balance_devastator_guideratedelay 999 set g_balance_devastator_guidestop 1 set g_balance_devastator_health 30 -set g_balance_devastator_homing_missile_speed 500 -set g_balance_devastator_homing_missile_speed_accel 1.025 -set g_balance_devastator_homing_missile_speed_accel2 1.05 -set g_balance_devastator_homing_missile_speed_decel 0.9 -set g_balance_devastator_homing_missile_speed_max 1000 -set g_balance_devastator_homing_missile_speed_turnrate 0.25 -set g_balance_devastator_homing_missile_active 0 +set g_balance_devastator_homing_speed 500 +set g_balance_devastator_homing_speed_accel 1.025 +set g_balance_devastator_homing_speed_accel2 1.05 +set g_balance_devastator_homing_speed_decel 0.9 +set g_balance_devastator_homing_speed_max 1000 +set g_balance_devastator_homing_speed_turnrate 0.25 +set g_balance_devastator_homing 0 set g_balance_devastator_lifetime 20 set g_balance_devastator_radius 110 set g_balance_devastator_refire 0.9 diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg index 8be5541db..a3d1840d2 100644 --- a/bal-wep-xonotic.cfg +++ b/bal-wep-xonotic.cfg @@ -398,13 +398,13 @@ set g_balance_devastator_guiderate 90 set g_balance_devastator_guideratedelay 0.01 set g_balance_devastator_guidestop 0 set g_balance_devastator_health 30 -set g_balance_devastator_homing_missile_speed 500 -set g_balance_devastator_homing_missile_speed_accel 1.025 -set g_balance_devastator_homing_missile_speed_accel2 1.05 -set g_balance_devastator_homing_missile_speed_decel 0.9 -set g_balance_devastator_homing_missile_speed_max 1000 -set g_balance_devastator_homing_missile_speed_turnrate 0.25 -set g_balance_devastator_homing_missile_active 0 +set g_balance_devastator_homing_speed 500 +set g_balance_devastator_homing_speed_accel 1.025 +set g_balance_devastator_homing_speed_accel2 1.05 +set g_balance_devastator_homing_speed_decel 0.9 +set g_balance_devastator_homing_speed_max 1000 +set g_balance_devastator_homing_speed_turnrate 0.25 +set g_balance_devastator_homing 0 set g_balance_devastator_lifetime 10 set g_balance_devastator_radius 110 set g_balance_devastator_refire 1.1 diff --git a/qcsrc/common/weapons/weapon/devastator.qc b/qcsrc/common/weapons/weapon/devastator.qc index 8cc1ee5be..caf991550 100644 --- a/qcsrc/common/weapons/weapon/devastator.qc +++ b/qcsrc/common/weapons/weapon/devastator.qc @@ -15,8 +15,7 @@ void W_Devastator_Unregister(entity this) } void W_Devastator_Explode(entity this, entity directhitentity) -{ - +{ W_Devastator_Unregister(this); if(directhitentity.takedamage == DAMAGE_AIM) @@ -398,12 +397,12 @@ void Homing_Missile_Think(entity this) float ad = vlen(vectoangles(normalize(this.enemy.origin - this.origin)) - this.angles); // To close to something, Slow down! - if ( ((ff < 0.7) || (ad > 4)) && (myspeed > WEP_CVAR(devastator, homing_missile_speed)) ) - myspeed = max(myspeed * WEP_CVAR(devastator, homing_missile_speed_decel), WEP_CVAR(devastator, homing_missile_speed)); + if ( ((ff < 0.7) || (ad > 4)) && (myspeed > WEP_CVAR(devastator, homing_speed)) ) + myspeed = max(myspeed * WEP_CVAR(devastator, homing_speed_decel), WEP_CVAR(devastator, homing_speed)); // Failry clear, accelerate. - if ( (ff > 0.7) && (myspeed < WEP_CVAR(devastator, homing_missile_speed_max)) ) - myspeed = min(myspeed * WEP_CVAR(devastator, homing_missile_speed_accel), WEP_CVAR(devastator, homing_missile_speed_max)); + if ( (ff > 0.7) && (myspeed < WEP_CVAR(devastator, homing_speed_max)) ) + myspeed = min(myspeed * WEP_CVAR(devastator, homing_speed_accel), WEP_CVAR(devastator, homing_speed_max)); // Setup trace pitch pt_seek = 1 - ff; @@ -459,14 +458,14 @@ void Homing_Missile_Think(entity this) { // Got a clear path to target, speed up fast (if not at full speed) and go straight for it. myspeed = vlen(this.velocity); - if (myspeed < WEP_CVAR(devastator, homing_missile_speed_max)) - myspeed = min(myspeed * WEP_CVAR(devastator, homing_missile_speed_accel2), WEP_CVAR(devastator, homing_missile_speed_max)); + if (myspeed < WEP_CVAR(devastator, homing_speed_max)) + myspeed = min(myspeed * WEP_CVAR(devastator, homing_speed_accel2), WEP_CVAR(devastator, homing_speed_max)); wishdir = ve; } - if ((myspeed > WEP_CVAR(devastator, homing_missile_speed)) && (this.cnt > time)) - myspeed = min(myspeed * WEP_CVAR(devastator, homing_missile_speed_accel2), WEP_CVAR(devastator, homing_missile_speed_max)); + if ((myspeed > WEP_CVAR(devastator, homing_speed)) && (this.cnt > time)) + myspeed = min(myspeed * WEP_CVAR(devastator, homing_speed_accel2), WEP_CVAR(devastator, homing_speed_max)); // Ranoutagazfish? if (this.cnt < time) @@ -479,7 +478,7 @@ void Homing_Missile_Think(entity this) // Calculate new heading olddir = normalize(this.velocity); - newdir = normalize(olddir + wishdir * WEP_CVAR(devastator, homing_missile_speed_turnrate)); + newdir = normalize(olddir + wishdir * WEP_CVAR(devastator, homing_speed_turnrate)); // Set heading & speed this.velocity = newdir * myspeed; @@ -557,7 +556,7 @@ void W_Devastator_Attack(Weapon thiswep, entity actor, .entity weaponentity, int settouch(missile, W_Devastator_Touch); missile.nextthink = time; - if(WEP_CVAR(devastator, homing_missile_active) != 0) + if(WEP_CVAR(devastator, homing) != 0) setthink(missile, Homing_Missile_Think); else setthink(missile, W_Devastator_Think); diff --git a/qcsrc/common/weapons/weapon/devastator.qh b/qcsrc/common/weapons/weapon/devastator.qh index b713646ed..c528d7555 100644 --- a/qcsrc/common/weapons/weapon/devastator.qh +++ b/qcsrc/common/weapons/weapon/devastator.qh @@ -34,13 +34,13 @@ CLASS(Devastator, Weapon) P(class, prefix, guiderate, float, NONE) \ P(class, prefix, guidestop, float, NONE) \ P(class, prefix, health, float, NONE) \ - P(class, prefix, homing_missile_active, bool, NONE) \ - P(class, prefix, homing_missile_speed, float, NONE) \ - P(class, prefix, homing_missile_speed_accel, float, NONE) \ - P(class, prefix, homing_missile_speed_accel2, float, NONE) \ - P(class, prefix, homing_missile_speed_decel, float, NONE) \ - P(class, prefix, homing_missile_speed_max, float, NONE) \ - P(class, prefix, homing_missile_speed_turnrate, float, NONE) \ + P(class, prefix, homing, bool, NONE) \ + P(class, prefix, homing_speed, float, NONE) \ + P(class, prefix, homing_speed_accel, float, NONE) \ + P(class, prefix, homing_speed_accel2, float, NONE) \ + P(class, prefix, homing_speed_decel, float, NONE) \ + P(class, prefix, homing_speed_max, float, NONE) \ + P(class, prefix, homing_speed_turnrate, float, NONE) \ P(class, prefix, lifetime, float, NONE) \ P(class, prefix, radius, float, NONE) \ P(class, prefix, refire, float, NONE) \ -- 2.39.2