From 95c8b1345c2dbab3d661e435a998df88cfe83f72 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 22 May 2015 04:38:57 +0000 Subject: [PATCH] [Classic] Missing updates. --- .../data_classic/html/classmaster/31756-1.htm | 11 +++++ .../data_classic/html/classmaster/31756.htm | 13 +++++ .../html/classmaster/tutorialtemplate.htm | 2 +- .../scripts/handlers/MasterHandler.java | 4 ++ .../actionhandlers/L2PcInstanceAction.java | 2 +- .../bypasshandlers/AlternateClassMaster.java | 48 +++++++++++++++++++ .../handlers/effecthandlers/Fishing.java | 2 +- .../usercommandhandlers}/ExperienceGain.java | 18 +++---- .../stats/npcs/custom/ClassMaster.xml | 9 ++++ 9 files changed, 97 insertions(+), 12 deletions(-) create mode 100644 trunk/dist/game/data_classic/html/classmaster/31756-1.htm create mode 100644 trunk/dist/game/data_classic/html/classmaster/31756.htm create mode 100644 trunk/dist/game/data_classic/scripts/handlers/bypasshandlers/AlternateClassMaster.java rename trunk/dist/game/data_classic/scripts/{custom/listeners/ExperienceGain => handlers/usercommandhandlers}/ExperienceGain.java (86%) create mode 100644 trunk/dist/game/data_classic/stats/npcs/custom/ClassMaster.xml diff --git a/trunk/dist/game/data_classic/html/classmaster/31756-1.htm b/trunk/dist/game/data_classic/html/classmaster/31756-1.htm new file mode 100644 index 0000000000..d8a48510d3 --- /dev/null +++ b/trunk/dist/game/data_classic/html/classmaster/31756-1.htm @@ -0,0 +1,11 @@ +Test Server Helper:
+What item do you need?
+ + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/classmaster/31756.htm b/trunk/dist/game/data_classic/html/classmaster/31756.htm new file mode 100644 index 0000000000..68cdfa4fe1 --- /dev/null +++ b/trunk/dist/game/data_classic/html/classmaster/31756.htm @@ -0,0 +1,13 @@ +Test Server Helper:
+How may I assist you?
+ + + + + + + + + + + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/classmaster/tutorialtemplate.htm b/trunk/dist/game/data_classic/html/classmaster/tutorialtemplate.htm index cda735effb..c0383cd327 100644 --- a/trunk/dist/game/data_classic/html/classmaster/tutorialtemplate.htm +++ b/trunk/dist/game/data_classic/html/classmaster/tutorialtemplate.htm @@ -6,5 +6,5 @@ Item(s) required for class change: %req_items%

-Ask me next time. +Ask me next time. \ No newline at end of file diff --git a/trunk/dist/game/data_classic/scripts/handlers/MasterHandler.java b/trunk/dist/game/data_classic/scripts/handlers/MasterHandler.java index 1c5a5722de..24533de119 100644 --- a/trunk/dist/game/data_classic/scripts/handlers/MasterHandler.java +++ b/trunk/dist/game/data_classic/scripts/handlers/MasterHandler.java @@ -109,6 +109,7 @@ import handlers.admincommandhandlers.AdminTvTEvent; import handlers.admincommandhandlers.AdminUnblockIp; import handlers.admincommandhandlers.AdminVitality; import handlers.admincommandhandlers.AdminZone; +import handlers.bypasshandlers.AlternateClassMaster; import handlers.bypasshandlers.ArcanCityMovie; import handlers.bypasshandlers.Augment; import handlers.bypasshandlers.Buy; @@ -243,6 +244,7 @@ import handlers.usercommandhandlers.ChannelLeave; import handlers.usercommandhandlers.ClanPenalty; import handlers.usercommandhandlers.ClanWarsList; import handlers.usercommandhandlers.Dismount; +import handlers.usercommandhandlers.ExperienceGain; import handlers.usercommandhandlers.InstanceZone; import handlers.usercommandhandlers.Loc; import handlers.usercommandhandlers.Mount; @@ -411,6 +413,7 @@ public class MasterHandler }, { // Bypass Handlers + AlternateClassMaster.class, ArcanCityMovie.class, Augment.class, Buy.class, @@ -515,6 +518,7 @@ public class MasterHandler ClanPenalty.class, ClanWarsList.class, Dismount.class, + ExperienceGain.class, Unstuck.class, InstanceZone.class, Loc.class, diff --git a/trunk/dist/game/data_classic/scripts/handlers/actionhandlers/L2PcInstanceAction.java b/trunk/dist/game/data_classic/scripts/handlers/actionhandlers/L2PcInstanceAction.java index bdc126d141..569ddfdde3 100644 --- a/trunk/dist/game/data_classic/scripts/handlers/actionhandlers/L2PcInstanceAction.java +++ b/trunk/dist/game/data_classic/scripts/handlers/actionhandlers/L2PcInstanceAction.java @@ -72,7 +72,7 @@ public class L2PcInstanceAction implements IActionHandler // Aggression target lock effect if (activeChar.isLockedTarget() && (activeChar.getLockedTarget() != target)) { - activeChar.sendPacket(SystemMessageId.FAILED_CHANGE_TARGET); + activeChar.sendPacket(SystemMessageId.FAILED_TO_CHANGE_ENMITY); return false; } diff --git a/trunk/dist/game/data_classic/scripts/handlers/bypasshandlers/AlternateClassMaster.java b/trunk/dist/game/data_classic/scripts/handlers/bypasshandlers/AlternateClassMaster.java new file mode 100644 index 0000000000..442c522562 --- /dev/null +++ b/trunk/dist/game/data_classic/scripts/handlers/bypasshandlers/AlternateClassMaster.java @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2004-2015 L2J DataPack + * + * This file is part of L2J DataPack. + * + * L2J DataPack is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * L2J DataPack is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.bypasshandlers; + +import com.l2jserver.gameserver.handler.IBypassHandler; +import com.l2jserver.gameserver.model.actor.L2Character; +import com.l2jserver.gameserver.model.actor.instance.L2ClassMasterInstance; +import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; + +/** + * @author Mobius + */ +public class AlternateClassMaster implements IBypassHandler +{ + private static final String[] COMMANDS = + { + "AlternateClassMaster", + }; + + @Override + public boolean useBypass(String command, L2PcInstance activeChar, L2Character target) + { + L2ClassMasterInstance.onTutorialLink(activeChar, command); + return false; + } + + @Override + public String[] getBypassList() + { + return COMMANDS; + } +} diff --git a/trunk/dist/game/data_classic/scripts/handlers/effecthandlers/Fishing.java b/trunk/dist/game/data_classic/scripts/handlers/effecthandlers/Fishing.java index 81773603a7..f77c95784c 100644 --- a/trunk/dist/game/data_classic/scripts/handlers/effecthandlers/Fishing.java +++ b/trunk/dist/game/data_classic/scripts/handlers/effecthandlers/Fishing.java @@ -93,7 +93,7 @@ public final class Fishing extends AbstractEffect } else { - player.endFishing(false); + player.endFishing(false, false); } player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); diff --git a/trunk/dist/game/data_classic/scripts/custom/listeners/ExperienceGain/ExperienceGain.java b/trunk/dist/game/data_classic/scripts/handlers/usercommandhandlers/ExperienceGain.java similarity index 86% rename from trunk/dist/game/data_classic/scripts/custom/listeners/ExperienceGain/ExperienceGain.java rename to trunk/dist/game/data_classic/scripts/handlers/usercommandhandlers/ExperienceGain.java index e372baa514..7670bbf435 100644 --- a/trunk/dist/game/data_classic/scripts/custom/listeners/ExperienceGain/ExperienceGain.java +++ b/trunk/dist/game/data_classic/scripts/handlers/usercommandhandlers/ExperienceGain.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package custom.listeners.ExperienceGain; +package handlers.usercommandhandlers; import com.l2jserver.gameserver.handler.IVoicedCommandHandler; import com.l2jserver.gameserver.model.actor.L2Playable; @@ -33,28 +33,28 @@ public final class ExperienceGain implements IVoicedCommandHandler { private final String[] COMMANDS = new String[] { - "xpoff", - "xpon", + "expoff", + "expon", }; @Override public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params) { - if (command.equals("xpoff")) + if (command.equals("expoff")) { - if (!activeChar.getVariables().getBoolean("XPOFF", false)) + if (!activeChar.getVariables().getBoolean("EXPOFF", false)) { activeChar.addListener(new FunctionEventListener(activeChar, EventType.ON_PLAYABLE_EXP_CHANGED, (OnPlayableExpChanged event) -> onExperienceReceived(event.getActiveChar(), event.getNewExp() - event.getOldExp()), this)); - activeChar.getVariables().set("XPOFF", true); + activeChar.getVariables().set("EXPOFF", true); activeChar.sendMessage("Experience gain is disabled."); } } - else if (command.equals("xpon")) + else if (command.equals("expon")) { - if (activeChar.getVariables().getBoolean("XPOFF", false)) + if (activeChar.getVariables().getBoolean("EXPOFF", false)) { activeChar.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this); - activeChar.getVariables().set("XPOFF", false); + activeChar.getVariables().set("EXPOFF", false); activeChar.sendMessage("Experience gain is enabled."); } } diff --git a/trunk/dist/game/data_classic/stats/npcs/custom/ClassMaster.xml b/trunk/dist/game/data_classic/stats/npcs/custom/ClassMaster.xml new file mode 100644 index 0000000000..cd69f857cd --- /dev/null +++ b/trunk/dist/game/data_classic/stats/npcs/custom/ClassMaster.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file