From 324f0a3ddbecf44ac196a8172c80aa9f69121add Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 28 Apr 2016 17:31:58 +0000 Subject: [PATCH] Moved Magmeld scripts to zones package. --- trunk/dist/game/data/scripts.cfg | 10 ++++++---- .../Magmeld}/AnghelWaterfallPortal.java | 4 ++-- .../{group_template => zones/Magmeld}/ArcanRitual.java | 2 +- .../Magmeld}/OrbisTempleStatues.java | 4 ++-- .../Magmeld/OrbisTempleTeleports.java} | 10 +++++----- 5 files changed, 16 insertions(+), 14 deletions(-) rename trunk/dist/game/data/scripts/ai/{npc/Teleports/AnghelWaterfallPortal => zones/Magmeld}/AnghelWaterfallPortal.java (89%) rename trunk/dist/game/data/scripts/ai/{group_template => zones/Magmeld}/ArcanRitual.java (96%) rename trunk/dist/game/data/scripts/ai/{group_template => zones/Magmeld}/OrbisTempleStatues.java (96%) rename trunk/dist/game/data/scripts/ai/{npc/Teleports/OrbisTemple/OrbisTemple.java => zones/Magmeld/OrbisTempleTeleports.java} (89%) diff --git a/trunk/dist/game/data/scripts.cfg b/trunk/dist/game/data/scripts.cfg index 3ca8a1ddcb..5189bee7f2 100644 --- a/trunk/dist/game/data/scripts.cfg +++ b/trunk/dist/game/data/scripts.cfg @@ -12,7 +12,6 @@ handlers/MasterHandler.java # Group Template ai/group_template/AdenReconstructorManager.java -ai/group_template/ArcanRitual.java ai/group_template/BeastFarm.java ai/group_template/DenOfEvil.java ai/group_template/DragonValley.java @@ -30,7 +29,6 @@ ai/group_template/MinionSpawnManager.java ai/group_template/MonasteryOfSilence.java ai/group_template/NonLethalableNpcs.java ai/group_template/NonRandomWalkNpcs.java -ai/group_template/OrbisTempleStatues.java ai/group_template/PaganKey.java ai/group_template/PaganTemple.java ai/group_template/PavelArchaic.java @@ -168,7 +166,6 @@ ai/npc/Sirra/Sirra.java ai/npc/Summons/MerchantGolem/GolemTrader.java ai/npc/SupportUnitCaptain/SupportUnitCaptain.java ai/npc/SymbolMaker/SymbolMaker.java -ai/npc/Teleports/AnghelWaterfallPortal/AnghelWaterfallPortal.java ai/npc/Teleports/CrumaTower/CrumaTower.java ai/npc/Teleports/DarkOmens/DarkOmens.java ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java @@ -184,7 +181,6 @@ ai/npc/Teleports/Klemis/Klemis.java ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java -ai/npc/Teleports/OrbisTemple/OrbisTemple.java ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java @@ -216,6 +212,12 @@ ai/zones/FantasyIsle/HandysBlockCheckerEvent.java ai/zones/FantasyIsle/Parade.java ai/zones/FantasyIsle/TalentShow.java +# Magmeld +ai/zones/Magmeld/AnghelWaterfallPortal.java +ai/zones/Magmeld/ArcanRitual.java +ai/zones/Magmeld/OrbisTempleStatues.java +ai/zones/Magmeld/OrbisTempleTeleports.java + # Village Master village_master/Clan/Clan.java village_master/Alliance/Alliance.java diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/AnghelWaterfallPortal/AnghelWaterfallPortal.java b/trunk/dist/game/data/scripts/ai/zones/Magmeld/AnghelWaterfallPortal.java similarity index 89% rename from trunk/dist/game/data/scripts/ai/npc/Teleports/AnghelWaterfallPortal/AnghelWaterfallPortal.java rename to trunk/dist/game/data/scripts/ai/zones/Magmeld/AnghelWaterfallPortal.java index 249ea7590b..1178e5fe58 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/AnghelWaterfallPortal/AnghelWaterfallPortal.java +++ b/trunk/dist/game/data/scripts/ai/zones/Magmeld/AnghelWaterfallPortal.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.AnghelWaterfallPortal; +package ai.zones.Magmeld; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -33,7 +33,7 @@ final class AnghelWaterfallPortal extends AbstractNpcAI private AnghelWaterfallPortal() { - super(AnghelWaterfallPortal.class.getSimpleName(), "ai/npc/Teleports"); + super(AnghelWaterfallPortal.class.getSimpleName(), "ai/zones/Magmeld"); addEnterZoneId(ZONE_ID); } diff --git a/trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java b/trunk/dist/game/data/scripts/ai/zones/Magmeld/ArcanRitual.java similarity index 96% rename from trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java rename to trunk/dist/game/data/scripts/ai/zones/Magmeld/ArcanRitual.java index f2179e30c7..0cdc676448 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java +++ b/trunk/dist/game/data/scripts/ai/zones/Magmeld/ArcanRitual.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.Magmeld; import java.util.ArrayList; diff --git a/trunk/dist/game/data/scripts/ai/group_template/OrbisTempleStatues.java b/trunk/dist/game/data/scripts/ai/zones/Magmeld/OrbisTempleStatues.java similarity index 96% rename from trunk/dist/game/data/scripts/ai/group_template/OrbisTempleStatues.java rename to trunk/dist/game/data/scripts/ai/zones/Magmeld/OrbisTempleStatues.java index 89b7980570..a5159b7be7 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/OrbisTempleStatues.java +++ b/trunk/dist/game/data/scripts/ai/zones/Magmeld/OrbisTempleStatues.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.Magmeld; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -45,7 +45,7 @@ final class OrbisTempleStatues extends AbstractNpcAI public OrbisTempleStatues() { - super(OrbisTempleStatues.class.getSimpleName(), "ai/group_template"); + super(OrbisTempleStatues.class.getSimpleName(), "ai/zones/Magmeld"); addSpawnId(VICTIM_1, VICTIM_2, VICTIM_3, GUARD_1, GUARD_2, GUARD_3, THROWER_1, THROWER_2, THROWER_3, ANCIENT_HERO, CHIEF_CURATOR); addAttackId(VICTIM_1, VICTIM_2, VICTIM_3, GUARD_1, GUARD_2, GUARD_3, THROWER_1, THROWER_2, THROWER_3); } diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/OrbisTemple/OrbisTemple.java b/trunk/dist/game/data/scripts/ai/zones/Magmeld/OrbisTempleTeleports.java similarity index 89% rename from trunk/dist/game/data/scripts/ai/npc/Teleports/OrbisTemple/OrbisTemple.java rename to trunk/dist/game/data/scripts/ai/zones/Magmeld/OrbisTempleTeleports.java index 4be38836d9..d5efe8ff83 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/OrbisTemple/OrbisTemple.java +++ b/trunk/dist/game/data/scripts/ai/zones/Magmeld/OrbisTempleTeleports.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.OrbisTemple; +package ai.zones.Magmeld; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Character; @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Orbis Temple teleport AI. * @author Mobius */ -final class OrbisTemple extends AbstractNpcAI +final class OrbisTempleTeleports extends AbstractNpcAI { // Zones private static final int ZONE_ID_1 = 200201; @@ -43,9 +43,9 @@ final class OrbisTemple extends AbstractNpcAI private static final Location TELEPORT_LOC_5 = new Location(211137, 50501, -14624); private static final Location TELEPORT_LOC_6 = new Location(211641, 115547, -12736); - private OrbisTemple() + private OrbisTempleTeleports() { - super(OrbisTemple.class.getSimpleName(), "ai/npc/Teleports"); + super(OrbisTempleTeleports.class.getSimpleName(), "ai/zones/Magmeld"); addEnterZoneId(ZONE_ID_1, ZONE_ID_2, ZONE_ID_3, ZONE_ID_4, ZONE_ID_5, ZONE_ID_6); } @@ -93,6 +93,6 @@ final class OrbisTemple extends AbstractNpcAI public static void main(String[] args) { - new OrbisTemple(); + new OrbisTempleTeleports(); } } \ No newline at end of file