mirror of
https://github.com/Gurge44/EndlessHostRoles.git
synced 2026-10-20 01:46:25 +00:00
fix & balance Mingle
This commit is contained in:
Gurge44 committed
1 parent
b29f08f599
commit
fbdaae733d
2 files changed
+122
-118
No files matched your search
+6
-5
@@ -46,15 +46,15 @@ public static class Mingle
|
||||
.SetColor(color)
|
||||
.SetGameMode(gameMode);
|
||||
|
||||
TimeDecreaseOnNoDeathOption = new IntegerOptionItem(id++, "Mingle.TimeDecreaseOnNoDeathOption", new(0, 60, 1), 5, tab)
|
||||
TimeDecreaseOnNoDeathOption = new IntegerOptionItem(id++, "Mingle.TimeDecreaseOnNoDeathOption", new(0, 60, 1), 10, tab)
|
||||
.SetColor(color)
|
||||
.SetGameMode(gameMode);
|
||||
|
||||
ExtraTimeOnAirshipOption = new IntegerOptionItem(id++, "Mingle.ExtraTimeOnAirshipOption", new(0, 300, 1), 20, tab)
|
||||
ExtraTimeOnAirshipOption = new IntegerOptionItem(id++, "Mingle.ExtraTimeOnAirshipOption", new(0, 300, 1), 10, tab)
|
||||
.SetColor(color)
|
||||
.SetGameMode(gameMode);
|
||||
|
||||
ExtraTimeOnFungleOption = new IntegerOptionItem(id++, "Mingle.ExtraTimeOnFungleOption", new(0, 300, 1), 10, tab)
|
||||
ExtraTimeOnFungleOption = new IntegerOptionItem(id++, "Mingle.ExtraTimeOnFungleOption", new(0, 300, 1), 5, tab)
|
||||
.SetColor(color)
|
||||
.SetGameMode(gameMode);
|
||||
|
||||
@@ -62,7 +62,7 @@ public static class Mingle
|
||||
.SetColor(color)
|
||||
.SetGameMode(gameMode);
|
||||
|
||||
MinTimeOption = new IntegerOptionItem(id++, "Mingle.MinTimeOption", new(1, 300, 1), 15, tab)
|
||||
MinTimeOption = new IntegerOptionItem(id++, "Mingle.MinTimeOption", new(1, 300, 1), 10, tab)
|
||||
.SetColor(color)
|
||||
.SetGameMode(gameMode);
|
||||
|
||||
@@ -73,7 +73,7 @@ public static class Mingle
|
||||
|
||||
public static string GetSuffix(PlayerControl seer)
|
||||
{
|
||||
return seer.IsModdedClient() ? string.Empty : GetRoomsInfo(seer, false);
|
||||
return seer.IsHost() ? string.Empty : GetRoomsInfo(seer, false);
|
||||
}
|
||||
|
||||
public static int GetSurvivalTime(byte id)
|
||||
@@ -296,6 +296,7 @@ public static class Mingle
|
||||
break;
|
||||
case var x when x == aapc.Length:
|
||||
Main.AllPlayerSpeed.SetAllValues(Main.RealOptionsData.GetFloat(FloatOptionNames.PlayerSpeedMod));
|
||||
Main.PlayerStates.Values.DoIf(s => !s.IsDead, s => s.SetDead());
|
||||
CustomWinnerHolder.ResetAndSetWinner(CustomWinner.None);
|
||||
GameGoing = false;
|
||||
break;
|
||||
|
||||
+116
-113
@@ -205,129 +205,132 @@ internal static class SetEverythingUpPatch
|
||||
var additionalWinnerText = string.Empty;
|
||||
string customWinnerColor = Utils.GetRoleColorCode(CustomRoles.Crewmate);
|
||||
|
||||
switch (Options.CurrentGameMode)
|
||||
if (CustomWinnerHolder.WinnerTeam is not (CustomWinner.None or CustomWinner.Draw or CustomWinner.Error))
|
||||
{
|
||||
case CustomGameMode.SoloKombat:
|
||||
switch (Options.CurrentGameMode)
|
||||
{
|
||||
__instance.BackgroundBar.material.color = new Color32(245, 82, 82, 255);
|
||||
customWinnerText = CustomWinnerHolder.WinnerIds.Select(x => x.ColoredPlayerName()).Join() + GetString("Win");
|
||||
customWinnerColor = "#f55252";
|
||||
additionalWinnerText = "\n" + string.Format(GetString("SoloKombat.WinnersKillCount"), SoloPVP.KBScore[CustomWinnerHolder.WinnerIds.First()]);
|
||||
goto Skip;
|
||||
}
|
||||
case CustomGameMode.FFA:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = new Color32(0, 255, 255, 255);
|
||||
winnerText.text = FreeForAll.FFATeamMode.GetBool() ? string.Empty : Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.MoveAndStop:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = new Color32(0, 255, 165, 255);
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.HotPotato:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = new Color32(232, 205, 70, 255);
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.Speedrun:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = Utils.GetRoleColor(CustomRoles.Speedrunner);
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.CaptureTheFlag:
|
||||
{
|
||||
(Color Color, string Team) winnerData = CaptureTheFlag.WinnerData;
|
||||
__instance.BackgroundBar.material.color = winnerData.Color;
|
||||
winnerText.text = winnerData.Team;
|
||||
winnerText.color = winnerData.Color;
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.NaturalDisasters:
|
||||
{
|
||||
var ndColor = new Color32(3, 252, 74, 255);
|
||||
__instance.BackgroundBar.material.color = ndColor;
|
||||
|
||||
if (CustomWinnerHolder.WinnerIds.Count <= 1)
|
||||
case CustomGameMode.SoloKombat:
|
||||
{
|
||||
__instance.BackgroundBar.material.color = new Color32(245, 82, 82, 255);
|
||||
customWinnerText = CustomWinnerHolder.WinnerIds.Select(x => x.ColoredPlayerName()).Join() + GetString("Win");
|
||||
customWinnerColor = "#f55252";
|
||||
additionalWinnerText = "\n" + string.Format(GetString("SoloKombat.WinnersKillCount"), SoloPVP.KBScore[CustomWinnerHolder.WinnerIds.First()]);
|
||||
goto Skip;
|
||||
}
|
||||
case CustomGameMode.FFA:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = new Color32(0, 255, 255, 255);
|
||||
winnerText.text = FreeForAll.FFATeamMode.GetBool() ? string.Empty : Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.MoveAndStop:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = new Color32(0, 255, 165, 255);
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
else
|
||||
case CustomGameMode.HotPotato:
|
||||
{
|
||||
winnerText.text = CustomWinnerHolder.WinnerIds.Select(x => x.ColoredPlayerName()).Join() + GetString("Win");
|
||||
winnerText.color = ndColor;
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = new Color32(232, 205, 70, 255);
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.Speedrun:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = Utils.GetRoleColor(CustomRoles.Speedrunner);
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.CaptureTheFlag:
|
||||
{
|
||||
(Color Color, string Team) winnerData = CaptureTheFlag.WinnerData;
|
||||
__instance.BackgroundBar.material.color = winnerData.Color;
|
||||
winnerText.text = winnerData.Team;
|
||||
winnerText.color = winnerData.Color;
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.NaturalDisasters:
|
||||
{
|
||||
var ndColor = new Color32(3, 252, 74, 255);
|
||||
__instance.BackgroundBar.material.color = ndColor;
|
||||
|
||||
if (CustomWinnerHolder.WinnerIds.Count <= 1)
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
}
|
||||
else
|
||||
{
|
||||
winnerText.text = CustomWinnerHolder.WinnerIds.Select(x => x.ColoredPlayerName()).Join() + GetString("Win");
|
||||
winnerText.color = ndColor;
|
||||
}
|
||||
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.RoomRush:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = new Color32(255, 171, 27, 255);
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.KingOfTheZones:
|
||||
{
|
||||
(Color Color, string Team) winnerData = KingOfTheZones.WinnerData;
|
||||
__instance.BackgroundBar.material.color = winnerData.Color;
|
||||
winnerText.text = winnerData.Team;
|
||||
winnerText.color = winnerData.Color;
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.Quiz:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = Utils.GetRoleColor(CustomRoles.QuizMaster);
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.TheMindGame:
|
||||
{
|
||||
__instance.BackgroundBar.material.color = Color.yellow;
|
||||
winnerText.text = CustomWinnerHolder.WinnerIds.Select(x => x.ColoredPlayerName()).Join() + GetString("Win");
|
||||
winnerText.color = Color.yellow;
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.BedWars:
|
||||
{
|
||||
(Color Color, string Team) winnerData = BedWars.WinnerData;
|
||||
__instance.BackgroundBar.material.color = winnerData.Color;
|
||||
winnerText.text = winnerData.Team;
|
||||
winnerText.color = winnerData.Color;
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.Deathrace:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = Utils.GetRoleColor(CustomRoles.Racer);
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.Mingle:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = Utils.GetRoleColor(CustomRoles.MinglePlayer);
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.RoomRush:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = new Color32(255, 171, 27, 255);
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.KingOfTheZones:
|
||||
{
|
||||
(Color Color, string Team) winnerData = KingOfTheZones.WinnerData;
|
||||
__instance.BackgroundBar.material.color = winnerData.Color;
|
||||
winnerText.text = winnerData.Team;
|
||||
winnerText.color = winnerData.Color;
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.Quiz:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = Utils.GetRoleColor(CustomRoles.QuizMaster);
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.TheMindGame:
|
||||
{
|
||||
__instance.BackgroundBar.material.color = Color.yellow;
|
||||
winnerText.text = CustomWinnerHolder.WinnerIds.Select(x => x.ColoredPlayerName()).Join() + GetString("Win");
|
||||
winnerText.color = Color.yellow;
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.BedWars:
|
||||
{
|
||||
(Color Color, string Team) winnerData = BedWars.WinnerData;
|
||||
__instance.BackgroundBar.material.color = winnerData.Color;
|
||||
winnerText.text = winnerData.Team;
|
||||
winnerText.color = winnerData.Color;
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.Deathrace:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = Utils.GetRoleColor(CustomRoles.Racer);
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
case CustomGameMode.Mingle:
|
||||
{
|
||||
byte winnerId = CustomWinnerHolder.WinnerIds.FirstOrDefault();
|
||||
__instance.BackgroundBar.material.color = Utils.GetRoleColor(CustomRoles.MinglePlayer);
|
||||
winnerText.text = Main.AllPlayerNames[winnerId] + GetString("Win");
|
||||
winnerText.color = Main.PlayerColors[winnerId];
|
||||
goto EndOfText;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user