diff --git a/09HDscape-server/src/org/crandor/game/content/skill/Skills.java b/09HDscape-server/src/org/crandor/game/content/skill/Skills.java index 5e74bf52f..78b559a5c 100644 --- a/09HDscape-server/src/org/crandor/game/content/skill/Skills.java +++ b/09HDscape-server/src/org/crandor/game/content/skill/Skills.java @@ -258,7 +258,7 @@ public final class Skills { if (!(entity instanceof Player)) { return 1.0; } - double mod = multiplyer ? (GlobalEventManager.get().isActive("XPFever") ? EXPERIENCE_MULTIPLIER * 2 : EXPERIENCE_MULTIPLIER) : 1; + double mod = multiplyer ? (GlobalEventManager.get().isActive("XP Fever") ? EXPERIENCE_MULTIPLIER * 2 : EXPERIENCE_MULTIPLIER) : 1; Player p = (Player) entity; if (p.getIronmanManager().getMode() == IronmanMode.ULTIMATE) { mod /= 4; diff --git a/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java b/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java index 7373cb8b0..b827ef898 100644 --- a/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java +++ b/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java @@ -37,6 +37,7 @@ public class GlobalEventManager implements CallBack { getEvents().put("Thieves jackpot", 0L); getEvents().put("Golden essence", 0L); getEvents().put("Clone Fest", 0L); + getEvents().put("XPFever", 0L); } catch (Exception e) { e.printStackTrace(); @@ -158,16 +159,6 @@ public class GlobalEventManager implements CallBack { return message(message, tag, ""); } - - - /* - * getEvents().put("Alchemy hellenistic", 0L); - getEvents().put("Golden retriever", 0L); - getEvents().put("Harvesting doubles", 0L); - getEvents().put("Thieves jackpot", 0L); - getEvents().put("Golden essence", 0L); - - */ public GlobalEventManager message(String message, boolean tag, String color) { /*if (WorldCommunicator.isEnabled()) { MSPacketRepository.sendWorldMessage((tag ? "[Event Manager] - " : "")+ message); @@ -234,16 +225,6 @@ public class GlobalEventManager implements CallBack { return this; } - - /* - * getEvents().put("Alchemy hellenistic", 0L); - getEvents().put("Golden retriever", 0L); - getEvents().put("Harvesting doubles", 0L); - getEvents().put("Thieves jackpot", 0L); - getEvents().put("Golden essence", 0L); - - */ - public GlobalEventManager activateHourly(String eventName) { if (getEvents().get(eventName) == null) { @@ -277,6 +258,9 @@ public class GlobalEventManager implements CallBack { case "Clone Fest": player.getPacketDispatch().sendMessages("This event means 20 clones have been spawned in the wilderness", "near the mage bank."); break; + case "XPFever": + player.getPacketDispatch().sendMessages("This event means you'll receive x2 XP"); + break; } } diff --git a/09HDscape-server/src/plugin/command/DeveloperCommandPlugin.java b/09HDscape-server/src/plugin/command/DeveloperCommandPlugin.java index 843e9a3c8..ab89ed789 100644 --- a/09HDscape-server/src/plugin/command/DeveloperCommandPlugin.java +++ b/09HDscape-server/src/plugin/command/DeveloperCommandPlugin.java @@ -182,9 +182,9 @@ public final class DeveloperCommandPlugin extends CommandPlugin { for (int i = 1; i < args.length; i++) target += args[i] + ((i == args.length - 1) ? "" : " "); if (args.length > 1) - GlobalEventManager.get().activate("XPFever", target); + GlobalEventManager.get().activate("XP Fever", target); else - GlobalEventManager.get().activate("XPFever", target); + GlobalEventManager.get().activate("XP Fever", target); break; case "poison": player.getStateManager().set(EntityState.POISONED, 200, player); diff --git a/09HDscape-server/src/plugin/interaction/inter/ExperienceLampInterface.java b/09HDscape-server/src/plugin/interaction/inter/ExperienceLampInterface.java index 7c4be423a..e4b4003a7 100644 --- a/09HDscape-server/src/plugin/interaction/inter/ExperienceLampInterface.java +++ b/09HDscape-server/src/plugin/interaction/inter/ExperienceLampInterface.java @@ -87,7 +87,7 @@ public final class ExperienceLampInterface extends ComponentPlugin { experience /= 2; } } else { - player.getDialogueInterpreter().open(70099, new Object[] { "The lamp gives you " + (experience * (Skills.EXPERIENCE_MULTIPLIER * (GlobalEventManager.get().isActive("XPFever") ? 2 : 1))) + " " + Skills.SKILL_NAME[skillType.skill] + " experience." }); + player.getDialogueInterpreter().open(70099, new Object[] { "The lamp gives you " + (experience * (Skills.EXPERIENCE_MULTIPLIER * (GlobalEventManager.get().isActive("XP Fever") ? 2 : 1))) + " " + Skills.SKILL_NAME[skillType.skill] + " experience." }); } player.getSkills().addExperience(skillType.skill, experience, false); }