Skip to content

Hard-sync winning KOTH faction #1885

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

Merged
ari-steas merged 1 commit into from
Feb 7, 2025
Merged

Hard-sync winning KOTH faction #1885

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions .../StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/Elimination/EliminationGamemode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,10 @@ public override void StartRound(string[] arguments = null)
"\n- Tracked grids:" + trackedGrids);
}

protected bool _setWinnerFromArgs = false;
public override void StopRound()
{
bool setWinnerFromArgs = false;
_setWinnerFromArgs = false;
foreach (var arg in Arguments)
{
if (arg.StartsWith("win"))
Expand All @@ -194,12 +195,12 @@ public override void StopRound()
long.TryParse(arg.Remove(0, 3), out factionId);

_winningFaction = MyAPIGateway.Session.Factions.TryGetFactionById(factionId);
setWinnerFromArgs = true;
_setWinnerFromArgs = true;
break;
}
}

if (!setWinnerFromArgs && MyAPIGateway.Session.IsServer)
if (!_setWinnerFromArgs && MyAPIGateway.Session.IsServer)
{
Arguments = Arguments.Concat(new[] { $"win{_winningFaction?.FactionId ?? -1}" }).ToArray();
}
Expand Down
4 changes: 3 additions & 1 deletion ... Mods/StarCore SUGMA Gamemodes/Data/Scripts/SUGMA/GameModes/KingOfTheHill/KOTHGamemode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,10 @@ public override void StartRound(string[] arguments = null)
public override void StopRound()
{
base.StopRound();
if (!_setWinnerFromArgs)
_winningFaction = ControlPoint._zoneOwner;

SUGMA_SessionComponent.I.GetComponent<KOTHHud>("KOTHHud")?.MatchEnded(ControlPoint._zoneOwner);
SUGMA_SessionComponent.I.GetComponent<KOTHHud>("KOTHHud")?.MatchEnded(_winningFaction);
SUGMA_SessionComponent.I.UnregisterComponent("KOTHHud");

ControlPoint = null;
Expand Down