Fixed some Pailaka Injured Dragon issues.

Contributed by Mathael.

trunk/dist/game/data/instances/Pailaka/PailakaInjuredDragon.xml

@@ -14,18 +14,17 @@
 			<npc id="32509" x="113745" y="-47565" z="-2593" heading="55710" />
 			<npc id="18660" x="105618" y="-41801" z="-1782" heading="34701" /> <!-- Latana -->
 		</group>
-		<group name="wall_1" spawnByDefault="false">
+		<group name="wall_200001" spawnByDefault="false">
 			<npc id="18635" x="122077" y="-46098" z="-2914" heading="5028" />
 			<npc id="18636" x="122023" y="-45769" z="-2910" heading="63593" />
 			<npc id="18642" x="122038" y="-45904" z="-2914" heading="771" />
 			<npc id="18636" x="122050" y="-45999" z="-2910" heading="1701" />
 			<npc id="18635" x="122019" y="-45634" z="-2908" heading="64841" />
 		</group>
-		<group name="wall_1_add" spawnByDefault="false">
+		<group name="wall_200001_add" spawnByDefault="false">
 			<npc id="18640" x="121931" y="-45844" z="-2902" heading="664" /> <!-- Varka Silenos Shaman -->
 		</group>
-
+		<group name="wall_200002" spawnByDefault="false">
-		<group name="wall_2" spawnByDefault="false">
 			<npc id="18653" x="115997" y="-46271" z="-2637" heading="63732" />
 			<npc id="18654" x="116056" y="-46341" z="-2630" heading="63791" />
 			<npc id="18646" x="116054" y="-46439" z="-2637" heading="63477" />
@@ -33,11 +32,11 @@
 			<npc id="18654" x="116084" y="-46587" z="-2651" heading="1141" />
 			<npc id="18653" x="116063" y="-46680" z="-2658" heading="4323" />
 		</group>
-		<group name="wall_2_add" spawnByDefault="false">
+		<group name="wall_200002_add" spawnByDefault="false">
 			<npc id="18648" x="115989" y="-46537" z="-2641" heading="1087" />
 			<npc id="18652" x="115984" y="-46471" z="-2635" heading="0" />
 		</group>
-		<group name="wall_3" spawnByDefault="false">
+		<group name="wall_200003" spawnByDefault="false">
 			<npc id="18653" x="116213" y="-50301" z="-2622" heading="50611" />
 			<npc id="18654" x="116155" y="-50420" z="-2635" heading="53262" />
 			<npc id="18646" x="116075" y="-50463" z="-2642" heading="53954" />
@@ -45,23 +44,23 @@
 			<npc id="18654" x="115952" y="-50528" z="-2646" heading="52507" />
 			<npc id="18653" x="115780" y="-50465" z="-2620" heading="52135" />
 		</group>
-		<group name="wall_3_add" spawnByDefault="false">
+		<group name="wall_200003_add" spawnByDefault="false">
 			<npc id="18648" x="116065" y="-50355" z="-2639" heading="53280" />
 			<npc id="18652" x="115988" y="-50389" z="-2641" heading="52342" />
 			<npc id="18648" x="115906" y="-50447" z="-2643" heading="54768" />
 		</group>
-		<group name="wall_4">
+		<group name="wall_200004">
 			<npc id="18635" x="117184" y="-51722" z="-2575" heading="55468" />
 			<npc id="18636" x="117097" y="-51774" z="-2577" heading="51453" />
 			<npc id="18642" x="117013" y="-51840" z="-2578" heading="55135" />
 			<npc id="18636" x="116926" y="-51876" z="-2580" heading="56322" />
 			<npc id="18635" x="116876" y="-51937" z="-2572" heading="59301" />
 		</group>
-		<group name="wall_4_add" spawnByDefault="false">
+		<group name="wall_200004_add" spawnByDefault="false">
 			<npc id="18648" x="117060" y="-51674" z="-2580" heading="57161" />
 			<npc id="18648" x="116918" y="-51781" z="-2582" heading="57343" />
 		</group>
-		<group name="wall_5" spawnByDefault="false">
+		<group name="wall_200005" spawnByDefault="false">
 			<npc id="18649" x="111606" y="-43746" z="-2633" heading="62267" />
 			<npc id="18650" x="111602" y="-43846" z="-2638" heading="63427" />
 			<npc id="18649" x="111616" y="-43922" z="-2635" heading="60699" />
@@ -69,13 +68,13 @@
 			<npc id="18649" x="111614" y="-44071" z="-2642" heading="63794" />
 			<npc id="18650" x="111619" y="-44129" z="-2650" heading="2365" />
 		</group>
-		<group name="wall_5_add" spawnByDefault="false">
+		<group name="wall_200005_add" spawnByDefault="false">
-			<npc id="18652" x="111331" y="-43648" z="-2608" heading="62842" />
+			<npc id="18652" x="111499" y="-43867" z="-2619" heading="1338" />
-			<npc id="18648" x="111284" y="-43780" z="-2592" heading="61754" />
+			<npc id="18648" x="111539" y="-43743" z="-2623" heading="62952" />
-			<npc id="18648" x="111260" y="-43897" z="-2586" heading="63902" />
+			<npc id="18648" x="111522" y="-43965" z="-2616" heading="63399" />
-			<npc id="18652" x="111257" y="-44014" z="-2590" heading="539" />
+			<npc id="18652" x="111514" y="-44085" z="-2625" heading="379" />
 		</group>
-		<group name="wall_6" spawnByDefault="false">
+		<group name="wall_200006" spawnByDefault="false">
 			<npc id="18657" x="109272" y="-45665" z="-2210" heading="4731" />
 			<npc id="18655" x="109326" y="-45781" z="-2235" heading="5945" />
 			<npc id="18657" x="109393" y="-45893" z="-2253" heading="5549" />
@@ -83,12 +82,12 @@
 			<npc id="18657" x="109516" y="-46032" z="-2268" heading="4362" />
 			<npc id="18655" x="109584" y="-46100" z="-2263" heading="9356" />
 		</group>
-		<group name="wall_6_add" spawnByDefault="false">
+		<group name="wall_200006_add" spawnByDefault="false">
 			<npc id="18652" x="109442" y="-46077" z="-2256" heading="8191" />
 			<npc id="18648" x="109298" y="-45890" z="-2232" heading="7391" />
 			<npc id="18652" x="109373" y="-45985" z="-2250" heading="7882" />
 		</group>
-		<group name="wall_7">
+		<group name="wall_200007">
 			<npc id="18653" x="116432" y="-55729" z="-2441" heading="65250" />
 			<npc id="18654" x="116499" y="-55822" z="-2449" heading="63477" />
 			<npc id="18646" x="116503" y="-55918" z="-2449" heading="589" />
@@ -96,12 +95,12 @@
 			<npc id="18654" x="116481" y="-56108" z="-2437" heading="62531" />
 			<npc id="18653" x="116433" y="-56194" z="-2432" heading="927" />
 		</group>
-		<group name="wall_7_add" spawnByDefault="false">
+		<group name="wall_200007_add" spawnByDefault="false">
 			<npc id="18648" x="116348" y="-56103" z="-2460" heading="63868" />
 			<npc id="18652" x="116394" y="-55968" z="-2465" heading="2634" />
 			<npc id="18648" x="116398" y="-55821" z="-2464" heading="664" />
 		</group>
-		<group name="wall_8" spawnByDefault="false">
+		<group name="wall_200008" spawnByDefault="false">
 			<npc id="18655" x="108892" y="-41031" z="-2204" heading="64381" />
 			<npc id="18657" x="108888" y="-41114" z="-2195" heading="64256" />
 			<npc id="18655" x="108886" y="-41185" z="-2196" heading="64884" />
@@ -110,19 +109,19 @@
 			<npc id="18657" x="108869" y="-41376" z="-2163" heading="2280" />
 			<npc id="18655" x="108877" y="-41436" z="-2144" heading="64321" />
 		</group>
-		<group name="wall_8_add" spawnByDefault="false">
+		<group name="wall_200008_add" spawnByDefault="false">
 			<npc id="18652" x="108797" y="-41101" z="-2176" heading="62980" />
 			<npc id="18652" x="108819" y="-41198" z="-2183" heading="0" />
 			<npc id="18652" x="108811" y="-41293" z="-2170" heading="473" />
 		</group>
-		<group name="wall_9">
+		<group name="wall_200009">
 			<npc id="18650" x="110205" y="-39800" z="-1840" heading="46882" />
 			<npc id="18649" x="110110" y="-39799" z="-1850" heading="46038" />
 			<npc id="18659" x="110023" y="-39802" z="-1852" heading="48655" />
 			<npc id="18649" x="109955" y="-39811" z="-1855" heading="48647" />
 			<npc id="18650" x="109874" y="-39833" z="-1837" heading="48408" />
 		</group>
-		<group name="wall_9_add" spawnByDefault="false">
+		<group name="wall_200009_add" spawnByDefault="false">
 			<npc id="18652" x="109965" y="-39685" z="-1815" heading="48384" />
 			<npc id="18652" x="110087" y="-39710" z="-1827" heading="48270" />
 		</group>

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

@@ -19,6 +19,7 @@ package instances.PailakaInjuredDragon;
 import java.util.HashMap;
 import java.util.List;
 
+import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -26,6 +27,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 import com.l2jmobius.gameserver.model.instancezone.Instance;
 import com.l2jmobius.gameserver.model.quest.QuestState;
+import com.l2jmobius.gameserver.model.spawns.SpawnGroup;
 import com.l2jmobius.gameserver.model.zone.L2ZoneType;
 
 import instances.AbstractInstance;
@@ -61,33 +63,20 @@ public class PailakaInjuredDragon extends AbstractInstance
 	// Usable Quest Items
 	private static final int SHIELD_POTION = 13032;
 	private static final int HEAL_POTION = 13033;
-	// Zones
-	private static final int[] ZONES =
-	{
-		200001,
-		200002,
-		200003,
-		200004,
-		200005,
-		200006,
-		200007,
-		200008,
-		200009
-	};
 	// Walls
-	private final HashMap<Integer, MonsterWall> WALLS = new HashMap<>();
+	private static final HashMap<Integer, Location> ZONES_TELEPORTS = new HashMap<>();
-	private static final Location[] ZONES_TELEPORTS =
+	static
 	{
-		new Location(122452, -45808, -2981),
+		ZONES_TELEPORTS.put(200001, new Location(122452, -45808, -2981));
-		new Location(116610, -46418, -2641),
+		ZONES_TELEPORTS.put(200002, new Location(116610, -46418, -2641));
-		new Location(116237, -50961, -2636),
+		ZONES_TELEPORTS.put(200003, new Location(116237, -50961, -2636));
-		new Location(117384, -52141, -2544),
+		ZONES_TELEPORTS.put(200004, new Location(117384, -52141, -2544));
-		new Location(112169, -44004, -2707),
+		ZONES_TELEPORTS.put(200005, new Location(112169, -44004, -2707));
-		new Location(109460, -45869, -2265),
+		ZONES_TELEPORTS.put(200006, new Location(109460, -45869, -2265));
-		new Location(117111, -55927, -2380),
+		ZONES_TELEPORTS.put(200007, new Location(117111, -55927, -2380));
-		new Location(109274, -41277, -2271),
+		ZONES_TELEPORTS.put(200008, new Location(109274, -41277, -2271));
-		new Location(110023, -40263, -2001)
+		ZONES_TELEPORTS.put(200009, new Location(110023, -40263, -2001));
-	};
+	}
 	// Skill
 	private static final SkillHolder LATANA_PRESENTATION_SKILL = new SkillHolder(5759, 1);
 	// Misc
@@ -97,11 +86,10 @@ public class PailakaInjuredDragon extends AbstractInstance
 	{
 		addInstanceEnterId(TEMPLATE_ID);
 		addStartNpc(KETRA_ORC_SHAMAN);
-		addKillId(ANTELOPE1, ANTELOPE2, ANTELOPE3, GENERAL, GREAT_MAGUS, PROPHET, ELITE_GUARD, COMMANDER, OFFICER, RECRUIT, FOOTMAN, WARRIOR, PROPHET_GUARD, HEAD_GUARD, LATANA);
+		addKillId(ANTELOPE1, ANTELOPE2, ANTELOPE3, GENERAL, GREAT_MAGUS, PROPHET, ELITE_GUARD, COMMANDER, OFFICER, RECRUIT, FOOTMAN, WARRIOR, PROPHET_GUARD, HEAD_GUARD, SHAMAN, CHIEF_PRIEST, GRAND_PRIEST, LATANA);
-		addAttackId(SHAMAN, GRAND_PRIEST, CHIEF_PRIEST);
+		addSpawnId(LATANA);
-		addSpawnId(LATANA, SHAMAN, CHIEF_PRIEST, GRAND_PRIEST);
 		addAggroRangeEnterId(LATANA);
-		addEnterZoneId(ZONES);
+		addEnterZoneId(ZONES_TELEPORTS.keySet());
 		addInstanceCreatedId(TEMPLATE_ID);
 	}
 	
@@ -161,29 +149,15 @@ public class PailakaInjuredDragon extends AbstractInstance
 	{
 		for (int i = 0; i < 9; i++)
 		{
-			final int zoneId = ZONES[i];
+			final int zoneId = 200000 + (i + 1);
-			final List<L2Npc> npcs = instance.spawnGroup("wall_" + (i + 1));
+			final List<L2Npc> npcs = instance.spawnGroup("wall_" + zoneId);
 			npcs.forEach(k -> k.setScriptValue(zoneId));
-			WALLS.put(zoneId, new MonsterWall((i + 1), zoneId, npcs, ZONES_TELEPORTS[i]));
+			instance.getParameters().set("wall_" + zoneId, npcs.size());
 		}
+		
 		super.onInstanceCreated(instance, player);
 	}
 	
-	@Override
-	public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
-	{
-		final MonsterWall wall = WALLS.get(npc.getScriptValue());
-		if ((wall != null) && !wall.isUnlocked())
-		{
-			if (wall.getMobs().stream().filter(mob -> !mob.isDead()).count() == 0)
-			{
-				wall.unlock();
-			}
-			attacker.teleToLocation(wall.getZoneTeleportBack());
-		}
-		return super.onAttack(npc, attacker, damage, isSummon);
-	}
-	
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
@@ -209,12 +183,27 @@ public class PailakaInjuredDragon extends AbstractInstance
 				}
 			}
 			
-			if ((npcId != ANTELOPE1) && (npcId != ANTELOPE2) && (npcId != ANTELOPE3))
+			if ((npcId != ANTELOPE1) && (npcId != ANTELOPE2) && (npcId != ANTELOPE3) && (npcId != SHAMAN) && (npcId != CHIEF_PRIEST) && (npcId != GRAND_PRIEST))
 			{
-				final MonsterWall wall = WALLS.get(npc.getScriptValue());
+				final Instance world = npc.getInstanceWorld();
-				if ((wall != null) && !wall.isUnlocked() && !wall.isPriestSpawned())
+				final int zoneId = npc.getScriptValue();
+				int killcount = world.getParameters().getInt("wall_" + zoneId);
+				killcount--;
+				world.setParameter("wall_" + zoneId, killcount);
+				
+				if (killcount <= 0)
 				{
-					wall.spawnPriest(npc.getInstanceWorld());
+					world.getSpawnGroup("wall_" + zoneId).forEach(SpawnGroup::despawnAll);
+					world.getSpawnGroup("wall_" + zoneId + "_add").forEach(SpawnGroup::despawnAll);
+				}
+				else if (!world.getParameters().getBoolean("wall_" + zoneId + "_add", false))
+				{
+					world.setParameter("wall_" + zoneId + "_add", true);
+					world.spawnGroup("wall_" + zoneId + "_add").forEach(mage ->
+					{
+						mage.setTarget(killer);
+						mage.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, killer);
+					});
 				}
 			}
 		}
@@ -225,10 +214,6 @@ public class PailakaInjuredDragon extends AbstractInstance
 	public String onSpawn(L2Npc npc)
 	{
 		npc.setIsImmobilized(true);
-		if (npc.getId() != LATANA)
-		{
-			npc.setIsInvul(true);
-		}
 		return super.onSpawn(npc);
 	}
 	
@@ -240,75 +225,15 @@ public class PailakaInjuredDragon extends AbstractInstance
 			return super.onEnterZone(character, zone);
 		}
 		
-		final MonsterWall wall = WALLS.get(zone.getId());
+		final Instance world = character.getInstanceWorld();
-		if ((wall != null) && !wall.isUnlocked())
+		if (world.getParameters().getInt("wall_" + zone.getId()) > 0)
 		{
-			if ((wall.getMobs().stream().filter(mob -> !mob.isDead()).count() > 0) || wall.isPriestSpawned())
+			character.teleToLocation(ZONES_TELEPORTS.get(zone.getId()));
-			{
-				character.teleToLocation(wall.getZoneTeleportBack());
-			}
 		}
 		
 		return super.onEnterZone(character, zone);
 	}
 	
-	private class MonsterWall
-	{
-		private final int _wallNumber;
-		private final int _zoneId;
-		private boolean _unlocked;
-		private boolean _priestSpawned;
-		private final List<L2Npc> _mobs;
-		private List<L2Npc> _priests;
-		private final Location _zoneTeleportBack;
-		
-		MonsterWall(int wallNumber, int zoneId, List<L2Npc> mobs, Location loc)
-		{
-			_unlocked = false;
-			_priestSpawned = false;
-			_wallNumber = wallNumber;
-			_zoneId = zoneId;
-			_mobs = mobs;
-			_priests = null;
-			_zoneTeleportBack = loc;
-		}
-		
-		boolean isUnlocked()
-		{
-			return _unlocked;
-		}
-		
-		boolean isPriestSpawned()
-		{
-			return _priestSpawned;
-		}
-		
-		List<L2Npc> getMobs()
-		{
-			return _mobs;
-		}
-		
-		Location getZoneTeleportBack()
-		{
-			return _zoneTeleportBack;
-		}
-		
-		void spawnPriest(Instance instance)
-		{
-			_priests = instance.spawnGroup("wall_" + _wallNumber + "_add");
-			_priests.forEach(k -> k.setScriptValue(_zoneId));
-			_priestSpawned = true;
-		}
-		
-		void unlock()
-		{
-			_unlocked = true;
-			_priestSpawned = false;
-			_priests.forEach(L2Npc::deleteMe);
-			_mobs.forEach(L2Npc::deleteMe);
-		}
-	}
-	
 	public static void main(String[] args)
 	{
 		new PailakaInjuredDragon();

trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/32512-02.html

@@ -3,4 +3,4 @@ You have done it!<br>
 You have lifted the curse! I no longer feel the taint of darkness upon our Atlar of Fire!<br>
 Warrior, I wish you could stay heer with us, but our shaman decrees that you must leave...<br>
 Here is a Scroll of Escape that he has prepared for you. Use it to return safely to your world.
-</body></html>
+</body></html>

trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/32512-03.html

@@ -1,3 +1,3 @@
 <html><body>Ketra Orc Supporter:<br>
 Use the Scroll of Escape that I gave you to return to your world.
-</body></html>
+</body></html>

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

@@ -306,6 +306,17 @@ public class Q00144_PailakaInjuredDragon extends Quest
 		return htmltext;
 	}
 	
+	@Override
+	public String onFirstTalk(L2Npc npc, L2PcInstance player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
+		{
+			return getNoQuestMsg(player);
+		}
+		return qs.getState() == State.COMPLETED ? "32512-03.html" : "32512-01.html";
+	}
+	
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{