#include "mutators/all.qh"
#include "scores.qh"
#include "spawnpoints.qh"
-#include "t_items.qh"
+#include "../common/state.qh"
+#include "../common/physics/player.qh"
+#include "../common/t_items.qh"
#include "../common/vehicles/all.qh"
#include "../common/items/all.qc"
#include "../common/mutators/mutator/waypoints/waypointsprites.qh"
#include "weapons/selection.qh"
#include "../common/constants.qh"
#include "../common/deathtypes/all.qh"
-#include "../common/notifications.qh"
-#include "../common/movetypes/movetypes.qh"
+#include "../common/notifications/all.qh"
+#include "../common/physics/movetypes/movetypes.qh"
#include "../common/playerstats.qh"
#include "../common/teams.qh"
#include "../common/util.qh"
{
// after a frag, exchange the current weapon (or the culprit, if detectable) by a new random weapon
Weapon culprit = DEATH_WEAPONOF(deathtype);
- if(!culprit)
- culprit = get_weaponinfo(attacker.weapon);
- else if(!(attacker.weapons & WepSet_FromWeapon(culprit.m_id)))
- culprit = get_weaponinfo(attacker.weapon);
+ if(!culprit) culprit = PS(attacker).m_weapon;
+ else if(!(attacker.weapons & (culprit.m_wepset))) culprit = PS(attacker).m_weapon;
if(g_weaponarena_random_with_blaster && culprit == WEP_BLASTER) // WEAPONTODO: Shouldn't this be in a mutator?
{
// all others (including the culprit): remove
GiveFrags_randomweapons.weapons &= ~attacker.weapons;
- GiveFrags_randomweapons.weapons &= ~WepSet_FromWeapon(culprit.m_id);
+ GiveFrags_randomweapons.weapons &= ~(culprit.m_wepset);
// among the remaining ones, choose one by random
W_RandomWeapons(GiveFrags_randomweapons, 1);
if(GiveFrags_randomweapons.weapons)
{
attacker.weapons |= GiveFrags_randomweapons.weapons;
- attacker.weapons &= ~WepSet_FromWeapon(culprit.m_id);
+ attacker.weapons &= ~(culprit.m_wepset);
}
}
// after a frag, choose another random weapon set
- if (!(attacker.weapons & WepSet_FromWeapon(attacker.weapon)))
+ if (!(attacker.weapons & WepSet_FromWeapon(PS(attacker).m_weapon)))
W_SwitchWeapon_Force(attacker, w_getbestweapon(attacker));
}
string AppendItemcodes(string s, entity player)
{
- float w;
- w = player.weapon;
+ int w = PS(player).m_weapon.m_id;
//if(w == 0)
// w = player.switchweapon;
if(w == 0)
s = strcat(s, "I");
if(player.flagcarried != world)
s = strcat(s, "F");
- if(player.BUTTON_CHAT)
+ if(PHYS_INPUT_BUTTON_CHAT(player))
s = strcat(s, "T");
if(player.kh_next)
s = strcat(s, "K");
entity deathent = Deathtypes_from(deathtype - DT_FIRST);
if (!deathent) { backtrace("Obituary_SpecialDeath: Could not find deathtype entity!\n"); return; }
+ if(g_cts && deathtype == DEATH_KILL.m_id)
+ return; // TODO: somehow put this in CTS gamemode file!
+
if(murder)
{
if(deathent.death_msgmurder)
NOTIF_ONE,
notif_target,
MSG_MULTI,
- deathent.death_msgmurder.nent_id,
+ deathent.death_msgmurder,
s1, s2, s3, "",
f1, f2, f3, 0
);
NOTIF_ALL_EXCEPT,
notif_target,
MSG_INFO,
- deathent.death_msgmurder.nent_msginfo.nent_id,
+ deathent.death_msgmurder.nent_msginfo,
s1, s2, s3, "",
f1, f2, f3, 0
);
NOTIF_ONE,
notif_target,
MSG_MULTI,
- deathent.death_msgself.nent_id,
+ deathent.death_msgself,
s1, s2, s3, "",
f1, f2, f3, 0
);
NOTIF_ALL_EXCEPT,
notif_target,
MSG_INFO,
- deathent.death_msgself.nent_msginfo.nent_id,
+ deathent.death_msgself.nent_msginfo,
s1, s2, s3, "",
f1, f2, f3, 0
);
if (death_weapon != WEP_Null)
{
w_deathtype = deathtype;
- int death_message = ((murder) ? death_weapon.wr_killmessage(death_weapon) : death_weapon.wr_suicidemessage(death_weapon));
+ Notification death_message = ((murder) ? death_weapon.wr_killmessage(death_weapon) : death_weapon.wr_suicidemessage(death_weapon));
w_deathtype = false;
if (death_message)
s1, s2, s3, "",
f1, f2, 0, 0
);
+ // send the info part to everyone
Send_Notification_WOCOVA(
NOTIF_ALL_EXCEPT,
notif_target,
MSG_INFO,
- msg_multi_notifs[death_message - 1].nent_msginfo.nent_id,
+ death_message.nent_msginfo,
s1, s2, s3, "",
f1, f2, 0, 0
);
return false;
}
-.int buffs; // TODO: remove
-
+.int buffs = _STAT(BUFFS); // TODO: remove
+entity buff_FirstFromFlags(int _buffs);
void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
{
// Sanity check
return;
}
LogDeath("suicide", deathtype, targ, targ);
- GiveFrags(attacker, targ, -1, deathtype);
+ if(deathtype != DEATH_AUTOTEAMCHANGE.m_id) // special case: don't negate frags if auto switched
+ GiveFrags(attacker, targ, -1, deathtype);
}
// ======
Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_TEAMKILL_FRAG, targ.netname);
Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_TEAMKILL_FRAGGED, attacker.netname);
- Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM_4(targ.team, INFO_DEATH_TEAMKILL_), targ.netname, attacker.netname, deathlocation, targ.killcount);
+ Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM(targ.team, INFO_DEATH_TEAMKILL), targ.netname, attacker.netname, deathlocation, targ.killcount);
// In this case, the death message will ALWAYS be "foo was betrayed by bar"
// No need for specific death/weapon messages...
CHOICE_TYPEFRAG,
targ.netname,
kill_count_to_attacker,
- (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping)
+ (IS_BOT_CLIENT(targ) ? -1 : targ.ping)
);
Send_Notification(
NOTIF_ONE,
kill_count_to_target,
attacker.health,
attacker.armorvalue,
- (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping)
+ (IS_BOT_CLIENT(attacker) ? -1 : attacker.ping)
);
}
else
CHOICE_FRAG,
targ.netname,
kill_count_to_attacker,
- (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping)
+ (IS_BOT_CLIENT(targ) ? -1 : targ.ping)
);
Send_Notification(
NOTIF_ONE,
kill_count_to_target,
attacker.health,
attacker.armorvalue,
- (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping)
+ (IS_BOT_CLIENT(attacker) ? -1 : attacker.ping)
);
}
- float f3 = 0;
+ int f3 = 0;
if(deathtype == DEATH_BUFF.m_id)
- f3 = attacker.buffs;
+ f3 = buff_FirstFromFlags(attacker.buffs).m_id;
if (!Obituary_WeaponDeath(targ, true, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker))
Obituary_SpecialDeath(targ, true, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker, f3);
void Ice_Think()
{SELFPARAM();
- if(!self.owner.frozen || self.owner.iceblock != self)
+ if(!STAT(FROZEN, self.owner) || self.owner.iceblock != self)
{
remove(self);
return;
if(!IS_PLAYER(targ) && !IS_MONSTER(targ)) // only specified entities can be freezed
return;
- if(targ.frozen)
+ if(STAT(FROZEN, targ))
return;
float targ_maxhealth = ((IS_MONSTER(targ)) ? targ.max_health : start_health);
- targ.frozen = frozen_type;
+ STAT(FROZEN, targ) = frozen_type;
targ.revive_progress = ((frozen_type == 3) ? 1 : 0);
targ.health = ((frozen_type == 3) ? targ_maxhealth : 1);
targ.revive_speed = freeze_time;
targ.iceblock = ice;
targ.revival_time = 0;
- WITH(entity, self, ice, Ice_Think());
+ WITHSELF(ice, Ice_Think());
RemoveGrapplingHook(targ);
- entity head;
- FOR_EACH_PLAYER(head)
- if(head.hook.aiment == targ)
- RemoveGrapplingHook(head);
+ FOREACH_CLIENT(IS_PLAYER(it) && it.hook.aiment == targ, LAMBDA(RemoveGrapplingHook(it)));
// add waypoint
if(show_waypoint)
void Unfreeze (entity targ)
{
- if(!targ.frozen)
+ SELFPARAM();
+ if(!STAT(FROZEN, targ))
return;
- if(targ.frozen && targ.frozen != 3) // only reset health if target was frozen
+ if(STAT(FROZEN, targ) && STAT(FROZEN, targ) != 3) // only reset health if target was frozen
targ.health = ((IS_PLAYER(targ)) ? start_health : targ.max_health);
- entity head;
- targ.frozen = 0;
+ STAT(FROZEN, targ) = 0;
targ.revive_progress = 0;
targ.revival_time = time;
self.bot_attack = true;
WaypointSprite_Kill(targ.waypointsprite_attached);
- FOR_EACH_PLAYER(head)
- if(head.hook.aiment == targ)
- RemoveGrapplingHook(head);
+ FOREACH_CLIENT(IS_PLAYER(it) && it.hook.aiment == targ, LAMBDA(RemoveGrapplingHook(it)));
// remove the ice block
if(targ.iceblock)
damage = 0;
else if(autocvar_teamplay_mode == 4)
{
- if(IS_PLAYER(targ) && targ.deadflag == DEAD_NO)
+ if(IS_PLAYER(targ) && !IS_DEAD(targ))
{
attacker.dmg_team = attacker.dmg_team + damage;
complainteamdamage = attacker.dmg_team - autocvar_g_teamdamage_threshold;
mirrordamage = frag_mirrordamage;
force = frag_force;
- if(targ.frozen)
+ if(STAT(FROZEN, targ))
if(deathtype != DEATH_HURTTRIGGER.m_id && deathtype != DEATH_TEAMCHANGE.m_id && deathtype != DEATH_AUTOTEAMCHANGE.m_id)
{
if(autocvar_g_frozen_revive_falldamage > 0)
force *= autocvar_g_frozen_force;
}
- if(targ.frozen && deathtype == DEATH_HURTTRIGGER.m_id && !autocvar_g_frozen_damage_trigger)
+ if(STAT(FROZEN, targ) && deathtype == DEATH_HURTTRIGGER.m_id && !autocvar_g_frozen_damage_trigger)
{
Send_Effect(EFFECT_TELEPORT, targ.origin, '0 0 0', 1);
// count the damage
if(attacker)
- if(!targ.deadflag)
+ if(!IS_DEAD(targ))
if(deathtype != DEATH_BUFF.m_id)
if(targ.takedamage == DAMAGE_AIM)
if(targ != attacker)
if(IS_PLAYER(victim) || (IS_TURRET(victim) && victim.active == ACTIVE_ACTIVE) || IS_MONSTER(victim) || MUTATOR_CALLHOOK(PlayHitsound, victim))
{
- if(DIFF_TEAM(victim, attacker) && !victim.frozen)
+ if(DIFF_TEAM(victim, attacker) && !STAT(FROZEN, victim))
{
if(damage > 0)
{
if(deathtype != DEATH_FIRE.m_id)
{
- if(victim.BUTTON_CHAT)
+ if(PHYS_INPUT_BUTTON_CHAT(victim))
attacker.typehitsound += 1;
else
attacker.damage_dealt += damage;
farcent.origin = hitloc;
farcent.forcetype = FORCETYPE_FORCEATPOS;
farcent.nextthink = time + 0.1;
- farcent.think = SUB_Remove;
+ farcent.think = SUB_Remove_self;
}
else
{
self.velocity = self.velocity + farce;
self.move_velocity = self.velocity;
}
- self.flags &= ~FL_ONGROUND;
+ UNSET_ONGROUND(self);
self.move_flags &= ~FL_ONGROUND;
UpdateCSQCProjectile(self);
}
// apply damage
if (damage != 0 || (self.damageforcescale && vlen(force)))
if (self.event_damage)
- self.event_damage (inflictor, attacker, damage, deathtype, hitloc, force);
+ self.event_damage (self, inflictor, attacker, damage, deathtype, hitloc, force);
setself(this);
// apply mirror damage if any
+ if(!autocvar_g_mirrordamage_onlyweapons || DEATH_WEAPONOF(deathtype) != WEP_Null)
if(mirrordamage > 0 || mirrorforce > 0)
{
attacker = attacker_save;
if(IS_PLAYER(e))
{
- if(e.deadflag)
+ if(IS_DEAD(e))
return -1;
}
else
e.fire_endtime = 0;
// ice stops fire
- if(e.frozen)
+ if(STAT(FROZEN, e))
e.fire_endtime = 0;
t = min(frametime, e.fire_endtime - time);
}
e.fire_hitsound = true;
- if (!IS_INDEPENDENT_PLAYER(e))
- if(!e.frozen)
- FOR_EACH_PLAYER(other) if(e != other)
- {
- if(IS_PLAYER(other))
- if(other.deadflag == DEAD_NO)
- if (!IS_INDEPENDENT_PLAYER(other))
- if(boxesoverlap(e.absmin, e.absmax, other.absmin, other.absmax))
- {
- t = autocvar_g_balance_firetransfer_time * (e.fire_endtime - time);
- d = autocvar_g_balance_firetransfer_damage * e.fire_damagepersec * t;
- Fire_AddDamage(other, o, d, t, DEATH_FIRE.m_id);
- }
- }
+ if(!IS_INDEPENDENT_PLAYER(e))
+ if(!STAT(FROZEN, e))
+ FOREACH_CLIENT(IS_PLAYER(it) && it != e, LAMBDA(
+ if(!IS_DEAD(it))
+ if(!IS_INDEPENDENT_PLAYER(it))
+ if(boxesoverlap(e.absmin, e.absmax, it.absmin, it.absmax))
+ {
+ t = autocvar_g_balance_firetransfer_time * (e.fire_endtime - time);
+ d = autocvar_g_balance_firetransfer_damage * e.fire_damagepersec * t;
+ Fire_AddDamage(it, o, d, t, DEATH_FIRE.m_id);
+ }
+ ));
}
void Fire_ApplyEffect(entity e)
projects / xonotic / xonotic-data.pk3dir.git / blobdiff