Reloading for fireball

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 682b1e83eaa3892ad5a9dae6dc60d6146b881643..c2e5bee72484db2667b63f8da6ab818790b03f32 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -709,6 +709,8 @@ set g_balance_fireball_secondary_speed 900
 set g_balance_fireball_secondary_speed_up 100
 set g_balance_fireball_secondary_speed_z 0
 set g_balance_fireball_secondary_spread 0
+set g_balance_fireball_reload_ammo 60
+set g_balance_fireball_reload_time 2
 // }}}
 // {{{ seeker
 set g_balance_seeker_flac_ammo 0.5

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 019ed71b4604f0de6ea0c7ff59854799b9424fd7..bf4fa7a6f6449652fe46094c086a0a9033aa1da5 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -255,6 +255,8 @@ float autocvar_g_balance_fireball_secondary_lifetime;
 float autocvar_g_balance_fireball_secondary_refire;
 float autocvar_g_balance_fireball_secondary_speed;
 float autocvar_g_balance_fireball_secondary_speed_up;
+float autocvar_g_balance_fireball_reload_ammo;
+float autocvar_g_balance_fireball_reload_time;
 float autocvar_g_balance_firetransfer_damage;
 float autocvar_g_balance_firetransfer_time;
 float autocvar_g_balance_fuel_limit;

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 12e2f1327940cbba964693f59f28459e9df917f3..0cc4e1bb8f951b3f652f3ec324b60d63e205eab6 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -898,6 +898,7 @@ void PutClientInServer (void)
                self.electro_load = autocvar_g_balance_electro_reload_ammo;
                self.crylink_load = autocvar_g_balance_crylink_reload_ammo;
                self.hlac_load = autocvar_g_balance_hlac_reload_ammo;
+               self.fireball_load = autocvar_g_balance_fireball_reload_ammo;
 
                if(inWarmupStage)
                {

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index 727018815f99dbb0daab3efcb7af24946f557d4e..e0f0748f4725b29b6153334bf4ecc71a1a74f8f6 100644 (file)
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -6,6 +6,64 @@ REGISTER_WEAPON(FIREBALL, w_fireball, IT_FUEL, 9, WEP_TYPE_SPLASH, BOT_PICKUP_RA
 .vector fireball_impactvec;
 .float fireball_primarytime;
 
+.float fireball_load;
+
+void W_Fireball_SetAmmoCounter()
+{
+       // set clip_load to the weapon we have switched to, if the gun uses reloading
+       if(!autocvar_g_balance_fireball_reload_ammo)
+               self.clip_load = 0; // also keeps crosshair ammo from displaying
+       else
+       {
+               self.clip_load = self.fireball_load;
+               self.clip_size = autocvar_g_balance_fireball_reload_ammo; // for the crosshair ammo display
+       }
+}
+
+void W_Fireball_ReloadedAndReady()
+{
+       float t;
+
+       // now do the ammo transfer
+       self.clip_load = self.old_clip_load; // restore the ammo counter, in case we still had ammo in the weapon before reloading
+       while(self.clip_load < autocvar_g_balance_fireball_reload_ammo && self.ammo_fuel) // make sure we don't add more ammo than we have
+       {
+               self.clip_load += 1;
+               self.ammo_fuel -= 1;
+
+               // fuel can be a non-whole number, which brakes stuff here when between 0 and 1
+               if(self.ammo_fuel < 1)
+                       self.ammo_fuel = 0;
+       }
+       self.fireball_load = self.clip_load;
+
+       t = ATTACK_FINISHED(self) - autocvar_g_balance_fireball_reload_time - 1;
+       ATTACK_FINISHED(self) = t;
+       w_ready();
+}
+
+void W_Fireball_Reload()
+{
+       // return if reloading is disabled for this weapon
+       if(!autocvar_g_balance_fireball_reload_ammo)
+               return;
+
+       if(!W_ReloadCheck(self.ammo_fuel, min(autocvar_g_balance_fireball_primary_ammo, autocvar_g_balance_fireball_secondary_ammo)))
+               return;
+
+       float t;
+
+       sound (self, CHAN_WEAPON2, "weapons/reload.wav", VOL_BASE, ATTN_NORM);
+
+       t = max(time, ATTACK_FINISHED(self)) + autocvar_g_balance_fireball_reload_time + 1;
+       ATTACK_FINISHED(self) = t;
+
+       weapon_thinkf(WFRAME_RELOAD, autocvar_g_balance_fireball_reload_time, W_Fireball_ReloadedAndReady);
+
+       self.old_clip_load = self.clip_load;
+       self.clip_load = -1;
+}
+
 void W_Fireball_Explode (void)
 {
        entity e;
@@ -194,8 +252,17 @@ void W_Fireball_Attack1_Frame1()
 
 void W_Fireball_Attack1_Frame0()
 {
+       // if this weapon is reloadable, decrease its load. Else decrease the player's ammo
        if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-               self.ammo_fuel = self.ammo_fuel - autocvar_g_balance_fireball_primary_ammo;
+       {
+               if(autocvar_g_balance_fireball_reload_ammo)
+               {
+                       self.clip_load -= autocvar_g_balance_fireball_primary_ammo;
+                       self.fireball_load = self.clip_load;
+               }
+               else
+                       self.ammo_fuel -= autocvar_g_balance_fireball_primary_ammo;
+       }
 
        W_Fireball_AttackEffect(0, '-1.25 -3.75 0');
        sound (self, CHAN_WEAPON, "weapons/fireball_prefire2.wav", VOL_BASE, ATTN_NORM);
@@ -246,8 +313,17 @@ void W_Fireball_Attack2()
        vector f_diff;
        float c;
 
+       // if this weapon is reloadable, decrease its load. Else decrease the player's ammo
        if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-               self.ammo_fuel = self.ammo_fuel - autocvar_g_balance_fireball_secondary_ammo;
+       {
+               if(autocvar_g_balance_fireball_reload_ammo)
+               {
+                       self.clip_load -= autocvar_g_balance_fireball_secondary_ammo;
+                       self.fireball_load = self.clip_load;
+               }
+               else
+                       self.ammo_fuel -= autocvar_g_balance_fireball_secondary_ammo;
+       }
 
        c = mod(self.bulletcounter, 4);
        switch(c)
@@ -327,19 +403,36 @@ float w_fireball(float req)
        }
        else if (req == WR_THINK)
        {
-               if (self.BUTTON_ATCK)
-               if (time >= self.fireball_primarytime)
-               if (weapon_prepareattack(0, autocvar_g_balance_fireball_primary_refire))
+               if(autocvar_g_balance_fireball_reload_ammo && self.clip_load < min(autocvar_g_balance_fireball_primary_ammo, autocvar_g_balance_fireball_secondary_ammo)) // forced reload
+                       W_Fireball_Reload();
+               else if (self.BUTTON_ATCK)
                {
-                       W_Fireball_Attack1_Frame0();
-                       self.fireball_primarytime = time + autocvar_g_balance_fireball_primary_refire2;
+                       if (time >= self.fireball_primarytime)
+                       if (weapon_prepareattack(0, autocvar_g_balance_fireball_primary_refire))
+                       {
+                               W_Fireball_Attack1_Frame0();
+                               self.fireball_primarytime = time + autocvar_g_balance_fireball_primary_refire2;
+                       }
                }
-               if (self.BUTTON_ATCK2)
-               if (weapon_prepareattack(1, autocvar_g_balance_fireball_secondary_refire))
+               else if (self.BUTTON_ATCK2)
                {
-                       W_Fireball_Attack2();
-                       weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_fireball_secondary_animtime, w_ready);
+                       if (weapon_prepareattack(1, autocvar_g_balance_fireball_secondary_refire))
+                       {
+                               W_Fireball_Attack2();
+                               weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_fireball_secondary_animtime, w_ready);
+                       }
                }
+        if(self.wish_reload)
+        {
+            if(self.switchweapon == self.weapon)
+            {
+                if(self.weaponentity.state == WS_READY)
+                {
+                    self.wish_reload = 0;
+                    W_Fireball_Reload();
+                }
+            }
+        }
        }
        else if (req == WR_PRECACHE)
        {
@@ -352,11 +445,24 @@ float w_fireball(float req)
                precache_sound ("weapons/fireball_prefire2.wav");
        }
        else if (req == WR_SETUP)
+       {
                weapon_setup(WEP_FIREBALL);
+               W_Fireball_SetAmmoCounter();
+       }
        else if (req == WR_CHECKAMMO1)
-               return self.ammo_fuel >= autocvar_g_balance_fireball_primary_ammo;
+       {
+               if(autocvar_g_balance_fireball_reload_ammo)
+                       return self.fireball_load >= autocvar_g_balance_fireball_primary_ammo;
+               else
+                       return self.ammo_fuel >= autocvar_g_balance_fireball_primary_ammo;
+       }
        else if (req == WR_CHECKAMMO2)
-               return self.ammo_fuel >= autocvar_g_balance_fireball_secondary_ammo;
+       {
+               if(autocvar_g_balance_fireball_reload_ammo)
+                       return self.fireball_load >= autocvar_g_balance_fireball_secondary_ammo;
+               else
+                       return self.ammo_fuel >= autocvar_g_balance_fireball_secondary_ammo;
+       }
        else if (req == WR_RESETPLAYER)
        {
                self.fireball_primarytime = time;
@@ -417,6 +523,10 @@ float w_fireball(float req)
                                w_deathtypestring = "%s tasted %s's fireball";
                }
        }
+       else if (req == WR_RELOAD)
+       {
+               W_Fireball_Reload();
+       }
        return TRUE;
 }
 #endif