INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-11 15:48:05 -05:00
Code Issues Releases Wiki Activity

Containment: contest gives both teams score

Browse Source
This commit is contained in:
Jbleezy
2022-01-30 17:51:14 -08:00
parent b15026f5ef
commit ee8e9694f6
1 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
scripts/zm/zgrief/zgrief_reimagined.gsc
View File

@ -2218,6 +2218,7 @@ containment_think()
held_time = []; held_time = [];
held_time["axis"] = undefined; held_time["axis"] = undefined;
held_time["allies"] = undefined; held_time["allies"] = undefined;
held_prev = "none";
start_time = getTime(); start_time = getTime();
while((getTime() - start_time) <= (level.containment_time * 1000)) while((getTime() - start_time) <= (level.containment_time * 1000))
{ {
@ -2290,8 +2291,12 @@ containment_think()
player.containment_waypoint.color = (1, 1, 0); player.containment_waypoint.color = (1, 1, 0);
} }
held_time["axis"] = undefined; if(held_prev != "cont")
held_time["allies"] = undefined; {
held_time["axis"] = getTime();
held_time["allies"] = getTime();
held_prev = "cont";
}
} }
else if(in_containment_zone["axis"] > in_containment_zone["allies"]) else if(in_containment_zone["axis"] > in_containment_zone["allies"])
{ {
@ -2307,15 +2312,14 @@ containment_think()
} }
} }
if(!isDefined(held_time["axis"])) if(held_prev != "axis")
{ {
held_time["axis"] = getTime(); if(held_prev != "cont")
} {
held_time["axis"] = getTime();
if((getTime() - held_time["axis"]) >= 1000) }
{ held_time["allies"] = undefined;
held_time["axis"] = getTime(); held_prev = "axis";
increment_score("axis");
} }
} }
else if(in_containment_zone["allies"] > in_containment_zone["axis"]) else if(in_containment_zone["allies"] > in_containment_zone["axis"])
@ -2332,15 +2336,14 @@ containment_think()
} }
} }
if(!isDefined(held_time["allies"])) if(held_prev != "allies")
{ {
held_time["allies"] = getTime(); if(held_prev != "cont")
} {
held_time["allies"] = getTime();
if((getTime() - held_time["allies"]) >= 1000) }
{ held_time["axis"] = undefined;
held_time["allies"] = getTime(); held_prev = "allies";
increment_score("allies");
} }
} }
else else
@ -2357,8 +2360,30 @@ containment_think()
player.containment_waypoint.color = (1, 1, 1); player.containment_waypoint.color = (1, 1, 1);
} }
held_time["axis"] = undefined; if(held_prev != "none")
held_time["allies"] = undefined; {
held_time["axis"] = undefined;
held_time["allies"] = undefined;
held_prev = "none";
}
}
if(isDefined(held_time["axis"]))
{
if((getTime() - held_time["axis"]) >= 1000)
{
held_time["axis"] = getTime();
increment_score("axis");
}
}
if(isDefined(held_time["allies"]))
{
if((getTime() - held_time["allies"]) >= 1000)
{
held_time["allies"] = getTime();
increment_score("allies");
}
} }
wait 0.05; wait 0.05;