Mines only have their lanching speed, so don't keep two speed cvars

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 9dc8917c788a890f22f105bd6a16abd63786258b..33fefc843daa3e14383961935c0e29ddd41d7044 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -309,8 +309,7 @@ set g_balance_minelayer_edgedamage 30
 set g_balance_minelayer_force 250
 set g_balance_minelayer_radius 175
 set g_balance_minelayer_detectionradius 150
-set g_balance_minelayer_speed 0
-set g_balance_minelayer_speedstart 750
+set g_balance_minelayer_speed 750
 set g_balance_minelayer_lifetime 60
 set g_balance_minelayer_refire 1.5
 set g_balance_minelayer_animtime 0.4

diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc
index 41b3d66d094f6cd0dd88b5650cf4184cf8c1f0a5..934aba87ddc6fd2f175fcbde18459dc3de57f694 100644 (file)
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@ -1085,7 +1085,7 @@ void havocbot_chooseweapon()
                )
        )
                mine = (cvar("g_balance_minelayer_damage")/cvar("g_balance_minelayer_refire")*1.0)
-                       * bound(0,(cvar("g_balance_minelayer_speedstart")/distance*maxdelaytime),1)*1.1;
+                       * bound(0,(cvar("g_balance_minelayer_speed")/distance*maxdelaytime),1)*1.1;
 
        if (client_hasweapon(self, WEP_ELECTRO, TRUE, FALSE) &&
                !(      cvar("bot_ai_weapon_combo") && self.weapon == WEP_ELECTRO &&

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 625705f8ffa7a237413c658fbaa1a5c7da7d5c72..31091d3f99bb974949f208f6d2b324a5a0a15629 100644 (file)
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -216,7 +216,7 @@ void W_Mine_Attack (void)
        setsize (mine, '-4 -4 -4', '4 4 4'); // give it some size so it can be shot
 
        setorigin (mine, w_shotorg - v_forward * 4); // move it back so it hits the wall at the right point
-       W_SetupProjectileVelocity(mine, cvar("g_balance_minelayer_speedstart"), 0);
+       W_SetupProjectileVelocity(mine, cvar("g_balance_minelayer_speed"), 0);
        mine.angles = vectoangles (mine.velocity);
 
        mine.touch = W_Mine_Touch;