if(teamplay)
isfriend = (cm == 1024 + 17 * myteam);
+ else if(ISGAMETYPE(BR))
+ isfriend = br_isSameSquad(this.entnum);
else
isfriend = islocalplayer;
if ((team_count == 2) && (myteam != NUM_SPECTATOR) && (fpc == 2 || fpc == 4 || fpc == 5))
forceplayercolors_enabled = true;
}
+ else if (ISGAMETYPE(BR))
+ {
+ if (br_inSquad() && (fpc == 2 || fpc == 5))
+ forceplayercolors_enabled = true;
+ }
else
{
if (fpc == 1 || fpc == 2)
}
// forceplayercolors too
- if(teamplay)
+ if(teamplay || ISGAMETYPE(BR))
{
// own team's color is never forced
int forcecolor_friend = 0, forcecolor_enemy = 0;
if(forceplayercolors_enabled)
forcecolor_enemy = 1024 + autocvar__cl_color;
- if(forcecolor_enemy && !forcecolor_friend)
+ if(!ISGAMETYPE(BR) && forcecolor_enemy && !forcecolor_friend)
{
// only enemy color is forced?
// verify it is not equal to the friend color
forcecolor_enemy = 0;
}
- if(forcecolor_friend && !forcecolor_enemy)
+ if(!ISGAMETYPE(BR) && forcecolor_friend && !forcecolor_enemy)
{
// only friend color is forced?
// verify it is not equal to the enemy color
forcecolor_friend = 0;
}
- if(cm == 1024 + 17 * myteam)
+ if((!ISGAMETYPE(BR) && (cm == 1024 + 17 * myteam)) || (ISGAMETYPE(BR) && br_isSameSquad(this.entnum)))
{
if(forcecolor_friend)
this.colormap = forcecolor_friend;
boxparticles(particleeffectnum(EFFECT_EF_FLAME), this, this.absmin, this.absmax, this.velocity, this.velocity, bound(0, frametime, 0.1), 0);
//pointparticles(EFFECT_EF_FLAME, this.origin, '0 0 0', bound(0, frametime, 0.1));
}
+ if(eff & EF_SHOCK)
+ {
+ boxparticles(particleeffectnum(EFFECT_ARC_LIGHTNING), this, this.absmin, this.absmax, '0 0 0', '0 0 0', bound(0, frametime, 0.1), 0);
+ //pointparticles(EFFECT_ARC_LIGHTNING, this.origin, '0 0 0', bound(0, frametime, 0.1));
+ }
if(eff & EF_STARDUST)
{
boxparticles(particleeffectnum(EFFECT_EF_STARDUST), this, this.absmin, this.absmax, this.velocity, this.velocity, bound(0, frametime, 0.1), 0);