EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 21:26:46 +01:00
Code Issues Projects Releases Wiki Activity

Reorganized Hardcore locale strings

Browse Source
This commit is contained in:
TfT_02 2013-08-21 18:51:58 +02:00
parent a6e7febf77
commit 0455416dec
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java
View File

@ -39,7 +39,7 @@ public class HardcoreCommand extends HardcoreModeCommand {
Config.getInstance().setHardcoreStatLossEnabled(SkillType.getSkill(skill), true); Config.getInstance().setHardcoreStatLossEnabled(SkillType.getSkill(skill), true);
} }
mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Enabled", skill)); mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode.Enabled", LocaleLoader.getString("Hardcore.DeathStatLoss.Name"), skill));
} }
@Override @Override
@ -53,12 +53,12 @@ public class HardcoreCommand extends HardcoreModeCommand {
Config.getInstance().setHardcoreStatLossEnabled(SkillType.getSkill(skill), false); Config.getInstance().setHardcoreStatLossEnabled(SkillType.getSkill(skill), false);
} }
mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Disabled", skill)); mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode.Disabled", LocaleLoader.getString("Hardcore.DeathStatLoss.Name"), skill));
} }
@Override @Override
protected void modify() { protected void modify() {
Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercent); Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercent);
sender.sendMessage(LocaleLoader.getString("Hardcore.PercentageChanged", percent.format(newPercent / 100D))); sender.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PercentageChanged", percent.format(newPercent / 100D)));
} }
} }

6
src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java
View File

@ -39,7 +39,7 @@ public class VampirismCommand extends HardcoreModeCommand {
Config.getInstance().setHardcoreVampirismEnabled(SkillType.getSkill(skill), true); Config.getInstance().setHardcoreVampirismEnabled(SkillType.getSkill(skill), true);
} }
mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Enabled", skill)); mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode.Enabled", LocaleLoader.getString("Hardcore.Vampirism.Name"), skill));
} }
@Override @Override
@ -53,12 +53,12 @@ public class VampirismCommand extends HardcoreModeCommand {
Config.getInstance().setHardcoreVampirismEnabled(SkillType.getSkill(skill), false); Config.getInstance().setHardcoreVampirismEnabled(SkillType.getSkill(skill), false);
} }
mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Disabled", skill)); mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode.Disabled", LocaleLoader.getString("Hardcore.Vampirism.Name"), skill));
} }
@Override @Override
protected void modify() { protected void modify() {
Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercent); Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercent);
sender.sendMessage(LocaleLoader.getString("Vampirism.PercentageChanged", percent.format(newPercent / 100D))); sender.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
} }
} }

10
src/main/java/com/gmail/nossr50/util/HardcoreManager.java
View File

@ -43,7 +43,7 @@ public final class HardcoreManager {
playerProfile.modifySkill(skillType, playerSkillLevel - levelsLost); playerProfile.modifySkill(skillType, playerSkillLevel - levelsLost);
} }
player.sendMessage(LocaleLoader.getString("Hardcore.Player.Loss", totalLost)); player.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PlayerDeath", totalLost));
} }
public static void invokeVampirism(Player killer, Player victim) { public static void invokeVampirism(Player killer, Player victim) {
@ -80,12 +80,12 @@ public final class HardcoreManager {
} }
if (totalStolen > 0) { if (totalStolen > 0) {
killer.sendMessage(LocaleLoader.getString("Vampirism.Killer.Success", totalStolen, victim.getName())); killer.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.Killer.Success", totalStolen, victim.getName()));
victim.sendMessage(LocaleLoader.getString("Vampirism.Victim.Success", killer.getName(), totalStolen)); victim.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.Victim.Success", killer.getName(), totalStolen));
} }
else { else {
killer.sendMessage(LocaleLoader.getString("Vampirism.Killer.Failure", victim.getName())); killer.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.Killer.Failure", victim.getName()));
victim.sendMessage(LocaleLoader.getString("Vampirism.Victim.Failure", killer.getName())); victim.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.Victim.Failure", killer.getName()));
} }
} }

22
src/main/resources/locale/locale_en_US.properties
View File

@ -688,17 +688,17 @@ Perks.activationtime.desc=Increases ability activation time by {0} seconds.
Perks.activationtime.bonus=[[GOLD]] ({0}s with Endurance Perk) Perks.activationtime.bonus=[[GOLD]] ({0}s with Endurance Perk)
#HARDCORE #HARDCORE
Hardcore.Player.Loss=[[GOLD]][mcMMO] [[DARK_RED]]You have lost [[BLUE]]{0}[[DARK_RED]] from death. Hardcore.Mode.Disabled=[[GOLD]][mcMMO] Hardcore mode {0} disabled. {1}
Vampirism.Killer.Failure=[[GOLD]][mcMMO] [[YELLOW]]{0}[[GRAY]] was too unskilled to grant you any knowledge. Hardcore.Mode.Enabled=[[GOLD]][mcMMO] Hardcore mode {0} enabled. {1}
Vampirism.Killer.Success=[[GOLD]][mcMMO] [[DARK_AQUA]]You have stolen [[BLUE]]{0}[[DARK_AQUA]] levels from [[YELLOW]]{1}. Hardcore.DeathStatLoss.Name=Skill Death Penalty
Vampirism.Victim.Failure=[[GOLD]][mcMMO] [[YELLOW]]{0}[[GRAY]] was unable to steal knowledge from you! Hardcore.DeathStatLoss.PlayerDeath=[[GOLD]][mcMMO] [[DARK_RED]]You have lost [[BLUE]]{0}[[DARK_RED]] from death.
Vampirism.Victim.Success=[[GOLD]][mcMMO] [[YELLOW]]{0}[[DARK_RED]] has stolen [[BLUE]]{1}[[DARK_RED]] levels from you! Hardcore.DeathStatLoss.PercentageChanged=[[GOLD]][mcMMO] The stat loss percentage was changed to {0}.
Hardcore.Disabled=[[GOLD]][mcMMO] Hardcore mode disabled. {0} Hardcore.Vampirism.Name=Vampirism
Hardcore.Enabled=[[GOLD]][mcMMO] Hardcore mode enabled. {0} Hardcore.Vampirism.Killer.Failure=[[GOLD]][mcMMO] [[YELLOW]]{0}[[GRAY]] was too unskilled to grant you any knowledge.
Hardcore.PercentageChanged=[[GOLD]][mcMMO] The stat loss percentage was changed to {0}. Hardcore.Vampirism.Killer.Success=[[GOLD]][mcMMO] [[DARK_AQUA]]You have stolen [[BLUE]]{0}[[DARK_AQUA]] levels from [[YELLOW]]{1}.
Vampirism.Disabled=[[GOLD]][mcMMO] Vampirism mode disabled. {0} Hardcore.Vampirism.Victim.Failure=[[GOLD]][mcMMO] [[YELLOW]]{0}[[GRAY]] was unable to steal knowledge from you!
Vampirism.Enabled=[[GOLD]][mcMMO] Vampirism mode enabled. {0} Hardcore.Vampirism.Victim.Success=[[GOLD]][mcMMO] [[YELLOW]]{0}[[DARK_RED]] has stolen [[BLUE]]{1}[[DARK_RED]] levels from you!
Vampirism.PercentageChanged=[[GOLD]][mcMMO] The stat leech percentage was changed to {0}. Hardcore.Vampirism.PercentageChanged=[[GOLD]][mcMMO] The stat leech percentage was changed to {0}.
#SPOUT #SPOUT
Spout.Donate=[[YELLOW]][mcMMO] Donate! Spout.Donate=[[YELLOW]][mcMMO] Donate!