From c7ff2fc70f94e50b9da45900e55d99f80e8aa738 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 1 May 2016 18:00:23 +0000
Subject: [PATCH] Moved Gainak Underground scripts to zones package.

---
 trunk/dist/game/data/scripts.cfg                       |  6 ++++--
 .../GainakUnderground}/Lailly.java                     |  4 ++--
 .../UndergroundEntranceTeleports.java}                 | 10 +++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename trunk/dist/game/data/scripts/ai/{individual => zones/GainakUnderground}/Lailly.java (90%)
 rename trunk/dist/game/data/scripts/ai/{npc/Teleports/GainakUndergroundEntrance/GainakUndergroundEntrance.java => zones/GainakUnderground/UndergroundEntranceTeleports.java} (87%)

diff --git a/trunk/dist/game/data/scripts.cfg b/trunk/dist/game/data/scripts.cfg
index 673ec44048..5248fd4689 100644
--- a/trunk/dist/game/data/scripts.cfg
+++ b/trunk/dist/game/data/scripts.cfg
@@ -63,7 +63,6 @@ ai/individual/EvasGiftBox.java
 ai/individual/FrightenedRagnaOrc.java
 ai/individual/Gordon.java
 ai/individual/GraveRobbers.java
-ai/individual/Lailly.java
 ai/individual/MercenaryCaptain.java
 ai/individual/Orfen.java
 ai/individual/QueenAnt.java
@@ -127,7 +126,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/GainakUndergroundEntrance/GainakUndergroundEntrance.java
 ai/npc/Teleports/GardenOfSpirits/GardenOfSpirits.java
 ai/npc/Teleports/GiantServant/GiantServant.java
 ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java
@@ -172,6 +170,10 @@ ai/zones/FantasyIsle/HandysBlockCheckerEvent.java
 ai/zones/FantasyIsle/Parade.java
 ai/zones/FantasyIsle/TalentShow.java
 
+# Gainak Underground
+ai/zones/GainakUnderground/Lailly.java
+ai/zones/GainakUnderground/UndergroundEntranceTeleports.java
+
 # Gracia
 ai/zones/Gracia/EnergySeeds.java
 ai/zones/Gracia/SeedOfAnnihilation.java
diff --git a/trunk/dist/game/data/scripts/ai/individual/Lailly.java b/trunk/dist/game/data/scripts/ai/zones/GainakUnderground/Lailly.java
similarity index 90%
rename from trunk/dist/game/data/scripts/ai/individual/Lailly.java
rename to trunk/dist/game/data/scripts/ai/zones/GainakUnderground/Lailly.java
index 131afa3563..5adc65c7cb 100644
--- a/trunk/dist/game/data/scripts/ai/individual/Lailly.java
+++ b/trunk/dist/game/data/scripts/ai/zones/GainakUnderground/Lailly.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.individual;
+package ai.zones.GainakUnderground;
 
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -34,7 +34,7 @@ final class Lailly extends AbstractNpcAI
 	
 	private Lailly()
 	{
-		super(Lailly.class.getSimpleName(), "ai/individual");
+		super(Lailly.class.getSimpleName(), "ai/zones/GainakUnderground");
 		addSpawnId(LAILLY);
 	}
 	
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/GainakUndergroundEntrance/GainakUndergroundEntrance.java b/trunk/dist/game/data/scripts/ai/zones/GainakUnderground/UndergroundEntranceTeleports.java
similarity index 87%
rename from trunk/dist/game/data/scripts/ai/npc/Teleports/GainakUndergroundEntrance/GainakUndergroundEntrance.java
rename to trunk/dist/game/data/scripts/ai/zones/GainakUnderground/UndergroundEntranceTeleports.java
index 5fef13822d..c7f83e0022 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/GainakUndergroundEntrance/GainakUndergroundEntrance.java
+++ b/trunk/dist/game/data/scripts/ai/zones/GainakUnderground/UndergroundEntranceTeleports.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.npc.Teleports.GainakUndergroundEntrance;
+package ai.zones.GainakUnderground;
 
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -26,7 +26,7 @@ import ai.AbstractNpcAI;
  * Gainak Underground Entrance teleport AI.
  * @author Mobius
  */
-final class GainakUndergroundEntrance extends AbstractNpcAI
+final class UndergroundEntranceTeleports extends AbstractNpcAI
 {
 	// Zones
 	private static final int ZONE_ID_1 = 200207;
@@ -43,9 +43,9 @@ final class GainakUndergroundEntrance extends AbstractNpcAI
 	private static final Location TELEPORT_LOC_5 = new Location(-46867, -149309, -14216);
 	private static final Location TELEPORT_LOC_6 = new Location(18784, -115648, -248);
 	
-	private GainakUndergroundEntrance()
+	private UndergroundEntranceTeleports()
 	{
-		super(GainakUndergroundEntrance.class.getSimpleName(), "ai/npc/Teleports");
+		super(UndergroundEntranceTeleports.class.getSimpleName(), "ai/zones/GainakUnderground");
 		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 GainakUndergroundEntrance extends AbstractNpcAI
 	
 	public static void main(String[] args)
 	{
-		new GainakUndergroundEntrance();
+		new UndergroundEntranceTeleports();
 	}
 }
\ No newline at end of file