Improving a bit the things for the sake of Mario's thread in the Merge request

diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg
index 753548eaa2a27096828f52794d067097ee3c2e19..f8c7a20a7cb6edd603ea6dabdd6aa3d37af70108 100644 (file)
--- 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 9981f1af77c8dd282a26c2ce6abac3d8be864704..4d6ff3f03afd9f9db90ff496a590ad6e87b3f5b4 100644 (file)
--- 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 6a0b8e05d1d272d908601c822c9c6fed89269408..6b5f08147491e65c32e07c30d7cf0abe1076d668 100644 (file)
--- 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 c63343e3a2484d5108f77aacc7f018918479d81d..f50c2800e69c4d5f5dd78c58ea80e37722ced2da 100644 (file)
--- 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 8be5541db82996d72001710296d332fbf3b1029d..a3d1840d239e4d0479e85f60fae36bdf95b559f4 100644 (file)
--- 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 8cc1ee5bed6d0e35cb6af4c195b288fb821f0dc8..caf99155059c8cfd0cb1f74a7773f3a6ea5410f2 100644 (file)
--- 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 b713646ed2ee36a43b73dc375cc84b8d963be573..c528d7555a0389b3ef5a3776a26bb3c98aa32e5f 100644 (file)
--- 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) \