Simplified script constructors.
This commit is contained in:
		| @@ -1,5 +1,5 @@ | ||||
| <html><body> | ||||
| As you approach the statue, you hear a familiar voice whispering in your ear. It says,<br> | ||||
| <font color="LEVEL">All right. It's almost completed... If you wish to possess the secret of immortality, ancient treasures, and the secret of the seal, then call his name...</font><br> | ||||
| <a action="bypass -h npc_%objectId%_Quest baium">Wake Baium</a> | ||||
| <a action="bypass -h npc_%objectId%_Quest Baium">Wake Baium</a> | ||||
| </body></html> | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| <html><body>Angelic Vortex:<br> | ||||
| The Angelic Vortex emits a faint light, and in the midst of the light an image appears. In the deepest part of a specious area, a gigantic stone statue is visible. The statue has a human-like appearance and is in a seated position, as though it was being held by some invisible force against its will.<br> | ||||
| <a action="bypass -h npc_%objectId%_Quest baium">Go where the Angelic Vortex leads.</a> | ||||
| <a action="bypass -h npc_%objectId%_Quest Baium">Go where the Angelic Vortex leads.</a> | ||||
| </body></html> | ||||
| @@ -48,7 +48,7 @@ public class HotSprings extends Quest | ||||
| 	 | ||||
| 	private HotSprings() | ||||
| 	{ | ||||
| 		super(-1, "HotSprings", "ai/areas"); | ||||
| 		super(-1, "ai/areas"); | ||||
| 		 | ||||
| 		addAttackId(BANDERSNATCHLING, FLAVA, ATROXSPAWN, NEPENTHES, ATROX, BANDERSNATCH); | ||||
| 	} | ||||
|   | ||||
| @@ -125,9 +125,9 @@ public class Antharas extends Quest | ||||
| 	protected static BossZone _Zone; | ||||
| 	 | ||||
| 	// Boss: Antharas | ||||
| 	public Antharas(int id, String name, String descr) | ||||
| 	public Antharas() | ||||
| 	{ | ||||
| 		super(id, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		final int[] mob = | ||||
| 		{ | ||||
| 			ANTHARASOLDID, | ||||
| @@ -1007,6 +1007,6 @@ public class Antharas extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new Antharas(-1, "antharas", "ai"); | ||||
| 		new Antharas(); | ||||
| 	} | ||||
| } | ||||
| @@ -93,9 +93,9 @@ public class Baium extends Quest | ||||
| 	private final List<NpcInstance> _minions = new CopyOnWriteArrayList<>(); | ||||
| 	protected BossZone _zone; | ||||
| 	 | ||||
| 	public Baium(int questId, String name, String descr) | ||||
| 	public Baium() | ||||
| 	{ | ||||
| 		super(questId, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		final int[] mob = | ||||
| 		{ | ||||
| @@ -344,9 +344,9 @@ public class Baium extends Quest | ||||
| 				return "<html><body>Angelic Vortex:<br>You may not enter while flying a wyvern</body></html>"; | ||||
| 			} | ||||
| 			 | ||||
| 			if ((status == ASLEEP) && (player.getQuestState("baium").getQuestItemsCount(4295) > 0)) // bloody fabric | ||||
| 			if ((status == ASLEEP) && (player.getQuestState(getName()).getQuestItemsCount(4295) > 0)) // bloody fabric | ||||
| 			{ | ||||
| 				player.getQuestState("baium").takeItems(4295, 1); | ||||
| 				player.getQuestState(getName()).takeItems(4295, 1); | ||||
| 				// allow entry for the player for the next 30 secs (more than enough time for the TP to happen) | ||||
| 				// Note: this just means 30secs to get in, no limits on how long it takes before we get out. | ||||
| 				_zone.allowPlayerEntry(player, 30); | ||||
| @@ -687,6 +687,6 @@ public class Baium extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new Baium(-1, "baium", "ai"); | ||||
| 		new Baium(); | ||||
| 	} | ||||
| } | ||||
| @@ -26,9 +26,9 @@ public class Barakiel extends Quest | ||||
| 	// Barakiel NpcID | ||||
| 	private static final int BARAKIEL = 25325; | ||||
| 	 | ||||
| 	public Barakiel(int questId, String name, String descr) | ||||
| 	public Barakiel() | ||||
| 	{ | ||||
| 		super(questId, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		addEventId(BARAKIEL, Quest.QuestEventType.ON_ATTACK); | ||||
| 	} | ||||
| @@ -37,6 +37,6 @@ public class Barakiel extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new Barakiel(-1, "Barakiel", "ai"); | ||||
| 		new Barakiel(); | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -131,7 +131,7 @@ public class Benom extends Quest | ||||
| 	 | ||||
| 	public Benom() | ||||
| 	{ | ||||
| 		super(-1, "Benom", "ai/bosses"); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		addStartNpc(BENOM_TELEPORT); | ||||
| 		addTalkId(BENOM_TELEPORT); | ||||
|   | ||||
| @@ -79,9 +79,9 @@ public class Core extends Quest | ||||
| 	 | ||||
| 	private static final Collection<Attackable> _minions = ConcurrentHashMap.newKeySet(); | ||||
| 	 | ||||
| 	public Core(int id, String name, String descr) | ||||
| 	public Core() | ||||
| 	{ | ||||
| 		super(id, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		final int[] mobs = | ||||
| 		{ | ||||
| @@ -256,6 +256,6 @@ public class Core extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new Core(-1, "core", "ai"); | ||||
| 		new Core(); | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -43,7 +43,7 @@ public class DrChaos extends Quest | ||||
| 	 | ||||
| 	private DrChaos() | ||||
| 	{ | ||||
| 		super(-1, "DrChaos", "ai/bosses"); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		addFirstTalkId(DR_CHAOS); | ||||
| 	} | ||||
|   | ||||
| @@ -279,9 +279,9 @@ public class Frintezza extends Quest | ||||
| 	private final Collection<Attackable> _minions = ConcurrentHashMap.newKeySet(); | ||||
| 	 | ||||
| 	// Boss: Frintezza | ||||
| 	public Frintezza(int id, String name, String descr) | ||||
| 	public Frintezza() | ||||
| 	{ | ||||
| 		super(id, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		final int[] mob = | ||||
| 		{ | ||||
| 			SCARLET1, | ||||
| @@ -1878,6 +1878,6 @@ public class Frintezza extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new Frintezza(-1, "Frintezza", "ai"); | ||||
| 		new Frintezza(); | ||||
| 	} | ||||
| } | ||||
| @@ -26,9 +26,9 @@ public class Golkonda extends Quest | ||||
| 	// Golkonda NpcID | ||||
| 	private static final int GOLKONDA = 25126; | ||||
| 	 | ||||
| 	public Golkonda(int questId, String name, String descr) | ||||
| 	public Golkonda() | ||||
| 	{ | ||||
| 		super(questId, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		addEventId(GOLKONDA, Quest.QuestEventType.ON_ATTACK); | ||||
| 	} | ||||
| @@ -37,6 +37,6 @@ public class Golkonda extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new Golkonda(-1, "Golkonda", "ai"); | ||||
| 		new Golkonda(); | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -107,9 +107,9 @@ public class Gordon extends Quest | ||||
| 	private static boolean _isAttacked = false; | ||||
| 	private static boolean _isSpawned = false; | ||||
| 	 | ||||
| 	public Gordon(int id, String name, String descr) | ||||
| 	public Gordon() | ||||
| 	{ | ||||
| 		super(id, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		addEventId(GORDON, Quest.QuestEventType.ON_KILL); | ||||
| 		addEventId(GORDON, Quest.QuestEventType.ON_ATTACK); | ||||
| @@ -292,6 +292,6 @@ public class Gordon extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new Gordon(-1, "Gordon", "ai"); | ||||
| 		new Gordon(); | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -39,7 +39,7 @@ public class Gustav extends Quest | ||||
| 	 | ||||
| 	private Gustav() | ||||
| 	{ | ||||
| 		super(-1, "Gustav", "ai/bosses"); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		addTalkId(MESSENGER); | ||||
| 		addStartNpc(MESSENGER); | ||||
|   | ||||
| @@ -26,9 +26,9 @@ public class Hallate extends Quest | ||||
| 	// Hallate NpcID | ||||
| 	private static final int HALLATE = 25220; | ||||
| 	 | ||||
| 	public Hallate(int questId, String name, String descr) | ||||
| 	public Hallate() | ||||
| 	{ | ||||
| 		super(questId, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		addEventId(HALLATE, Quest.QuestEventType.ON_ATTACK); | ||||
| 	} | ||||
| @@ -37,6 +37,6 @@ public class Hallate extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new Hallate(-1, "Hallate", "ai"); | ||||
| 		new Hallate(); | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -51,9 +51,9 @@ public class IceFairySirra extends Quest | ||||
| 	protected Collection<NpcInstance> _allMobs = ConcurrentHashMap.newKeySet(); | ||||
| 	protected Future<?> _onDeadEventTask = null; | ||||
| 	 | ||||
| 	public IceFairySirra(int id, String name, String descr) | ||||
| 	public IceFairySirra() | ||||
| 	{ | ||||
| 		super(id, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		final int[] mobs = | ||||
| 		{ | ||||
| 			STEWARD, | ||||
| @@ -76,7 +76,7 @@ public class IceFairySirra extends Quest | ||||
| 	@Override | ||||
| 	public String onFirstTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		if (player.getQuestState("IceFairySirra") == null) | ||||
| 		if (player.getQuestState(getName()) == null) | ||||
| 		{ | ||||
| 			newQuestState(player); | ||||
| 		} | ||||
| @@ -449,6 +449,6 @@ public class IceFairySirra extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new IceFairySirra(-1, "IceFairySirra", "ai"); | ||||
| 		new IceFairySirra(); | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -26,9 +26,9 @@ public class Kernon extends Quest | ||||
| 	// Kernon NpcID | ||||
| 	private static final int KERNON = 25054; | ||||
| 	 | ||||
| 	public Kernon(int questId, String name, String descr) | ||||
| 	public Kernon() | ||||
| 	{ | ||||
| 		super(questId, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		addEventId(KERNON, Quest.QuestEventType.ON_ATTACK); | ||||
| 	} | ||||
| @@ -37,6 +37,6 @@ public class Kernon extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new Kernon(-1, "Kernon", "ai"); | ||||
| 		new Kernon(); | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -39,7 +39,7 @@ public class Nurka extends Quest | ||||
| 	 | ||||
| 	private Nurka() | ||||
| 	{ | ||||
| 		super(-1, "Nurka", "ai/bosses"); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		addTalkId(MESSENGER); | ||||
| 		addStartNpc(MESSENGER); | ||||
|   | ||||
| @@ -50,14 +50,9 @@ public class Orfen extends Quest | ||||
| 		ORFEN_RETURN | ||||
| 	} | ||||
| 	 | ||||
| 	/** | ||||
| 	 * @param questId | ||||
| 	 * @param name | ||||
| 	 * @param descr | ||||
| 	 */ | ||||
| 	public Orfen(int questId, String name, String descr) | ||||
| 	public Orfen() | ||||
| 	{ | ||||
| 		super(questId, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); | ||||
| 		final Integer status = GrandBossManager.getInstance().getBossStatus(ORFEN); | ||||
| @@ -264,6 +259,6 @@ public class Orfen extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new Orfen(-1, "Orfen", "ai"); | ||||
| 		new Orfen(); | ||||
| 	} | ||||
| } | ||||
| @@ -70,9 +70,9 @@ public class QueenAnt extends Quest | ||||
| 		HEAL | ||||
| 	} | ||||
| 	 | ||||
| 	public QueenAnt(int questId, String name, String descr) | ||||
| 	public QueenAnt() | ||||
| 	{ | ||||
| 		super(questId, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		final int[] mobs = | ||||
| 		{ | ||||
| @@ -434,6 +434,6 @@ public class QueenAnt extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new QueenAnt(-1, "queen_ant", "ai"); | ||||
| 		new QueenAnt(); | ||||
| 	} | ||||
| } | ||||
| @@ -46,7 +46,7 @@ public class Sailren extends Quest | ||||
| 	 | ||||
| 	private Sailren() | ||||
| 	{ | ||||
| 		super(-1, "Sailren", "ai/bosses"); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		addStartNpc(STATUE); | ||||
| 		addTalkId(STATUE); | ||||
|   | ||||
| @@ -53,7 +53,7 @@ public class Tyrannosaurus extends Quest | ||||
| 	 | ||||
| 	public Tyrannosaurus() | ||||
| 	{ | ||||
| 		super(-1, "Tyrannosaurus", "ai/bosses"); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		addKillId(TREX); | ||||
| 		addSpawn(TREX[Rnd.get(TREX.length)], SPAWNS[Rnd.get(SPAWNS.length)], false, 0); | ||||
| 	} | ||||
|   | ||||
| @@ -75,9 +75,9 @@ public class Valakas extends Quest | ||||
| 	private static BossZone _Zone; | ||||
| 	 | ||||
| 	// Boss: Valakas | ||||
| 	public Valakas(int id, String name, String descr) | ||||
| 	public Valakas() | ||||
| 	{ | ||||
| 		super(id, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		final int[] mob = | ||||
| 		{ | ||||
| 			VALAKAS | ||||
| @@ -1567,6 +1567,6 @@ public class Valakas extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new Valakas(-1, "valakas", "ai"); | ||||
| 		new Valakas(); | ||||
| 	} | ||||
| } | ||||
| @@ -113,9 +113,9 @@ public class VanHalter extends Quest | ||||
| 	private static final byte ALIVE = 2; | ||||
| 	 | ||||
| 	// Initialize | ||||
| 	public VanHalter(int questId, String name, String descr) | ||||
| 	public VanHalter() | ||||
| 	{ | ||||
| 		super(questId, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		final int[] mobs = | ||||
| 		{ | ||||
| @@ -1759,6 +1759,6 @@ public class VanHalter extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new VanHalter(-1, "vanhalter", "ai"); | ||||
| 		new VanHalter(); | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -125,9 +125,9 @@ public class Zaken extends Quest | ||||
| 	 | ||||
| 	private static BossZone _Zone; | ||||
| 	 | ||||
| 	public Zaken(int questId, String name, String descr) | ||||
| 	public Zaken() | ||||
| 	{ | ||||
| 		super(questId, name, descr); | ||||
| 		super(-1, "ai/bosses"); | ||||
| 		 | ||||
| 		// Zaken doors handling | ||||
| 		ThreadPool.scheduleAtFixedRate(() -> | ||||
| @@ -997,6 +997,6 @@ public class Zaken extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new Zaken(-1, "Zaken", "ai"); | ||||
| 		new Zaken(); | ||||
| 	} | ||||
| } | ||||
| @@ -32,9 +32,9 @@ public class AncientEgg extends Quest | ||||
| 	// Skill | ||||
| 	private static final int SIGNAL = 5088; // Signal | ||||
| 	 | ||||
| 	private AncientEgg(int questId, String name, String descr) | ||||
| 	private AncientEgg() | ||||
| 	{ | ||||
| 		super(questId, name, descr); | ||||
| 		super(-1, "ai"); | ||||
| 		addAttackId(EGG); | ||||
| 	} | ||||
| 	 | ||||
| @@ -48,6 +48,6 @@ public class AncientEgg extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new AncientEgg(-1, "AncientEgg", "ai"); | ||||
| 		new AncientEgg(); | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -33,7 +33,7 @@ public class CatsEyeBandit extends Quest | ||||
| 	 | ||||
| 	private CatsEyeBandit() | ||||
| 	{ | ||||
| 		super(-1, "CatsEyeBandit", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addKillId(CATS_EYE_BANDIT); | ||||
| 		addAttackId(CATS_EYE_BANDIT); | ||||
|   | ||||
| @@ -52,7 +52,7 @@ public class Chests extends Quest | ||||
| 	 | ||||
| 	private Chests() | ||||
| 	{ | ||||
| 		super(-1, "Chests", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addSkillUseId(CHESTS); | ||||
| 		addAttackId(CHESTS); | ||||
|   | ||||
| @@ -33,7 +33,7 @@ public class DeluLizardmanSpecialAgent extends Quest | ||||
| 	 | ||||
| 	private DeluLizardmanSpecialAgent() | ||||
| 	{ | ||||
| 		super(-1, "DeluLizardmanSpecialAgent", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addAttackId(DELU_LIZARDMAN_SPECIAL_AGENT); | ||||
| 	} | ||||
|   | ||||
| @@ -33,7 +33,7 @@ public class DeluLizardmanSpecialCommander extends Quest | ||||
| 	 | ||||
| 	private DeluLizardmanSpecialCommander() | ||||
| 	{ | ||||
| 		super(-1, "DeluLizardmanSpecialCommander", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addAttackId(DELU_LIZARDMAN_SPECIAL_COMMANDER); | ||||
| 	} | ||||
|   | ||||
| @@ -52,7 +52,7 @@ public class EvaBox extends Quest | ||||
| 	 | ||||
| 	private EvaBox() | ||||
| 	{ | ||||
| 		super(-1, "EvaBox", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addKillId(BOX); | ||||
| 	} | ||||
|   | ||||
| @@ -164,7 +164,7 @@ public class FeedableBeasts extends Quest | ||||
| 	 | ||||
| 	private FeedableBeasts() | ||||
| 	{ | ||||
| 		super(-1, "FeedableBeasts", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addKillId(FEEDABLE_BEASTS); | ||||
| 		addSkillUseId(FEEDABLE_BEASTS); | ||||
| @@ -404,7 +404,7 @@ public class FeedableBeasts extends Quest | ||||
| 			nextNpc.setRunning(); | ||||
| 			 | ||||
| 			// If player has Q020 going, give quest item | ||||
| 			QuestState st = player.getQuestState(Q020_BringUpWithLove.qn); | ||||
| 			QuestState st = player.getQuestState(Q020_BringUpWithLove.class.getSimpleName()); | ||||
| 			if ((st != null) && (Rnd.get(100) < 5) && !st.hasQuestItems(7185)) | ||||
| 			{ | ||||
| 				st.giveItems(7185, 1); | ||||
|   | ||||
| @@ -33,7 +33,7 @@ public class KarulBugbear extends Quest | ||||
| 	 | ||||
| 	private KarulBugbear() | ||||
| 	{ | ||||
| 		super(-1, "KarulBugbear", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addAttackId(KARUL_BUGBEAR); | ||||
| 	} | ||||
|   | ||||
| @@ -60,9 +60,9 @@ public class Monastery extends Quest | ||||
| 		"name! How dare you defy the will of Einhasad!" | ||||
| 	}; | ||||
| 	 | ||||
| 	public Monastery(int questId, String name, String descr) | ||||
| 	public Monastery() | ||||
| 	{ | ||||
| 		super(questId, name, descr); | ||||
| 		super(-1, "ai"); | ||||
| 		registerMobs(mobs1, QuestEventType.ON_AGGRO_RANGE_ENTER, QuestEventType.ON_SPAWN, QuestEventType.ON_SPELL_FINISHED); | ||||
| 		registerMobs(mobs2, QuestEventType.ON_SPELL_FINISHED); | ||||
| 	} | ||||
| @@ -187,6 +187,6 @@ public class Monastery extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new Monastery(-1, "monastery", "ai"); | ||||
| 		new Monastery(); | ||||
| 	} | ||||
| } | ||||
| @@ -28,11 +28,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; | ||||
| import org.l2jmobius.gameserver.model.quest.QuestState; | ||||
| import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| import ai.others.Tutorial.Tutorial; | ||||
|  | ||||
| public class NewbieHelper extends Quest | ||||
| { | ||||
| 	private final static String qn = "NewbieHelper"; | ||||
| 	private final static String qnTutorial = "Tutorial"; | ||||
| 	 | ||||
| 	// Quest Items | ||||
| 	// Human | ||||
| 	private final static int RECOMMENDATION_01 = 1067; | ||||
| @@ -91,7 +90,7 @@ public class NewbieHelper extends Quest | ||||
| 	 | ||||
| 	public NewbieHelper() | ||||
| 	{ | ||||
| 		super(-1, qn, "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addStartNpc(30009, 30019, 30131, 30400, 30530, 30575); | ||||
| 		 | ||||
| @@ -172,8 +171,8 @@ public class NewbieHelper extends Quest | ||||
| 	@Override | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		final QuestState qs1 = player.getQuestState(qn); | ||||
| 		final QuestState qs2 = player.getQuestState(qnTutorial); | ||||
| 		final QuestState qs1 = player.getQuestState(getName()); | ||||
| 		final QuestState qs2 = player.getQuestState(Tutorial.class.getSimpleName()); | ||||
| 		if ((qs1 == null) || (qs2 == null)) | ||||
| 		{ | ||||
| 			return null; | ||||
| @@ -253,8 +252,8 @@ public class NewbieHelper extends Quest | ||||
| 	public String onFirstTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = ""; | ||||
| 		QuestState qs1 = player.getQuestState(qn); | ||||
| 		QuestState qs2 = player.getQuestState(qnTutorial); | ||||
| 		QuestState qs1 = player.getQuestState(getName()); | ||||
| 		QuestState qs2 = player.getQuestState(Tutorial.class.getSimpleName()); | ||||
| 		if (qs1 == null) | ||||
| 		{ | ||||
| 			qs1 = newQuestState(player); | ||||
| @@ -398,8 +397,8 @@ public class NewbieHelper extends Quest | ||||
| 	@Override | ||||
| 	public String onKill(NpcInstance npc, PlayerInstance player, boolean isPet) | ||||
| 	{ | ||||
| 		final QuestState qs1 = player.getQuestState(qn); | ||||
| 		final QuestState qs2 = player.getQuestState(qnTutorial); | ||||
| 		final QuestState qs1 = player.getQuestState(getName()); | ||||
| 		final QuestState qs2 = player.getQuestState(Tutorial.class.getSimpleName()); | ||||
| 		if ((qs1 == null) || (qs2 == null)) | ||||
| 		{ | ||||
| 			return null; | ||||
|   | ||||
| @@ -33,7 +33,7 @@ public class OlMahumGeneral extends Quest | ||||
| 	 | ||||
| 	private OlMahumGeneral() | ||||
| 	{ | ||||
| 		super(-1, "OlMahumGeneral", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addAttackId(OL_MAHUM_GENERAL); | ||||
| 	} | ||||
|   | ||||
| @@ -43,7 +43,7 @@ public class RetreatOnAttack extends Quest | ||||
| 	 | ||||
| 	private RetreatOnAttack() | ||||
| 	{ | ||||
| 		super(-1, "RetreatOnAttack", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addAttackId(EPLY, OL_MAHUM_GUARD); | ||||
| 	} | ||||
|   | ||||
| @@ -33,7 +33,7 @@ public class ScarletStakatoNoble extends Quest | ||||
| 	 | ||||
| 	private ScarletStakatoNoble() | ||||
| 	{ | ||||
| 		super(-1, "ScarletStakatoNoble", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addKillId(SCARLET_STAKATO_NOBLE); | ||||
| 	} | ||||
|   | ||||
| @@ -52,7 +52,7 @@ public class Splendor extends Quest | ||||
| 	 | ||||
| 	private Splendor() | ||||
| 	{ | ||||
| 		super(-1, "Splendor", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		for (int npcId : NPCS.keySet()) | ||||
| 		{ | ||||
|   | ||||
| @@ -113,9 +113,9 @@ public class SummonMinions extends Quest | ||||
| 		}); // Pythia | ||||
| 	} | ||||
| 	 | ||||
| 	public SummonMinions(int questId, String name, String descr) | ||||
| 	public SummonMinions() | ||||
| 	{ | ||||
| 		super(questId, name, descr); | ||||
| 		super(-1, "ai"); | ||||
| 		final int[] mobs = | ||||
| 		{ | ||||
| 			20767, | ||||
| @@ -269,6 +269,6 @@ public class SummonMinions extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new SummonMinions(-1, "SummonMinions", "ai"); | ||||
| 		new SummonMinions(); | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -33,7 +33,7 @@ public class TimakOrcOverlord extends Quest | ||||
| 	 | ||||
| 	private TimakOrcOverlord() | ||||
| 	{ | ||||
| 		super(-1, "TimakOrcOverlord", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addAttackId(TIMAK_ORC_OVERLORD); | ||||
| 	} | ||||
|   | ||||
| @@ -33,7 +33,7 @@ public class TimakOrcTroopLeader extends Quest | ||||
| 	 | ||||
| 	private TimakOrcTroopLeader() | ||||
| 	{ | ||||
| 		super(-1, "TimakOrcTroopLeader", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addAttackId(TIMAK_ORC_TROOP_LEADER); | ||||
| 	} | ||||
|   | ||||
| @@ -77,9 +77,9 @@ public class Transform extends Quest | ||||
| 		"This time at the last! The end!" | ||||
| 	}; | ||||
| 	 | ||||
| 	public Transform(int questId, String name, String descr) | ||||
| 	public Transform() | ||||
| 	{ | ||||
| 		super(questId, name, descr); | ||||
| 		super(-1, "ai"); | ||||
| 		 | ||||
| 		_mobs.add(new Transformer(21261, 21262, 1, 5)); // 1st mutation Ol Mahum Transcender | ||||
| 		_mobs.add(new Transformer(21262, 21263, 1, 5)); // 2st mutation Ol Mahum Transcender | ||||
| @@ -228,6 +228,6 @@ public class Transform extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new Transform(-1, "transform", "ai"); | ||||
| 		new Transform(); | ||||
| 	} | ||||
| } | ||||
| @@ -33,7 +33,7 @@ public class TurekOrcFootman extends Quest | ||||
| 	 | ||||
| 	private TurekOrcFootman() | ||||
| 	{ | ||||
| 		super(-1, "TurekOrcFootman", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addAttackId(TUREK_ORC_FOOTMAN); | ||||
| 	} | ||||
|   | ||||
| @@ -33,7 +33,7 @@ public class TurekOrcSupplier extends Quest | ||||
| 	 | ||||
| 	private TurekOrcSupplier() | ||||
| 	{ | ||||
| 		super(-1, "TurekOrcSupplier", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addAttackId(TUREK_ORC_SUPPLIER); | ||||
| 	} | ||||
|   | ||||
| @@ -33,7 +33,7 @@ public class TurekOrcWarlord extends Quest | ||||
| 	 | ||||
| 	private TurekOrcWarlord() | ||||
| 	{ | ||||
| 		super(-1, "TurekOrcWarlord", "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 		 | ||||
| 		addAttackId(TUREK_ORC_WARLORD); | ||||
| 	} | ||||
|   | ||||
| @@ -152,17 +152,15 @@ public class Tutorial extends Quest | ||||
| 		TCLc.put(50, "tutorial_22kb.htm"); | ||||
| 	} | ||||
| 	 | ||||
| 	private static final String qn = "Tutorial"; | ||||
| 	 | ||||
| 	public Tutorial() | ||||
| 	{ | ||||
| 		super(-1, qn, "ai/others"); | ||||
| 		super(-1, "ai/others"); | ||||
| 	} | ||||
| 	 | ||||
| 	@Override | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		final QuestState qs = player.getQuestState(qn); | ||||
| 		final QuestState qs = player.getQuestState(getName()); | ||||
| 		if ((qs == null) || Config.DISABLE_TUTORIAL) | ||||
| 		{ | ||||
| 			return null; | ||||
|   | ||||
| @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.model.quest.Quest; | ||||
|  | ||||
| public class ZombieGatekeepers extends Quest | ||||
| { | ||||
| 	public ZombieGatekeepers(int questId, String name, String descr) | ||||
| 	public ZombieGatekeepers() | ||||
| 	{ | ||||
| 		super(questId, name, descr); | ||||
| 		super(-1, "ai"); | ||||
| 		addAttackId(22136); | ||||
| 		addAggroRangeEnterId(22136); | ||||
| 	} | ||||
| @@ -108,6 +108,6 @@ public class ZombieGatekeepers extends Quest | ||||
| 	 | ||||
| 	public static void main(String[] args) | ||||
| 	{ | ||||
| 		new ZombieGatekeepers(-1, "ZombieGatekeepers", "ai"); | ||||
| 		new ZombieGatekeepers(); | ||||
| 	} | ||||
| } | ||||
| @@ -32,8 +32,6 @@ import org.l2jmobius.gameserver.util.Util; | ||||
|  */ | ||||
| public class EchoCrystals extends Quest | ||||
| { | ||||
| 	private static final String qn = "EchoCrystals"; | ||||
| 	 | ||||
| 	private static final int ADENA = 57; | ||||
| 	private static final int COST = 200; | ||||
| 	 | ||||
| @@ -51,7 +49,7 @@ public class EchoCrystals extends Quest | ||||
| 	 | ||||
| 	public EchoCrystals() | ||||
| 	{ | ||||
| 		super(-1, qn, "custom"); | ||||
| 		super(-1, "custom"); | ||||
| 		 | ||||
| 		addStartNpc(31042, 31043); | ||||
| 		addTalkId(31042, 31043); | ||||
| @@ -61,7 +59,7 @@ public class EchoCrystals extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = ""; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		 | ||||
| 		if ((st != null) && Util.isDigit(event)) | ||||
| 		{ | ||||
|   | ||||
| @@ -25,7 +25,7 @@ public class HeroCirclet extends Quest | ||||
| { | ||||
| 	public HeroCirclet() | ||||
| 	{ | ||||
| 		super(-1, "HeroCirclet", "custom"); | ||||
| 		super(-1, "custom"); | ||||
| 		 | ||||
| 		addStartNpc(31690, 31769, 31770, 31771, 31772); | ||||
| 		addTalkId(31690, 31769, 31770, 31771, 31772); | ||||
|   | ||||
| @@ -41,7 +41,7 @@ public class HeroWeapon extends Quest | ||||
| 	 | ||||
| 	public HeroWeapon() | ||||
| 	{ | ||||
| 		super(-1, "HeroWeapon", "custom"); | ||||
| 		super(-1, "custom"); | ||||
| 		 | ||||
| 		addStartNpc(31690, 31769, 31770, 31771, 31772, 31773); | ||||
| 		addTalkId(31690, 31769, 31770, 31771, 31772, 31773); | ||||
|   | ||||
| @@ -43,8 +43,6 @@ import org.l2jmobius.gameserver.util.Util; | ||||
|  */ | ||||
| public class KetraOrcSupport extends Quest | ||||
| { | ||||
| 	private static final String qn = "KetraOrcSupport"; | ||||
| 	 | ||||
| 	private static final int KADUN = 31370; // Hierarch | ||||
| 	private static final int WAHKAN = 31371; // Messenger | ||||
| 	private static final int ASEFA = 31372; // Soul Guide | ||||
| @@ -134,7 +132,7 @@ public class KetraOrcSupport extends Quest | ||||
| 	 | ||||
| 	public KetraOrcSupport() | ||||
| 	{ | ||||
| 		super(-1, qn, "custom"); | ||||
| 		super(-1, "custom"); | ||||
| 		 | ||||
| 		addFirstTalkId(KADUN, WAHKAN, ASEFA, ATAN, JAFF, JUMARA, KURFA); | ||||
| 		addTalkId(ASEFA, JAFF, KURFA); | ||||
| @@ -202,7 +200,7 @@ public class KetraOrcSupport extends Quest | ||||
| 	public String onFirstTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			st = newQuestState(player); | ||||
|   | ||||
| @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class MissQueen extends Quest | ||||
| { | ||||
| 	private static final String qn = "MissQueen"; | ||||
| 	 | ||||
| 	// Rewards | ||||
| 	private static final int COUPON_ONE = 7832; | ||||
| 	private static final int COUPON_TWO = 7833; | ||||
| @@ -49,7 +47,7 @@ public class MissQueen extends Quest | ||||
| 	 | ||||
| 	public MissQueen() | ||||
| 	{ | ||||
| 		super(-1, qn, "custom"); | ||||
| 		super(-1, "custom"); | ||||
| 		 | ||||
| 		// Spawn the 11 NPCs. | ||||
| 		for (Location loc : LOCATIONS) | ||||
| @@ -66,7 +64,7 @@ public class MissQueen extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		 | ||||
| 		if (event.equals("newbie_coupon")) | ||||
| 		{ | ||||
| @@ -117,7 +115,7 @@ public class MissQueen extends Quest | ||||
| 	@Override | ||||
| 	public String onFirstTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			st = newQuestState(player); | ||||
|   | ||||
| @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.util.Util; | ||||
|  */ | ||||
| public class NpcLocationInfo extends Quest | ||||
| { | ||||
| 	private static final String qn = "NpcLocationInfo"; | ||||
| 	 | ||||
| 	private static final int[] RADARS = | ||||
| 	{ | ||||
| 		// Talking Island | ||||
| @@ -208,7 +206,7 @@ public class NpcLocationInfo extends Quest | ||||
| 	 | ||||
| 	public NpcLocationInfo() | ||||
| 	{ | ||||
| 		super(-1, qn, "custom"); | ||||
| 		super(-1, "custom"); | ||||
| 		 | ||||
| 		addStartNpc(30598, 30599, 30600, 30601, 30602); | ||||
| 		addTalkId(30598, 30599, 30600, 30601, 30602); | ||||
| @@ -218,7 +216,7 @@ public class NpcLocationInfo extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
|   | ||||
| @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.util.Util; | ||||
|  | ||||
| public class RaidbossInfo extends Quest | ||||
| { | ||||
| 	private static final String qn = "RaidbossInfo"; | ||||
| 	private static final String BOSS_CLASS_TYPE = "RaidBoss"; | ||||
| 	 | ||||
| 	private static final Map<Integer, Location> RADARS = new HashMap<>(); | ||||
| @@ -120,7 +119,7 @@ public class RaidbossInfo extends Quest | ||||
| 	 | ||||
| 	public RaidbossInfo() | ||||
| 	{ | ||||
| 		super(-1, qn, "custom"); | ||||
| 		super(-1, "custom"); | ||||
| 		 | ||||
| 		for (int npcId : NPCs) | ||||
| 		{ | ||||
| @@ -142,7 +141,7 @@ public class RaidbossInfo extends Quest | ||||
| 	@Override | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return event; | ||||
|   | ||||
| @@ -29,15 +29,13 @@ import village_master.SecondClassChange.SecondClassChange; | ||||
|  */ | ||||
| public class ShadowWeapon extends Quest | ||||
| { | ||||
| 	private static final String qn = "ShadowWeapon"; | ||||
| 	 | ||||
| 	// itemId for shadow weapon coupons, it's not used more than once but increases readability | ||||
| 	private static final int D_COUPON = 8869; | ||||
| 	private static final int C_COUPON = 8870; | ||||
| 	 | ||||
| 	public ShadowWeapon() | ||||
| 	{ | ||||
| 		super(-1, qn, "custom"); | ||||
| 		super(-1, "custom"); | ||||
| 		 | ||||
| 		addStartNpc(FirstClassChange.FIRSTCLASSNPCS); | ||||
| 		addTalkId(FirstClassChange.FIRSTCLASSNPCS); | ||||
| @@ -49,7 +47,7 @@ public class ShadowWeapon extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -42,8 +42,6 @@ import org.l2jmobius.gameserver.util.Util; | ||||
|  */ | ||||
| public class VarkaSilenosSupport extends Quest | ||||
| { | ||||
| 	private static final String qn = "VarkaSilenosSupport"; | ||||
| 	 | ||||
| 	private static final int ASHAS = 31377; // Hierarch | ||||
| 	private static final int NARAN = 31378; // Messenger | ||||
| 	private static final int UDAN = 31379; // Buffer | ||||
| @@ -133,7 +131,7 @@ public class VarkaSilenosSupport extends Quest | ||||
| 	 | ||||
| 	public VarkaSilenosSupport() | ||||
| 	{ | ||||
| 		super(-1, qn, "custom"); | ||||
| 		super(-1, "custom"); | ||||
| 		 | ||||
| 		addFirstTalkId(ASHAS, NARAN, UDAN, DIYABU, HAGOS, SHIKON, TERANU); | ||||
| 		addTalkId(UDAN, HAGOS, TERANU); | ||||
| @@ -201,7 +199,7 @@ public class VarkaSilenosSupport extends Quest | ||||
| 	public String onFirstTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			st = newQuestState(player); | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q001_LettersOfLove extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q001_LettersOfLove"; | ||||
| 	 | ||||
| 	// Npcs | ||||
| 	private static final int DARIN = 30048; | ||||
| 	private static final int ROXXY = 30006; | ||||
| @@ -42,7 +40,7 @@ public class Q001_LettersOfLove extends Quest | ||||
| 	 | ||||
| 	public Q001_LettersOfLove() | ||||
| 	{ | ||||
| 		super(1, qn, "Letters of Love"); | ||||
| 		super(1, "Letters of Love"); | ||||
| 		 | ||||
| 		registerQuestItems(DARIN_LETTER, ROXXY_KERCHIEF, DARIN_RECEIPT, BAULRO_POTION); | ||||
| 		 | ||||
| @@ -54,7 +52,7 @@ public class Q001_LettersOfLove extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -75,7 +73,7 @@ public class Q001_LettersOfLove extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
|   | ||||
| @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q002_WhatWomenWant extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q002_WhatWomenWant"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int ARUJIEN = 30223; | ||||
| 	private static final int MIRABEL = 30146; | ||||
| @@ -45,7 +43,7 @@ public class Q002_WhatWomenWant extends Quest | ||||
| 	 | ||||
| 	public Q002_WhatWomenWant() | ||||
| 	{ | ||||
| 		super(2, qn, "What Women Want"); | ||||
| 		super(2, "What Women Want"); | ||||
| 		 | ||||
| 		registerQuestItems(ARUJIEN_LETTER_1, ARUJIEN_LETTER_2, ARUJIEN_LETTER_3, POETRY_BOOK, GREENIS_LETTER); | ||||
| 		 | ||||
| @@ -57,7 +55,7 @@ public class Q002_WhatWomenWant extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -92,7 +90,7 @@ public class Q002_WhatWomenWant extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
|   | ||||
| @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q003_WillTheSealBeBroken extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q003_WillTheSealBeBroken"; | ||||
| 	 | ||||
| 	// Items | ||||
| 	private static final int ONYX_BEAST_EYE = 1081; | ||||
| 	private static final int TAINT_STONE = 1082; | ||||
| @@ -37,7 +35,7 @@ public class Q003_WillTheSealBeBroken extends Quest | ||||
| 	 | ||||
| 	public Q003_WillTheSealBeBroken() | ||||
| 	{ | ||||
| 		super(3, qn, "Will the Seal be Broken?"); | ||||
| 		super(3, "Will the Seal be Broken?"); | ||||
| 		 | ||||
| 		registerQuestItems(ONYX_BEAST_EYE, TAINT_STONE, SUCCUBUS_BLOOD); | ||||
| 		 | ||||
| @@ -51,7 +49,7 @@ public class Q003_WillTheSealBeBroken extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -70,7 +68,7 @@ public class Q003_WillTheSealBeBroken extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -28,9 +28,7 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q004_LongliveThePaagrioLord extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q004_LongliveThePaagrioLord"; | ||||
| 	 | ||||
| 	private static final Map<Integer, Integer> NPC_GIFTS = new HashMap<>(); | ||||
| 	private static final Map<Integer, Integer> NPC_GIFTS = new HashMap<>(); | ||||
| 	static | ||||
| 	{ | ||||
| 		NPC_GIFTS.put(30585, 1542); | ||||
| @@ -43,7 +41,7 @@ public class Q004_LongliveThePaagrioLord extends Quest | ||||
| 	 | ||||
| 	public Q004_LongliveThePaagrioLord() | ||||
| 	{ | ||||
| 		super(4, qn, "Long live the Pa'agrio Lord!"); | ||||
| 		super(4, "Long live the Pa'agrio Lord!"); | ||||
| 		 | ||||
| 		registerQuestItems(1541, 1542, 1543, 1544, 1545, 1546); | ||||
| 		 | ||||
| @@ -55,7 +53,7 @@ public class Q004_LongliveThePaagrioLord extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -75,7 +73,7 @@ public class Q004_LongliveThePaagrioLord extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q005_MinersFavor extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q005_MinersFavor"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int BOLTER = 30554; | ||||
| 	private static final int SHARI = 30517; | ||||
| @@ -46,7 +44,7 @@ public class Q005_MinersFavor extends Quest | ||||
| 	 | ||||
| 	public Q005_MinersFavor() | ||||
| 	{ | ||||
| 		super(5, qn, "Miner's Favor"); | ||||
| 		super(5, "Miner's Favor"); | ||||
| 		 | ||||
| 		registerQuestItems(BOLTERS_LIST, MINING_BOOTS, MINERS_PICK, BOOMBOOM_POWDER, REDSTONE_BEER, BOLTERS_SMELLY_SOCKS); | ||||
| 		 | ||||
| @@ -58,7 +56,7 @@ public class Q005_MinersFavor extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -94,7 +92,7 @@ public class Q005_MinersFavor extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q006_StepIntoTheFuture extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q006_StepIntoTheFuture"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int ROXXY = 30006; | ||||
| 	private static final int BAULRO = 30033; | ||||
| @@ -41,7 +39,7 @@ public class Q006_StepIntoTheFuture extends Quest | ||||
| 	 | ||||
| 	public Q006_StepIntoTheFuture() | ||||
| 	{ | ||||
| 		super(6, qn, "Step into the Future"); | ||||
| 		super(6, "Step into the Future"); | ||||
| 		 | ||||
| 		registerQuestItems(BAULRO_LETTER); | ||||
| 		 | ||||
| @@ -53,7 +51,7 @@ public class Q006_StepIntoTheFuture extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -98,7 +96,7 @@ public class Q006_StepIntoTheFuture extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q007_ATripBegins extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q007_ATripBegins"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int MIRABEL = 30146; | ||||
| 	private static final int ARIEL = 30148; | ||||
| @@ -41,7 +39,7 @@ public class Q007_ATripBegins extends Quest | ||||
| 	 | ||||
| 	public Q007_ATripBegins() | ||||
| 	{ | ||||
| 		super(7, qn, "A Trip Begins"); | ||||
| 		super(7, "A Trip Begins"); | ||||
| 		 | ||||
| 		registerQuestItems(ARIEL_RECO); | ||||
| 		 | ||||
| @@ -53,7 +51,7 @@ public class Q007_ATripBegins extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -91,7 +89,7 @@ public class Q007_ATripBegins extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q008_AnAdventureBegins extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q008_AnAdventureBegins"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int JASMINE = 30134; | ||||
| 	private static final int ROSELYN = 30355; | ||||
| @@ -41,7 +39,7 @@ public class Q008_AnAdventureBegins extends Quest | ||||
| 	 | ||||
| 	public Q008_AnAdventureBegins() | ||||
| 	{ | ||||
| 		super(8, qn, "An Adventure Begins"); | ||||
| 		super(8, "An Adventure Begins"); | ||||
| 		 | ||||
| 		registerQuestItems(ROSELYN_NOTE); | ||||
| 		 | ||||
| @@ -53,7 +51,7 @@ public class Q008_AnAdventureBegins extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -91,7 +89,7 @@ public class Q008_AnAdventureBegins extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q009_IntoTheCityOfHumans extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q009_IntoTheCityOfHumans"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private final int PETUKAI = 30583; | ||||
| 	private final int TANAPI = 30571; | ||||
| @@ -38,7 +36,7 @@ public class Q009_IntoTheCityOfHumans extends Quest | ||||
| 	 | ||||
| 	public Q009_IntoTheCityOfHumans() | ||||
| 	{ | ||||
| 		super(9, qn, "Into the City of Humans"); | ||||
| 		super(9, "Into the City of Humans"); | ||||
| 		 | ||||
| 		addStartNpc(PETUKAI); | ||||
| 		addTalkId(PETUKAI, TANAPI, TAMIL); | ||||
| @@ -48,7 +46,7 @@ public class Q009_IntoTheCityOfHumans extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -79,7 +77,7 @@ public class Q009_IntoTheCityOfHumans extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q010_IntoTheWorld extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q010_IntoTheWorld"; | ||||
| 	 | ||||
| 	// Items | ||||
| 	private static final int VERY_EXPENSIVE_NECKLACE = 7574; | ||||
| 	 | ||||
| @@ -41,7 +39,7 @@ public class Q010_IntoTheWorld extends Quest | ||||
| 	 | ||||
| 	public Q010_IntoTheWorld() | ||||
| 	{ | ||||
| 		super(10, qn, "Into the World"); | ||||
| 		super(10, "Into the World"); | ||||
| 		 | ||||
| 		registerQuestItems(VERY_EXPENSIVE_NECKLACE); | ||||
| 		 | ||||
| @@ -53,7 +51,7 @@ public class Q010_IntoTheWorld extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -97,7 +95,7 @@ public class Q010_IntoTheWorld extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q011_SecretMeetingWithKetraOrcs extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q011_SecretMeetingWithKetraOrcs"; | ||||
| 	 | ||||
| 	// Npcs | ||||
| 	private static final int CADMON = 31296; | ||||
| 	private static final int LEON = 31256; | ||||
| @@ -36,7 +34,7 @@ public class Q011_SecretMeetingWithKetraOrcs extends Quest | ||||
| 	 | ||||
| 	public Q011_SecretMeetingWithKetraOrcs() | ||||
| 	{ | ||||
| 		super(11, qn, "Secret Meeting With Ketra Orcs"); | ||||
| 		super(11, "Secret Meeting With Ketra Orcs"); | ||||
| 		 | ||||
| 		registerQuestItems(MUNITIONS_BOX); | ||||
| 		 | ||||
| @@ -48,7 +46,7 @@ public class Q011_SecretMeetingWithKetraOrcs extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -80,7 +78,7 @@ public class Q011_SecretMeetingWithKetraOrcs extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q012_SecretMeetingWithVarkaSilenos extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q012_SecretMeetingWithVarkaSilenos"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int CADMON = 31296; | ||||
| 	private static final int HELMUT = 31258; | ||||
| @@ -36,7 +34,7 @@ public class Q012_SecretMeetingWithVarkaSilenos extends Quest | ||||
| 	 | ||||
| 	public Q012_SecretMeetingWithVarkaSilenos() | ||||
| 	{ | ||||
| 		super(12, qn, "Secret Meeting With Varka Silenos"); | ||||
| 		super(12, "Secret Meeting With Varka Silenos"); | ||||
| 		 | ||||
| 		registerQuestItems(MUNITIONS_BOX); | ||||
| 		 | ||||
| @@ -48,7 +46,7 @@ public class Q012_SecretMeetingWithVarkaSilenos extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -80,7 +78,7 @@ public class Q012_SecretMeetingWithVarkaSilenos extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q013_ParcelDelivery extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q013_ParcelDelivery"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int FUNDIN = 31274; | ||||
| 	private static final int VULCAN = 31539; | ||||
| @@ -35,7 +33,7 @@ public class Q013_ParcelDelivery extends Quest | ||||
| 	 | ||||
| 	public Q013_ParcelDelivery() | ||||
| 	{ | ||||
| 		super(13, qn, "Parcel Delivery"); | ||||
| 		super(13, "Parcel Delivery"); | ||||
| 		 | ||||
| 		registerQuestItems(PACKAGE); | ||||
| 		 | ||||
| @@ -47,7 +45,7 @@ public class Q013_ParcelDelivery extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -75,7 +73,7 @@ public class Q013_ParcelDelivery extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q014_WhereaboutsOfTheArchaeologist extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q014_WhereaboutsOfTheArchaeologist"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int LIESEL = 31263; | ||||
| 	private static final int GHOST_OF_ADVENTURER = 31538; | ||||
| @@ -35,7 +33,7 @@ public class Q014_WhereaboutsOfTheArchaeologist extends Quest | ||||
| 	 | ||||
| 	public Q014_WhereaboutsOfTheArchaeologist() | ||||
| 	{ | ||||
| 		super(14, qn, "Whereabouts of the Archaeologist"); | ||||
| 		super(14, "Whereabouts of the Archaeologist"); | ||||
| 		 | ||||
| 		registerQuestItems(LETTER); | ||||
| 		 | ||||
| @@ -47,7 +45,7 @@ public class Q014_WhereaboutsOfTheArchaeologist extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -74,7 +72,7 @@ public class Q014_WhereaboutsOfTheArchaeologist extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q015_SweetWhispers extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q015_SweetWhispers"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int VLADIMIR = 31302; | ||||
| 	private static final int HIERARCH = 31517; | ||||
| @@ -33,7 +31,7 @@ public class Q015_SweetWhispers extends Quest | ||||
| 	 | ||||
| 	public Q015_SweetWhispers() | ||||
| 	{ | ||||
| 		super(15, qn, "Sweet Whispers"); | ||||
| 		super(15, "Sweet Whispers"); | ||||
| 		 | ||||
| 		addStartNpc(VLADIMIR); | ||||
| 		addTalkId(VLADIMIR, HIERARCH, MYSTERIOUS_NECRO); | ||||
| @@ -43,7 +41,7 @@ public class Q015_SweetWhispers extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -74,7 +72,7 @@ public class Q015_SweetWhispers extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q016_TheComingDarkness extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q016_TheComingDarkness"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int HIERARCH = 31517; | ||||
| 	private static final int EVIL_ALTAR_1 = 31512; | ||||
| @@ -39,7 +37,7 @@ public class Q016_TheComingDarkness extends Quest | ||||
| 	 | ||||
| 	public Q016_TheComingDarkness() | ||||
| 	{ | ||||
| 		super(16, qn, "The Coming Darkness"); | ||||
| 		super(16, "The Coming Darkness"); | ||||
| 		 | ||||
| 		registerQuestItems(CRYSTAL_OF_SEAL); | ||||
| 		 | ||||
| @@ -51,7 +49,7 @@ public class Q016_TheComingDarkness extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -102,7 +100,7 @@ public class Q016_TheComingDarkness extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q017_LightAndDarkness extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q017_LightAndDarkness"; | ||||
| 	 | ||||
| 	// Items | ||||
| 	private static final int BLOOD_OF_SAINT = 7168; | ||||
| 	 | ||||
| @@ -38,7 +36,7 @@ public class Q017_LightAndDarkness extends Quest | ||||
| 	 | ||||
| 	public Q017_LightAndDarkness() | ||||
| 	{ | ||||
| 		super(17, qn, "Light and Darkness"); | ||||
| 		super(17, "Light and Darkness"); | ||||
| 		 | ||||
| 		registerQuestItems(BLOOD_OF_SAINT); | ||||
| 		 | ||||
| @@ -50,7 +48,7 @@ public class Q017_LightAndDarkness extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -123,7 +121,7 @@ public class Q017_LightAndDarkness extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q018_MeetingWithTheGoldenRam extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q018_MeetingWithTheGoldenRam"; | ||||
| 	 | ||||
| 	// Items | ||||
| 	private static final int SUPPLY_BOX = 7245; | ||||
| 	 | ||||
| @@ -36,7 +34,7 @@ public class Q018_MeetingWithTheGoldenRam extends Quest | ||||
| 	 | ||||
| 	public Q018_MeetingWithTheGoldenRam() | ||||
| 	{ | ||||
| 		super(18, qn, "Meeting with the Golden Ram"); | ||||
| 		super(18, "Meeting with the Golden Ram"); | ||||
| 		 | ||||
| 		registerQuestItems(SUPPLY_BOX); | ||||
| 		 | ||||
| @@ -48,7 +46,7 @@ public class Q018_MeetingWithTheGoldenRam extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -82,7 +80,7 @@ public class Q018_MeetingWithTheGoldenRam extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q019_GoToThePastureland extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q019_GoToThePastureland"; | ||||
| 	 | ||||
| 	// Items | ||||
| 	private static final int YOUNG_WILD_BEAST_MEAT = 7547; | ||||
| 	 | ||||
| @@ -35,7 +33,7 @@ public class Q019_GoToThePastureland extends Quest | ||||
| 	 | ||||
| 	public Q019_GoToThePastureland() | ||||
| 	{ | ||||
| 		super(19, qn, "Go to the Pastureland!"); | ||||
| 		super(19, "Go to the Pastureland!"); | ||||
| 		 | ||||
| 		registerQuestItems(YOUNG_WILD_BEAST_MEAT); | ||||
| 		 | ||||
| @@ -47,7 +45,7 @@ public class Q019_GoToThePastureland extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -82,7 +80,7 @@ public class Q019_GoToThePastureland extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
|   | ||||
| @@ -24,14 +24,12 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q020_BringUpWithLove extends Quest | ||||
| { | ||||
| 	public static final String qn = "Q020_BringUpWithLove"; | ||||
| 	 | ||||
| 	// Item | ||||
| 	private static final int JEWEL_OF_INNOCENCE = 7185; | ||||
| 	 | ||||
| 	public Q020_BringUpWithLove() | ||||
| 	{ | ||||
| 		super(20, qn, "Bring Up With Love"); | ||||
| 		super(20, "Bring Up With Love"); | ||||
| 		 | ||||
| 		registerQuestItems(JEWEL_OF_INNOCENCE); | ||||
| 		 | ||||
| @@ -43,7 +41,7 @@ public class Q020_BringUpWithLove extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -70,7 +68,7 @@ public class Q020_BringUpWithLove extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
|   | ||||
| @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q021_HiddenTruth extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q021_HiddenTruth"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int MYSTERIOUS_WIZARD = 31522; | ||||
| 	private static final int TOMBSTONE = 31523; | ||||
| @@ -55,7 +53,7 @@ public class Q021_HiddenTruth extends Quest | ||||
| 	 | ||||
| 	public Q021_HiddenTruth() | ||||
| 	{ | ||||
| 		super(21, qn, "Hidden Truth"); | ||||
| 		super(21, "Hidden Truth"); | ||||
| 		 | ||||
| 		registerQuestItems(CROSS_OF_EINHASAD); | ||||
| 		 | ||||
| @@ -67,7 +65,7 @@ public class Q021_HiddenTruth extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -170,7 +168,7 @@ public class Q021_HiddenTruth extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
|   | ||||
| @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; | ||||
| import org.l2jmobius.gameserver.model.quest.QuestState; | ||||
| import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| import quests.Q021_HiddenTruth.Q021_HiddenTruth; | ||||
|  | ||||
| public class Q022_TragedyInVonHellmannForest extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q022_TragedyInVonHellmannForest"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int WELL = 31527; | ||||
| 	private static final int TIFAREN = 31334; | ||||
| @@ -52,7 +52,7 @@ public class Q022_TragedyInVonHellmannForest extends Quest | ||||
| 	 | ||||
| 	public Q022_TragedyInVonHellmannForest() | ||||
| 	{ | ||||
| 		super(22, qn, "Tragedy in von Hellmann Forest"); | ||||
| 		super(22, "Tragedy in von Hellmann Forest"); | ||||
| 		 | ||||
| 		registerQuestItems(LOST_SKULL_OF_ELF, REPORT_BOX, SEALED_REPORT_BOX, LETTER_OF_INNOCENTIN, RED_JEWEL_OF_ADVENTURER, GREEN_JEWEL_OF_ADVENTURER); | ||||
| 		 | ||||
| @@ -67,7 +67,7 @@ public class Q022_TragedyInVonHellmannForest extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -75,7 +75,7 @@ public class Q022_TragedyInVonHellmannForest extends Quest | ||||
| 		 | ||||
| 		if (event.equals("31334-03.htm")) | ||||
| 		{ | ||||
| 			QuestState st2 = player.getQuestState("Q021_HiddenTruth"); | ||||
| 			QuestState st2 = player.getQuestState(Q021_HiddenTruth.class.getSimpleName()); | ||||
| 			if ((st2 != null) && st2.isCompleted() && (player.getLevel() >= 63)) | ||||
| 			{ | ||||
| 				htmltext = "31334-02.htm"; | ||||
| @@ -198,7 +198,7 @@ public class Q022_TragedyInVonHellmannForest extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -210,7 +210,7 @@ public class Q022_TragedyInVonHellmannForest extends Quest | ||||
| 				switch (npc.getNpcId()) | ||||
| 				{ | ||||
| 					case INNOCENTIN: | ||||
| 						QuestState st2 = player.getQuestState("Q021_HiddenTruth"); | ||||
| 						QuestState st2 = player.getQuestState(Q021_HiddenTruth.class.getSimpleName()); | ||||
| 						if ((st2 != null) && st2.isCompleted()) | ||||
| 						{ | ||||
| 							if (!st.hasQuestItems(CROSS_OF_EINHASAD)) | ||||
| @@ -421,7 +421,7 @@ public class Q022_TragedyInVonHellmannForest extends Quest | ||||
| 	@Override | ||||
| 	public String onAttack(NpcInstance npc, PlayerInstance attacker, int damage, boolean isPet) | ||||
| 	{ | ||||
| 		QuestState st = attacker.getQuestState(qn); | ||||
| 		QuestState st = attacker.getQuestState(getName()); | ||||
| 		if ((st == null) || !st.isStarted() || isPet) | ||||
| 		{ | ||||
| 			return null; | ||||
|   | ||||
| @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; | ||||
| import org.l2jmobius.gameserver.model.quest.QuestState; | ||||
| import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| import quests.Q022_TragedyInVonHellmannForest.Q022_TragedyInVonHellmannForest; | ||||
|  | ||||
| public class Q023_LidiasHeart extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q023_LidiasHeart"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int INNOCENTIN = 31328; | ||||
| 	private static final int BROKEN_BOOKSHELF = 31526; | ||||
| @@ -46,7 +46,7 @@ public class Q023_LidiasHeart extends Quest | ||||
| 	 | ||||
| 	public Q023_LidiasHeart() | ||||
| 	{ | ||||
| 		super(23, qn, "Lidia's Heart"); | ||||
| 		super(23, "Lidia's Heart"); | ||||
| 		 | ||||
| 		registerQuestItems(FOREST_OF_DEADMAN_MAP, SILVER_KEY, LIDIA_DIARY, SILVER_SPEAR); | ||||
| 		 | ||||
| @@ -58,7 +58,7 @@ public class Q023_LidiasHeart extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -171,7 +171,7 @@ public class Q023_LidiasHeart extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -180,7 +180,7 @@ public class Q023_LidiasHeart extends Quest | ||||
| 		switch (st.getState()) | ||||
| 		{ | ||||
| 			case State.CREATED: | ||||
| 				QuestState st2 = player.getQuestState("Q022_TragedyInVonHellmannForest"); | ||||
| 				QuestState st2 = player.getQuestState(Q022_TragedyInVonHellmannForest.class.getSimpleName()); | ||||
| 				if ((st2 != null) && st2.isCompleted()) | ||||
| 				{ | ||||
| 					if (player.getLevel() >= 64) | ||||
|   | ||||
| @@ -23,14 +23,14 @@ import org.l2jmobius.gameserver.model.quest.QuestState; | ||||
| import org.l2jmobius.gameserver.model.quest.State; | ||||
| import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; | ||||
|  | ||||
| import quests.Q023_LidiasHeart.Q023_LidiasHeart; | ||||
|  | ||||
| /** | ||||
|  * @author Mobius | ||||
|  * @note Based on python script | ||||
|  */ | ||||
| public class Q024_InhabitantsOfTheForrestOfTheDead extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q024_InhabitantsOfTheForrestOfTheDead"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int DORIAN = 31389; | ||||
| 	private static final int WIZARD = 31522; | ||||
| @@ -47,7 +47,7 @@ public class Q024_InhabitantsOfTheForrestOfTheDead extends Quest | ||||
| 	 | ||||
| 	public Q024_InhabitantsOfTheForrestOfTheDead() | ||||
| 	{ | ||||
| 		super(24, qn, "Inhabitants of the Forest of the Dead"); | ||||
| 		super(24, "Inhabitants of the Forest of the Dead"); | ||||
| 		 | ||||
| 		addStartNpc(DORIAN); | ||||
| 		addTalkId(DORIAN, TOMBSTONE, MAID_OF_LIDIA, WIZARD); | ||||
| @@ -59,7 +59,7 @@ public class Q024_InhabitantsOfTheForrestOfTheDead extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		final QuestState qs = player.getQuestState(qn); | ||||
| 		final QuestState qs = player.getQuestState(getName()); | ||||
| 		if (qs == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -146,7 +146,7 @@ public class Q024_InhabitantsOfTheForrestOfTheDead extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		final QuestState qs = player.getQuestState(qn); | ||||
| 		final QuestState qs = player.getQuestState(getName()); | ||||
| 		if (qs == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -170,7 +170,7 @@ public class Q024_InhabitantsOfTheForrestOfTheDead extends Quest | ||||
| 		{ | ||||
| 			if (state == State.CREATED) | ||||
| 			{ | ||||
| 				final QuestState qs2 = player.getQuestState("Q023_LidiasHeart"); | ||||
| 				final QuestState qs2 = player.getQuestState(Q023_LidiasHeart.class.getSimpleName()); | ||||
| 				if (qs2 != null) | ||||
| 				{ | ||||
| 					if ((qs2.getState() == State.COMPLETED) && (player.getLevel() >= 65)) | ||||
| @@ -266,7 +266,7 @@ public class Q024_InhabitantsOfTheForrestOfTheDead extends Quest | ||||
| 		else | ||||
| 		{ | ||||
| 			npc.getAttackByList().remove(player); | ||||
| 			final QuestState qs = player.getQuestState(qn); | ||||
| 			final QuestState qs = player.getQuestState(getName()); | ||||
| 			if ((qs != null) && (qs.getQuestItemsCount(SILVER_CROSS) > 0)) | ||||
| 			{ | ||||
| 				qs.takeItems(SILVER_CROSS, -1); | ||||
|   | ||||
| @@ -25,14 +25,14 @@ import org.l2jmobius.gameserver.model.quest.QuestState; | ||||
| import org.l2jmobius.gameserver.model.quest.State; | ||||
| import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; | ||||
|  | ||||
| import quests.Q024_InhabitantsOfTheForrestOfTheDead.Q024_InhabitantsOfTheForrestOfTheDead; | ||||
|  | ||||
| /** | ||||
|  * @author Mobius | ||||
|  * @note Based on python script | ||||
|  */ | ||||
| public class Q025_HidingBehindTheTruth extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q025_HidingBehindTheTruth"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int AGRIPEL = 31348; | ||||
| 	private static final int BENEDICT = 31349; | ||||
| @@ -53,7 +53,7 @@ public class Q025_HidingBehindTheTruth extends Quest | ||||
| 	 | ||||
| 	public Q025_HidingBehindTheTruth() | ||||
| 	{ | ||||
| 		super(25, qn, "Hiding Behind the Truth"); | ||||
| 		super(25, "Hiding Behind the Truth"); | ||||
| 		 | ||||
| 		addStartNpc(BENEDICT); | ||||
| 		addTalkId(AGRIPEL, BENEDICT, BOOKSHELF, BOOKSHELF2, BOOKSHELF3, WIZARD, LIDIA, TOMBSTONE, COFFIN); | ||||
| @@ -65,7 +65,7 @@ public class Q025_HidingBehindTheTruth extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState qs = player.getQuestState(qn); | ||||
| 		QuestState qs = player.getQuestState(getName()); | ||||
| 		if (qs == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -222,7 +222,7 @@ public class Q025_HidingBehindTheTruth extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState qs = player.getQuestState(qn); | ||||
| 		QuestState qs = player.getQuestState(getName()); | ||||
| 		if (qs == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -239,7 +239,7 @@ public class Q025_HidingBehindTheTruth extends Quest | ||||
| 		{ | ||||
| 			if (npcId == BENEDICT) | ||||
| 			{ | ||||
| 				final QuestState qs2 = player.getQuestState("Q024_InhabitantsOfTheForrestOfTheDead"); | ||||
| 				final QuestState qs2 = player.getQuestState(Q024_InhabitantsOfTheForrestOfTheDead.class.getSimpleName()); | ||||
| 				if (qs2 != null) | ||||
| 				{ | ||||
| 					if ((qs2.getState() == State.COMPLETED) && (player.getLevel() >= 66)) | ||||
| @@ -428,7 +428,7 @@ public class Q025_HidingBehindTheTruth extends Quest | ||||
| 	@Override | ||||
| 	public String onKill(NpcInstance npc, PlayerInstance player, boolean isPet) | ||||
| 	{ | ||||
| 		final QuestState qs = player.getQuestState(qn); | ||||
| 		final QuestState qs = player.getQuestState(getName()); | ||||
| 		if (qs == null) | ||||
| 		{ | ||||
| 			return null; | ||||
|   | ||||
| @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; | ||||
| import org.l2jmobius.gameserver.model.quest.QuestState; | ||||
| import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| import quests.Q050_LanoscosSpecialBait.Q050_LanoscosSpecialBait; | ||||
|  | ||||
| public class Q027_ChestCaughtWithABaitOfWind extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q027_ChestCaughtWithABaitOfWind"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int LANOSCO = 31570; | ||||
| 	private static final int SHALING = 31442; | ||||
| @@ -37,7 +37,7 @@ public class Q027_ChestCaughtWithABaitOfWind extends Quest | ||||
| 	 | ||||
| 	public Q027_ChestCaughtWithABaitOfWind() | ||||
| 	{ | ||||
| 		super(27, qn, "Chest caught with a bait of wind"); | ||||
| 		super(27, "Chest caught with a bait of wind"); | ||||
| 		 | ||||
| 		registerQuestItems(STRANGE_BLUEPRINT); | ||||
| 		 | ||||
| @@ -49,7 +49,7 @@ public class Q027_ChestCaughtWithABaitOfWind extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -96,7 +96,7 @@ public class Q027_ChestCaughtWithABaitOfWind extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| @@ -112,7 +112,7 @@ public class Q027_ChestCaughtWithABaitOfWind extends Quest | ||||
| 				} | ||||
| 				else | ||||
| 				{ | ||||
| 					QuestState st2 = player.getQuestState("Q050_LanoscosSpecialBait"); | ||||
| 					QuestState st2 = player.getQuestState(Q050_LanoscosSpecialBait.class.getSimpleName()); | ||||
| 					if ((st2 != null) && st2.isCompleted()) | ||||
| 					{ | ||||
| 						htmltext = "31570-01.htm"; | ||||
|   | ||||
| @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; | ||||
| import org.l2jmobius.gameserver.model.quest.QuestState; | ||||
| import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| import quests.Q051_OFullesSpecialBait.Q051_OFullesSpecialBait; | ||||
|  | ||||
| public class Q028_ChestCaughtWithABaitOfIcyAir extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q028_ChestCaughtWithABaitOfIcyAir"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int OFULLE = 31572; | ||||
| 	private static final int KIKI = 31442; | ||||
| @@ -37,7 +37,7 @@ public class Q028_ChestCaughtWithABaitOfIcyAir extends Quest | ||||
| 	 | ||||
| 	public Q028_ChestCaughtWithABaitOfIcyAir() | ||||
| 	{ | ||||
| 		super(28, qn, "Chest caught with a bait of icy air"); | ||||
| 		super(28, "Chest caught with a bait of icy air"); | ||||
| 		 | ||||
| 		registerQuestItems(KIKI_LETTER); | ||||
| 		 | ||||
| @@ -49,7 +49,7 @@ public class Q028_ChestCaughtWithABaitOfIcyAir extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -96,7 +96,7 @@ public class Q028_ChestCaughtWithABaitOfIcyAir extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| @@ -112,7 +112,7 @@ public class Q028_ChestCaughtWithABaitOfIcyAir extends Quest | ||||
| 				} | ||||
| 				else | ||||
| 				{ | ||||
| 					QuestState st2 = player.getQuestState("Q051_OFullesSpecialBait"); | ||||
| 					QuestState st2 = player.getQuestState(Q051_OFullesSpecialBait.class.getSimpleName()); | ||||
| 					if ((st2 != null) && st2.isCompleted()) | ||||
| 					{ | ||||
| 						htmltext = "31572-01.htm"; | ||||
|   | ||||
| @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; | ||||
| import org.l2jmobius.gameserver.model.quest.QuestState; | ||||
| import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| import quests.Q052_WilliesSpecialBait.Q052_WilliesSpecialBait; | ||||
|  | ||||
| public class Q029_ChestCaughtWithABaitOfEarth extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q029_ChestCaughtWithABaitOfEarth"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int WILLIE = 31574; | ||||
| 	private static final int ANABEL = 30909; | ||||
| @@ -37,7 +37,7 @@ public class Q029_ChestCaughtWithABaitOfEarth extends Quest | ||||
| 	 | ||||
| 	public Q029_ChestCaughtWithABaitOfEarth() | ||||
| 	{ | ||||
| 		super(29, qn, "Chest caught with a bait of earth"); | ||||
| 		super(29, "Chest caught with a bait of earth"); | ||||
| 		 | ||||
| 		registerQuestItems(SMALL_GLASS_BOX); | ||||
| 		 | ||||
| @@ -49,7 +49,7 @@ public class Q029_ChestCaughtWithABaitOfEarth extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -96,7 +96,7 @@ public class Q029_ChestCaughtWithABaitOfEarth extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| @@ -112,7 +112,7 @@ public class Q029_ChestCaughtWithABaitOfEarth extends Quest | ||||
| 				} | ||||
| 				else | ||||
| 				{ | ||||
| 					QuestState st2 = player.getQuestState("Q052_WilliesSpecialBait"); | ||||
| 					QuestState st2 = player.getQuestState(Q052_WilliesSpecialBait.class.getSimpleName()); | ||||
| 					if ((st2 != null) && st2.isCompleted()) | ||||
| 					{ | ||||
| 						htmltext = "31574-01.htm"; | ||||
|   | ||||
| @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; | ||||
| import org.l2jmobius.gameserver.model.quest.QuestState; | ||||
| import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| import quests.Q053_LinnaeusSpecialBait.Q053_LinnaeusSpecialBait; | ||||
|  | ||||
| public class Q030_ChestCaughtWithABaitOfFire extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q030_ChestCaughtWithABaitOfFire"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int LINNAEUS = 31577; | ||||
| 	private static final int RUKAL = 30629; | ||||
| @@ -37,7 +37,7 @@ public class Q030_ChestCaughtWithABaitOfFire extends Quest | ||||
| 	 | ||||
| 	public Q030_ChestCaughtWithABaitOfFire() | ||||
| 	{ | ||||
| 		super(30, qn, "Chest caught with a bait of fire"); | ||||
| 		super(30, "Chest caught with a bait of fire"); | ||||
| 		 | ||||
| 		registerQuestItems(MUSICAL_SCORE); | ||||
| 		 | ||||
| @@ -49,7 +49,7 @@ public class Q030_ChestCaughtWithABaitOfFire extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -96,7 +96,7 @@ public class Q030_ChestCaughtWithABaitOfFire extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| @@ -112,7 +112,7 @@ public class Q030_ChestCaughtWithABaitOfFire extends Quest | ||||
| 				} | ||||
| 				else | ||||
| 				{ | ||||
| 					QuestState st2 = player.getQuestState("Q053_LinnaeusSpecialBait"); | ||||
| 					QuestState st2 = player.getQuestState(Q053_LinnaeusSpecialBait.class.getSimpleName()); | ||||
| 					if ((st2 != null) && st2.isCompleted()) | ||||
| 					{ | ||||
| 						htmltext = "31577-01.htm"; | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q031_SecretBuriedInTheSwamp extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q031_SecretBuriedInTheSwamp"; | ||||
| 	 | ||||
| 	// Item | ||||
| 	private static final int KRORIN_JOURNAL = 7252; | ||||
| 	 | ||||
| @@ -39,7 +37,7 @@ public class Q031_SecretBuriedInTheSwamp extends Quest | ||||
| 	 | ||||
| 	public Q031_SecretBuriedInTheSwamp() | ||||
| 	{ | ||||
| 		super(31, qn, "Secret Buried in the Swamp"); | ||||
| 		super(31, "Secret Buried in the Swamp"); | ||||
| 		 | ||||
| 		registerQuestItems(KRORIN_JOURNAL); | ||||
| 		 | ||||
| @@ -51,7 +49,7 @@ public class Q031_SecretBuriedInTheSwamp extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -109,7 +107,7 @@ public class Q031_SecretBuriedInTheSwamp extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q032_AnObviousLie extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q032_AnObviousLie"; | ||||
| 	 | ||||
| 	// Items | ||||
| 	private static final int SUEDE = 1866; | ||||
| 	private static final int THREAD = 1868; | ||||
| @@ -45,7 +43,7 @@ public class Q032_AnObviousLie extends Quest | ||||
| 	 | ||||
| 	public Q032_AnObviousLie() | ||||
| 	{ | ||||
| 		super(32, qn, "An Obvious Lie"); | ||||
| 		super(32, "An Obvious Lie"); | ||||
| 		 | ||||
| 		registerQuestItems(MAP, MEDICINAL_HERB); | ||||
| 		 | ||||
| @@ -59,7 +57,7 @@ public class Q032_AnObviousLie extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -171,7 +169,7 @@ public class Q032_AnObviousLie extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; | ||||
| import org.l2jmobius.gameserver.model.quest.QuestState; | ||||
| import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| import quests.Q037_MakeFormalWear.Q037_MakeFormalWear; | ||||
|  | ||||
| public class Q033_MakeAPairOfDressShoes extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q033_MakeAPairOfDressShoes"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int WOODLEY = 30838; | ||||
| 	private static final int IAN = 30164; | ||||
| @@ -41,7 +41,7 @@ public class Q033_MakeAPairOfDressShoes extends Quest | ||||
| 	 | ||||
| 	public Q033_MakeAPairOfDressShoes() | ||||
| 	{ | ||||
| 		super(33, qn, "Make a Pair of Dress Shoes"); | ||||
| 		super(33, "Make a Pair of Dress Shoes"); | ||||
| 		 | ||||
| 		addStartNpc(WOODLEY); | ||||
| 		addTalkId(WOODLEY, IAN, LEIKAR); | ||||
| @@ -51,7 +51,7 @@ public class Q033_MakeAPairOfDressShoes extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -114,7 +114,7 @@ public class Q033_MakeAPairOfDressShoes extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| @@ -126,7 +126,7 @@ public class Q033_MakeAPairOfDressShoes extends Quest | ||||
| 			case State.CREATED: | ||||
| 				if (player.getLevel() >= 60) | ||||
| 				{ | ||||
| 					QuestState fwear = player.getQuestState("Q037_MakeFormalWear"); | ||||
| 					QuestState fwear = player.getQuestState(Q037_MakeFormalWear.class.getSimpleName()); | ||||
| 					if ((fwear != null) && (fwear.getInt("cond") == 7)) | ||||
| 					{ | ||||
| 						htmltext = "30838-0.htm"; | ||||
|   | ||||
| @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; | ||||
| import org.l2jmobius.gameserver.model.quest.QuestState; | ||||
| import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| import quests.Q037_MakeFormalWear.Q037_MakeFormalWear; | ||||
|  | ||||
| public class Q034_InSearchOfCloth extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q034_InSearchOfCloth"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int RADIA = 30088; | ||||
| 	private static final int RALFORD = 30165; | ||||
| @@ -46,7 +46,7 @@ public class Q034_InSearchOfCloth extends Quest | ||||
| 	 | ||||
| 	public Q034_InSearchOfCloth() | ||||
| 	{ | ||||
| 		super(34, qn, "In Search of Cloth"); | ||||
| 		super(34, "In Search of Cloth"); | ||||
| 		 | ||||
| 		registerQuestItems(SPINNERET, SPIDERSILK); | ||||
| 		 | ||||
| @@ -60,7 +60,7 @@ public class Q034_InSearchOfCloth extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -117,7 +117,7 @@ public class Q034_InSearchOfCloth extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| @@ -129,7 +129,7 @@ public class Q034_InSearchOfCloth extends Quest | ||||
| 			case State.CREATED: | ||||
| 				if (player.getLevel() >= 60) | ||||
| 				{ | ||||
| 					QuestState fwear = player.getQuestState("Q037_MakeFormalWear"); | ||||
| 					QuestState fwear = player.getQuestState(Q037_MakeFormalWear.class.getSimpleName()); | ||||
| 					if ((fwear != null) && (fwear.getInt("cond") == 6)) | ||||
| 					{ | ||||
| 						htmltext = "30088-0.htm"; | ||||
|   | ||||
| @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; | ||||
| import org.l2jmobius.gameserver.model.quest.QuestState; | ||||
| import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| import quests.Q037_MakeFormalWear.Q037_MakeFormalWear; | ||||
|  | ||||
| public class Q035_FindGlitteringJewelry extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q035_FindGlitteringJewelry"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int ELLIE = 30091; | ||||
| 	private static final int FELTON = 30879; | ||||
| @@ -41,7 +41,7 @@ public class Q035_FindGlitteringJewelry extends Quest | ||||
| 	 | ||||
| 	public Q035_FindGlitteringJewelry() | ||||
| 	{ | ||||
| 		super(35, qn, "Find Glittering Jewelry"); | ||||
| 		super(35, "Find Glittering Jewelry"); | ||||
| 		 | ||||
| 		registerQuestItems(ROUGH_JEWEL); | ||||
| 		 | ||||
| @@ -55,7 +55,7 @@ public class Q035_FindGlitteringJewelry extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -101,7 +101,7 @@ public class Q035_FindGlitteringJewelry extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| @@ -113,7 +113,7 @@ public class Q035_FindGlitteringJewelry extends Quest | ||||
| 			case State.CREATED: | ||||
| 				if (player.getLevel() >= 60) | ||||
| 				{ | ||||
| 					QuestState fwear = player.getQuestState("Q037_MakeFormalWear"); | ||||
| 					QuestState fwear = player.getQuestState(Q037_MakeFormalWear.class.getSimpleName()); | ||||
| 					if ((fwear != null) && (fwear.getInt("cond") == 6)) | ||||
| 					{ | ||||
| 						htmltext = "30091-0.htm"; | ||||
|   | ||||
| @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; | ||||
| import org.l2jmobius.gameserver.model.quest.QuestState; | ||||
| import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| import quests.Q037_MakeFormalWear.Q037_MakeFormalWear; | ||||
|  | ||||
| public class Q036_MakeASewingKit extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q036_MakeASewingKit"; | ||||
| 	 | ||||
| 	// Items | ||||
| 	private static final int REINFORCED_STEEL = 7163; | ||||
| 	private static final int ARTISANS_FRAME = 1891; | ||||
| @@ -36,7 +36,7 @@ public class Q036_MakeASewingKit extends Quest | ||||
| 	 | ||||
| 	public Q036_MakeASewingKit() | ||||
| 	{ | ||||
| 		super(36, qn, "Make a Sewing Kit"); | ||||
| 		super(36, "Make a Sewing Kit"); | ||||
| 		 | ||||
| 		registerQuestItems(REINFORCED_STEEL); | ||||
| 		 | ||||
| @@ -50,7 +50,7 @@ public class Q036_MakeASewingKit extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -90,7 +90,7 @@ public class Q036_MakeASewingKit extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| @@ -102,7 +102,7 @@ public class Q036_MakeASewingKit extends Quest | ||||
| 			case State.CREATED: | ||||
| 				if (player.getLevel() >= 60) | ||||
| 				{ | ||||
| 					QuestState fwear = player.getQuestState("Q037_MakeFormalWear"); | ||||
| 					QuestState fwear = player.getQuestState(Q037_MakeFormalWear.class.getSimpleName()); | ||||
| 					if ((fwear != null) && (fwear.getInt("cond") == 6)) | ||||
| 					{ | ||||
| 						htmltext = "30847-0.htm"; | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q037_MakeFormalWear extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q037_MakeFormalWear"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int ALEXIS = 30842; | ||||
| 	private static final int LEIKAR = 31520; | ||||
| @@ -46,7 +44,7 @@ public class Q037_MakeFormalWear extends Quest | ||||
| 	 | ||||
| 	public Q037_MakeFormalWear() | ||||
| 	{ | ||||
| 		super(37, qn, "Make Formal Wear"); | ||||
| 		super(37, "Make Formal Wear"); | ||||
| 		 | ||||
| 		registerQuestItems(SIGNET_RING, ICE_WINE, BOX_OF_COOKIES); | ||||
| 		 | ||||
| @@ -58,7 +56,7 @@ public class Q037_MakeFormalWear extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -123,7 +121,7 @@ public class Q037_MakeFormalWear extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q038_DragonFangs extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q038_DragonFangs"; | ||||
| 	 | ||||
| 	// Items | ||||
| 	private static final int FEATHER_ORNAMENT = 7173; | ||||
| 	private static final int TOOTH_OF_TOTEM = 7174; | ||||
| @@ -64,7 +62,7 @@ public class Q038_DragonFangs extends Quest | ||||
| 	}; | ||||
| 	 | ||||
| 	// Droplist | ||||
| 	private static final Map<Integer, int[]> DROPLIST = new HashMap<>(); | ||||
| 	private static final Map<Integer, int[]> DROPLIST = new HashMap<>(); | ||||
| 	static | ||||
| 	{ | ||||
| 		DROPLIST.put(21100, new int[] | ||||
| @@ -99,7 +97,7 @@ public class Q038_DragonFangs extends Quest | ||||
| 	 | ||||
| 	public Q038_DragonFangs() | ||||
| 	{ | ||||
| 		super(38, qn, "Dragon Fangs"); | ||||
| 		super(38, "Dragon Fangs"); | ||||
| 		 | ||||
| 		registerQuestItems(FEATHER_ORNAMENT, TOOTH_OF_TOTEM, TOOTH_OF_DRAGON, LETTER_OF_IRIS, LETTER_OF_ROHMER); | ||||
| 		 | ||||
| @@ -116,7 +114,7 @@ public class Q038_DragonFangs extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -189,7 +187,7 @@ public class Q038_DragonFangs extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
|   | ||||
| @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q039_RedEyedInvaders extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q039_RedEyedInvaders"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int BABENCO = 30334; | ||||
| 	private static final int BATHIS = 30332; | ||||
| @@ -46,7 +44,7 @@ public class Q039_RedEyedInvaders extends Quest | ||||
| 	private static final int GEM_OF_MAILLE = 7181; | ||||
| 	 | ||||
| 	// First droplist | ||||
| 	private static final Map<Integer, int[]> FIRST_DP = new HashMap<>(); | ||||
| 	private static final Map<Integer, int[]> FIRST_DP = new HashMap<>(); | ||||
| 	static | ||||
| 	{ | ||||
| 		FIRST_DP.put(MAILLE_LIZARDMAN_GUARD, new int[] | ||||
| @@ -67,7 +65,7 @@ public class Q039_RedEyedInvaders extends Quest | ||||
| 	} | ||||
| 	 | ||||
| 	// Second droplist | ||||
| 	private static final Map<Integer, int[]> SECOND_DP = new HashMap<>(); | ||||
| 	private static final Map<Integer, int[]> SECOND_DP = new HashMap<>(); | ||||
| 	static | ||||
| 	{ | ||||
| 		SECOND_DP.put(ARANEID, new int[] | ||||
| @@ -97,7 +95,7 @@ public class Q039_RedEyedInvaders extends Quest | ||||
| 	 | ||||
| 	public Q039_RedEyedInvaders() | ||||
| 	{ | ||||
| 		super(39, qn, "Red-Eyed Invaders"); | ||||
| 		super(39, "Red-Eyed Invaders"); | ||||
| 		 | ||||
| 		registerQuestItems(BLACK_BONE_NECKLACE, RED_BONE_NECKLACE, INCENSE_POUCH, GEM_OF_MAILLE); | ||||
| 		 | ||||
| @@ -111,7 +109,7 @@ public class Q039_RedEyedInvaders extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -153,7 +151,7 @@ public class Q039_RedEyedInvaders extends Quest | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -214,7 +212,7 @@ public class Q039_RedEyedInvaders extends Quest | ||||
| 		PlayerInstance partyMember = getRandomPartyMember(player, npc, "2"); | ||||
| 		if ((partyMember != null) && (npcId != ARANEID)) | ||||
| 		{ | ||||
| 			final QuestState st = partyMember.getQuestState(qn); | ||||
| 			final QuestState st = partyMember.getQuestState(getName()); | ||||
| 			if (st == null) | ||||
| 			{ | ||||
| 				return null; | ||||
| @@ -231,7 +229,7 @@ public class Q039_RedEyedInvaders extends Quest | ||||
| 			partyMember = getRandomPartyMember(player, npc, "4"); | ||||
| 			if ((partyMember != null) && (npcId != MAILLE_LIZARDMAN)) | ||||
| 			{ | ||||
| 				final QuestState st = partyMember.getQuestState(qn); | ||||
| 				final QuestState st = partyMember.getQuestState(getName()); | ||||
| 				final int[] list = SECOND_DP.get(npcId); | ||||
| 				 | ||||
| 				if (st.dropItems(list[0], 1, 30, list[2]) && (st.getQuestItemsCount(list[1]) == 30)) | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q042_HelpTheUncle extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q042_HelpTheUncle"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int WATERS = 30828; | ||||
| 	private static final int SOPHYA = 30735; | ||||
| @@ -42,7 +40,7 @@ public class Q042_HelpTheUncle extends Quest | ||||
| 	 | ||||
| 	public Q042_HelpTheUncle() | ||||
| 	{ | ||||
| 		super(42, qn, "Help the Uncle!"); | ||||
| 		super(42, "Help the Uncle!"); | ||||
| 		 | ||||
| 		registerQuestItems(MAP_PIECE, MAP); | ||||
| 		 | ||||
| @@ -56,7 +54,7 @@ public class Q042_HelpTheUncle extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -100,7 +98,7 @@ public class Q042_HelpTheUncle extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q043_HelpTheSister extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q043_HelpTheSister"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int COOPER = 30829; | ||||
| 	private static final int GALLADUCCI = 30097; | ||||
| @@ -42,7 +40,7 @@ public class Q043_HelpTheSister extends Quest | ||||
| 	 | ||||
| 	public Q043_HelpTheSister() | ||||
| 	{ | ||||
| 		super(43, qn, "Help the Sister!"); | ||||
| 		super(43, "Help the Sister!"); | ||||
| 		 | ||||
| 		registerQuestItems(MAP_PIECE, MAP); | ||||
| 		 | ||||
| @@ -56,7 +54,7 @@ public class Q043_HelpTheSister extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -100,7 +98,7 @@ public class Q043_HelpTheSister extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q044_HelpTheSon extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q044_HelpTheSon"; | ||||
| 	 | ||||
| 	// Npcs | ||||
| 	private static final int LUNDY = 30827; | ||||
| 	private static final int DRIKUS = 30505; | ||||
| @@ -43,7 +41,7 @@ public class Q044_HelpTheSon extends Quest | ||||
| 	 | ||||
| 	public Q044_HelpTheSon() | ||||
| 	{ | ||||
| 		super(44, qn, "Help the Son!"); | ||||
| 		super(44, "Help the Son!"); | ||||
| 		 | ||||
| 		registerQuestItems(GEMSTONE_FRAGMENT, GEMSTONE); | ||||
| 		 | ||||
| @@ -57,7 +55,7 @@ public class Q044_HelpTheSon extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -101,7 +99,7 @@ public class Q044_HelpTheSon extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -21,8 +21,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q045_ToTalkingIsland extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q045_ToTalkingIsland"; | ||||
| 	 | ||||
| 	// Npcs | ||||
| 	private static final int GALLADUCCI = 30097; | ||||
| 	private static final int GENTLER = 30094; | ||||
| @@ -41,7 +39,7 @@ public class Q045_ToTalkingIsland extends Quest | ||||
| 	 | ||||
| 	public Q045_ToTalkingIsland() | ||||
| 	{ | ||||
| 		super(45, qn, "To Talking Island"); | ||||
| 		super(45, "To Talking Island"); | ||||
| 		 | ||||
| 		registerQuestItems(ORDER_DOCUMENT_1, ORDER_DOCUMENT_2, ORDER_DOCUMENT_3, MAGIC_SWORD_HILT, GEMSTONE_POWDER, PURIFIED_MAGIC_NECKLACE); | ||||
| 		 | ||||
| @@ -53,7 +51,7 @@ public class Q045_ToTalkingIsland extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -116,7 +114,7 @@ public class Q045_ToTalkingIsland extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q046_OnceMoreInTheArmsOfTheMotherTree extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q046_OnceMoreInTheArmsOfTheMotherTree"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int GALLADUCCI = 30097; | ||||
| 	private static final int GENTLER = 30094; | ||||
| @@ -45,7 +43,7 @@ public class Q046_OnceMoreInTheArmsOfTheMotherTree extends Quest | ||||
| 	 | ||||
| 	public Q046_OnceMoreInTheArmsOfTheMotherTree() | ||||
| 	{ | ||||
| 		super(46, qn, "Once More In the Arms of the Mother Tree"); | ||||
| 		super(46, "Once More In the Arms of the Mother Tree"); | ||||
| 		 | ||||
| 		registerQuestItems(ORDER_DOCUMENT_1, ORDER_DOCUMENT_2, ORDER_DOCUMENT_3, MAGIC_SWORD_HILT, GEMSTONE_POWDER, PURIFIED_MAGIC_NECKLACE); | ||||
| 		 | ||||
| @@ -57,7 +55,7 @@ public class Q046_OnceMoreInTheArmsOfTheMotherTree extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -120,7 +118,7 @@ public class Q046_OnceMoreInTheArmsOfTheMotherTree extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
| @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; | ||||
|  | ||||
| public class Q047_IntoTheDarkForest extends Quest | ||||
| { | ||||
| 	private static final String qn = "Q047_IntoTheDarkForest"; | ||||
| 	 | ||||
| 	// NPCs | ||||
| 	private static final int GALLADUCCI = 30097; | ||||
| 	private static final int GENTLER = 30094; | ||||
| @@ -45,7 +43,7 @@ public class Q047_IntoTheDarkForest extends Quest | ||||
| 	 | ||||
| 	public Q047_IntoTheDarkForest() | ||||
| 	{ | ||||
| 		super(47, qn, "Into the Dark Forest"); | ||||
| 		super(47, "Into the Dark Forest"); | ||||
| 		 | ||||
| 		registerQuestItems(ORDER_DOCUMENT_1, ORDER_DOCUMENT_2, ORDER_DOCUMENT_3, MAGIC_SWORD_HILT, GEMSTONE_POWDER, PURIFIED_MAGIC_NECKLACE); | ||||
| 		 | ||||
| @@ -57,7 +55,7 @@ public class Q047_IntoTheDarkForest extends Quest | ||||
| 	public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		String htmltext = event; | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
| 			return htmltext; | ||||
| @@ -120,7 +118,7 @@ public class Q047_IntoTheDarkForest extends Quest | ||||
| 	@Override | ||||
| 	public String onTalk(NpcInstance npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		QuestState st = player.getQuestState(qn); | ||||
| 		QuestState st = player.getQuestState(getName()); | ||||
| 		String htmltext = getNoQuestMsg(); | ||||
| 		if (st == null) | ||||
| 		{ | ||||
|   | ||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user
	 MobiusDevelopment
					MobiusDevelopment