Scoreboard improvements

EvoEsports · Sep 29, 2024 · 6c4d70c · 6c4d70c
1 parent d9273a7
commit 6c4d70c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 37 deletions.
diff --git a/src/Modules/ScoreboardModule/Controllers/ScoreboardCommandsController.cs b/src/Modules/ScoreboardModule/Controllers/ScoreboardCommandsController.cs
diff --git a/src/Modules/ScoreboardModule/Interfaces/IScoreboardNicknamesService.cs b/src/Modules/ScoreboardModule/Interfaces/IScoreboardNicknamesService.cs
@@ -4,8 +4,6 @@ public interface IScoreboardNicknamesService
 {
     public Task AddNicknameByLoginAsync(string login);
 
-    public Task RemoveNicknameAsync(string login);
-
     public Task ClearNicknamesAsync();
 
     public Task LoadNicknamesAsync();

diff --git a/src/Modules/ScoreboardModule/ScoreboardModule.cs b/src/Modules/ScoreboardModule/ScoreboardModule.cs
@@ -5,18 +5,16 @@
 namespace EvoSC.Modules.Official.ScoreboardModule;
 
 [Module(IsInternal = true)]
-public class ScoreboardModule(IScoreboardService scoreboardService, IScoreboardNicknamesService nicknamesService) : EvoScModule, IToggleable
+public class ScoreboardModule(IScoreboardService scoreboardService, IScoreboardNicknamesService nicknamesService)
+    : EvoScModule, IToggleable
 {
-    public Task EnableAsync()
+    public async Task EnableAsync()
     {
-        nicknamesService.LoadNicknamesAsync();
-        scoreboardService.HideNadeoScoreboardAsync();
-
-        return scoreboardService.SendScoreboardAsync();
+        await nicknamesService.LoadNicknamesAsync();
+        await scoreboardService.HideNadeoScoreboardAsync();
+        await scoreboardService.SendScoreboardAsync();
     }
 
-    public Task DisableAsync()
-    {
-        return scoreboardService.ShowNadeoScoreboardAsync();
-    }
+    public Task DisableAsync() =>
+        scoreboardService.ShowNadeoScoreboardAsync();
 }
diff --git a/src/Modules/ScoreboardModule/Services/ScoreboardNicknamesService.cs b/src/Modules/ScoreboardModule/Services/ScoreboardNicknamesService.cs
@@ -27,13 +27,6 @@ public async Task AddNicknameByLoginAsync(string login)
         _nicknames[login] = player.NickName;
     }
 
-    public Task RemoveNicknameAsync(string login)
-    {
-        _nicknames.Remove(login);
-
-        return Task.CompletedTask;
-    }
-
     public Task ClearNicknamesAsync()
     {
         _nicknames.Clear();

diff --git a/src/Modules/ScoreboardModule/Templates/Scoreboard.mt b/src/Modules/ScoreboardModule/Templates/Scoreboard.mt
@@ -24,7 +24,7 @@
     <property type="double" name="legendHeight" default="3.8"/>
     <property type="int" name="actionButtonCount" default="2"/>
 
-    <template layer="ScoresTable_x">
+    <template layer="ScoresTable">
         <!-- UI Styles -->
         <UIStyle/>
 
@@ -151,6 +151,10 @@
                 out ^= "0";
             }
 
+            if(points == "0"){
+                return out ^ points;
+            }
+
             return out ^ primaryTextColor ^ points;
         }