why shot delayed

diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg
index adb7cc654fa3565e82441a1ca9115936191ebfc1..9dfb0105d98675f0628f44373a19579302d6a488 100644 (file)
--- a/bal-wep-mario.cfg
+++ b/bal-wep-mario.cfg
@@ -298,6 +298,9 @@ set g_balance_crylink_weaponthrowable 1
 set g_balance_vortex_charge 0
 set g_balance_vortex_charge_always 0
 set g_balance_vortex_charge_animlimit 0.5
+set g_balance_vortex_charge_bow 1
+set g_balance_vortex_charge_bow_hold 4
+set g_balance_vortex_charge_bow_hold_releasedeath 0
 set g_balance_vortex_charge_limit 1
 set g_balance_vortex_charge_maxspeed 800
 set g_balance_vortex_charge_mindmg 40

diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg
index 17f5b31cab3b29b313e70f27606e6cf42bd7e082..a1ed5c20709c1d01f05240faead64ccc12aaeb2c 100644 (file)
--- a/bal-wep-nexuiz25.cfg
+++ b/bal-wep-nexuiz25.cfg
@@ -298,6 +298,9 @@ set g_balance_crylink_weaponthrowable 1
 set g_balance_vortex_charge 0
 set g_balance_vortex_charge_always 0
 set g_balance_vortex_charge_animlimit 0.5
+set g_balance_vortex_charge_bow 1
+set g_balance_vortex_charge_bow_hold 4
+set g_balance_vortex_charge_bow_hold_releasedeath 0
 set g_balance_vortex_charge_limit 1
 set g_balance_vortex_charge_maxspeed 800
 set g_balance_vortex_charge_mindmg 40

diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg
index 2799a2496b47fb4debea904aa6b051b95c59a621..51d71f3414fc489c4a0638cc9cb20a0efe6a24f0 100644 (file)
--- a/bal-wep-samual.cfg
+++ b/bal-wep-samual.cfg
@@ -298,6 +298,9 @@ set g_balance_crylink_weaponthrowable 1
 set g_balance_vortex_charge 1
 set g_balance_vortex_charge_always 0
 set g_balance_vortex_charge_animlimit 0.5
+set g_balance_vortex_charge_bow 1
+set g_balance_vortex_charge_bow_hold 4
+set g_balance_vortex_charge_bow_hold_releasedeath 0
 set g_balance_vortex_charge_limit 1
 set g_balance_vortex_charge_maxspeed 800
 set g_balance_vortex_charge_mindmg 40

diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg
index 09466acce81bcb3949c256133dce2a9675c89acc..567eeafd6cf5e4841a09b1e3b7abc3f8861e8a56 100644 (file)
--- a/bal-wep-xdf.cfg
+++ b/bal-wep-xdf.cfg
@@ -298,6 +298,9 @@ set g_balance_crylink_weaponthrowable 1
 set g_balance_vortex_charge 0
 set g_balance_vortex_charge_always 0
 set g_balance_vortex_charge_animlimit 0.5
+set g_balance_vortex_charge_bow 1
+set g_balance_vortex_charge_bow_hold 4
+set g_balance_vortex_charge_bow_hold_releasedeath 0
 set g_balance_vortex_charge_limit 1
 set g_balance_vortex_charge_maxspeed 800
 set g_balance_vortex_charge_mindmg 40

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 319d77923035e150b23bf90fa1ca4321d5564e55..486e8865f6d7f1a1814f1258d85345a248e795d3 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -298,6 +298,9 @@ set g_balance_crylink_weaponthrowable 1
 set g_balance_vortex_charge 1
 set g_balance_vortex_charge_always 0
 set g_balance_vortex_charge_animlimit 0.5
+set g_balance_vortex_charge_bow 1
+set g_balance_vortex_charge_bow_hold 4
+set g_balance_vortex_charge_bow_hold_releasedeath 0
 set g_balance_vortex_charge_limit 1
 set g_balance_vortex_charge_maxspeed 800
 set g_balance_vortex_charge_mindmg 40

diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc
index 5c9ae23a1806d6b4b04801b61a16f8c8ea0c1534..ebc439cefa5d9b244b11677378aa696cc9a3c3bf 100644 (file)
--- a/qcsrc/common/weapons/weapon/vortex.qc
+++ b/qcsrc/common/weapons/weapon/vortex.qc
@@ -145,6 +145,8 @@ void W_Vortex_Attack(Weapon thiswep, entity actor, .entity weaponentity, float i
        SendCSQCVortexBeamParticle(charge);
 
        W_DecreaseAmmo(thiswep, actor, myammo, weaponentity);
+
+       weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_BOTH(vortex, !issecondary, animtime), w_ready);
 }
 
 .float vortex_chargepool_pauseregen_finished;
@@ -155,6 +157,101 @@ void W_Vortex_Charge(entity actor, .entity weaponentity, float dt)
                actor.(weaponentity).vortex_charge = min(1, actor.(weaponentity).vortex_charge + WEP_CVAR(vortex, charge_rate) * dt);
 }
 
+.float hagar_loadstep, hagar_loadbeep, hagar_warning;
+.float hagar_loadblock; // fire press checker, not original use
+void W_Vortex_Charge_Bow(Weapon thiswep, entity actor, .entity weaponentity)
+{
+       // loadable vortex attack, must always run each frame
+       if(time < game_starttime || time < actor.race_penalty || timeout_status == TIMEOUT_ACTIVE)
+               return;
+       if (weaponUseForbidden(actor))
+               return;
+
+       bool loaded = actor.(weaponentity).vortex_charge == WEP_CVAR(vortex, charge_limit);
+
+       if(PHYS_INPUT_BUTTON_ATCK(actor) && (actor.(weaponentity).state == WS_READY || actor.(weaponentity).state == WS_INUSE)) 
+       {
+               actor.(weaponentity).hagar_loadblock = true;
+
+               // check if we can attempt to charge more
+               if(!loaded)
+               {
+                       W_Vortex_Charge(actor, weaponentity, frametime / W_TICSPERFRAME);
+                       actor.(weaponentity).state = WS_INUSE;
+                       sound(actor, CH_WEAPON_B, SND_HAGAR_LOAD, VOL_BASE * 0.8, ATTN_NORM); // sound is too loud according to most
+
+                       if(actor.(weaponentity).vortex_charge >= WEP_CVAR(vortex, charge_limit)){
+                               loaded = true;
+                               actor.(weaponentity).vortex_charge = WEP_CVAR(vortex, charge_limit); //no overcharge
+                       }
+               }
+               if(loaded && !actor.(weaponentity).hagar_loadbeep) // prevents the beep from playing each frame
+               {
+                       // if this is the last rocket we can load, play a beep sound to notify the player
+                       sound(actor, CH_WEAPON_A, SND_HAGAR_BEEP, VOL_BASE, ATTN_NORM);
+                       actor.(weaponentity).hagar_loadbeep = true;
+                       actor.(weaponentity).hagar_loadstep = time + WEP_CVAR(vortex, charge_bow_hold) * W_WeaponRateFactor(actor);
+               }
+       }
+
+       if(actor.(weaponentity).vortex_charge && actor.(weaponentity).hagar_loadblock == true)
+       {
+               // play warning sound if we're about to release
+               if(!actor.(weaponentity).hagar_warning) // prevents the beep from playing each frame
+               {
+                       if(loaded && actor.(weaponentity).hagar_loadstep - 0.5 < time && WEP_CVAR(vortex, charge_bow_hold) >= 0)
+                       {
+                               // we're about to automatically release after holding time, play a beep sound to notify the player
+                               sound(actor, CH_WEAPON_A, SND_HAGAR_BEEP, VOL_BASE, ATTN_NORM);
+                               actor.(weaponentity).hagar_warning = true;
+                       }
+               }
+
+               // release if player let go of button or if they've held it in too long
+               if(!PHYS_INPUT_BUTTON_ATCK(actor) || (loaded && actor.(weaponentity).hagar_loadstep < time && WEP_CVAR(vortex, charge_bow_hold) >= 0))
+               {
+                       actor.(weaponentity).state = WS_READY;
+                       if(thiswep.wr_checkammo1(thiswep, actor, weaponentity)){
+                               if(weapon_prepareattack(thiswep, actor, weaponentity, false, WEP_CVAR_PRI(vortex, refire))){
+                                       W_Vortex_Attack(thiswep, actor, weaponentity, 0);
+                               }
+                       }
+               }
+       }
+       else
+       {
+               actor.(weaponentity).hagar_loadbeep = false;
+               actor.(weaponentity).hagar_warning = false;
+               actor.(weaponentity).hagar_loadblock = false;
+
+               // we aren't checking ammo during an attack, so we must do it here
+               if(!(thiswep.wr_checkammo1(thiswep, actor, weaponentity) + thiswep.wr_checkammo2(thiswep, actor, weaponentity)))
+               if(!(actor.items & IT_UNLIMITED_AMMO))
+               {
+                       // note: this doesn't force the switch
+                       W_SwitchToOtherWeapon(actor, weaponentity);
+                       return;
+               }
+       }
+}
+
+METHOD(Vortex, wr_gonethink, void(entity thiswep, entity actor, .entity weaponentity))
+{
+       // we lost the weapon and want to prepare switching away
+       if(actor.(weaponentity).hagar_load)
+       {
+               actor.(weaponentity).state = WS_READY;
+               W_Vortex_Attack(thiswep, actor, weaponentity, 0);
+       }
+}
+METHOD(Vortex, wr_playerdeath, void(entity thiswep, entity actor, .entity weaponentity))
+{
+       // if we have charge loaded when we die, release it
+       if(actor.(weaponentity).hagar_load && WEP_CVAR(vortex, charge_bow_hold_releasedeath))
+               if(thiswep.wr_checkammo1(thiswep, actor, weaponentity))
+                       W_Vortex_Attack(thiswep, actor, weaponentity, 0);
+}
+
 METHOD(Vortex, wr_aim, void(entity thiswep, entity actor, .entity weaponentity))
 {
        if(bot_aim(actor, weaponentity, 1000000, 0, 1, false, true))
@@ -162,102 +259,113 @@ METHOD(Vortex, wr_aim, void(entity thiswep, entity actor, .entity weaponentity))
 }
 METHOD(Vortex, wr_think, void(entity thiswep, entity actor, .entity weaponentity, int fire))
 {
+       if(autocvar_g_balance_vortex_reload_ammo && actor.(weaponentity).clip_load < min(WEP_CVAR_PRI(vortex, ammo), WEP_CVAR_SEC(vortex, ammo)))
+       { // forced reload
+               thiswep.wr_reload(thiswep, actor, weaponentity);
+
+               if(WEP_CVAR(vortex, charge_bow))
+                       actor.(weaponentity).vortex_charge = 0;
+
+               return; // if we need to reload cancel all charging and firing
+       }
+
+       if(WEP_CVAR(vortex, charge_bow))
+       {
+               W_Vortex_Charge_Bow(thiswep, actor, weaponentity);
+               return; // this charging mode overrides normal charging and firing
+       }
+
        if(!WEP_CVAR(vortex, charge_always))
                W_Vortex_Charge(actor, weaponentity, frametime / W_TICSPERFRAME);
 
        if(WEP_CVAR_SEC(vortex, chargepool))
+       {
                if(actor.(weaponentity).vortex_chargepool_ammo < 1)
                {
                        if(actor.vortex_chargepool_pauseregen_finished < time)
                                actor.(weaponentity).vortex_chargepool_ammo = min(1, actor.(weaponentity).vortex_chargepool_ammo + WEP_CVAR_SEC(vortex, chargepool_regen) * frametime / W_TICSPERFRAME);
                        actor.pauseregen_finished = max(actor.pauseregen_finished, time + WEP_CVAR_SEC(vortex, chargepool_pause_regen));
                }
+       }
 
-       if(autocvar_g_balance_vortex_reload_ammo && actor.(weaponentity).clip_load < min(WEP_CVAR_PRI(vortex, ammo), WEP_CVAR_SEC(vortex, ammo))) { // forced reload
-               thiswep.wr_reload(thiswep, actor, weaponentity);
-       } else
+       if(fire & 1)
        {
-               if(fire & 1)
+               if(weapon_prepareattack(thiswep, actor, weaponentity, false, WEP_CVAR_PRI(vortex, refire)))
                {
-                       if(weapon_prepareattack(thiswep, actor, weaponentity, false, WEP_CVAR_PRI(vortex, refire)))
-                       {
-                               W_Vortex_Attack(thiswep, actor, weaponentity, 0);
-                               weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_PRI(vortex, animtime), w_ready);
-                       }
+                       W_Vortex_Attack(thiswep, actor, weaponentity, 0);
                }
-               if((WEP_CVAR(vortex, charge) && !WEP_CVAR(vortex, secondary)) ? (PHYS_INPUT_BUTTON_ZOOM(actor) | PHYS_INPUT_BUTTON_ZOOMSCRIPT(actor)) : (fire & 2))
+       }
+       if((WEP_CVAR(vortex, charge) && !WEP_CVAR(vortex, secondary)) ? (PHYS_INPUT_BUTTON_ZOOM(actor) | PHYS_INPUT_BUTTON_ZOOMSCRIPT(actor)) : (fire & 2))
+       {
+               if(WEP_CVAR(vortex, charge))
                {
-                       if(WEP_CVAR(vortex, charge))
-                       {
-                               actor.(weaponentity).vortex_charge_rottime = time + WEP_CVAR(vortex, charge_rot_pause);
-                               float dt = frametime / W_TICSPERFRAME;
+                       actor.(weaponentity).vortex_charge_rottime = time + WEP_CVAR(vortex, charge_rot_pause);
+                       float dt = frametime / W_TICSPERFRAME;
 
-                               if(actor.(weaponentity).vortex_charge < 1)
+                       if(actor.(weaponentity).vortex_charge < 1)
+                       {
+                               if(WEP_CVAR_SEC(vortex, chargepool))
                                {
-                                       if(WEP_CVAR_SEC(vortex, chargepool))
+                                       if(WEP_CVAR_SEC(vortex, ammo))
                                        {
-                                               if(WEP_CVAR_SEC(vortex, ammo))
-                                               {
-                                                       // always deplete if secondary is held
-                                                       actor.(weaponentity).vortex_chargepool_ammo = max(0, actor.(weaponentity).vortex_chargepool_ammo - WEP_CVAR_SEC(vortex, ammo) * dt);
+                                               // always deplete if secondary is held
+                                               actor.(weaponentity).vortex_chargepool_ammo = max(0, actor.(weaponentity).vortex_chargepool_ammo - WEP_CVAR_SEC(vortex, ammo) * dt);
 
-                                                       dt = min(dt, (1 - actor.(weaponentity).vortex_charge) / WEP_CVAR(vortex, charge_rate));
-                                                       actor.vortex_chargepool_pauseregen_finished = time + WEP_CVAR_SEC(vortex, chargepool_pause_regen);
-                                                       dt = min(dt, actor.(weaponentity).vortex_chargepool_ammo);
-                                                       dt = max(0, dt);
+                                               dt = min(dt, (1 - actor.(weaponentity).vortex_charge) / WEP_CVAR(vortex, charge_rate));
+                                               actor.vortex_chargepool_pauseregen_finished = time + WEP_CVAR_SEC(vortex, chargepool_pause_regen);
+                                               dt = min(dt, actor.(weaponentity).vortex_chargepool_ammo);
+                                               dt = max(0, dt);
 
-                                                       actor.(weaponentity).vortex_charge += dt * WEP_CVAR(vortex, charge_rate);
-                                               }
+                                               actor.(weaponentity).vortex_charge += dt * WEP_CVAR(vortex, charge_rate);
                                        }
+                               }
 
-                                       else if(WEP_CVAR_SEC(vortex, ammo))
+                               else if(WEP_CVAR_SEC(vortex, ammo))
+                               {
+                                       if(fire & 2) // only eat ammo when the button is pressed
                                        {
-                                               if(fire & 2) // only eat ammo when the button is pressed
+                                               dt = min(dt, (1 - actor.(weaponentity).vortex_charge) / WEP_CVAR(vortex, charge_rate));
+                                               if(!(actor.items & IT_UNLIMITED_AMMO))
                                                {
-                                                       dt = min(dt, (1 - actor.(weaponentity).vortex_charge) / WEP_CVAR(vortex, charge_rate));
-                                                       if(!(actor.items & IT_UNLIMITED_AMMO))
+                                                       // if this weapon is reloadable, decrease its load. Else decrease the player's ammo
+                                                       if(autocvar_g_balance_vortex_reload_ammo)
                                                        {
-                                                               // if this weapon is reloadable, decrease its load. Else decrease the player's ammo
-                                                               if(autocvar_g_balance_vortex_reload_ammo)
+                                                               dt = min(dt, (actor.(weaponentity).clip_load - WEP_CVAR_PRI(vortex, ammo)) / WEP_CVAR_SEC(vortex, ammo));
+                                                               dt = max(0, dt);
+                                                               if(dt > 0)
                                                                {
-                                                                       dt = min(dt, (actor.(weaponentity).clip_load - WEP_CVAR_PRI(vortex, ammo)) / WEP_CVAR_SEC(vortex, ammo));
-                                                                       dt = max(0, dt);
-                                                                       if(dt > 0)
-                                                                       {
-                                                                               actor.(weaponentity).clip_load = max(WEP_CVAR_SEC(vortex, ammo), actor.(weaponentity).clip_load - WEP_CVAR_SEC(vortex, ammo) * dt);
-                                                                       }
-                                                                       actor.(weaponentity).(weapon_load[thiswep.m_id]) = actor.(weaponentity).clip_load;
+                                                                       actor.(weaponentity).clip_load = max(WEP_CVAR_SEC(vortex, ammo), actor.(weaponentity).clip_load - WEP_CVAR_SEC(vortex, ammo) * dt);
                                                                }
-                                                               else
+                                                               actor.(weaponentity).(weapon_load[thiswep.m_id]) = actor.(weaponentity).clip_load;
+                                                       }
+                                                       else
+                                                       {
+                                                               dt = min(dt, (GetResource(actor, thiswep.ammo_type) - WEP_CVAR_PRI(vortex, ammo)) / WEP_CVAR_SEC(vortex, ammo));
+                                                               dt = max(0, dt);
+                                                               if(dt > 0)
                                                                {
-                                                                       dt = min(dt, (GetResource(actor, thiswep.ammo_type) - WEP_CVAR_PRI(vortex, ammo)) / WEP_CVAR_SEC(vortex, ammo));
-                                                                       dt = max(0, dt);
-                                                                       if(dt > 0)
-                                                                       {
-                                                                               SetResource(actor, thiswep.ammo_type, max(WEP_CVAR_SEC(vortex, ammo), GetResource(actor, thiswep.ammo_type) - WEP_CVAR_SEC(vortex, ammo) * dt));
-                                                                       }
+                                                                       SetResource(actor, thiswep.ammo_type, max(WEP_CVAR_SEC(vortex, ammo), GetResource(actor, thiswep.ammo_type) - WEP_CVAR_SEC(vortex, ammo) * dt));
                                                                }
                                                        }
-                                                       actor.(weaponentity).vortex_charge += dt * WEP_CVAR(vortex, charge_rate);
                                                }
-                                       }
-
-                                       else
-                                       {
-                                               dt = min(dt, (1 - actor.(weaponentity).vortex_charge) / WEP_CVAR(vortex, charge_rate));
                                                actor.(weaponentity).vortex_charge += dt * WEP_CVAR(vortex, charge_rate);
                                        }
                                }
-                       }
-                       else if(WEP_CVAR(vortex, secondary))
-                       {
-                               if(weapon_prepareattack(thiswep, actor, weaponentity, false, WEP_CVAR_SEC(vortex, refire)))
+
+                               else
                                {
-                                       W_Vortex_Attack(thiswep, actor, weaponentity, 1);
-                                       weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_SEC(vortex, animtime), w_ready);
+                                       dt = min(dt, (1 - actor.(weaponentity).vortex_charge) / WEP_CVAR(vortex, charge_rate));
+                                       actor.(weaponentity).vortex_charge += dt * WEP_CVAR(vortex, charge_rate);
                                }
                        }
                }
+               else if(WEP_CVAR(vortex, secondary))
+               {
+                       if(weapon_prepareattack(thiswep, actor, weaponentity, false, WEP_CVAR_SEC(vortex, refire)))
+                       {
+                               W_Vortex_Attack(thiswep, actor, weaponentity, 1);
+                       }
+               }
        }
 }
 METHOD(Vortex, wr_setup, void(entity thiswep, entity actor, .entity weaponentity))

diff --git a/qcsrc/common/weapons/weapon/vortex.qh b/qcsrc/common/weapons/weapon/vortex.qh
index babbfe51bb0f25a8a0777ce78cbfc3da08470ce7..c964251893cf80a64396356de508dbf8955eac3e 100644 (file)
--- a/qcsrc/common/weapons/weapon/vortex.qh
+++ b/qcsrc/common/weapons/weapon/vortex.qh
@@ -31,6 +31,9 @@ CLASS(Vortex, Weapon)
                P(class, prefix, charge, float, NONE) \
                P(class, prefix, charge_always, float, NONE) \
                P(class, prefix, charge_animlimit, float, NONE) \
+               P(class, prefix, charge_bow, float, NONE) \
+               P(class, prefix, charge_bow_hold, float, NONE) \
+               P(class, prefix, charge_bow_hold_releasedeath, float, NONE) \
                P(class, prefix, charge_limit, float, NONE) \
                P(class, prefix, charge_maxspeed, float, NONE) \
                P(class, prefix, charge_mindmg, float, NONE) \

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 58fda9a016cdc2b42cd0c5ef8622f9c28d699cae..3d5767fd0b9a25fda79b1438eb49b88100e6d933 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -2173,7 +2173,7 @@ bool PlayerThink(entity this)
                for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
                {
                        .entity weaponentity = weaponentities[slot];
-                       if(WEP_CVAR(vortex, charge_always))
+                       if(WEP_CVAR(vortex, charge_always) && !WEP_CVAR(vortex, charge_bow))
                                W_Vortex_Charge(this, weaponentity, frametime);
                        W_WeaponFrame(this, weaponentity);
                }