return true;
}
+void buffs_BuffModel_Spawn(entity player)
+{
+ player.buff_model = spawn();
+ setmodel(player.buff_model, BUFF_MODEL);
+ setsize(player.buff_model, '0 0 -40', '0 0 40');
+ setattachment(player.buff_model, player, "");
+ setorigin(player.buff_model, '0 0 1' * (player.buff_model.maxs.z * 1));
+ player.buff_model.owner = player;
+ player.buff_model.scale = 0.7;
+ player.buff_model.pflags = PFLAGS_FULLDYNAMIC;
+ player.buff_model.light_lev = 200;
+ player.buff_model.customizeentityforclient = buffs_BuffModel_Customize;
+}
+
vector buff_GlowColor(entity buff)
{
//if(buff.team) { return Team_ColorRGB(buff.team); }
return buff.color;
}
+void buff_Effect(entity player, string eff)
+{
+ if(!autocvar_g_buffs_effects) { return; }
+
+ if(time >= self.buff_effect_delay)
+ {
+ pointparticles(particleeffectnum(eff), player.origin + ((player.mins + player.maxs) * 0.5), '0 0 0', 1);
+ self.buff_effect_delay = time + 0.05; // prevent spam
+ }
+}
+
// buff item
float buff_Waypoint_visible_for_player(entity plr)
{
self.glowmod = buff_GlowColor(self);
self.skin = Buff_Skin(self.buffs);
- setmodel(self, "models/relics/relic.md3");
+ setmodel(self, BUFF_MODEL);
if(self.buff_waypoint)
{
if(self.noalign)
self.movetype = MOVETYPE_NONE; // reset by random location
- setmodel(self, "models/relics/relic.md3");
+ setmodel(self, BUFF_MODEL);
setsize(self, BUFF_MIN, BUFF_MAX);
if(cvar("g_buffs_random_location") || (self.spawnflags & 1))
buff_Init(ent);
}
+void buff_Vengeance_DelayedDamage()
+{
+ if(self.enemy)
+ Damage(self.enemy, self.owner, self.owner, self.dmg, DEATH_BUFF, self.enemy.origin, '0 0 0');
+
+ remove(self);
+ return;
+}
+
+float buff_Inferno_CalculateTime(float x, float offset_x, float offset_y, float intersect_x, float intersect_y, float base)
+{
+ return offset_y + (intersect_y - offset_y) * logn(((x - offset_x) * ((base - 1) / intersect_x)) + 1, base);
+}
+
// mutator hooks
MUTATOR_HOOKFUNCTION(buffs_PlayerDamage_SplitHealthArmor)
{
return false;
}
-void buff_Vengeance_DelayedDamage()
-{
- if(self.enemy)
- Damage(self.enemy, self.owner, self.owner, self.dmg, DEATH_BUFF, self.enemy.origin, '0 0 0');
-
- remove(self);
- return;
-}
-
-float buff_Inferno_CalculateTime(float x, float offset_x, float offset_y, float intersect_x, float intersect_y, float base)
-{
- return offset_y + (intersect_y - offset_y) * logn(((x - offset_x) * ((base - 1) / intersect_x)) + 1, base);
-}
-
MUTATOR_HOOKFUNCTION(buffs_PlayerDamage_Calculate)
{
if(frag_deathtype == DEATH_BUFF) { return false; }
if(!ITEM_DAMAGE_NEEDKILL(frag_deathtype))
if(frag_attacker)
if(random() <= autocvar_g_buffs_medic_survive_chance)
- if(frag_target.health - autocvar_g_buffs_medic_survive_health > 0) // not if the final result would be less than 0, medic must get health
- frag_damage = frag_target.health - autocvar_g_buffs_medic_survive_health;
+ frag_damage = max(5, frag_target.health - autocvar_g_buffs_medic_survive_health);
if(frag_target.buffs & BUFF_VENGEANCE)
if(frag_attacker)
return false;
}
+MUTATOR_HOOKFUNCTION(buffs_PlayerThrowKey)
+{
+ if(MUTATOR_RETURNVALUE || gameover) { return false; }
+
+ if(self.buffs & BUFF_SWAPPER)
+ {
+ float best_distance = autocvar_g_buffs_swapper_range;
+ entity closest = world;
+ entity player;
+ FOR_EACH_PLAYER(player)
+ if(DIFF_TEAM(self, player))
+ if(player.deadflag == DEAD_NO && !player.frozen && !player.vehicle)
+ if(vlen(self.origin - player.origin) <= best_distance)
+ {
+ best_distance = vlen(self.origin - player.origin);
+ closest = player;
+ }
+
+ if(closest)
+ {
+ vector my_org, my_vel, my_ang, their_org, their_vel, their_ang;
+
+ my_org = self.origin;
+ my_vel = self.velocity;
+ my_ang = self.angles;
+ their_org = closest.origin;
+ their_vel = closest.velocity;
+ their_ang = closest.angles;
+
+ if(closest.ballcarried)
+ if(g_keepaway) { ka_DropEvent(closest); }
+ else { DropBall(closest.ballcarried, closest.origin, closest.velocity);}
+ if(closest.flagcarried) { ctf_Handle_Throw(closest, world, DROP_THROW); }
+ if(closest.nade) { toss_nade(closest, '0 0 0', time + 0.05); }
+
+ MUTATOR_CALLHOOK(PortalTeleport); // initiate flag dropper
+
+ setorigin(self, their_org);
+ setorigin(closest, my_org);
+
+ closest.velocity = my_vel;
+ closest.angles = my_ang;
+ closest.fixangle = true;
+ closest.oldorigin = my_org;
+ closest.oldvelocity = my_vel;
+ self.velocity = their_vel;
+ self.angles = their_ang;
+ self.fixangle = true;
+ self.oldorigin = their_org;
+ self.oldvelocity = their_vel;
+
+ // set pusher so self gets the kill if they fall into void
+ closest.pusher = self;
+ closest.pushltime = time + autocvar_g_maxpushtime;
+ closest.istypefrag = closest.BUTTON_CHAT;
+
+ pointparticles(particleeffectnum("electro_combo"), their_org, '0 0 0', 1);
+ pointparticles(particleeffectnum("electro_combo"), my_org, '0 0 0', 1);
+
+ sound(self, CH_TRIGGER, "keepaway/respawn.wav", VOL_BASE, ATTEN_NORM);
+ sound(closest, CH_TRIGGER, "keepaway/respawn.wav", VOL_BASE, ATTEN_NORM);
+
+ // TODO: add a counter to handle how many times one can teleport, and a delay to prevent spam
+ self.buffs = 0;
+ return true;
+ }
+ }
+ return false;
+}
+
MUTATOR_HOOKFUNCTION(buffs_RemovePlayer)
{
if(self.buff_model)
return false;
}
+MUTATOR_HOOKFUNCTION(buffs_WeaponSpeed)
+{
+ if(self.buffs & BUFF_SPEED)
+ ret_float *= autocvar_g_buffs_speed_weaponspeed;
+
+ if(time < self.buff_disability_time)
+ ret_float *= autocvar_g_buffs_disability_weaponspeed;
+
+ return false;
+}
+
MUTATOR_HOOKFUNCTION(buffs_PlayerThink)
{
if(gameover || self.deadflag != DEAD_NO) { return false; }
self.alpha = self.buff_invisible_prev_alpha;
BUFF_ONADD(BUFF_FLIGHT)
- self.gravity = self.buff_flight_prev_gravity;
-
- BUFF_ONREM(BUFF_FLIGHT)
{
self.buff_flight_prev_gravity = self.gravity;
self.gravity = autocvar_g_buffs_flight_gravity;
}
+ BUFF_ONREM(BUFF_FLIGHT)
+ self.gravity = self.buff_flight_prev_gravity;
+
self.oldbuffs = self.buffs;
if(self.buffs)
{
if(!self.buff_model)
- {
- self.buff_model = spawn();
- setmodel(self.buff_model, "models/relics/relic.md3");
- setsize(self.buff_model, '0 0 -40', '0 0 40');
- setattachment(self.buff_model, self, "");
- setorigin(self.buff_model, '0 0 1' * (self.buff_model.maxs.z * 1));
- self.buff_model.owner = self;
- self.buff_model.scale = 0.7;
- self.buff_model.pflags = PFLAGS_FULLDYNAMIC;
- self.buff_model.light_lev = 200;
- self.buff_model.customizeentityforclient = buffs_BuffModel_Customize;
- }
+ buffs_BuffModel_Spawn(self);
+
self.buff_model.color = Buff_Color(self.buffs);
self.buff_model.glowmod = buff_GlowColor(self.buff_model);
self.buff_model.skin = Buff_Skin(self.buffs);
void buffs_Initialize()
{
- precache_model("models/relics/relic.md3");
+ precache_model(BUFF_MODEL);
precache_sound("misc/strength_respawn.wav");
precache_sound("misc/shield_respawn.wav");
precache_sound("relics/relic_effect.wav");
MUTATOR_HOOK(PlayerRegen, buffs_PlayerRegen, CBC_ORDER_ANY);
MUTATOR_HOOK(PlayerDies, buffs_PlayerDies, CBC_ORDER_ANY);
MUTATOR_HOOK(PlayerUseKey, buffs_PlayerUseKey, CBC_ORDER_FIRST);
+ MUTATOR_HOOK(ForbidThrowCurrentWeapon, buffs_PlayerThrowKey, CBC_ORDER_ANY);
MUTATOR_HOOK(MakePlayerObserver, buffs_RemovePlayer, CBC_ORDER_ANY);
MUTATOR_HOOK(ClientDisconnect, buffs_RemovePlayer, CBC_ORDER_ANY);
MUTATOR_HOOK(OnEntityPreSpawn, buffs_OnEntityPreSpawn, CBC_ORDER_ANY);
MUTATOR_HOOK(CustomizeWaypoint, buffs_CustomizeWaypoint, CBC_ORDER_ANY);
MUTATOR_HOOK(WeaponRateFactor, buffs_WeaponRate, CBC_ORDER_ANY);
+ MUTATOR_HOOK(WeaponSpeedFactor, buffs_WeaponSpeed, CBC_ORDER_ANY);
MUTATOR_HOOK(PlayerPreThink, buffs_PlayerThink, CBC_ORDER_ANY);
MUTATOR_HOOK(GetCvars, buffs_GetCvars, CBC_ORDER_ANY);
MUTATOR_HOOK(BuildMutatorsString, buffs_BuildMutatorsString, CBC_ORDER_ANY);
projects / xonotic / xonotic-data.pk3dir.git / blobdiff