更新更多变量并优化计分板显示内容 (#45)

MemoriesOfTime · Jul 3, 2023 · a8061df · a8061df
1 parent a8f3ce9
commit a8061df
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 29 deletions.
diff --git a/src/main/java/cn/lanink/crystalwars/theme/Theme.java b/src/main/java/cn/lanink/crystalwars/theme/Theme.java
@@ -89,11 +89,14 @@ public String stringReplace(BaseArena arena, Player player, String string, List<
         PlayerData playerData = arena.getPlayerData(player);
         return string
                 .replace("{PluginName}", CrystalWars.PLUGIN_NAME)
+                .replace("{PluginVersion}",CrystalWars.VERSION)
                 .replace("{AutoSpace}", Utils.getSpace(list))
                 .replace("{PlayerCount}", String.valueOf(arena.getPlayerCount()))
                 .replace("{MinPlayer}", String.valueOf(arena.getMinPlayers()))
                 .replace("{MaxPlayer}", String.valueOf(arena.getMaxPlayers()))
                 .replace("{VictoryTeam}", arena.getVictoryTeam() != Team.NULL ? Utils.getShowTeam(player, arena.getVictoryTeam()) : CrystalWars.getInstance().getLang(player).translateString("teams_gameDraw"))
+                .replace("{GameMode}",arena.getGameMode())
+                .replace("{MapName}",arena.getGameWorldName())
                 //玩家数据
                 .replace("{KillCount}", String.valueOf(playerData.getKillCount()))
                 .replace("{MyTeam}", Utils.getShowTeam(player, playerData.getTeam()))

diff --git a/src/main/resources/Resources/Language/en_US.properties b/src/main/resources/Resources/Language/en_US.properties
@@ -64,10 +64,10 @@ tips_killPlayer_fire=%1% A fire burned %2%
 tips_death_void=%1% die in the void
 tips_death_fire=%1% die by fire
 tips_join_team=%1% joined the %2% team
-teams_name_red=§lRed Team§r
-teams_name_yellow=§lYellow Team§r
-teams_name_blue=§lBlue Team§r
-teams_name_green=§lGreen Team§r
+teams_name_red=§lRed§r
+teams_name_yellow=§lYellow§r
+teams_name_blue=§lBlue§r
+teams_name_green=§lGreen§r
 teams_name_noTeam=§lNo Team§r
 teams_gameDraw=§fDraw
 crystalName=§eCrystal

diff --git a/src/main/resources/Theme/DefaultTheme.yml b/src/main/resources/Theme/DefaultTheme.yml
@@ -1,31 +1,51 @@
 scoreboard_wait:
   title: "{PluginName}"
   line:
+    - "§7{yyyy}/{MM}/{dd}"
     - "{AutoSpace}"
-    - "[IF:PlayerCount>=MinPlayer]{§f◎ §f开始倒计时: §a{time}}[IF_NOT:PlayerCount>=MinPlayer]{§f◎ §c等待玩家加入中...}"
+    - "§f地图: §a{MapName}"
+    - "§f玩家: §a{PlayerCount}/§a{MaxPlayer}"
     - "{AutoSpace}"
-    - "§f◎  §a{PlayerCount}§e/§a{MinPlayer} §8(§6Max:§a{MaxPlayer}§8)"
+    - "[IF:PlayerCount>=MinPlayer]{§f即将开始: §a{time}s}[IF_NOT:PlayerCount>=MinPlayer]{§f等待玩家加入中...}"
+    - "{AutoSpace}"
+    - "§f模式: §a{GameMode}"
+    - "§f版本: §7v{PluginVersion}"
     - "{AutoSpace}"
 
 scoreboard_game:
   title: "{PluginName}"
   line:
+    - "§7{yyyy}/{MM}/{dd}"
+    - "{AutoSpace}"
+    - "[IF_NOT:isOvertime]{§f终极PvP: §a{time}s}[IF:isOvertime]{§f游戏结束: §a{time}s}"
     - "{AutoSpace}"
-    - "§f◎ §f倒计时:  §a{time} [IF:isOvertime]{§f(加时赛)}"
+    - "[IF:TeamSurviving_RED]{§l{TeamName_RED}: §l§a{TeamCrystalHealth_RED} §b({TeamSurvivingPlayers_RED})}"
+    - "[IF_NOT:TeamSurviving_RED]{§l{TeamName_RED}: §l§c✘ §b({TeamSurvivingPlayers_RED})}"
+    - "[IF:TeamSurviving_YELLOW]{§l{TeamName_YELLOW}: §l§a{TeamCrystalHealth_YELLOW} §b({TeamSurvivingPlayers_YELLOW})}"
+    - "[IF_NOT:TeamSurviving_YELLOW]{§l{TeamName_YELLOW}: §l§c✘ §b({TeamSurvivingPlayers_YELLOW})}"
+    - "[IF:TeamSurviving_BLUE]{§l{TeamName_BLUE}: §l§a{TeamCrystalHealth_BLUE} §b({TeamSurvivingPlayers_BLUE})}"
+    - "[IF_NOT:TeamSurviving_BLUE]{§l{TeamName_BLUE}: §l§c✘ §b({TeamSurvivingPlayers_BLUE})}"
+    - "[IF:TeamSurviving_GREEN]{§l{TeamName_GREEN}: §l§a{TeamCrystalHealth_GREEN} §b({TeamSurvivingPlayers_GREEN})}"
+    - "[IF_NOT:TeamSurviving_GREEN]{§l{TeamName_GREEN}: §l§c✘ §b({TeamSurvivingPlayers_GREEN})}"
     - "{AutoSpace}"
-    - "[IF:TeamSurviving_RED]{§f◎ -{TeamName_RED}§f- §e水晶:§a{TeamCrystalHealth_RED} §8(§a{TeamSurvivingPlayers_RED}§8)}"
-    - "[IF_NOT:TeamSurviving_RED]{§f◎ -{TeamName_RED}§f- §c(oT-T)尸}"
-    - "[IF:TeamSurviving_YELLOW]{§f◎ -{TeamName_YELLOW}§f- §e水晶:§a{TeamCrystalHealth_YELLOW} §8(§a{TeamSurvivingPlayers_YELLOW}§8)}"
-    - "[IF_NOT:TeamSurviving_YELLOW]{§f◎ -{TeamName_YELLOW}§f- §c(oT-T)尸}"
-    - "[IF:TeamSurviving_BLUE]{§f◎ -{TeamName_BLUE}§f- §e水晶:§a{TeamCrystalHealth_BLUE} §8(§a{TeamSurvivingPlayers_BLUE}§8)}"
-    - "[IF_NOT:TeamSurviving_BLUE]{§f◎ -{TeamName_BLUE}§f- §c(oT-T)尸}"
-    - "[IF:TeamSurviving_GREEN]{§f◎ -{TeamName_GREEN}§f- §e水晶:§a{TeamCrystalHealth_GREEN} §8(§a{TeamSurvivingPlayers_GREEN}§8)}"
-    - "[IF_NOT:TeamSurviving_GREEN]{§f◎ -{TeamName_GREEN}§f- §c(oT-T)尸}"
+    - "§f击杀数: §a{KillCount}"
     - "{AutoSpace}"
 
 scoreboard_victory:
   title: "{PluginName}"
   line:
+    - "§7{yyyy}/{MM}/{dd}"
+    - "{AutoSpace}"
+    - "§f胜利队伍: {VictoryTeam}"
+    - "{AutoSpace}"
+    - "[IF:TeamSurviving_RED]{§l{TeamName_RED}: §l§a{TeamCrystalHealth_RED} §b({TeamSurvivingPlayers_RED})}"
+    - "[IF_NOT:TeamSurviving_RED]{§l{TeamName_RED}: §l§c✘ §b({TeamSurvivingPlayers_RED})}"
+    - "[IF:TeamSurviving_YELLOW]{§l{TeamName_YELLOW}: §l§a{TeamCrystalHealth_YELLOW} §b({TeamSurvivingPlayers_YELLOW})}"
+    - "[IF_NOT:TeamSurviving_YELLOW]{§l{TeamName_YELLOW}: §l§c✘ §b({TeamSurvivingPlayers_YELLOW})}"
+    - "[IF:TeamSurviving_BLUE]{§l{TeamName_BLUE}: §l§a{TeamCrystalHealth_BLUE} §b({TeamSurvivingPlayers_BLUE})}"
+    - "[IF_NOT:TeamSurviving_BLUE]{§l{TeamName_BLUE}: §l§c✘ §b({TeamSurvivingPlayers_BLUE})}"
+    - "[IF:TeamSurviving_GREEN]{§l{TeamName_GREEN}: §l§a{TeamCrystalHealth_GREEN} §b({TeamSurvivingPlayers_GREEN})}"
+    - "[IF_NOT:TeamSurviving_GREEN]{§l{TeamName_GREEN}: §l§c✘ §b({TeamSurvivingPlayers_GREEN})}"
+    - "{AutoSpace}"
+    - "§f击杀数: §a{KillCount}"
     - "{AutoSpace}"
-    - "§f◎ §e胜利队伍: {VictoryTeam}§e！"
-    - "{AutoSpace}"
diff --git a/src/main/resources/Theme/DefaultThemeEnglish.yml b/src/main/resources/Theme/DefaultThemeEnglish.yml
@@ -1,31 +1,50 @@
 scoreboard_wait:
   title: "{PluginName}"
   line:
+    - "§7{yyyy}/{MM}/{dd}"
     - "{AutoSpace}"
-    - "[IF:PlayerCount>=MinPlayer]{§f◎ §fStart the countdown: §a{time}}[IF_NOT:PlayerCount>=MinPlayer]{§f◎ §cWaiting for player to join...}"
+    - "§fMap: §a{MapName}"
+    - "§fPlayers: §a{PlayerCount}/§a{MaxPlayer}"
     - "{AutoSpace}"
-    - "§f◎  §a{PlayerCount}§e/§a{MinPlayer} §8(§6Max:§a{MaxPlayer}§8)"
+    - "[IF:PlayerCount>=MinPlayer]{§fStarting in §a{time}s}[IF_NOT:PlayerCount>=MinPlayer]{§fWaiting...}"
+    - "{AutoSpace}"
+    - "§fMode: §a{GameMode}"
+    - "§fVersion: §7v{PluginVersion}"
     - "{AutoSpace}"
 
 scoreboard_game:
   title: "{PluginName}"
   line:
+    - "§7{yyyy}/{MM}/{dd}"
+    - "{AutoSpace}"
+    - "[IF_NOT:isOvertime]{§fFinal PvP: §a{time}s}[IF:isOvertime]{§fGame Over: §a{time}s}"
     - "{AutoSpace}"
-    - "§f◎ §fCountdown:  §a{time} [IF:isOvertime]{§f(overtime)}"
+    - "[IF:TeamSurviving_RED]{§l{TeamName_RED}: §l§a{TeamCrystalHealth_RED} §b({TeamSurvivingPlayers_RED})}"
+    - "[IF_NOT:TeamSurviving_RED]{§l{TeamName_RED}: §l§c✘ §b({TeamSurvivingPlayers_RED})}"
+    - "[IF:TeamSurviving_YELLOW]{§l{TeamName_YELLOW}: §l§a{TeamCrystalHealth_YELLOW} §b({TeamSurvivingPlayers_YELLOW})}"
+    - "[IF_NOT:TeamSurviving_YELLOW]{§l{TeamName_YELLOW}: §l§c✘ §b({TeamSurvivingPlayers_YELLOW})}"
+    - "[IF:TeamSurviving_BLUE]{§l{TeamName_BLUE}: §l§a{TeamCrystalHealth_BLUE} §b({TeamSurvivingPlayers_BLUE})}"
+    - "[IF_NOT:TeamSurviving_BLUE]{§l{TeamName_BLUE}: §l§c✘ §b({TeamSurvivingPlayers_BLUE})}"
+    - "[IF:TeamSurviving_GREEN]{§l{TeamName_GREEN}: §l§a{TeamCrystalHealth_GREEN} §b({TeamSurvivingPlayers_GREEN})}"
+    - "[IF_NOT:TeamSurviving_GREEN]{§l{TeamName_GREEN}: §l§c✘ §b({TeamSurvivingPlayers_GREEN})}"
     - "{AutoSpace}"
-    - "[IF:TeamSurviving_RED]{§f◎ -{TeamName_RED}§f- §eCrystal:§a{TeamCrystalHealth_RED} §8(§a{TeamSurvivingPlayers_RED}§8)}"
-    - "[IF_NOT:TeamSurviving_RED]{§f◎ -{TeamName_RED}§f- §c(oT-T)尸}"
-    - "[IF:TeamSurviving_YELLOW]{§f◎ -{TeamName_YELLOW}§f- §eCrystal:§a{TeamCrystalHealth_YELLOW} §8(§a{TeamSurvivingPlayers_YELLOW}§8)}"
-    - "[IF_NOT:TeamSurviving_YELLOW]{§f◎ -{TeamName_YELLOW}§f- §c(oT-T)尸}"
-    - "[IF:TeamSurviving_BLUE]{§f◎ -{TeamName_BLUE}§f- §eCrystal:§a{TeamCrystalHealth_BLUE} §8(§a{TeamSurvivingPlayers_BLUE}§8)}"
-    - "[IF_NOT:TeamSurviving_BLUE]{§f◎ -{TeamName_BLUE}§f- §c(oT-T)尸}"
-    - "[IF:TeamSurviving_GREEN]{§f◎ -{TeamName_GREEN}§f- §eCrystal:§a{TeamCrystalHealth_GREEN} §8(§a{TeamSurvivingPlayers_GREEN}§8)}"
-    - "[IF_NOT:TeamSurviving_GREEN]{§f◎ -{TeamName_GREEN}§f- §c(oT-T)尸}"
+    - "§fKill: §a{KillCount}"
     - "{AutoSpace}"
 
 scoreboard_victory:
   title: "{PluginName}"
   line:
     - "{AutoSpace}"
-    - "§f◎ §eWinningTeam: {VictoryTeam}§e！"
+    - "§fWinningTeam: {VictoryTeam}"
+    - "{AutoSpace}"
+    - "[IF:TeamSurviving_RED]{§l{TeamName_RED}: §l§a{TeamCrystalHealth_RED} §b({TeamSurvivingPlayers_RED})}"
+    - "[IF_NOT:TeamSurviving_RED]{§l{TeamName_RED}: §l§c✘ §b({TeamSurvivingPlayers_RED})}"
+    - "[IF:TeamSurviving_YELLOW]{§l{TeamName_YELLOW}: §l§a{TeamCrystalHealth_YELLOW} §b({TeamSurvivingPlayers_YELLOW})}"
+    - "[IF_NOT:TeamSurviving_YELLOW]{§l{TeamName_YELLOW}: §l§c✘ §b({TeamSurvivingPlayers_YELLOW})}"
+    - "[IF:TeamSurviving_BLUE]{§l{TeamName_BLUE}: §l§a{TeamCrystalHealth_BLUE} §b({TeamSurvivingPlayers_BLUE})}"
+    - "[IF_NOT:TeamSurviving_BLUE]{§l{TeamName_BLUE}: §l§c✘ §b({TeamSurvivingPlayers_BLUE})}"
+    - "[IF:TeamSurviving_GREEN]{§l{TeamName_GREEN}: §l§a{TeamCrystalHealth_GREEN} §b({TeamSurvivingPlayers_GREEN})}"
+    - "[IF_NOT:TeamSurviving_GREEN]{§l{TeamName_GREEN}: §l§c✘ §b({TeamSurvivingPlayers_GREEN})}"
+    - "{AutoSpace}"
+    - "§fKill: §a{KillCount}"
     - "{AutoSpace}"
diff --git a/src/main/resources/Theme/变量介绍.txt b/src/main/resources/Theme/变量介绍.txt
@@ -1,10 +1,13 @@
 {PluginName} 彩色插件名称
+{PluginVersion} 插件的版本号
 {AutoSpace} 自动填充的空格（用于空出一行）
 {time} 倒计时
 {PlayerCount} 房间中玩家数量
 {MinPlayer} 房间开始游戏需要的最少玩家数量
 {MaxPlayer} 房间最多游戏人数
 {VictoryTeam} 胜利队伍（仅胜利结算阶段有效）
+{GameMode} 房间的游戏模式
+{MapName} 游戏房间的名称
 
 {KillCount} 玩家本局击杀数
 {MyTeam} 玩家所在队伍