From 446d327df7c33d12536b473c5a1349c8ba7b1658 Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Mon, 5 Jul 2021 06:53:26 +0300 Subject: [PATCH] wip --- YAS/Classes/CustomRanks.uc | 4 +- YAS/Classes/KFScoreBoard.uc | 61 +--- YAS/Classes/ScoreboardStyle.uc | 503 +++++++++++++++++--------------- YAS/Classes/SystemAdminRank.uc | 3 +- YAS/Classes/SystemPlayerRank.uc | 3 +- YAS/Classes/Types.uc | 236 ++++++++------- 6 files changed, 405 insertions(+), 405 deletions(-) diff --git a/YAS/Classes/CustomRanks.uc b/YAS/Classes/CustomRanks.uc index d20e3c9..0b645b7 100644 --- a/YAS/Classes/CustomRanks.uc +++ b/YAS/Classes/CustomRanks.uc @@ -33,7 +33,9 @@ public static function InitConfig(int ConfigVersion) ExampleRank.TextColor.B = 130; ExampleRank.OverrideAdminRank = false; default.Rank.AddItem(ExampleRank); - + + case 1: + case 2147483647: StaticSaveConfig(); } diff --git a/YAS/Classes/KFScoreBoard.uc b/YAS/Classes/KFScoreBoard.uc index c0909ba..72af7f6 100644 --- a/YAS/Classes/KFScoreBoard.uc +++ b/YAS/Classes/KFScoreBoard.uc @@ -502,39 +502,12 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float Canvas.TextSize("ABC", XL, YL, FontScalar, FontScalar); TextYOffset = YOffset + (Height * 0.5f) - (YL * 0.5f); - // change rect color by HP - if (!KFPRI.bReadyToPlay && KFGRI.bMatchHasBegun) - { - SetDrawColor(C, Settings.Style.LeftStateBoxColor); - } - else if (!KFGRI.bMatchHasBegun) - { - SetDrawColor(C, Settings.Style.LeftStateBoxColor); - } - else if (bIsZED && KFTeamInfo_Zeds(GetPlayer().PlayerReplicationInfo.Team) == None) - { - SetDrawColor(C, Settings.Style.LeftStateBoxColor); - } - else if (KFPRI.PlayerHealth <= 0 || KFPRI.PlayerHealthPercent <= 0) - { - SetDrawColor(C, Settings.Style.LeftStateBoxColorDead); - } - else - { - if (ByteToFloat(KFPRI.PlayerHealthPercent) >= float(Settings.State.High) / 100.0) - SetDrawColor(C, Settings.Style.LeftStateBoxColorHigh); - else if (ByteToFloat(KFPRI.PlayerHealthPercent) >= float(Settings.State.Low) / 100.0) - SetDrawColor(C, Settings.Style.LeftStateBoxColorMid); - else - SetDrawColor(C, Settings.Style.LeftStateBoxColorLow); - } - if (KFPRIArray.Length > 1 && Index == 0) - Shape = Settings.Style.ShapeLeftStateBoxTopPlayer; + Shape = Settings.Style.ShapeStateHealthBoxTopPlayer; else if (KFPRIArray.Length > 1 && Index == KFPRIArray.Length - 1) - Shape = Settings.Style.ShapeLeftStateBoxBottomPlayer; + Shape = Settings.Style.ShapeStateHealthBoxBottomPlayer; else - Shape = Settings.Style.ShapeLeftStateBoxMidPlayer; + Shape = Settings.Style.ShapeStateHealthBoxMidPlayer; // Health Owner.CurrentStyle.DrawRectBox(XPos, @@ -564,7 +537,7 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float } else if (bIsZED && KFTeamInfo_Zeds(GetPlayer().PlayerReplicationInfo.Team) == None) { - SetDrawColor(C, Settings.Style.StateTextColor); + SetDrawColor(C, Settings.Style.StateTextColorHealthUnknown); S = Unknown; } else if (KFPRI.PlayerHealth <= 0 || KFPRI.PlayerHealthPercent <= 0) @@ -582,12 +555,12 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float } else { - if (ByteToFloat(KFPRI.PlayerHealthPercent) >= float(Settings.State.High) / 100.0) - SetDrawColor(C, Settings.Style.StateTextColorHighHP); - else if (ByteToFloat(KFPRI.PlayerHealthPercent) >= float(Settings.State.Low) / 100.0) - SetDrawColor(C, Settings.Style.StateTextColorMidHP); + if (ByteToFloat(KFPRI.PlayerHealthPercent) >= float(Settings.Health.High) / 100.0) + SetDrawColor(C, Settings.Style.StateTextColorHealthHigh); + else if (ByteToFloat(KFPRI.PlayerHealthPercent) >= float(Settings.Health.Low) / 100.0) + SetDrawColor(C, Settings.Style.StateTextColorHealthMid); else - SetDrawColor(C, Settings.Style.StateTextColorLowHP); + SetDrawColor(C, Settings.Style.StateTextColorHealthLow); S = String(KFPRI.PlayerHealth); } @@ -724,8 +697,6 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float if (CurrentRank.ApplyColorToFields.Level) SetDrawColor(C, CurrentRank.TextColor); - else - SetDrawColor(C, Settings.Style.LevelTextColor); S = KFPRI.CurrentPerkClass.default.PerkName; DrawTextShadowHLeftVCenter(S, PerkXPos, TextYOffset, FontScalar); } @@ -733,8 +704,6 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float { if (CurrentRank.ApplyColorToFields.Perk) SetDrawColor(C, CurrentRank.TextColor); - else - SetDrawColor(C, Settings.Style.PerkTextColor); S = NoPerk; DrawTextShadowHLeftVCenter(S, PerkXPos, TextYOffset, FontScalar); RealPlayerWBox = PerkXPos - PlayerXPos; @@ -772,15 +741,11 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float // Kill if (CurrentRank.ApplyColorToFields.Kills) SetDrawColor(C, CurrentRank.TextColor); - else - SetDrawColor(C, Settings.Style.KillsTextColor); DrawTextShadowHVCenter(string (KFPRI.Kills), KillsXPos, TextYOffset, KillsWBox, FontScalar); // Assist if (CurrentRank.ApplyColorToFields.Assists) SetDrawColor(C, CurrentRank.TextColor); - else - SetDrawColor(C, Settings.Style.AssistsTextColor); DrawTextShadowHVCenter(string (KFPRI.Assists), AssistXPos, TextYOffset, AssistWBox, FontScalar); // Dosh @@ -793,8 +758,6 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float { if (CurrentRank.ApplyColorToFields.Dosh) SetDrawColor(C, CurrentRank.TextColor); - else - SetDrawColor(C, Settings.Style.DoshTextColor); StrValue = String(int(KFPRI.Score)); //StrValue = GetNiceSize(int(KFPRI.Score)); } DrawTextShadowHVCenter(StrValue, DoshXPos, TextYOffset, DoshWBox, FontScalar); @@ -802,7 +765,7 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float // Ping if (KFPRI.bBot) { - SetDrawColor(C, Settings.Style.PingTextColor); + SetDrawColor(C, Settings.Style.PingTextColorNone); S = "-"; } else @@ -822,9 +785,9 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float } C.TextSize(S, XL, YL, FontScalar, FontScalar); - DrawTextShadowHVCenter(S, PingXPos, TextYOffset, Settings.Ping.ShowPingBars ? PingWBox/2 : PingWBox, FontScalar); + DrawTextShadowHVCenter(S, PingXPos, TextYOffset, Settings.Style.ShowPingBars ? PingWBox/2 : PingWBox, FontScalar); C.SetDrawColor(250, 250, 250, 255); - if (Settings.Ping.ShowPingBars) + if (Settings.Style.ShowPingBars) DrawPingBars(C, YOffset + (Height/2) - ((Height*0.5)/2), Width - (Height*0.5) - (BorderSize*2), Height*0.5, Height*0.5, float(Ping)); } diff --git a/YAS/Classes/ScoreboardStyle.uc b/YAS/Classes/ScoreboardStyle.uc index f058db4..06beb8d 100644 --- a/YAS/Classes/ScoreboardStyle.uc +++ b/YAS/Classes/ScoreboardStyle.uc @@ -12,9 +12,12 @@ var config int ShapeGameInfoBox; var config int ShapeWaveInfoBox; var config int ShapePlayersCountBox; var config int ShapeHeaderBox; -var config int ShapeLeftStateBoxTopPlayer; -var config int ShapeLeftStateBoxMidPlayer; -var config int ShapeLeftStateBoxBottomPlayer; +var config int ShapeStateHealthBoxTopPlayer; +var config int ShapeStateHealthBoxMidPlayer; +var config int ShapeStateHealthBoxBottomPlayer; +var config int ShapeStateArmorBoxTopPlayer; +var config int ShapeStateArmorBoxMidPlayer; +var config int ShapeStateArmorBoxBottomPlayer; var config int ShapePlayerBoxTopPlayer; var config int ShapePlayerBoxMidPlayer; var config int ShapePlayerBoxBottomPlayer; @@ -48,9 +51,9 @@ var config ColorRGBA StateBoxColorReady; var config ColorRGBA StateBoxColorNotReady; var config ColorRGBA StateBoxColorSpectator; var config ColorRGBA StateBoxColorDead; -var config ColorRGBA StateBoxColorHPLow; -var config ColorRGBA StateBoxColorHPMid; -var config ColorRGBA StateBoxColorHPHigh; +var config ColorRGBA StateBoxColorHealthLow; +var config ColorRGBA StateBoxColorHealthMid; +var config ColorRGBA StateBoxColorHealthHigh; var config ColorRGBA StateBoxColorArmorLow; var config ColorRGBA StateBoxColorArmorMid; var config ColorRGBA StateBoxColorArmorHigh; @@ -69,9 +72,10 @@ var config ColorRGBA StateTextColorReady; var config ColorRGBA StateTextColorNotReady; var config ColorRGBA StateTextColorSpectator; var config ColorRGBA StateTextColorDead; -var config ColorRGBA StateTextColorHPLow; -var config ColorRGBA StateTextColorHPMid; -var config ColorRGBA StateTextColorHPHigh; +var config ColorRGBA StateTextColorHealthUnknown; +var config ColorRGBA StateTextColorHealthLow; +var config ColorRGBA StateTextColorHealthMid; +var config ColorRGBA StateTextColorHealthHigh; var config ColorRGBA StateTextColorArmorLow; var config ColorRGBA StateTextColorArmorMid; var config ColorRGBA StateTextColorArmorHigh; @@ -117,6 +121,7 @@ var config ColorRGBA AssistsTextColorMid; var config ColorRGBA AssistsTextColorHigh; // Ping text +var config ColorRGBA PingTextColorNone; var config ColorRGBA PingTextColorLow; var config ColorRGBA PingTextColorMid; var config ColorRGBA PingTextColorHigh; @@ -145,57 +150,65 @@ public static function InitConfig(int ConfigVersion) WriteSettings(DefaultSettings()); case 1: - default.AssistsTextColorHigh = DefaultStyle.AssistsTextColorHigh; - default.AssistsTextColorLow = DefaultStyle.AssistsTextColorLow; - default.AssistsTextColorMid = DefaultStyle.AssistsTextColorMid; - default.bArmorBoxSmoothColorChange = DefaultStyle.bArmorBoxSmoothColorChange; - default.bArmorTextSmoothColorChange = DefaultStyle.bArmorTextSmoothColorChange; - default.bAssistsTextSmoothColorChange = DefaultStyle.bAssistsTextSmoothColorChange; - default.bDoshTextSmoothColorChange = DefaultStyle.bDoshTextSmoothColorChange; - default.bHealthBoxSmoothColorChange = DefaultStyle.bHealthBoxSmoothColorChange; - default.bHealthTextSmoothColorChange = DefaultStyle.bHealthTextSmoothColorChange; - default.bKillsTextSmoothColorChange = DefaultStyle.bKillsTextSmoothColorChange; - default.bLevelTextSmoothColorChange = DefaultStyle.bLevelTextSmoothColorChange; - default.bPingTextSmoothColorChange = DefaultStyle.bPingTextSmoothColorChange; - default.bShowPingBars = DefaultStyle.bShowPingBars; - default.DoshTextColorHigh = DefaultStyle.DoshTextColorHigh; - default.DoshTextColorLow = DefaultStyle.DoshTextColorLow; - default.DoshTextColorMid = DefaultStyle.DoshTextColorMid; - default.KillsTextColorHigh = DefaultStyle.KillsTextColorHigh; - default.KillsTextColorLow = DefaultStyle.KillsTextColorLow; - default.KillsTextColorMid = DefaultStyle.KillsTextColorMid; - default.LevelTextColorHigh = DefaultStyle.LevelTextColorHigh; - default.LevelTextColorLow = DefaultStyle.LevelTextColorLow; - default.LevelTextColorMid = DefaultStyle.LevelTextColorMid; - default.PerkBerserkerTextColor = DefaultStyle.PerkBerserkerTextColor; - default.PerkCommandoTextColor = DefaultStyle.PerkCommandoTextColor; - default.PerkDemolitionistTextColor = DefaultStyle.PerkDemolitionistTextColor; - default.PerkFieldMedicTextColor = DefaultStyle.PerkFieldMedicTextColor; - default.PerkFirebugTextColor = DefaultStyle.PerkFirebugTextColor; - default.PerkGunslingerTextColor = DefaultStyle.PerkGunslingerTextColor; - default.PerkNoneTextColor = DefaultStyle.PerkNoneTextColor; - default.PerkSharpshooterTextColor = DefaultStyle.PerkSharpshooterTextColor; - default.PerkSupportTextColor = DefaultStyle.PerkSupportTextColor; - default.PerkSurvivalistTextColor = DefaultStyle.PerkSurvivalistTextColor; - default.PerkSwatTextColor = DefaultStyle.PerkSwatTextColor; - default.StateBoxColorArmorHigh = DefaultStyle.StateBoxColorArmorHigh; - default.StateBoxColorArmorLow = DefaultStyle.StateBoxColorArmorLow; - default.StateBoxColorArmorMid = DefaultStyle.StateBoxColorArmorMid; - default.StateBoxColorDead = DefaultStyle.StateBoxColorDead; - default.StateBoxColorHPHigh = DefaultStyle.StateBoxColorHPHigh; - default.StateBoxColorHPLow = DefaultStyle.StateBoxColorHPLow; - default.StateBoxColorHPMid = DefaultStyle.StateBoxColorHPMid; - default.StateBoxColorLobby = DefaultStyle.StateBoxColorLobby; - default.StateBoxColorNotReady = DefaultStyle.StateBoxColorNotReady; - default.StateBoxColorReady = DefaultStyle.StateBoxColorReady; - default.StateBoxColorSpectator = DefaultStyle.StateBoxColorSpectator; - default.StateTextColorArmorHigh = DefaultStyle.StateTextColorArmorHigh; - default.StateTextColorArmorLow = DefaultStyle.StateTextColorArmorLow; - default.StateTextColorArmorMid = DefaultStyle.StateTextColorArmorMid; - default.StateTextColorHPHigh = DefaultStyle.StateTextColorHPHigh; - default.StateTextColorHPLow = DefaultStyle.StateTextColorHPLow; - default.StateTextColorHPMid = DefaultStyle.StateTextColorHPMid; - default.StatsOwnerBoxColor = DefaultStyle.StatsOwnerBoxColor; + default.AssistsTextColorHigh = DefaultStyle.AssistsTextColorHigh; + default.AssistsTextColorLow = DefaultStyle.AssistsTextColorLow; + default.AssistsTextColorMid = DefaultStyle.AssistsTextColorMid; + default.bArmorBoxSmoothColorChange = DefaultStyle.ArmorBoxSmoothColorChange; + default.bArmorTextSmoothColorChange = DefaultStyle.ArmorTextSmoothColorChange; + default.bAssistsTextSmoothColorChange = DefaultStyle.AssistsTextSmoothColorChange; + default.bDoshTextSmoothColorChange = DefaultStyle.DoshTextSmoothColorChange; + default.bHealthBoxSmoothColorChange = DefaultStyle.HealthBoxSmoothColorChange; + default.bHealthTextSmoothColorChange = DefaultStyle.HealthTextSmoothColorChange; + default.bKillsTextSmoothColorChange = DefaultStyle.KillsTextSmoothColorChange; + default.bLevelTextSmoothColorChange = DefaultStyle.LevelTextSmoothColorChange; + default.bPingTextSmoothColorChange = DefaultStyle.PingTextSmoothColorChange; + default.bShowPingBars = DefaultStyle.ShowPingBars; + default.DoshTextColorHigh = DefaultStyle.DoshTextColorHigh; + default.DoshTextColorLow = DefaultStyle.DoshTextColorLow; + default.DoshTextColorMid = DefaultStyle.DoshTextColorMid; + default.KillsTextColorHigh = DefaultStyle.KillsTextColorHigh; + default.KillsTextColorLow = DefaultStyle.KillsTextColorLow; + default.KillsTextColorMid = DefaultStyle.KillsTextColorMid; + default.LevelTextColorHigh = DefaultStyle.LevelTextColorHigh; + default.LevelTextColorLow = DefaultStyle.LevelTextColorLow; + default.LevelTextColorMid = DefaultStyle.LevelTextColorMid; + default.PerkBerserkerTextColor = DefaultStyle.PerkBerserkerTextColor; + default.PerkCommandoTextColor = DefaultStyle.PerkCommandoTextColor; + default.PerkDemolitionistTextColor = DefaultStyle.PerkDemolitionistTextColor; + default.PerkFieldMedicTextColor = DefaultStyle.PerkFieldMedicTextColor; + default.PerkFirebugTextColor = DefaultStyle.PerkFirebugTextColor; + default.PerkGunslingerTextColor = DefaultStyle.PerkGunslingerTextColor; + default.PerkNoneTextColor = DefaultStyle.PerkNoneTextColor; + default.PerkSharpshooterTextColor = DefaultStyle.PerkSharpshooterTextColor; + default.PerkSupportTextColor = DefaultStyle.PerkSupportTextColor; + default.PerkSurvivalistTextColor = DefaultStyle.PerkSurvivalistTextColor; + default.PerkSwatTextColor = DefaultStyle.PerkSwatTextColor; + default.StateBoxColorArmorHigh = DefaultStyle.StateBoxColorArmorHigh; + default.StateBoxColorArmorLow = DefaultStyle.StateBoxColorArmorLow; + default.StateBoxColorArmorMid = DefaultStyle.StateBoxColorArmorMid; + default.StateBoxColorDead = DefaultStyle.StateBoxColorDead; + default.StateBoxColorHealthHigh = DefaultStyle.StateBoxColorHealthHigh; + default.StateBoxColorHealthLow = DefaultStyle.StateBoxColorHealthLow; + default.StateBoxColorHealthMid = DefaultStyle.StateBoxColorHealthMid; + default.StateBoxColorLobby = DefaultStyle.StateBoxColorLobby; + default.StateBoxColorNotReady = DefaultStyle.StateBoxColorNotReady; + default.StateBoxColorReady = DefaultStyle.StateBoxColorReady; + default.StateBoxColorSpectator = DefaultStyle.StateBoxColorSpectator; + default.StateTextColorArmorHigh = DefaultStyle.StateTextColorArmorHigh; + default.StateTextColorArmorLow = DefaultStyle.StateTextColorArmorLow; + default.StateTextColorArmorMid = DefaultStyle.StateTextColorArmorMid; + default.StateTextColorHealthUnknown = DefaultStyle.StateTextColorHealthUnknown; + default.StateTextColorHealthHigh = DefaultStyle.StateTextColorHealthHigh; + default.StateTextColorHealthLow = DefaultStyle.StateTextColorHealthLow; + default.StateTextColorHealthMid = DefaultStyle.StateTextColorHealthMid; + default.StatsOwnerBoxColor = DefaultStyle.StatsOwnerBoxColor; + default.ShapeStateHealthBoxTopPlayer = DefaultStyle.ShapeStateHealthBoxTopPlayer; + default.ShapeStateHealthBoxMidPlayer = DefaultStyle.ShapeStateHealthBoxMidPlayer; + default.ShapeStateHealthBoxBottomPlayer = DefaultStyle.ShapeStateHealthBoxBottomPlayer; + default.ShapeStateArmorBoxTopPlayer = DefaultStyle.ShapeStateArmorBoxTopPlayer; + default.ShapeStateArmorBoxMidPlayer = DefaultStyle.ShapeStateArmorBoxMidPlayer; + default.ShapeStateArmorBoxBottomPlayer = DefaultStyle.ShapeStateArmorBoxBottomPlayer; + default.PingTextColorNone = DefaultStyle.PingTextColorNone; WriteSettings(Settings()); @@ -220,132 +233,137 @@ public static function YASStyle Settings() `callstack_static("Settings"); // Box shapes - Settings.EdgeSize = default.EdgeSize; - Settings.ShapeServerNameBox = default.ShapeServerNameBox; - Settings.ShapeGameInfoBox = default.ShapeGameInfoBox; - Settings.ShapeWaveInfoBox = default.ShapeWaveInfoBox; - Settings.ShapePlayersCountBox = default.ShapePlayersCountBox; - Settings.ShapeHeaderBox = default.ShapeHeaderBox; - Settings.ShapeLeftStateBoxTopPlayer = default.ShapeLeftStateBoxTopPlayer; - Settings.ShapeLeftStateBoxMidPlayer = default.ShapeLeftStateBoxMidPlayer; - Settings.ShapeLeftStateBoxBottomPlayer = default.ShapeLeftStateBoxBottomPlayer; - Settings.ShapePlayerBoxTopPlayer = default.ShapePlayerBoxTopPlayer; - Settings.ShapePlayerBoxMidPlayer = default.ShapePlayerBoxMidPlayer; - Settings.ShapePlayerBoxBottomPlayer = default.ShapePlayerBoxBottomPlayer; - Settings.ShapeStatsBoxTopPlayer = default.ShapeStatsBoxTopPlayer; - Settings.ShapeStatsBoxMidPlayer = default.ShapeStatsBoxMidPlayer; - Settings.ShapeStatsBoxBottomPlayer = default.ShapeStatsBoxBottomPlayer; + Settings.EdgeSize = default.EdgeSize; + Settings.ShapeServerNameBox = default.ShapeServerNameBox; + Settings.ShapeGameInfoBox = default.ShapeGameInfoBox; + Settings.ShapeWaveInfoBox = default.ShapeWaveInfoBox; + Settings.ShapePlayersCountBox = default.ShapePlayersCountBox; + Settings.ShapeHeaderBox = default.ShapeHeaderBox; + Settings.ShapeStateHealthBoxTopPlayer = default.ShapeStateHealthBoxTopPlayer; + Settings.ShapeStateHealthBoxMidPlayer = default.ShapeStateHealthBoxMidPlayer; + Settings.ShapeStateHealthBoxBottomPlayer = default.ShapeStateHealthBoxBottomPlayer; + Settings.ShapeStateArmorBoxTopPlayer = default.ShapeStateArmorBoxTopPlayer; + Settings.ShapeStateArmorBoxMidPlayer = default.ShapeStateArmorBoxMidPlayer; + Settings.ShapeStateArmorBoxBottomPlayer = default.ShapeStateArmorBoxBottomPlayer; + Settings.ShapePlayerBoxTopPlayer = default.ShapePlayerBoxTopPlayer; + Settings.ShapePlayerBoxMidPlayer = default.ShapePlayerBoxMidPlayer; + Settings.ShapePlayerBoxBottomPlayer = default.ShapePlayerBoxBottomPlayer; + Settings.ShapeStatsBoxTopPlayer = default.ShapeStatsBoxTopPlayer; + Settings.ShapeStatsBoxMidPlayer = default.ShapeStatsBoxMidPlayer; + Settings.ShapeStatsBoxBottomPlayer = default.ShapeStatsBoxBottomPlayer; // Server box - Settings.ServerNameBoxColor = default.ServerNameBoxColor; - Settings.ServerNameTextColor = default.ServerNameTextColor; + Settings.ServerNameBoxColor = default.ServerNameBoxColor; + Settings.ServerNameTextColor = default.ServerNameTextColor; // Game info box - Settings.GameInfoBoxColor = default.GameInfoBoxColor; - Settings.GameInfoTextColor = default.GameInfoTextColor; + Settings.GameInfoBoxColor = default.GameInfoBoxColor; + Settings.GameInfoTextColor = default.GameInfoTextColor; // Wave info box - Settings.WaveBoxColor = default.WaveBoxColor; - Settings.WaveTextColor = default.WaveTextColor; + Settings.WaveBoxColor = default.WaveBoxColor; + Settings.WaveTextColor = default.WaveTextColor; // Player count box - Settings.PlayerCountBoxColor = default.PlayerCountBoxColor; - Settings.PlayerCountTextColor = default.PlayerCountTextColor; + Settings.PlayerCountBoxColor = default.PlayerCountBoxColor; + Settings.PlayerCountTextColor = default.PlayerCountTextColor; // Header box - Settings.ListHeaderBoxColor = default.ListHeaderBoxColor; - Settings.ListHeaderTextColor = default.ListHeaderTextColor; + Settings.ListHeaderBoxColor = default.ListHeaderBoxColor; + Settings.ListHeaderTextColor = default.ListHeaderTextColor; // State box - Settings.StateBoxColorLobby = default.StateBoxColorLobby; - Settings.StateBoxColorReady = default.StateBoxColorReady; - Settings.StateBoxColorNotReady = default.StateBoxColorNotReady; - Settings.StateBoxColorSpectator = default.StateBoxColorSpectator; - Settings.StateBoxColorDead = default.StateBoxColorDead; - Settings.StateBoxColorHPLow = default.StateBoxColorHPLow; - Settings.StateBoxColorHPMid = default.StateBoxColorHPMid; - Settings.StateBoxColorHPHigh = default.StateBoxColorHPHigh; - Settings.StateBoxColorArmorLow = default.StateBoxColorArmorLow; - Settings.StateBoxColorArmorMid = default.StateBoxColorArmorMid; - Settings.StateBoxColorArmorHigh = default.StateBoxColorArmorHigh; + Settings.StateBoxColorLobby = default.StateBoxColorLobby; + Settings.StateBoxColorReady = default.StateBoxColorReady; + Settings.StateBoxColorNotReady = default.StateBoxColorNotReady; + Settings.StateBoxColorSpectator = default.StateBoxColorSpectator; + Settings.StateBoxColorDead = default.StateBoxColorDead; + Settings.StateBoxColorHealthLow = default.StateBoxColorHealthLow; + Settings.StateBoxColorHealthMid = default.StateBoxColorHealthMid; + Settings.StateBoxColorHealthHigh = default.StateBoxColorHealthHigh; + Settings.StateBoxColorArmorLow = default.StateBoxColorArmorLow; + Settings.StateBoxColorArmorMid = default.StateBoxColorArmorMid; + Settings.StateBoxColorArmorHigh = default.StateBoxColorArmorHigh; // Player box - Settings.PlayerOwnerBoxColor = default.PlayerOwnerBoxColor; - Settings.PlayerBoxColor = default.PlayerBoxColor; + Settings.PlayerOwnerBoxColor = default.PlayerOwnerBoxColor; + Settings.PlayerBoxColor = default.PlayerBoxColor; // Stats box - Settings.StatsOwnerBoxColor = default.StatsOwnerBoxColor; - Settings.StatsBoxColor = default.StatsBoxColor; + Settings.StatsOwnerBoxColor = default.StatsOwnerBoxColor; + Settings.StatsBoxColor = default.StatsBoxColor; // State text - Settings.StateTextColorLobby = default.StateTextColorLobby; - Settings.StateTextColorReady = default.StateTextColorReady; - Settings.StateTextColorNotReady = default.StateTextColorNotReady; - Settings.StateTextColorSpectator = default.StateTextColorSpectator; - Settings.StateTextColorDead = default.StateTextColorDead; - Settings.StateTextColorHPLow = default.StateTextColorHPLow; - Settings.StateTextColorHPMid = default.StateTextColorHPMid; - Settings.StateTextColorHPHigh = default.StateTextColorHPHigh; - Settings.StateTextColorArmorLow = default.StateTextColorArmorLow; - Settings.StateTextColorArmorMid = default.StateTextColorArmorMid; - Settings.StateTextColorArmorHigh = default.StateTextColorArmorHigh; + Settings.StateTextColorLobby = default.StateTextColorLobby; + Settings.StateTextColorReady = default.StateTextColorReady; + Settings.StateTextColorNotReady = default.StateTextColorNotReady; + Settings.StateTextColorSpectator = default.StateTextColorSpectator; + Settings.StateTextColorDead = default.StateTextColorDead; + Settings.StateTextColorHealthUnknown = default.StateTextColorHealthUnknown; + Settings.StateTextColorHealthLow = default.StateTextColorHealthLow; + Settings.StateTextColorHealthMid = default.StateTextColorHealthMid; + Settings.StateTextColorHealthHigh = default.StateTextColorHealthHigh; + Settings.StateTextColorArmorLow = default.StateTextColorArmorLow; + Settings.StateTextColorArmorMid = default.StateTextColorArmorMid; + Settings.StateTextColorArmorHigh = default.StateTextColorArmorHigh; // Rank text - Settings.RankTextColor = default.RankTextColor; + Settings.RankTextColor = default.RankTextColor; // Player text - Settings.PlayerNameTextColor = default.PlayerNameTextColor; + Settings.PlayerNameTextColor = default.PlayerNameTextColor; // Level text - Settings.LevelTextColorLow = default.LevelTextColorLow; - Settings.LevelTextColorMid = default.LevelTextColorMid; - Settings.LevelTextColorHigh = default.LevelTextColorHigh; + Settings.LevelTextColorLow = default.LevelTextColorLow; + Settings.LevelTextColorMid = default.LevelTextColorMid; + Settings.LevelTextColorHigh = default.LevelTextColorHigh; // Perk text - Settings.ZedTextColor = default.ZedTextColor; - Settings.PerkNoneTextColor = default.PerkNoneTextColor; - Settings.PerkBerserkerTextColor = default.PerkBerserkerTextColor; - Settings.PerkCommandoTextColor = default.PerkCommandoTextColor; - Settings.PerkSupportTextColor = default.PerkSupportTextColor; - Settings.PerkFieldMedicTextColor = default.PerkFieldMedicTextColor; - Settings.PerkDemolitionistTextColor = default.PerkDemolitionistTextColor; - Settings.PerkFirebugTextColor = default.PerkFirebugTextColor; - Settings.PerkGunslingerTextColor = default.PerkGunslingerTextColor; - Settings.PerkSharpshooterTextColor = default.PerkSharpshooterTextColor; - Settings.PerkSwatTextColor = default.PerkSwatTextColor; - Settings.PerkSurvivalistTextColor = default.PerkSurvivalistTextColor; + Settings.ZedTextColor = default.ZedTextColor; + Settings.PerkNoneTextColor = default.PerkNoneTextColor; + Settings.PerkBerserkerTextColor = default.PerkBerserkerTextColor; + Settings.PerkCommandoTextColor = default.PerkCommandoTextColor; + Settings.PerkSupportTextColor = default.PerkSupportTextColor; + Settings.PerkFieldMedicTextColor = default.PerkFieldMedicTextColor; + Settings.PerkDemolitionistTextColor = default.PerkDemolitionistTextColor; + Settings.PerkFirebugTextColor = default.PerkFirebugTextColor; + Settings.PerkGunslingerTextColor = default.PerkGunslingerTextColor; + Settings.PerkSharpshooterTextColor = default.PerkSharpshooterTextColor; + Settings.PerkSwatTextColor = default.PerkSwatTextColor; + Settings.PerkSurvivalistTextColor = default.PerkSurvivalistTextColor; // Dosh text - Settings.DoshTextColorLow = default.DoshTextColorLow; - Settings.DoshTextColorMid = default.DoshTextColorMid; - Settings.DoshTextColorHigh = default.DoshTextColorHigh; + Settings.DoshTextColorLow = default.DoshTextColorLow; + Settings.DoshTextColorMid = default.DoshTextColorMid; + Settings.DoshTextColorHigh = default.DoshTextColorHigh; // Kills text - Settings.KillsTextColorLow = default.KillsTextColorLow; - Settings.KillsTextColorMid = default.KillsTextColorMid; - Settings.KillsTextColorHigh = default.KillsTextColorHigh; + Settings.KillsTextColorLow = default.KillsTextColorLow; + Settings.KillsTextColorMid = default.KillsTextColorMid; + Settings.KillsTextColorHigh = default.KillsTextColorHigh; // Assists text - Settings.AssistsTextColorLow = default.AssistsTextColorLow; - Settings.AssistsTextColorMid = default.AssistsTextColorMid; - Settings.AssistsTextColorHigh = default.AssistsTextColorHigh; + Settings.AssistsTextColorLow = default.AssistsTextColorLow; + Settings.AssistsTextColorMid = default.AssistsTextColorMid; + Settings.AssistsTextColorHigh = default.AssistsTextColorHigh; // Ping text - Settings.PingTextColorLow = default.PingTextColorLow; - Settings.PingTextColorMid = default.PingTextColorMid; - Settings.PingTextColorHigh = default.PingTextColorHigh; + Settings.PingTextColorNone = default.PingTextColorNone; + Settings.PingTextColorLow = default.PingTextColorLow; + Settings.PingTextColorMid = default.PingTextColorMid; + Settings.PingTextColorHigh = default.PingTextColorHigh; // Other settings - Settings.bShowPingBars = default.bShowPingBars; - Settings.bHealthBoxSmoothColorChange = default.bHealthBoxSmoothColorChange; - Settings.bArmorBoxSmoothColorChange = default.bArmorBoxSmoothColorChange; - Settings.bHealthTextSmoothColorChange = default.bHealthTextSmoothColorChange; - Settings.bArmorTextSmoothColorChange = default.bArmorTextSmoothColorChange; - Settings.bLevelTextSmoothColorChange = default.bLevelTextSmoothColorChange; - Settings.bDoshTextSmoothColorChange = default.bDoshTextSmoothColorChange; - Settings.bKillsTextSmoothColorChange = default.bKillsTextSmoothColorChange; - Settings.bAssistsTextSmoothColorChange = default.bAssistsTextSmoothColorChange; - Settings.bPingTextSmoothColorChange = default.bPingTextSmoothColorChange; + Settings.ShowPingBars = default.bShowPingBars; + Settings.HealthBoxSmoothColorChange = default.bHealthBoxSmoothColorChange; + Settings.ArmorBoxSmoothColorChange = default.bArmorBoxSmoothColorChange; + Settings.HealthTextSmoothColorChange = default.bHealthTextSmoothColorChange; + Settings.ArmorTextSmoothColorChange = default.bArmorTextSmoothColorChange; + Settings.LevelTextSmoothColorChange = default.bLevelTextSmoothColorChange; + Settings.DoshTextSmoothColorChange = default.bDoshTextSmoothColorChange; + Settings.KillsTextSmoothColorChange = default.bKillsTextSmoothColorChange; + Settings.AssistsTextSmoothColorChange = default.bAssistsTextSmoothColorChange; + Settings.PingTextSmoothColorChange = default.bPingTextSmoothColorChange; return Settings; } @@ -355,132 +373,137 @@ public static function WriteSettings(YASStyle Settings) `callstack_static("WriteSettings"); // Box shapes - default.EdgeSize = Settings.EdgeSize; - default.ShapeServerNameBox = Settings.ShapeServerNameBox; - default.ShapeGameInfoBox = Settings.ShapeGameInfoBox; - default.ShapeWaveInfoBox = Settings.ShapeWaveInfoBox; - default.ShapePlayersCountBox = Settings.ShapePlayersCountBox; - default.ShapeHeaderBox = Settings.ShapeHeaderBox; - default.ShapeLeftStateBoxTopPlayer = Settings.ShapeLeftStateBoxTopPlayer; - default.ShapeLeftStateBoxMidPlayer = Settings.ShapeLeftStateBoxMidPlayer; - default.ShapeLeftStateBoxBottomPlayer = Settings.ShapeLeftStateBoxBottomPlayer; - default.ShapePlayerBoxTopPlayer = Settings.ShapePlayerBoxTopPlayer; - default.ShapePlayerBoxMidPlayer = Settings.ShapePlayerBoxMidPlayer; - default.ShapePlayerBoxBottomPlayer = Settings.ShapePlayerBoxBottomPlayer; - default.ShapeStatsBoxTopPlayer = Settings.ShapeStatsBoxTopPlayer; - default.ShapeStatsBoxMidPlayer = Settings.ShapeStatsBoxMidPlayer; - default.ShapeStatsBoxBottomPlayer = Settings.ShapeStatsBoxBottomPlayer; + default.EdgeSize = Settings.EdgeSize; + default.ShapeServerNameBox = Settings.ShapeServerNameBox; + default.ShapeGameInfoBox = Settings.ShapeGameInfoBox; + default.ShapeWaveInfoBox = Settings.ShapeWaveInfoBox; + default.ShapePlayersCountBox = Settings.ShapePlayersCountBox; + default.ShapeHeaderBox = Settings.ShapeHeaderBox; + default.ShapeStateHealthBoxTopPlayer = Settings.ShapeStateHealthBoxTopPlayer; + default.ShapeStateHealthBoxMidPlayer = Settings.ShapeStateHealthBoxMidPlayer; + default.ShapeStateHealthBoxBottomPlayer = Settings.ShapeStateHealthBoxBottomPlayer; + default.ShapeStateArmorBoxTopPlayer = Settings.ShapeStateArmorBoxTopPlayer; + default.ShapeStateArmorBoxMidPlayer = Settings.ShapeStateArmorBoxMidPlayer; + default.ShapeStateArmorBoxBottomPlayer = Settings.ShapeStateArmorBoxBottomPlayer; + default.ShapePlayerBoxTopPlayer = Settings.ShapePlayerBoxTopPlayer; + default.ShapePlayerBoxMidPlayer = Settings.ShapePlayerBoxMidPlayer; + default.ShapePlayerBoxBottomPlayer = Settings.ShapePlayerBoxBottomPlayer; + default.ShapeStatsBoxTopPlayer = Settings.ShapeStatsBoxTopPlayer; + default.ShapeStatsBoxMidPlayer = Settings.ShapeStatsBoxMidPlayer; + default.ShapeStatsBoxBottomPlayer = Settings.ShapeStatsBoxBottomPlayer; // Server box - default.ServerNameBoxColor = Settings.ServerNameBoxColor; - default.ServerNameTextColor = Settings.ServerNameTextColor; + default.ServerNameBoxColor = Settings.ServerNameBoxColor; + default.ServerNameTextColor = Settings.ServerNameTextColor; // Game info box - default.GameInfoBoxColor = Settings.GameInfoBoxColor; - default.GameInfoTextColor = Settings.GameInfoTextColor; + default.GameInfoBoxColor = Settings.GameInfoBoxColor; + default.GameInfoTextColor = Settings.GameInfoTextColor; // Wave info box - default.WaveBoxColor = Settings.WaveBoxColor; - default.WaveTextColor = Settings.WaveTextColor; + default.WaveBoxColor = Settings.WaveBoxColor; + default.WaveTextColor = Settings.WaveTextColor; // Player count box - default.PlayerCountBoxColor = Settings.PlayerCountBoxColor; - default.PlayerCountTextColor = Settings.PlayerCountTextColor; + default.PlayerCountBoxColor = Settings.PlayerCountBoxColor; + default.PlayerCountTextColor = Settings.PlayerCountTextColor; // Header box - default.ListHeaderBoxColor = Settings.ListHeaderBoxColor; - default.ListHeaderTextColor = Settings.ListHeaderTextColor; + default.ListHeaderBoxColor = Settings.ListHeaderBoxColor; + default.ListHeaderTextColor = Settings.ListHeaderTextColor; // State box - default.StateBoxColorLobby = Settings.StateBoxColorLobby; - default.StateBoxColorReady = Settings.StateBoxColorReady; - default.StateBoxColorNotReady = Settings.StateBoxColorNotReady; - default.StateBoxColorSpectator = Settings.StateBoxColorSpectator; - default.StateBoxColorDead = Settings.StateBoxColorDead; - default.StateBoxColorHPLow = Settings.StateBoxColorHPLow; - default.StateBoxColorHPMid = Settings.StateBoxColorHPMid; - default.StateBoxColorHPHigh = Settings.StateBoxColorHPHigh; - default.StateBoxColorArmorLow = Settings.StateBoxColorArmorLow; - default.StateBoxColorArmorMid = Settings.StateBoxColorArmorMid; - default.StateBoxColorArmorHigh = Settings.StateBoxColorArmorHigh; + default.StateBoxColorLobby = Settings.StateBoxColorLobby; + default.StateBoxColorReady = Settings.StateBoxColorReady; + default.StateBoxColorNotReady = Settings.StateBoxColorNotReady; + default.StateBoxColorSpectator = Settings.StateBoxColorSpectator; + default.StateBoxColorDead = Settings.StateBoxColorDead; + default.StateBoxColorHealthLow = Settings.StateBoxColorHealthLow; + default.StateBoxColorHealthMid = Settings.StateBoxColorHealthMid; + default.StateBoxColorHealthHigh = Settings.StateBoxColorHealthHigh; + default.StateBoxColorArmorLow = Settings.StateBoxColorArmorLow; + default.StateBoxColorArmorMid = Settings.StateBoxColorArmorMid; + default.StateBoxColorArmorHigh = Settings.StateBoxColorArmorHigh; // Player box - default.PlayerOwnerBoxColor = Settings.PlayerOwnerBoxColor; - default.PlayerBoxColor = Settings.PlayerBoxColor; + default.PlayerOwnerBoxColor = Settings.PlayerOwnerBoxColor; + default.PlayerBoxColor = Settings.PlayerBoxColor; // Stats box - default.StatsOwnerBoxColor = Settings.StatsOwnerBoxColor; - default.StatsBoxColor = Settings.StatsBoxColor; + default.StatsOwnerBoxColor = Settings.StatsOwnerBoxColor; + default.StatsBoxColor = Settings.StatsBoxColor; // State text - default.StateTextColorLobby = Settings.StateTextColorLobby; - default.StateTextColorReady = Settings.StateTextColorReady; - default.StateTextColorNotReady = Settings.StateTextColorNotReady; - default.StateTextColorSpectator = Settings.StateTextColorSpectator; - default.StateTextColorDead = Settings.StateTextColorDead; - default.StateTextColorHPLow = Settings.StateTextColorHPLow; - default.StateTextColorHPMid = Settings.StateTextColorHPMid; - default.StateTextColorHPHigh = Settings.StateTextColorHPHigh; - default.StateTextColorArmorLow = Settings.StateTextColorArmorLow; - default.StateTextColorArmorMid = Settings.StateTextColorArmorMid; - default.StateTextColorArmorHigh = Settings.StateTextColorArmorHigh; + default.StateTextColorLobby = Settings.StateTextColorLobby; + default.StateTextColorReady = Settings.StateTextColorReady; + default.StateTextColorNotReady = Settings.StateTextColorNotReady; + default.StateTextColorSpectator = Settings.StateTextColorSpectator; + default.StateTextColorDead = Settings.StateTextColorDead; + default.StateTextColorHealthUnknown = Settings.StateTextColorHealthUnknown; + default.StateTextColorHealthLow = Settings.StateTextColorHealthLow; + default.StateTextColorHealthMid = Settings.StateTextColorHealthMid; + default.StateTextColorHealthHigh = Settings.StateTextColorHealthHigh; + default.StateTextColorArmorLow = Settings.StateTextColorArmorLow; + default.StateTextColorArmorMid = Settings.StateTextColorArmorMid; + default.StateTextColorArmorHigh = Settings.StateTextColorArmorHigh; // Rank text - default.RankTextColor = Settings.RankTextColor; + default.RankTextColor = Settings.RankTextColor; // Player text - default.PlayerNameTextColor = Settings.PlayerNameTextColor; + default.PlayerNameTextColor = Settings.PlayerNameTextColor; // Level text - default.LevelTextColorLow = Settings.LevelTextColorLow; - default.LevelTextColorMid = Settings.LevelTextColorMid; - default.LevelTextColorHigh = Settings.LevelTextColorHigh; + default.LevelTextColorLow = Settings.LevelTextColorLow; + default.LevelTextColorMid = Settings.LevelTextColorMid; + default.LevelTextColorHigh = Settings.LevelTextColorHigh; // Perk text - default.ZedTextColor = Settings.ZedTextColor; - default.PerkNoneTextColor = Settings.PerkNoneTextColor; - default.PerkBerserkerTextColor = Settings.PerkBerserkerTextColor; - default.PerkCommandoTextColor = Settings.PerkCommandoTextColor; - default.PerkSupportTextColor = Settings.PerkSupportTextColor; - default.PerkFieldMedicTextColor = Settings.PerkFieldMedicTextColor; - default.PerkDemolitionistTextColor = Settings.PerkDemolitionistTextColor; - default.PerkFirebugTextColor = Settings.PerkFirebugTextColor; - default.PerkGunslingerTextColor = Settings.PerkGunslingerTextColor; - default.PerkSharpshooterTextColor = Settings.PerkSharpshooterTextColor; - default.PerkSwatTextColor = Settings.PerkSwatTextColor; - default.PerkSurvivalistTextColor = Settings.PerkSurvivalistTextColor; + default.ZedTextColor = Settings.ZedTextColor; + default.PerkNoneTextColor = Settings.PerkNoneTextColor; + default.PerkBerserkerTextColor = Settings.PerkBerserkerTextColor; + default.PerkCommandoTextColor = Settings.PerkCommandoTextColor; + default.PerkSupportTextColor = Settings.PerkSupportTextColor; + default.PerkFieldMedicTextColor = Settings.PerkFieldMedicTextColor; + default.PerkDemolitionistTextColor = Settings.PerkDemolitionistTextColor; + default.PerkFirebugTextColor = Settings.PerkFirebugTextColor; + default.PerkGunslingerTextColor = Settings.PerkGunslingerTextColor; + default.PerkSharpshooterTextColor = Settings.PerkSharpshooterTextColor; + default.PerkSwatTextColor = Settings.PerkSwatTextColor; + default.PerkSurvivalistTextColor = Settings.PerkSurvivalistTextColor; // Dosh text - default.DoshTextColorLow = Settings.DoshTextColorLow; - default.DoshTextColorMid = Settings.DoshTextColorMid; - default.DoshTextColorHigh = Settings.DoshTextColorHigh; + default.DoshTextColorLow = Settings.DoshTextColorLow; + default.DoshTextColorMid = Settings.DoshTextColorMid; + default.DoshTextColorHigh = Settings.DoshTextColorHigh; // Kills text - default.KillsTextColorLow = Settings.KillsTextColorLow; - default.KillsTextColorMid = Settings.KillsTextColorMid; - default.KillsTextColorHigh = Settings.KillsTextColorHigh; + default.KillsTextColorLow = Settings.KillsTextColorLow; + default.KillsTextColorMid = Settings.KillsTextColorMid; + default.KillsTextColorHigh = Settings.KillsTextColorHigh; // Assists text - default.AssistsTextColorLow = Settings.AssistsTextColorLow; - default.AssistsTextColorMid = Settings.AssistsTextColorMid; - default.AssistsTextColorHigh = Settings.AssistsTextColorHigh; + default.AssistsTextColorLow = Settings.AssistsTextColorLow; + default.AssistsTextColorMid = Settings.AssistsTextColorMid; + default.AssistsTextColorHigh = Settings.AssistsTextColorHigh; // Ping text - default.PingTextColorLow = Settings.PingTextColorLow; - default.PingTextColorMid = Settings.PingTextColorMid; - default.PingTextColorHigh = Settings.PingTextColorHigh; + default.PingTextColorNone = Settings.PingTextColorNone; + default.PingTextColorLow = Settings.PingTextColorLow; + default.PingTextColorMid = Settings.PingTextColorMid; + default.PingTextColorHigh = Settings.PingTextColorHigh; // Other settings - default.bShowPingBars = Settings.bShowPingBars; - default.bHealthBoxSmoothColorChange = Settings.bHealthBoxSmoothColorChange; - default.bArmorBoxSmoothColorChange = Settings.bArmorBoxSmoothColorChange; - default.bHealthTextSmoothColorChange = Settings.bHealthTextSmoothColorChange; - default.bArmorTextSmoothColorChange = Settings.bArmorTextSmoothColorChange; - default.bLevelTextSmoothColorChange = Settings.bLevelTextSmoothColorChange; - default.bDoshTextSmoothColorChange = Settings.bDoshTextSmoothColorChange; - default.bKillsTextSmoothColorChange = Settings.bKillsTextSmoothColorChange; - default.bAssistsTextSmoothColorChange = Settings.bAssistsTextSmoothColorChange; - default.bPingTextSmoothColorChange = Settings.bPingTextSmoothColorChange; + default.bShowPingBars = Settings.ShowPingBars; + default.bHealthBoxSmoothColorChange = Settings.HealthBoxSmoothColorChange; + default.bArmorBoxSmoothColorChange = Settings.ArmorBoxSmoothColorChange; + default.bHealthTextSmoothColorChange = Settings.HealthTextSmoothColorChange; + default.bArmorTextSmoothColorChange = Settings.ArmorTextSmoothColorChange; + default.bLevelTextSmoothColorChange = Settings.LevelTextSmoothColorChange; + default.bDoshTextSmoothColorChange = Settings.DoshTextSmoothColorChange; + default.bKillsTextSmoothColorChange = Settings.KillsTextSmoothColorChange; + default.bAssistsTextSmoothColorChange = Settings.AssistsTextSmoothColorChange; + default.bPingTextSmoothColorChange = Settings.PingTextSmoothColorChange; } defaultProperties diff --git a/YAS/Classes/SystemAdminRank.uc b/YAS/Classes/SystemAdminRank.uc index 5af53ca..99ca4ae 100644 --- a/YAS/Classes/SystemAdminRank.uc +++ b/YAS/Classes/SystemAdminRank.uc @@ -16,9 +16,10 @@ public static function InitConfig(int ConfigVersion) switch (ConfigVersion) { case 0: - case 1: WriteSettings(DefaultSettings()); + case 1: + case 2147483647: StaticSaveConfig(); } diff --git a/YAS/Classes/SystemPlayerRank.uc b/YAS/Classes/SystemPlayerRank.uc index 5e81ea2..d27d468 100644 --- a/YAS/Classes/SystemPlayerRank.uc +++ b/YAS/Classes/SystemPlayerRank.uc @@ -16,9 +16,10 @@ public static function InitConfig(int ConfigVersion) switch (ConfigVersion) { case 0: - case 1: WriteSettings(DefaultSettings()); + case 1: + case 2147483647: StaticSaveConfig(); } diff --git a/YAS/Classes/Types.uc b/YAS/Classes/Types.uc index 0e08332..b9624e2 100644 --- a/YAS/Classes/Types.uc +++ b/YAS/Classes/Types.uc @@ -26,6 +26,7 @@ struct Fields var bool Kills; var bool Assists; var bool Health; + var bool Armor; var bool Ping; StructDefaultProperties @@ -38,6 +39,7 @@ struct Fields Kills = false; Assists = false; Health = false; + Armor = false; Ping = false; } }; @@ -83,7 +85,7 @@ struct YASSettingsAdmin { Rank = "Admin" TextColor = (R=250, G=0, B=0, A=255) - ApplyColorToFields = (Rank=True, Player=True, Level=False, Perk=False, Dosh=False, Kills=False, Assists=False, Health=False, Ping=False) + ApplyColorToFields = (Rank=True, Player=True, Level=False, Perk=False, Dosh=False, Kills=False, Assists=False, Health=False, Armor=False, Ping=False) } }; @@ -97,7 +99,7 @@ struct YASSettingsPlayer { Rank = "Player" TextColor = (R=250, G=250, B=250, A=255) - ApplyColorToFields = (Rank=True, Player=True, Level=False, Perk=False, Dosh=False, Kills=False, Assists=False, Health=False, Ping=False) + ApplyColorToFields = (Rank=True, Player=True, Level=False, Perk=False, Dosh=False, Kills=False, Assists=False, Health=False, Armor=False, Ping=False) } }; @@ -144,7 +146,6 @@ struct YASSettingsLevel StructDefaultProperties { - Dynamic = True Low [0] = 0 High[0] = 0 Low [1] = 5 @@ -165,9 +166,12 @@ struct YASStyle var int ShapeWaveInfoBox; var int ShapePlayersCountBox; var int ShapeHeaderBox; - var int ShapeLeftStateBoxTopPlayer; - var int ShapeLeftStateBoxMidPlayer; - var int ShapeLeftStateBoxBottomPlayer; + var int ShapeStateHealthBoxTopPlayer; + var int ShapeStateHealthBoxMidPlayer; + var int ShapeStateHealthBoxBottomPlayer; + var int ShapeStateArmorBoxTopPlayer; + var int ShapeStateArmorBoxMidPlayer; + var int ShapeStateArmorBoxBottomPlayer; var int ShapePlayerBoxTopPlayer; var int ShapePlayerBoxMidPlayer; var int ShapePlayerBoxBottomPlayer; @@ -201,9 +205,9 @@ struct YASStyle var ColorRGBA StateBoxColorNotReady; var ColorRGBA StateBoxColorSpectator; var ColorRGBA StateBoxColorDead; - var ColorRGBA StateBoxColorHPLow; - var ColorRGBA StateBoxColorHPMid; - var ColorRGBA StateBoxColorHPHigh; + var ColorRGBA StateBoxColorHealthLow; + var ColorRGBA StateBoxColorHealthMid; + var ColorRGBA StateBoxColorHealthHigh; var ColorRGBA StateBoxColorArmorLow; var ColorRGBA StateBoxColorArmorMid; var ColorRGBA StateBoxColorArmorHigh; @@ -222,9 +226,10 @@ struct YASStyle var ColorRGBA StateTextColorNotReady; var ColorRGBA StateTextColorSpectator; var ColorRGBA StateTextColorDead; - var ColorRGBA StateTextColorHPLow; - var ColorRGBA StateTextColorHPMid; - var ColorRGBA StateTextColorHPHigh; + var ColorRGBA StateTextColorHealthUnknown; + var ColorRGBA StateTextColorHealthLow; + var ColorRGBA StateTextColorHealthMid; + var ColorRGBA StateTextColorHealthHigh; var ColorRGBA StateTextColorArmorLow; var ColorRGBA StateTextColorArmorMid; var ColorRGBA StateTextColorArmorHigh; @@ -270,153 +275,158 @@ struct YASStyle var ColorRGBA AssistsTextColorHigh; // Ping text + var ColorRGBA PingTextColorNone; var ColorRGBA PingTextColorLow; var ColorRGBA PingTextColorMid; var ColorRGBA PingTextColorHigh; // Other settings - var bool bShowPingBars; - var bool bHealthBoxSmoothColorChange; - var bool bArmorBoxSmoothColorChange; - var bool bHealthTextSmoothColorChange; - var bool bArmorTextSmoothColorChange; - var bool bLevelTextSmoothColorChange; - var bool bDoshTextSmoothColorChange; - var bool bKillsTextSmoothColorChange; - var bool bAssistsTextSmoothColorChange; - var bool bPingTextSmoothColorChange; + var bool ShowPingBars; + var bool HealthBoxSmoothColorChange; + var bool ArmorBoxSmoothColorChange; + var bool HealthTextSmoothColorChange; + var bool ArmorTextSmoothColorChange; + var bool LevelTextSmoothColorChange; + var bool DoshTextSmoothColorChange; + var bool KillsTextSmoothColorChange; + var bool AssistsTextSmoothColorChange; + var bool PingTextSmoothColorChange; StructDefaultProperties { - EdgeSize = 8 + EdgeSize = 8 // Box shapes - ShapeServerNameBox = 150 - ShapeGameInfoBox = 151 - ShapeWaveInfoBox = 0 - ShapePlayersCountBox = 152 - ShapeHeaderBox = 150 - ShapeLeftStateBoxTopPlayer = 151 - ShapeLeftStateBoxMidPlayer = 151 - ShapeLeftStateBoxBottomPlayer = 151 - ShapePlayerBoxTopPlayer = 0 - ShapePlayerBoxMidPlayer = 0 - ShapePlayerBoxBottomPlayer = 0 - ShapeStatsBoxTopPlayer = 153 - ShapeStatsBoxMidPlayer = 153 - ShapeStatsBoxBottomPlayer = 153 + ShapeServerNameBox = 150 + ShapeGameInfoBox = 151 + ShapeWaveInfoBox = 0 + ShapePlayersCountBox = 152 + ShapeHeaderBox = 150 + ShapeStateHealthBoxTopPlayer = 151 + ShapeStateHealthBoxMidPlayer = 151 + ShapeStateHealthBoxBottomPlayer = 151 + ShapeStateArmorBoxTopPlayer = 151 + ShapeStateArmorBoxMidPlayer = 151 + ShapeStateArmorBoxBottomPlayer = 151 + ShapePlayerBoxTopPlayer = 0 + ShapePlayerBoxMidPlayer = 0 + ShapePlayerBoxBottomPlayer = 0 + ShapeStatsBoxTopPlayer = 153 + ShapeStatsBoxMidPlayer = 153 + ShapeStatsBoxBottomPlayer = 153 // Server box - ServerNameBoxColor = (R=75, G=0, B=0, A=200) - ServerNameTextColor = (R=250, G=250, B=250, A=255) + ServerNameBoxColor = (R=75, G=0, B=0, A=200) + ServerNameTextColor = (R=250, G=250, B=250, A=255) // Game info box - GameInfoBoxColor = (R=30, G=30, B=30, A=200) - GameInfoTextColor = (R=250, G=250, B=250, A=255) + GameInfoBoxColor = (R=30, G=30, B=30, A=200) + GameInfoTextColor = (R=250, G=250, B=250, A=255) // Wave info box - WaveBoxColor = (R=10, G=10, B=10, A=200) - WaveTextColor = (R=250, G=250, B=250, A=255) + WaveBoxColor = (R=10, G=10, B=10, A=200) + WaveTextColor = (R=250, G=250, B=250, A=255) // Player count box - PlayerCountBoxColor = (R=75, G=0, B=0, A=200) - PlayerCountTextColor = (R=250, G=250, B=250, A=255) + PlayerCountBoxColor = (R=75, G=0, B=0, A=200) + PlayerCountTextColor = (R=250, G=250, B=250, A=255) // Header box - ListHeaderBoxColor = (R=10, G=10, B=10, A=200) - ListHeaderTextColor = (R=250, G=250, B=250, A=255) + ListHeaderBoxColor = (R=10, G=10, B=10, A=200) + ListHeaderTextColor = (R=250, G=250, B=250, A=255) // State box - StateBoxColorLobby = (R=150, G=150, B=150, A=150) - StateBoxColorReady = (R=150, G=150, B=150, A=150) - StateBoxColorNotReady = (R=150, G=150, B=150, A=150) - StateBoxColorSpectator = (R=150, G=150, B=150, A=150) - StateBoxColorDead = (R=200, G=0, B=0, A=150) - StateBoxColorHPLow = (R=200, G=50, B=50, A=150) - StateBoxColorHPMid = (R=200, G=200, B=0, A=150) - StateBoxColorHPHigh = (R=0, G=200, B=0, A=150) - StateBoxColorArmorLow = (R=0, G=0, B=150, A=150) - StateBoxColorArmorMid = (R=0, G=0, B=150, A=150) - StateBoxColorArmorHigh = (R=0, G=0, B=150, A=150) + StateBoxColorLobby = (R=150, G=150, B=150, A=150) + StateBoxColorReady = (R=150, G=150, B=150, A=150) + StateBoxColorNotReady = (R=150, G=150, B=150, A=150) + StateBoxColorSpectator = (R=150, G=150, B=150, A=150) + StateBoxColorDead = (R=200, G=0, B=0, A=150) + StateTextColorHealthUnknown = (R=150, G=150, B=150, A=150) + StateBoxColorHealthLow = (R=200, G=50, B=50, A=150) + StateBoxColorHealthMid = (R=200, G=200, B=0, A=150) + StateBoxColorHealthHigh = (R=0, G=200, B=0, A=150) + StateBoxColorArmorLow = (R=0, G=0, B=150, A=150) + StateBoxColorArmorMid = (R=0, G=0, B=150, A=150) + StateBoxColorArmorHigh = (R=0, G=0, B=150, A=150) // Player box - PlayerOwnerBoxColor = (R=100, G=10, B=10, A=150) - PlayerBoxColor = (R=30, G=30, B=30, A=150) + PlayerOwnerBoxColor = (R=100, G=10, B=10, A=150) + PlayerBoxColor = (R=30, G=30, B=30, A=150) // Stats box - StatsOwnerBoxColor = (R=10, G=10, B=10, A=150) - StatsBoxColor = (R=10, G=10, B=10, A=150) + StatsOwnerBoxColor = (R=10, G=10, B=10, A=150) + StatsBoxColor = (R=10, G=10, B=10, A=150) // State text - StateTextColorLobby = (R=150, G=150, B=150, A=150) - StateTextColorReady = (R=150, G=150, B=150, A=150) - StateTextColorNotReady = (R=150, G=150, B=150, A=150) - StateTextColorSpectator = (R=150, G=150, B=150, A=150) - StateTextColorDead = (R=250, G=0, B=0, A=255) - StateTextColorLowHP = (R=250, G=250, B=250, A=255) - StateTextColorMidHP = (R=250, G=250, B=250, A=255) - StateTextColorHighHP = (R=250, G=250, B=250, A=255) - StateTextColorArmorLow = (R=250, G=250, B=250, A=255) - StateTextColorArmorMid = (R=250, G=250, B=250, A=255) - StateTextColorArmorHigh = (R=250, G=250, B=250, A=255) + StateTextColorLobby = (R=150, G=150, B=150, A=150) + StateTextColorReady = (R=150, G=150, B=150, A=150) + StateTextColorNotReady = (R=150, G=150, B=150, A=150) + StateTextColorSpectator = (R=150, G=150, B=150, A=150) + StateTextColorDead = (R=250, G=0, B=0, A=255) + StateTextColorHealthLow = (R=250, G=250, B=250, A=255) + StateTextColorHealthMid = (R=250, G=250, B=250, A=255) + StateTextColorHealthHigh = (R=250, G=250, B=250, A=255) + StateTextColorArmorLow = (R=250, G=250, B=250, A=255) + StateTextColorArmorMid = (R=250, G=250, B=250, A=255) + StateTextColorArmorHigh = (R=250, G=250, B=250, A=255) // Rank text - RankTextColor = (R=250, G=250, B=250, A=255) + RankTextColor = (R=250, G=250, B=250, A=255) // Player text - PlayerNameTextColor = (R=250, G=250, B=250, A=255) + PlayerNameTextColor = (R=250, G=250, B=250, A=255) // Level text - LevelTextColorLow = (R=250, G=100, B=100, A=255) - LevelTextColorMid = (R=250, G=250, B=0, A=255) - LevelTextColorHigh = (R=0, G=250, B=0, A=255) + LevelTextColorLow = (R=250, G=100, B=100, A=255) + LevelTextColorMid = (R=250, G=250, B=0, A=255) + LevelTextColorHigh = (R=0, G=250, B=0, A=255) // Perk text - ZedTextColor = (R=255, G=0, B=0, A=255) - PerkNoneTextColor = (R=250, G=250, B=250, A=255) - PerkBerserkerTextColor = (R=250, G=250, B=250, A=255) - PerkCommandoTextColor = (R=250, G=250, B=250, A=255) - PerkSupportTextColor = (R=250, G=250, B=250, A=255) - PerkFieldMedicTextColor = (R=250, G=250, B=250, A=255) - PerkDemolitionistTextColor = (R=250, G=250, B=250, A=255) - PerkFirebugTextColor = (R=250, G=250, B=250, A=255) - PerkGunslingerTextColor = (R=250, G=250, B=250, A=255) - PerkSharpshooterTextColor = (R=250, G=250, B=250, A=255) - PerkSwatTextColor = (R=250, G=250, B=250, A=255) - PerkSurvivalistTextColor = (R=250, G=250, B=250, A=255) + ZedTextColor = (R=255, G=0, B=0, A=255) + PerkNoneTextColor = (R=250, G=250, B=250, A=255) + PerkBerserkerTextColor = (R=250, G=250, B=250, A=255) + PerkCommandoTextColor = (R=250, G=250, B=250, A=255) + PerkSupportTextColor = (R=250, G=250, B=250, A=255) + PerkFieldMedicTextColor = (R=250, G=250, B=250, A=255) + PerkDemolitionistTextColor = (R=250, G=250, B=250, A=255) + PerkFirebugTextColor = (R=250, G=250, B=250, A=255) + PerkGunslingerTextColor = (R=250, G=250, B=250, A=255) + PerkSharpshooterTextColor = (R=250, G=250, B=250, A=255) + PerkSwatTextColor = (R=250, G=250, B=250, A=255) + PerkSurvivalistTextColor = (R=250, G=250, B=250, A=255) // Dosh text - DoshTextColorLow = (R=250, G=250, B=100, A=255) - DoshTextColorMid = (R=250, G=250, B=100, A=255) - DoshTextColorHigh = (R=250, G=250, B=100, A=255) + DoshTextColorLow = (R=250, G=250, B=100, A=255) + DoshTextColorMid = (R=250, G=250, B=100, A=255) + DoshTextColorHigh = (R=250, G=250, B=100, A=255) // Kills text - KillsTextColorLow = (R=250, G=250, B=250, A=255) - KillsTextColorMid = (R=250, G=250, B=250, A=255) - KillsTextColorHigh = (R=250, G=250, B=250, A=255) + KillsTextColorLow = (R=250, G=250, B=250, A=255) + KillsTextColorMid = (R=250, G=250, B=250, A=255) + KillsTextColorHigh = (R=250, G=250, B=250, A=255) // Assists text - AssistsTextColorLow = (R=250, G=250, B=250, A=255) - AssistsTextColorMid = (R=250, G=250, B=250, A=255) - AssistsTextColorHigh = (R=250, G=250, B=250, A=255) + AssistsTextColorLow = (R=250, G=250, B=250, A=255) + AssistsTextColorMid = (R=250, G=250, B=250, A=255) + AssistsTextColorHigh = (R=250, G=250, B=250, A=255) // Ping text - PingTextColorNone = (R=250, G=250, B=250, A=255) - PingTextColorLow = (R=0, G=250, B=0, A=255) - PingTextColorMid = (R=250, G=250, B=0, A=255) - PingTextColorHigh = (R=250, G=0, B=0, A=255) + PingTextColorNone = (R=250, G=250, B=250, A=255) + PingTextColorLow = (R=0, G=250, B=0, A=255) + PingTextColorMid = (R=250, G=250, B=0, A=255) + PingTextColorHigh = (R=250, G=0, B=0, A=255) // Other settings - bShowPingBars = true - bHealthBoxSmoothColorChange = true - bArmorBoxSmoothColorChange = true - bHealthTextSmoothColorChange = false - bArmorTextSmoothColorChange = false - bLevelTextSmoothColorChange = false - bDoshTextSmoothColorChange = false - bKillsTextSmoothColorChange = false - bAssistsTextSmoothColorChange = false - bPingTextSmoothColorChange = false + ShowPingBars = true + HealthBoxSmoothColorChange = true + ArmorBoxSmoothColorChange = true + HealthTextSmoothColorChange = false + ArmorTextSmoothColorChange = false + LevelTextSmoothColorChange = false + DoshTextSmoothColorChange = false + KillsTextSmoothColorChange = false + AssistsTextSmoothColorChange = false + PingTextSmoothColorChange = false } };