From 570cd3e457fa742da27409ce4821983d24ab9f8e Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 29 Apr 2016 08:10:50 +0000 Subject: [PATCH] Moved Faeron Village scripts to zones package. --- trunk/dist/game/data/scripts.cfg | 8 +++++--- .../FaeronVillage}/AltarOfSouls/33920-1.html | 0 .../FaeronVillage}/AltarOfSouls/33920-2.html | 0 .../FaeronVillage}/AltarOfSouls/33920-3.html | 0 .../FaeronVillage}/AltarOfSouls/33920-4.html | 0 .../FaeronVillage}/AltarOfSouls/33920-5.html | 0 .../FaeronVillage}/AltarOfSouls/33920-6.html | 0 .../FaeronVillage}/AltarOfSouls/33920-7.html | 0 .../FaeronVillage}/AltarOfSouls/33920-8.html | 0 .../FaeronVillage}/AltarOfSouls/33920-9.html | 0 .../{npc => zones/FaeronVillage}/AltarOfSouls/33920.html | 0 .../FaeronVillage}/AltarOfSouls/AltarOfSouls.java | 4 ++-- .../FaeronVillage}/RemembranceTower/33989.html | 0 .../FaeronVillage}/RemembranceTower/RemembranceTower.java | 4 ++-- 14 files changed, 9 insertions(+), 7 deletions(-) rename trunk/dist/game/data/scripts/ai/{npc => zones/FaeronVillage}/AltarOfSouls/33920-1.html (100%) rename trunk/dist/game/data/scripts/ai/{npc => zones/FaeronVillage}/AltarOfSouls/33920-2.html (100%) rename trunk/dist/game/data/scripts/ai/{npc => zones/FaeronVillage}/AltarOfSouls/33920-3.html (100%) rename trunk/dist/game/data/scripts/ai/{npc => zones/FaeronVillage}/AltarOfSouls/33920-4.html (100%) rename trunk/dist/game/data/scripts/ai/{npc => zones/FaeronVillage}/AltarOfSouls/33920-5.html (100%) rename trunk/dist/game/data/scripts/ai/{npc => zones/FaeronVillage}/AltarOfSouls/33920-6.html (100%) rename trunk/dist/game/data/scripts/ai/{npc => zones/FaeronVillage}/AltarOfSouls/33920-7.html (100%) rename trunk/dist/game/data/scripts/ai/{npc => zones/FaeronVillage}/AltarOfSouls/33920-8.html (100%) rename trunk/dist/game/data/scripts/ai/{npc => zones/FaeronVillage}/AltarOfSouls/33920-9.html (100%) rename trunk/dist/game/data/scripts/ai/{npc => zones/FaeronVillage}/AltarOfSouls/33920.html (100%) rename trunk/dist/game/data/scripts/ai/{npc => zones/FaeronVillage}/AltarOfSouls/AltarOfSouls.java (93%) rename trunk/dist/game/data/scripts/ai/{npc => zones/FaeronVillage}/RemembranceTower/33989.html (100%) rename trunk/dist/game/data/scripts/ai/{npc => zones/FaeronVillage}/RemembranceTower/RemembranceTower.java (90%) diff --git a/trunk/dist/game/data/scripts.cfg b/trunk/dist/game/data/scripts.cfg index e116de0989..317da26226 100644 --- a/trunk/dist/game/data/scripts.cfg +++ b/trunk/dist/game/data/scripts.cfg @@ -87,9 +87,8 @@ ai/individual/WindVortex.java ai/npc/Acateo/Acateo.java ai/npc/AdventurersGuide/AdventurersGuide.java ai/npc/Alarm/Alarm.java -ai/npc/Alexandria/Alexandria.java -ai/npc/AltarOfSouls/AltarOfSouls.java ai/npc/AlchemistManager/AlchemistManager.java +ai/npc/Alexandria/Alexandria.java ai/npc/ArenaManager/ArenaManager.java ai/npc/AvantGarde/AvantGarde.java ai/npc/BlackJudge/BlackJudge.java @@ -125,7 +124,6 @@ ai/npc/Nomi/Nomi.java ai/npc/NpcBuffers/NpcBuffers.java ai/npc/Proclaimer/Proclaimer.java ai/npc/Rignos/Rignos.java -ai/npc/RemembranceTower/RemembranceTower.java ai/npc/Scarecrow/Scarecrow.java ai/npc/Sirra/Sirra.java ai/npc/Summons/MerchantGolem/GolemTrader.java @@ -170,6 +168,10 @@ ai/npc/Zenya/Zenya.java # Atelia Fortess ai/zones/AteliaFortress/AteliaManager/AteliaManager.java +# Faeron Village +ai/zones/FaeronVillage/AltarOfSouls/AltarOfSouls.java +ai/zones/FaeronVillage/RemembranceTower/RemembranceTower.java + # Fantasy Isle ai/zones/FantasyIsle/HandysBlockCheckerEvent.java ai/zones/FantasyIsle/Parade.java diff --git a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-1.html b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-1.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-1.html rename to trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-1.html diff --git a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-2.html b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-2.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-2.html rename to trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-2.html diff --git a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-3.html b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-3.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-3.html rename to trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-3.html diff --git a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-4.html b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-4.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-4.html rename to trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-4.html diff --git a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-5.html b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-5.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-5.html rename to trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-5.html diff --git a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-6.html b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-6.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-6.html rename to trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-6.html diff --git a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-7.html b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-7.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-7.html rename to trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-7.html diff --git a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-8.html b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-8.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-8.html rename to trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-8.html diff --git a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-9.html b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-9.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920-9.html rename to trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920-9.html diff --git a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920.html b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/33920.html rename to trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/33920.html diff --git a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/AltarOfSouls.java b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/AltarOfSouls.java similarity index 93% rename from trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/AltarOfSouls.java rename to trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/AltarOfSouls.java index e3e0f20d0f..2eb5c67c04 100644 --- a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/AltarOfSouls.java +++ b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/AltarOfSouls/AltarOfSouls.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.AltarOfSouls; +package ai.zones.FaeronVillage.AltarOfSouls; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -43,7 +43,7 @@ final class AltarOfSouls extends AbstractNpcAI private AltarOfSouls() { - super(AltarOfSouls.class.getSimpleName(), "ai/npc"); + super(AltarOfSouls.class.getSimpleName(), "ai/zones/FaeronVillage"); addStartNpc(ALTAR_OF_SOULS); addFirstTalkId(ALTAR_OF_SOULS); addTalkId(ALTAR_OF_SOULS); diff --git a/trunk/dist/game/data/scripts/ai/npc/RemembranceTower/33989.html b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/RemembranceTower/33989.html similarity index 100% rename from trunk/dist/game/data/scripts/ai/npc/RemembranceTower/33989.html rename to trunk/dist/game/data/scripts/ai/zones/FaeronVillage/RemembranceTower/33989.html diff --git a/trunk/dist/game/data/scripts/ai/npc/RemembranceTower/RemembranceTower.java b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/RemembranceTower/RemembranceTower.java similarity index 90% rename from trunk/dist/game/data/scripts/ai/npc/RemembranceTower/RemembranceTower.java rename to trunk/dist/game/data/scripts/ai/zones/FaeronVillage/RemembranceTower/RemembranceTower.java index 98f4cf16a7..05d73f302a 100644 --- a/trunk/dist/game/data/scripts/ai/npc/RemembranceTower/RemembranceTower.java +++ b/trunk/dist/game/data/scripts/ai/zones/FaeronVillage/RemembranceTower/RemembranceTower.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.RemembranceTower; +package ai.zones.FaeronVillage.RemembranceTower; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -35,7 +35,7 @@ final class RemembranceTower extends AbstractNpcAI private RemembranceTower() { - super(RemembranceTower.class.getSimpleName(), "ai/npc"); + super(RemembranceTower.class.getSimpleName(), "ai/zones/FaeronVillage"); addStartNpc(REMEMBRANCE_TOWER); addTalkId(REMEMBRANCE_TOWER); addFirstTalkId(REMEMBRANCE_TOWER);