diff --git a/trunk/dist/game/data/scripts.cfg b/trunk/dist/game/data/scripts.cfg index d29ef2efa7..19d38470f5 100644 --- a/trunk/dist/game/data/scripts.cfg +++ b/trunk/dist/game/data/scripts.cfg @@ -150,9 +150,7 @@ 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/Toyron/Toyron.java ai/npc/Trainers/HealerTrainer/HealerTrainer.java -ai/npc/Trandon/Trandon.java ai/npc/Tunatun/Tunatun.java ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java @@ -218,6 +216,8 @@ 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/Toyron/Toyron.java +ai/zones/TalkingIsland/Trandon/Trandon.java ai/zones/TalkingIsland/YeSagiraTeleporter/YeSagiraTeleporter.java # Village Master diff --git a/trunk/dist/game/data/scripts/ai/npc/Toyron/33004-01.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Toyron/33004-01.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Toyron/33004-01.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Toyron/33004-01.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Toyron/33004-02.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Toyron/33004-02.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Toyron/33004-02.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Toyron/33004-02.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Toyron/33004.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Toyron/33004.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Toyron/33004.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Toyron/33004.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Toyron/Toyron.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Toyron/Toyron.java similarity index 93% rename from trunk/dist/game/data/scripts/ai/npc/Toyron/Toyron.java rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Toyron/Toyron.java index 1e3d0900ac..270b3e3362 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Toyron/Toyron.java +++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Toyron/Toyron.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.Toyron; +package ai.zones.TalkingIsland.Toyron; import com.l2jmobius.gameserver.instancemanager.InstanceManager; import com.l2jmobius.gameserver.model.Location; @@ -40,7 +40,7 @@ final class Toyron extends AbstractNpcAI private Toyron() { - super(Toyron.class.getSimpleName(), "ai/npc"); + super(Toyron.class.getSimpleName(), "ai/zones/TalkingIsland"); addStartNpc(TOYRON); addFirstTalkId(TOYRON); addTalkId(TOYRON); diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-01.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-01.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-01.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-01.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-02.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-02.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-02.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-02.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-03.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-03.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-03.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-03.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-04.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-04.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-04.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-04.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-05.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-05.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-05.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-05.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-06.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-06.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-06.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-06.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-07.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-07.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-07.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-07.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-08.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-08.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-08.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-08.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-09.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-09.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-09.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-09.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-10.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-10.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-10.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-10.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-11.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-11.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-11.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-11.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-12.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-12.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-12.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-12.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-13.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-13.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-13.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-13.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-14.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-14.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-14.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-14.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-15.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-15.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-15.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-15.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-16.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-16.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-16.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-16.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-17.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-17.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-17.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-17.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-18.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-18.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-18.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-18.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-19.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-19.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-19.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-19.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-20.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-20.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-20.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-20.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-21.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-21.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-21.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-21.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-22.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-22.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-22.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-22.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-23.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-23.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-23.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-23.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-24.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-24.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-24.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-24.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-25.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-25.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-25.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-25.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-26.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-26.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-26.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-26.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-27.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-27.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-27.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-27.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-28.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-28.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-28.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-28.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-29.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-29.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-29.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-29.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-30.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-30.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-30.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-30.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-31.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-31.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-31.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-31.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-32.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-32.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-32.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-32.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490-33.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-33.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490-33.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490-33.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/33490.html b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/33490.html rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/33490.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Trandon/Trandon.java b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/Trandon.java similarity index 95% rename from trunk/dist/game/data/scripts/ai/npc/Trandon/Trandon.java rename to trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/Trandon.java index d09264758d..d0903a782e 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Trandon/Trandon.java +++ b/trunk/dist/game/data/scripts/ai/zones/TalkingIsland/Trandon/Trandon.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.Trandon; +package ai.zones.TalkingIsland.Trandon; import java.util.Set; @@ -53,7 +53,7 @@ public final class Trandon extends AbstractNpcAI private Trandon() { - super(Trandon.class.getSimpleName(), "ai/npc"); + super(Trandon.class.getSimpleName(), "ai/zones/TalkingIsland"); addStartNpc(NPC_ID); addFirstTalkId(NPC_ID); addTalkId(NPC_ID);