-void ok_DecreaseCharge(entity ent, float wep)
+#include "mutator_overkill.qh"
+#include "../_all.qh"
+
+#include "mutator.qh"
+
+void W_Blaster_Attack(entity, float, float, float, float, float, float, float, float, float, float);
+void spawnfunc_weapon_hmg();
+void spawnfunc_weapon_rpc();
+
+void ok_DecreaseCharge(entity ent, int wep)
{
if(!ent.ok_use_ammocharge) return;
ent.ammo_charge[wep] -= max(0, cvar(sprintf("g_overkill_ammo_decharge_%s", wepent.netname)));
}
-void ok_IncreaseCharge(entity ent, float wep)
+void ok_IncreaseCharge(entity ent, int wep)
{
entity wepent = get_weaponinfo(wep);
ent.ammo_charge[wep] = min(autocvar_g_overkill_ammo_charge_limit, ent.ammo_charge[wep] + cvar(sprintf("g_overkill_ammo_charge_rate_%s", wepent.netname)) * frametime / W_TICSPERFRAME);
}
-float ok_CheckWeaponCharge(entity ent, float wep)
+float ok_CheckWeaponCharge(entity ent, int wep)
{
if(!ent.ok_use_ammocharge) return true;
MUTATOR_HOOKFUNCTION(ok_PlayerDamage_Calculate)
{
if(IS_PLAYER(frag_attacker) && IS_PLAYER(frag_target))
- if(DEATH_ISWEAPON(frag_deathtype, WEP_BLASTER))
+ if(DEATH_ISWEAPON(frag_deathtype, WEP_BLASTER.m_id))
{
frag_damage = 0;
}
MUTATOR_HOOKFUNCTION(ok_PlayerDamage_SplitHealthArmor)
-{
+{SELFPARAM();
if(damage_take)
self.ok_pauseregen_finished = max(self.ok_pauseregen_finished, time + 2);
return false;
}
MUTATOR_HOOKFUNCTION(ok_PlayerDies)
-{
- entity oldself = self;
+{SELFPARAM();
+ entity targ = ((frag_attacker) ? frag_attacker : frag_target);
- if(self.flags & FL_MONSTER)
+ if(IS_MONSTER(self))
{
remove(other); // remove default item
other = world;
}
- self = spawn();
+ setself(spawn());
self.ok_item = true;
self.noalign = true;
self.pickup_anyway = true;
self.gravity = 1;
self.reset = SUB_Remove;
setorigin(self, frag_target.origin + '0 0 32');
- self.velocity = '0 0 200' + normalize(frag_attacker.origin - self.origin) * 500;
+ self.velocity = '0 0 200' + normalize(targ.origin - self.origin) * 500;
self.classname = "droppedweapon"; // hax
SUB_SetFade(self, time + 5, 1);
- self = oldself;
+ setself(this);
self.ok_lastwep = self.switchweapon;
}
MUTATOR_HOOKFUNCTION(ok_PlayerRegen)
-{
+{SELFPARAM();
// overkill's values are different, so use custom regen
if(!self.frozen)
{
minf = autocvar_g_balance_fuel_regenstable;
limitf = autocvar_g_balance_fuel_limit;
- self.ammo_fuel = CalcRotRegen(self.ammo_fuel, minf, autocvar_g_balance_fuel_regen, autocvar_g_balance_fuel_regenlinear, frametime * (time > self.pauseregen_finished) * ((self.items & IT_FUEL_REGEN) != 0), maxf, autocvar_g_balance_fuel_rot, autocvar_g_balance_fuel_rotlinear, frametime * (time > self.pauserotfuel_finished), limitf);
+ self.ammo_fuel = CalcRotRegen(self.ammo_fuel, minf, autocvar_g_balance_fuel_regen, autocvar_g_balance_fuel_regenlinear, frametime * (time > self.pauseregen_finished) * ((self.items & ITEM_JetpackRegen.m_itemid) != 0), maxf, autocvar_g_balance_fuel_rot, autocvar_g_balance_fuel_rotlinear, frametime * (time > self.pauserotfuel_finished), limitf);
}
return true; // return true anyway, as frozen uses no regen
}
}
MUTATOR_HOOKFUNCTION(ok_PlayerPreThink)
-{
+{SELFPARAM();
if(intermission_running || gameover)
return false;
ok_IncreaseCharge(self, self.weapon);
if(self.BUTTON_ATCK2)
- if(!forbidWeaponUse() || self.weapon_blocked) // allow if weapon is blocked
+ if(!forbidWeaponUse(self) || self.weapon_blocked) // allow if weapon is blocked
if(time >= self.jump_interval)
{
self.jump_interval = time + WEP_CVAR_PRI(blaster, refire) * W_WeaponRateFactor();
makevectors(self.v_angle);
+ int oldwep = self.weapon;
+ self.weapon = WEP_BLASTER.m_id;
W_Blaster_Attack(
- WEP_BLASTER | HITTYPE_SECONDARY,
+ self,
+ WEP_BLASTER.m_id | HITTYPE_SECONDARY,
WEP_CVAR_SEC(vaporizer, shotangle),
WEP_CVAR_SEC(vaporizer, damage),
WEP_CVAR_SEC(vaporizer, edgedamage),
WEP_CVAR_SEC(vaporizer, delay),
WEP_CVAR_SEC(vaporizer, lifetime)
);
+ self.weapon = oldwep;
}
self.weapon_blocked = false;
{
//Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_OVERKILL_CHARGE);
self.ok_notice_time = time + 2;
- play2(self, "weapons/dryfire.wav");
+ play2(self, SND(DRYFIRE));
}
+ Weapon wpn = get_weaponinfo(self.weapon);
if(self.weaponentity.state != WS_CLEAR)
- w_ready();
+ w_ready(wpn, self, self.BUTTON_ATCK, self.BUTTON_ATCK2);
self.weapon_blocked = true;
}
}
MUTATOR_HOOKFUNCTION(ok_PlayerSpawn)
-{
+{SELFPARAM();
if(autocvar_g_overkill_ammo_charge)
{
- float i;
-
- for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+ for(int i = WEP_FIRST; i <= WEP_LAST; ++i)
self.ammo_charge[i] = autocvar_g_overkill_ammo_charge_limit;
self.ok_use_ammocharge = 1;
}
MUTATOR_HOOKFUNCTION(ok_OnEntityPreSpawn)
-{
+{SELFPARAM();
if(autocvar_g_powerups)
if(autocvar_g_overkill_powerups_replace)
{
{
entity wep = spawn();
setorigin(wep, self.origin);
- setmodel(wep, "models/weapons/g_ok_hmg.md3");
+ setmodel(wep, MDL_OK_HMG);
wep.classname = "weapon_hmg";
wep.ok_item = true;
wep.noalign = self.noalign;
{
entity wep = spawn();
setorigin(wep, self.origin);
- setmodel(wep, "models/weapons/g_ok_rl.md3");
+ setmodel(wep, MDL_OK_RPC);
wep.classname = "weapon_rpc";
wep.ok_item = true;
wep.noalign = self.noalign;
}
MUTATOR_HOOKFUNCTION(ok_ItemRemove)
-{
+{SELFPARAM();
if(self.ok_item)
return false;
switch(self.items)
{
- case IT_HEALTH: return !(autocvar_g_overkill_100h_anyway);
- case IT_ARMOR: return !(autocvar_g_overkill_100a_anyway);
+ case ITEM_HealthMega.m_itemid: return !(autocvar_g_overkill_100h_anyway);
+ case ITEM_ArmorMega.m_itemid: return !(autocvar_g_overkill_100a_anyway);
}
return true;
}
MUTATOR_HOOKFUNCTION(ok_SpectateCopy)
-{
+{SELFPARAM();
self.ammo_charge[self.weapon] = other.ammo_charge[other.weapon];
self.ok_use_ammocharge = other.ok_use_ammocharge;
MUTATOR_HOOKFUNCTION(ok_StartItems)
{
- WepSet ok_start_items = (WEPSET_MACHINEGUN | WEPSET_VORTEX | WEPSET_SHOTGUN);
+ WepSet ok_start_items = (WEPSET(MACHINEGUN) | WEPSET(VORTEX) | WEPSET(SHOTGUN));
- if((get_weaponinfo(WEP_RPC)).weaponstart > 0) { ok_start_items |= WEPSET_RPC; }
- if((get_weaponinfo(WEP_HMG)).weaponstart > 0) { ok_start_items |= WEPSET_HMG; }
+ if(WEP_RPC.weaponstart > 0) { ok_start_items |= WEPSET(RPC); }
+ if(WEP_HMG.weaponstart > 0) { ok_start_items |= WEPSET(HMG); }
start_items |= IT_UNLIMITED_WEAPON_AMMO;
start_weapons = warmup_start_weapons = ok_start_items;
precache_all_playermodels("models/ok_player/*.dpm");
- precache_model("models/weapons/h_ok_mg.iqm");
- precache_model("models/weapons/v_ok_mg.md3");
- precache_model("models/weapons/g_ok_mg.md3");
-
- precache_model("models/weapons/h_ok_shotgun.iqm");
- precache_model("models/weapons/v_ok_shotgun.md3");
- precache_model("models/weapons/g_ok_shotgun.md3");
-
- precache_model("models/weapons/h_ok_sniper.iqm");
- precache_model("models/weapons/v_ok_sniper.md3");
- precache_model("models/weapons/g_ok_sniper.md3");
-
- precache_sound("weapons/dryfire.wav");
-
addstat(STAT_OK_AMMO_CHARGE, AS_FLOAT, ok_use_ammocharge);
addstat(STAT_OK_AMMO_CHARGEPOOL, AS_FLOAT, ok_ammo_charge);
- (get_weaponinfo(WEP_RPC)).spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
- (get_weaponinfo(WEP_HMG)).spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
+ WEP_RPC.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
+ WEP_HMG.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
- (get_weaponinfo(WEP_SHOTGUN)).mdl = "ok_shotgun";
- (get_weaponinfo(WEP_MACHINEGUN)).mdl = "ok_mg";
- (get_weaponinfo(WEP_VORTEX)).mdl = "ok_sniper";
+ WEP_SHOTGUN.mdl = "ok_shotgun";
+ WEP_MACHINEGUN.mdl = "ok_mg";
+ WEP_VORTEX.mdl = "ok_sniper";
}
MUTATOR_DEFINITION(mutator_overkill)
MUTATOR_ONREMOVE
{
- (get_weaponinfo(WEP_RPC)).spawnflags |= WEP_FLAG_MUTATORBLOCKED;
- (get_weaponinfo(WEP_HMG)).spawnflags |= WEP_FLAG_MUTATORBLOCKED;
+ WEP_RPC.spawnflags |= WEP_FLAG_MUTATORBLOCKED;
+ WEP_HMG.spawnflags |= WEP_FLAG_MUTATORBLOCKED;
}
return false;