From 0843ed261feadd6317fabe8b2e6fe46220cc696f Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 24 Jul 2015 20:59:00 +0000
Subject: [PATCH] Reworked Dragon Valley NPC AIs.

---
 .../ai/individual/MercenaryCaptain.java       | 17 ++++++++++-------
 .../game/data/scripts/ai/individual/Namo.java | 19 +++++++++++--------
 .../data/scripts/ai/individual/Rakun.java     | 19 +++++++++++--------
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java b/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java
index ecba6864b3..7038533c01 100644
--- a/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java
+++ b/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java
@@ -21,14 +21,14 @@ package ai.individual;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.enums.ChatType;
+import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.NpcStringId;
 
 /**
  * Mercenary Captain AI.
- * @author Gladicek
- * @Changed by Stayway
+ * @author Mobius
  */
 public final class MercenaryCaptain extends AbstractNpcAI
 {
@@ -38,13 +38,13 @@ public final class MercenaryCaptain extends AbstractNpcAI
 	private MercenaryCaptain()
 	{
 		super(MercenaryCaptain.class.getSimpleName(), "ai/individual");
-		addSpawnId(MERCENARY_CAPTAIN);
+		addSeeCreatureId(MERCENARY_CAPTAIN);
 	}
 	
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("SPAM_TEXT") && (npc != null))
+		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.THE_SOUTHERN_PART_OF_DRAGON_VALLEY_IS_MUCH_MORE_DANGEROUS_THAN_THE_NORTH_BE_CAREFUL, 1000);
 		}
@@ -52,10 +52,13 @@ public final class MercenaryCaptain extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSpawn(L2Npc npc)
+	public String onSeeCreature(L2Npc npc, L2Character creature, boolean isSummon)
 	{
-		startQuestTimer("SPAM_TEXT", 12000, npc, null, true);
-		return super.onSpawn(npc);
+		if (creature.isPlayer())
+		{
+			startQuestTimer("BROADCAST_TEXT", 3000, npc, null, true);
+		}
+		return super.onSeeCreature(npc, creature, isSummon);
 	}
 	
 	public static void main(String[] args)
diff --git a/trunk/dist/game/data/scripts/ai/individual/Namo.java b/trunk/dist/game/data/scripts/ai/individual/Namo.java
index 0a80beced1..444a58a061 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Namo.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Namo.java
@@ -21,14 +21,14 @@ package ai.individual;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.enums.ChatType;
+import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.NpcStringId;
 
 /**
- * Mercenary Captain AI.
- * @author Gladicek
- * @Changed by Stayway
+ * Namo AI
+ * @author Mobius
  */
 public final class Namo extends AbstractNpcAI
 {
@@ -38,13 +38,13 @@ public final class Namo extends AbstractNpcAI
 	private Namo()
 	{
 		super(Namo.class.getSimpleName(), "ai/individual");
-		addSpawnId(NAMO);
+		addSeeCreatureId(NAMO);
 	}
 	
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("SPAM_TEXT") && (npc != null))
+		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT, 1000);
 		}
@@ -52,10 +52,13 @@ public final class Namo extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSpawn(L2Npc npc)
+	public String onSeeCreature(L2Npc npc, L2Character creature, boolean isSummon)
 	{
-		startQuestTimer("SPAM_TEXT", 12000, npc, null, true);
-		return super.onSpawn(npc);
+		if (creature.isPlayer())
+		{
+			startQuestTimer("BROADCAST_TEXT", 3000, npc, null, true);
+		}
+		return super.onSeeCreature(npc, creature, isSummon);
 	}
 	
 	public static void main(String[] args)
diff --git a/trunk/dist/game/data/scripts/ai/individual/Rakun.java b/trunk/dist/game/data/scripts/ai/individual/Rakun.java
index acc9c5534e..08a9abfb6e 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Rakun.java
+++ b/trunk/dist/game/data/scripts/ai/individual/Rakun.java
@@ -21,14 +21,14 @@ package ai.individual;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.enums.ChatType;
+import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.NpcStringId;
 
 /**
- * Mercenary Captain AI.
- * @author Gladicek
- * @Changed by Stayway
+ * Rakun AI.
+ * @author Mobius
  */
 public final class Rakun extends AbstractNpcAI
 {
@@ -38,13 +38,13 @@ public final class Rakun extends AbstractNpcAI
 	private Rakun()
 	{
 		super(Rakun.class.getSimpleName(), "ai/individual");
-		addSpawnId(RAKUN);
+		addSeeCreatureId(RAKUN);
 	}
 	
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("SPAM_TEXT") && (npc != null))
+		if (event.equals("BROADCAST_TEXT") && (npc != null))
 		{
 			broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.THIS_PLACE_SWARMS_WITH_DRAGONS_BY_DAY_AND_UNDEAD_BY_NIGHT, 1000);
 		}
@@ -52,10 +52,13 @@ public final class Rakun extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onSpawn(L2Npc npc)
+	public String onSeeCreature(L2Npc npc, L2Character creature, boolean isSummon)
 	{
-		startQuestTimer("SPAM_TEXT", 12000, npc, null, true);
-		return super.onSpawn(npc);
+		if (creature.isPlayer())
+		{
+			startQuestTimer("BROADCAST_TEXT", 3000, npc, null, true);
+		}
+		return super.onSeeCreature(npc, creature, isSummon);
 	}
 	
 	public static void main(String[] args)