From 20377d55759219aec4703dffe57903d735908f98 Mon Sep 17 00:00:00 2001 From: goosius1 <=> Date: Sat, 27 Feb 2021 09:57:45 +0000 Subject: [PATCH 1/3] Renamed 'siege points' to 'siege balance' - No intended functional changes included --- .../goosius/siegewar/SiegeController.java | 10 +- .../command/SiegeWarAdminCommand.java | 14 +-- .../enums/SiegeWarPermissionNodes.java | 6 +- .../goosius/siegewar/hud/SiegeHUDManager.java | 3 +- .../goosius/siegewar/hud/SiegeWarHud.java | 26 +++--- .../SiegeWarNationEventListener.java | 2 +- .../listeners/SiegeWarTownEventListener.java | 12 +-- .../listeners/SiegeWarTownyEventListener.java | 2 +- .../metadata/SiegeMetaDataController.java | 18 ++-- .../siegewar/objects/BattleSession.java | 28 +++--- .../gmail/goosius/siegewar/objects/Siege.java | 92 +++++++++---------- .../siegewar/playeractions/PlayerDeath.java | 30 +++--- .../siegewar/settings/ConfigNodes.java | 22 ++--- .../siegewar/settings/SiegeWarSettings.java | 16 ++-- .../goosius/siegewar/tasks/DynmapTask.java | 8 +- .../tasks/SiegeWarTimerTaskController.java | 6 +- .../goosius/siegewar/utils/BookUtil.java | 14 +-- .../utils/SiegeWarBannerControlUtil.java | 32 +++---- .../utils/SiegeWarBattleSessionUtil.java | 24 ++--- ...intsUtil.java => SiegeWarScoringUtil.java} | 72 +++++++-------- .../siegewar/utils/SiegeWarSicknessUtil.java | 6 +- .../utils/SiegeWarSiegeCompletionUtil.java | 4 +- src/main/resources/english.yml | 22 +++-- src/main/resources/french.yml | 22 +++-- 24 files changed, 248 insertions(+), 243 deletions(-) rename src/main/java/com/gmail/goosius/siegewar/utils/{SiegeWarPointsUtil.java => SiegeWarScoringUtil.java} (70%) diff --git a/src/main/java/com/gmail/goosius/siegewar/SiegeController.java b/src/main/java/com/gmail/goosius/siegewar/SiegeController.java index 9e0934531..ed3693456 100644 --- a/src/main/java/com/gmail/goosius/siegewar/SiegeController.java +++ b/src/main/java/com/gmail/goosius/siegewar/SiegeController.java @@ -83,8 +83,8 @@ public static void saveSiege(Siege siege) { + "!" + siege.getFlagLocation().getX() + "!" + siege.getFlagLocation().getY() + "!" + siege.getFlagLocation().getZ()); - SiegeMetaDataController.setStatus(town, siege.getStatus().toString()); - SiegeMetaDataController.setPoints(town, siege.getSiegePoints()); + SiegeMetaDataController.setSiegeStatus(town, siege.getStatus().toString()); + SiegeMetaDataController.setSiegeBalance(town, siege.getSiegeBalance()); SiegeMetaDataController.setWarChestAmount(town, siege.getWarChestAmount()); SiegeMetaDataController.setTownPlundered(town, siege.getTownPlundered()); SiegeMetaDataController.setTownInvaded(town, siege.getTownInvaded()); @@ -155,11 +155,11 @@ public static boolean loadSiege(Siege siege) { Location loc = new Location(world, x, y, z); siege.setFlagLocation(loc); - if (SiegeMetaDataController.getStatus(town).isEmpty()) + if (SiegeMetaDataController.getSiegeStatus(town).isEmpty()) return false; - siege.setStatus(SiegeStatus.parseString(SiegeMetaDataController.getStatus(town))); + siege.setStatus(SiegeStatus.parseString(SiegeMetaDataController.getSiegeStatus(town))); - siege.setSiegePoints(SiegeMetaDataController.getPoints(town)); + siege.setSiegeBalance(SiegeMetaDataController.getSiegeBalance(town)); siege.setWarChestAmount(SiegeMetaDataController.getWarChestAmount(town)); siege.setTownPlundered(SiegeMetaDataController.townPlundered(town)); siege.setTownInvaded(SiegeMetaDataController.townInvaded(town)); diff --git a/src/main/java/com/gmail/goosius/siegewar/command/SiegeWarAdminCommand.java b/src/main/java/com/gmail/goosius/siegewar/command/SiegeWarAdminCommand.java index 35340f6d7..2f268552b 100644 --- a/src/main/java/com/gmail/goosius/siegewar/command/SiegeWarAdminCommand.java +++ b/src/main/java/com/gmail/goosius/siegewar/command/SiegeWarAdminCommand.java @@ -35,7 +35,7 @@ public class SiegeWarAdminCommand implements CommandExecutor, TabCompleter { private static final List siegewaradminTabCompletes = Arrays.asList("immunity","reload","siege","town","nation"); private static final List siegewaradminImmunityTabCompletes = Arrays.asList("town","nation","alltowns"); - private static final List siegewaradminSiegeTabCompletes = Arrays.asList("setpoints","end","setplundered","remove"); + private static final List siegewaradminSiegeTabCompletes = Arrays.asList("setbalance","end","setplundered","remove"); private static final List siegewaradminTownTabCompletes = Arrays.asList("setcaptured"); private static final List siegewaradminNationTabCompletes = Arrays.asList("setplundergained","setplunderlost","settownsgained","settownslost","setnationdefeats"); @@ -151,7 +151,7 @@ private void showHelp(CommandSender sender) { sender.sendMessage(ChatTools.formatCommand("Eg", "/swa", "immunity town [town_name] [hours]", "")); sender.sendMessage(ChatTools.formatCommand("Eg", "/swa", "immunity nation [nation_name] [hours]", "")); sender.sendMessage(ChatTools.formatCommand("Eg", "/swa", "immunity alltowns [hours]", "")); - sender.sendMessage(ChatTools.formatCommand("Eg", "/swa", "siege [town_name] setpoints [points]", "")); + sender.sendMessage(ChatTools.formatCommand("Eg", "/swa", "siege [town_name] setbalance [points]", "")); sender.sendMessage(ChatTools.formatCommand("Eg", "/swa", "siege [town_name] end", "")); sender.sendMessage(ChatTools.formatCommand("Eg", "/swa", "siege [town_name] setplundered [true/false]", "")); sender.sendMessage(ChatTools.formatCommand("Eg", "/swa", "siege [town_name] remove", "")); @@ -167,7 +167,7 @@ private void showImmunityHelp(CommandSender sender) { private void showSiegeHelp(CommandSender sender) { sender.sendMessage(ChatTools.formatTitle("/swa siege")); - sender.sendMessage(ChatTools.formatCommand("Eg", "/swa", "siege [town_name] setpoints [points]", "")); + sender.sendMessage(ChatTools.formatCommand("Eg", "/swa", "siege [town_name] setbalance [points]", "")); sender.sendMessage(ChatTools.formatCommand("Eg", "/swa", "siege [town_name] end", "")); sender.sendMessage(ChatTools.formatCommand("Eg", "/swa", "siege [town_name] setplundered [true/false]", "")); sender.sendMessage(ChatTools.formatCommand("Eg", "/swa", "siege [town_name] remove", "")); @@ -268,7 +268,7 @@ private void parseSiegeWarSiegeCommand(CommandSender sender, String[] args) { } switch(args[1].toLowerCase()) { - case "setpoints": + case "setbalance": if (args.length < 3) { showSiegeHelp(sender); } @@ -280,13 +280,13 @@ private void parseSiegeWarSiegeCommand(CommandSender sender, String[] args) { } int newPoints = Integer.parseInt(args[2]); - siege.setSiegePoints(newPoints); + siege.setSiegeBalance(newPoints); SiegeController.saveSiege(siege); - Messaging.sendMsg(sender, Translation.of("msg_swa_set_points_success", newPoints, town.getName())); + Messaging.sendMsg(sender, Translation.of("msg_swa_set_siege_balance_success", newPoints, town.getName())); return; case "end": - if (siege.getSiegePoints() < 1) + if (siege.getSiegeBalance() < 1) DefenderWin.defenderWin(siege, siege.getDefendingTown()); else AttackerWin.attackerWin(siege, siege.getAttackingNation()); diff --git a/src/main/java/com/gmail/goosius/siegewar/enums/SiegeWarPermissionNodes.java b/src/main/java/com/gmail/goosius/siegewar/enums/SiegeWarPermissionNodes.java index 4e547c499..1449e4e0c 100644 --- a/src/main/java/com/gmail/goosius/siegewar/enums/SiegeWarPermissionNodes.java +++ b/src/main/java/com/gmail/goosius/siegewar/enums/SiegeWarPermissionNodes.java @@ -7,13 +7,15 @@ */ public enum SiegeWarPermissionNodes { - SIEGEWAR_NATION_SIEGE_POINTS("siegewar.nation.siege.points"), + //This permission affects battle points, but the perm currently has the older name of siege points + SIEGEWAR_NATION_BATTLE_POINTS("siegewar.nation.siege.points"), SIEGEWAR_NATION_SIEGE_LEADERSHIP("siegewar.nation.siege.leadership"), SIEGEWAR_NATION_SIEGE_ATTACK("siegewar.nation.siege.attack"), SIEGEWAR_NATION_SIEGE_ABANDON("siegewar.nation.siege.abandon"), SIEGEWAR_NATION_SIEGE_INVADE("siegewar.nation.siege.invade"), SIEGEWAR_NATION_SIEGE_PLUNDER("siegewar.nation.siege.plunder"), - SIEGEWAR_TOWN_SIEGE_POINTS("siegewar.town.siege.points"), + //This permission affects battle points, but the perm currently has the older name of siege points + SIEGEWAR_TOWN_BATTLE_POINTS("siegewar.town.siege.points"), SIEGEWAR_TOWN_SIEGE_SURRENDER("siegewar.town.siege.surrender"), SIEGEWAR_TOWN_SIEGE_START_CANNON_SESSION("siegewar.town.siege.startcannonsession"), // Siegewar related war sickness immunities diff --git a/src/main/java/com/gmail/goosius/siegewar/hud/SiegeHUDManager.java b/src/main/java/com/gmail/goosius/siegewar/hud/SiegeHUDManager.java index 0a678b276..ddb509ed7 100644 --- a/src/main/java/com/gmail/goosius/siegewar/hud/SiegeHUDManager.java +++ b/src/main/java/com/gmail/goosius/siegewar/hud/SiegeHUDManager.java @@ -6,7 +6,6 @@ import com.gmail.goosius.siegewar.objects.Siege; import com.gmail.goosius.siegewar.SiegeWar; -import com.gmail.goosius.siegewar.hud.SiegeWarHud; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -40,7 +39,7 @@ public static void toggleOff(Player player) { public static void updateHUDs() { for (Entry entry : warHudUsers.entrySet()) { - if (entry.getKey().getScoreboard().getTeam("points") == null) { + if (entry.getKey().getScoreboard().getTeam("balance") == null) { warHudUsers.remove(entry.getKey()); continue; } else diff --git a/src/main/java/com/gmail/goosius/siegewar/hud/SiegeWarHud.java b/src/main/java/com/gmail/goosius/siegewar/hud/SiegeWarHud.java index e6bb11987..47198b385 100644 --- a/src/main/java/com/gmail/goosius/siegewar/hud/SiegeWarHud.java +++ b/src/main/java/com/gmail/goosius/siegewar/hud/SiegeWarHud.java @@ -21,12 +21,12 @@ public static void updateInfo(Player p, Siege siege) { board.getObjective("WAR_HUD_OBJ").setDisplayName(SiegeHUDManager.checkLength(Colors.Gold + "§l" + siege.getDefendingTown().getName()) + " " + Translation.of("hud_title")); board.getTeam("attackers").setSuffix(SiegeHUDManager.checkLength(siege.getAttackingNation().getName())); board.getTeam("defenders").setSuffix(SiegeHUDManager.checkLength(siege.getDefendingTown().getName())); - board.getTeam("points").setSuffix(siege.getSiegePoints().toString()); + board.getTeam("balance").setSuffix(siege.getSiegeBalance().toString()); board.getTeam("timeRemaining").setSuffix(siege.getTimeRemaining()); board.getTeam("bannerControl").setSuffix(siege.getBannerControllingSide().name().charAt(0) + siege.getBannerControllingSide().name().substring(1).toLowerCase()); - board.getTeam("batAttackerScore").setSuffix(siege.getFormattedAttackerBattleScore()); - board.getTeam("batDefenderScore").setSuffix(siege.getFormattedDefenderBattleScore()); - board.getTeam("batTimeRemaining").setSuffix(siege.getFormattedBattleTimeRemaining()); + board.getTeam("btAttackerPoints").setSuffix(siege.getFormattedAttackerBattlePoints()); + board.getTeam("btDefenderPoints").setSuffix(siege.getFormattedDefenderBattlePoints()); + board.getTeam("btTimeRemaining").setSuffix(siege.getFormattedBattleTimeRemaining()); } public static void toggleOn(Player p, Siege siege) { @@ -36,25 +36,25 @@ public static void toggleOn(Player p, Siege siege) { Team attackers = board.registerNewTeam("attackers"), defenders = board.registerNewTeam("defenders"), - points = board.registerNewTeam("points"), + balance = board.registerNewTeam("balance"), timeRemaining = board.registerNewTeam("timeRemaining"), bannerControl = board.registerNewTeam("bannerControl"), - battleAttackerScore = board.registerNewTeam("batAttackerScore"), - battleDefenderScore = board.registerNewTeam("batDefenderScore"), - battleTimeRemaining = board.registerNewTeam("batTimeRemaining"); + battleAttackerScore = board.registerNewTeam("btAttackerPoints"), + battleDefenderScore = board.registerNewTeam("btDefenderPoints"), + battleTimeRemaining = board.registerNewTeam("btTimeRemaining"); String attackers_entry = Colors.LightGray + Translation.of("hud_attackers"), defenders_entry = Colors.LightGray + Translation.of("hud_defenders"), - points_entry = Colors.LightGray + Translation.of("hud_points"), + balance_entry = Colors.LightGray + Translation.of("hud_balance"), timeRemaining_entry = Colors.LightGray + Translation.of("hud_time_remaining"), bannerControl_entry = Colors.LightGray + Translation.of("hud_banner_control"), - battleAttackerScore_entry = Colors.LightGray + Translation.of("hud_battle_attacker_score"), - battleDefenderScore_entry = Colors.LightGray + Translation.of("hud_battle_defender_score"), + battleAttackerScore_entry = Colors.LightGray + Translation.of("hud_battle_attacker_points"), + battleDefenderScore_entry = Colors.LightGray + Translation.of("hud_battle_defender_points"), battleTimeRemaining_entry = Colors.LightGray + Translation.of("hud_battle_time_remaining"); attackers.addEntry(attackers_entry); defenders.addEntry(defenders_entry); - points.addEntry(points_entry); + balance.addEntry(balance_entry); bannerControl.addEntry(bannerControl_entry); timeRemaining.addEntry(timeRemaining_entry); battleDefenderScore.addEntry(battleDefenderScore_entry); @@ -63,7 +63,7 @@ public static void toggleOn(Player p, Siege siege) { objective.getScore(attackers_entry).setScore(8); objective.getScore(defenders_entry).setScore(7); - objective.getScore(points_entry).setScore(6); + objective.getScore(balance_entry).setScore(6); objective.getScore(timeRemaining_entry).setScore(5); objective.getScore(bannerControl_entry).setScore(4); objective.getScore(battleAttackerScore_entry).setScore(3); diff --git a/src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarNationEventListener.java b/src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarNationEventListener.java index 89151a1b6..07b8bbeef 100644 --- a/src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarNationEventListener.java +++ b/src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarNationEventListener.java @@ -146,7 +146,7 @@ public void onNationRankGivenToPlayer(NationRankAddEvent event) { //In Siegewar, if target town is peaceful, can't add military rank if(SiegeWarSettings.getWarSiegeEnabled() && SiegeWarSettings.getWarCommonPeacefulTownsEnabled() - && SiegeWarPermissionUtil.doesNationRankAllowPermissionNode(event.getRank(), SiegeWarPermissionNodes.SIEGEWAR_NATION_SIEGE_POINTS) + && SiegeWarPermissionUtil.doesNationRankAllowPermissionNode(event.getRank(), SiegeWarPermissionNodes.SIEGEWAR_NATION_BATTLE_POINTS) && TownyAPI.getInstance().getResidentTownOrNull(event.getResident()).isNeutral()) { // We know that the resident's town will not be null based on the tests already done. event.setCancelled(true); event.setCancelMessage(Translation.of("plugin_prefix") + Translation.of("msg_war_siege_cannot_add_nation_military_rank_to_peaceful_resident")); diff --git a/src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarTownEventListener.java b/src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarTownEventListener.java index ede2a8578..c80d2a1c8 100644 --- a/src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarTownEventListener.java +++ b/src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarTownEventListener.java @@ -170,7 +170,7 @@ public void onTownToggleNeutral(TownToggleNeutralEvent event) { //Remove any military nation ranks of residents for(Resident peacefulTownResident: town.getResidents()) { for (String nationRank : new ArrayList<>(peacefulTownResident.getNationRanks())) { - if (SiegeWarPermissionUtil.doesNationRankAllowPermissionNode(nationRank, SiegeWarPermissionNodes.SIEGEWAR_NATION_SIEGE_POINTS)) { + if (SiegeWarPermissionUtil.doesNationRankAllowPermissionNode(nationRank, SiegeWarPermissionNodes.SIEGEWAR_NATION_BATTLE_POINTS)) { try { peacefulTownResident.removeNationRank(nationRank); } catch (NotRegisteredException ignored) {} @@ -314,9 +314,9 @@ public void onTownStatusScreen(TownStatusScreenEvent event) { out.add(Translation.of("status_town_siege_status_besieger", siege.getAttackingNation().getFormattedName())); // > Points: +530 - int pointsInt = siege.getSiegePoints(); + int pointsInt = siege.getSiegeBalance(); String pointsString = pointsInt > 0 ? "+" + pointsInt : "" + pointsInt; - out.add(Translation.of("status_town_siege_status_points", pointsString)); + out.add(Translation.of("status_town_siege_status_siege_balance", pointsString)); // > Banner XYZ: {2223,82,9877} out.add( @@ -335,8 +335,8 @@ public void onTownStatusScreen(TownStatusScreenEvent event) { out.add(Translation.of("status_town_siege_status_warchest", warChest)); if(BattleSession.getBattleSession().isActive() - && (siege.getAttackerBattleScore() > 0 - || siege.getDefenderBattleScore() > 0 + && (siege.getAttackerBattlePoints() > 0 + || siege.getDefenderBattlePoints() > 0 || siege.getBannerControllingSide() != SiegeSide.NOBODY || siege.getBannerControlSessions().size() > 0)) { @@ -359,7 +359,7 @@ public void onTownStatusScreen(TownStatusScreenEvent event) { } // > Score: +90 / -220 - out.add(Translation.of("status_town_siege_battle_score", siege.getFormattedAttackerBattleScore(), siege.getFormattedDefenderBattleScore())); + out.add(Translation.of("status_town_siege_battle_score", siege.getFormattedAttackerBattlePoints(), siege.getFormattedDefenderBattlePoints())); // > Time Remaining: 22 minutes out.add(Translation.of("status_town_siege_battle_time_remaining", BattleSession.getBattleSession().getFormattedTimeRemainingUntilBattleSessionEnds())); diff --git a/src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarTownyEventListener.java b/src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarTownyEventListener.java index 016ac1a87..f7492fa44 100644 --- a/src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarTownyEventListener.java +++ b/src/main/java/com/gmail/goosius/siegewar/listeners/SiegeWarTownyEventListener.java @@ -69,7 +69,7 @@ public void onNewDay(PreNewDayEvent event) { @EventHandler public void onNewHour(NewHourEvent event) { if(SiegeWarSettings.getWarSiegeEnabled()) { - SiegeWarTimerTaskController.updatePopulationBasedSiegePointModifiers(); + SiegeWarTimerTaskController.updatePopulationBasedBattlePointModifiers(); } } diff --git a/src/main/java/com/gmail/goosius/siegewar/metadata/SiegeMetaDataController.java b/src/main/java/com/gmail/goosius/siegewar/metadata/SiegeMetaDataController.java index 683322134..acd5eb02c 100644 --- a/src/main/java/com/gmail/goosius/siegewar/metadata/SiegeMetaDataController.java +++ b/src/main/java/com/gmail/goosius/siegewar/metadata/SiegeMetaDataController.java @@ -1,6 +1,5 @@ package com.gmail.goosius.siegewar.metadata; -import com.palmergames.bukkit.towny.object.Resident; import org.jetbrains.annotations.Nullable; import com.gmail.goosius.siegewar.SiegeWar; @@ -31,7 +30,8 @@ public class SiegeMetaDataController { private static StringDataField siegeTownUUID = new StringDataField("siegewar_townUUID", ""); private static StringDataField siegeFlagLocation = new StringDataField("siegewar_flagLocation", ""); private static StringDataField siegeStatus = new StringDataField("siegewar_status", ""); - private static IntegerDataField siegePoints = new IntegerDataField("siegewar_points", 0); + //In metadata, siegeBalance still uses the old name of points + private static IntegerDataField siegeBalance = new IntegerDataField("siegewar_points", 0); private static DecimalDataField siegeWarChestAmount = new DecimalDataField("siegewar_warChestAmount", 0.0); private static BooleanDataField townPlundered = new BooleanDataField("siegewar_townPlundered", false); private static BooleanDataField townInvaded = new BooleanDataField("siegewar_townInvaded", false); @@ -129,14 +129,14 @@ public static void setFlagLocation(Town town, String loc) { } @Nullable - public static String getStatus(Town town) { + public static String getSiegeStatus(Town town) { StringDataField sdf = (StringDataField) siegeStatus.clone(); if (town.hasMeta(sdf.getKey())) return MetaDataUtil.getString(town, sdf); return null; } - public static void setStatus(Town town, String status) { + public static void setSiegeStatus(Town town, String status) { StringDataField sdf = (StringDataField) siegeStatus.clone(); if (town.hasMeta(sdf.getKey())) MetaDataUtil.setString(town, sdf, status); @@ -144,15 +144,15 @@ public static void setStatus(Town town, String status) { town.addMetaData(new StringDataField("siegewar_status", status)); } - public static int getPoints(Town town) { - IntegerDataField idf = (IntegerDataField) siegePoints.clone(); + public static int getSiegeBalance(Town town) { + IntegerDataField idf = (IntegerDataField) siegeBalance.clone(); if (town.hasMeta(idf.getKey())) return MetaDataUtil.getInt(town, idf); return 0; } - public static void setPoints(Town town, int num) { - IntegerDataField idf = (IntegerDataField) siegePoints.clone(); + public static void setSiegeBalance(Town town, int num) { + IntegerDataField idf = (IntegerDataField) siegeBalance.clone(); if (town.hasMeta(idf.getKey())) MetaDataUtil.setInt(town, idf, num); else @@ -269,7 +269,7 @@ public static void removeSiegeMeta (Town town) { if (town.hasMeta(sdf.getKey())) town.removeMetaData(sdf); - IntegerDataField idf = (IntegerDataField) siegePoints.clone(); + IntegerDataField idf = (IntegerDataField) siegeBalance.clone(); if (town.hasMeta(idf.getKey())) town.removeMetaData(idf); diff --git a/src/main/java/com/gmail/goosius/siegewar/objects/BattleSession.java b/src/main/java/com/gmail/goosius/siegewar/objects/BattleSession.java index 0d5cd0d48..2a41174a6 100644 --- a/src/main/java/com/gmail/goosius/siegewar/objects/BattleSession.java +++ b/src/main/java/com/gmail/goosius/siegewar/objects/BattleSession.java @@ -9,23 +9,23 @@ * A battle session is period of time, typically 50 minutes, * in which individual "battles" take place at each siege. * - * During a battle, siege points can be gained/lost. + * During a battle, battle points can be gained/lost by either side. * - * At the end of a battle session: - * - The winner of each battle is declared - * - either the "Attacker" or the "Defender", or "Draw" - * - If nobody contested a battle, no winner is declared. - * - All scoreboards will show that the winner won +1 "battle". - * - Siege points are reset to 0 - * - Plunder is awarded to any soldiers on the winning side, - * who gained banner control during the battle. - * (Attackers steal from the town, defenders steals from the war chest) + * When a battle ends: + * - The winner depends on who scores the most battle points. + * - It will be Attacker, Defender, or a Draw + * - If nobody contested a battle, no winner is declared. + * - If there is a winner, their battle points are applied to the siege balance. * - * Until the next battle session starts: - * - This period is known as a "break", and typically lasts 10 minutes. - * - During this period, siege points remain at 0, and banner control is not possible. + * After a battle ends + * - Battle points are reset to 0 + * - All banner control is wiped + * - There is a break (defualt 10 mins) until the next battle session starts + * ... during the break, no battle points gains or banner control are possible. * - * At the normal end of a siege, whoever has won the most battles, wins the siege. + * FYI + * In the context of the overall Siege, the siege balance determines the winner + * (not the battle points) * * @author Goosius */ diff --git a/src/main/java/com/gmail/goosius/siegewar/objects/Siege.java b/src/main/java/com/gmail/goosius/siegewar/objects/Siege.java index 83177ecfa..ebb63eb2d 100644 --- a/src/main/java/com/gmail/goosius/siegewar/objects/Siege.java +++ b/src/main/java/com/gmail/goosius/siegewar/objects/Siege.java @@ -27,7 +27,7 @@ * * A siege is initiated by a nation leader with appropriate permissions, * It typically lasts for a moderate duration (e.g. hours or days), - * and can be ended n a number of ways, including abandon, surrender, or points victory. + * and can be ended n a number of ways, including when siege victory timer reaches 0, or abandon, or surrender. * * After a siege ends, it enters an aftermath phase where the status is no longer "In Progress", * During this phase, the town cannot be attacked again, @@ -46,17 +46,17 @@ public class Siege { private long scheduledEndTime; //Scheduled end of siege private long actualEndTime; //Actual end time of siege private Location siegeBannerLocation; - private int siegePoints; + private int siegeBalance; private double warChestAmount; private List bannerControllingResidents; //Soldiers currently controlling the banner private SiegeSide bannerControllingSide; private Map bannerControlSessions; - private int battleScoreEarnedFromCurrentBannerControl; + private int timedBattlePointsEarnedFromCurrentBannerControl; private boolean attackerHasLowestPopulation; - private double siegePointModifierForSideWithLowestPopulation; + private double battlePointstModifierForSideWithLowestPopulation; private int cannonSessionRemainingShortTicks; //Short ticks remaining until standard cannon protections are restored - private int attackerBattleScore; - private int defenderBattleScore; + private int attackerBattlePoints; + private int defenderBattlePoints; private Set attackerBattleContributors; //UUID's of attackers who contributed during the current battle private Map attackerSiegeContributors; //UUID:numContributions map of attackers who contributed during current siege @@ -64,17 +64,17 @@ public Siege(String name) { this.name = name; status = SiegeStatus.IN_PROGRESS; attackingNation = null; - siegePoints = 0; + siegeBalance = 0; siegeBannerLocation = null; warChestAmount = 0; bannerControllingResidents = new ArrayList<>(); bannerControllingSide = SiegeSide.NOBODY; bannerControlSessions = new HashMap<>(); attackerHasLowestPopulation = false; - siegePointModifierForSideWithLowestPopulation = 0; //0 is the special starting value + battlePointstModifierForSideWithLowestPopulation = 0; //0 is the special starting value cannonSessionRemainingShortTicks = 0; - attackerBattleScore = 0; - defenderBattleScore = 0; + attackerBattlePoints = 0; + defenderBattlePoints = 0; attackerBattleContributors = new HashSet<>(); attackerSiegeContributors = new HashMap<>(); } @@ -188,16 +188,16 @@ public void setFlagLocation(Location location) { this.siegeBannerLocation = location; } - public Integer getSiegePoints() { - return siegePoints; + public Integer getSiegeBalance() { + return siegeBalance; } - public void setSiegePoints(int siegePoints) { - this.siegePoints = siegePoints; + public void setSiegeBalance(int siegeBalance) { + this.siegeBalance = siegeBalance; } - public void adjustSiegePoints(int adjustment) { - siegePoints += adjustment; + public void adjustSiegeBalance(int adjustment) { + siegeBalance += adjustment; } public double getWarChestAmount() { @@ -257,12 +257,12 @@ public String toString() { return name; } - public double getSiegePointModifierForSideWithLowestPopulation() { - return siegePointModifierForSideWithLowestPopulation; + public double getBattlePointsModifierForSideWithLowestPopulation() { + return battlePointstModifierForSideWithLowestPopulation; } - public void setSiegePointModifierForSideWithLowestPopulation(double siegePointModifierForSideWithLowestPopulation) { - this.siegePointModifierForSideWithLowestPopulation = siegePointModifierForSideWithLowestPopulation; + public void setBattlePointsModifierForSideWithLowestPopulation(double battlePointsModifierForSideWithLowestPopulation) { + this.battlePointstModifierForSideWithLowestPopulation = battlePointsModifierForSideWithLowestPopulation; } public boolean isAttackerHasLowestPopulation() { @@ -306,51 +306,51 @@ public void decrementCannonSessionRemainingShortTicks(){ cannonSessionRemainingShortTicks--; } - public int getAttackerBattleScore() { - return attackerBattleScore; + public int getAttackerBattlePoints() { + return attackerBattlePoints; } - public void setAttackerBattleScore(int attackerBattleScore) { - this.attackerBattleScore = attackerBattleScore; + public void setAttackerBattlePoints(int attackerBattlePoints) { + this.attackerBattlePoints = attackerBattlePoints; } - public String getFormattedAttackerBattleScore() { - if(attackerBattleScore == 0) { + public String getFormattedAttackerBattlePoints() { + if(attackerBattlePoints == 0) { return "0"; } else { - return "+" + attackerBattleScore; + return "+" + attackerBattlePoints; } } - public int getDefenderBattleScore() { - return defenderBattleScore; + public int getDefenderBattlePoints() { + return defenderBattlePoints; } - public void setDefenderBattleScore(int defenderBattleScore) { - this.defenderBattleScore = defenderBattleScore; + public void setDefenderBattlePoints(int defenderBattlePoints) { + this.defenderBattlePoints = defenderBattlePoints; } - public String getFormattedDefenderBattleScore() { - if(defenderBattleScore == 0) { + public String getFormattedDefenderBattlePoints() { + if(defenderBattlePoints == 0) { return "0"; } else { - return "-" + defenderBattleScore; + return "-" + defenderBattlePoints; } } - public void adjustAttackerBattleScore(int battleScore) { - attackerBattleScore += battleScore; + public void adjustAttackerBattlePoints(int battleScore) { + attackerBattlePoints += battleScore; } - public void adjustDefenderBattleScore(int battleScore) { - defenderBattleScore += battleScore; + public void adjustDefenderBattlePoints(int battleScore) { + defenderBattlePoints += battleScore; } public String getFormattedBattleTimeRemaining() { if (BattleSession.getBattleSession().isActive() && status == SiegeStatus.IN_PROGRESS - && (getAttackerBattleScore() > 0 - || getDefenderBattleScore() > 0 + && (getAttackerBattlePoints() > 0 + || getDefenderBattlePoints() > 0 || getBannerControllingSide() != SiegeSide.NOBODY || getBannerControlSessions().size() > 0)) { return BattleSession.getBattleSession().getFormattedTimeRemainingUntilBattleSessionEnds(); @@ -394,15 +394,15 @@ public void propagateAttackerBattleContributorsToAttackerSiegeContributors() { } } - public int getBattleScoreEarnedFromCurrentBannerControl() { - return battleScoreEarnedFromCurrentBannerControl; + public int getTimedBattlePointsEarnedFromCurrentBannerControl() { + return timedBattlePointsEarnedFromCurrentBannerControl; } - public void setBattleScoreEarnedFromCurrentBannerControl(int battleScoreEarnedFromCurrentBannerControl) { - this.battleScoreEarnedFromCurrentBannerControl = battleScoreEarnedFromCurrentBannerControl; + public void setTimedBattlePointsEarnedFromCurrentBannerControl(int timedBattlePointsEarnedFromCurrentBannerControl) { + this.timedBattlePointsEarnedFromCurrentBannerControl = timedBattlePointsEarnedFromCurrentBannerControl; } - public void adjustBattleScoreEarnedFromCurrentBannerControl(int timedBattleScore) { - battleScoreEarnedFromCurrentBannerControl += timedBattleScore; + public void adjustBattlePointsEarnedFromCurrentBannerControl(int timedBattlePoints) { + timedBattlePointsEarnedFromCurrentBannerControl += timedBattlePoints; } } \ No newline at end of file diff --git a/src/main/java/com/gmail/goosius/siegewar/playeractions/PlayerDeath.java b/src/main/java/com/gmail/goosius/siegewar/playeractions/PlayerDeath.java index 68e8a7deb..4912e4258 100644 --- a/src/main/java/com/gmail/goosius/siegewar/playeractions/PlayerDeath.java +++ b/src/main/java/com/gmail/goosius/siegewar/playeractions/PlayerDeath.java @@ -10,7 +10,7 @@ import com.gmail.goosius.siegewar.settings.SiegeWarSettings; import com.gmail.goosius.siegewar.utils.CosmeticUtil; import com.gmail.goosius.siegewar.utils.SiegeWarDistanceUtil; -import com.gmail.goosius.siegewar.utils.SiegeWarPointsUtil; +import com.gmail.goosius.siegewar.utils.SiegeWarScoringUtil; import com.palmergames.bukkit.towny.TownyUniverse; import com.palmergames.bukkit.towny.object.Resident; import com.palmergames.bukkit.towny.object.Town; @@ -29,7 +29,7 @@ * This class intercepts 'player death' events coming from the TownyPlayerListener class. * * This class evaluates the death, and determines if the player is involved in any nearby sieges. - * If so, their opponents gain siege points, and the player keeps inventory. + * If so, the opposing team gains battle points, and the player keeps inventory. * * @author Goosius */ @@ -39,15 +39,15 @@ public class PlayerDeath { * Evaluates a siege death event. * * If the dead player is officially involved in a nearby siege, - * - Their side loses siege points + * - The opposing team gains battle points * - Their inventory items degrade a little (e.g. 10%) * * This mechanic allows for a wide range of siege-kill-tactics. * Examples: - * - Players without towns can contribute to siege points - * - Players from non-nation towns can contribute to siege points - * - Players from secretly-allied nations can contribute to siege points - * - Devices (cannons, traps, bombs etc.) can be used to gain siege points + * - Players without towns can contribute to battle points + * - Players from non-nation towns can contribute to battle points + * - Players from secretly-allied nations can contribute to battle points + * - Devices (cannons, traps, bombs etc.) can be used to gain battle points * * @param deadPlayer The player who died * @param playerDeathEvent The player death event @@ -68,15 +68,15 @@ public static void evaluateSiegePlayerDeath(Player deadPlayer, PlayerDeathEvent * Do an early permission test to avoid hitting the sieges list if * it could never return a proper SiegeSide. */ - if (!tps.testPermission(deadPlayer, SiegeWarPermissionNodes.SIEGEWAR_TOWN_SIEGE_POINTS.getNode()) + if (!tps.testPermission(deadPlayer, SiegeWarPermissionNodes.SIEGEWAR_TOWN_BATTLE_POINTS.getNode()) && !hasTownMilitaryRank(deadResident) - && !tps.testPermission(deadPlayer, SiegeWarPermissionNodes.SIEGEWAR_NATION_SIEGE_POINTS.getNode()) + && !tps.testPermission(deadPlayer, SiegeWarPermissionNodes.SIEGEWAR_NATION_BATTLE_POINTS.getNode()) && !hasNationMilitaryRank(deadResident)) return; Town deadResidentTown = deadResident.getTown(); - //Residents of occupied towns do not give siege points if killed + //Residents of occupied towns do not give battle points if killed if (deadResidentTown.isConquered()) return; @@ -97,7 +97,7 @@ public static void evaluateSiegePlayerDeath(Player deadPlayer, PlayerDeathEvent //Is player eligible ? if (SiegeController.hasActiveSiege(deadResidentTown) && SiegeController.getSiege(deadResidentTown) == candidateSiege - && (tps.testPermission(deadPlayer, SiegeWarPermissionNodes.SIEGEWAR_TOWN_SIEGE_POINTS.getNode()) + && (tps.testPermission(deadPlayer, SiegeWarPermissionNodes.SIEGEWAR_TOWN_BATTLE_POINTS.getNode()) || hasTownMilitaryRank(deadResident)) ) { candidateSiegePlayerSide = SiegeSide.DEFENDERS; //Candidate siege has player defending own-town @@ -105,7 +105,7 @@ public static void evaluateSiegePlayerDeath(Player deadPlayer, PlayerDeathEvent } else if (deadResidentTown.hasNation() && candidateSiege.getDefendingTown().hasNation() && candidateSiege.getStatus().isActive() - && (tps.testPermission(deadPlayer, SiegeWarPermissionNodes.SIEGEWAR_NATION_SIEGE_POINTS.getNode()) + && (tps.testPermission(deadPlayer, SiegeWarPermissionNodes.SIEGEWAR_NATION_BATTLE_POINTS.getNode()) || hasNationMilitaryRank(deadResident)) && (deadResidentTown.getNation() == candidateSiege.getDefendingTown().getNation() || deadResidentTown.getNation().hasMutualAlly(candidateSiege.getDefendingTown().getNation()))) { @@ -114,7 +114,7 @@ public static void evaluateSiegePlayerDeath(Player deadPlayer, PlayerDeathEvent } else if (deadResidentTown.hasNation() && candidateSiege.getStatus().isActive() - && (tps.testPermission(deadPlayer, SiegeWarPermissionNodes.SIEGEWAR_NATION_SIEGE_POINTS.getNode()) + && (tps.testPermission(deadPlayer, SiegeWarPermissionNodes.SIEGEWAR_NATION_BATTLE_POINTS.getNode()) || hasNationMilitaryRank(deadResident)) && (deadResidentTown.getNation() == candidateSiege.getAttackingNation() || deadResidentTown.getNation().hasMutualAlly(candidateSiege.getAttackingNation()))) { @@ -146,14 +146,14 @@ public static void evaluateSiegePlayerDeath(Player deadPlayer, PlayerDeathEvent } if (confirmedCandidateSiegePlayerSide == SiegeSide.DEFENDERS) { - SiegeWarPointsUtil.awardPenaltyPoints( + SiegeWarScoringUtil.awardPenaltyPoints( false, deadPlayer, deadResident, confirmedCandidateSiege, Translation.of("msg_siege_war_defender_death")); } else { - SiegeWarPointsUtil.awardPenaltyPoints( + SiegeWarScoringUtil.awardPenaltyPoints( true, deadPlayer, deadResident, diff --git a/src/main/java/com/gmail/goosius/siegewar/settings/ConfigNodes.java b/src/main/java/com/gmail/goosius/siegewar/settings/ConfigNodes.java index 3b2b7506c..0547a5641 100644 --- a/src/main/java/com/gmail/goosius/siegewar/settings/ConfigNodes.java +++ b/src/main/java/com/gmail/goosius/siegewar/settings/ConfigNodes.java @@ -298,26 +298,26 @@ public enum ConfigNodes { "# This is the vertical distance a soldier must be from the banner to get banner control.", "# Note that the horizontal distance is always the same as the Towny townblock size."), - //Siege points - WAR_SIEGE_POINTS_FOR_ATTACKER_OCCUPATION( + //Battle points + WAR_BATTLE_POINTS_FOR_ATTACKER_OCCUPATION( "war.siege.scoring.points_for_attacker_occupation", "10", "", - "# This setting determines the number of siege points awarded to an occupying attacker.", + "# This setting determines the number of battle points awarded to an occupying attacker.", "# The points are awarded if a player remains within a town-block length of the siege banner for: ", "# 10 minutes (default configuration)."), - WAR_SIEGE_POINTS_FOR_DEFENDER_OCCUPATION( + WAR_BATTLE_POINTS_FOR_DEFENDER_OCCUPATION( "war.siege.scoring.points_for_defender_occupation", "10", "", - "# This setting determines the number of siege points awarded to an occupying defender.", + "# This setting determines the number of battle points awarded to an occupying defender.", "# The points are awarded if a player remains within a town-block length of the siege banner for ", "# 10 minutes (default configuration)."), - WAR_SIEGE_POINTS_FOR_ATTACKER_DEATH( + WAR_BATTLE_POINTS_FOR_ATTACKER_DEATH( "war.siege.scoring.points_for_attacker_death", "150", "", - "# This setting determines the number of siege points awarded if an attacker dies.", + "# This setting determines the number of battle points awarded if an attacker dies.", "# The points are awarded if the player dies within the configured siege zone death radius.", "# The points are given to the defending town.", "# ", @@ -329,11 +329,11 @@ public enum ConfigNodes { "# Configuration Outcomes:", "# Value HIGH --> If the value is high, then PVP will be DISCOURAGED", "# Value LOW --> If the value is low, then PVP will be ENCOURAGED"), - WAR_SIEGE_POINTS_FOR_DEFENDER_DEATH( + WAR_BATTLE_POINTS_FOR_DEFENDER_DEATH( "war.siege.scoring.points_for_defender_death", "150", "", - "# This setting determines the number of siege points awarded if a defender dies.", + "# This setting determines the number of battle points awarded if a defender dies.", "# The points are awarded if the player dies within the configured siege zone death radius.", "# The points are given to the attacking nation.", "# ", @@ -360,7 +360,7 @@ public enum ConfigNodes { "# Example:", "# 1. Assume this value is set to 3.0.", "# 2. Assume a siege attacker has 3 times the population of a siege defender (counting allied populations too).", - "# 3. In this example, if the siege defender scores any siege points, the points will be boosted by the (separately configured) maximum.", + "# 3. In this example, if the siege defender scores any battle points, the points will be boosted by the (separately configured) maximum.", "# 4. In this example, the siege attacker will not get any points boosts."), WAR_SIEGE_MAX_POPULATION_BASED_POINTS_BOOST( "war.siege.scoring.max_population_based_points_boost", @@ -370,7 +370,7 @@ public enum ConfigNodes { "# Example:", "# 1. Assume this value is set to 2.0.", "# 2. Assume that a siege attacker greatly outnumbers a siege defender in population. (also counting allies)", - "# 3. In this example, if the siege defender scores any siege points, the points will be multiplied by 2.", + "# 3. In this example, if the siege defender scores any battle points, the points will be multiplied by 2.", "# 4. In this example, the siege attacker will not get any points boosts."), //Battle Sessions diff --git a/src/main/java/com/gmail/goosius/siegewar/settings/SiegeWarSettings.java b/src/main/java/com/gmail/goosius/siegewar/settings/SiegeWarSettings.java index 5cabaa198..9839a7041 100644 --- a/src/main/java/com/gmail/goosius/siegewar/settings/SiegeWarSettings.java +++ b/src/main/java/com/gmail/goosius/siegewar/settings/SiegeWarSettings.java @@ -117,20 +117,20 @@ public static double getWarSiegeMinSiegeDurationBeforeAbandonHours() { return Settings.getDouble(ConfigNodes.WAR_SIEGE_MIN_SIEGE_DURATION_BEFORE_ABANDON_HOURS); } - public static int getWarSiegePointsForAttackerOccupation() { - return Settings.getInt(ConfigNodes.WAR_SIEGE_POINTS_FOR_ATTACKER_OCCUPATION); + public static int getWarBattlePointsForAttackerOccupation() { + return Settings.getInt(ConfigNodes.WAR_BATTLE_POINTS_FOR_ATTACKER_OCCUPATION); } - public static int getWarSiegePointsForDefenderOccupation() { - return Settings.getInt(ConfigNodes.WAR_SIEGE_POINTS_FOR_DEFENDER_OCCUPATION); + public static int getWarBattlePointsForDefenderOccupation() { + return Settings.getInt(ConfigNodes.WAR_BATTLE_POINTS_FOR_DEFENDER_OCCUPATION); } - public static int getWarSiegePointsForAttackerDeath() { - return Settings.getInt(ConfigNodes.WAR_SIEGE_POINTS_FOR_ATTACKER_DEATH); + public static int getWarBattlePointsForAttackerDeath() { + return Settings.getInt(ConfigNodes.WAR_BATTLE_POINTS_FOR_ATTACKER_DEATH); } - public static int getWarSiegePointsForDefenderDeath() { - return Settings.getInt(ConfigNodes.WAR_SIEGE_POINTS_FOR_DEFENDER_DEATH); + public static int getWarBattlePointsForDefenderDeath() { + return Settings.getInt(ConfigNodes.WAR_BATTLE_POINTS_FOR_DEFENDER_DEATH); } public static int getWarSiegeZoneRadiusBlocks() { diff --git a/src/main/java/com/gmail/goosius/siegewar/tasks/DynmapTask.java b/src/main/java/com/gmail/goosius/siegewar/tasks/DynmapTask.java index 4dd04b70f..2e925a2f8 100644 --- a/src/main/java/com/gmail/goosius/siegewar/tasks/DynmapTask.java +++ b/src/main/java/com/gmail/goosius/siegewar/tasks/DynmapTask.java @@ -95,8 +95,8 @@ private static void displaySieges() { //Change to battle icon if a battle is in progress if (siege.getStatus() == SiegeStatus.IN_PROGRESS && BattleSession.getBattleSession().isActive() - && (siege.getAttackerBattleScore() > 0 - || siege.getDefenderBattleScore() > 0 + && (siege.getAttackerBattlePoints() > 0 + || siege.getDefenderBattlePoints() > 0 || siege.getBannerControllingSide() != SiegeSide.NOBODY || siege.getBannerControlSessions().size() > 0)) { marker.setMarkerIcon(markerapi.getMarkerIcon(BATTLE_BANNER_ICON_ID)); @@ -132,12 +132,12 @@ private static void displaySieges() { lines.add(Translation.of("dynmap_siege_attacker", siege.getAttackingNation().getName())); lines.add(Translation.of("dynmap_siege_defender", siege.getDefendingTown().getName())); lines.add(Translation.of("dynmap_siege_status", siege.getStatus().getName())); - lines.add(Translation.of("dynmap_siege_points", siege.getSiegePoints())); + lines.add(Translation.of("dynmap_battle_points", siege.getSiegeBalance())); lines.add(Translation.of("dynmap_siege_time_left", siege.getTimeRemaining())); if (TownyEconomyHandler.isActive()) lines.add(Translation.of("dynmap_siege_war_chest", TownyEconomyHandler.getFormattedBalance(siege.getWarChestAmount()))); lines.add(Translation.of("dynmap_siege_banner_control", siege.getBannerControllingSide().name().charAt(0) + siege.getBannerControllingSide().name().substring(1).toLowerCase())); - lines.add(Translation.of("dynmap_siege_battle_score", siege.getFormattedAttackerBattleScore(), siege.getFormattedDefenderBattleScore())); + lines.add(Translation.of("dynmap_siege_battle_score", siege.getFormattedAttackerBattlePoints(), siege.getFormattedDefenderBattlePoints())); lines.add(Translation.of("dynmap_siege_battle_time_left", siege.getFormattedBattleTimeRemaining())); String desc = "" + name + "
" + StringMgmt.join(lines, "
"); diff --git a/src/main/java/com/gmail/goosius/siegewar/tasks/SiegeWarTimerTaskController.java b/src/main/java/com/gmail/goosius/siegewar/tasks/SiegeWarTimerTaskController.java index da8b715af..a0c7c06ad 100644 --- a/src/main/java/com/gmail/goosius/siegewar/tasks/SiegeWarTimerTaskController.java +++ b/src/main/java/com/gmail/goosius/siegewar/tasks/SiegeWarTimerTaskController.java @@ -43,7 +43,7 @@ private static void evaluateTimedSiegeOutcome(Siege siege) { case IN_PROGRESS: //If scheduled end time has arrived, choose winner if (System.currentTimeMillis() > siege.getScheduledEndTime()) { - TownyObject siegeWinner = SiegeWarPointsUtil.calculateSiegeWinner(siege); + TownyObject siegeWinner = SiegeWarScoringUtil.calculateSiegeWinner(siege); if (siegeWinner instanceof Town) { DefenderWin.defenderWin(siege, (Town) siegeWinner); } else { @@ -97,9 +97,9 @@ public static void evaluateBannerControl() { } } - public static void updatePopulationBasedSiegePointModifiers() { + public static void updatePopulationBasedBattlePointModifiers() { if(SiegeWarSettings.getWarSiegePopulationBasedPointBoostsEnabled()) { - SiegeWarPointsUtil.updatePopulationBasedSiegePointModifiers(); + SiegeWarScoringUtil.updatePopulationBasedBattlePointModifiers(); } } diff --git a/src/main/java/com/gmail/goosius/siegewar/utils/BookUtil.java b/src/main/java/com/gmail/goosius/siegewar/utils/BookUtil.java index 365a8ff4d..de3e4952d 100644 --- a/src/main/java/com/gmail/goosius/siegewar/utils/BookUtil.java +++ b/src/main/java/com/gmail/goosius/siegewar/utils/BookUtil.java @@ -88,16 +88,16 @@ private static String siegeWarUserGuide(String text) { */ text += "\nSIEGE SCORING\n\n"; text += "Players win sieges by holding the ground within " + TownySettings.getTownBlockSize() + " blocks of the siege banner (the 'timed point zone'), and/or by killing enemy soldiers within " + SiegeWarSettings.getWarSiegeZoneRadiusBlocks() + " blocks of the siege banner (the 'siege zone').\n\n"; - text += "Attackers gain " + SiegeWarSettings.getWarSiegePointsForAttackerOccupation() + " base points every 20 seconds for holding the banner. "; - text += "Defenders gain " + SiegeWarSettings.getWarSiegePointsForDefenderOccupation() + " base points every 20 seconds for holding the banner. "; - text += "Attackers gain " + SiegeWarSettings.getWarSiegePointsForAttackerDeath() + " base points if an attacker is killed in the siege zone. "; - text += "Defenders gain " + SiegeWarSettings.getWarSiegePointsForDefenderDeath() + " base points if an defender is killed in the siege zone.\n\n"; + text += "Attackers gain " + SiegeWarSettings.getWarBattlePointsForAttackerOccupation() + " base points every 20 seconds for holding the banner. "; + text += "Defenders gain " + SiegeWarSettings.getWarBattlePointsForDefenderOccupation() + " base points every 20 seconds for holding the banner. "; + text += "Attackers gain " + SiegeWarSettings.getWarBattlePointsForAttackerDeath() + " base points if an attacker is killed in the siege zone. "; + text += "Defenders gain " + SiegeWarSettings.getWarBattlePointsForDefenderDeath() + " base points if an defender is killed in the siege zone.\n\n"; if (SiegeWarSettings.isWarSiegeCounterattackBoosterEnabled() && counterPercent > 0) { text += "If one siege-side has banner control, then the other side will receive a kill point bonus of " + counterPercent + " % for each player on the banner control list. "; text += "For example, if there are 3 players on the banner control list and one is killed, the enemy side will receive " + (3 * counterPercent) + "% more death points than normal.\n\n"; } if (SiegeWarSettings.getWarSiegePopulationBasedPointBoostsEnabled()) - text += "The side of the siege which has a lower population will receive extra siege points.\n\n"; + text += "The side of the siege which has a lower population will receive extra battle points.\n\n"; /* @@ -122,7 +122,7 @@ private static String siegeWarUserGuide(String text) { */ text += "\nHOW A SIEGE ENDS\n\n"; text += "Maximum siege duration is " + maxSiege + " (this is important to allow players enough time to respond to siege attacks, especially casual & cross-timezone players.)\n\n"; - text += "At the end of the max siege duration, a winner is chosen based on the points (positive points mean the attacker wins, negative points mean the defender wins).\n\n"; + text += "At the end of the max siege duration, a winner is chosen based on the siege balance (positive means the attacker wins, negative means the defender wins).\n\n"; /* * Abandon & Surrender @@ -206,7 +206,7 @@ private static String siegeWarUserGuide(String text) { //Battle sessions text += "\nBATTLE SESSIONS\n\n"; - text += "Fighting is organised into " + activeSession + " 'battle sessions'. During a battle session, each team (attackers/defenders) competes in 'battles' at each siege. Killing or banner control will give them a 'battle score'. When the battle session ends, at each battle, the team with the highest battle score wins the battle, and their battle score is converted into siege points. After a battle session ends, there is typically a break until the next battle session. In this break, nobody can gain battle scores.\n\n"; + text += "Fighting is organised into " + activeSession + " 'battle sessions'. During a battle session, each team (attackers/defenders) competes in 'battles' at each siege. Killing or banner control will give them a 'battle score'. When the battle session ends, at each battle, the team with the highest battle score wins the battle, and their battle score is applied to the siege balance. After a battle session ends, there is typically a break until the next battle session. In this break, nobody can gain battle points.\n\n"; return text; } diff --git a/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarBannerControlUtil.java b/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarBannerControlUtil.java index bec3640ca..ac9f185fa 100644 --- a/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarBannerControlUtil.java +++ b/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarBannerControlUtil.java @@ -78,7 +78,7 @@ private static void evaluateNewBannerControlSessions(Siege siege) { residentTown = resident.getTown(); if(residentTown == siege.getDefendingTown() - && universe.getPermissionSource().testPermission(resident.getPlayer(), SiegeWarPermissionNodes.SIEGEWAR_TOWN_SIEGE_POINTS.getNode())) { + && universe.getPermissionSource().testPermission(resident.getPlayer(), SiegeWarPermissionNodes.SIEGEWAR_TOWN_BATTLE_POINTS.getNode())) { //Player is defending their own town if(siege.getBannerControllingSide() == SiegeSide.DEFENDERS && siege.getBannerControllingResidents().contains(resident)) @@ -88,7 +88,7 @@ private static void evaluateNewBannerControlSessions(Siege siege) { continue; } else if (residentTown.hasNation() - && universe.getPermissionSource().testPermission(resident.getPlayer(), SiegeWarPermissionNodes.SIEGEWAR_NATION_SIEGE_POINTS.getNode())) { + && universe.getPermissionSource().testPermission(resident.getPlayer(), SiegeWarPermissionNodes.SIEGEWAR_NATION_BATTLE_POINTS.getNode())) { if (defendingTown.hasNation() && (defendingTown.getNation() == residentTown.getNation() @@ -192,7 +192,7 @@ private static boolean doesPlayerMeetBasicSessionRequirements(Siege siege, Playe if(player.isFlying() || player.isGliding()) return false; // Player is flying - if(!SiegeWarPointsUtil.isPlayerInTimedPointZone(player, siege)) + if(!SiegeWarScoringUtil.isPlayerInTimedPointZone(player, siege)) return false; //player is not in the timed point zone return true; @@ -234,16 +234,16 @@ public void run() { reversal = true; //Apply reversal bonus if required setting is enabled if(SiegeWarSettings.isWarSiegeBannerControlReversalBonusEnabled()) { - reversalBonusScore = (int)((siege.getBattleScoreEarnedFromCurrentBannerControl() * SiegeWarSettings.getWarSiegeBannerControlReversalBonusFactor()) + 0.5); + reversalBonusScore = (int)((siege.getTimedBattlePointsEarnedFromCurrentBannerControl() * SiegeWarSettings.getWarSiegeBannerControlReversalBonusFactor()) + 0.5); if (bannerControlSession.getSiegeSide() == SiegeSide.ATTACKERS) { - siege.adjustAttackerBattleScore(reversalBonusScore); + siege.adjustAttackerBattlePoints(reversalBonusScore); } else { - siege.adjustDefenderBattleScore(reversalBonusScore); + siege.adjustDefenderBattlePoints(reversalBonusScore); } } } siege.clearBannerControllingResidents(); - siege.setBattleScoreEarnedFromCurrentBannerControl(0); + siege.setTimedBattlePointsEarnedFromCurrentBannerControl(0); siege.setBannerControllingSide(bannerControlSession.getSiegeSide()); siege.addBannerControllingResident(bannerControlSession.getResident()); @@ -283,24 +283,24 @@ private static void evaluateBannerControlEffects(Siege siege) { if(siege.getStatus() != SiegeStatus.IN_PROGRESS) return; - //Award battle score - int battleScore = 0; + //Award battle points + int battlePoints = 0; switch(siege.getBannerControllingSide()) { case ATTACKERS: - battleScore = siege.getBannerControllingResidents().size() * SiegeWarSettings.getWarSiegePointsForAttackerOccupation(); - battleScore = SiegeWarPointsUtil.adjustSiegePointsForPopulationQuotient(true, battleScore, siege); - siege.adjustAttackerBattleScore(battleScore); + battlePoints = siege.getBannerControllingResidents().size() * SiegeWarSettings.getWarBattlePointsForAttackerOccupation(); + battlePoints = SiegeWarScoringUtil.applyBattlePointsAdjustmentForPopulationQuotient(true, battlePoints, siege); + siege.adjustAttackerBattlePoints(battlePoints); siege.registerAttackerBattleContributorsFromBannerControl(); break; case DEFENDERS: - battleScore = siege.getBannerControllingResidents().size() * SiegeWarSettings.getWarSiegePointsForDefenderOccupation(); - battleScore = SiegeWarPointsUtil.adjustSiegePointsForPopulationQuotient(false, battleScore, siege); - siege.adjustDefenderBattleScore(battleScore); + battlePoints = siege.getBannerControllingResidents().size() * SiegeWarSettings.getWarBattlePointsForDefenderOccupation(); + battlePoints = SiegeWarScoringUtil.applyBattlePointsAdjustmentForPopulationQuotient(false, battlePoints, siege); + siege.adjustDefenderBattlePoints(battlePoints); break; default: } //Record score for use by the 'Banner Control Reversal Bonus' feature - siege.adjustBattleScoreEarnedFromCurrentBannerControl(battleScore); + siege.adjustBattlePointsEarnedFromCurrentBannerControl(battlePoints); } } diff --git a/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarBattleSessionUtil.java b/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarBattleSessionUtil.java index 79cf39c32..5d1c6eaf4 100644 --- a/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarBattleSessionUtil.java +++ b/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarBattleSessionUtil.java @@ -38,32 +38,32 @@ public static void evaluateBattleSessions() { for(Siege siege: SiegeController.getSieges()) { if (siege.getStatus() == SiegeStatus.IN_PROGRESS - && (siege.getAttackerBattleScore() > 0 || siege.getDefenderBattleScore() > 0)) { + && (siege.getAttackerBattlePoints() > 0 || siege.getDefenderBattlePoints() > 0)) { //Calculate result - int battleResult; - if (siege.getAttackerBattleScore() > siege.getDefenderBattleScore()) { - battleResult = siege.getAttackerBattleScore(); - } else if (siege.getAttackerBattleScore() < siege.getDefenderBattleScore()) { - battleResult = -siege.getDefenderBattleScore(); + int battlePointsOfWinner; + if (siege.getAttackerBattlePoints() > siege.getDefenderBattlePoints()) { + battlePointsOfWinner = siege.getAttackerBattlePoints(); + } else if (siege.getAttackerBattlePoints() < siege.getDefenderBattlePoints()) { + battlePointsOfWinner = -siege.getDefenderBattlePoints(); } else { - battleResult = 0; + battlePointsOfWinner = 0; } - //Apply the result to the siege points - siege.adjustSiegePoints(battleResult); + //Apply the battle points of the winner to the siege balance + siege.adjustSiegeBalance(battlePointsOfWinner); //Propagate attacker battle contributions to siege history siege.propagateAttackerBattleContributorsToAttackerSiegeContributors(); //Prepare result for messaging - battleResults.put(siege, battleResult); + battleResults.put(siege, battlePointsOfWinner); //Clear battle related stats from the siege siege.setBannerControllingSide(SiegeSide.NOBODY); siege.clearBannerControllingResidents(); siege.clearBannerControlSessions(); - siege.setAttackerBattleScore(0); - siege.setDefenderBattleScore(0); + siege.setAttackerBattlePoints(0); + siege.setDefenderBattlePoints(0); siege.clearAttackerBattleContributors(); //Save siege diff --git a/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarPointsUtil.java b/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarScoringUtil.java similarity index 70% rename from src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarPointsUtil.java rename to src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarScoringUtil.java index 27444cf0e..80b091ad6 100644 --- a/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarPointsUtil.java +++ b/src/main/java/com/gmail/goosius/siegewar/utils/SiegeWarScoringUtil.java @@ -15,24 +15,24 @@ import java.util.Map; /** - * This class contains utility functions related to siege points + * This class contains utility functions related to battle scoring - i.e. battle points and siege balance * * @author Goosius */ -public class SiegeWarPointsUtil { +public class SiegeWarScoringUtil { /** * This method calculates who has won a siege - * - * Defending Town - The defending town has won the siege if all of the siege zones are in negative points. - * Attacking Nation - an attacking nation has won the siege if its siege points are positive, - * and higher than the siegepoints of any other attacker. + * + * Siege Balance Negative - Defending town wins + * Siege Balance 0 - Defending town wins + * Siege Balance Positive - Attacking nation wins * * @param siege the siege * @return the winner of the siege */ public static TownyObject calculateSiegeWinner(Siege siege) { - if(siege.getSiegePoints() > 0) { + if(siege.getSiegeBalance() > 0) { return siege.getAttackingNation(); } else { return siege.getDefendingTown(); @@ -57,7 +57,7 @@ public static boolean isPlayerInTimedPointZone(Player player, Siege siege) { } /** - * This method applies penalty points to a player if they are in the given siegezone + * This method applies penalty battle points to a player if they are in the given siegezone * Offline players will also be punished * * @param residentIsAttacker is the resident an attacker or defender? @@ -75,18 +75,18 @@ public static void awardPenaltyPoints(boolean residentIsAttacker, if(!BattleSession.getBattleSession().isActive()) return; - //Give battle score to opposing side - int battleScore; + //Give battle points to opposing side + int battlePoints; if (residentIsAttacker) { - battleScore = SiegeWarSettings.getWarSiegePointsForAttackerDeath(); - battleScore = adjustSiegePointPenaltyForBannerControl(true, battleScore, siege); - battleScore = adjustSiegePointsForPopulationQuotient(false, battleScore, siege); - siege.adjustDefenderBattleScore(battleScore); + battlePoints = SiegeWarSettings.getWarBattlePointsForAttackerDeath(); + battlePoints = applyBattlePointsPenaltyForBannerControl(true, battlePoints, siege); + battlePoints = applyBattlePointsAdjustmentForPopulationQuotient(false, battlePoints, siege); + siege.adjustDefenderBattlePoints(battlePoints); } else { - battleScore = SiegeWarSettings.getWarSiegePointsForDefenderDeath(); - battleScore = adjustSiegePointPenaltyForBannerControl(false, battleScore, siege); - battleScore = adjustSiegePointsForPopulationQuotient(true, battleScore, siege); - siege.adjustAttackerBattleScore(battleScore); + battlePoints = SiegeWarSettings.getWarBattlePointsForDefenderDeath(); + battlePoints = applyBattlePointsPenaltyForBannerControl(false, battlePoints, siege); + battlePoints = applyBattlePointsAdjustmentForPopulationQuotient(true, battlePoints, siege); + siege.adjustAttackerBattlePoints(battlePoints); } //Send messages to siege participants @@ -94,19 +94,19 @@ public static void awardPenaltyPoints(boolean residentIsAttacker, unformattedErrorMessage, siege.getDefendingTown().getName(), resident.getName(), - Math.abs(battleScore)); + Math.abs(battlePoints)); SiegeWarNotificationUtil.informSiegeParticipants(siege, message); } - public static void updatePopulationBasedSiegePointModifiers() { + public static void updatePopulationBasedBattlePointModifiers() { Map nationSidePopulationsCache = new HashMap<>(); for (Siege siege : SiegeController.getSieges()) { - updateSiegePointPopulationModifier(siege, nationSidePopulationsCache); + updateBattlePointPopulationModifier(siege, nationSidePopulationsCache); } } - private static void updateSiegePointPopulationModifier(Siege siege, Map nationSidePopulationsCache) { + private static void updateBattlePointPopulationModifier(Siege siege, Map nationSidePopulationsCache) { Nation nation = null; int attackerPopulation; int defenderPopulation; @@ -170,44 +170,44 @@ private static void updateSiegePointPopulationModifier(Siege siege, Map Points: &a%s' +status_town_siege_status_siege_balance: '&2 > Balance: &a%s' status_town_siege_status_warchest: '&2 > War Chest: &a%s' #Death points -msg_siege_war_attacker_death: '&bSiege of %s > Attacker died > %s > Battle score -%d' -msg_siege_war_defender_death: '&bSiege of %s > Defender died > %s > Battle score +%d' +msg_siege_war_attacker_death: '&bSiege of %s > Attacker died > %s > Battle Points -%d' +msg_siege_war_defender_death: '&bSiege of %s > Defender died > %s > Battle Points +%d' #Battle sessions status_town_siege_battle: '&2Battle' @@ -296,18 +295,21 @@ msg_war_siege_battle_session_ended_defender_result: "&b * Defenders @ %s (%s)" msg_war_siege_battle_session_ended_draw_result: "&b * Draw @ %s (0)" msg_war_siege_battle_session_break_cannot_get_banner_control: "&cBanner control cannot be gained until the next battle session starts. The next battle session will start in %s." -#Scoreboard -hud_points: 'Siege Points: ' -hud_battle_attacker_score: 'BAT ATK Score: ' -hud_battle_defender_score: 'BAT DEF Score: ' +#Hud +hud_points: 'Siege Balance: ' +hud_battle_attacker_score: 'BAT ATK Points: ' +hud_battle_defender_score: 'BAT DEF Points: ' hud_battle_time_remaining: 'BAT Time Left: ' #Dynmap -dynmap_siege_points: 'Siege Points: %d' +dynmap_battle_points: 'Siege Balance: %d' dynmap_siege_battle_score: 'Battle Score: %s / %s' dynmap_siege_battle_time_left: 'Battle Time Left: %s' #Banner control msg_siege_war_banner_control_reversed_by_attacker: '&bSiege on %s > The attackers have stolen banner control from the defenders!.' msg_siege_war_banner_control_reversed_by_defender: '&bSiege on %s > The defenders have stolen banner control from the attackers!.' -msg_siege_war_banner_control_reversal_bonus: ' Reversal Bonus: %s%d' \ No newline at end of file +msg_siege_war_banner_control_reversal_bonus: ' Reversal Bonus: %s%d' + +#Admin +msg_swa_set_siege_balance_success: '&bSuccessfully set siege balance to %d for %s.' \ No newline at end of file diff --git a/src/main/resources/french.yml b/src/main/resources/french.yml index 22e246b01..2e89f0125 100644 --- a/src/main/resources/french.yml +++ b/src/main/resources/french.yml @@ -200,7 +200,6 @@ hud_banner_control: "Ctrl bannière: " hud_time_remaining: "Temps restant: " msg_err_peaceful_town_pvp_forced_off: "&cLe PVP est désactivé dans les villes pacifiques." -msg_swa_set_points_success: "&bRéussi à mettre les points de siège sur %d pour %s." msg_swa_resident_already_has_control: "&cLe résident %s a déjà le contrôle." msg_swa_resident_doesnt_have_control: "&Le résident %s n'a pas le contrôle." msg_swa_set_plunder_success: "&bPillage défini pour %s sur %s." @@ -277,12 +276,12 @@ msg_beacon_preference_set: "&bBeacon preference set to %s." msg_na: 'N/A' #Town screen -status_town_siege_status_points: '&2 > Points: &a%s' +status_town_siege_status_siege_balance: '&2 > Balance: &a%s' status_town_siege_status_warchest: '&2 > War Chest: &a%s' #Death points -msg_siege_war_attacker_death: '&bSiege of %s > Attacker died > %s > Battle score -%d' -msg_siege_war_defender_death: '&bSiege of %s > Defender died > %s > Battle score +%d' +msg_siege_war_attacker_death: '&bSiege of %s > Attacker died > %s > Battle Points -%d' +msg_siege_war_defender_death: '&bSiege of %s > Defender died > %s > Battle Points +%d' #Battle sessions status_town_siege_battle: '&2Battle' @@ -296,18 +295,21 @@ msg_war_siege_battle_session_ended_defender_result: "&b * Defenders @ %s (%s)" msg_war_siege_battle_session_ended_draw_result: "&b * Draw @ %s (0)" msg_war_siege_battle_session_break_cannot_get_banner_control: "&cBanner control cannot be gained until the next battle session starts. The next battle session will start in %s." -#Scoreboard -hud_points: 'Siege Points: ' -hud_battle_attacker_score: 'BAT ATK Score: ' -hud_battle_defender_score: 'BAT DEF Score: ' +#Hud +hud_points: 'Siege Balance: ' +hud_battle_attacker_score: 'BAT ATK Points: ' +hud_battle_defender_score: 'BAT DEF Points: ' hud_battle_time_remaining: 'BAT Time Left: ' #Dynmap -dynmap_siege_points: 'Siege Points: %d' +dynmap_battle_points: 'Siege Balance: %d' dynmap_siege_battle_score: 'Battle Score: %s / %s' dynmap_siege_battle_time_left: 'Battle Time Left: %s' #Banner control msg_siege_war_banner_control_reversed_by_attacker: '&bSiege on %s > The attackers have stolen banner control from the defenders!.' msg_siege_war_banner_control_reversed_by_defender: '&bSiege on %s > The defenders have stolen banner control from the attackers!.' -msg_siege_war_banner_control_reversal_bonus: ' Reversal Bonus: %s%d' \ No newline at end of file +msg_siege_war_banner_control_reversal_bonus: ' Reversal Bonus: %s%d' + +#Admin +msg_swa_set_siege_balance_success: '&bSuccessfully set siege balance to %d for %s.' \ No newline at end of file From 21469b5c692fddaffc5365915c62231f59f37176 Mon Sep 17 00:00:00 2001 From: goosius1 <=> Date: Sat, 27 Feb 2021 10:12:23 +0000 Subject: [PATCH 2/3] Translation fix --- src/main/resources/english.yml | 4 ++-- src/main/resources/french.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/english.yml b/src/main/resources/english.yml index 4a189e75a..f943671fb 100644 --- a/src/main/resources/english.yml +++ b/src/main/resources/english.yml @@ -297,8 +297,8 @@ msg_war_siege_battle_session_break_cannot_get_banner_control: "&cBanner control #Hud hud_points: 'Siege Balance: ' -hud_battle_attacker_score: 'BAT ATK Points: ' -hud_battle_defender_score: 'BAT DEF Points: ' +hud_battle_attacker_points: 'BAT ATK Points: ' +hud_battle_defender_points: 'BAT DEF Points: ' hud_battle_time_remaining: 'BAT Time Left: ' #Dynmap diff --git a/src/main/resources/french.yml b/src/main/resources/french.yml index 2e89f0125..f219c1c24 100644 --- a/src/main/resources/french.yml +++ b/src/main/resources/french.yml @@ -297,8 +297,8 @@ msg_war_siege_battle_session_break_cannot_get_banner_control: "&cBanner control #Hud hud_points: 'Siege Balance: ' -hud_battle_attacker_score: 'BAT ATK Points: ' -hud_battle_defender_score: 'BAT DEF Points: ' +hud_battle_attacker_points: 'BAT ATK Points: ' +hud_battle_defender_points: 'BAT DEF Points: ' hud_battle_time_remaining: 'BAT Time Left: ' #Dynmap From 435f39f23dd402a8bf50952c20fcd3003d3e57db Mon Sep 17 00:00:00 2001 From: goosius1 <=> Date: Sat, 27 Feb 2021 10:19:03 +0000 Subject: [PATCH 3/3] Fixed lang issue --- src/main/java/com/gmail/goosius/siegewar/hud/SiegeWarHud.java | 2 +- src/main/resources/english.yml | 2 +- src/main/resources/french.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gmail/goosius/siegewar/hud/SiegeWarHud.java b/src/main/java/com/gmail/goosius/siegewar/hud/SiegeWarHud.java index 47198b385..1b68d2f77 100644 --- a/src/main/java/com/gmail/goosius/siegewar/hud/SiegeWarHud.java +++ b/src/main/java/com/gmail/goosius/siegewar/hud/SiegeWarHud.java @@ -45,7 +45,7 @@ public static void toggleOn(Player p, Siege siege) { String attackers_entry = Colors.LightGray + Translation.of("hud_attackers"), defenders_entry = Colors.LightGray + Translation.of("hud_defenders"), - balance_entry = Colors.LightGray + Translation.of("hud_balance"), + balance_entry = Colors.LightGray + Translation.of("hud_siege_balance"), timeRemaining_entry = Colors.LightGray + Translation.of("hud_time_remaining"), bannerControl_entry = Colors.LightGray + Translation.of("hud_banner_control"), battleAttackerScore_entry = Colors.LightGray + Translation.of("hud_battle_attacker_points"), diff --git a/src/main/resources/english.yml b/src/main/resources/english.yml index f943671fb..cb7f5a01f 100644 --- a/src/main/resources/english.yml +++ b/src/main/resources/english.yml @@ -296,7 +296,7 @@ msg_war_siege_battle_session_ended_draw_result: "&b * Draw @ %s (0)" msg_war_siege_battle_session_break_cannot_get_banner_control: "&cBanner control cannot be gained until the next battle session starts. The next battle session will start in %s." #Hud -hud_points: 'Siege Balance: ' +hud_siege_balance: 'Siege Balance: ' hud_battle_attacker_points: 'BAT ATK Points: ' hud_battle_defender_points: 'BAT DEF Points: ' hud_battle_time_remaining: 'BAT Time Left: ' diff --git a/src/main/resources/french.yml b/src/main/resources/french.yml index f219c1c24..069ae998d 100644 --- a/src/main/resources/french.yml +++ b/src/main/resources/french.yml @@ -296,7 +296,7 @@ msg_war_siege_battle_session_ended_draw_result: "&b * Draw @ %s (0)" msg_war_siege_battle_session_break_cannot_get_banner_control: "&cBanner control cannot be gained until the next battle session starts. The next battle session will start in %s." #Hud -hud_points: 'Siege Balance: ' +hud_siege_balance: 'Siege Balance: ' hud_battle_attacker_points: 'BAT ATK Points: ' hud_battle_defender_points: 'BAT DEF Points: ' hud_battle_time_remaining: 'BAT Time Left: '