diff --git a/trunk/dist/game/data/scripts.cfg b/trunk/dist/game/data/scripts.cfg index e71755a0c3..673ec44048 100644 --- a/trunk/dist/game/data/scripts.cfg +++ b/trunk/dist/game/data/scripts.cfg @@ -35,7 +35,6 @@ ai/group_template/PlainsOfDion.java ai/group_template/PlainsOfLizardman.java ai/group_template/PolymorphingAngel.java ai/group_template/PolymorphingOnAttack.java -ai/group_template/PrimevalIsle.java ai/group_template/PrisonGuards.java ai/group_template/RandomSpawn.java ai/group_template/Remnants.java @@ -51,7 +50,6 @@ ai/group_template/Wasteland.java # Individual ai/individual/Antharas/Antharas.java ai/individual/Baium/Baium.java -ai/individual/Sailren/Sailren.java ai/individual/Venom/Venom.java ai/individual/Anais.java ai/individual/Ballista.java @@ -129,7 +127,6 @@ ai/npc/Teleports/CrumaTower/CrumaTower.java ai/npc/Teleports/DarkOmens/DarkOmens.java ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java ai/npc/Teleports/DimensionalWarpTeleport/DimensionalWarpTeleport.java -ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java ai/npc/Teleports/GainakUndergroundEntrance/GainakUndergroundEntrance.java ai/npc/Teleports/GardenOfSpirits/GardenOfSpirits.java ai/npc/Teleports/GiantServant/GiantServant.java @@ -204,6 +201,11 @@ ai/zones/Magmeld/ArcanRitual.java ai/zones/Magmeld/OrbisTempleStatues.java ai/zones/Magmeld/OrbisTempleTeleports.java +# Primeval Isle +ai/zones/PrimevalIsle/PrimevalIsle.java +ai/zones/PrimevalIsle/ElrokiTeleporters/ElrokiTeleporters.java +ai/zones/PrimevalIsle/Sailren/Sailren.java + # Sel Mahum Training Grounds ai/zones/SelMahumTrainingGrounds/SelMahumDrill.java ai/zones/SelMahumTrainingGrounds/SelMahumSquad.java diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32111-no.html b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/ElrokiTeleporters/32111-no.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32111-no.html rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/ElrokiTeleporters/32111-no.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32111.html b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/ElrokiTeleporters/32111.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32111.html rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/ElrokiTeleporters/32111.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32112-no.html b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/ElrokiTeleporters/32112-no.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32112-no.html rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/ElrokiTeleporters/32112-no.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32112.html b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/ElrokiTeleporters/32112.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32112.html rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/ElrokiTeleporters/32112.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/ElrokiTeleporters/ElrokiTeleporters.java similarity index 90% rename from trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/ElrokiTeleporters/ElrokiTeleporters.java index f4ef63dcbc..4671b228c1 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java +++ b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/ElrokiTeleporters/ElrokiTeleporters.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.ElrokiTeleporters; +package ai.zones.PrimevalIsle.ElrokiTeleporters; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Npc; @@ -37,7 +37,7 @@ final class ElrokiTeleporters extends AbstractNpcAI private ElrokiTeleporters() { - super(ElrokiTeleporters.class.getSimpleName(), "ai/npc/Teleports"); + super(ElrokiTeleporters.class.getSimpleName(), "ai/zones/PrimevalIsle"); addFirstTalkId(ORAHOCHIN, GARIACHIN); addStartNpc(ORAHOCHIN, GARIACHIN); addTalkId(ORAHOCHIN, GARIACHIN); diff --git a/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/PrimevalIsle.java similarity index 96% rename from trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/PrimevalIsle.java index 0782f300c3..5248490733 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java +++ b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/PrimevalIsle.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.PrimevalIsle; import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; @@ -104,7 +104,7 @@ final class PrimevalIsle extends AbstractNpcAI private PrimevalIsle() { - super(PrimevalIsle.class.getSimpleName(), "ai/group_template"); + super(PrimevalIsle.class.getSimpleName(), "ai/zones/PrimevalIsle"); addSpawnId(TREX); addSpawnId(SPRIGNANT); addSpawnId(MONSTERS); diff --git a/trunk/dist/game/data/scripts/ai/individual/Sailren/32109-01.html b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-01.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/individual/Sailren/32109-01.html rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-01.html diff --git a/trunk/dist/game/data/scripts/ai/individual/Sailren/32109-01a.html b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-01a.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/individual/Sailren/32109-01a.html rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-01a.html diff --git a/trunk/dist/game/data/scripts/ai/individual/Sailren/32109-02.html b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-02.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/individual/Sailren/32109-02.html rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-02.html diff --git a/trunk/dist/game/data/scripts/ai/individual/Sailren/32109-02a.html b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-02a.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/individual/Sailren/32109-02a.html rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-02a.html diff --git a/trunk/dist/game/data/scripts/ai/individual/Sailren/32109-03.html b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-03.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/individual/Sailren/32109-03.html rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-03.html diff --git a/trunk/dist/game/data/scripts/ai/individual/Sailren/32109-03a.html b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-03a.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/individual/Sailren/32109-03a.html rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-03a.html diff --git a/trunk/dist/game/data/scripts/ai/individual/Sailren/32109-04.html b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-04.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/individual/Sailren/32109-04.html rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-04.html diff --git a/trunk/dist/game/data/scripts/ai/individual/Sailren/32109-05.html b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-05.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/individual/Sailren/32109-05.html rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109-05.html diff --git a/trunk/dist/game/data/scripts/ai/individual/Sailren/32109.html b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/individual/Sailren/32109.html rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/32109.html diff --git a/trunk/dist/game/data/scripts/ai/individual/Sailren/Sailren.java b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/Sailren.java similarity index 95% rename from trunk/dist/game/data/scripts/ai/individual/Sailren/Sailren.java rename to trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/Sailren.java index c0cddf82b9..a83eedb9e2 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Sailren/Sailren.java +++ b/trunk/dist/game/data/scripts/ai/zones/PrimevalIsle/Sailren/Sailren.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.Sailren; +package ai.zones.PrimevalIsle.Sailren; import com.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -65,7 +65,7 @@ final class Sailren extends AbstractNpcAI private Sailren() { - super(Sailren.class.getSimpleName(), "ai/individual"); + super(Sailren.class.getSimpleName(), "ai/zones/PrimevalIsle"); addStartNpc(STATUE, CUBIC); addTalkId(STATUE, CUBIC); addFirstTalkId(STATUE);