Proper cvars and remove old cvars

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 414222b286d664a6687262010c9be19b40fda71d..1f204aba4fc62ef2bb1e118ad8bb3a6c7d4265df 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -264,6 +264,7 @@ set g_balance_shotgun_secondary_force 150
 set g_balance_shotgun_secondary_refire 1.1
 set g_balance_shotgun_secondary_animtime 1
 set g_balance_shotgun_reload_ammo 4
+set g_balance_shotgun_reload_time 2
 // }}}
 // {{{ uzi
 set g_balance_uzi_mode 1                               // Activates varible spread for sustained & burst mode secondary
@@ -611,8 +612,6 @@ set g_balance_hlac_secondary_ammo 4
 set g_balance_hlac_secondary_shots 6
 // }}}
 // {{{ sniperrifle
-set g_balance_sniperrifle_magazinecapacity 8 // make it pretty much useless in close combat
-set g_balance_sniperrifle_reloadtime 2 // matches reload anim
 set g_balance_sniperrifle_auto_reload_on_switch 0
 set g_balance_sniperrifle_bursttime 0
 set g_balance_sniperrifle_primary_tracer 1
@@ -644,6 +643,7 @@ set g_balance_sniperrifle_secondary_bulletconstant 110 // 15.5qu
 set g_balance_sniperrifle_secondary_burstcost 0
 set g_balance_sniperrifle_secondary_bullethail 0 // empty magazine on shot
 set g_balance_sniperrifle_reload_ammo 8
+set g_balance_sniperrifle_reload_time 2
 // }}}
 // {{{ tuba
 set g_balance_tuba_refire 0.05

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index c52820f9dddfa63571a20bf54357f699b69d5db3..4a9476bb576e7db85e9f3e5e4e545206774aaa76 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -84,7 +84,6 @@ float autocvar_g_balance_armor_rotstable;
 float autocvar_g_balance_armor_start;
 float autocvar_g_balance_sniperrifle_auto_reload_on_switch;
 float autocvar_g_balance_sniperrifle_bursttime;
-float autocvar_g_balance_sniperrifle_magazinecapacity;
 float autocvar_g_balance_sniperrifle_primary_ammo;
 float autocvar_g_balance_sniperrifle_primary_animtime;
 float autocvar_g_balance_sniperrifle_primary_bulletconstant;
@@ -98,7 +97,6 @@ float autocvar_g_balance_sniperrifle_primary_refire;
 float autocvar_g_balance_sniperrifle_primary_speed;
 float autocvar_g_balance_sniperrifle_primary_spread;
 float autocvar_g_balance_sniperrifle_primary_tracer;
-float autocvar_g_balance_sniperrifle_reloadtime;
 float autocvar_g_balance_sniperrifle_secondary;
 float autocvar_g_balance_sniperrifle_secondary_ammo;
 float autocvar_g_balance_sniperrifle_secondary_animtime;
@@ -115,6 +113,7 @@ float autocvar_g_balance_sniperrifle_secondary_speed;
 float autocvar_g_balance_sniperrifle_secondary_spread;
 float autocvar_g_balance_sniperrifle_secondary_tracer;
 float autocvar_g_balance_sniperrifle_reload_ammo;
+float autocvar_g_balance_sniperrifle_reload_time;
 float autocvar_g_balance_cloaked_alpha;
 float autocvar_g_balance_crylink_primary_ammo;
 float autocvar_g_balance_crylink_primary_animtime;
@@ -613,6 +612,7 @@ float autocvar_g_balance_shotgun_secondary_melee_swing;
 float autocvar_g_balance_shotgun_secondary_melee_time;
 float autocvar_g_balance_shotgun_secondary_refire;
 float autocvar_g_balance_shotgun_reload_ammo;
+float autocvar_g_balance_shotgun_reload_time;
 float autocvar_g_balance_teams;
 float autocvar_g_balance_teams_force;
 float autocvar_g_balance_teams_prevent_imbalance;

diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc
index b7ee13b3721414edadc473d23dd3090b943ad7a3..2a0d61d100ce22518167666b6a66e33b00f09905 100644 (file)
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@ -947,9 +947,10 @@ void havocbot_chooseweapon()
                return;
 
        // Workaround for rifle reloading (..)
-       if(self.weapon == WEP_SNIPERRIFLE)
+       // Is this still needed with the new reload system?
+       /*if(self.weapon == WEP_SNIPERRIFLE)
        if(i < autocvar_g_balance_sniperrifle_reloadtime + 1)
-               return;
+               return;*/
 
        local float w;
        local float distance; distance=bound(10,vlen(self.origin-self.enemy.origin)-200,10000);

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 796f0dc35252bba3ee98ce599d11b9e617f591b8..94417254b7474fa90668fbb45bf5e7dceb8acd5b 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1107,7 +1107,7 @@ float ClientInit_SendEntity(entity to, float sf)
        WriteByte(MSG_ENTITY, autocvar_g_balance_nex_secondary); // client has to know if it should zoom or not
        WriteByte(MSG_ENTITY, autocvar_g_balance_sniperrifle_secondary); // client has to know if it should zoom or not
        WriteByte(MSG_ENTITY, serverflags); // client has to know if it should zoom or not
-       WriteByte(MSG_ENTITY, autocvar_g_balance_sniperrifle_magazinecapacity); // rifle max bullets
+       WriteByte(MSG_ENTITY, 8); // rifle max bullets  // TO BE FIXED WITH NEW STAT!
        WriteCoord(MSG_ENTITY, autocvar_g_trueaim_minrange);
        return TRUE;
 }

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 6f070547193ac6abc2f26fbee83365a0750d835a..2e861599739d05d3abed1cb4f8a57d899a004eb2 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -27,7 +27,7 @@ void W_Shotgun_ReloadedAndReady()
        }
        self.shotgun_load = self.ammo_counter;
 
-       t = ATTACK_FINISHED(self) - autocvar_g_balance_sniperrifle_reloadtime - 1;
+       t = ATTACK_FINISHED(self) - autocvar_g_balance_shotgun_reload_time - 1;
        ATTACK_FINISHED(self) = t;
        w_ready();
 }
@@ -45,10 +45,10 @@ void W_Shotgun_Reload()
 
        sound (self, CHAN_WEAPON2, "weapons/campingrifle_reload.wav", VOL_BASE, ATTN_NORM);
 
-       t = max(time, ATTACK_FINISHED(self)) + autocvar_g_balance_sniperrifle_reloadtime + 1;
+       t = max(time, ATTACK_FINISHED(self)) + autocvar_g_balance_shotgun_reload_time + 1;
        ATTACK_FINISHED(self) = t;
 
-       weapon_thinkf(WFRAME_RELOAD, autocvar_g_balance_sniperrifle_reloadtime, W_Shotgun_ReloadedAndReady);
+       weapon_thinkf(WFRAME_RELOAD, autocvar_g_balance_shotgun_reload_time, W_Shotgun_ReloadedAndReady);
 
        self.old_ammo_counter = self.ammo_counter;
        self.ammo_counter = -1;

diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index 0938cae0a649e6cd32d0ce98c63b32fd857770e0..8a3f5a5dee1634dc967ef64f89e1a854a17df998 100644 (file)
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -31,7 +31,7 @@ void W_SniperRifle_ReloadedAndReady()
        }
        self.sniperrifle_load = self.ammo_counter;
 
-       t = ATTACK_FINISHED(self) - autocvar_g_balance_sniperrifle_reloadtime - 1;
+       t = ATTACK_FINISHED(self) - autocvar_g_balance_sniperrifle_reload_time - 1;
        ATTACK_FINISHED(self) = t;
        w_ready();
 }
@@ -49,10 +49,10 @@ void W_SniperRifle_Reload()
 
        sound (self, CHAN_WEAPON2, "weapons/campingrifle_reload.wav", VOL_BASE, ATTN_NORM);
 
-       t = max(time, ATTACK_FINISHED(self)) + autocvar_g_balance_sniperrifle_reloadtime + 1;
+       t = max(time, ATTACK_FINISHED(self)) + autocvar_g_balance_sniperrifle_reload_time + 1;
        ATTACK_FINISHED(self) = t;
 
-       weapon_thinkf(WFRAME_RELOAD, autocvar_g_balance_sniperrifle_reloadtime, W_SniperRifle_ReloadedAndReady);
+       weapon_thinkf(WFRAME_RELOAD, autocvar_g_balance_sniperrifle_reload_time, W_SniperRifle_ReloadedAndReady);
 
        self.old_ammo_counter = self.ammo_counter;
        self.ammo_counter = -1;
@@ -61,7 +61,7 @@ void W_SniperRifle_Reload()
 float W_SniperRifle_CheckMaxBullets(float checkammo)
 {
        float maxbulls;
-       maxbulls = autocvar_g_balance_sniperrifle_magazinecapacity;
+       maxbulls = autocvar_g_balance_sniperrifle_reload_ammo;
        if(!maxbulls)
                maxbulls = 8; // match HUD
        if(checkammo)
@@ -283,7 +283,7 @@ float w_sniperrifle(float req)
        else if (req == WR_RESETPLAYER)
        {
                self.sniperrifle_accumulator = time - autocvar_g_balance_sniperrifle_bursttime;
-               self.ammo_counter = autocvar_g_balance_sniperrifle_magazinecapacity;
+               self.ammo_counter = autocvar_g_balance_sniperrifle_reload_ammo;
                W_SniperRifle_CheckMaxBullets(FALSE);
        }
        return TRUE;