.float ok_notice_time;
.float ammo_charge[Weapons_MAX];
-.float ok_use_ammocharge;
-.float ok_ammo_charge;
+.float ok_use_ammocharge = _STAT(OK_AMMO_CHARGE);
+.float ok_ammo_charge = _STAT(OK_AMMO_CHARGEPOOL);
.float ok_pauseregen_finished;
MUTATOR_HOOKFUNCTION(ok, W_DecreaseAmmo)
{
- entity actor = MUTATOR_ARGV(0, entity);
+ entity actor = M_ARGV(0, entity);
if (actor.ok_use_ammocharge)
{
- ok_DecreaseCharge(actor, actor.weapon);
+ ok_DecreaseCharge(actor, PS(actor).m_weapon.m_id);
return true;
}
}
MUTATOR_HOOKFUNCTION(ok, W_Reload)
{
- entity actor = MUTATOR_ARGV(0, entity);
+ entity actor = M_ARGV(0, entity);
return actor.ok_use_ammocharge;
}
{
if(!ent.ok_use_ammocharge) return;
- entity wepent = get_weaponinfo(wep);
+ entity wepent = Weapons_from(wep);
- if(wepent.weapon == 0)
- return; // dummy
+ if (wepent == WEP_Null) return; // dummy
ent.ammo_charge[wep] -= max(0, cvar(sprintf("g_overkill_ammo_decharge_%s", wepent.netname)));
}
void ok_IncreaseCharge(entity ent, int wep)
{
- entity wepent = get_weaponinfo(wep);
+ entity wepent = Weapons_from(wep);
- if(wepent.weapon == 0)
- return; // dummy
+ if (wepent == WEP_Null) return; // dummy
if(ent.ok_use_ammocharge)
- if(!ent.BUTTON_ATCK) // not while attacking?
+ if(!PHYS_INPUT_BUTTON_ATCK(ent)) // not while attacking?
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);
}
{
if(!ent.ok_use_ammocharge) return true;
- entity wepent = get_weaponinfo(wep);
+ entity wepent = Weapons_from(wep);
- if(wepent.weapon == 0)
- return 0; // dummy
+ if(wepent == WEP_Null) return 0; // dummy
return (ent.ammo_charge[wep] >= cvar(sprintf("g_overkill_ammo_decharge_%s", wepent.netname)));
}
MUTATOR_HOOKFUNCTION(ok, PlayerDamage_Calculate, CBC_ORDER_LAST)
{
+ entity frag_attacker = M_ARGV(1, entity);
+ entity frag_target = M_ARGV(2, entity);
+ float frag_deathtype = M_ARGV(3, float);
+ float frag_damage = M_ARGV(4, float);
+ vector frag_force = M_ARGV(6, vector);
+
if(IS_PLAYER(frag_attacker) && IS_PLAYER(frag_target))
if(DEATH_ISWEAPON(frag_deathtype, WEP_BLASTER))
{
if(frag_attacker != frag_target)
if(frag_target.health > 0)
- if(frag_target.frozen == 0)
- if(frag_target.deadflag == DEAD_NO)
+ if(STAT(FROZEN, frag_target) == 0)
+ if(!IS_DEAD(frag_target))
{
Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_SECONDARY_NODAMAGE);
frag_force = '0 0 0';
}
+
+ M_ARGV(4, float) = frag_damage;
+ M_ARGV(6, vector) = frag_force;
}
return false;
}
MUTATOR_HOOKFUNCTION(ok, PlayerDamage_SplitHealthArmor)
-{SELFPARAM();
+{
if(damage_take)
- self.ok_pauseregen_finished = max(self.ok_pauseregen_finished, time + 2);
+ frag_target.ok_pauseregen_finished = max(frag_target.ok_pauseregen_finished, time + 2);
return false;
}
MUTATOR_HOOKFUNCTION(ok, PlayerDies)
-{SELFPARAM();
+{
entity targ = ((frag_attacker) ? frag_attacker : frag_target);
- if(IS_MONSTER(self))
+ if(IS_MONSTER(frag_target))
{
remove(other); // remove default item
- other = world;
+ other = NULL;
}
- setself(new(droppedweapon)); // hax
- self.ok_item = true;
- self.noalign = true;
- self.pickup_anyway = true;
- spawnfunc_item_armor_small(this);
- self.movetype = MOVETYPE_TOSS;
- self.gravity = 1;
- self.reset = SUB_Remove;
- setorigin(self, frag_target.origin + '0 0 32');
- self.velocity = '0 0 200' + normalize(targ.origin - self.origin) * 500;
- SUB_SetFade(self, time + 5, 1);
- setself(this);
-
- self.ok_lastwep = self.switchweapon;
+ entity e = new(droppedweapon); // hax
+ e.ok_item = true;
+ e.noalign = true;
+ e.pickup_anyway = true;
+ e.spawnfunc_checked = true;
+ spawnfunc_item_armor_small(e);
+ if (!wasfreed(e)) { // might have been blocked by a mutator
+ e.movetype = MOVETYPE_TOSS;
+ e.gravity = 1;
+ e.reset = SUB_Remove;
+ setorigin(e, frag_target.origin + '0 0 32');
+ e.velocity = '0 0 200' + normalize(targ.origin - frag_target.origin) * 500;
+ SUB_SetFade(e, time + 5, 1);
+ }
+
+ frag_target.ok_lastwep = PS(frag_target).m_switchweapon.m_id;
return false;
}
MUTATOR_HOOKFUNCTION(ok, PlayerRegen)
{SELFPARAM();
// overkill's values are different, so use custom regen
- if(!self.frozen)
+ if(!STAT(FROZEN, self))
{
self.armorvalue = CalcRotRegen(self.armorvalue, autocvar_g_balance_armor_regenstable, autocvar_g_balance_armor_regen, autocvar_g_balance_armor_regenlinear, 1 * frametime * (time > self.ok_pauseregen_finished), 0, 0, 1, 1 * frametime * (time > self.pauserotarmor_finished), autocvar_g_balance_armor_limit);
self.health = CalcRotRegen(self.health, autocvar_g_balance_health_regenstable, 0, 100, 1 * frametime * (time > self.ok_pauseregen_finished), 200, 0, autocvar_g_balance_health_rotlinear, 1 * frametime * (time > self.pauserothealth_finished), autocvar_g_balance_health_limit);
if(intermission_running || gameover)
return false;
- if(self.deadflag != DEAD_NO || !IS_PLAYER(self) || self.frozen)
+ if(IS_DEAD(self) || !IS_PLAYER(self) || STAT(FROZEN, self))
return false;
if(self.ok_lastwep)
{
- self.switchweapon = self.ok_lastwep;
+ Weapon newwep = Weapons_from(self.ok_lastwep);
+ if(self.ok_lastwep == WEP_HMG.m_id)
+ newwep = WEP_MACHINEGUN;
+ if(self.ok_lastwep == WEP_RPC.m_id)
+ newwep = WEP_VORTEX;
+ PS(self).m_switchweapon = newwep;
self.ok_lastwep = 0;
}
- ok_IncreaseCharge(self, self.weapon);
+ ok_IncreaseCharge(self, PS(self).m_weapon.m_id);
- if(self.BUTTON_ATCK2)
+ if(PHYS_INPUT_BUTTON_ATCK2(self))
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;
+ Weapon oldwep = PS(self).m_weapon;
+ PS(self).m_weapon = WEP_BLASTER;
W_Blaster_Attack(
self,
WEP_BLASTER.m_id | HITTYPE_SECONDARY,
WEP_CVAR_SEC(vaporizer, delay),
WEP_CVAR_SEC(vaporizer, lifetime)
);
- self.weapon = oldwep;
+ PS(self).m_weapon = oldwep;
}
self.weapon_blocked = false;
- self.ok_ammo_charge = self.ammo_charge[self.weapon];
+ self.ok_ammo_charge = self.ammo_charge[PS(self).m_weapon.m_id];
if(self.ok_use_ammocharge)
- if(!ok_CheckWeaponCharge(self, self.weapon))
+ if(!ok_CheckWeaponCharge(self, PS(self).m_weapon.m_id))
{
- if(autocvar_g_overkill_ammo_charge_notice && time > self.ok_notice_time && self.BUTTON_ATCK && IS_REAL_CLIENT(self) && self.weapon == self.switchweapon)
+ if(autocvar_g_overkill_ammo_charge_notice && time > self.ok_notice_time && PHYS_INPUT_BUTTON_ATCK(self) && IS_REAL_CLIENT(self) && PS(self).m_weapon == PS(self).m_switchweapon)
{
//Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_OVERKILL_CHARGE);
self.ok_notice_time = time + 2;
play2(self, SND(DRYFIRE));
}
- Weapon wpn = get_weaponinfo(self.weapon);
+ Weapon wpn = PS(self).m_weapon;
.entity weaponentity = weaponentities[0]; // TODO: unhardcode
if(self.(weaponentity).state != WS_CLEAR)
- w_ready(wpn, self, weaponentity, (self.BUTTON_ATCK ? 1 : 0) | (self.BUTTON_ATCK2 ? 2 : 0));
+ w_ready(wpn, self, weaponentity, PHYS_INPUT_BUTTON_ATCK(self) | (PHYS_INPUT_BUTTON_ATCK2(self) << 1));
self.weapon_blocked = true;
}
- self.BUTTON_ATCK2 = 0;
+ PHYS_INPUT_BUTTON_ATCK2(self) = false;
return false;
}
MUTATOR_HOOKFUNCTION(ok, PlayerSpawn)
-{SELFPARAM();
+{
+ entity player = M_ARGV(0, entity);
+
if(autocvar_g_overkill_ammo_charge)
{
- for(int i = WEP_FIRST; i <= WEP_LAST; ++i)
- self.ammo_charge[i] = autocvar_g_overkill_ammo_charge_limit;
+ FOREACH(Weapons, it != WEP_Null, LAMBDA(player.ammo_charge[it.m_id] = autocvar_g_overkill_ammo_charge_limit));
- self.ok_use_ammocharge = 1;
- self.ok_notice_time = time;
+ player.ok_use_ammocharge = 1;
+ player.ok_notice_time = time;
}
else
- self.ok_use_ammocharge = 0;
+ player.ok_use_ammocharge = 0;
+
+ // if player changed their weapon while dead, don't switch to their death weapon
+ if(player.impulse)
+ player.ok_lastwep = 0;
- self.ok_pauseregen_finished = time + 2;
+ player.ok_pauseregen_finished = time + 2;
return false;
}
-void self_spawnfunc_weapon_hmg() { SELFPARAM(); spawnfunc_weapon_hmg(this); }
-void self_spawnfunc_weapon_rpc() { SELFPARAM(); spawnfunc_weapon_rpc(this); }
+void self_spawnfunc_weapon_hmg(entity this) { spawnfunc_weapon_hmg(this); }
+void self_spawnfunc_weapon_rpc(entity this) { spawnfunc_weapon_rpc(this); }
MUTATOR_HOOKFUNCTION(ok, OnEntityPreSpawn)
{SELFPARAM();
wep.team = self.team;
wep.respawntime = autocvar_g_overkill_superguns_respawn_time;
wep.pickup_anyway = true;
- wep.think = self_spawnfunc_weapon_hmg;
+ wep.spawnfunc_checked = true;
+ setthink(wep, self_spawnfunc_weapon_hmg);
wep.nextthink = time + 0.1;
return true;
}
wep.team = self.team;
wep.respawntime = autocvar_g_overkill_superguns_respawn_time;
wep.pickup_anyway = true;
- wep.think = self_spawnfunc_weapon_rpc;
+ wep.spawnfunc_checked = true;
+ setthink(wep, self_spawnfunc_weapon_rpc);
wep.nextthink = time + 0.1;
return true;
}
MUTATOR_HOOKFUNCTION(ok, SpectateCopy)
{SELFPARAM();
- self.ammo_charge[self.weapon] = other.ammo_charge[other.weapon];
+ self.ammo_charge[PS(self).m_weapon.m_id] = other.ammo_charge[PS(other).m_weapon.m_id];
self.ok_use_ammocharge = other.ok_use_ammocharge;
return false;
precache_all_playermodels("models/ok_player/*.dpm");
- addstat(STAT_OK_AMMO_CHARGE, AS_FLOAT, ok_use_ammocharge);
- addstat(STAT_OK_AMMO_CHARGEPOOL, AS_FLOAT, ok_ammo_charge);
-
WEP_RPC.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
WEP_HMG.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff