Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ff2r_default_abilities: Add 'rival' to specify whether minion will respawn on rival team #177

Merged
merged 1 commit into from
Mar 2, 2024
Merged

ff2r_default_abilities: Add 'rival' to specify whether minion will respawn on rival team #177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions addons/sourcemod/scripting/ff2r_default_abilities.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"amount" "n/3 + 1" // Amount of clones to summon
"die on boss death" "true" // If clones die when the boss dies
"allow bosses" "false" //Allow bosses to become minions (in the process the boss becomes normal player)
"rival" "false" //Whether players will spawn on ally or rival team

"character"
{
Expand Down Expand Up @@ -2604,6 +2605,7 @@ void Rage_CloneAttack(int client, ConfigData cfg)

int owner = cfg.GetBool("die on boss death", true) ? client : -1;
bool allowBosses = cfg.GetBool("allow bosses", false);
bool rival = cfg.GetBool("rival", false);

ConfigData minion = cfg.GetSection("character");

Expand All @@ -2629,7 +2631,7 @@ void Rage_CloneAttack(int client, ConfigData cfg)
}

if(victims)
SpawnCloneList(victim, victims, amount, minion, owner, team, pos);
SpawnCloneList(victim, victims, amount, minion, owner, team, pos, rival);
}

if(amount)
Expand All @@ -2652,7 +2654,7 @@ void Rage_CloneAttack(int client, ConfigData cfg)
}

if(victims)
SpawnCloneList(victim, victims, amount, minion, owner, team, pos);
SpawnCloneList(victim, victims, amount, minion, owner, team, pos, rival);

if(amount)
{
Expand All @@ -2674,13 +2676,13 @@ void Rage_CloneAttack(int client, ConfigData cfg)
}

if(victims)
SpawnCloneList(victim, victims, amount, minion, owner, team, pos);
SpawnCloneList(victim, victims, amount, minion, owner, team, pos, rival);
}
}
}
}

void SpawnCloneList(int[] clients, int &amount, int &cap, ConfigData cfg, int owner, int team, const float pos[3])
void SpawnCloneList(int[] clients, int &amount, int &cap, ConfigData cfg, int owner, int team, const float pos[3], bool rivalTeam)
{
if(amount > cap)
{
Expand All @@ -2697,6 +2699,9 @@ void SpawnCloneList(int[] clients, int &amount, int &cap, ConfigData cfg, int ow

if(IsPlayerAlive(clients[i]))
ForcePlayerSuicide(clients[i]);

if(rivalTeam)
team = (team == 2) ? 3 : 2;

if(cfg)
FF2R_CreateBoss(clients[i], cfg, team);
Expand Down
Loading