From f768338b37d24fdaa14ab32d6c65e851f88a14c1 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 18 Jun 2016 12:06:43 +0000 Subject: [PATCH] Re-organisation of some AI scripts from group folder. --- .../{group => areas/BeastFarm}/BabyPets.java | 2 +- .../{group => areas/BeastFarm}/BeastFarm.java | 2 +- .../BeastFarm}/FeedableBeasts.java | 2 +- .../BeastFarm}/ImprovedBabyPets.java | 2 +- .../DenOfDevil}/DenOfEvil.java | 2 +- .../DragonValley}/LairOfAntharas.java | 2 +- .../OrbisTemple/OrbisTempleTeleports.java | 159 +++++++----------- .../TalkingIsland}/RuinsOfYeSagira.java | 2 +- .../scripts/ai/areas/Wasteland/Wasteland.java | 72 -------- .../{Wasteland => Wastelands}/QueenAnt.java | 2 +- .../Wastelands}/Wastelands.java | 2 +- .../data/scripts/ai/group/OrbisTemple.java | 65 ------- trunk/dist/game/data/zones/custom_script.xml | 36 ---- 13 files changed, 72 insertions(+), 278 deletions(-) rename trunk/dist/game/data/scripts/ai/{group => areas/BeastFarm}/BabyPets.java (99%) rename trunk/dist/game/data/scripts/ai/{group => areas/BeastFarm}/BeastFarm.java (99%) rename trunk/dist/game/data/scripts/ai/{group => areas/BeastFarm}/FeedableBeasts.java (99%) rename trunk/dist/game/data/scripts/ai/{group => areas/BeastFarm}/ImprovedBabyPets.java (99%) rename trunk/dist/game/data/scripts/ai/{group => areas/DenOfDevil}/DenOfEvil.java (99%) rename trunk/dist/game/data/scripts/ai/{group => areas/DragonValley}/LairOfAntharas.java (99%) rename trunk/dist/game/data/scripts/ai/{group => areas/TalkingIsland}/RuinsOfYeSagira.java (98%) delete mode 100644 trunk/dist/game/data/scripts/ai/areas/Wasteland/Wasteland.java rename trunk/dist/game/data/scripts/ai/areas/{Wasteland => Wastelands}/QueenAnt.java (99%) rename trunk/dist/game/data/scripts/ai/{group => areas/Wastelands}/Wastelands.java (99%) delete mode 100644 trunk/dist/game/data/scripts/ai/group/OrbisTemple.java diff --git a/trunk/dist/game/data/scripts/ai/group/BabyPets.java b/trunk/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java similarity index 99% rename from trunk/dist/game/data/scripts/ai/group/BabyPets.java rename to trunk/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.java index 5af251532b..f2f72be670 100644 --- a/trunk/dist/game/data/scripts/ai/group/BabyPets.java +++ b/trunk/dist/game/data/scripts/ai/areas/BeastFarm/BabyPets.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; +package ai.areas.BeastFarm; import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.gameserver.ai.CtrlIntention; diff --git a/trunk/dist/game/data/scripts/ai/group/BeastFarm.java b/trunk/dist/game/data/scripts/ai/areas/BeastFarm/BeastFarm.java similarity index 99% rename from trunk/dist/game/data/scripts/ai/group/BeastFarm.java rename to trunk/dist/game/data/scripts/ai/areas/BeastFarm/BeastFarm.java index 0e2e76285a..03a872dbe9 100644 --- a/trunk/dist/game/data/scripts/ai/group/BeastFarm.java +++ b/trunk/dist/game/data/scripts/ai/areas/BeastFarm/BeastFarm.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; +package ai.areas.BeastFarm; import java.util.ArrayList; import java.util.HashMap; diff --git a/trunk/dist/game/data/scripts/ai/group/FeedableBeasts.java b/trunk/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java similarity index 99% rename from trunk/dist/game/data/scripts/ai/group/FeedableBeasts.java rename to trunk/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index 8962b1886e..3501c25fee 100644 --- a/trunk/dist/game/data/scripts/ai/group/FeedableBeasts.java +++ b/trunk/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.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; +package ai.areas.BeastFarm; import java.util.HashMap; import java.util.Map; diff --git a/trunk/dist/game/data/scripts/ai/group/ImprovedBabyPets.java b/trunk/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java similarity index 99% rename from trunk/dist/game/data/scripts/ai/group/ImprovedBabyPets.java rename to trunk/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.java index 675adbfab0..1b8afbfbeb 100644 --- a/trunk/dist/game/data/scripts/ai/group/ImprovedBabyPets.java +++ b/trunk/dist/game/data/scripts/ai/areas/BeastFarm/ImprovedBabyPets.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; +package ai.areas.BeastFarm; import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.gameserver.ai.CtrlIntention; diff --git a/trunk/dist/game/data/scripts/ai/group/DenOfEvil.java b/trunk/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java similarity index 99% rename from trunk/dist/game/data/scripts/ai/group/DenOfEvil.java rename to trunk/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.java index dbc8c21ff2..a2b9a3f2f7 100644 --- a/trunk/dist/game/data/scripts/ai/group/DenOfEvil.java +++ b/trunk/dist/game/data/scripts/ai/areas/DenOfDevil/DenOfEvil.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; +package ai.areas.DenOfDevil; import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.gameserver.ThreadPoolManager; diff --git a/trunk/dist/game/data/scripts/ai/group/LairOfAntharas.java b/trunk/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java similarity index 99% rename from trunk/dist/game/data/scripts/ai/group/LairOfAntharas.java rename to trunk/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.java index de9881243b..998b45a84b 100644 --- a/trunk/dist/game/data/scripts/ai/group/LairOfAntharas.java +++ b/trunk/dist/game/data/scripts/ai/areas/DragonValley/LairOfAntharas.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; +package ai.areas.DragonValley; import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.model.actor.L2Attackable; diff --git a/trunk/dist/game/data/scripts/ai/areas/OrbisTemple/OrbisTempleTeleports.java b/trunk/dist/game/data/scripts/ai/areas/OrbisTemple/OrbisTempleTeleports.java index dde6fcde41..ff751330f4 100644 --- a/trunk/dist/game/data/scripts/ai/areas/OrbisTemple/OrbisTempleTeleports.java +++ b/trunk/dist/game/data/scripts/ai/areas/OrbisTemple/OrbisTempleTeleports.java @@ -1,97 +1,64 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package ai.areas.OrbisTemple; - -import com.l2jmobius.gameserver.model.Location; -import com.l2jmobius.gameserver.model.actor.L2Character; -import com.l2jmobius.gameserver.model.zone.L2ZoneType; - -import ai.AbstractNpcAI; - -/** - * Orbis Temple teleport AI. - * @author Mobius - */ -public final class OrbisTempleTeleports extends AbstractNpcAI -{ - // Zones - private static final int ZONE_ID_1 = 200201; - private static final int ZONE_ID_2 = 200202; - private static final int ZONE_ID_3 = 200203; - private static final int ZONE_ID_4 = 200204; - private static final int ZONE_ID_5 = 200205; - private static final int ZONE_ID_6 = 200206; - // Teleport Locations - private static final Location TELEPORT_LOC_1 = new Location(198022, 90032, -192); - private static final Location TELEPORT_LOC_2 = new Location(213983, 53250, -8176); - private static final Location TELEPORT_LOC_3 = new Location(215056, 50467, -8416); - private static final Location TELEPORT_LOC_4 = new Location(213799, 53253, -14432); - 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 OrbisTempleTeleports() - { - addEnterZoneId(ZONE_ID_1, ZONE_ID_2, ZONE_ID_3, ZONE_ID_4, ZONE_ID_5, ZONE_ID_6); - } - - @Override - public String onEnterZone(L2Character character, L2ZoneType zone) - { - if (character.isPlayer()) - { - switch (zone.getId()) - { - case ZONE_ID_1: - { - character.teleToLocation(TELEPORT_LOC_2); - break; - } - case ZONE_ID_2: - { - character.teleToLocation(TELEPORT_LOC_1); - break; - } - case ZONE_ID_3: - { - character.teleToLocation(TELEPORT_LOC_4); - break; - } - case ZONE_ID_4: - { - character.teleToLocation(TELEPORT_LOC_3); - break; - } - case ZONE_ID_5: - { - character.teleToLocation(TELEPORT_LOC_6); - break; - } - case ZONE_ID_6: - { - character.teleToLocation(TELEPORT_LOC_5); - break; - } - } - } - return super.onEnterZone(character, zone); - } - - public static void main(String[] args) - { - new OrbisTempleTeleports(); - } +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package ai.areas.OrbisTemple; + +import java.util.HashMap; +import java.util.Map; + +import com.l2jmobius.gameserver.model.Location; +import com.l2jmobius.gameserver.model.actor.L2Character; +import com.l2jmobius.gameserver.model.zone.L2ZoneType; + +import ai.AbstractNpcAI; + +/** + * Orbis Temple AI. + * @author Gladicek + */ +public final class OrbisTempleTeleports extends AbstractNpcAI +{ + private static final Map TELEPORT_DATA = new HashMap<>(); + static + { + TELEPORT_DATA.put(12036, new Location(213983, 53250, -8176)); + TELEPORT_DATA.put(12037, new Location(198022, 90032, -192)); + TELEPORT_DATA.put(12038, new Location(213799, 53253, -14432)); + TELEPORT_DATA.put(12039, new Location(215056, 50467, -8416)); + TELEPORT_DATA.put(12040, new Location(211641, 115547, -12736)); + TELEPORT_DATA.put(12041, new Location(211137, 50501, -14624)); + } + + public OrbisTempleTeleports() + { + addEnterZoneId(TELEPORT_DATA.keySet()); + } + + @Override + public String onEnterZone(L2Character creature, L2ZoneType zone) + { + if (creature.isPlayer() && (creature.getInstanceWorld() == null)) + { + creature.teleToLocation(TELEPORT_DATA.get(zone.getId())); + } + return super.onEnterZone(creature, zone); + } + + public static void main(String[] args) + { + new OrbisTempleTeleports(); + } } \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/ai/group/RuinsOfYeSagira.java b/trunk/dist/game/data/scripts/ai/areas/TalkingIsland/RuinsOfYeSagira.java similarity index 98% rename from trunk/dist/game/data/scripts/ai/group/RuinsOfYeSagira.java rename to trunk/dist/game/data/scripts/ai/areas/TalkingIsland/RuinsOfYeSagira.java index 06206709f3..af20ebd1a3 100644 --- a/trunk/dist/game/data/scripts/ai/group/RuinsOfYeSagira.java +++ b/trunk/dist/game/data/scripts/ai/areas/TalkingIsland/RuinsOfYeSagira.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; +package ai.areas.TalkingIsland; import com.l2jmobius.gameserver.instancemanager.WalkingManager; import com.l2jmobius.gameserver.model.Location; diff --git a/trunk/dist/game/data/scripts/ai/areas/Wasteland/Wasteland.java b/trunk/dist/game/data/scripts/ai/areas/Wasteland/Wasteland.java deleted file mode 100644 index 882ab93264..0000000000 --- a/trunk/dist/game/data/scripts/ai/areas/Wasteland/Wasteland.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package ai.areas.Wasteland; - -import com.l2jmobius.gameserver.model.L2World; -import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; -import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; - -import ai.AbstractNpcAI; - -/** - * Wasteland AI. - * @author Stayway, Mobius - */ -public final class Wasteland extends AbstractNpcAI -{ - // NPCs - private static final int JOEL = 33516; - private static final int SHUAZEN = 33517; - private static final int GUARD = 19126; - - public Wasteland() - { - addSpawnId(JOEL, SHUAZEN, GUARD); - } - - @Override - public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) - { - if (event.equals("GUARD_AGGRO") && (npc != null) && !npc.isDead()) - { - L2World.getInstance().forEachVisibleObject(npc, L2MonsterInstance.class, npc.getAggroRange(), nearby -> - { - if (npc.isInCombat()) - { - return; - } - addAttackDesire(npc, nearby); - return; - }); - startQuestTimer("GUARD_AGGRO", 10000, npc, null); - } - return super.onAdvEvent(event, npc, player); - } - - @Override - public String onSpawn(L2Npc npc) - { - startQuestTimer("GUARD_AGGRO", 5000, npc, null); - return super.onSpawn(npc); - } - - public static void main(String[] args) - { - new Wasteland(); - } -} \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/ai/areas/Wasteland/QueenAnt.java b/trunk/dist/game/data/scripts/ai/areas/Wastelands/QueenAnt.java similarity index 99% rename from trunk/dist/game/data/scripts/ai/areas/Wasteland/QueenAnt.java rename to trunk/dist/game/data/scripts/ai/areas/Wastelands/QueenAnt.java index 832f2aaa5f..bc1a5fe03a 100644 --- a/trunk/dist/game/data/scripts/ai/areas/Wasteland/QueenAnt.java +++ b/trunk/dist/game/data/scripts/ai/areas/Wastelands/QueenAnt.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.areas.Wasteland; +package ai.areas.Wastelands; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; diff --git a/trunk/dist/game/data/scripts/ai/group/Wastelands.java b/trunk/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java similarity index 99% rename from trunk/dist/game/data/scripts/ai/group/Wastelands.java rename to trunk/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.java index 8a01139d15..3b5c481414 100644 --- a/trunk/dist/game/data/scripts/ai/group/Wastelands.java +++ b/trunk/dist/game/data/scripts/ai/areas/Wastelands/Wastelands.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; +package ai.areas.Wastelands; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; diff --git a/trunk/dist/game/data/scripts/ai/group/OrbisTemple.java b/trunk/dist/game/data/scripts/ai/group/OrbisTemple.java deleted file mode 100644 index f7b7b0ce9c..0000000000 --- a/trunk/dist/game/data/scripts/ai/group/OrbisTemple.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package ai.group; - -import java.util.HashMap; -import java.util.Map; - -import com.l2jmobius.gameserver.model.Location; -import com.l2jmobius.gameserver.model.actor.L2Character; -import com.l2jmobius.gameserver.model.zone.L2ZoneType; - -import ai.AbstractNpcAI; - -/** - * Orbis Temple AI. - * @author Gladicek - */ -public final class OrbisTemple extends AbstractNpcAI -{ - private static final Map TELEPORT_DATA = new HashMap<>(); - - static - { - TELEPORT_DATA.put(12036, new Location(213983, 53250, -8176)); - TELEPORT_DATA.put(12037, new Location(198022, 90032, -192)); - TELEPORT_DATA.put(12038, new Location(213799, 53253, -14432)); - TELEPORT_DATA.put(12039, new Location(215056, 50467, -8416)); - TELEPORT_DATA.put(12040, new Location(211641, 115547, -12736)); - TELEPORT_DATA.put(12041, new Location(211137, 50501, -14624)); - } - - public OrbisTemple() - { - addEnterZoneId(TELEPORT_DATA.keySet()); - } - - @Override - public String onEnterZone(L2Character creature, L2ZoneType zone) - { - if (creature.isPlayer() && (creature.getInstanceWorld() == null)) - { - creature.teleToLocation(TELEPORT_DATA.get(zone.getId())); - } - return super.onEnterZone(creature, zone); - } - - public static void main(String[] args) - { - new OrbisTemple(); - } -} \ No newline at end of file diff --git a/trunk/dist/game/data/zones/custom_script.xml b/trunk/dist/game/data/zones/custom_script.xml index b73939eed0..e9d9935d3d 100644 --- a/trunk/dist/game/data/zones/custom_script.xml +++ b/trunk/dist/game/data/zones/custom_script.xml @@ -626,42 +626,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -