-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Crowd Control can now be used in the single player campaign via new Mods
menu options. Also corrected some compiler warnings.
- Loading branch information
1 parent
30f0e6b
commit 3973c5c
Showing
18 changed files
with
648 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| class UT99CCEnemyBrowser extends UTMenu.EnemyBrowser; | ||
| function StartMap(string StartMap, int Rung, string GameType) | ||
| { | ||
| local int Team; | ||
| local Class<GameInfo> GameClass; | ||
|
|
||
| GameClass = Class<GameInfo>(DynamicLoadObject(GameType, Class'Class')); | ||
| GameClass.Static.ResetGame(); | ||
|
|
||
| if ((GameType == "Botpack.DeathMatchPlus") || | ||
| (GameType == "Botpack.DeathMatchPlusTest")) | ||
| Team = 255; | ||
| else | ||
| Team = 0; | ||
|
|
||
| StartMap = StartMap | ||
| $"?Game="$GameType | ||
| $"?Mutator=UT99CrowdControl.CrowdControl" | ||
| $"?Tournament="$Rung | ||
| $"?Name="$GetPlayerOwner().PlayerReplicationInfo.PlayerName | ||
| $"?Team="$Team; | ||
|
|
||
| Root.SetMousePos((Root.WinWidth*Root.GUIScale)/2, (Root.WinHeight*Root.GUIScale)/2); | ||
| Root.Console.CloseUWindow(); | ||
| if ( TournamentGameInfo(GetPlayerOwner().Level.Game) != None ) | ||
| TournamentGameInfo(GetPlayerOwner().Level.Game).LadderTransition(StartMap); | ||
| else | ||
| GetPlayerOwner().ClientTravel(StartMap, TRAVEL_Absolute, True); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| class UT99CCLadderAS extends UTMenu.UTLadderAS; | ||
|
|
||
| //This only hits the tutorial... sigh | ||
| function StartMap(string StartMap, int Rung, string GameType) | ||
| { | ||
| local Class<GameInfo> GameClass; | ||
|
|
||
| GameClass = Class<GameInfo>(DynamicLoadObject(GameType, Class'Class')); | ||
| GameClass.Static.ResetGame(); | ||
|
|
||
| StartMap = StartMap | ||
| $"?Game="$GameType | ||
| $"?Mutator=UT99CrowdControl.CrowdControl" | ||
| $"?Tournament="$Rung | ||
| $"?Name="$GetPlayerOwner().PlayerReplicationInfo.PlayerName | ||
| $"?Team=0"; | ||
|
|
||
| Root.SetMousePos((Root.WinWidth*Root.GUIScale)/2, (Root.WinHeight*Root.GUIScale)/2); | ||
| Root.Console.CloseUWindow(); | ||
| if ( TournamentGameInfo(GetPlayerOwner().Level.Game) != None ) | ||
| TournamentGameInfo(GetPlayerOwner().Level.Game).LadderTransition(StartMap); | ||
| else | ||
| GetPlayerOwner().ClientTravel(StartMap, TRAVEL_Absolute, True); | ||
| } | ||
|
|
||
|
|
||
| function NextPressed() | ||
| { | ||
| local ObjectiveBrowser OB; | ||
|
|
||
| if (PendingPos > ArrowPos) | ||
| return; | ||
|
|
||
| HideWindow(); | ||
| OB = UT99CCObjectiveBrowser(Root.CreateWindow(class'UT99CCObjectiveBrowser', 100, 100, 200, 200, Root, True)); | ||
| OB.LadderWindow = Self; | ||
| OB.Ladder = Ladder; | ||
| OB.Match = SelectedMatch; | ||
| OB.GameType = GameType; | ||
| OB.Initialize(); | ||
| } | ||
|
|
||
| function BackPressed() | ||
| { | ||
| Root.CreateWindow(class'UT99CCManagerWindow', 100, 100, 200, 200, Root, True); | ||
| Close(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| class UT99CCLadderCTF extends UTMenu.UTLadderCTF; | ||
|
|
||
| //This only hits the tutorial... sigh | ||
| function StartMap(string StartMap, int Rung, string GameType) | ||
| { | ||
| local Class<GameInfo> GameClass; | ||
|
|
||
| GameClass = Class<GameInfo>(DynamicLoadObject(GameType, Class'Class')); | ||
| GameClass.Static.ResetGame(); | ||
|
|
||
| StartMap = StartMap | ||
| $"?Game="$GameType | ||
| $"?Mutator=UT99CrowdControl.CrowdControl" | ||
| $"?Tournament="$Rung | ||
| $"?Name="$GetPlayerOwner().PlayerReplicationInfo.PlayerName | ||
| $"?Team=0"; | ||
| Root.SetMousePos((Root.WinWidth*Root.GUIScale)/2, (Root.WinHeight*Root.GUIScale)/2); | ||
| Root.Console.CloseUWindow(); | ||
| if ( TournamentGameInfo(GetPlayerOwner().Level.Game) != None ) | ||
| TournamentGameInfo(GetPlayerOwner().Level.Game).LadderTransition(StartMap); | ||
| else | ||
| GetPlayerOwner().ClientTravel(StartMap, TRAVEL_Absolute, True); | ||
| } | ||
| function NextPressed() | ||
| { | ||
| local TeamBrowser TB; | ||
| local string MapName; | ||
| if (PendingPos > ArrowPos) | ||
| return; | ||
| if (SelectedMatch == 0) | ||
| { | ||
| MapName = LadderObj.CurrentLadder.Default.MapPrefix$Ladder.Static.GetMap(0); | ||
| if (class'UTLadderStub'.Static.IsDemo()) | ||
| { | ||
| if (class'UTLadderStub'.Static.DemoHasTuts()) | ||
| { | ||
| CloseUp(); | ||
| StartMap(MapName, 0, "Botpack.TrainingCTF"); | ||
| } | ||
| } else { | ||
| CloseUp(); | ||
| StartMap(MapName, 0, "Botpack.TrainingCTF"); | ||
| } | ||
| } else { | ||
| if (LadderObj.CurrentLadder.Default.DemoDisplay[SelectedMatch] == 1) | ||
| return; | ||
|
|
||
| HideWindow(); | ||
| TB = UT99CCTeamBrowser(Root.CreateWindow(class'UT99CCTeamBrowser', 100, 100, 200, 200, Root, True)); | ||
| TB.LadderWindow = Self; | ||
| TB.Ladder = LadderObj.CurrentLadder; | ||
| TB.Match = SelectedMatch; | ||
| TB.GameType = GameType; | ||
| TB.Initialize(); | ||
| } | ||
| } | ||
|
|
||
| function BackPressed() | ||
| { | ||
| Root.CreateWindow(class'UT99CCManagerWindow', 100, 100, 200, 200, Root, True); | ||
| Close(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| class UT99CCLadderChal extends UTMenu.UTLadderChal; | ||
|
|
||
| //This only hits the tutorial... sigh | ||
| function StartMap(string StartMap, int Rung, string GameType) | ||
| { | ||
| local Class<GameInfo> GameClass; | ||
|
|
||
| GameClass = Class<GameInfo>(DynamicLoadObject(GameType, Class'Class')); | ||
| GameClass.Static.ResetGame(); | ||
|
|
||
| StartMap = StartMap | ||
| $"?Game="$GameType | ||
| $"?Mutator=UT99CrowdControl.CrowdControl" | ||
| $"?Tournament="$Rung | ||
| $"?Name="$GetPlayerOwner().PlayerReplicationInfo.PlayerName | ||
| $"?Team=0"; | ||
| Root.SetMousePos((Root.WinWidth*Root.GUIScale)/2, (Root.WinHeight*Root.GUIScale)/2); | ||
| Root.Console.CloseUWindow(); | ||
| if ( TournamentGameInfo(GetPlayerOwner().Level.Game) != None ) | ||
| TournamentGameInfo(GetPlayerOwner().Level.Game).LadderTransition(StartMap); | ||
| else | ||
| GetPlayerOwner().ClientTravel(StartMap, TRAVEL_Absolute, True); | ||
| } | ||
| function NextPressed() | ||
| { | ||
| local EnemyBrowser EB; | ||
| if (PendingPos > ArrowPos) | ||
| return; | ||
| HideWindow(); | ||
| EB = UT99CCEnemyBrowser(Root.CreateWindow(class'UT99CCEnemyBrowser', 100, 100, 200, 200, Root, True)); | ||
| EB.LadderWindow = Self; | ||
| EB.Ladder = Ladder; | ||
| EB.Match = SelectedMatch; | ||
| if (SelectedMatch == 3) | ||
| EB.GameType = "Botpack.ChallengeDMP"; | ||
| else | ||
| EB.GameType = GameType; | ||
| EB.Initialize(); | ||
| } | ||
|
|
||
| function BackPressed() | ||
| { | ||
| Root.CreateWindow(class'UT99CCManagerWindow', 100, 100, 200, 200, Root, True); | ||
| Close(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| class UT99CCLadderDM extends UTMenu.UTLadderDM; | ||
|
|
||
| //This only hits the tutorial... sigh | ||
| function StartMap(string StartMap, int Rung, string GameType) | ||
| { | ||
| local Class<GameInfo> GameClass; | ||
|
|
||
| GameClass = Class<GameInfo>(DynamicLoadObject(GameType, Class'Class')); | ||
| GameClass.Static.ResetGame(); | ||
|
|
||
| StartMap = StartMap | ||
| $"?Game="$GameType | ||
| $"?Mutator=UT99CrowdControl.CrowdControl" | ||
| $"?Tournament="$Rung | ||
| $"?Name="$GetPlayerOwner().PlayerReplicationInfo.PlayerName | ||
| $"?Team=255"; | ||
| Root.Console.CloseUWindow(); | ||
| if ( TournamentGameInfo(GetPlayerOwner().Level.Game) != None ) | ||
| TournamentGameInfo(GetPlayerOwner().Level.Game).LadderTransition(StartMap); | ||
| else | ||
| GetPlayerOwner().ClientTravel(StartMap, TRAVEL_Absolute, True); | ||
| } | ||
| function NextPressed() | ||
| { | ||
| local EnemyBrowser EB; | ||
| local string MapName; | ||
| if (PendingPos > ArrowPos) | ||
| return; | ||
| if (SelectedMatch == 0) | ||
| { | ||
| MapName = LadderObj.CurrentLadder.Default.MapPrefix$Ladder.Static.GetMap(0); | ||
| if (class'UTLadderStub'.Static.IsDemo()) | ||
| { | ||
| if (class'UTLadderStub'.Static.DemoHasTuts()) | ||
| { | ||
| CloseUp(); | ||
| StartMap(MapName, 0, "Botpack.TrainingDM"); | ||
| } | ||
| } else { | ||
| CloseUp(); | ||
| StartMap(MapName, 0, "Botpack.TrainingDM"); | ||
| } | ||
| } else { | ||
| HideWindow(); | ||
| EB = UT99CCEnemyBrowser(Root.CreateWindow(class'UT99CCEnemyBrowser', 100, 100, 200, 200, Root, True)); | ||
| EB.LadderWindow = Self; | ||
| EB.Ladder = LadderObj.CurrentLadder; | ||
| EB.Match = SelectedMatch; | ||
| EB.GameType = GameType; | ||
| EB.Initialize(); | ||
| } | ||
| } | ||
|
|
||
| function BackPressed() | ||
| { | ||
| Root.CreateWindow(class'UT99CCManagerWindow', 100, 100, 200, 200, Root, True); | ||
| Close(); | ||
| } |
Oops, something went wrong.