From df77a7229544cc9308311a5252f83b4ef1f46181 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 28 Apr 2016 19:44:21 +0000
Subject: [PATCH] Moved Talking Island scripts to zones package.
---
trunk/dist/game/data/scripts.cfg | 67 ++++++++---------
.../data/scripts/ai/individual/Galad.java | 63 ----------------
.../scripts/ai/individual/GuardSoldier.java | 68 -----------------
.../data/scripts/ai/individual/Holly.java | 67 -----------------
.../data/scripts/ai/individual/Luderic.java | 73 -------------------
.../scripts/ai/individual/TomaJunior.java | 68 -----------------
.../TalkingIsland}/Apprentice/33124.html | 0
.../TalkingIsland}/Apprentice/Apprentice.java | 6 +-
.../AwakeningMaster/33397-01.html | 0
.../AwakeningMaster/33397-no.htm | 0
.../AwakeningMaster/33397-no_class.htm | 0
.../TalkingIsland}/AwakeningMaster/33397.html | 0
.../AwakeningMaster/33398-01.html | 0
.../AwakeningMaster/33398-no.htm | 0
.../AwakeningMaster/33398-no_class.htm | 0
.../TalkingIsland}/AwakeningMaster/33398.html | 0
.../AwakeningMaster/33399-01.html | 0
.../AwakeningMaster/33399-no.htm | 0
.../AwakeningMaster/33399-no_class.htm | 0
.../TalkingIsland}/AwakeningMaster/33399.html | 0
.../AwakeningMaster/33400-01.html | 0
.../AwakeningMaster/33400-no.htm | 0
.../AwakeningMaster/33400-no_class.htm | 0
.../TalkingIsland}/AwakeningMaster/33400.html | 0
.../AwakeningMaster/33401-01.html | 0
.../AwakeningMaster/33401-no.htm | 0
.../AwakeningMaster/33401-no_class.htm | 0
.../TalkingIsland}/AwakeningMaster/33401.html | 0
.../AwakeningMaster/33402-01.html | 0
.../AwakeningMaster/33402-no.htm | 0
.../AwakeningMaster/33402-no_class.htm | 0
.../TalkingIsland}/AwakeningMaster/33402.html | 0
.../AwakeningMaster/33403-01.html | 0
.../AwakeningMaster/33403-no.htm | 0
.../AwakeningMaster/33403-no_class.htm | 0
.../TalkingIsland}/AwakeningMaster/33403.html | 0
.../AwakeningMaster/33404-01.html | 0
.../AwakeningMaster/33404-no.htm | 0
.../AwakeningMaster/33404-no_class.htm | 0
.../TalkingIsland}/AwakeningMaster/33404.html | 0
.../AwakeningMaster/AwakeningMaster.java | 4 +-
.../TalkingIsland}/Banette.java | 4 +-
.../TalkingIsland}/Bink.java | 4 +-
.../TalkingIsland}/Devno.java | 4 +-
.../TalkingIsland}/DrillSergeant.java | 4 +-
.../TalkingIsland}/Eleve.java | 4 +-
.../TalkingIsland}/Gagabu.java | 4 +-
.../TalkingIsland}/Handermonkey.java | 4 +-
.../TalkingIsland}/Hardin/33870-01.html | 0
.../TalkingIsland}/Hardin/33870-02.html | 0
.../TalkingIsland}/Hardin/33870-03.html | 0
.../TalkingIsland}/Hardin/Hardin.java | 4 +-
.../HarnakUnderground/HarnakUnderground.java | 4 +-
.../HarnakUnderground/no_level.htm | 0
.../HarnakUnderground/non_awakened.htm | 0
.../TalkingIsland}/Heymond.java | 4 +-
.../TalkingIsland}/Karonf.java | 4 +-
.../TalkingIsland}/Lumi.java | 4 +-
.../TalkingIsland}/Mahram.java | 4 +-
.../TalkingIsland}/Mai.java | 4 +-
.../TalkingIsland}/MarinSmith.java | 4 +-
.../Milia => zones/TalkingIsland}/Milia.java | 4 +-
.../TalkingIsland}/MonkOfChaos/33880-1.html | 0
.../TalkingIsland}/MonkOfChaos/33880-2.html | 0
.../TalkingIsland}/MonkOfChaos/33880.html | 0
.../MonkOfChaos/MonkOfChaos.java | 4 +-
.../TalkingIsland}/MonkOfChaos/canceled.html | 0
.../TalkingIsland}/MonkOfChaos/no-adena.html | 0
.../TalkingIsland}/MonkOfChaos/no-cancel.html | 0
.../TalkingIsland}/MonkOfChaos/no-learn.html | 0
.../MonkOfChaos/no-subclass.html | 0
.../TalkingIsland}/Oris.java | 4 +-
.../TalkingIsland}/Pantheon/32972-1.html | 0
.../Pantheon/32972-noteleport.html | 0
.../TalkingIsland}/Pantheon/32972.html | 0
.../TalkingIsland}/Pantheon/Pantheon.java | 4 +-
.../TalkingIsland}/Raina/33491-01.html | 0
.../TalkingIsland}/Raina/33491-02.html | 0
.../TalkingIsland}/Raina/33491-03.html | 0
.../TalkingIsland}/Raina/33491-04.html | 0
.../TalkingIsland}/Raina/33491-05.html | 0
.../TalkingIsland}/Raina/33491.html | 0
.../TalkingIsland}/Raina/Raina.java | 4 +-
.../TalkingIsland}/Raina/addConfirm.html | 0
.../TalkingIsland}/Raina/addConfirm2.html | 0
.../Raina/addDualClassErtheia.html | 0
.../Raina/addDualClassErtheiaFailed.html | 0
.../Raina/addDualClassErtheiaList.html | 0
.../TalkingIsland}/Raina/addFailed.html | 0
.../TalkingIsland}/Raina/addSuccess.html | 0
.../TalkingIsland}/Raina/inventoryLimit.html | 0
.../TalkingIsland}/Raina/noCertificate.html | 0
.../TalkingIsland}/Raina/noErtheia.html | 0
.../TalkingIsland}/Raina/noQuest.html | 0
.../TalkingIsland}/Raina/noSubChange.html | 0
.../TalkingIsland}/Raina/noSummon.html | 0
.../TalkingIsland}/Raina/noTransform.html | 0
.../TalkingIsland}/Raina/onlyErtheia.html | 0
.../TalkingIsland}/Raina/reawaken.html | 0
.../TalkingIsland}/Raina/reawakenCancel.html | 0
.../Raina/reawakenClassList.html | 0
.../TalkingIsland}/Raina/reawakenList.html | 0
.../TalkingIsland}/Raina/reawakenNoDual.html | 0
.../TalkingIsland}/Raina/reawakenNoFee.html | 0
.../TalkingIsland}/Raina/reawakenSuccess.html | 0
.../Raina/removeSubclassList.html | 0
.../TalkingIsland}/Raina/subclassList.html | 0
.../Raina/subclassRemoveList.html | 0
.../TalkingIsland}/Shannon.java | 4 +-
.../TalkingIsland}/Sodian.java | 4 +-
.../TalkingIsland}/Stiller.java | 4 +-
.../TalkingIsland}/Theodore.java | 4 +-
.../TalkingIsland}/TrainingGolem.java | 4 +-
.../TalkingIsland}/TrainningSoldier.java | 4 +-
.../TalkingIsland/YeSagiraGuards.java} | 10 +--
.../YeSagiraTeleporter/33180.html | 0
.../YeSagiraTeleporter.java | 4 +-
117 files changed, 96 insertions(+), 438 deletions(-)
delete mode 100644 trunk/dist/game/data/scripts/ai/individual/Galad.java
delete mode 100644 trunk/dist/game/data/scripts/ai/individual/GuardSoldier.java
delete mode 100644 trunk/dist/game/data/scripts/ai/individual/Holly.java
delete mode 100644 trunk/dist/game/data/scripts/ai/individual/Luderic.java
delete mode 100644 trunk/dist/game/data/scripts/ai/individual/TomaJunior.java
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Apprentice/33124.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Apprentice/Apprentice.java (91%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33397-01.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33397-no.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33397-no_class.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33397.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33398-01.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33398-no.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33398-no_class.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33398.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33399-01.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33399-no.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33399-no_class.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33399.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33400-01.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33400-no.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33400-no_class.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33400.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33401-01.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33401-no.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33401-no_class.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33401.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33402-01.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33402-no.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33402-no_class.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33402.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33403-01.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33403-no.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33403-no_class.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33403.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33404-01.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33404-no.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33404-no_class.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/33404.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/AwakeningMaster/AwakeningMaster.java (95%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Banette.java (92%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Bink.java (91%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Devno.java (93%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/DrillSergeant.java (92%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Eleve.java (92%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Gagabu.java (91%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Handermonkey.java (91%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Hardin/33870-01.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Hardin/33870-02.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Hardin/33870-03.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Hardin/Hardin.java (91%)
rename trunk/dist/game/data/scripts/ai/{npc/Teleports => zones/TalkingIsland}/HarnakUnderground/HarnakUnderground.java (89%)
rename trunk/dist/game/data/scripts/ai/{npc/Teleports => zones/TalkingIsland}/HarnakUnderground/no_level.htm (100%)
rename trunk/dist/game/data/scripts/ai/{npc/Teleports => zones/TalkingIsland}/HarnakUnderground/non_awakened.htm (100%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Heymond.java (91%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Karonf.java (92%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Lumi.java (92%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Mahram.java (91%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Mai.java (91%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/MarinSmith.java (91%)
rename trunk/dist/game/data/scripts/ai/{npc/Milia => zones/TalkingIsland}/Milia.java (92%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/MonkOfChaos/33880-1.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/MonkOfChaos/33880-2.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/MonkOfChaos/33880.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/MonkOfChaos/MonkOfChaos.java (94%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/MonkOfChaos/canceled.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/MonkOfChaos/no-adena.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/MonkOfChaos/no-cancel.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/MonkOfChaos/no-learn.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/MonkOfChaos/no-subclass.html (100%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Oris.java (91%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Pantheon/32972-1.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Pantheon/32972-noteleport.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Pantheon/32972.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Pantheon/Pantheon.java (92%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/33491-01.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/33491-02.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/33491-03.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/33491-04.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/33491-05.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/33491.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/Raina.java (96%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/addConfirm.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/addConfirm2.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/addDualClassErtheia.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/addDualClassErtheiaFailed.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/addDualClassErtheiaList.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/addFailed.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/addSuccess.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/inventoryLimit.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/noCertificate.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/noErtheia.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/noQuest.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/noSubChange.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/noSummon.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/noTransform.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/onlyErtheia.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/reawaken.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/reawakenCancel.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/reawakenClassList.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/reawakenList.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/reawakenNoDual.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/reawakenNoFee.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/reawakenSuccess.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/removeSubclassList.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/subclassList.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc => zones/TalkingIsland}/Raina/subclassRemoveList.html (100%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Shannon.java (91%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Sodian.java (91%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Stiller.java (91%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/Theodore.java (91%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/TrainingGolem.java (88%)
rename trunk/dist/game/data/scripts/ai/{individual => zones/TalkingIsland}/TrainningSoldier.java (93%)
rename trunk/dist/game/data/scripts/ai/{group_template/YeSagira.java => zones/TalkingIsland/YeSagiraGuards.java} (86%)
rename trunk/dist/game/data/scripts/ai/{npc/Teleports => zones/TalkingIsland}/YeSagiraTeleporter/33180.html (100%)
rename trunk/dist/game/data/scripts/ai/{npc/Teleports => zones/TalkingIsland}/YeSagiraTeleporter/YeSagiraTeleporter.java (92%)
diff --git a/trunk/dist/game/data/scripts.cfg b/trunk/dist/game/data/scripts.cfg
index 5189bee7f2..c62151b6a8 100644
--- a/trunk/dist/game/data/scripts.cfg
+++ b/trunk/dist/game/data/scripts.cfg
@@ -50,7 +50,6 @@ ai/group_template/SummonPc.java
ai/group_template/TurekOrcs.java
ai/group_template/WarriorFishingBlock.java
ai/group_template/Wasteland.java
-ai/group_template/YeSagira.java
# Individual
ai/individual/Antharas/Antharas.java
@@ -60,38 +59,20 @@ ai/individual/Venom/Venom.java
ai/individual/Anais.java
ai/individual/Ballista.java
ai/individual/Beleth.java
-ai/individual/Banette.java
-ai/individual/Bink.java
ai/individual/CrimsonHatuOtis.java
ai/individual/Core.java
-ai/individual/Devno.java
ai/individual/DarkWaterDragon.java
ai/individual/DivineBeast.java
-ai/individual/DrillSergeant.java
-ai/individual/Eleve.java
ai/individual/Epidos.java
ai/individual/EvasGiftBox.java
ai/individual/FrightenedRagnaOrc.java
-ai/individual/Gagabu.java
-ai/individual/Galad.java
ai/individual/Gordon.java
ai/individual/GraveRobbers.java
-ai/individual/GuardSoldier.java
-ai/individual/Handermonkey.java
-ai/individual/Heymond.java
-ai/individual/Holly.java
-ai/individual/Karonf.java
ai/individual/Lailly.java
ai/individual/LeopardDragonHachling.java
-ai/individual/Luderic.java
-ai/individual/Lumi.java
-ai/individual/Mahram.java
-ai/individual/Mai.java
-ai/individual/MarinSmith.java
ai/individual/MercenaryCaptain.java
ai/individual/Namo.java
ai/individual/Orfen.java
-ai/individual/Oris.java
ai/individual/QueenAnt.java
ai/individual/QueenShyeed.java
ai/individual/RagnaOrcCommander.java
@@ -99,15 +80,8 @@ ai/individual/RagnaOrcSeer.java
ai/individual/RagnaOrcHero.java
ai/individual/Rakun.java
ai/individual/ScarletVanHalisha.java
-ai/individual/Shannon.java
ai/individual/SinEater.java
ai/individual/SinWardens.java
-ai/individual/Sodian.java
-ai/individual/Stiller.java
-ai/individual/Theodore.java
-ai/individual/TomaJunior.java
-ai/individual/TrainingGolem.java
-ai/individual/TrainningSoldier.java
ai/individual/Valakas.java
ai/individual/WindVortex.java
@@ -118,10 +92,8 @@ ai/npc/Alarm/Alarm.java
ai/npc/Alexandria/Alexandria.java
ai/npc/AltarOfSouls/AltarOfSouls.java
ai/npc/AlchemistManager/AlchemistManager.java
-ai/npc/Apprentice/Apprentice.java
ai/npc/ArenaManager/ArenaManager.java
ai/npc/AvantGarde/AvantGarde.java
-ai/npc/AwakeningMaster/AwakeningMaster.java
ai/npc/BlackJudge/BlackJudge.java
ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
ai/npc/CastleAmbassador/CastleAmbassador.java
@@ -141,7 +113,6 @@ ai/npc/ForgeOfTheGods/Rooney.java
ai/npc/FortressArcherCaptain/FortressArcherCaptain.java
ai/npc/FortressSiegeManager/FortressSiegeManager.java
ai/npc/FreyasSteward/FreyasSteward.java
-ai/npc/Hardin/Hardin.java
ai/npc/Jinia/Jinia.java
ai/npc/KainVanHalter/KainVanHalter.java
ai/npc/KetraOrcSupport/KetraOrcSupport.java
@@ -149,17 +120,13 @@ ai/npc/LaVieEnRose/LaVieEnRose.java
ai/npc/Mammons/Mammons.java
ai/npc/ManorManager/ManorManager.java
ai/npc/MentorGuide/MentorGuide.java
-ai/npc/Milia/Milia.java
ai/npc/Minigame/Minigame.java
-ai/npc/MonkOfChaos/MonkOfChaos.java
ai/npc/MonumentOfHeroes/MonumentOfHeroes.java
ai/npc/Merlot/Merlot.java
ai/npc/Nomi/Nomi.java
ai/npc/NpcBuffers/NpcBuffers.java
-ai/npc/Pantheon/Pantheon.java
ai/npc/Proclaimer/Proclaimer.java
ai/npc/Rignos/Rignos.java
-ai/npc/Raina/Raina.java
ai/npc/RemembranceTower/RemembranceTower.java
ai/npc/Scarecrow/Scarecrow.java
ai/npc/Sirra/Sirra.java
@@ -175,7 +142,6 @@ ai/npc/Teleports/GainakUndergroundEntrance/GainakUndergroundEntrance.java
ai/npc/Teleports/GardenOfSpirits/GardenOfSpirits.java
ai/npc/Teleports/GiantServant/GiantServant.java
ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java
-ai/npc/Teleports/HarnakUnderground/HarnakUnderground.java
ai/npc/Teleports/KargosTeleport/KargosTeleport.java
ai/npc/Teleports/Klemis/Klemis.java
ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -193,7 +159,6 @@ ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.jav
ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java
ai/npc/Teleports/ToIVortex/ToIVortex.java
ai/npc/Teleports/Warpgate/Warpgate.java
-ai/npc/Teleports/YeSagiraTeleporter/YeSagiraTeleporter.java
ai/npc/Toyron/Toyron.java
ai/npc/Trainers/HealerTrainer/HealerTrainer.java
ai/npc/Trandon/Trandon.java
@@ -218,6 +183,38 @@ ai/zones/Magmeld/ArcanRitual.java
ai/zones/Magmeld/OrbisTempleStatues.java
ai/zones/Magmeld/OrbisTempleTeleports.java
+# Talking Island
+ai/zones/TalkingIsland/Banette.java
+ai/zones/TalkingIsland/Bink.java
+ai/zones/TalkingIsland/Devno.java
+ai/zones/TalkingIsland/DrillSergeant.java
+ai/zones/TalkingIsland/Eleve.java
+ai/zones/TalkingIsland/Gagabu.java
+ai/zones/TalkingIsland/Handermonkey.java
+ai/zones/TalkingIsland/Heymond.java
+ai/zones/TalkingIsland/Karonf.java
+ai/zones/TalkingIsland/Lumi.java
+ai/zones/TalkingIsland/Mahram.java
+ai/zones/TalkingIsland/Mai.java
+ai/zones/TalkingIsland/MarinSmith.java
+ai/zones/TalkingIsland/Milia.java
+ai/zones/TalkingIsland/Oris.java
+ai/zones/TalkingIsland/Shannon.java
+ai/zones/TalkingIsland/Sodian.java
+ai/zones/TalkingIsland/Stiller.java
+ai/zones/TalkingIsland/Theodore.java
+ai/zones/TalkingIsland/TrainingGolem.java
+ai/zones/TalkingIsland/TrainningSoldier.java
+ai/zones/TalkingIsland/YeSagiraGuards.java
+ai/zones/TalkingIsland/Apprentice/Apprentice.java
+ai/zones/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+ai/zones/TalkingIsland/Hardin/Hardin.java
+ai/zones/TalkingIsland/HarnakUnderground/HarnakUnderground.java
+ai/zones/TalkingIsland/MonkOfChaos/MonkOfChaos.java
+ai/zones/TalkingIsland/Pantheon/Pantheon.java
+ai/zones/TalkingIsland/Raina/Raina.java
+ai/zones/TalkingIsland/YeSagiraTeleporter/YeSagiraTeleporter.java
+
# Village Master
village_master/Clan/Clan.java
village_master/Alliance/Alliance.java
diff --git a/trunk/dist/game/data/scripts/ai/individual/Galad.java b/trunk/dist/game/data/scripts/ai/individual/Galad.java
deleted file mode 100644
index d3e59f1225..0000000000
--- a/trunk/dist/game/data/scripts/ai/individual/Galad.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package ai.individual;
-
-import com.l2jmobius.gameserver.enums.ChatType;
-import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.NpcStringId;
-
-import ai.npc.AbstractNpcAI;
-
-/**
- * Galad AI.
- * @author Gladicek
- */
-final class Galad extends AbstractNpcAI
-{
- // NPCs
- private static final int GALAD = 33572;
-
- private Galad()
- {
- super(Galad.class.getSimpleName(), "ai/individual");
- addSpawnId(GALAD);
- }
-
- @Override
- public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
- {
- if (event.equals("SPAM_TEXT") && (npc != null))
- {
- npc.broadcastSocialAction(3);
- broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.OCCASIONALLY_RARE_JEWELS_OF_GIANTS_ARE_DISCOVERED_IN_THE_BEACH, 1000);
- }
- return super.onAdvEvent(event, npc, player);
- }
-
- @Override
- public String onSpawn(L2Npc npc)
- {
- startQuestTimer("SPAM_TEXT", 8000, npc, null, true);
- return super.onSpawn(npc);
- }
-
- public static void main(String[] args)
- {
- new Galad();
- }
-}
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/individual/GuardSoldier.java b/trunk/dist/game/data/scripts/ai/individual/GuardSoldier.java
deleted file mode 100644
index cc0a1872da..0000000000
--- a/trunk/dist/game/data/scripts/ai/individual/GuardSoldier.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package ai.individual;
-
-import com.l2jmobius.gameserver.enums.ChatType;
-import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.NpcStringId;
-
-import ai.npc.AbstractNpcAI;
-
-/**
- * Guard Soldier AI.
- * @author Gladicek
- */
-final class GuardSoldier extends AbstractNpcAI
-{
- // NPCs
- private static final int GUARD_SOLDIER = 33286;
-
- private GuardSoldier()
- {
- super(GuardSoldier.class.getSimpleName(), "ai/individual");
- addSpawnId(GUARD_SOLDIER);
- }
-
- @Override
- public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
- {
- if (event.equals("SPAM_TEXT") && (npc != null))
- {
- npc.broadcastSocialAction(3);
- broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.LADY_YOU_MUST_GO_IN, 1000);
- }
- else if (event.equals("SOCIAL_ACTION") && (npc != null))
- {
- npc.broadcastSocialAction(2);
- }
- return super.onAdvEvent(event, npc, player);
- }
-
- @Override
- public String onSpawn(L2Npc npc)
- {
- startQuestTimer("SPAM_TEXT", 12000, npc, null, true);
- startQuestTimer("SOCIAL_ACTION", 15000, npc, null, true);
- return super.onSpawn(npc);
- }
-
- public static void main(String[] args)
- {
- new GuardSoldier();
- }
-}
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/individual/Holly.java b/trunk/dist/game/data/scripts/ai/individual/Holly.java
deleted file mode 100644
index 897d5c6714..0000000000
--- a/trunk/dist/game/data/scripts/ai/individual/Holly.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package ai.individual;
-
-import com.l2jmobius.gameserver.enums.ChatType;
-import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.NpcStringId;
-
-import ai.npc.AbstractNpcAI;
-
-/**
- * Holly AI.
- * @author Gladicek
- */
-final class Holly extends AbstractNpcAI
-{
- // NPCs
- private static final int HOLLY = 33219;
-
- private Holly()
- {
- super(Holly.class.getSimpleName(), "ai/individual");
- addSpawnId(HOLLY);
- }
-
- @Override
- public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
- {
- if (event.equals("SPAM_TEXT") && (npc != null))
- {
- broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.GIRAN_SHUTTLE_DOES_NOT_COME_ANYMORE_IT_S_ALL_IN_THE_PAST, 1000);
- }
- else if (event.equals("SOCIAL_ACTION") && (npc != null))
- {
- npc.broadcastSocialAction(6);
- }
- return super.onAdvEvent(event, npc, player);
- }
-
- @Override
- public String onSpawn(L2Npc npc)
- {
- startQuestTimer("SPAM_TEXT", 10000, npc, null, true);
- startQuestTimer("SOCIAL_ACTION", 2000, npc, null, true);
- return super.onSpawn(npc);
- }
-
- public static void main(String[] args)
- {
- new Holly();
- }
-}
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/individual/Luderic.java b/trunk/dist/game/data/scripts/ai/individual/Luderic.java
deleted file mode 100644
index f65a1012fd..0000000000
--- a/trunk/dist/game/data/scripts/ai/individual/Luderic.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package ai.individual;
-
-import com.l2jmobius.gameserver.enums.ChatType;
-import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.NpcStringId;
-
-import ai.npc.AbstractNpcAI;
-
-/**
- * Luderic AI.
- * @author Gladicek
- */
-final class Luderic extends AbstractNpcAI
-{
- // NPCs
- private static final int LUDERIC = 33575;
- // Misc
- private static final NpcStringId[] LUDERIC_SHOUT =
- {
- NpcStringId.THERE_IS_A_DAY_WHERE_YOU_CAN_SEE_EVEN_THE_ADEN_CONTINENT_IF_THE_WEATHER_IS_GOOD,
- NpcStringId.IF_I_M_HERE_IT_FEELS_LIKE_TIME_HAS_STOPPED
- };
-
- private Luderic()
- {
- super(Luderic.class.getSimpleName(), "ai/individual");
- addSpawnId(LUDERIC);
- }
-
- @Override
- public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
- {
- if (event.equals("SPAM_TEXT") && (npc != null))
- {
- broadcastNpcSay(npc, ChatType.NPC_GENERAL, LUDERIC_SHOUT[getRandom(2)], 1000);
- }
- else if (event.equals("SOCIAL_ACTION") && (npc != null))
- {
- npc.broadcastSocialAction(1);
- }
- return super.onAdvEvent(event, npc, player);
- }
-
- @Override
- public String onSpawn(L2Npc npc)
- {
- startQuestTimer("SPAM_TEXT", 7000, npc, null, true);
- startQuestTimer("SOCIAL_ACTION", 3000, npc, null, true);
- return super.onSpawn(npc);
- }
-
- public static void main(String[] args)
- {
- new Luderic();
- }
-}
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/individual/TomaJunior.java b/trunk/dist/game/data/scripts/ai/individual/TomaJunior.java
deleted file mode 100644
index 7150e34bb9..0000000000
--- a/trunk/dist/game/data/scripts/ai/individual/TomaJunior.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package ai.individual;
-
-import com.l2jmobius.gameserver.enums.ChatType;
-import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.NpcStringId;
-
-import ai.npc.AbstractNpcAI;
-
-/**
- * Guard Soldier AI.
- * @author Gladicek
- */
-final class TomaJunior extends AbstractNpcAI
-{
- // NPCs
- private static final int TOMA_JUNIOR = 33571;
-
- private TomaJunior()
- {
- super(GuardSoldier.class.getSimpleName(), "ai/individual");
- addSpawnId(TOMA_JUNIOR);
- }
-
- @Override
- public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
- {
- if (event.equals("SPAM_TEXT") && (npc != null))
- {
- npc.broadcastSocialAction(3);
- broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.THE_BEACH_WHERE_RELICS_OF_GIANTS_HAD_FALLEN_HAS_NOW_BECOME_CLEAN, 1000);
- }
- else if (event.equals("SOCIAL_ACTION") && (npc != null))
- {
- npc.broadcastSocialAction(6);
- }
- return super.onAdvEvent(event, npc, player);
- }
-
- @Override
- public String onSpawn(L2Npc npc)
- {
- startQuestTimer("SPAM_TEXT", 9000, npc, null, true);
- startQuestTimer("SOCIAL_ACTION", 15000, npc, null, true);
- return super.onSpawn(npc);
- }
-
- public static void main(String[] args)
- {
- new TomaJunior();
- }
-}
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/npc/Apprentice/33124.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Apprentice/33124.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Apprentice/33124.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Apprentice/33124.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Apprentice/Apprentice.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Apprentice/Apprentice.java
similarity index 91%
rename from trunk/dist/game/data/scripts/ai/npc/Apprentice/Apprentice.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Apprentice/Apprentice.java
index 09c26c41f1..5ecd50911f 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Apprentice/Apprentice.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Apprentice/Apprentice.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.npc.Apprentice;
+package ai.zones.TalkingIsland.Apprentice;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -30,14 +30,14 @@ import ai.npc.AbstractNpcAI;
*/
final class Apprentice extends AbstractNpcAI
{
- // NPCs
+ // NPC
private static final int APPRENTICE = 33124;
// Skill
private static final SkillHolder KUKURU = new SkillHolder(9204, 1); // Kukuru
private Apprentice()
{
- super(Apprentice.class.getSimpleName(), "ai/npc");
+ super(Apprentice.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(APPRENTICE);
addStartNpc(APPRENTICE);
addTalkId(APPRENTICE);
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33397-01.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33397-01.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33397-01.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33397-01.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33397-no.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33397-no.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33397-no.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33397-no.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33397-no_class.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33397-no_class.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33397-no_class.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33397-no_class.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33397.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33397.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33397.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33397.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33398-01.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33398-01.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33398-01.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33398-01.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33398-no.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33398-no.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33398-no.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33398-no.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33398-no_class.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33398-no_class.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33398-no_class.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33398-no_class.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33398.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33398.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33398.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33398.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33399-01.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33399-01.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33399-01.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33399-01.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33399-no.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33399-no.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33399-no.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33399-no.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33399-no_class.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33399-no_class.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33399-no_class.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33399-no_class.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33399.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33399.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33399.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33399.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33400-01.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33400-01.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33400-01.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33400-01.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33400-no.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33400-no.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33400-no.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33400-no.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33400-no_class.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33400-no_class.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33400-no_class.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33400-no_class.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33400.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33400.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33400.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33400.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33401-01.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33401-01.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33401-01.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33401-01.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33401-no.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33401-no.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33401-no.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33401-no.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33401-no_class.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33401-no_class.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33401-no_class.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33401-no_class.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33401.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33401.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33401.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33401.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33402-01.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33402-01.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33402-01.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33402-01.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33402-no.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33402-no.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33402-no.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33402-no.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33402-no_class.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33402-no_class.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33402-no_class.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33402-no_class.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33402.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33402.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33402.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33402.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33403-01.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33403-01.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33403-01.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33403-01.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33403-no.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33403-no.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33403-no.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33403-no.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33403-no_class.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33403-no_class.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33403-no_class.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33403-no_class.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33403.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33403.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33403.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33403.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33404-01.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33404-01.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33404-01.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33404-01.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33404-no.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33404-no.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33404-no.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33404-no.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33404-no_class.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33404-no_class.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33404-no_class.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33404-no_class.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33404.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33404.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/33404.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/33404.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/AwakeningMaster.java
similarity index 95%
rename from trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index a6c2ff9f5e..75a01e0ce8 100644
--- a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.npc.AwakeningMaster;
+package ai.zones.TalkingIsland.AwakeningMaster;
import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
@@ -84,7 +84,7 @@ public final class AwakeningMaster extends AbstractNpcAI
private AwakeningMaster()
{
- super(AwakeningMaster.class.getSimpleName(), "ai/npc");
+ super(AwakeningMaster.class.getSimpleName(), "ai/zones/TalkingIsland");
addStartNpc(SIGEL_MASTER, TYRR_MASTER, OTHELL_MASTER, YUL_MASTER, FEOH_MASTER, ISS_MASTER, WYNN_MASTER, AEORE_MASTER);
addTalkId(SIGEL_MASTER, TYRR_MASTER, OTHELL_MASTER, YUL_MASTER, FEOH_MASTER, ISS_MASTER, WYNN_MASTER, AEORE_MASTER);
addFirstTalkId(SIGEL_MASTER, TYRR_MASTER, OTHELL_MASTER, YUL_MASTER, FEOH_MASTER, ISS_MASTER, WYNN_MASTER, AEORE_MASTER);
diff --git a/trunk/dist/game/data/scripts/ai/individual/Banette.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Banette.java
similarity index 92%
rename from trunk/dist/game/data/scripts/ai/individual/Banette.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Banette.java
index 4b2000a0b8..b0656fd990 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Banette.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Banette.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -41,7 +41,7 @@ final class Banette extends AbstractNpcAI
private Banette()
{
- super(Banette.class.getSimpleName(), "ai/individual");
+ super(Banette.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(BANETTE);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/Bink.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Bink.java
similarity index 91%
rename from trunk/dist/game/data/scripts/ai/individual/Bink.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Bink.java
index 2e79cadfd9..4e91bae620 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Bink.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Bink.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -34,7 +34,7 @@ final class Bink extends AbstractNpcAI
private Bink()
{
- super(Bink.class.getSimpleName(), "ai/individual");
+ super(Bink.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(BINK);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/Devno.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Devno.java
similarity index 93%
rename from trunk/dist/game/data/scripts/ai/individual/Devno.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Devno.java
index 7bb0d8fc4c..7958c7d674 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Devno.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Devno.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.Location;
@@ -55,7 +55,7 @@ final class Devno extends AbstractNpcAI
private Devno()
{
- super(Devno.class.getSimpleName(), "ai/individual");
+ super(Devno.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(DEVNO);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/DrillSergeant.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/DrillSergeant.java
similarity index 92%
rename from trunk/dist/game/data/scripts/ai/individual/DrillSergeant.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/DrillSergeant.java
index ad6be3dcf4..dead3e0636 100644
--- a/trunk/dist/game/data/scripts/ai/individual/DrillSergeant.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/DrillSergeant.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -38,7 +38,7 @@ final class DrillSergeant extends AbstractNpcAI
private DrillSergeant()
{
- super(DrillSergeant.class.getSimpleName(), "ai/individual");
+ super(DrillSergeant.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(SERGANT);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/Eleve.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Eleve.java
similarity index 92%
rename from trunk/dist/game/data/scripts/ai/individual/Eleve.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Eleve.java
index 4b10c5754c..29f7432ea7 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Eleve.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Eleve.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.Location;
@@ -54,7 +54,7 @@ final class Eleve extends AbstractNpcAI
private Eleve()
{
- super(Eleve.class.getSimpleName(), "ai/individual");
+ super(Eleve.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(ELEVE);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/Gagabu.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Gagabu.java
similarity index 91%
rename from trunk/dist/game/data/scripts/ai/individual/Gagabu.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Gagabu.java
index 45be46285f..13920f83aa 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Gagabu.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Gagabu.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -40,7 +40,7 @@ final class Gagabu extends AbstractNpcAI
private Gagabu()
{
- super(Gagabu.class.getSimpleName(), "ai/individual");
+ super(Gagabu.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(GAGABU);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/Handermonkey.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Handermonkey.java
similarity index 91%
rename from trunk/dist/game/data/scripts/ai/individual/Handermonkey.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Handermonkey.java
index 341ea6e99f..6c92e23a84 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Handermonkey.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Handermonkey.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.model.Location;
@@ -34,7 +34,7 @@ final class Handermonkey extends AbstractNpcAI
private Handermonkey()
{
- super(Handermonkey.class.getSimpleName(), "ai/npc");
+ super(Handermonkey.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(HANDERMONKEY);
}
diff --git a/trunk/dist/game/data/scripts/ai/npc/Hardin/33870-01.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Hardin/33870-01.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Hardin/33870-01.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Hardin/33870-01.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Hardin/33870-02.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Hardin/33870-02.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Hardin/33870-02.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Hardin/33870-02.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Hardin/33870-03.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Hardin/33870-03.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Hardin/33870-03.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Hardin/33870-03.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Hardin/Hardin.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Hardin/Hardin.java
similarity index 91%
rename from trunk/dist/game/data/scripts/ai/npc/Hardin/Hardin.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Hardin/Hardin.java
index ec9abffce3..b738d2f66f 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Hardin/Hardin.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Hardin/Hardin.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.npc.Hardin;
+package ai.zones.TalkingIsland.Hardin;
import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
import com.l2jmobius.gameserver.enums.CategoryType;
@@ -37,7 +37,7 @@ final class Hardin extends AbstractNpcAI
private Hardin()
{
- super(Hardin.class.getSimpleName(), "ai/npc");
+ super(Hardin.class.getSimpleName(), "ai/zones/TalkingIsland");
addFirstTalkId(HARDIN);
addCondRace(Race.ERTHEIA, "no_race.html"); // TODO: Find proper HTML
}
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/HarnakUnderground/HarnakUnderground.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/HarnakUnderground/HarnakUnderground.java
similarity index 89%
rename from trunk/dist/game/data/scripts/ai/npc/Teleports/HarnakUnderground/HarnakUnderground.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/HarnakUnderground/HarnakUnderground.java
index 0b7f78e766..4422ca8c51 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/HarnakUnderground/HarnakUnderground.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/HarnakUnderground/HarnakUnderground.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.npc.Teleports.HarnakUnderground;
+package ai.zones.TalkingIsland.HarnakUnderground;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -36,7 +36,7 @@ final class HarnakUnderground extends AbstractNpcAI
private HarnakUnderground()
{
- super(HarnakUnderground.class.getSimpleName(), "ai/npc/Teleports");
+ super(HarnakUnderground.class.getSimpleName(), "ai/zones/TalkingIsland");
addStartNpc(HADEL);
addTalkId(HADEL);
}
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/HarnakUnderground/no_level.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/HarnakUnderground/no_level.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Teleports/HarnakUnderground/no_level.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/HarnakUnderground/no_level.htm
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/HarnakUnderground/non_awakened.htm b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/HarnakUnderground/non_awakened.htm
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Teleports/HarnakUnderground/non_awakened.htm
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/HarnakUnderground/non_awakened.htm
diff --git a/trunk/dist/game/data/scripts/ai/individual/Heymond.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Heymond.java
similarity index 91%
rename from trunk/dist/game/data/scripts/ai/individual/Heymond.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Heymond.java
index 92512aa894..29a301c7e8 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Heymond.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Heymond.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -41,7 +41,7 @@ final class Heymond extends AbstractNpcAI
private Heymond()
{
- super(Heymond.class.getSimpleName(), "ai/individual");
+ super(Heymond.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(HEYMOND);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/Karonf.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Karonf.java
similarity index 92%
rename from trunk/dist/game/data/scripts/ai/individual/Karonf.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Karonf.java
index 563cf3fb8f..ef4eaa00f3 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Karonf.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Karonf.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.Location;
@@ -54,7 +54,7 @@ final class Karonf extends AbstractNpcAI
private Karonf()
{
- super(Karonf.class.getSimpleName(), "ai/individual");
+ super(Karonf.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(KARONF);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/Lumi.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Lumi.java
similarity index 92%
rename from trunk/dist/game/data/scripts/ai/individual/Lumi.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Lumi.java
index e018dcdbee..61199ae660 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Lumi.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Lumi.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -41,7 +41,7 @@ final class Lumi extends AbstractNpcAI
private Lumi()
{
- super(Lumi.class.getSimpleName(), "ai/individual");
+ super(Lumi.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(LUMI);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/Mahram.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mahram.java
similarity index 91%
rename from trunk/dist/game/data/scripts/ai/individual/Mahram.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mahram.java
index e6db1ec608..f2898d98f9 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Mahram.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mahram.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -34,7 +34,7 @@ final class Mahram extends AbstractNpcAI
private Mahram()
{
- super(Mahram.class.getSimpleName(), "ai/individual");
+ super(Mahram.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(MAHRAM);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/Mai.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mai.java
similarity index 91%
rename from trunk/dist/game/data/scripts/ai/individual/Mai.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mai.java
index 8142ed25f5..a5b0c34805 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Mai.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Mai.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -34,7 +34,7 @@ final class Mai extends AbstractNpcAI
private Mai()
{
- super(Mai.class.getSimpleName(), "ai/individual");
+ super(Mai.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(MAI);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/MarinSmith.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MarinSmith.java
similarity index 91%
rename from trunk/dist/game/data/scripts/ai/individual/MarinSmith.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MarinSmith.java
index d78513ff56..55e7a1184a 100644
--- a/trunk/dist/game/data/scripts/ai/individual/MarinSmith.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MarinSmith.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -34,7 +34,7 @@ final class MarinSmith extends AbstractNpcAI
private MarinSmith()
{
- super(MarinSmith.class.getSimpleName(), "ai/individual");
+ super(MarinSmith.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(MARIN_SMITH);
}
diff --git a/trunk/dist/game/data/scripts/ai/npc/Milia/Milia.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Milia.java
similarity index 92%
rename from trunk/dist/game/data/scripts/ai/npc/Milia/Milia.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Milia.java
index d2289e7993..5968495569 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Milia/Milia.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Milia.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.npc.Milia;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.Location;
@@ -37,7 +37,7 @@ final class Milia extends AbstractNpcAI
private Milia()
{
- super(Milia.class.getSimpleName(), "ai/npc");
+ super(Milia.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(MILIA);
addStartNpc(MILIA);
addTalkId(MILIA);
diff --git a/trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/33880-1.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/33880-1.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/33880-1.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/33880-1.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/33880-2.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/33880-2.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/33880-2.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/33880-2.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/33880.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/33880.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/33880.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/33880.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/MonkOfChaos.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/MonkOfChaos.java
similarity index 94%
rename from trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/MonkOfChaos.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/MonkOfChaos.java
index 721543b75e..1ed9a2c7e0 100644
--- a/trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/MonkOfChaos.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/MonkOfChaos.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.npc.MonkOfChaos;
+package ai.zones.TalkingIsland.MonkOfChaos;
import java.util.List;
@@ -57,7 +57,7 @@ final class MonkOfChaos extends AbstractNpcAI
private MonkOfChaos()
{
- super(MonkOfChaos.class.getSimpleName(), "ai/npc");
+ super(MonkOfChaos.class.getSimpleName(), "ai/zones/TalkingIsland");
addStartNpc(MONK_OF_CHAOS);
addTalkId(MONK_OF_CHAOS);
addFirstTalkId(MONK_OF_CHAOS);
diff --git a/trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/canceled.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/canceled.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/canceled.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/canceled.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/no-adena.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/no-adena.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/no-adena.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/no-adena.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/no-cancel.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/no-cancel.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/no-cancel.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/no-cancel.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/no-learn.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/no-learn.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/no-learn.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/no-learn.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/no-subclass.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/no-subclass.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/no-subclass.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/MonkOfChaos/no-subclass.html
diff --git a/trunk/dist/game/data/scripts/ai/individual/Oris.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Oris.java
similarity index 91%
rename from trunk/dist/game/data/scripts/ai/individual/Oris.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Oris.java
index 2c9fa4a9cc..dd1af17f73 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Oris.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Oris.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -34,7 +34,7 @@ final class Oris extends AbstractNpcAI
private Oris()
{
- super(Oris.class.getSimpleName(), "ai/individual");
+ super(Oris.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(ORIS);
}
diff --git a/trunk/dist/game/data/scripts/ai/npc/Pantheon/32972-1.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Pantheon/32972-1.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Pantheon/32972-1.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Pantheon/32972-1.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Pantheon/32972-noteleport.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Pantheon/32972-noteleport.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Pantheon/32972-noteleport.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Pantheon/32972-noteleport.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Pantheon/32972.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Pantheon/32972.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Pantheon/32972.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Pantheon/32972.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Pantheon/Pantheon.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Pantheon/Pantheon.java
similarity index 92%
rename from trunk/dist/game/data/scripts/ai/npc/Pantheon/Pantheon.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Pantheon/Pantheon.java
index f7a209e4ef..4245f5195c 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Pantheon/Pantheon.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Pantheon/Pantheon.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.npc.Pantheon;
+package ai.zones.TalkingIsland.Pantheon;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.Location;
@@ -42,7 +42,7 @@ final class Pantheon extends AbstractNpcAI
private Pantheon()
{
- super(Pantheon.class.getSimpleName(), "ai/npc");
+ super(Pantheon.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(PANTHEON);
addStartNpc(PANTHEON);
addFirstTalkId(PANTHEON);
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/33491-01.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/33491-01.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/33491-01.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/33491-01.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/33491-02.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/33491-02.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/33491-02.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/33491-02.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/33491-03.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/33491-03.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/33491-03.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/33491-03.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/33491-04.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/33491-04.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/33491-04.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/33491-04.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/33491-05.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/33491-05.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/33491-05.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/33491-05.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/33491.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/33491.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/33491.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/33491.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/Raina.java
similarity index 96%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/Raina.java
index 1093c51cbf..6e2db79194 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/Raina.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.npc.Raina;
+package ai.zones.TalkingIsland.Raina;
import static com.l2jmobius.gameserver.model.base.ClassLevel.THIRD;
@@ -136,7 +136,7 @@ public final class Raina extends AbstractNpcAI
private Raina()
{
- super(Raina.class.getSimpleName(), "ai/npc");
+ super(Raina.class.getSimpleName(), "ai/zones/TalkingIsland");
addStartNpc(RAINA);
addFirstTalkId(RAINA);
addTalkId(RAINA);
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/addConfirm.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/addConfirm.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/addConfirm.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/addConfirm.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/addConfirm2.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/addConfirm2.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/addConfirm2.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/addConfirm2.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/addDualClassErtheia.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/addDualClassErtheia.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/addDualClassErtheia.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/addDualClassErtheia.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/addDualClassErtheiaFailed.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/addDualClassErtheiaFailed.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/addDualClassErtheiaFailed.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/addDualClassErtheiaFailed.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/addDualClassErtheiaList.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/addDualClassErtheiaList.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/addDualClassErtheiaList.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/addDualClassErtheiaList.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/addFailed.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/addFailed.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/addFailed.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/addFailed.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/addSuccess.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/addSuccess.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/addSuccess.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/addSuccess.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/inventoryLimit.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/inventoryLimit.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/inventoryLimit.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/inventoryLimit.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/noCertificate.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/noCertificate.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/noCertificate.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/noCertificate.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/noErtheia.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/noErtheia.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/noErtheia.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/noErtheia.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/noQuest.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/noQuest.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/noQuest.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/noQuest.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/noSubChange.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/noSubChange.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/noSubChange.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/noSubChange.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/noSummon.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/noSummon.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/noSummon.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/noSummon.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/noTransform.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/noTransform.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/noTransform.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/noTransform.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/onlyErtheia.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/onlyErtheia.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/onlyErtheia.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/onlyErtheia.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/reawaken.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/reawaken.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/reawaken.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/reawaken.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/reawakenCancel.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/reawakenCancel.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/reawakenCancel.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/reawakenCancel.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/reawakenClassList.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/reawakenClassList.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/reawakenClassList.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/reawakenClassList.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/reawakenList.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/reawakenList.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/reawakenList.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/reawakenList.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/reawakenNoDual.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/reawakenNoDual.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/reawakenNoDual.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/reawakenNoDual.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/reawakenNoFee.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/reawakenNoFee.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/reawakenNoFee.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/reawakenNoFee.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/reawakenSuccess.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/reawakenSuccess.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/reawakenSuccess.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/reawakenSuccess.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/removeSubclassList.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/removeSubclassList.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/removeSubclassList.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/removeSubclassList.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/subclassList.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/subclassList.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/subclassList.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/subclassList.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/subclassRemoveList.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/subclassRemoveList.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Raina/subclassRemoveList.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Raina/subclassRemoveList.html
diff --git a/trunk/dist/game/data/scripts/ai/individual/Shannon.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Shannon.java
similarity index 91%
rename from trunk/dist/game/data/scripts/ai/individual/Shannon.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Shannon.java
index 77a2af48ae..2fb50b5f8a 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Shannon.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Shannon.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -34,7 +34,7 @@ final class Shannon extends AbstractNpcAI
private Shannon()
{
- super(Shannon.class.getSimpleName(), "ai/individual");
+ super(Shannon.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(SHANNON);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/Sodian.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Sodian.java
similarity index 91%
rename from trunk/dist/game/data/scripts/ai/individual/Sodian.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Sodian.java
index add6d4067d..ccd730798b 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Sodian.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Sodian.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -40,7 +40,7 @@ final class Sodian extends AbstractNpcAI
private Sodian()
{
- super(Sodian.class.getSimpleName(), "ai/individual");
+ super(Sodian.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(SODIAN);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/Stiller.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Stiller.java
similarity index 91%
rename from trunk/dist/game/data/scripts/ai/individual/Stiller.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Stiller.java
index 55d851812b..2c2d14bf8b 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Stiller.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Stiller.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -40,7 +40,7 @@ final class Stiller extends AbstractNpcAI
private Stiller()
{
- super(Stiller.class.getSimpleName(), "ai/individual");
+ super(Stiller.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(STILLER);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/Theodore.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Theodore.java
similarity index 91%
rename from trunk/dist/game/data/scripts/ai/individual/Theodore.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Theodore.java
index ae07e42091..1332f34457 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Theodore.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Theodore.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -34,7 +34,7 @@ final class Theodore extends AbstractNpcAI
private Theodore()
{
- super(Theodore.class.getSimpleName(), "ai/individual");
+ super(Theodore.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(THEODORE);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/TrainingGolem.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/TrainingGolem.java
similarity index 88%
rename from trunk/dist/game/data/scripts/ai/individual/TrainingGolem.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/TrainingGolem.java
index 33647f6b8c..f7794ba5ef 100644
--- a/trunk/dist/game/data/scripts/ai/individual/TrainingGolem.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/TrainingGolem.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -31,7 +31,7 @@ final class TrainingGolem extends AbstractNpcAI
private TrainingGolem()
{
- super(TrainingGolem.class.getSimpleName(), "ai/individual");
+ super(TrainingGolem.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(TRAINING_GOLEM);
}
diff --git a/trunk/dist/game/data/scripts/ai/individual/TrainningSoldier.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/TrainningSoldier.java
similarity index 93%
rename from trunk/dist/game/data/scripts/ai/individual/TrainningSoldier.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/TrainningSoldier.java
index 698b7913c3..4ecbf7e187 100644
--- a/trunk/dist/game/data/scripts/ai/individual/TrainningSoldier.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/TrainningSoldier.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.individual;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.model.L2Object;
@@ -37,7 +37,7 @@ final class TrainningSoldier extends AbstractNpcAI
private TrainningSoldier()
{
- super(TrainningSoldier.class.getSimpleName(), "ai/individual");
+ super(TrainningSoldier.class.getSimpleName(), "ai/zones/TalkingIsland");
addSeeCreatureId(SOLDIER);
}
diff --git a/trunk/dist/game/data/scripts/ai/group_template/YeSagira.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraGuards.java
similarity index 86%
rename from trunk/dist/game/data/scripts/ai/group_template/YeSagira.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraGuards.java
index 4ae217ad6c..30c4b399f2 100644
--- a/trunk/dist/game/data/scripts/ai/group_template/YeSagira.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraGuards.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.group_template;
+package ai.zones.TalkingIsland;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -26,15 +26,15 @@ import ai.npc.AbstractNpcAI;
* YeSagira AI.
* @author Stayway, Mobius
*/
-final class YeSagira extends AbstractNpcAI
+final class YeSagiraGuards extends AbstractNpcAI
{
// Npcs
private static final int GUARD_1 = 19152;
private static final int GUARD_2 = 19153;
- public YeSagira()
+ public YeSagiraGuards()
{
- super(YeSagira.class.getSimpleName(), "ai/group_template");
+ super(YeSagiraGuards.class.getSimpleName(), "ai/zones/TalkingIsland");
addSpawnId(GUARD_1, GUARD_2);
}
@@ -69,6 +69,6 @@ final class YeSagira extends AbstractNpcAI
public static void main(String[] args)
{
- new YeSagira();
+ new YeSagiraGuards();
}
}
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/YeSagiraTeleporter/33180.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraTeleporter/33180.html
similarity index 100%
rename from trunk/dist/game/data/scripts/ai/npc/Teleports/YeSagiraTeleporter/33180.html
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraTeleporter/33180.html
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/YeSagiraTeleporter/YeSagiraTeleporter.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraTeleporter/YeSagiraTeleporter.java
similarity index 92%
rename from trunk/dist/game/data/scripts/ai/npc/Teleports/YeSagiraTeleporter/YeSagiraTeleporter.java
rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraTeleporter/YeSagiraTeleporter.java
index 4e56ef9dce..2df8c4ea1b 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/YeSagiraTeleporter/YeSagiraTeleporter.java
+++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/YeSagiraTeleporter/YeSagiraTeleporter.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package ai.npc.Teleports.YeSagiraTeleporter;
+package ai.zones.TalkingIsland.YeSagiraTeleporter;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -45,7 +45,7 @@ public final class YeSagiraTeleporter extends AbstractNpcAI
private YeSagiraTeleporter()
{
- super(YeSagiraTeleporter.class.getSimpleName(), "ai/npc/Teleports");
+ super(YeSagiraTeleporter.class.getSimpleName(), "ai/zones/TalkingIsland");
addStartNpc(YE_SAGIRA_TELEPORTER);
addFirstTalkId(YE_SAGIRA_TELEPORTER);
addTalkId(YE_SAGIRA_TELEPORTER);