Quest 10327 changes.

trunk/dist/game/data/instances/MuseumDungeon.xml

@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <instance name="Museum Dungeon" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
-	<activityTime val="20" />
 	<allowSummon val="false" />
-	<emptyDestroyTime val="60" />
+	<emptyDestroyTime val="5" />
-	<spawnPoint spawnX="-114359" spawnY="260120" spawnZ="-1192" />
+	<spawnPoint spawnX="-114711" spawnY="243911" spawnZ="-7968" />
 	<spawnlist>	
 		<group name="desks">
-			<!-- Desk -->
 			<spawn npcId="33126" x="-113744" y="244686" z="-7952" heading="0" respawn="0" />
 			<spawn npcId="33126" x="-114713" y="245760" z="-7952" heading="0" respawn="0" />
 			<spawn npcId="33126" x="-115684" y="244677" z="-7952" heading="0" respawn="0" />
 			<spawn npcId="33126" x="-114717" y="243602" z="-7952" heading="0" respawn="0" />
 		</group>
 		<group name="thiefs">
-			<!-- Thief -->
 			<spawn npcId="23121" x="-114865" y="244942" z="-7984" heading="0" respawn="0" />
 			<spawn npcId="23121" x="-114576" y="244952" z="-7976" heading="0" respawn="0" />
 		</group>		
 	</spawnlist>
-</instance>
+</instance>

trunk/dist/game/data/scripts/ai/npc/Toyron/Toyron.java

@@ -79,29 +79,22 @@ public final class Toyron extends AbstractNpcAI
 		final InstanceWorld world = InstanceManager.getInstance().getWorld(npc.getInstanceId());
 		final QuestState qs = player.getQuestState(Q10327_IntruderWhoWantsTheBookOfGiants.class.getSimpleName());
 		
-		if ((world != null) && (world.getTemplateId() == TEMPLATE_ID))
+		if ((world != null) && (world.getTemplateId() == TEMPLATE_ID) && (qs != null))
 		{
-			if (qs != null)
+			switch (qs.getCond())
 			{
-				switch (qs.getCond())
+				case 1:
 				{
-					case 1:
+					return "33004-01.html";
-					{
+				}
-						return "33004-01.html";
+				case 2:
-					}
+				{
-					case 2:
+					return "33004-02.html";
-					{
+				}
-						return "33004-02.html";
+				case 3:
-					}
+				{
-					case 3:
+					return "33004.html";
-					{
-						return "33004.html";
-					}
 				}
-			}
-			else
-			{
-				return "33004.html";
 			}
 		}
 		return "33004.html";

trunk/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java

@@ -125,11 +125,6 @@ public final class LabyrinthOfBelis extends AbstractInstance
 		
 		switch (event)
 		{
-			case "enter_instance":
-			{
-				enterInstance(player, new LOBWorld(), "LabyrinthOfBelis.xml", TEMPLATE_ID);
-				break;
-			}
 			case "officer_wait_1":
 			{
 				if (world.getStatus() == 1)
@@ -508,18 +503,17 @@ public final class LabyrinthOfBelis extends AbstractInstance
 	@Override
 	public void onEnterInstance(L2PcInstance player, InstanceWorld world, boolean firstEntrance)
 	{
-		final LOBWorld tmpworld = (LOBWorld) world;
 		if (firstEntrance)
 		{
-			tmpworld.setStatus(1);
+			world.setStatus(1);
-			tmpworld.addAllowed(player.getObjectId());
+			world.addAllowed(player.getObjectId());
-			tmpworld.terian = (L2QuestGuardInstance) addSpawn(OFFICER, TERIAN_SPAWN_LOC, false, 0, false, tmpworld.getInstanceId());
+			((LOBWorld) world).terian = (L2QuestGuardInstance) addSpawn(OFFICER, TERIAN_SPAWN_LOC, false, 0, false, world.getInstanceId());
-			tmpworld.terian.setSpawn(null);
+			((LOBWorld) world).terian.setSpawn(null);
-			tmpworld.savedSpawns = spawnGroup("room_1", tmpworld.getInstanceId());
+			((LOBWorld) world).savedSpawns = spawnGroup("room_1", world.getInstanceId());
-			tmpworld.generator = addSpawn(ELECTRICITY_GENERATOR, GENERATOR_SPAWN_LOC, false, 0, false, tmpworld.getInstanceId());
+			((LOBWorld) world).generator = addSpawn(ELECTRICITY_GENERATOR, GENERATOR_SPAWN_LOC, false, 0, false, world.getInstanceId());
-			openDoor(DOOR_1, tmpworld.getInstanceId());
+			openDoor(DOOR_1, world.getInstanceId());
-			startQuestTimer("officer_wait_1", 5000, tmpworld.terian, player);
+			startQuestTimer("officer_wait_1", 5000, ((LOBWorld) world).terian, player);
 		}
-		teleportPlayer(player, START_LOC, tmpworld.getInstanceId());
+		teleportPlayer(player, START_LOC, world.getInstanceId());
 	}
 }

trunk/dist/game/data/scripts/instances/MuseumDungeon/33126.html

@@ -1,4 +0,0 @@
-<html><body>[Desk]<br>
-A desk normally used by Pantheon.<br>
-It's so disorganized, it'll take a while to search it.
-</body></html>

trunk/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java

@@ -20,16 +20,15 @@ package instances.MuseumDungeon;
 
 import instances.AbstractInstance;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 
 import quests.Q10327_IntruderWhoWantsTheBookOfGiants.Q10327_IntruderWhoWantsTheBookOfGiants;
 
+import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.enums.ChatType;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -41,7 +40,7 @@ import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
 
 /**
- * @author Neanrakyr
+ * @author Mobius
  */
 public final class MuseumDungeon extends AbstractInstance
 {
@@ -49,33 +48,21 @@ public final class MuseumDungeon extends AbstractInstance
 	private static final int PANTHEON = 32972;
 	private static final int TOYRON = 33004;
 	private static final int DESK = 33126;
+	// Monster
 	private static final int THIEF = 23121;
-	// Items
+	// Item
 	private static final int THE_WAR_OF_GODS_AND_GIANTS = 17575;
-	// Locations
+	// Others
-	private static final Location START_LOC = new Location(-114711, 243911, -7968);
-	private static final Location TOYRON_SPAWN = new Location(-114707, 245428, -7968);
-	// Misc
 	private static final int TEMPLATE_ID = 182;
-	private static final NpcStringId[] TOYRON_SHOUT =
+	private static final Location START_LOC = new Location(-114711, 243911, -7968);
-	{
+	private static final Location TOYRON_SPAWN_LOC = new Location(-114707, 245428, -7968);
-		NpcStringId.YOUR_NORMAL_ATTACKS_AREN_T_WORKING,
-		NpcStringId.LOOKS_LIKE_ONLY_SKILL_BASED_ATTACKS_DAMAGE_THEM
-	};
-	private static final NpcStringId[] THIEF_SHOUT =
-	{
-		NpcStringId.YOU_LL_NEVER_LEAVE_WITH_THAT_BOOK,
-		NpcStringId.FINALLY_I_THOUGHT_I_WAS_GOING_TO_DIE_WAITING
-	};
 	
 	protected class MDWorld extends InstanceWorld
 	{
 		protected L2QuestGuardInstance toyron = null;
-		protected L2MonsterInstance thief = null;
+		protected List<L2Npc> deskSpawns = null;
-		protected List<L2Npc> desks;
+		protected List<L2Npc> thiefSpawns = null;
-		protected Set<L2Npc> spawnedThiefs = Collections.newSetFromMap(new ConcurrentHashMap<L2Npc, Boolean>());
+		protected int randomDesk = 0;
-		protected int bookDesk = 0;
-		protected int killedThiefs = 0;
 	}
 	
 	public MuseumDungeon()
@@ -83,226 +70,113 @@ public final class MuseumDungeon extends AbstractInstance
 		super(MuseumDungeon.class.getSimpleName());
 		addStartNpc(PANTHEON);
 		addTalkId(PANTHEON);
-		addTalkId(TOYRON);
 		addFirstTalkId(DESK);
 		addAttackId(THIEF);
-		addKillId(THIEF);
 	}
 	
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("enter_instance"))
+		if (event.equals("assist_player"))
-		{
-			enterInstance(player, new MDWorld(), "MuseumDungeon.xml", TEMPLATE_ID);
-		}
-		else
 		{
 			final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player);
-			
+			if ((tmpworld == null) || !(tmpworld instanceof MDWorld))
-			if ((tmpworld != null) && (tmpworld instanceof MDWorld))
 			{
-				final MDWorld world = (MDWorld) tmpworld;
+				return null;
-				switch (event)
+			}
+			final MDWorld world = (MDWorld) tmpworld;
+			
+			world.toyron.setIsRunning(true);
+			if (player.isInCombat() && (player.getTarget() != null) && player.getTarget().isMonster() && !((L2MonsterInstance) player.getTarget()).isAlikeDead())
+			{
+				if (world.toyron.calculateDistance(player.getTarget(), false, false) > 50)
 				{
-					case "toyron_follow":
+					world.toyron.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, player.getTarget().getLocation());
-					{
+					broadcastNpcSay(world.toyron, ChatType.NPC_GENERAL, NpcStringId.ENOUGH_OF_THIS_COME_AT_ME);
-						world.toyron.getAI().startFollow(player);
+				}
-						break;
+				else if (world.toyron.getTarget() != player.getTarget())
-					}
+				{
-					case "toyron_shout":
+					world.toyron.addDamageHate((L2Character) player.getTarget(), 0, 1000);
-					{
-						if (!world.toyron.canTarget(player))
-						{
-							cancelQuestTimer("toyron_shout", world.toyron, player);
-						}
-						broadcastNpcSay(world.toyron, ChatType.NPC_GENERAL, TOYRON_SHOUT[getRandom(2)]);
-						break;
-					}
-					case "spawn_thiefs_stage_1":
-					{
-						final List<L2Npc> thiefs = spawnGroup("thiefs", world.getInstanceId());
-						world.spawnedThiefs.addAll(thiefs);
-						for (L2Npc thief : world.spawnedThiefs)
-						{
-							thief.setIsRunning(true);
-							addAttackPlayerDesire(thief, player);
-							broadcastNpcSay(thief, ChatType.NPC_GENERAL, THIEF_SHOUT[getRandom(2)]);
-						}
-						break;
-					}
-					case "spawn_thiefs_stage_2":
-					{
-						final List<L2Npc> thiefs = spawnGroup("thiefs", world.getInstanceId());
-						world.spawnedThiefs.addAll(thiefs);
-						for (L2Npc thief : world.spawnedThiefs)
-						{
-							thief.setIsRunning(true);
-						}
-						break;
-					}
-					case "check_follow":
-					{
-						if (world.toyron.canTarget(player))
-						{
-							startQuestTimer("toyron_follow", 500, world.toyron, player);
-						}
-						break;
-					}
-					case "kill_thief":
-					{
-						npc.doDie(player);
-						startQuestTimer("toyron_follow", 500, world.toyron, player);
-						break;
-					}
 				}
 			}
+			else
+			{
+				world.toyron.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
+			}
+			
+			if (world.thiefSpawns.get(0).isDead() && world.thiefSpawns.get(1).isDead())
+			{
+				final QuestState qs = player.getQuestState(Q10327_IntruderWhoWantsTheBookOfGiants.class.getSimpleName());
+				if ((qs != null) && qs.isCond(2))
+				{
+					qs.setCond(3, true);
+					showOnScreenMsg(player, NpcStringId.TALK_TO_TOYRON_TO_RETURN_TO_THE_MUSEUM_LOBBY, ExShowScreenMessage.TOP_CENTER, 5000);
+				}
+			}
+			else
+			{
+				startQuestTimer("assist_player", 1000, world.toyron, player);
+			}
+		}
+		else if (event.equals("enter_instance"))
+		{
+			if (npc.getId() != PANTHEON)
+			{
+				return null;
+			}
+			enterInstance(player, new MDWorld(), "MuseumDungeon.xml", TEMPLATE_ID);
 		}
 		return super.onAdvEvent(event, npc, player);
 	}
 	
 	@Override
-	public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
+	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
+		final MDWorld world = (MDWorld) InstanceManager.getInstance().getWorld(npc.getInstanceId());
 		final QuestState qs = player.getQuestState(Q10327_IntruderWhoWantsTheBookOfGiants.class.getSimpleName());
-		final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId());
+		String htmltext = null;
-		final MDWorld world = (MDWorld) tmpworld;
 		
-		if ((qs != null) && qs.isCond(2))
+		if (qs.isCond(1))
 		{
-			if (world.killedThiefs >= 1)
+			if (world.deskSpawns.get(world.randomDesk) == npc)
 			{
-				qs.setCond(3, true);
+				qs.setCond(2);
-				showOnScreenMsg(player, NpcStringId.TALK_TO_TOYRON_TO_RETURN_TO_THE_MUSEUM_LOBBY, ExShowScreenMessage.TOP_CENTER, 4500);
+				giveItems(player, THE_WAR_OF_GODS_AND_GIANTS, 1);
+				world.thiefSpawns = spawnGroup("thiefs", world.getInstanceId());
+				showOnScreenMsg(player, NpcStringId.WATCH_OUT_YOU_ARE_BEING_ATTACKED, ExShowScreenMessage.TOP_CENTER, 5000);
+				startQuestTimer("assist_player", 2000, world.toyron, player);
+				htmltext = "desk_correct.html";
 			}
 			else
 			{
-				world.killedThiefs++;
+				htmltext = "desk_wrong.html";
 			}
 		}
-		return super.onKill(npc, player, isSummon);
+		return htmltext;
 	}
 	
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill)
 	{
-		final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId());
+		if (skill == null)
-		final MDWorld world = (MDWorld) tmpworld;
-		
-		if (skill != null)
 		{
-			broadcastNpcSay(world.toyron, ChatType.NPC_GENERAL, NpcStringId.ENOUGH_OF_THIS_COME_AT_ME);
+			((L2MonsterInstance) npc).setCurrentHp(npc.getCurrentHp() + damage);
-			world.toyron.reduceCurrentHp(1, npc, null);
+			showOnScreenMsg(attacker, NpcStringId.USE_YOUR_SKILL_ATTACKS_AGAINST_THEM, ExShowScreenMessage.TOP_CENTER, 5000);
-			npc.reduceCurrentHp(1, world.toyron, null);
-			startQuestTimer("kill_thief", 2500, npc, attacker);
-		}
-		else
-		{
-			showOnScreenMsg(attacker, NpcStringId.USE_YOUR_SKILL_ATTACKS_AGAINST_THEM, ExShowScreenMessage.TOP_CENTER, 4500);
 		}
 		return super.onAttack(npc, attacker, damage, isSummon, skill);
 	}
 	
-	@Override
-	public String onFirstTalk(L2Npc npc, L2PcInstance player)
-	{
-		final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId());
-		final QuestState qs = player.getQuestState(Q10327_IntruderWhoWantsTheBookOfGiants.class.getSimpleName());
-		final MDWorld world = (MDWorld) tmpworld;
-		String htmltext = null;
-		
-		if (qs == null)
-		{
-			htmltext = "33126.html";
-		}
-		else if (qs.isCond(1))
-		{
-			if (((npc.getObjectId() == world.bookDesk) && !qs.hasQuestItems(THE_WAR_OF_GODS_AND_GIANTS)))
-			{
-				qs.setCond(2);
-				giveItems(player, THE_WAR_OF_GODS_AND_GIANTS, 1);
-				showOnScreenMsg(player, NpcStringId.WATCH_OUT_YOU_ARE_BEING_ATTACKED, ExShowScreenMessage.TOP_CENTER, 4500);
-				startQuestTimer("spawn_thiefs_stage_1", 500, world.thief, player);
-				startQuestTimer("toyron_follow", 500, world.toyron, player);
-				htmltext = "33126-01.html";
-			}
-			else
-			{
-				htmltext = "33126-02.html";
-			}
-		}
-		else if (qs.isCond(2))
-		{
-			htmltext = "33126.html";
-		}
-		return htmltext;
-	}
-	
-	protected void spawnToyron(L2PcInstance player, MDWorld world)
-	{
-		if (world.toyron != null)
-		{
-			world.toyron.deleteMe();
-		}
-		world.toyron = (L2QuestGuardInstance) addSpawn(TOYRON, TOYRON_SPAWN, false, 0, true, world.getInstanceId());
-		world.toyron.setIsRunning(true);
-		world.toyron.setCanReturnToSpawnPoint(false);
-	}
-	
-	protected void checkStage(L2PcInstance player, MDWorld world)
-	{
-		final QuestState qs = player.getQuestState(Q10327_IntruderWhoWantsTheBookOfGiants.class.getSimpleName());
-		
-		if (qs != null)
-		{
-			if (qs.isCond(1))
-			{
-				showOnScreenMsg(player, NpcStringId.AMONG_THE_4_BOOKSHELVES_FIND_THE_ONE_CONTAINING_A_VOLUME_CALLED_THE_WAR_OF_GODS_AND_GIANTS, ExShowScreenMessage.TOP_CENTER, 4500);
-			}
-			else if (qs.isCond(2))
-			{
-				if (world.spawnedThiefs.isEmpty())
-				{
-					startQuestTimer("spawn_thiefs_stage_2", 500, world.thief, player);
-					startQuestTimer("toyron_follow", 500, world.toyron, player);
-				}
-				else
-				{
-					startQuestTimer("check_follow", 1000, world.toyron, player);
-				}
-			}
-		}
-	}
-	
-	protected void spawnDesks(L2PcInstance player, MDWorld world)
-	{
-		final List<L2Npc> desks = spawnGroup("desks", world.getInstanceId());
-		for (L2Npc desk : desks)
-		{
-			double point = Math.random();
-			int counter = 0;
-			if (((point <= 0.25) && (counter == 0)) || ((point > 0.25) && (point <= 0.5) && (counter == 1)) || ((point > 0.5) && (point <= 0.75) && (counter == 2)) || ((point > 0.75) && (counter == 3)))
-			{
-				world.bookDesk = desk.getObjectId();
-			}
-			++counter;
-		}
-		if ((world.bookDesk == 0) && (desks.size() > 0))
-		{
-			world.bookDesk = desks.get(0).getObjectId();
-		}
-	}
-	
 	@Override
 	public void onEnterInstance(L2PcInstance player, InstanceWorld world, boolean firstEntrance)
 	{
+		((MDWorld) world).toyron = (L2QuestGuardInstance) addSpawn(TOYRON, TOYRON_SPAWN_LOC, false, 0, false, world.getInstanceId());
+		((MDWorld) world).toyron.setSpawn(null);
 		if (firstEntrance)
 		{
 			world.addAllowed(player.getObjectId());
-			spawnToyron(player, (MDWorld) world);
+			((MDWorld) world).deskSpawns = spawnGroup("desks", world.getInstanceId());
-			spawnDesks(player, (MDWorld) world);
+			((MDWorld) world).randomDesk = getRandom(3) + 1;
 		}
 		teleportPlayer(player, START_LOC, world.getInstanceId());
-		checkStage(player, (MDWorld) world);
 	}
 }

trunk/dist/game/data/scripts/instances/MuseumDungeon/desk_correct.html

@@ -1,3 +1,3 @@
 <html><body>[Desk]:<br>
 You've found <font color="LEVEL">The War of Gods and Giants</font>. Take it back to Pantheon.
-</body></html>
+</body></html>

trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-04.htm

@@ -1,5 +1,5 @@
 <html><body>Pantheon:<br>
-You're still here<br1>
+You're still here.<br1>
 Go into the museum!<br>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest MuseumDungeon enter_instance">"On my way!"</Button>
 </body></html>

trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-05.htm

@@ -1,4 +1,5 @@
-<html><body>Pantheon:<br>
+<html><head><body>Pantheon:<br>
-I just saw suspicious intruders entering the Museum! I fear for the rare valuable articles inside the Museum. Please hurry into the Museum and deal with the intruders!<br>
+You've brought the book? Good! It must have been difficult to find it amongst all those others!<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest MuseumDungeon enter_instance">"Sure. I am going in."</Button>
+I hope you didn't get hurt either - Gallint may be a fool, but plenty have hurt themselves moving books around before him.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10327_IntruderWhoWantsTheBookOfGiants 32972-06.htm">"I had to fight someone!"</Button>
 </body></html>

trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-06.htm

@@ -1,5 +1,6 @@
-<html><head><body>Pantheon:<br>
+<html><body>Pantheon:<br>
-You've brought the book? Good! It must have been difficult to find it amongst all those others!<br>
+What? The thieves are getting more brash by the day!<br>
-I hope you didn't get hurt either - Gallint may be a fool, but plenty have hurt themselves moving books around before him.<br>
+Hmm... So, I wonder if the books related to Giants... are also related to Embryo. It's just speculation, but something worth considering.<br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10327_IntruderWhoWantsTheBookOfGiants 32972-07.htm">"I had to fight someone!"</Button>
+Now, I must apologize for placing you in harm's way. Please accept these Earrings - accessories such as these help protect you against magic!<br>
+Remember: you can wear up to two <font color="LEVEL">earrings</font> at a time. Purchase more from the <font color="LEVEL">General Merchant</font> if you wish.
 </body></html>

trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-07.htm

@@ -1,6 +1,4 @@
 <html><body>Pantheon:<br>
-What? The thieves are getting more brash by the day!<br>
+I'm still looking into things, friend. I'll let you know when I find anything.<br>
-Hmm... So, I wonder if the books related to Giants... are also related to Embryo. It's just speculation, but something worth considering.<br>
+(You have already completed this quest.)
-Now, I must apologize for placing you in harm's way. Please accept these Earrings - accessories such as these help protect you against magic!<br>
+</body></html>
-Remember: you can wear up to two <font color="LEVEL">earrings</font> at a time. Purchase more from the <font color="LEVEL">General Merchant</font> if you wish.
-</body></html>

trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-08.htm

@@ -1,4 +0,0 @@
-<html><body>Pantheon:<br>
-I'm still looking into things, friend. I'll let you know when I find anything<br>
-(You have already completed this quest.)
-</body></html>

trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-09.htm

@@ -1,4 +0,0 @@
-<html><body>Pantheon:<br>
-This mission can't be give to just anyone!<br>
-(Only characters below 20, who've completed the "Let's Respect Elders" quest, may start this quest.)
-</body></html>

trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java

@@ -22,7 +22,6 @@ import quests.Q10326_RespectYourElders.Q10326_RespectYourElders;
 
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.holders.ItemHolder;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
@@ -30,26 +29,27 @@ import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
 
 /**
- * @author Gladicek
+ * Intruder Who Wants the Book of Giants (10327)
+ * @author Mobius
  */
 public class Q10327_IntruderWhoWantsTheBookOfGiants extends Quest
 {
-	// Npcs
+	// Npc
 	private static final int PANTHEON = 32972;
 	// Items
 	private static final int THE_WAR_OF_GODS_AND_GIANTS = 17575;
-	private static final ItemHolder APPRENTICE_EARRING = new ItemHolder(112, 2);
+	private static final int APPRENTICE_EARRING = 112;
-	// Level Condition
+	// Other
 	private static final int MAX_LEVEL = 20;
 	
 	public Q10327_IntruderWhoWantsTheBookOfGiants()
 	{
-		super(10327, Q10327_IntruderWhoWantsTheBookOfGiants.class.getSimpleName(), "Intruder Who Wants the Book of Giants ");
+		super(10327, Q10327_IntruderWhoWantsTheBookOfGiants.class.getSimpleName(), "Intruder Who Wants the Book of Giants");
 		addStartNpc(PANTHEON);
 		addTalkId(PANTHEON);
 		registerQuestItems(THE_WAR_OF_GODS_AND_GIANTS);
-		addCondMaxLevel(MAX_LEVEL, "32972-09.htm");
+		addCondMaxLevel(MAX_LEVEL, "no_level.htm");
-		addCondCompletedQuest(Q10326_RespectYourElders.class.getSimpleName(), "32972-09.htm");
+		addCondCompletedQuest(Q10326_RespectYourElders.class.getSimpleName(), "no_level.htm");
 	}
 	
 	@Override
@@ -75,16 +75,15 @@ public class Q10327_IntruderWhoWantsTheBookOfGiants extends Quest
 				htmltext = event;
 				break;
 			}
-			case "32972-07.htm":
+			case "32972-06.htm":
 			{
 				if (qs.isCond(3))
 				{
-					showOnScreenMsg(player, NpcStringId.ACCESSORIES_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 4500);
+					giveAdena(player, 159, true);
-					giveAdena(player, 160, true);
+					giveItems(player, APPRENTICE_EARRING, 2);
-					giveItems(player, APPRENTICE_EARRING);
 					addExpAndSp(player, 7800, 5);
+					showOnScreenMsg(player, NpcStringId.ACCESSORIES_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 5000);
 					qs.exitQuest(false, true);
-					break;
 				}
 				break;
 			}
@@ -107,28 +106,23 @@ public class Q10327_IntruderWhoWantsTheBookOfGiants extends Quest
 			}
 			case State.STARTED:
 			{
-				if (qs.isCond(1))
+				if (qs.isCond(3))
-				{
-					htmltext = "32972-04.htm";
-					break;
-				}
-				else if (qs.isCond(2))
 				{
 					htmltext = "32972-05.htm";
-					break;
 				}
-				else if (qs.isCond(3))
+				else
 				{
-					htmltext = "32972-06.htm";
+					htmltext = "32972-04.htm";
-					break;
 				}
+				break;
 			}
 			case State.COMPLETED:
 			{
-				htmltext = "32972-08.htm";
+				htmltext = "32972-07.htm";
 				break;
 			}
 		}
+		
 		return htmltext;
 	}
 }

trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/no_level.htm

@@ -0,0 +1,4 @@
+<html><body>Pantheon:<br>
+This mission can't be give to just anyone!<br>
+(Only characters below 20, who have completed the "Respect Your Elders" quest, may start this quest.)
+</body></html>

trunk/dist/game/data/stats/npcs/23100-23199.xml

@@ -952,7 +952,7 @@
 			<skill id="14172" level="1" />
 			<skill id="4416" level="14" />
 		</skill_list>
-		<ai aggroRange="300" clanHelpRange="300" />
+		<ai aggroRange="2000" clanHelpRange="2000" />
 		<collision>
 			<radius normal="9" />
 			<height normal="22" />