OK weapons: Removed unused stuff from shotgun and machinegun.

diff --git a/bal-wep-overkill-nerfed.cfg b/bal-wep-overkill-nerfed.cfg
index 49d994852e247ac4053f0a9f2d0d384977dbf231..da0689e185e3e8def201645a3e5ed853a8982aca 100644 (file)
--- a/bal-wep-overkill-nerfed.cfg
+++ b/bal-wep-overkill-nerfed.cfg
@@ -13,7 +13,6 @@ set g_balance_okshotgun_primary_solidpenetration 3.8
 set g_balance_okshotgun_primary_spread 0.12
 set g_balance_okshotgun_reload_ammo 0
 set g_balance_okshotgun_reload_time 2
 set g_balance_okshotgun_primary_spread 0.12
 set g_balance_okshotgun_reload_ammo 0
 set g_balance_okshotgun_reload_time 2

-set g_balance_okshotgun_secondary_ammo 0

 set g_balance_okshotgun_secondary_animtime 0.2
 set g_balance_okshotgun_secondary_damage 20
 set g_balance_okshotgun_secondary_delay 0
 set g_balance_okshotgun_secondary_animtime 0.2
 set g_balance_okshotgun_secondary_damage 20
 set g_balance_okshotgun_secondary_delay 0


@@ -34,22 +33,16 @@ set g_balance_okshotgun_weaponstartoverride -1
 set g_balance_okshotgun_weaponthrowable 1
 // }}}
 // {{{ Overkill Machine Gun
 set g_balance_okshotgun_weaponthrowable 1
 // }}}
 // {{{ Overkill Machine Gun

-set g_balance_okmachinegun_burst 3
-set g_balance_okmachinegun_burst_ammo 3
-set g_balance_okmachinegun_burst_animtime 0.3
-set g_balance_okmachinegun_burst_refire 0.06
-set g_balance_okmachinegun_burst_refire2 0.45
-set g_balance_okmachinegun_burst_speed 0
-set g_balance_okmachinegun_first 1
-set g_balance_okmachinegun_first_ammo 1
-set g_balance_okmachinegun_first_damage 14
-set g_balance_okmachinegun_first_force 3
-set g_balance_okmachinegun_first_refire 0.125
-set g_balance_okmachinegun_first_spread 0.03
-set g_balance_okmachinegun_mode 1
+set g_balance_okmachinegun_primary_ammo 1
+set g_balance_okmachinegun_primary_damage 10
+set g_balance_okmachinegun_primary_force 3
+set g_balance_okmachinegun_primary_refire 0.1
+set g_balance_okmachinegun_primary_solidpenetration 13.1
+set g_balance_okmachinegun_primary_spread_add 0.012
+set g_balance_okmachinegun_primary_spread_max 0.05
+set g_balance_okmachinegun_primary_spread_min 0.02

 set g_balance_okmachinegun_reload_ammo 60
 set g_balance_okmachinegun_reload_time 2
 set g_balance_okmachinegun_reload_ammo 60
 set g_balance_okmachinegun_reload_time 2

-set g_balance_okmachinegun_secondary_ammo 0

 set g_balance_okmachinegun_secondary_animtime 0.2
 set g_balance_okmachinegun_secondary_damage 20
 set g_balance_okmachinegun_secondary_delay 0
 set g_balance_okmachinegun_secondary_animtime 0.2
 set g_balance_okmachinegun_secondary_damage 20
 set g_balance_okmachinegun_secondary_delay 0


@@ -62,15 +55,6 @@ set g_balance_okmachinegun_secondary_refire_type 0
 set g_balance_okmachinegun_secondary_shotangle 0
 set g_balance_okmachinegun_secondary_speed 6000
 set g_balance_okmachinegun_secondary_spread 0
 set g_balance_okmachinegun_secondary_shotangle 0
 set g_balance_okmachinegun_secondary_speed 6000
 set g_balance_okmachinegun_secondary_spread 0

-set g_balance_okmachinegun_solidpenetration 13.1
-set g_balance_okmachinegun_spread_add 0.012
-set g_balance_okmachinegun_spread_max 0.05
-set g_balance_okmachinegun_spread_min 0.02
-set g_balance_okmachinegun_sustained_ammo 1
-set g_balance_okmachinegun_sustained_damage 10
-set g_balance_okmachinegun_sustained_force 3
-set g_balance_okmachinegun_sustained_refire 0.1
-set g_balance_okmachinegun_sustained_spread 0.03

 set g_balance_okmachinegun_switchdelay_drop 0.2
 set g_balance_okmachinegun_switchdelay_raise 0.2
 set g_balance_okmachinegun_weaponreplace ""
 set g_balance_okmachinegun_switchdelay_drop 0.2
 set g_balance_okmachinegun_switchdelay_raise 0.2
 set g_balance_okmachinegun_weaponreplace ""

diff --git a/bal-wep-overkill.cfg b/bal-wep-overkill.cfg
index 67cc81523f1f1d7db4021952f921fdabae9f77ec..fcee3d5e81f1e30bda996ecf9cde6d39e2ac7b42 100644 (file)
--- a/bal-wep-overkill.cfg
+++ b/bal-wep-overkill.cfg
@@ -830,7 +830,6 @@ set g_balance_okshotgun_primary_solidpenetration 3.8
 set g_balance_okshotgun_primary_spread 0.07
 set g_balance_okshotgun_reload_ammo 24
 set g_balance_okshotgun_reload_time 2
 set g_balance_okshotgun_primary_spread 0.07
 set g_balance_okshotgun_reload_ammo 24
 set g_balance_okshotgun_reload_time 2

-set g_balance_okshotgun_secondary_ammo 0

 set g_balance_okshotgun_secondary_animtime 0.2
 set g_balance_okshotgun_secondary_damage 25
 set g_balance_okshotgun_secondary_delay 0
 set g_balance_okshotgun_secondary_animtime 0.2
 set g_balance_okshotgun_secondary_damage 25
 set g_balance_okshotgun_secondary_delay 0


@@ -851,22 +850,16 @@ set g_balance_okshotgun_weaponstartoverride -1
 set g_balance_okshotgun_weaponthrowable 1
 // }}}
 // {{{ Overkill Machine Gun
 set g_balance_okshotgun_weaponthrowable 1
 // }}}
 // {{{ Overkill Machine Gun

-set g_balance_okmachinegun_burst 3
-set g_balance_okmachinegun_burst_ammo 3
-set g_balance_okmachinegun_burst_animtime 0.3
-set g_balance_okmachinegun_burst_refire 0.06
-set g_balance_okmachinegun_burst_refire2 0.45
-set g_balance_okmachinegun_burst_speed 0
-set g_balance_okmachinegun_first 1
-set g_balance_okmachinegun_first_ammo 1
-set g_balance_okmachinegun_first_damage 14
-set g_balance_okmachinegun_first_force 5
-set g_balance_okmachinegun_first_refire 0.125
-set g_balance_okmachinegun_first_spread 0.03
-set g_balance_okmachinegun_mode 1
+set g_balance_okmachinegun_primary_ammo 1
+set g_balance_okmachinegun_primary_damage 25
+set g_balance_okmachinegun_primary_force 5
+set g_balance_okmachinegun_primary_refire 0.1
+set g_balance_okmachinegun_primary_solidpenetration 13.1
+set g_balance_okmachinegun_primary_spread_add 0.012
+set g_balance_okmachinegun_primary_spread_max 0.05
+set g_balance_okmachinegun_primary_spread_min 0

 set g_balance_okmachinegun_reload_ammo 30
 set g_balance_okmachinegun_reload_time 1.5
 set g_balance_okmachinegun_reload_ammo 30
 set g_balance_okmachinegun_reload_time 1.5

-set g_balance_okmachinegun_secondary_ammo 0

 set g_balance_okmachinegun_secondary_animtime 0.2
 set g_balance_okmachinegun_secondary_damage 25
 set g_balance_okmachinegun_secondary_delay 0
 set g_balance_okmachinegun_secondary_animtime 0.2
 set g_balance_okmachinegun_secondary_damage 25
 set g_balance_okmachinegun_secondary_delay 0


@@ -879,15 +872,6 @@ set g_balance_okmachinegun_secondary_refire_type 1
 set g_balance_okmachinegun_secondary_shotangle 0
 set g_balance_okmachinegun_secondary_speed 6000
 set g_balance_okmachinegun_secondary_spread 0
 set g_balance_okmachinegun_secondary_shotangle 0
 set g_balance_okmachinegun_secondary_speed 6000
 set g_balance_okmachinegun_secondary_spread 0

-set g_balance_okmachinegun_solidpenetration 13.1
-set g_balance_okmachinegun_spread_add 0.012
-set g_balance_okmachinegun_spread_max 0.05
-set g_balance_okmachinegun_spread_min 0
-set g_balance_okmachinegun_sustained_ammo 1
-set g_balance_okmachinegun_sustained_damage 25
-set g_balance_okmachinegun_sustained_force 5
-set g_balance_okmachinegun_sustained_refire 0.1
-set g_balance_okmachinegun_sustained_spread 0.01

 set g_balance_okmachinegun_switchdelay_drop 0.2
 set g_balance_okmachinegun_switchdelay_raise 0.2
 set g_balance_okmachinegun_weaponreplace ""
 set g_balance_okmachinegun_switchdelay_drop 0.2
 set g_balance_okmachinegun_switchdelay_raise 0.2
 set g_balance_okmachinegun_weaponreplace ""

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index aea4a1a5f87b7fb81b4761e251deb8759643de1d..0e9f45baf8c1d2cfef74feea04db4b2268a6b726 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -856,7 +856,6 @@ set g_balance_okshotgun_primary_solidpenetration 3.8
 set g_balance_okshotgun_primary_spread 0.07
 set g_balance_okshotgun_reload_ammo 24
 set g_balance_okshotgun_reload_time 2
 set g_balance_okshotgun_primary_spread 0.07
 set g_balance_okshotgun_reload_ammo 24
 set g_balance_okshotgun_reload_time 2

-set g_balance_okshotgun_secondary_ammo 0

 set g_balance_okshotgun_secondary_animtime 0.2
 set g_balance_okshotgun_secondary_damage 25
 set g_balance_okshotgun_secondary_delay 0
 set g_balance_okshotgun_secondary_animtime 0.2
 set g_balance_okshotgun_secondary_damage 25
 set g_balance_okshotgun_secondary_delay 0


@@ -877,22 +876,16 @@ set g_balance_okshotgun_weaponstartoverride -1
 set g_balance_okshotgun_weaponthrowable 1
 // }}}
 // {{{ Overkill Machine Gun
 set g_balance_okshotgun_weaponthrowable 1
 // }}}
 // {{{ Overkill Machine Gun

-set g_balance_okmachinegun_burst 3
-set g_balance_okmachinegun_burst_ammo 3
-set g_balance_okmachinegun_burst_animtime 0.3
-set g_balance_okmachinegun_burst_refire 0.06
-set g_balance_okmachinegun_burst_refire2 0.45
-set g_balance_okmachinegun_burst_speed 0
-set g_balance_okmachinegun_first 1
-set g_balance_okmachinegun_first_ammo 1
-set g_balance_okmachinegun_first_damage 14
-set g_balance_okmachinegun_first_force 5
-set g_balance_okmachinegun_first_refire 0.125
-set g_balance_okmachinegun_first_spread 0.03
-set g_balance_okmachinegun_mode 1
+set g_balance_okmachinegun_primary_ammo 1
+set g_balance_okmachinegun_primary_damage 25
+set g_balance_okmachinegun_primary_force 5
+set g_balance_okmachinegun_primary_refire 0.1
+set g_balance_okmachinegun_primary_solidpenetration 13.1
+set g_balance_okmachinegun_primary_spread_add 0.012
+set g_balance_okmachinegun_primary_spread_max 0.05
+set g_balance_okmachinegun_primary_spread_min 0

 set g_balance_okmachinegun_reload_ammo 30
 set g_balance_okmachinegun_reload_time 1.5
 set g_balance_okmachinegun_reload_ammo 30
 set g_balance_okmachinegun_reload_time 1.5

-set g_balance_okmachinegun_secondary_ammo 0

 set g_balance_okmachinegun_secondary_animtime 0.2
 set g_balance_okmachinegun_secondary_damage 25
 set g_balance_okmachinegun_secondary_delay 0
 set g_balance_okmachinegun_secondary_animtime 0.2
 set g_balance_okmachinegun_secondary_damage 25
 set g_balance_okmachinegun_secondary_delay 0


@@ -905,15 +898,6 @@ set g_balance_okmachinegun_secondary_refire_type 1
 set g_balance_okmachinegun_secondary_shotangle 0
 set g_balance_okmachinegun_secondary_speed 6000
 set g_balance_okmachinegun_secondary_spread 0
 set g_balance_okmachinegun_secondary_shotangle 0
 set g_balance_okmachinegun_secondary_speed 6000
 set g_balance_okmachinegun_secondary_spread 0

-set g_balance_okmachinegun_solidpenetration 13.1
-set g_balance_okmachinegun_spread_add 0.012
-set g_balance_okmachinegun_spread_max 0.05
-set g_balance_okmachinegun_spread_min 0
-set g_balance_okmachinegun_sustained_ammo 1
-set g_balance_okmachinegun_sustained_damage 25
-set g_balance_okmachinegun_sustained_force 5
-set g_balance_okmachinegun_sustained_refire 0.1
-set g_balance_okmachinegun_sustained_spread 0.01

 set g_balance_okmachinegun_switchdelay_drop 0.2
 set g_balance_okmachinegun_switchdelay_raise 0.2
 set g_balance_okmachinegun_weaponreplace ""
 set g_balance_okmachinegun_switchdelay_drop 0.2
 set g_balance_okmachinegun_switchdelay_raise 0.2
 set g_balance_okmachinegun_weaponreplace ""

diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
index d874304432182434b9be139c905ea9a8ae2865f1..d2ed859f98cd380d6069417cf4acf1d0e56f8487 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
+++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
@@ -13,66 +13,6 @@ spawnfunc(weapon_okmachinegun)
        weapon_defaultspawnfunc(this, WEP_OVERKILL_MACHINEGUN);
 }
 
        weapon_defaultspawnfunc(this, WEP_OVERKILL_MACHINEGUN);
 }
 

-void W_OverkillMachineGun_Attack(Weapon thiswep, int deathtype, entity actor, .entity weaponentity)
-{
-       W_SetupShot(actor, weaponentity, true, 0, SND_UZI_FIRE, CH_WEAPON_A, ((actor.(weaponentity).misc_bulletcounter == 1) ? WEP_CVAR(okmachinegun, first_damage) : WEP_CVAR(okmachinegun, sustained_damage)));
-       if(!autocvar_g_norecoil)
-       {
-               actor.punchangle_x = random() - 0.5;
-               actor.punchangle_y = random() - 0.5;
-       }
-       int slot = weaponslot(weaponentity);
-       // this attack_finished just enforces a cooldown at the end of a burst
-       ATTACK_FINISHED(actor, slot) = time + WEP_CVAR(okmachinegun, first_refire) * W_WeaponRateFactor(actor);
-
-       if(actor.(weaponentity).misc_bulletcounter == 1)
-               fireBullet(actor, weaponentity, w_shotorg, w_shotdir, WEP_CVAR(okmachinegun, first_spread), WEP_CVAR(okmachinegun, solidpenetration), WEP_CVAR(okmachinegun, first_damage), WEP_CVAR(okmachinegun, first_force), deathtype, 0);
-       else
-               fireBullet(actor, weaponentity, w_shotorg, w_shotdir, WEP_CVAR(okmachinegun, sustained_spread), WEP_CVAR(okmachinegun, solidpenetration), WEP_CVAR(okmachinegun, sustained_damage), WEP_CVAR(okmachinegun, sustained_force), deathtype, 0);
-
-       Send_Effect(EFFECT_MACHINEGUN_MUZZLEFLASH, w_shotorg, w_shotdir * 1000, 1);
-
-       W_MachineGun_MuzzleFlash(actor, weaponentity);
-       W_AttachToShotorg(actor, weaponentity, actor.(weaponentity).muzzle_flash, '5 0 0');
-
-       // casing code
-       if(autocvar_g_casings >= 2)
-       {
-               makevectors(actor.v_angle); // for some reason, this is lost
-               SpawnCasing(((random() * 50 + 50) * v_right) - (v_forward * (random() * 25 + 25)) - ((random() * 5 - 70) * v_up), 2, vectoangles(v_forward),'0 250 0', 100, 3, actor, weaponentity);
-       }
-
-       if(actor.(weaponentity).misc_bulletcounter == 1)
-               W_DecreaseAmmo(thiswep, actor, WEP_CVAR(okmachinegun, first_ammo), weaponentity);
-       else
-               W_DecreaseAmmo(thiswep, actor, WEP_CVAR(okmachinegun, sustained_ammo), weaponentity);
-}
-
-// weapon frames
-void W_OverkillMachineGun_Attack_Frame(Weapon thiswep, entity actor, .entity weaponentity, int fire)
-{
-       if(actor.(weaponentity).m_weapon != actor.(weaponentity).m_switchweapon) // abort immediately if switching
-       {
-               w_ready(thiswep, actor, weaponentity, fire);
-               return;
-       }
-       if(PHYS_INPUT_BUTTON_ATCK(actor))
-       {
-               if(!thiswep.wr_checkammo2(thiswep, actor, weaponentity))
-               if(!(actor.items & IT_UNLIMITED_WEAPON_AMMO))
-               {
-                       W_SwitchWeapon_Force(actor, w_getbestweapon(actor, weaponentity), weaponentity);
-                       w_ready(thiswep, actor, weaponentity, fire);
-                       return;
-               }
-               actor.(weaponentity).misc_bulletcounter = actor.(weaponentity).misc_bulletcounter + 1;
-               W_OverkillMachineGun_Attack(WEP_OVERKILL_MACHINEGUN, WEP_OVERKILL_MACHINEGUN.m_id, actor, weaponentity);
-               weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR(okmachinegun, sustained_refire), W_OverkillMachineGun_Attack_Frame);
-       }
-       else
-               weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR(okmachinegun, sustained_refire), w_ready);
-}
-

 void W_OverkillMachineGun_Attack_Auto(Weapon thiswep, entity actor, .entity weaponentity, int fire)
 {
        float okmachinegun_spread;
 void W_OverkillMachineGun_Attack_Auto(Weapon thiswep, entity actor, .entity weaponentity, int fire)
 {
        float okmachinegun_spread;


@@ -91,17 +31,17 @@ void W_OverkillMachineGun_Attack_Auto(Weapon thiswep, entity actor, .entity weap
                return;
        }
 
                return;
        }
 

-       W_DecreaseAmmo(WEP_OVERKILL_MACHINEGUN, actor, WEP_CVAR(okmachinegun, sustained_ammo), weaponentity);
+       W_DecreaseAmmo(WEP_OVERKILL_MACHINEGUN, actor, WEP_CVAR_PRI(okmachinegun, ammo), weaponentity);

 
 

-       W_SetupShot(actor, weaponentity, true, 0, SND_UZI_FIRE, CH_WEAPON_A, WEP_CVAR(okmachinegun, sustained_damage));
+       W_SetupShot(actor, weaponentity, true, 0, SND_UZI_FIRE, CH_WEAPON_A, WEP_CVAR_PRI(okmachinegun, damage));

        if(!autocvar_g_norecoil)
        {
                actor.punchangle_x = random() - 0.5;
                actor.punchangle_y = random() - 0.5;
        }
 
        if(!autocvar_g_norecoil)
        {
                actor.punchangle_x = random() - 0.5;
                actor.punchangle_y = random() - 0.5;
        }
 

-       okmachinegun_spread = bound(WEP_CVAR(okmachinegun, spread_min), WEP_CVAR(okmachinegun, spread_min) + (WEP_CVAR(okmachinegun, spread_add) * actor.(weaponentity).misc_bulletcounter), WEP_CVAR(okmachinegun, spread_max));
-       fireBullet(actor, weaponentity, w_shotorg, w_shotdir, okmachinegun_spread, WEP_CVAR(okmachinegun, solidpenetration), WEP_CVAR(okmachinegun, sustained_damage), WEP_CVAR(okmachinegun, sustained_force), WEP_OVERKILL_MACHINEGUN.m_id, 0);
+       okmachinegun_spread = bound(WEP_CVAR_PRI(okmachinegun, spread_min), WEP_CVAR_PRI(okmachinegun, spread_min) + (WEP_CVAR_PRI(okmachinegun, spread_add) * actor.(weaponentity).misc_bulletcounter), WEP_CVAR_PRI(okmachinegun, spread_max));
+       fireBullet(actor, weaponentity, w_shotorg, w_shotdir, okmachinegun_spread, WEP_CVAR_PRI(okmachinegun, solidpenetration), WEP_CVAR_PRI(okmachinegun, damage), WEP_CVAR_PRI(okmachinegun, force), WEP_OVERKILL_MACHINEGUN.m_id, 0);

 
        actor.(weaponentity).misc_bulletcounter = actor.(weaponentity).misc_bulletcounter + 1;
 
 
        actor.(weaponentity).misc_bulletcounter = actor.(weaponentity).misc_bulletcounter + 1;
 


@@ -117,8 +57,8 @@ void W_OverkillMachineGun_Attack_Auto(Weapon thiswep, entity actor, .entity weap
        }
 
        int slot = weaponslot(weaponentity);
        }
 
        int slot = weaponslot(weaponentity);

-       ATTACK_FINISHED(actor, slot) = time + WEP_CVAR(okmachinegun, first_refire) * W_WeaponRateFactor(actor);
-       weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR(okmachinegun, sustained_refire), W_OverkillMachineGun_Attack_Auto);
+       ATTACK_FINISHED(actor, slot) = time + WEP_CVAR_PRI(okmachinegun, refire) * W_WeaponRateFactor(actor);
+       weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_PRI(okmachinegun, refire), W_OverkillMachineGun_Attack_Auto);

 }
 
 METHOD(OverkillMachineGun, wr_aim, void(entity thiswep, entity actor, .entity weaponentity))
 }
 
 METHOD(OverkillMachineGun, wr_aim, void(entity thiswep, entity actor, .entity weaponentity))


@@ -171,148 +111,70 @@ METHOD(OverkillMachineGun, wr_think, void(entity thiswep, entity actor, .entity
                        animdecide_setaction(actor, ANIMACTION_SHOOT, true);
                }
        }
                        animdecide_setaction(actor, ANIMACTION_SHOOT, true);
                }
        }

-       if (WEP_CVAR(okmachinegun, reload_ammo) && actor.(weaponentity).clip_load < min(max(WEP_CVAR(okmachinegun, sustained_ammo), WEP_CVAR(okmachinegun, first_ammo)), WEP_CVAR(okmachinegun, burst_ammo)))
+       if (WEP_CVAR(okmachinegun, reload_ammo) && actor.(weaponentity).clip_load < WEP_CVAR_PRI(okmachinegun, ammo))

        {
                // Forced reload
                thiswep.wr_reload(thiswep, actor, weaponentity);
                return;
        }
        {
                // Forced reload
                thiswep.wr_reload(thiswep, actor, weaponentity);
                return;
        }

-       if (WEP_CVAR(okmachinegun, mode) == 1)
+       if (fire & 1) // Primary attack

        {
        {

-               if(fire & 1) // Primary attack
+               if (!weapon_prepareattack(thiswep, actor, weaponentity, false, 0))

                {
                {

-                       if (!weapon_prepareattack(thiswep, actor, weaponentity, false, 0))
-                       {
-                               return;
-                       }
-                       actor.(weaponentity).misc_bulletcounter = 0;
-                       W_OverkillMachineGun_Attack_Auto(thiswep, actor, weaponentity, fire);

                        return;
                }
                        return;
                }

-               if ((fire & 2) && (WEP_CVAR_SEC(okmachinegun, refire_type) == 0)) // Secondary attack
-               {
-                       if (!weapon_prepareattack(thiswep, actor, weaponentity, true, WEP_CVAR_SEC(okmachinegun, refire)))
-                       {
-                               return;
-                       }
-                       // ugly instagib hack to reuse the fire mode of the laser
-                       makevectors(actor.v_angle);
-                       Weapon oldwep = actor.(weaponentity).m_weapon; // we can't avoid this hack
-                       actor.(weaponentity).m_weapon = WEP_BLASTER;
-                       W_Blaster_Attack(
-                               actor,
-                               weaponentity,
-                               WEP_BLASTER.m_id | HITTYPE_SECONDARY,
-                               WEP_CVAR_SEC(okmachinegun, shotangle),
-                               WEP_CVAR_SEC(okmachinegun, damage),
-                               WEP_CVAR_SEC(okmachinegun, edgedamage),
-                               WEP_CVAR_SEC(okmachinegun, radius),
-                               WEP_CVAR_SEC(okmachinegun, force),
-                               WEP_CVAR_SEC(okmachinegun, speed),
-                               WEP_CVAR_SEC(okmachinegun, spread),
-                               WEP_CVAR_SEC(okmachinegun, delay),
-                               WEP_CVAR_SEC(okmachinegun, lifetime)
-                       );
-                       actor.(weaponentity).m_weapon = oldwep;
-                       weapon_thinkf(actor, weaponentity, WFRAME_FIRE2, WEP_CVAR_SEC(okmachinegun, animtime), w_ready);
-               }
+               actor.(weaponentity).misc_bulletcounter = 0;
+               W_OverkillMachineGun_Attack_Auto(thiswep, actor, weaponentity, fire);
+               return;

        }
        }

-       else
+       if ((fire & 2) && (WEP_CVAR_SEC(okmachinegun, refire_type) == 0)) // Secondary attack

        {
        {

-               if (fire & 1) // Primary attack
+               if (!weapon_prepareattack(thiswep, actor, weaponentity, true, WEP_CVAR_SEC(okmachinegun, refire)))

                {
                {

-                       if (!weapon_prepareattack(thiswep, actor, weaponentity, false, 0))
-                       {
-                               return;
-                       }
-                       actor.(weaponentity).misc_bulletcounter = 1;
-                       W_OverkillMachineGun_Attack(WEP_OVERKILL_MACHINEGUN, WEP_OVERKILL_MACHINEGUN.m_id, actor, weaponentity); // sets attack_finished
-                       weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR(okmachinegun, sustained_refire), W_OverkillMachineGun_Attack_Frame);

                        return;
                }
                        return;
                }

-               if ((fire & 2) && (WEP_CVAR_SEC(okmachinegun, refire_type) == 0)) // Secondary attack
-               {
-                       if (!weapon_prepareattack(thiswep, actor, weaponentity, true, WEP_CVAR_SEC(okmachinegun, refire)))
-                       {
-                               return;
-                       }
-                       // ugly instagib hack to reuse the fire mode of the laser
-                       makevectors(actor.v_angle);
-                       Weapon oldwep = actor.(weaponentity).m_weapon; // we can't avoid this hack
-                       actor.(weaponentity).m_weapon = WEP_BLASTER;
-                       W_Blaster_Attack(
-                               actor,
-                               weaponentity,
-                               WEP_BLASTER.m_id | HITTYPE_SECONDARY,
-                               WEP_CVAR_SEC(okmachinegun, shotangle),
-                               WEP_CVAR_SEC(okmachinegun, damage),
-                               WEP_CVAR_SEC(okmachinegun, edgedamage),
-                               WEP_CVAR_SEC(okmachinegun, radius),
-                               WEP_CVAR_SEC(okmachinegun, force),
-                               WEP_CVAR_SEC(okmachinegun, speed),
-                               WEP_CVAR_SEC(okmachinegun, spread),
-                               WEP_CVAR_SEC(okmachinegun, delay),
-                               WEP_CVAR_SEC(okmachinegun, lifetime)
-                       );
-                       actor.(weaponentity).m_weapon = oldwep;
-                       weapon_thinkf(actor, weaponentity, WFRAME_FIRE2, WEP_CVAR_SEC(okmachinegun, animtime), w_ready);
-               }
+               // Ugly hack to reuse the fire mode of the blaster.
+               makevectors(actor.v_angle);
+               Weapon oldwep = actor.(weaponentity).m_weapon; // we can't avoid this hack
+               actor.(weaponentity).m_weapon = WEP_BLASTER;
+               W_Blaster_Attack(
+                       actor,
+                       weaponentity,
+                       WEP_BLASTER.m_id | HITTYPE_SECONDARY,
+                       WEP_CVAR_SEC(okmachinegun, shotangle),
+                       WEP_CVAR_SEC(okmachinegun, damage),
+                       WEP_CVAR_SEC(okmachinegun, edgedamage),
+                       WEP_CVAR_SEC(okmachinegun, radius),
+                       WEP_CVAR_SEC(okmachinegun, force),
+                       WEP_CVAR_SEC(okmachinegun, speed),
+                       WEP_CVAR_SEC(okmachinegun, spread),
+                       WEP_CVAR_SEC(okmachinegun, delay),
+                       WEP_CVAR_SEC(okmachinegun, lifetime)
+               );
+               actor.(weaponentity).m_weapon = oldwep;
+               weapon_thinkf(actor, weaponentity, WFRAME_FIRE2, WEP_CVAR_SEC(okmachinegun, animtime), w_ready);

        }
 }
 
 METHOD(OverkillMachineGun, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity))
 {
        float ammo_amount;
        }
 }
 
 METHOD(OverkillMachineGun, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity))
 {
        float ammo_amount;

-       if (WEP_CVAR(okmachinegun, mode) == 1)
-       {
-               ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(okmachinegun, sustained_ammo);
-       }
-       else
-       {
-               ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(okmachinegun, first_ammo);
-       }
+       ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(okmachinegun, ammo);

        if (WEP_CVAR(okmachinegun, reload_ammo))
        {
        if (WEP_CVAR(okmachinegun, reload_ammo))
        {

-               if (WEP_CVAR(okmachinegun, mode) == 1)
-               {
-                       ammo_amount += actor.(weaponentity).(weapon_load[WEP_OVERKILL_MACHINEGUN.m_id]) >= WEP_CVAR(okmachinegun, sustained_ammo);
-               }
-               else
-               {
-                       ammo_amount += actor.(weaponentity).(weapon_load[WEP_OVERKILL_MACHINEGUN.m_id]) >= WEP_CVAR(okmachinegun, first_ammo);
-               }
+               ammo_amount += actor.(weaponentity).(weapon_load[WEP_OVERKILL_MACHINEGUN.m_id]) >= WEP_CVAR_PRI(okmachinegun, ammo);

        }
        return ammo_amount;
 }
 
 METHOD(OverkillMachineGun, wr_checkammo2, bool(entity thiswep, entity actor, .entity weaponentity))
 {
        }
        return ammo_amount;
 }
 
 METHOD(OverkillMachineGun, wr_checkammo2, bool(entity thiswep, entity actor, .entity weaponentity))
 {

-       float ammo_amount;
-       if (WEP_CVAR(okmachinegun, mode) == 1)
-       {
-               ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(okmachinegun, burst_ammo);
-       }
-       else
-       {
-               ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(okmachinegun, first_ammo);
-       }
-       if (WEP_CVAR(okmachinegun, reload_ammo))
-       {
-               if (WEP_CVAR(okmachinegun, mode) == 1)
-               {
-                       ammo_amount += actor.(weaponentity).(weapon_load[WEP_OVERKILL_MACHINEGUN.m_id]) >= WEP_CVAR(okmachinegun, burst_ammo);
-               }
-               else
-               {
-                       ammo_amount += actor.(weaponentity).(weapon_load[WEP_OVERKILL_MACHINEGUN.m_id]) >= WEP_CVAR(okmachinegun, first_ammo);
-               }
-       }
-       return ammo_amount;
+       return true; // Blaster secondary is unlimited.

 }
 
 METHOD(OverkillMachineGun, wr_reload, void(entity thiswep, entity actor, .entity weaponentity))
 {
 }
 
 METHOD(OverkillMachineGun, wr_reload, void(entity thiswep, entity actor, .entity weaponentity))
 {

-       W_Reload(actor, weaponentity, min(max(WEP_CVAR(okmachinegun, sustained_ammo), WEP_CVAR(okmachinegun, first_ammo)), WEP_CVAR(okmachinegun, burst_ammo)), SND_RELOAD);
+       W_Reload(actor, weaponentity, WEP_CVAR_PRI(okmachinegun, ammo), SND_RELOAD);

 }
 
 METHOD(OverkillMachineGun, wr_suicidemessage, Notification(entity thiswep))
 }
 
 METHOD(OverkillMachineGun, wr_suicidemessage, Notification(entity thiswep))

diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
index d33838ac32185eb9dd9752bd2896b53c11cfe35d..24987c5a020b4250cc9d5a6a956bdfd95b3daad7 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
@@ -18,37 +18,14 @@ CLASS(OverkillMachineGun, Weapon)
 
 #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \
 
 #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \

-               P(class, prefix, burst, float, NONE) \
-               P(class, prefix, burst_ammo, float, NONE) \
-               P(class, prefix, burst_animtime, float, NONE) \
-               P(class, prefix, burst_refire2, float, NONE) \
-               P(class, prefix, burst_refire, float, NONE) \
-               P(class, prefix, burst_speed, float, NONE) \
-               P(class, prefix, first, float, NONE) \
-               P(class, prefix, first_ammo, float, NONE) \
-               P(class, prefix, first_damage, float, NONE) \
-               P(class, prefix, first_force, float, NONE) \
-               P(class, prefix, first_refire, float, NONE) \
-               P(class, prefix, first_spread, float, NONE) \
-               P(class, prefix, mode, float, NONE) \
-               P(class, prefix, reload_ammo, float, NONE) \
-               P(class, prefix, reload_time, float, NONE) \
-               P(class, prefix, solidpenetration, float, NONE) \
-               P(class, prefix, spread_add, float, NONE) \
-               P(class, prefix, spread_max, float, NONE) \
-               P(class, prefix, spread_min, float, NONE) \
-               P(class, prefix, sustained_ammo, float, NONE) \
-               P(class, prefix, sustained_damage, float, NONE) \
-               P(class, prefix, sustained_force, float, NONE) \
-               P(class, prefix, sustained_refire, float, NONE) \
-               P(class, prefix, sustained_spread, float, NONE) \
-               P(class, prefix, switchdelay_drop, float, NONE) \
-               P(class, prefix, switchdelay_raise, float, NONE) \
-               P(class, prefix, weaponreplace, string,NONE) \
-               P(class, prefix, weaponstartoverride, float, NONE) \
-               P(class, prefix, weaponstart, float, NONE) \
-               P(class, prefix, weaponthrowable, float, NONE) \
-               P(class, prefix, ammo, float, SEC) \
+               P(class, prefix, ammo, float, PRI) \
+               P(class, prefix, damage, float, PRI) \
+               P(class, prefix, force, float, PRI) \
+               P(class, prefix, refire, float, PRI) \
+               P(class, prefix, solidpenetration, float, PRI) \
+               P(class, prefix, spread_add, float, PRI) \
+               P(class, prefix, spread_max, float, PRI) \
+               P(class, prefix, spread_min, float, PRI) \

                P(class, prefix, animtime, float, SEC) \
                P(class, prefix, damage, float, SEC) \
                P(class, prefix, delay, float, SEC) \
                P(class, prefix, animtime, float, SEC) \
                P(class, prefix, damage, float, SEC) \
                P(class, prefix, delay, float, SEC) \


@@ -61,7 +38,14 @@ CLASS(OverkillMachineGun, Weapon)
                P(class, prefix, shotangle, float, SEC) \
                P(class, prefix, speed, float, SEC) \
                P(class, prefix, spread, float, SEC) \
                P(class, prefix, shotangle, float, SEC) \
                P(class, prefix, speed, float, SEC) \
                P(class, prefix, spread, float, SEC) \

-               P(class, prefix, type, float, SEC) \
+               P(class, prefix, reload_ammo, float, NONE) \
+               P(class, prefix, reload_time, float, NONE) \
+               P(class, prefix, switchdelay_drop, float, NONE) \
+               P(class, prefix, switchdelay_raise, float, NONE) \
+               P(class, prefix, weaponreplace, string, NONE) \
+               P(class, prefix, weaponstartoverride, float, NONE) \
+               P(class, prefix, weaponstart, float, NONE) \
+               P(class, prefix, weaponthrowable, float, NONE) \

        END()
        W_PROPS(X, OverkillMachineGun, okmachinegun)
 #undef X
        END()
        W_PROPS(X, OverkillMachineGun, okmachinegun)
 #undef X

diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qc b/qcsrc/common/mutators/mutator/overkill/okshotgun.qc
index 45522e155b0b1fc296f56994d2e4ce9c30d41cfe..8f606bd3b01e6102e884c77ac7125230f8a94925 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qc
+++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qc
@@ -85,7 +85,7 @@ METHOD(OverkillShotgun, wr_think, void(entity thiswep, entity actor, .entity wea
                {
                        return;
                }
                {
                        return;
                }

-               // ugly instagib hack to reuse the fire mode of the laser
+               // Ugly hack to reuse the fire mode of the blaster.

                makevectors(actor.v_angle);
                Weapon oldwep = actor.(weaponentity).m_weapon; // we can't avoid this hack
                actor.(weaponentity).m_weapon = WEP_BLASTER;
                makevectors(actor.v_angle);
                Weapon oldwep = actor.(weaponentity).m_weapon; // we can't avoid this hack
                actor.(weaponentity).m_weapon = WEP_BLASTER;


@@ -117,13 +117,7 @@ METHOD(OverkillShotgun, wr_checkammo1, bool(entity thiswep, entity actor, .entit
 
 METHOD(OverkillShotgun, wr_checkammo2, bool(entity thiswep, entity actor, .entity weaponentity))
 {
 
 METHOD(OverkillShotgun, wr_checkammo2, bool(entity thiswep, entity actor, .entity weaponentity))
 {

-       if (WEP_CVAR_SEC(okshotgun, ammo) == 0)
-       {
-               return true;
-       }
-       float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(okshotgun, ammo);
-       ammo_amount += actor.(weaponentity).(weapon_load[WEP_OVERKILL_SHOTGUN.m_id]) >= WEP_CVAR_SEC(okshotgun, ammo);
-       return ammo_amount;
+       return true; // Blaster secondary is unlimited.

 }
 
 METHOD(OverkillShotgun, wr_reload, void(entity thiswep, entity actor, .entity weaponentity))
 }
 
 METHOD(OverkillShotgun, wr_reload, void(entity thiswep, entity actor, .entity weaponentity))

diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
index 3c3882c0367d734d927c2e74817e55a05d205bde..1b6582aa8f5cdd4c0bfe735d49f407d45005eb72 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
@@ -27,7 +27,6 @@ CLASS(OverkillShotgun, Weapon)
                P(class, prefix, refire, float, PRI) \
                P(class, prefix, solidpenetration, float, PRI) \
                P(class, prefix, spread, float, PRI) \
                P(class, prefix, refire, float, PRI) \
                P(class, prefix, solidpenetration, float, PRI) \
                P(class, prefix, spread, float, PRI) \

-               P(class, prefix, ammo, float, SEC) \

                P(class, prefix, animtime, float, SEC) \
                P(class, prefix, damage, float, SEC) \
                P(class, prefix, delay, float, SEC) \
                P(class, prefix, animtime, float, SEC) \
                P(class, prefix, damage, float, SEC) \
                P(class, prefix, delay, float, SEC) \