diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdShow.java b/src/main/java/com/massivecraft/factions/cmd/CmdShow.java index f986d56c..71134119 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdShow.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdShow.java @@ -57,10 +57,14 @@ public class CmdShow extends FCommand { msg(TL.COMMAND_SHOW_JOINING.toString() + peaceStatus, (faction.getOpen() ? TL.COMMAND_SHOW_UNINVITED.toString() : TL.COMMAND_SHOW_INVITATION.toString())); double powerBoost = faction.getPowerBoost(); - String boost = (powerBoost == 0.0) ? "" : (powerBoost > 0.0 ? TL.COMMAND_SHOW_BONUS.toString():TL.COMMAND_SHOW_PENALTY.toString() + powerBoost + ")"); + String boost = (powerBoost == 0.0) ? "" : (powerBoost > 0.0 ? TL.COMMAND_SHOW_BONUS.toString() : TL.COMMAND_SHOW_PENALTY.toString() + powerBoost + ")"); String raidable = faction.getLandRounded() > faction.getPowerRounded() ? TL.RAIDABLE_TRUE.toString() : TL.RAIDABLE_FALSE.toString(); msg(TL.COMMAND_SHOW_POWER, faction.getLandRounded(), faction.getPowerRounded(), faction.getPowerMaxRounded(), boost, raidable); + if (P.p.getConfig().getBoolean("hcf.raidable", false)) { + int dtr = Math.max(faction.getPowerRounded() - faction.getLandRounded(), 0); + msg(TL.COMMAND_SHOW_DEATHS_TIL_RAIDABLE, dtr); + } if (faction.isPermanent()) { msg(TL.COMMAND_SHOW_PERMANENT); } diff --git a/src/main/java/com/massivecraft/factions/zcore/util/TL.java b/src/main/java/com/massivecraft/factions/zcore/util/TL.java index f3c3e1ff..b9ed585a 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java @@ -446,6 +446,7 @@ public enum TL { COMMAND_SHOW_MEMBERSONLINE("Members online: "), COMMAND_SHOW_MEMBERSOFFLINE("Members offline: "), COMMAND_SHOW_COMMANDDESCRIPTION("Show faction information"), + COMMAND_SHOW_DEATHS_TIL_RAIDABLE("DTR: %1$d"), COMMAND_SHOWINVITES_PENDING("Players with pending invites: "), COMMAND_SHOWINVITES_CLICKTOREVOKE("Click to revoke invite for %1$s"), diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 47085f47..bd5e3caa 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -177,6 +177,9 @@ max-relations: hcf: raidable: false + # DTR (death til raidable) will be in /f show if enabled. Configure the message in the lang.yml + dtr: false + # Should we allow Factions to over claim if they are raidable (above has no effect on this)? # This has always been true, allowing factions to over claim others. overclaim: true \ No newline at end of file