diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/HotSprings.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/HotSprings.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java
index e3c51a551c..016b50e41c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/HotSprings.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.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.areas.HotSprings;
import com.l2jmobius.gameserver.datatables.SkillData;
import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -48,7 +48,6 @@ public final class HotSprings extends AbstractNpcAI
private HotSprings()
{
- super(HotSprings.class.getSimpleName(), "ai/group_template");
addAttackId(BANDERSNATCHLING, FLAVA, ATROXSPAWN, NEPENTHES, ATROX, BANDERSNATCH);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DarkWaterDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DarkWaterDragon.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 75235177d8..9d8c230ce5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DarkWaterDragon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.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;
+package ai.areas.IsleOfPrayer;
import java.util.Map;
import java.util.Set;
@@ -46,7 +46,6 @@ public final class DarkWaterDragon extends AbstractNpcAI
private DarkWaterDragon()
{
- super(DarkWaterDragon.class.getSimpleName(), "ai/individual");
final int[] mobs =
{
DRAGON,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/EvasGiftBox.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/EvasGiftBox.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/EvasGiftBox.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/EvasGiftBox.java
index 609ba9e8c1..c165c91fa9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/EvasGiftBox.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/EvasGiftBox.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;
+package ai.areas.IsleOfPrayer;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -39,7 +39,6 @@ public final class EvasGiftBox extends AbstractNpcAI
private EvasGiftBox()
{
- super(EvasGiftBox.class.getSimpleName(), "ai/individual");
addKillId(BOX);
addSpawnId(BOX);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/IsleOfPrayer.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/IsleOfPrayer.java
index 6dfd6fe218..50f984d64d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/IsleOfPrayer.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.areas.IsleOfPrayer;
import java.util.HashMap;
import java.util.Map;
@@ -59,7 +59,6 @@ public final class IsleOfPrayer extends AbstractNpcAI
private IsleOfPrayer()
{
- super(IsleOfPrayer.class.getSimpleName(), "ai/group_template");
addKillId(MONSTERS.keySet());
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rignos/32349-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/32349-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rignos/32349-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/32349-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rignos/32349-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/32349-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rignos/32349-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/32349-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rignos/32349-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/32349-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rignos/32349-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/32349-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rignos/32349.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/32349.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rignos/32349.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/32349.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rignos/Rignos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rignos/Rignos.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.java
index e2fd01216d..b14559791b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Rignos/Rignos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/Rignos/Rignos.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.Rignos;
+package ai.areas.IsleOfPrayer.Rignos;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -40,7 +40,6 @@ public class Rignos extends AbstractNpcAI
private Rignos()
{
- super(Rignos.class.getSimpleName(), "ai/npc");
addStartNpc(RIGNOS);
addTalkId(RIGNOS);
addFirstTalkId(RIGNOS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31370-friend.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31370-friend.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31370-friend.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31370-friend.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31370-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31370-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31370-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31370-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31371-friend.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31371-friend.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31371-friend.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31371-friend.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31371-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31371-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31371-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31371-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31372-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31372-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31372-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31372-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31372-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31372-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31372-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31372-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31372-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31372-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31372-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31372-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31372-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31372-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31372-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31372-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31373-friend.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31373-friend.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31373-friend.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31373-friend.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31373-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31373-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31373-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31373-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31374-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31374-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31374-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31374-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31374-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31374-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31374-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31374-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31374-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31374-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31374-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31374-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31375-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31375-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31375-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31375-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31375-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31375-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31375-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31375-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31375-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31375-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31375-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31375-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31375-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31375-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31375-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31375-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31376-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31376-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31376-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31376-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31376-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31376-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31376-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31376-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31376-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31376-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31376-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31376-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31376-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31376-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31376-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31376-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31376-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31376-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31376-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31376-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31376-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31376-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/31376-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/31376-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 1af408b592..7718d8621f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.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.KetraOrcSupport;
+package ai.areas.KetraOrcOutpust.KetraOrcSupport;
import java.util.HashMap;
import java.util.Map;
@@ -90,7 +90,6 @@ public final class KetraOrcSupport extends AbstractNpcAI
private KetraOrcSupport()
{
- super(KetraOrcSupport.class.getSimpleName(), "ai/npc");
addFirstTalkId(KADUN, WAHKAN, ASEFA, ATAN, JAFF, JUMARA, KURFA);
addTalkId(ASEFA, KURFA, JAFF);
addStartNpc(KURFA, JAFF);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/GraveRobbers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/GraveRobbers.java
similarity index 90%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/GraveRobbers.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/GraveRobbers.java
index 499d676c53..a411f9cb68 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/GraveRobbers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/GraveRobbers.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;
+package ai.areas.MithrilMines;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -35,7 +35,6 @@ public final class GraveRobbers extends AbstractNpcAI
private GraveRobbers()
{
- super(GraveRobbers.class.getSimpleName(), "ai/individual");
addSpawnId(GRAVE_ROBBER_SUMMONER, GRAVE_ROBBER_MEGICIAN);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/32652-01.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/32652-01.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/32652-01.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/32652-01.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/32652-02.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/32652-02.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/32652-02.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/32652-02.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/32652-03.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/32652-03.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/32652-03.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/32652-03.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
similarity index 91%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 3e2967bb1d..5338cfbec6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MithrilMines/MithrilMinesTeleporter/MithrilMinesTeleporter.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.MithrilMinesTeleporter;
+package ai.areas.MithrilMines.MithrilMinesTeleporter;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -43,7 +43,6 @@ public final class MithrilMinesTeleporter extends AbstractNpcAI
private MithrilMinesTeleporter()
{
- super(MithrilMinesTeleporter.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(TELEPORT_CRYSTAL);
addFirstTalkId(TELEPORT_CRYSTAL);
addTalkId(TELEPORT_CRYSTAL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
index e85ce63f31..e4145d3b47 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.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.areas.MonasteryOfSilence;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.enums.ChatType;
@@ -73,7 +73,6 @@ public final class MonasteryOfSilence extends AbstractNpcAI
private MonasteryOfSilence()
{
- super(MonasteryOfSilence.class.getSimpleName(), "ai/group_template");
addSkillSeeId(DIVINITY_CLAN);
addAttackId(KNIGHT, CAPTAIN, GUIDE, SEEKER, ASCETIC);
addNpcHateId(GUIDE, SEEKER, SAVIOR, ASCETIC);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/FadedMark.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/FadedMark.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/FadedMark.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/FadedMark.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.java
index 6388014616..db6a60d747 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/PaganTeleporters.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.PaganTeleporters;
+package ai.areas.PaganTemple.PaganTeleporters;
import java.util.HashMap;
import java.util.Map;
@@ -55,7 +55,6 @@ public final class PaganTeleporters extends AbstractNpcAI
private PaganTeleporters()
{
- super(PaganTeleporters.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(NPCS);
addTalkId(NPCS);
addFirstTalkId(TRIOLS_MIRROR_1, TRIOLS_MIRROR_2);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/noItem.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/noItem.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/noItem.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/noItem.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/noMark.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/noMark.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/noMark.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/noMark.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/openDoor.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/openDoor.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/openDoor.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PaganTemple/PaganTeleporters/openDoor.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PavelArchaic.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PavelArchaic/PavelArchaic.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PavelArchaic.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PavelArchaic/PavelArchaic.java
index cef6ca41f7..a024f15da4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PavelArchaic.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PavelArchaic/PavelArchaic.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.areas.PavelArchaic;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -35,7 +35,6 @@ public final class PavelArchaic extends AbstractNpcAI
private PavelArchaic()
{
- super(PavelArchaic.class.getSimpleName(), "ai/group_template");
addKillId(SAFETY_DEVICE, PINCER_GOLEM, JACKHAMMER_GOLEM);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfDion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfDion.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java
index 91214518d1..d4770c0203 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfDion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.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.areas.PlainsOfDion;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -57,7 +57,6 @@ public final class PlainsOfDion extends AbstractNpcAI
private PlainsOfDion()
{
- super(PlainsOfDion.class.getSimpleName(), "ai/group_template");
addAttackId(DELU_LIZARDMEN);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.java
index 138f174c22..d299cea079 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PlainsOfLizardman/PlainsOfLizardman.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.areas.PlainsOfLizardman;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.model.Location;
@@ -90,7 +90,6 @@ public final class PlainsOfLizardman extends AbstractNpcAI
private PlainsOfLizardman()
{
- super(PlainsOfLizardman.class.getSimpleName(), "ai/group_template");
addAttackId(FANTASY_MUSHROOM, RAINBOW_FROG, STICKY_MUSHROOM, ENERGY_PLANT, TANTA_SUMMONER);
addKillId(TANTA_LIZARDMEN);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32111-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/ElrokiTeleporters/32111-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32111-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/ElrokiTeleporters/32111-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32111.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/ElrokiTeleporters/32111.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32111.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/ElrokiTeleporters/32111.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32112-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/ElrokiTeleporters/32112-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32112-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/ElrokiTeleporters/32112-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32112.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/ElrokiTeleporters/32112.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/32112.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/ElrokiTeleporters/32112.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/ElrokiTeleporters/ElrokiTeleporters.java
similarity index 91%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/ElrokiTeleporters/ElrokiTeleporters.java
index 4eb825aed2..b7e6737a8f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/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.areas.PrimevalIsle.ElrokiTeleporters;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -37,7 +37,6 @@ public final class ElrokiTeleporters extends AbstractNpcAI
private ElrokiTeleporters()
{
- super(ElrokiTeleporters.class.getSimpleName(), "ai/npc/Teleports");
addFirstTalkId(ORAHOCHIN, GARIACHIN);
addStartNpc(ORAHOCHIN, GARIACHIN);
addTalkId(ORAHOCHIN, GARIACHIN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PrimevalIsle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PrimevalIsle.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
index 04cada182a..a84b20e4ee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PrimevalIsle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/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.areas.PrimevalIsle;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.enums.ChatType;
@@ -104,7 +104,6 @@ public final class PrimevalIsle extends AbstractNpcAI
private PrimevalIsle()
{
- super(PrimevalIsle.class.getSimpleName(), "ai/group_template");
addSpawnId(TREX);
addSpawnId(SPRIGNANT);
addSpawnId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Venom/29055.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/29055.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Venom/29055.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/29055.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Venom/35506-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/35506-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Venom/35506-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/35506-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Venom/35506.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/35506.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Venom/35506.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/35506.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Venom/Venom.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Venom/Venom.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index 9fa1d746da..445f616d6c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Venom/Venom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.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.Venom;
+package ai.areas.Rune.RuneCastle.Venom;
import java.util.ArrayList;
import java.util.List;
@@ -99,7 +99,6 @@ public final class Venom extends AbstractNpcAI
private Venom()
{
- super(Venom.class.getSimpleName(), "ai/individual");
addStartNpc(DUNGEON_KEEPER, TELEPORT_CUBE);
addFirstTalkId(DUNGEON_KEEPER, TELEPORT_CUBE);
addTalkId(DUNGEON_KEEPER, TELEPORT_CUBE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SelMahumDrill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SelMahumDrill.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
index 335fef037b..e5d2f59f03 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SelMahumDrill.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.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.areas.SelMahumTrainingGrounds;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -128,8 +128,6 @@ public final class SelMahumDrill extends AbstractNpcAI
private SelMahumDrill()
{
- super(SelMahumDrill.class.getSimpleName(), "ai/group_template");
-
addAttackId(MAHUM_CHIEFS);
addAttackId(MAHUM_SOLDIERS);
addKillId(MAHUM_CHIEFS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SelMahumSquad.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SelMahumSquad.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
index f6e645a549..094ccac1ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SelMahumSquad.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.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.areas.SelMahumTrainingGrounds;
import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.ai.CtrlIntention;
@@ -68,8 +68,6 @@ public final class SelMahumSquad extends AbstractNpcAI
private SelMahumSquad()
{
- super(SelMahumSquad.class.getSimpleName(), "ai/group_template");
-
addAttackId(CHEF);
addAttackId(SQUAD_LEADERS);
addEventReceivedId(CHEF, FIRE, STOVE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SilentValley.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SilentValley.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.java
index a2ed7a538a..c55d69ba9f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SilentValley.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SilentValley/SilentValley.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.areas.SilentValley;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.L2Object;
@@ -60,7 +60,6 @@ public final class SilentValley extends AbstractNpcAI
private SilentValley()
{
- super(SilentValley.class.getSimpleName(), "ai/group_template");
addAttackId(MOBS);
addAttackId(CHEST, GUARD1, GUARD2);
addEventReceivedId(GUARD1, GUARD2);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/StakatoNest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/StakatoNest.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index 87490af7fb..5345ecd231 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/StakatoNest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.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.areas.StakatoNest;
import java.util.List;
@@ -82,7 +82,6 @@ public final class StakatoNest extends AbstractNpcAI
private StakatoNest()
{
- super(StakatoNest.class.getSimpleName(), "ai/group_template");
registerMobs(STAKATO_MOBS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/32640-no.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/32640-no.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/32640-no.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/32640-no.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/32640.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/32640.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/32640.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/32640.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.java
index 1a01068d92..8886696485 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNestTeleporter/StakatoNestTeleporter.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.StakatoNestTeleporter;
+package ai.areas.StakatoNest.StakatoNestTeleporter;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -44,7 +44,6 @@ public final class StakatoNestTeleporter extends AbstractNpcAI
private StakatoNestTeleporter()
{
- super(StakatoNestTeleporter.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(KINTAIJIN);
addTalkId(KINTAIJIN);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/30949no-adena.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/30949no-adena.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/30949no-adena.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/30949no-adena.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/30950no-adena.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/30950no-adena.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/30950no-adena.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/30950no-adena.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/30951no-adena.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/30951no-adena.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/30951no-adena.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/30951no-adena.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.java
index 4f0171e583..cc82125902 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/ToIVortex.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.ToIVortex;
+package ai.areas.TowerOfInsolence.ToIVortex;
import java.util.HashMap;
import java.util.Map;
@@ -81,7 +81,6 @@ public final class ToIVortex extends AbstractNpcAI
private ToIVortex()
{
- super(ToIVortex.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(KEPLON, EUCLIE, PITHGON, DIMENSION_VORTEX_1, DIMENSION_VORTEX_2, DIMENSION_VORTEX_3);
addTalkId(KEPLON, EUCLIE, PITHGON, DIMENSION_VORTEX_1, DIMENSION_VORTEX_2, DIMENSION_VORTEX_3);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/no-stones.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/no-stones.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/no-stones.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/TowerOfInsolence/ToIVortex/no-stones.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31377-friend.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31377-friend.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31377-friend.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31377-friend.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31377-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31377-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31377-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31377-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31378-friend.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31378-friend.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31378-friend.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31378-friend.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31378-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31378-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31378-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31378-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31379-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31379-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31379-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31379-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31379-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31379-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31379-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31379-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31379-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31379-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31379-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31379-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31379-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31379-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31379-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31379-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31380-friend.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31380-friend.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31380-friend.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31380-friend.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31380-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31380-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31380-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31380-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31381-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31381-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31381-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31381-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31381-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31381-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31381-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31381-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31381-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31381-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31381-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31381-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31382-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31382-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31382-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31382-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31382-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31382-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31382-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31382-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31382-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31382-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31382-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31382-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31382-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31382-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31382-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31382-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31383-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31383-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31383-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31383-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31383-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31383-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31383-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31383-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31383-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31383-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31383-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31383-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31383-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31383-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31383-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31383-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31383-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31383-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31383-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31383-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31383-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31383-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/31383-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/31383-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index 48a8b2279e..81a9509e17 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.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.VarkaSilenosSupport;
+package ai.areas.VarkaSilenosBarracks.VarkaSilenosSupport;
import java.util.HashMap;
import java.util.Map;
@@ -90,7 +90,6 @@ public final class VarkaSilenosSupport extends AbstractNpcAI
private VarkaSilenosSupport()
{
- super(VarkaSilenosSupport.class.getSimpleName(), "ai/npc");
addFirstTalkId(ASHAS, NARAN, UDAN, DIYABU, HAGOS, SHIKON, TERANU);
addTalkId(UDAN, HAGOS, TERANU);
addStartNpc(HAGOS, TERANU);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/package-info.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/package-info.java
similarity index 56%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/package-info.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/package-info.java
index 81278dc830..0bb127ad5b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/package-info.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/package-info.java
@@ -14,14 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
/**
- * Teleporter AIs are used for teleports that are too advanced to be done under normal means.
- * For example, teleporting to the race track allows a player a free teleport and a free return to the same city from which the player went to the race track.
- * Normal teleports do not store any information about the origin.
- * In order to achieve this special teleportation, a teleport script is needed.
- *
- * All implementation details are fully covered by quests.
- * @author Zoey76
+ * @author Mobius
*/
-package ai.npc.Teleports;
\ No newline at end of file
+package ai.areas;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Anais.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Anais/Anais.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Anais.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Anais/Anais.java
index 3d83ecf8e1..9dfb3e3c18 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Anais.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Anais/Anais.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;
+package ai.bosses.Anais;
import java.util.ArrayList;
import java.util.Map;
@@ -48,7 +48,6 @@ public final class Anais extends AbstractNpcAI
private Anais()
{
- super(Anais.class.getSimpleName(), "ai/individual");
addAttackId(ANAIS);
addSpawnId(DIVINE_BURNER);
addKillId(GRAIL_WARD);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/13001-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/13001-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/13001-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/13001-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/13001-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/13001-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/13001-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/13001-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/13001-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/13001-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/13001-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/13001-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/13001-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/13001-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/13001-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/13001-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/13001-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/13001-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/13001-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/13001-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/13001.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/13001.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/13001.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/13001.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/Antharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/Antharas.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java
index 29dba844cc..d43d9eb1b0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Antharas/Antharas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.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.Antharas;
+package ai.bosses.Antharas;
import java.util.HashMap;
import java.util.List;
@@ -124,7 +124,6 @@ public final class Antharas extends AbstractNpcAI
private Antharas()
{
- super(Antharas.class.getSimpleName(), "ai/individual");
addStartNpc(HEART, CUBE);
addTalkId(HEART, CUBE);
addFirstTalkId(HEART);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Baium/31862-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/31862-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Baium/31862-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/31862-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Baium/31862-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/31862-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Baium/31862-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/31862-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Baium/31862-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/31862-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Baium/31862-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/31862-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Baium/31862-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/31862-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Baium/31862-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/31862-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Baium/31862.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/31862.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Baium/31862.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/31862.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Baium/Baium.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Baium/Baium.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 35398ec228..50db6c41e7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Baium/Baium.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.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.Baium;
+package ai.bosses.Baium;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention;
@@ -100,7 +100,6 @@ public final class Baium extends AbstractNpcAI
private Baium()
{
- super(Baium.class.getSimpleName(), "ai/individual");
addFirstTalkId(ANG_VORTEX);
addTalkId(ANG_VORTEX, TELE_CUBE, BAIUM_STONE);
addStartNpc(ANG_VORTEX, TELE_CUBE, BAIUM_STONE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Beleth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Beleth.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index 24c4d363d9..cea93d1301 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Beleth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.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;
+package ai.bosses.Beleth;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -98,7 +98,6 @@ public final class Beleth extends AbstractNpcAI
private Beleth()
{
- super(Beleth.class.getSimpleName(), "ai/individual");
addEnterZoneId(ZONE.getId());
registerMobs(REAL_BELETH, FAKE_BELETH);
addStartNpc(STONE_COFFIN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Core.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Core.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java
index 82fa2631a7..f3e9c208b8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Core.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.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;
+package ai.bosses.Core;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -59,7 +59,6 @@ public final class Core extends AbstractNpcAI
private Core()
{
- super(Core.class.getSimpleName(), "ai/individual");
registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
_firstAttacked = false;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
index 92e5c3784e..08b7bdbe3f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DrChaos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.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;
+package ai.bosses.DrChaos;
import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.ai.CtrlIntention;
@@ -56,8 +56,6 @@ public class DrChaos extends AbstractNpcAI
public DrChaos()
{
- super(DrChaos.class.getSimpleName(), "ai");
-
addFirstTalkId(DOCTOR_CHAOS); // Different HTMs following actual humor.
addSpawnId(DOCTOR_CHAOS); // Timer activation at 30sec + paranoia activity.
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Orfen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Orfen.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 7633df8889..01ea27455a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Orfen.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.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;
+package ai.bosses.Orfen;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -78,7 +78,6 @@ public final class Orfen extends AbstractNpcAI
private Orfen()
{
- super(Orfen.class.getSimpleName(), "ai/individual");
final int[] mobs =
{
ORFEN,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/QueenAnt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/QueenAnt.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
index c3713cc8b1..e344be4701 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/QueenAnt.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/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.individual;
+package ai.bosses.QueenAnt;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -86,7 +86,6 @@ public final class QueenAnt extends AbstractNpcAI
private QueenAnt()
{
- super(QueenAnt.class.getSimpleName(), "ai/individual");
addSpawnId(MOBS);
addKillId(MOBS);
addAggroRangeEnterId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/QueenShyeed.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/QueenShyeed.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java
index fb7385d17f..62812ffa7d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/QueenShyeed.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.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;
+package ai.bosses.QueenShyeed;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
@@ -78,7 +78,6 @@ public final class QueenShyeed extends AbstractNpcAI
private QueenShyeed()
{
- super(QueenShyeed.class.getSimpleName(), "ai/individual");
addKillId(SHYEED);
spawnShyeed();
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-01a.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-01a.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-01a.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-01a.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-02a.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-02a.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-02a.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-02a.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-03a.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-03a.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-03a.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-03a.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/32109.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/32109.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/Sailren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/Sailren.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java
index fb5c439235..9aa5d1dbec 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Sailren/Sailren.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/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.bosses.Sailren;
import com.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@@ -65,7 +65,6 @@ public final class Sailren extends AbstractNpcAI
private Sailren()
{
- super(Sailren.class.getSimpleName(), "ai/individual");
addStartNpc(STATUE, CUBIC);
addTalkId(STATUE, CUBIC);
addFirstTalkId(STATUE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Valakas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Valakas.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index 31a29294ed..fd408dcf0b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Valakas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.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;
+package ai.bosses.Valakas;
import java.util.ArrayList;
import java.util.List;
@@ -118,7 +118,6 @@ public final class Valakas extends AbstractNpcAI
private Valakas()
{
- super(Valakas.class.getSimpleName(), "ai/individual");
registerMobs(VALAKAS);
ZONE = GrandBossManager.getInstance().getZone(212852, -114842, -1632);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/package-info.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/package-info.java
new file mode 100644
index 0000000000..7fc7403d60
--- /dev/null
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * 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 .
+ */
+/**
+ * @author Mobius
+ */
+package ai.bosses;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/RangeGuard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/RangeGuard.java
deleted file mode 100644
index 790a2cfb58..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/RangeGuard.java
+++ /dev/null
@@ -1,119 +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_template;
-
-import com.l2jmobius.gameserver.data.xml.impl.NpcData;
-import com.l2jmobius.gameserver.model.L2Object;
-import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.L2Playable;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
-import com.l2jmobius.gameserver.model.holders.SkillHolder;
-import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.util.Util;
-
-import ai.AbstractNpcAI;
-
-/**
- * Range Guard AI.
- * @author St3eT.
- */
-public final class RangeGuard extends AbstractNpcAI
-{
- // Skill
- private static final SkillHolder ULTIMATE_DEFENSE = new SkillHolder(5044, 3); // NPC Ultimate Defense
- //@formatter:off
- private static final int[] NOT_ALLOWED_SKILLS =
- {
- 15, 28, // Charm / Aggression
- 51, 65, // Lure / Horror
- 106, 115, // Veil / Power Break
- 122, 127, // Hex / Hamstring
- 254, 352, // Spoil / Shield Bash
- 353, 358, // Shield Slam / Bluff
- 402, 403, // Arrest / Shackle
- 412, 485, // Sand Bomb / Disarm
- 501, 511, // Violent Temper / Temptation
- 522, 531, // Real Target / Critical Wound
- 680, 695, // Divine Knight Hate / Divine Wizard Divine Cloud
- 696, 716, // Divine Wizard Surrender to Divine / Zaken Hold
- 775, 792, // Weapon Blockade / Betrayal Mark
- 1042, 1049, // Hold Undead / Requiem
- 1069, 1071, // Sleep / Surrender To Water
- 1072, 1074, // Sleeping Cloud / Surrender To Wind
- 1083, 1097, // Surrender To Fire / Dreaming Spirit
- 1092, 1064, // Fear / Silence
- 1160, 1164, // Slow / Curse Weakness
- 1169, 1170, // Curse Fear / Anchor
- 1201, 1206, // Dryad Root / Wind Shackle
- 1222, 1223, // Curse Chaos / Surrender To Earth
- 1224, 1263, // Surrender To Poison / Curse Gloom
- 1269, 1336, // Curse Disease / Curse of Doom
- 1337, 1338, // Curse of Abyss / Arcane Chaos
- 1358, 1359, // Block Shield / Block Wind Walk
- 1386, 1394, // Arcane Disruption / Trance
- 1396, 1445, // Magical BackFire / Surrender to Dark
- 1446, 1447, // Shadow Bind / Voice Bind
- 1481, 1482, // Oblivion / Weak Constitution
- 1483, 1484, // Thin Skin / Enervation
- 1485, 1486, // Spite / Mental Impoverish
- 1511, 1524, // Curse of Life Flow / Surrender to the Divine
- 1529, // Soul Web
- };
- //@formatter:on
- // Misc
- private static final int MIN_DISTANCE = 150;
-
- private RangeGuard()
- {
- super(RangeGuard.class.getSimpleName(), "ai/group_template");
-
- for (L2NpcTemplate template : NpcData.getInstance().getAllNpcOfClassType("L2Monster"))
- {
- if (template.getParameters().getInt("LongRangeGuardRate", -1) > 0)
- {
- addAttackId(template.getId());
- }
- }
- }
-
- @Override
- public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill)
- {
- final L2Playable playable = (isSummon) ? attacker.getSummon() : attacker;
- final int longRangeGuardRate = npc.getTemplate().getParameters().getInt("LongRangeGuardRate");
- final double distance = Util.calculateDistance(npc, playable, true, false);
-
- if (npc.isAffectedBySkill(ULTIMATE_DEFENSE.getSkillId()) && (distance <= MIN_DISTANCE))
- {
- npc.stopSkillEffects(true, ULTIMATE_DEFENSE.getSkillId());
- }
- else if ((distance > MIN_DISTANCE) && !npc.isSkillDisabled(ULTIMATE_DEFENSE.getSkillId()) && !((skill != null) && Util.contains(NOT_ALLOWED_SKILLS, skill.getId())) && (getRandom(100) < longRangeGuardRate))
- {
- final L2Object target = npc.getTarget();
- npc.setTarget(npc);
- npc.doCast(ULTIMATE_DEFENSE.getSkill());
- npc.setTarget(target);
- }
- return super.onAttack(npc, attacker, damage, isSummon, skill);
- }
-
- public static void main(String[] args)
- {
- new RangeGuard();
- }
-}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/documentation.txt b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/documentation.txt
deleted file mode 100644
index 9284db442e..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/documentation.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Group Template AI:
-This folder contains AI scripts for group templates. That is, if many different mobs share the same behaviour,
-a group AI script can be created for all of them. Such group templates ought to be here.
-
-Group templates can be subclassed. In other words, a group may inherit from another group. For example,
-one group template might define mobs that cast spells. Another template may then define the AI for mobs
-that cast spells AND use shots. In that case, instead of rewriting all the attack and spell-use AI, we can
-inherit from the first group template, then add the new behaviours, and split up the NPC registrations appropriately.
-
-"NPC registrations" refers to the addition of NPCs in the various events of the scripts, such as onAttack, onKill, etc
-Those are done by using keywords such as "addKillId" etc. For more details on registrations, see
-"scripts/quests/documentation.txt"
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/package-info.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/package-info.java
deleted file mode 100644
index 3411746340..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/package-info.java
+++ /dev/null
@@ -1,35 +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 .
- */
-
-/**
- * Group Template AI:
- * This folder contains AI scripts for group templates.
- * That is, if many different mobs share the same behavior, a group AI script can be created for all of them.
- * Such group templates ought to be here.
- *
- * Group templates can be sub-classed.
- * In other words, a group may inherit from another group.
- * For example, one group template might define mobs that cast spells.
- * Another template may then define the AI for mobs that cast spells AND use shots.
- * In that case, instead of rewriting all the attack and spell-use AI, we can inherit from the first group template, then add the new behaviors, and split up the NPC registrations appropriately.
- *
- * "NPC registrations" refers to the addition of NPCs in the various events of the scripts, such as onAttack, onKill, etc.
- * Those are done by using methods such as addKillId(..) etc.
- * @see quests
- * @author Fulminus, Zoey76
- */
-package ai.group_template;
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/documentation.txt b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/documentation.txt
deleted file mode 100644
index ac398232f8..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/documentation.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Individual AI:
-This folder contains AI scripts for single npc templates (one npc ID, but possibly many instances).
-That is, if a particular NPC/mob has a unique AI or something slightly different from all other generic NPCs,
-an individual AI script can be created for all occurences of that npc/mob. Such individual scripts ought to be here.
-
-Individual AI scripts can be subclassed. In other words, an individual may inherit from a group or other individual.
-For example, one group template might define mobs that cast spells. A particular mob may cast spells but may also
-talk whenever it gets attacked. In that case, instead of writing all the AI for attacking and casting spells, it may
-inherit from a group template that defines AI for ALL mobs that cast spells, then add behaviours for talking onAttack.
-
-"NPC registrations" refers to the addition of NPCs in the various events of the scripts, such as onAttack, onKill, etc
-Those are done by using keywords such as "addKillId" etc. For more details on registrations, see
-"scripts/quests/documentation.txt"
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Abercrombie/31555-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Abercrombie/31555-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Abercrombie/31555-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Abercrombie/31555-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Abercrombie/31555-07.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Abercrombie/31555-07.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Abercrombie/31555-07.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Abercrombie/31555-07.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Abercrombie/31555-09.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Abercrombie/31555-09.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Abercrombie/31555-09.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Abercrombie/31555-09.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Abercrombie/Abercrombie.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Abercrombie/Abercrombie.java
similarity index 91%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Abercrombie/Abercrombie.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Abercrombie/Abercrombie.java
index 974ff5217a..bb70326dc0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Abercrombie/Abercrombie.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Abercrombie/Abercrombie.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.Abercrombie;
+package ai.others.Abercrombie;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -35,7 +35,6 @@ public final class Abercrombie extends AbstractNpcAI
public Abercrombie()
{
- super(Abercrombie.class.getSimpleName(), "ai/npc");
addFirstTalkId(ABERCROMBIE);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.java
index 95dc01ba79..14d6a5b2ca 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AltarsOfSacrifice.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.others;
import java.util.logging.Level;
@@ -215,8 +215,6 @@ public final class AltarsOfSacrifice extends AbstractNpcAI
private AltarsOfSacrifice()
{
- super("AltarsOfSacrifice", "ai/group_template");
-
for (int i = 0; i < _altars.length; ++i)
{
if (_altars[i].hasBosses())
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ArenaManager/31225.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ArenaManager/31225.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ArenaManager/31225.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ArenaManager/31225.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ArenaManager/31226.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ArenaManager/31226.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ArenaManager/31226.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ArenaManager/31226.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ArenaManager/ArenaManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ArenaManager/ArenaManager.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.java
index 385e007df1..3412c9b60e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ArenaManager/ArenaManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ArenaManager/ArenaManager.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.ArenaManager;
+package ai.others.ArenaManager;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -56,7 +56,6 @@ public final class ArenaManager extends AbstractNpcAI
private ArenaManager()
{
- super(ArenaManager.class.getSimpleName(), "ai/npc");
addStartNpc(ARENA_MANAGER);
addTalkId(ARENA_MANAGER);
addFirstTalkId(ARENA_MANAGER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Asamah/32115-01.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/32115-01.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Asamah/32115-01.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/32115-01.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Asamah/32115-02.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/32115-02.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Asamah/32115-02.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/32115-02.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Asamah/32115-03.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/32115-03.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Asamah/32115-03.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/32115-03.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Asamah/32115-04.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/32115-04.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Asamah/32115-04.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/32115-04.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Asamah/Asamah.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/Asamah.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Asamah/Asamah.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/Asamah.java
index 7fa42aa854..916ee1b9fd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Asamah/Asamah.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asamah/Asamah.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.Asamah;
+package ai.others.Asamah;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -35,7 +35,6 @@ public final class Asamah extends AbstractNpcAI
public Asamah()
{
- super(Asamah.class.getSimpleName(), "ai/npc");
addFirstTalkId(ASAMAH);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Asher/32714-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asher/32714-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Asher/32714-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asher/32714-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Asher/32714-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asher/32714-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Asher/32714-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asher/32714-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Asher/32714.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asher/32714.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Asher/32714.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asher/32714.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Asher/Asher.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asher/Asher.java
similarity index 91%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Asher/Asher.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asher/Asher.java
index 22c6a0f0bc..ee2c4d0794 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Asher/Asher.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Asher/Asher.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.Asher;
+package ai.others.Asher;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -39,7 +39,6 @@ public class Asher extends AbstractNpcAI
private Asher()
{
- super(Asher.class.getSimpleName(), "ai/npc/Teleports");
addFirstTalkId(ASHER);
addStartNpc(ASHER);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-02a.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-02a.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-02a.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-02a.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-02b.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-02b.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-02b.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-02b.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-02c.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-02c.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-02c.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-02c.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-05a.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-05a.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-05a.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-05a.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-05no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-05no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-05no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-05no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-06.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-06.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-06.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-06.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-06no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-06no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-06no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-06no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-07.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-07.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-07.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-07.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-08.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-08.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-08.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-08.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-08no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-08no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-08no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-08no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-09no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-09no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-09no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-09no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-10no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-10no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/32323-10no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/32323-10no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java
index 8210ab83e8..46d72fea57 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.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.AvantGarde;
+package ai.others.AvantGarde;
import java.util.List;
@@ -67,7 +67,6 @@ public class AvantGarde extends AbstractNpcAI
public AvantGarde()
{
- super(AvantGarde.class.getSimpleName(), "ai/npc");
addStartNpc(AVANT_GARDE);
addTalkId(AVANT_GARDE);
addFirstTalkId(AVANT_GARDE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Ballista.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Ballista.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Ballista.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Ballista.java
index 32dc686ff3..3a421ca769 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Ballista.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Ballista.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;
+package ai.others;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.L2Object;
@@ -64,7 +64,6 @@ public final class Ballista extends AbstractNpcAI
private Ballista()
{
- super(Ballista.class.getSimpleName(), "ai/individual");
addSkillSeeId(BALLISTA);
addSpawnId(BALLISTA);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-06.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-06.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-06.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-06.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-07.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-07.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-07.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-07.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-08.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-08.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981-08.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981-08.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/30981.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/30981.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.java
index f4914e2597..01cd0a1c45 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackJudge/BlackJudge.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.BlackJudge;
+package ai.others.BlackJudge;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -42,7 +42,6 @@ public class BlackJudge extends AbstractNpcAI
private BlackJudge()
{
- super(BlackJudge.class.getSimpleName(), "ai/npc");
addStartNpc(BLACK_JUDGE);
addTalkId(BLACK_JUDGE);
addFirstTalkId(BLACK_JUDGE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-06.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-06.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/31092-06.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/31092-06.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index 5b91692124..358af462b1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.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.BlackMarketeerOfMammon;
+package ai.others.BlackMarketeerOfMammon;
import java.util.Calendar;
@@ -40,7 +40,6 @@ public final class BlackMarketeerOfMammon extends AbstractNpcAI
private BlackMarketeerOfMammon()
{
- super(BlackMarketeerOfMammon.class.getSimpleName(), "ai/npc");
addStartNpc(BLACK_MARKETEER);
addTalkId(BLACK_MARKETEER);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/BlackdaggerWing.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackdaggerWing.java
similarity index 97%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/BlackdaggerWing.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackdaggerWing.java
index 5f64d05fa1..d1f961cd10 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/BlackdaggerWing.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackdaggerWing.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;
+package ai.others;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
@@ -50,7 +50,6 @@ public class BlackdaggerWing extends AbstractNpcAI
public BlackdaggerWing()
{
- super(BlackdaggerWing.class.getSimpleName(), "ai/individual");
addAttackId(BLACKDAGGER_WING);
addSeeCreatureId(BLACKDAGGER_WING);
addSpellFinishedId(BLACKDAGGER_WING);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/BleedingFly.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BleedingFly.java
similarity index 98%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/BleedingFly.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BleedingFly.java
index 0715e816f7..763407da48 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/BleedingFly.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BleedingFly.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;
+package ai.others;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -51,7 +51,6 @@ public class BleedingFly extends AbstractNpcAI
public BleedingFly()
{
- super(BleedingFly.class.getSimpleName(), "ai/individual");
addAttackId(BLEEDING_FLY);
addSpawnId(BLEEDING_FLY);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.java
index 9acebb1874..80d09cba91 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/CastleAmbassador.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.CastleAmbassador;
+package ai.others.CastleAmbassador;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -49,7 +49,6 @@ public final class CastleAmbassador extends AbstractNpcAI
private CastleAmbassador()
{
- super(CastleAmbassador.class.getSimpleName(), "ai/npc");
addStartNpc(CASTLE_AMBASSADOR);
addTalkId(CASTLE_AMBASSADOR);
addFirstTalkId(CASTLE_AMBASSADOR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/ambassador-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/ambassador-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/ambassador-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/ambassador-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/ambassador-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/ambassador-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/ambassador-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/ambassador-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/ambassador-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/ambassador-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/ambassador.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/ambassador.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleAmbassador/ambassador.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35098-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35098-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35098-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35098-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35098-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35098-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35098-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35098-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35140-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35140-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35140-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35140-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35140-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35140-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35140-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35140-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35182-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35182-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35182-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35182-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35182-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35182-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35182-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35182-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35224-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35224-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35224-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35224-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35224-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35224-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35224-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35224-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35272-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35272-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35272-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35272-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35272-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35272-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35272-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35272-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35314-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35314-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35314-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35314-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35314-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35314-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35314-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35314-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35361-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35361-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35361-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35361-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35361-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35361-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35361-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35361-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35507-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35507-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35507-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35507-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35507-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35507-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35507-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35507-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35553-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35553-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35553-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35553-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35553-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35553-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/35553-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/35553-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.java
index d93ab9502e..33f3083bdf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/CastleBlacksmith.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.CastleBlacksmith;
+package ai.others.CastleBlacksmith;
import com.l2jmobius.gameserver.model.ClanPrivilege;
import com.l2jmobius.gameserver.model.PcCondOverride;
@@ -45,7 +45,6 @@ public final class CastleBlacksmith extends AbstractNpcAI
private CastleBlacksmith()
{
- super(CastleBlacksmith.class.getSimpleName(), "ai/npc");
addStartNpc(NPCS);
addTalkId(NPCS);
addFirstTalkId(NPCS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleBlacksmith/no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleBlacksmith/no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35100-d.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35100-d.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35100-d.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35100-d.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35100-du.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35100-du.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35100-du.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35100-du.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35100-t1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35100-t1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35100-t1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35100-t1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35100-t2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35100-t2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35100-t2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35100-t2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35100-tu.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35100-tu.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35100-tu.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35100-tu.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35142-d.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35142-d.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35142-d.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35142-d.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35142-du.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35142-du.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35142-du.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35142-du.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35142-t1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35142-t1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35142-t1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35142-t1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35142-t2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35142-t2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35142-t2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35142-t2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35142-tu.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35142-tu.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35142-tu.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35142-tu.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35184-d.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35184-d.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35184-d.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35184-d.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35184-du.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35184-du.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35184-du.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35184-du.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35184-t1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35184-t1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35184-t1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35184-t1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35184-t2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35184-t2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35184-t2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35184-t2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35184-tu.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35184-tu.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35184-tu.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35184-tu.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35226-d.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35226-d.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35226-d.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35226-d.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35226-du.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35226-du.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35226-du.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35226-du.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35226-t1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35226-t1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35226-t1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35226-t1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35226-t2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35226-t2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35226-t2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35226-t2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35226-tu.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35226-tu.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35226-tu.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35226-tu.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35274-d.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35274-d.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35274-d.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35274-d.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35274-du.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35274-du.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35274-du.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35274-du.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35274-t1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35274-t1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35274-t1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35274-t1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35274-t2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35274-t2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35274-t2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35274-t2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35274-tu.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35274-tu.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35274-tu.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35274-tu.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35316-d.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35316-d.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35316-d.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35316-d.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35316-du.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35316-du.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35316-du.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35316-du.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35316-t1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35316-t1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35316-t1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35316-t1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35316-t2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35316-t2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35316-t2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35316-t2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35316-tu.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35316-tu.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35316-tu.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35316-tu.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35363-d.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35363-d.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35363-d.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35363-d.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35363-du.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35363-du.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35363-du.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35363-du.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35363-t1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35363-t1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35363-t1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35363-t1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35363-t2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35363-t2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35363-t2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35363-t2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35363-tu.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35363-tu.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35363-tu.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35363-tu.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35507-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35507-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35507-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35507-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35509-d.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35509-d.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35509-d.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35509-d.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35509-du.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35509-du.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35509-du.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35509-du.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35509-t1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35509-t1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35509-t1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35509-t1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35509-t2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35509-t2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35509-t2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35509-t2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35509-tu.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35509-tu.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35509-tu.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35509-tu.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35553-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35553-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35553-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35553-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35555-d.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35555-d.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35555-d.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35555-d.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35555-du.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35555-du.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35555-du.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35555-du.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35555-t1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35555-t1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35555-t1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35555-t1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35555-t2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35555-t2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35555-t2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35555-t2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35555-tu.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35555-tu.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/35555-tu.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/35555-tu.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index 82762cfdb6..7c8048448b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.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.CastleChamberlain;
+package ai.others.CastleChamberlain;
import java.util.Arrays;
import java.util.Calendar;
@@ -131,7 +131,6 @@ public final class CastleChamberlain extends AbstractNpcAI
private CastleChamberlain()
{
- super(CastleChamberlain.class.getSimpleName(), "ai/npc");
addStartNpc(NPC);
addTalkId(NPC);
addFirstTalkId(NPC);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castleafterbuff.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castleafterbuff.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castleafterbuff.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castleafterbuff.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castleaftersettaxrate.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castleaftersettaxrate.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castleaftersettaxrate.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castleaftersettaxrate.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castlebuff-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castlebuff-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castlebuff-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castlebuff-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castlebuff-08.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castlebuff-08.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castlebuff-08.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castlebuff-08.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledeco-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledeco-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledeco-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledeco-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledeco-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledeco-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledeco-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledeco-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledeco-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledeco-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledeco-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledeco-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledeco-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledeco-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledeco-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledeco-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledeco-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledeco-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledeco-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledeco-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledeco-AE01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledeco-AE01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledeco-AE01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledeco-AE01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledeco-AR01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledeco-AR01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledeco-AR01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledeco-AR01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledecoalreadyset.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledecoalreadyset.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledecoalreadyset.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledecoalreadyset.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledecofunction.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledecofunction.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castledecofunction.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castledecofunction.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castlefuncdisabled.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castlefuncdisabled.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castlefuncdisabled.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castlefuncdisabled.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castlemanagevault.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castlemanagevault.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castlemanagevault.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castlemanagevault.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castlenotenoughbalance.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castlenotenoughbalance.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castlenotenoughbalance.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castlenotenoughbalance.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castlenotenoughmp.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castlenotenoughmp.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castlenotenoughmp.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castlenotenoughmp.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castleresetdeco.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castleresetdeco.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castleresetdeco.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castleresetdeco.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castlesettaxrate.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castlesettaxrate.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castlesettaxrate.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castlesettaxrate.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castletdecomanage.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castletdecomanage.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castletdecomanage.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castletdecomanage.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castletoohightaxrate.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castletoohightaxrate.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/castletoohightaxrate.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/castletoohightaxrate.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-06.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-06.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-06.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-06.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-07.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-07.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-07.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-07.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-08.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-08.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-08.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-08.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-09.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-09.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-09.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-09.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-10.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-10.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-10.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-10.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-11.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-11.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-11.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-11.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-12.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-12.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-12.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-12.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-13.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-13.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-13.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-13.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-14.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-14.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-14.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-14.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-15.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-15.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-15.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-15.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-16.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-16.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-16.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-16.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-17.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-17.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-17.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-17.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-17a.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-17a.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-17a.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-17a.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-18.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-18.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-18.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-18.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-19.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-19.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-19.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-19.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-20.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-20.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-20.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-20.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-21.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-21.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-21.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-21.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-22.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-22.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-22.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-22.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-23.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-23.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-23.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-23.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-24.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-24.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-24.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-24.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-25.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-25.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-25.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-25.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-26.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-26.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-26.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-26.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-27.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-27.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-27.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-27.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-28.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-28.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/chamberlain-28.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-28.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/manor-help-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/manor-help-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/manor-help-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/manor-help-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/manor-help-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/manor-help-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/manor-help-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/manor-help-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/manor-help-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/manor-help-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/manor-help-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/manor-help-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/manor-help-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/manor-help-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/manor-help-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/manor-help-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/manor.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/manor.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/manor.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/manor.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/ssq_notdawnorevent.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/ssq_notdawnorevent.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/ssq_notdawnorevent.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/ssq_notdawnorevent.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/ssq_notenoughticket.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/ssq_notenoughticket.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/ssq_notenoughticket.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/ssq_notenoughticket.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/ssq_selldawnticket.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/ssq_selldawnticket.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/ssq_selldawnticket.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/ssq_selldawnticket.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index 5ca67c9ffb..2473383ce2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.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.CastleCourtMagician;
+package ai.others.CastleCourtMagician;
import com.l2jmobius.gameserver.model.ClanPrivilege;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -116,7 +116,6 @@ public final class CastleCourtMagician extends AbstractNpcAI
private CastleCourtMagician()
{
- super(CastleCourtMagician.class.getSimpleName(), "ai/npc");
addStartNpc(COURT_MAGICIAN);
addTalkId(COURT_MAGICIAN);
addFirstTalkId(COURT_MAGICIAN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/courtmagician-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/courtmagician-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/courtmagician-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/courtmagician-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/courtmagician-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/courtmagician-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/courtmagician-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/courtmagician-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/courtmagician-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/courtmagician-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/courtmagician-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/courtmagician-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/courtmagician-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/courtmagician-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/courtmagician-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/courtmagician-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/courtmagician-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/courtmagician-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/courtmagician-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/courtmagician-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/courtmagician-06.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/courtmagician-06.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/courtmagician-06.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/courtmagician-06.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/courtmagician.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/courtmagician.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleCourtMagician/courtmagician.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleCourtMagician/courtmagician.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.java
index ef1dc9b85a..40e99f53aa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/CastleMercenaryManager.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.CastleMercenaryManager;
+package ai.others.CastleMercenaryManager;
import java.util.StringTokenizer;
@@ -51,7 +51,6 @@ public final class CastleMercenaryManager extends AbstractNpcAI
private CastleMercenaryManager()
{
- super(CastleMercenaryManager.class.getSimpleName(), "ai/npc");
addStartNpc(NPCS);
addTalkId(NPCS);
addFirstTalkId(NPCS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-aden-limit.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-aden-limit.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-aden-limit.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-aden-limit.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-dawn.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-dawn.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-dawn.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-dawn.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-dusk.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-dusk.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-dusk.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-dusk.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-limit.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-limit.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-limit.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-limit.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-rune-limit.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-rune-limit.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-rune-limit.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-rune-limit.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-siege.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-siege.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-siege.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-siege.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-ssq.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-ssq.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager-ssq.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager-ssq.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleMercenaryManager/mercmanager.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleMercenaryManager/mercmanager.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleSiegeManager/CastleSiegeManager-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleSiegeManager/CastleSiegeManager-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleSiegeManager/CastleSiegeManager-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleSiegeManager/CastleSiegeManager-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleSiegeManager/CastleSiegeManager.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleSiegeManager/CastleSiegeManager.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleSiegeManager/CastleSiegeManager.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleSiegeManager/CastleSiegeManager.java
index fd323f41e6..96d2cdaf99 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleSiegeManager/CastleSiegeManager.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.CastleSiegeManager;
+package ai.others.CastleSiegeManager;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -45,7 +45,6 @@ public final class CastleSiegeManager extends AbstractNpcAI
private CastleSiegeManager()
{
- super(CastleSiegeManager.class.getSimpleName(), "ai/npc");
addFirstTalkId(SIEGE_MANAGER);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java
index 9d96aad14c..f69d7bdaad 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.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.CastleTeleporter;
+package ai.others.CastleTeleporter;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
@@ -49,7 +49,6 @@ public final class CastleTeleporter extends AbstractNpcAI
private CastleTeleporter()
{
- super(CastleTeleporter.class.getSimpleName(), "ai/npc");
addStartNpc(NPCS);
addTalkId(NPCS);
addFirstTalkId(NPCS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleTeleporter/teleporter-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleTeleporter/teleporter-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleTeleporter/teleporter-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleTeleporter/teleporter-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleTeleporter/teleporter-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleTeleporter/teleporter-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleTeleporter/teleporter-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleTeleporter/teleporter-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleTeleporter/teleporter-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleTeleporter/teleporter-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleTeleporter/teleporter-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleTeleporter/teleporter-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.java
index ab584ff63f..58a6ed113a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/CastleWarehouse.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.CastleWarehouse;
+package ai.others.CastleWarehouse;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -46,7 +46,6 @@ public final class CastleWarehouse extends AbstractNpcAI
private CastleWarehouse()
{
- super(CastleWarehouse.class.getSimpleName(), "ai/npc");
addStartNpc(NPCS);
addTalkId(NPCS);
addFirstTalkId(NPCS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-06.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-06.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-06.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-06.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-07.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-07.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-07.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-07.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-08.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-08.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-08.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-08.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleWarehouse/warehouse-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleWarehouse/warehouse-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32024-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32024-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32024-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32024-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32024-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32024-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32024-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32024-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32024-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32024-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32024-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32024-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32024-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32024-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32024-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32024-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32024-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32024-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32024-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32024-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32024.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32024.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32024.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32024.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32025-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32025-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32025-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32025-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32025-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32025-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32025-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32025-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32025-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32025-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32025-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32025-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32025-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32025-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32025-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32025-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32025-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32025-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32025-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32025-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32025.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32025.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/32025.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/32025.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.java
index 9f336648a5..f81dbb45ee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ClanTrader/ClanTrader.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.ClanTrader;
+package ai.others.ClanTrader;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.ClanPrivilege;
@@ -47,7 +47,6 @@ public final class ClanTrader extends AbstractNpcAI
private ClanTrader()
{
- super(ClanTrader.class.getSimpleName(), "ai/npc");
addStartNpc(CLAN_TRADER);
addTalkId(CLAN_TRADER);
addFirstTalkId(CLAN_TRADER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CrimsonHatuOtis.java
index 4051d6046b..80a61ba62e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CrimsonHatuOtis.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;
+package ai.others;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -38,7 +38,6 @@ public final class CrimsonHatuOtis extends AbstractNpcAI
private CrimsonHatuOtis()
{
- super(CrimsonHatuOtis.class.getSimpleName(), "ai/individual");
addAttackId(CRIMSON_HATU_OTIS);
addKillId(CRIMSON_HATU_OTIS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/DelusionTeleport/DelusionTeleport.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/DelusionTeleport/DelusionTeleport.java
index 8bff61805e..628279946f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/DelusionTeleport/DelusionTeleport.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.DelusionTeleport;
+package ai.others.DelusionTeleport;
import java.util.HashMap;
import java.util.Map;
@@ -68,7 +68,6 @@ public final class DelusionTeleport extends AbstractNpcAI
private DelusionTeleport()
{
- super(DelusionTeleport.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DivineBeast.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/DivineBeast.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DivineBeast.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/DivineBeast.java
index 0d5f19c7ea..44da8bae8d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DivineBeast.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/DivineBeast.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;
+package ai.others;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.L2Summon;
@@ -34,7 +34,6 @@ public final class DivineBeast extends AbstractNpcAI
private DivineBeast()
{
- super(DivineBeast.class.getSimpleName(), "ai");
addSummonSpawnId(DIVINE_BEAST);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Dorian/Dorian.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Dorian/Dorian.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Dorian/Dorian.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Dorian/Dorian.java
index 75e8c34abe..fccbdddee2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Dorian/Dorian.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Dorian/Dorian.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.Dorian;
+package ai.others.Dorian;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -40,7 +40,6 @@ public final class Dorian extends AbstractNpcAI
private Dorian()
{
- super(Dorian.class.getSimpleName(), "ai/npc");
addSeeCreatureId(DORIAN);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DustRider.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/DustRider.java
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DustRider.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/DustRider.java
index 02ef40c7a6..ac5f795ccb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/DustRider.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/DustRider.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;
+package ai.others;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -41,7 +41,6 @@ public class DustRider extends AbstractNpcAI
public DustRider()
{
- super(DustRider.class.getSimpleName(), "ai/individual");
addAttackId(DUST_RIDER);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/EmeraldHorn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/EmeraldHorn.java
similarity index 98%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/EmeraldHorn.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/EmeraldHorn.java
index 71f3aa413b..210db80348 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/EmeraldHorn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/EmeraldHorn.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;
+package ai.others;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -50,7 +50,6 @@ public class EmeraldHorn extends AbstractNpcAI
public EmeraldHorn()
{
- super(EmeraldHorn.class.getSimpleName(), "ai/individual");
addAttackId(EMERALD_HORN);
addSpellFinishedId(EMERALD_HORN);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Epidos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Epidos.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Epidos.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Epidos.java
index 53e1954497..c980a5e87d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Epidos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Epidos.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;
+package ai.others;
import java.util.Arrays;
import java.util.Map;
@@ -61,7 +61,6 @@ public final class Epidos extends AbstractNpcAI
private Epidos()
{
- super(Epidos.class.getSimpleName(), "ai/individual");
addKillId(EPIDOSES);
addSpawnId(EPIDOSES);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/FairyTrees.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FairyTrees.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/FairyTrees.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FairyTrees.java
index ddf2c64316..a4771a6735 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/FairyTrees.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FairyTrees.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.others;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.L2Playable;
@@ -48,7 +48,6 @@ public class FairyTrees extends AbstractNpcAI
private FairyTrees()
{
- super(FairyTrees.class.getSimpleName(), "ai/group_template");
addKillId(MOBS);
addSpawnId(MOBS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479-06.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479-06.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479-06.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479-06.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479-07.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479-07.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479-07.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479-07.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36479.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36479.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480-06.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480-06.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480-06.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480-06.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480-07.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480-07.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480-07.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480-07.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/36480.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/36480.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/FameManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/FameManager.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/FameManager.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/FameManager.java
index 0290fabc8f..238a8fc52f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FameManager/FameManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FameManager/FameManager.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.FameManager;
+package ai.others.FameManager;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -44,7 +44,6 @@ public final class FameManager extends AbstractNpcAI
private FameManager()
{
- super(FameManager.class.getSimpleName(), "ai/npc");
addStartNpc(FAME_MANAGER);
addTalkId(FAME_MANAGER);
addFirstTalkId(FAME_MANAGER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/FleeMonsters.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FleeMonsters.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/FleeMonsters.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FleeMonsters.java
index e2cf6e6996..3b64bfef52 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/FleeMonsters.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FleeMonsters.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.others;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -54,7 +54,6 @@ public final class FleeMonsters extends AbstractNpcAI
private FleeMonsters()
{
- super(FleeMonsters.class.getSimpleName(), "ai/group_template");
addAttackId(MOBS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressArcherCaptain/FortressArcherCaptain-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressArcherCaptain/FortressArcherCaptain-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressArcherCaptain/FortressArcherCaptain.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressArcherCaptain/FortressArcherCaptain.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressArcherCaptain/FortressArcherCaptain.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressArcherCaptain/FortressArcherCaptain.java
index ca146343fc..29ac026171 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressArcherCaptain/FortressArcherCaptain.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.FortressArcherCaptain;
+package ai.others.FortressArcherCaptain;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -55,7 +55,6 @@ public final class FortressArcherCaptain extends AbstractNpcAI
private FortressArcherCaptain()
{
- super(FortressArcherCaptain.class.getSimpleName(), "ai/npc");
addStartNpc(ARCHER_CAPTAIN);
addFirstTalkId(ARCHER_CAPTAIN);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-06.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-06.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-06.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-06.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-07.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-07.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-07.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-07.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-08.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-08.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-08.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-08.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-09.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-09.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-09.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-09.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-10.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-10.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-10.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-10.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-11.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-11.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-11.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-11.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-12.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-12.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-12.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-12.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-13.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-13.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-13.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-13.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-14.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-14.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-14.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-14.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-15.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-15.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-15.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-15.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-16.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-16.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-16.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-16.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-17.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-17.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-17.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-17.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-18.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-18.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-18.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-18.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-19.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-19.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-19.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-19.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-20.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-20.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-20.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-20.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-21.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-21.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager-21.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager-21.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.java
index 437c79562a..e7cf47d805 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/FortressSiegeManager/FortressSiegeManager.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.FortressSiegeManager;
+package ai.others.FortressSiegeManager;
import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
import com.l2jmobius.gameserver.model.ClanPrivilege;
@@ -63,7 +63,6 @@ public final class FortressSiegeManager extends AbstractNpcAI
private FortressSiegeManager()
{
- super(FortressSiegeManager.class.getSimpleName(), "ai/npc");
addStartNpc(MANAGERS);
addTalkId(MANAGERS);
addFirstTalkId(MANAGERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GatekeeperSpirit/31111-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GatekeeperSpirit/31111-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GatekeeperSpirit/31111-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GatekeeperSpirit/31111-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GatekeeperSpirit/31111.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GatekeeperSpirit/31111.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GatekeeperSpirit/31111.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GatekeeperSpirit/31111.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GatekeeperSpirit/31112.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GatekeeperSpirit/31112.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GatekeeperSpirit/31112.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GatekeeperSpirit/31112.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GatekeeperSpirit/GatekeeperSpirit.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GatekeeperSpirit/GatekeeperSpirit.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.java
index a984d3b107..5dd02c0053 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GatekeeperSpirit/GatekeeperSpirit.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GatekeeperSpirit/GatekeeperSpirit.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.GatekeeperSpirit;
+package ai.others.GatekeeperSpirit;
import com.l2jmobius.gameserver.SevenSigns;
import com.l2jmobius.gameserver.model.Location;
@@ -44,7 +44,6 @@ public final class GatekeeperSpirit extends AbstractNpcAI
private GatekeeperSpirit()
{
- super(GatekeeperSpirit.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(GATEKEEPER_SPIRIT_ENTER, GATEKEEPER_SPIRIT_EXIT);
addFirstTalkId(GATEKEEPER_SPIRIT_ENTER, GATEKEEPER_SPIRIT_EXIT);
addTalkId(GATEKEEPER_SPIRIT_ENTER, GATEKEEPER_SPIRIT_EXIT);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Gordon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Gordon.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Gordon.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Gordon.java
index 35c4898f16..cfeaf581a2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Gordon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Gordon.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;
+package ai.others;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -33,7 +33,6 @@ public final class Gordon extends AbstractNpcAI
private Gordon()
{
- super(Gordon.class.getSimpleName(), "ai/individual");
addSpawnId(GORDON);
addSeeCreatureId(GORDON);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31385-01.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31385-01.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31385-01.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31385-01.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31385-02.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31385-02.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31385-02.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31385-02.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31385-03.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31385-03.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31385-03.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31385-03.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31385-04.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31385-04.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31385-04.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31385-04.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31540-01.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31540-01.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31540-01.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31540-01.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31540-02.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31540-02.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31540-02.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31540-02.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31540-03.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31540-03.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31540-03.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31540-03.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31540-04.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31540-04.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31540-04.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31540-04.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31540-05.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31540-05.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31540-05.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31540-05.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31540-06.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31540-06.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/31540-06.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/31540-06.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/GrandBossTeleporters.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/GrandBossTeleporters.java
index a63d826bd9..4447880fa5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/GrandBossTeleporters/GrandBossTeleporters.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.GrandBossTeleporters;
+package ai.others.GrandBossTeleporters;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.DoorData;
@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.model.zone.type.L2BossZone;
import ai.AbstractNpcAI;
-import ai.individual.Valakas;
+import ai.bosses.Valakas.Valakas;
/**
* Grand Bosses teleport AI.
@@ -58,7 +58,6 @@ public final class GrandBossTeleporters extends AbstractNpcAI
private GrandBossTeleporters()
{
- super(GrandBossTeleporters.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(NPCs);
addTalkId(NPCs);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30022-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30022-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30022-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30022-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30022.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30022.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30022.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30022.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30030-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30030-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30030-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30030-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30030.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30030.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30030.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30030.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30032-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30032-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30032-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30032-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30032.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30032.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30032.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30032.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30036-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30036-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30036-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30036-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30036.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30036.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30036.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30036.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30067-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30067-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30067-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30067-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30067.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30067.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30067.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30067.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30068-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30068-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30068-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30068-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30068.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30068.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30068.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30068.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30116-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30116-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30116-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30116-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30116.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30116.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30116.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30116.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30117-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30117-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30117-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30117-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30117.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30117.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30117.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30117.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30118-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30118-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30118-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30118-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30118.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30118.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30118.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30118.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30119-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30119-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30119-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30119-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30119.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30119.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30119.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30119.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30144-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30144-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30144-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30144-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30144.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30144.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30144.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30144.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30145-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30145-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30145-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30145-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30145.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30145.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30145.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30145.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30188-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30188-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30188-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30188-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30188.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30188.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30188.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30188.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30194-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30194-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30194-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30194-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30194.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30194.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30194.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30194.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30293-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30293-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30293-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30293-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30293.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30293.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30293.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30293.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30330-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30330-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30330-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30330-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30330.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30330.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30330.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30330.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30375-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30375-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30375-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30375-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30375.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30375.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30375.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30375.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30377-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30377-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30377-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30377-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30377.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30377.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30377.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30377.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30464-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30464-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30464-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30464-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30464.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30464.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30464.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30464.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30473-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30473-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30473-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30473-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30473.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30473.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30473.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30473.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30476-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30476-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30476-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30476-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30476.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30476.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30476.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30476.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30680-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30680-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30680-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30680-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30680.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30680.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30680.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30680.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30701-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30701-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30701-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30701-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30701.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30701.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30701.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30701.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30720-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30720-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30720-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30720-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30720.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30720.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30720.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30720.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30721-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30721-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30721-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30721-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30721.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30721.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30721.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30721.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30858-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30858-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30858-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30858-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30858.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30858.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30858.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30858.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30859-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30859-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30859-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30859-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30859.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30859.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30859.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30859.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30860-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30860-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30860-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30860-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30860.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30860.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30860.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30860.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30861-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30861-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30861-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30861-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30861.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30861.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30861.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30861.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30864-1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30864-1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30864-1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30864-1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30864-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30864-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30864-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30864-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30864.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30864.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30864.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30864.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30906-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30906-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30906-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30906-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30906.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30906.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30906.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30906.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30908-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30908-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30908-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30908-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30908.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30908.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30908.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30908.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30912-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30912-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30912-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30912-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30912.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30912.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/30912.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/30912.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31280-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31280-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31280-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31280-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31280.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31280.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31280.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31280.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31281-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31281-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31281-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31281-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31281.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31281.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31281.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31281.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31287-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31287-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31287-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31287-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31287.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31287.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31287.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31287.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31329-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31329-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31329-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31329-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31329.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31329.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31329.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31329.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31330-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31330-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31330-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31330-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31330.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31330.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31330.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31330.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31335-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31335-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31335-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31335-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31335.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31335.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31335.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31335.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31969-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31969-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31969-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31969-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31969.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31969.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31969.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31969.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31970-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31970-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31970-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31970-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31970.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31970.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31970.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31970.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31976-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31976-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31976-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31976-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31976.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31976.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/31976.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/31976.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/32155-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/32155-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/32155-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/32155-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/32155.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/32155.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/32155.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/32155.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/32162-noteach.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/32162-noteach.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/32162-noteach.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/32162-noteach.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/32162.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/32162.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/32162.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/32162.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.java
index 8fc1da4643..f709f0340c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/HealerTrainer.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.Trainers.HealerTrainer;
+package ai.others.HealerTrainer;
import java.util.Collection;
@@ -55,7 +55,6 @@ public final class HealerTrainer extends AbstractNpcAI
private HealerTrainer()
{
- super(HealerTrainer.class.getSimpleName(), "ai/npc/Trainers");
addStartNpc(HEALER_TRAINERS);
addTalkId(HEALER_TRAINERS);
addFirstTalkId(HEALER_TRAINERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/cleanse-no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/cleanse-no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/cleanse-no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/cleanse-no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/cleanse-no_skills.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/cleanse-no_skills.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/cleanse-no_skills.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/cleanse-no_skills.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/learn-lowlevel.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/learn-lowlevel.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/learn-lowlevel.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/learn-lowlevel.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/main.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/main.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/main.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HealerTrainer/main.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/HuntingGroundsTeleport.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/HuntingGroundsTeleport.java
index fc64d693cc..8e0f9e1615 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/HuntingGroundsTeleport.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.HuntingGroundsTeleport;
+package ai.others.HuntingGroundsTeleport;
import com.l2jmobius.gameserver.SevenSigns;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -47,7 +47,6 @@ public final class HuntingGroundsTeleport extends AbstractNpcAI
private HuntingGroundsTeleport()
{
- super(HuntingGroundsTeleport.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(PRIESTS);
addTalkId(PRIESTS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/dawn_tele-no.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/dawn_tele-no.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/dawn_tele-no.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/dawn_tele-no.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/dusk_tele-no.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/dusk_tele-no.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/dusk_tele-no.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/dusk_tele-no.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_aden.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_aden.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_aden.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_aden.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_dion.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_dion.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_dion.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_dion.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_giran.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_giran.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_giran.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_giran.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_gludin.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_gludin.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_gludin.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_gludin.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_gludio.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_gludio.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_gludio.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_gludio.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_goddard.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_goddard.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_goddard.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_goddard.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_heine.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_heine.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_heine.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_heine.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_hw.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_hw.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_hw.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_hw.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_oren.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_oren.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_oren.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_oren.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_rune.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_rune.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_rune.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_rune.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_schuttgart.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_schuttgart.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_schuttgart.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_schuttgart.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_wrong.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_wrong.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/hg_wrong.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/hg_wrong.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_aden.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_aden.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_aden.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_aden.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_dion.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_dion.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_dion.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_dion.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_giran.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_giran.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_giran.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_giran.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_gludin.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_gludin.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_gludin.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_gludin.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_gludio.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_gludio.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_gludio.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_gludio.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_goddard.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_goddard.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_goddard.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_goddard.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_heine.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_heine.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_heine.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_heine.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_hw.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_hw.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_hw.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_hw.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_oren.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_oren.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_oren.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_oren.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_rune.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_rune.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_rune.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_rune.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_schuttgart.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_schuttgart.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/low_schuttgart.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/low_schuttgart.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Katenar/32242-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/32242-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Katenar/32242-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/32242-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Katenar/32242-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/32242-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Katenar/32242-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/32242-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Katenar/32242-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/32242-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Katenar/32242-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/32242-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Katenar/32242-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/32242-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Katenar/32242-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/32242-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Katenar/Katenar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/Katenar.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Katenar/Katenar.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/Katenar.java
index 066dd54d1d..83de17265e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Katenar/Katenar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Katenar/Katenar.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.Katenar;
+package ai.others.Katenar;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -38,7 +38,6 @@ public final class Katenar extends AbstractNpcAI
private Katenar()
{
- super(Katenar.class.getSimpleName(), "ai/npc");
addStartNpc(KATENAR);
addTalkId(KATENAR);
addFirstTalkId(KATENAR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Kier/32022-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Kier/32022-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Kier/32022-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Kier/32022-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Kier/32022-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Kier/32022-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Kier/32022-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Kier/32022-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Kier/32022-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Kier/32022-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Kier/32022-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Kier/32022-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Kier/32022-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Kier/32022-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Kier/32022-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Kier/32022-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Kier/Kier.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Kier/Kier.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Kier/Kier.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Kier/Kier.java
index fc07367cca..2e2f874fe5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Kier/Kier.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Kier/Kier.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.Kier;
+package ai.others.Kier;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -36,7 +36,6 @@ public final class Kier extends AbstractNpcAI
private Kier()
{
- super(Kier.class.getSimpleName(), "ai/npc");
addFirstTalkId(KIER);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ManorManager/ManorManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ManorManager/ManorManager.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.java
index 88ab498956..6aea459e66 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ManorManager/ManorManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/ManorManager.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.ManorManager;
+package ai.others.ManorManager;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.instancemanager.CastleManorManager;
@@ -65,7 +65,6 @@ public final class ManorManager extends AbstractNpcAI
public ManorManager()
{
- super(ManorManager.class.getSimpleName(), "ai/npc");
addStartNpc(NPC);
addFirstTalkId(NPC);
addTalkId(NPC);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ManorManager/manager-help-01.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/manager-help-01.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ManorManager/manager-help-01.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/manager-help-01.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ManorManager/manager-help-02.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/manager-help-02.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ManorManager/manager-help-02.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/manager-help-02.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ManorManager/manager-help-03.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/manager-help-03.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ManorManager/manager-help-03.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/manager-help-03.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ManorManager/manager-lord.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/manager-lord.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ManorManager/manager-lord.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/manager-lord.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ManorManager/manager.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/manager.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/ManorManager/manager.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ManorManager/manager.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-06.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-06.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-06.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-06.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-07.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-07.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-07.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-07.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-08.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-08.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-08.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-08.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-09.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-09.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-09.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-09.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-10.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-10.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-10.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36481-10.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36482-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36482-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36482-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36482-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36483-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36483-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36483-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36483-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36484-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36484-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36484-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36484-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36485-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36485-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36485-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36485-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36486-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36486-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36486-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36486-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36487-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36487-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36487-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36487-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36488-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36488-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36488-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36488-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36489-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36489-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/36489-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/36489-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.java
index 6334212892..a4a4276b92 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MercenaryCaptain/MercenaryCaptain.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.MercenaryCaptain;
+package ai.others.MercenaryCaptain;
import java.util.HashMap;
import java.util.Map;
@@ -67,7 +67,6 @@ public final class MercenaryCaptain extends AbstractNpcAI
private MercenaryCaptain()
{
- super(MercenaryCaptain.class.getSimpleName(), "ai/npc");
for (int id : NPCS.keySet())
{
addStartNpc(id);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758-06.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758-06.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758-06.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758-06.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758-07.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758-07.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758-07.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758-07.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758-08.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758-08.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758-08.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758-08.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/32758.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/32758.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/Minigame.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/Minigame.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/Minigame.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/Minigame.java
index 8fc2e36e65..4dce8e4a5d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Minigame/Minigame.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Minigame/Minigame.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.Minigame;
+package ai.others.Minigame;
import java.util.ArrayList;
import java.util.List;
@@ -61,7 +61,6 @@ public final class Minigame extends AbstractNpcAI
private Minigame()
{
- super(Minigame.class.getSimpleName(), "ai/npc");
addStartNpc(SUMIEL);
addFirstTalkId(SUMIEL);
addTalkId(SUMIEL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MinionSpawnManager.java
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MinionSpawnManager.java
index 05e95e8456..88a5e6f1da 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MinionSpawnManager.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.others;
import java.util.HashSet;
import java.util.Set;
@@ -410,8 +410,6 @@ public final class MinionSpawnManager extends AbstractNpcAI
private MinionSpawnManager()
{
- super(MinionSpawnManager.class.getSimpleName(), "ai/group_template");
-
addSpawnId(NPC);
addAttackId(ON_ATTACK_NPC);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
index 937c812b52..5c3b57a64b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.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.MonumentOfHeroes;
+package ai.others.MonumentOfHeroes;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -59,7 +59,6 @@ public final class MonumentOfHeroes extends AbstractNpcAI
private MonumentOfHeroes()
{
- super(MonumentOfHeroes.class.getSimpleName(), "ai/npc");
addStartNpc(MONUMENTS);
addTalkId(MONUMENTS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/already_have_circlet.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/already_have_circlet.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/already_have_circlet.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/already_have_circlet.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/already_have_weapon.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/already_have_weapon.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/already_have_weapon.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/already_have_weapon.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/no_hero_circlet.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/no_hero_circlet.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/no_hero_circlet.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/no_hero_circlet.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/no_hero_weapon.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/no_hero_weapon.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/no_hero_weapon.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/no_hero_weapon.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/weapon_list.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/weapon_list.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/MonumentOfHeroes/weapon_list.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/weapon_list.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/MuscleBomber.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MuscleBomber.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/MuscleBomber.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MuscleBomber.java
index 09071e824a..85927517a3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/MuscleBomber.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MuscleBomber.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;
+package ai.others;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -50,7 +50,6 @@ public class MuscleBomber extends AbstractNpcAI
public MuscleBomber()
{
- super(MuscleBomber.class.getSimpleName(), "ai/individual");
addAttackId(MUSCLE_BOMBER);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NevitsHerald/4326-1.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/4326-1.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NevitsHerald/4326-1.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/4326-1.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NevitsHerald/4326.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/4326.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NevitsHerald/4326.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/4326.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NevitsHerald/NevitsHerald.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/NevitsHerald.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NevitsHerald/NevitsHerald.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/NevitsHerald.java
index aaaf57c080..8a97131894 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NevitsHerald/NevitsHerald.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NevitsHerald/NevitsHerald.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.NevitsHerald;
+package ai.others.NevitsHerald;
import java.util.ArrayList;
import java.util.List;
@@ -67,7 +67,6 @@ public final class NevitsHerald extends AbstractNpcAI
private NevitsHerald()
{
- super(NevitsHerald.class.getSimpleName(), "ai/npc");
addFirstTalkId(NEVITS_HERALD);
addStartNpc(NEVITS_HERALD);
addTalkId(NEVITS_HERALD);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/30598.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/30598.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/30598.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/30598.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/30599.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/30599.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/30599.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/30599.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/30600.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/30600.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/30600.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/30600.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/30601.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/30601.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/30601.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/30601.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/30602.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/30602.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/30602.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/30602.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/32135.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/32135.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/32135.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/32135.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.java
index 4fc7a6bc8a..9550af5155 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/NewbieTravelToken.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.NewbieTravelToken;
+package ai.others.NewbieTravelToken;
import java.util.HashMap;
import java.util.Map;
@@ -40,7 +40,6 @@ public final class NewbieTravelToken extends AbstractNpcAI
private NewbieTravelToken()
{
- super(NewbieTravelToken.class.getSimpleName(), "ai/npc/Teleports");
// Initialize Map
DATA.put(30600, new Location(12160, 16554, -4583)); // DE
DATA.put(30601, new Location(115594, -177993, -912)); // DW
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/cant-travel.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/cant-travel.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/cant-travel.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NewbieTravelToken/cant-travel.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.java
similarity index 90%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.java
index fd7f04b321..408436d8dc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NoblesseTeleport/NoblesseTeleport.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.NoblesseTeleport;
+package ai.others.NoblesseTeleport;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -56,7 +56,6 @@ public final class NoblesseTeleport extends AbstractNpcAI
private NoblesseTeleport()
{
- super(NoblesseTeleport.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(NPCs);
addTalkId(NPCs);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/noble-nopass.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NoblesseTeleport/noble-nopass.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/noble-nopass.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NoblesseTeleport/noble-nopass.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/nobleteleporter-no.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NoblesseTeleport/nobleteleporter-no.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/nobleteleporter-no.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NoblesseTeleport/nobleteleporter-no.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/nobleteleporter.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NoblesseTeleport/nobleteleporter.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/nobleteleporter.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NoblesseTeleport/nobleteleporter.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NonLethalableNpcs.java
similarity index 88%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NonLethalableNpcs.java
index bd32d85ce9..f396bb50be 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NonLethalableNpcs.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.others;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -32,7 +32,6 @@ public final class NonLethalableNpcs extends AbstractNpcAI
public NonLethalableNpcs()
{
- super(NonLethalableNpcs.class.getSimpleName(), "ai/group_template");
addSpawnId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/NonTalkingNpcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NonTalkingNpcs.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/NonTalkingNpcs.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NonTalkingNpcs.java
index 61aa0be138..98ff2a2112 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/NonTalkingNpcs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NonTalkingNpcs.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.others;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -54,7 +54,6 @@ public final class NonTalkingNpcs extends AbstractNpcAI
public NonTalkingNpcs()
{
- super(NonTalkingNpcs.class.getSimpleName(), "ai/group_template");
addSpawnId(NONTALKINGNPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferAI.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferAI.java
index d063895b2a..2420bbc531 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferAI.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.NpcBuffers;
+package ai.others.NpcBuffers;
import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.model.actor.L2Character;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferData.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferData.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferData.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferData.java
index e9815d94e3..a1c5350e56 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferData.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.NpcBuffers;
+package ai.others.NpcBuffers;
import java.util.ArrayList;
import java.util.List;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferSkillData.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferSkillData.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java
index 8164b9a300..eeed655dbc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferSkillData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.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.NpcBuffers;
+package ai.others.NpcBuffers;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffers.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffers.java
index 63f99d5ed2..8e38b7d30c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffers.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.NpcBuffers;
+package ai.others.NpcBuffers;
import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -31,8 +31,6 @@ public final class NpcBuffers extends AbstractNpcAI
private NpcBuffers()
{
- super(NpcBuffers.class.getSimpleName(), "npc");
-
for (int npcId : _npcBuffers.getNpcBufferIds())
{
// TODO: Cleanup once npc rework is finished and default html is configurable.
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java
index 77b311bac5..f94776c505 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.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.NpcBuffers;
+package ai.others.NpcBuffers;
import java.io.File;
import java.util.Collection;
@@ -45,7 +45,7 @@ public class NpcBuffersData implements IGameXmlReader
@Override
public void load()
{
- parseDatapackFile("data/scripts/ai/npc/NpcBuffers/NpcBuffersData.xml");
+ parseDatapackFile("data/scripts/ai/others/NpcBuffers/NpcBuffersData.xml");
LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded: " + _npcBuffers.size() + " buffers data.");
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.xml
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.xml
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.xml
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.xsd b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.xsd
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.xsd
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.xsd
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/impl/CabaleBuffer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/impl/CabaleBuffer.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java
index 978a755910..faf0d4c157 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/NpcBuffers/impl/CabaleBuffer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.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.NpcBuffers.impl;
+package ai.others.NpcBuffers.impl;
import java.util.Collection;
@@ -62,7 +62,6 @@ public final class CabaleBuffer extends AbstractNpcAI
private CabaleBuffer()
{
- super(CabaleBuffer.class.getSimpleName(), "ai/npc");
addFirstTalkId(SevenSigns.ORATOR_NPC_ID, SevenSigns.PREACHER_NPC_ID);
addSpawnId(SevenSigns.ORATOR_NPC_ID, SevenSigns.PREACHER_NPC_ID);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/1.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/1.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/1.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/1.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/1a.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/1a.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/1a.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/1a.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/3.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/3.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/3.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/3.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/4.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/4.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/4.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/4.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/5.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/5.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/5.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/5.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/5a.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/5a.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/5a.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/5a.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/6.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/6.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/6.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/6.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/7.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/7.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/7.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/7.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java
index ce0f7fe919..6b18fc3c13 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.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.OracleTeleport;
+package ai.others.OracleTeleport;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.Location;
@@ -139,7 +139,6 @@ public final class OracleTeleport extends AbstractNpcAI
private OracleTeleport()
{
- super(OracleTeleport.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(RIFT_POSTERS);
addStartNpc(TELEPORTERS);
addStartNpc(TEMPLE_PRIEST);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/oracle.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/oracle.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/oracle.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/oracle.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/oracle1.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/oracle1.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/oracle1.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/oracle1.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/rift_back.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/rift_back.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/rift_back.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/rift_back.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/rift_back_unknown.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/rift_back_unknown.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/rift_back_unknown.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/rift_back_unknown.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/ziggurat.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/ziggurat.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/ziggurat.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/ziggurat.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/ziggurat_lowlevel.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/ziggurat_lowlevel.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/ziggurat_lowlevel.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/ziggurat_lowlevel.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/ziggurat_noadena.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/ziggurat_noadena.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/ziggurat_noadena.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/ziggurat_noadena.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/ziggurat_nofrag.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/ziggurat_nofrag.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/ziggurat_nofrag.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/ziggurat_nofrag.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/ziggurat_rift.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/ziggurat_rift.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/ziggurat_rift.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/ziggurat_rift.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PolymorphingAngel.java
similarity index 91%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PolymorphingAngel.java
index d771b62c7d..0a15bfadf6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PolymorphingAngel.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.others;
import java.util.HashMap;
import java.util.Map;
@@ -42,7 +42,6 @@ public final class PolymorphingAngel extends AbstractNpcAI
private PolymorphingAngel()
{
- super(PolymorphingAngel.class.getSimpleName(), "ai/group_template");
addKillId(ANGELSPAWNS.keySet());
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java
index dabfdae374..d69df99127 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PolymorphingOnAttack.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.others;
import java.util.Arrays;
import java.util.HashMap;
@@ -79,7 +79,6 @@ public final class PolymorphingOnAttack extends AbstractNpcAI
private PolymorphingOnAttack()
{
- super(PolymorphingOnAttack.class.getSimpleName(), "ai/group_template");
addAttackId(MOBSPAWNS.keySet());
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/32783-1.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/32783-1.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/32783-1.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/32783-1.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/32783-2.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/32783-2.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/32783-2.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/32783-2.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/32783-adena.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/32783-adena.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/32783-adena.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/32783-adena.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/32783.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/32783.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/32783.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/32783.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/PriestOfBlessing.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/PriestOfBlessing.java
index 4872d12402..2ea492b88a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/PriestOfBlessing.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.PriestOfBlessing;
+package ai.others.PriestOfBlessing;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -86,7 +86,6 @@ public final class PriestOfBlessing extends AbstractNpcAI
private PriestOfBlessing()
{
- super(PriestOfBlessing.class.getSimpleName(), "ai/npc");
addStartNpc(PRIEST);
addFirstTalkId(PRIEST);
addTalkId(PRIEST);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PrisonGuards.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PrisonGuards.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PrisonGuards.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PrisonGuards.java
index edadddc72a..bf05af2b1f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/PrisonGuards.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PrisonGuards.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.others;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.L2Object;
@@ -45,7 +45,6 @@ public final class PrisonGuards extends AbstractNpcAI
private PrisonGuards()
{
- super(PrisonGuards.class.getSimpleName(), "ai/group_template");
addAttackId(GUARD_HEAD, GUARD);
addSpawnId(GUARD_HEAD, GUARD);
addNpcHateId(GUARD);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/RandomSpawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/RandomSpawn.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/RandomSpawn.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/RandomSpawn.java
index 9aa0a4c1c9..1abcad97e2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/RandomSpawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/RandomSpawn.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.others;
import java.util.HashMap;
import java.util.Map;
@@ -79,7 +79,6 @@ public final class RandomSpawn extends AbstractNpcAI
public RandomSpawn()
{
- super(RandomSpawn.class.getSimpleName(), "ai/group_template");
addSpawnId(SPAWN_POINTS.keySet());
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/Remnants.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Remnants.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/Remnants.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Remnants.java
index 23bd604c23..818eafe057 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/Remnants.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Remnants.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.others;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -42,7 +42,6 @@ public final class Remnants extends AbstractNpcAI
// private static final String MSG_DEREK = "The holy water affects Derek. You have freed his soul.";
private Remnants()
{
- super(Remnants.class.getSimpleName(), "ai/group_template");
addSpawnId(NPCS);
addSkillSeeId(NPCS);
// Do not override onKill for Derek here. Let's make global Hellbound manipulations in Engine where it is possible.
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/Sandstorms.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Sandstorms.java
similarity index 91%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/Sandstorms.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Sandstorms.java
index ae09ce4f0f..6126bc8582 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/Sandstorms.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Sandstorms.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.others;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -35,7 +35,6 @@ public class Sandstorms extends AbstractNpcAI
public Sandstorms()
{
- super(Sandstorms.class.getSimpleName(), "ai/group_template");
addAggroRangeEnterId(SANDSTORM); // Sandstorm
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SeeThroughSilentMove.java
similarity index 91%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SeeThroughSilentMove.java
index 87af6bb6ed..9210697a47 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SeeThroughSilentMove.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.others;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -40,7 +40,6 @@ public class SeeThroughSilentMove extends AbstractNpcAI
private SeeThroughSilentMove()
{
- super(SeeThroughSilentMove.class.getSimpleName(), "ai/group_template");
addSpawnId(MONSTERS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Selina/31556-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/31556-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Selina/31556-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/31556-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Selina/31556-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/31556-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Selina/31556-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/31556-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Selina/31556-08.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/31556-08.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Selina/31556-08.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/31556-08.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Selina/31556-09.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/31556-09.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Selina/31556-09.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/31556-09.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Selina/Selina.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/Selina.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Selina/Selina.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/Selina.java
index bbdfccff35..4f5cc3d9a4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Selina/Selina.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Selina/Selina.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.Selina;
+package ai.others.Selina;
import java.util.HashMap;
import java.util.Map;
@@ -55,7 +55,6 @@ public final class Selina extends AbstractNpcAI
public Selina()
{
- super(Selina.class.getSimpleName(), "ai/npc");
addStartNpc(SELINA);
addTalkId(SELINA);
addFirstTalkId(SELINA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Servitors/GolemTrader.java
similarity index 88%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Servitors/GolemTrader.java
index fad38d0161..e422a0c869 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Servitors/GolemTrader.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.Summons.MerchantGolem;
+package ai.others.Servitors;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -31,7 +31,6 @@ public final class GolemTrader extends AbstractNpcAI
private GolemTrader()
{
- super(GolemTrader.class.getSimpleName(), "ai/npc/Summons");
addSpawnId(GOLEM_TRADER);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Summons/Servitors/Servitors.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Servitors/Servitors.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Summons/Servitors/Servitors.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Servitors/Servitors.java
index 1b92e6485f..a9f197b7fa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Summons/Servitors/Servitors.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Servitors/Servitors.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.Summons.Servitors;
+package ai.others.Servitors;
import java.util.Arrays;
import java.util.HashMap;
@@ -83,7 +83,6 @@ public final class Servitors extends AbstractNpcAI
private Servitors()
{
- super(Servitors.class.getSimpleName(), "ai/npc/Summons");
}
@RegisterEvent(EventType.ON_CREATURE_KILL)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/SinEater.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Servitors/SinEater.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/SinEater.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Servitors/SinEater.java
index 752a7afb5a..70ab81c5d6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/SinEater.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Servitors/SinEater.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;
+package ai.others.Servitors;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -43,7 +43,6 @@ public final class SinEater extends AbstractNpcAI
private SinEater()
{
- super(SinEater.class.getSimpleName(), "ai/individual");
addSummonSpawnId(SIN_EATER);
addSummonTalkId(SIN_EATER);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/ShadowSummoner.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ShadowSummoner.java
similarity index 97%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/ShadowSummoner.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ShadowSummoner.java
index f9746eefb5..0aec20fece 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/ShadowSummoner.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/ShadowSummoner.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;
+package ai.others;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
@@ -53,7 +53,6 @@ public class ShadowSummoner extends AbstractNpcAI
public ShadowSummoner()
{
- super(ShadowSummoner.class.getSimpleName(), "ai/individual");
addAttackId(SHADOW_SUMMONER);
addSeeCreatureId(SHADOW_SUMMONER);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/SinWardens.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SinWardens.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/SinWardens.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SinWardens.java
index fe48a96c56..d3680bc2d8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/SinWardens.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SinWardens.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;
+package ai.others;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -56,7 +56,6 @@ public final class SinWardens extends AbstractNpcAI
private SinWardens()
{
- super(SinWardens.class.getSimpleName(), "ai/individual");
addKillId(SIN_WARDEN_MINIONS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/32376-02.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SteelCitadelTeleport/32376-02.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/32376-02.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SteelCitadelTeleport/32376-02.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/32376-02a.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SteelCitadelTeleport/32376-02a.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/32376-02a.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SteelCitadelTeleport/32376-02a.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/32376-03.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SteelCitadelTeleport/32376-03.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/32376-03.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SteelCitadelTeleport/32376-03.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SteelCitadelTeleport/SteelCitadelTeleport.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SteelCitadelTeleport/SteelCitadelTeleport.java
index bfe8415a55..4a31ada83f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SteelCitadelTeleport/SteelCitadelTeleport.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.SteelCitadelTeleport;
+package ai.others.SteelCitadelTeleport;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.instancemanager.GrandBossManager;
@@ -42,7 +42,6 @@ public final class SteelCitadelTeleport extends AbstractNpcAI
private SteelCitadelTeleport()
{
- super(SteelCitadelTeleport.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(NAIA_CUBE);
addTalkId(NAIA_CUBE);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32163-no.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32163-no.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32163-no.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32163-no.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32163.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32163.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32163.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32163.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32181-no.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32181-no.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32181-no.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32181-no.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32181.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32181.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32181.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32181.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32184-no.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32184-no.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32184-no.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32184-no.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32184.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32184.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32184.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32184.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32186-no.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32186-no.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32186-no.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32186-no.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32186.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32186.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/32186.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/32186.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/StrongholdsTeleports.java
similarity index 88%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/StrongholdsTeleports.java
index 89cc361ae7..4ba0af100c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/StrongholdsTeleports/StrongholdsTeleports.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.StrongholdsTeleports;
+package ai.others.StrongholdsTeleports;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -39,7 +39,6 @@ public final class StrongholdsTeleports extends AbstractNpcAI
private StrongholdsTeleports()
{
- super(StrongholdsTeleports.class.getSimpleName(), "ai/npc/Teleports");
addFirstTalkId(NPCs);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/AlreadyReceived.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/AlreadyReceived.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/AlreadyReceived.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/AlreadyReceived.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/CertificationList.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/CertificationList.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/CertificationList.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/CertificationList.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/ClassAbility.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/ClassAbility.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/ClassAbility.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/ClassAbility.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/EmergentAbility.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/EmergentAbility.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/EmergentAbility.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/EmergentAbility.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/Explanation.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/Explanation.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/Explanation.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/Explanation.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/GetAbility.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/GetAbility.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/GetAbility.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/GetAbility.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/LowLevel.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/LowLevel.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/LowLevel.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/LowLevel.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/Main.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/Main.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/Main.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/Main.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/NotMinLevel.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/NotMinLevel.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/NotMinLevel.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/NotMinLevel.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/NotObtain.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/NotObtain.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/NotObtain.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/NotObtain.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/NotSubclass.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/NotSubclass.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/NotSubclass.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/NotSubclass.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java
index 04e61bb2c3..fa9fbf8983 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.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.SubclassCertification;
+package ai.others.SubclassCertification;
import java.util.HashMap;
import java.util.Map;
@@ -82,7 +82,6 @@ public final class SubclassCertification extends AbstractNpcAI
private SubclassCertification()
{
- super(SubclassCertification.class.getSimpleName(), "ai/npc");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/WrongVillageMaster.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/WrongVillageMaster.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/WrongVillageMaster.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/WrongVillageMaster.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.java
index 35a9910b1d..79954033c1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/SupportUnitCaptain.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.SupportUnitCaptain;
+package ai.others.SupportUnitCaptain;
import com.l2jmobius.gameserver.model.ClanPrivilege;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -122,7 +122,6 @@ public final class SupportUnitCaptain extends AbstractNpcAI
private SupportUnitCaptain()
{
- super(SupportUnitCaptain.class.getSimpleName(), "ai/npc");
addStartNpc(UNIT_CAPTAIN);
addTalkId(UNIT_CAPTAIN);
addFirstTalkId(UNIT_CAPTAIN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/unitcaptain-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/unitcaptain-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/unitcaptain-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/unitcaptain-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/unitcaptain-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/unitcaptain-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/unitcaptain-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/unitcaptain-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/unitcaptain-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/unitcaptain-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/unitcaptain.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SupportUnitCaptain/unitcaptain.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SupportUnitCaptain/unitcaptain.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Survivor/32632-1.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/32632-1.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Survivor/32632-1.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/32632-1.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Survivor/32632-2.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/32632-2.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Survivor/32632-2.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/32632-2.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Survivor/32632-3.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/32632-3.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Survivor/32632-3.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/32632-3.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/Survivor.java
similarity index 91%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/Survivor.java
index aaf1faa486..ffee35f875 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/Survivor.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.Survivor;
+package ai.others.Survivor;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -39,7 +39,6 @@ public final class Survivor extends AbstractNpcAI
private Survivor()
{
- super(Survivor.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(SURVIVOR);
addTalkId(SURVIVOR);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index 92a9d78e42..f4cec57fbe 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.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.SymbolMaker;
+package ai.others.SymbolMaker;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -47,7 +47,6 @@ public final class SymbolMaker extends AbstractNpcAI
private SymbolMaker()
{
- super(SymbolMaker.class.getSimpleName(), "ai/npc");
addFirstTalkId(NPCS);
addStartNpc(NPCS);
addTalkId(NPCS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SymbolMaker/symbol_maker-1.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/symbol_maker-1.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SymbolMaker/symbol_maker-1.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/symbol_maker-1.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SymbolMaker/symbol_maker-2.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/symbol_maker-2.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SymbolMaker/symbol_maker-2.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/symbol_maker-2.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SymbolMaker/symbol_maker-3.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/symbol_maker-3.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SymbolMaker/symbol_maker-3.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/symbol_maker-3.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SymbolMaker/symbol_maker.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/symbol_maker.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SymbolMaker/symbol_maker.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SymbolMaker/symbol_maker.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToFantasy/TeleportToFantasy.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToFantasy/TeleportToFantasy.java
index 3e2bf0e5b6..e0825b11ad 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToFantasy/TeleportToFantasy.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.TeleportToFantasy;
+package ai.others.TeleportToFantasy;
import java.util.HashMap;
import java.util.Map;
@@ -80,7 +80,6 @@ public final class TeleportToFantasy extends AbstractNpcAI
private TeleportToFantasy()
{
- super(TeleportToFantasy.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(PADDIES);
addStartNpc(TELEPORTERS.keySet());
addTalkId(PADDIES);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToRaceTrack/TeleportToRaceTrack.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToRaceTrack/TeleportToRaceTrack.java
index ac9756363c..743042a03d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToRaceTrack/TeleportToRaceTrack.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.TeleportToRaceTrack;
+package ai.others.TeleportToRaceTrack;
import java.util.HashMap;
import java.util.Map;
@@ -74,7 +74,6 @@ public final class TeleportToRaceTrack extends AbstractNpcAI
private TeleportToRaceTrack()
{
- super(TeleportToRaceTrack.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(RACE_MANAGER);
addStartNpc(TELEPORTERS.keySet());
addTalkId(RACE_MANAGER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/32491-1.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/32491-1.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/32491-1.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/32491-1.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/32491-2.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/32491-2.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/32491-2.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/32491-2.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/32491.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/32491.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/32491.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/32491.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index 95c5cedfa4..ed67e47868 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.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.TeleportToUndergroundColiseum;
+package ai.others.TeleportToUndergroundColiseum;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -85,7 +85,6 @@ public final class TeleportToUndergroundColiseum extends AbstractNpcAI
private TeleportToUndergroundColiseum()
{
- super(TeleportToUndergroundColiseum.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(MANAGERS);
addStartNpc(COLISEUM_HELPER, PADDIES);
addFirstTalkId(COLISEUM_HELPER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/30540-01.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportWithCharm/30540-01.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/30540-01.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportWithCharm/30540-01.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/30576-01.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportWithCharm/30576-01.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/30576-01.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportWithCharm/30576-01.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportWithCharm/TeleportWithCharm.java
similarity index 91%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportWithCharm/TeleportWithCharm.java
index e0d053941d..5684e4f03c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportWithCharm/TeleportWithCharm.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.TeleportWithCharm;
+package ai.others.TeleportWithCharm;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -41,7 +41,6 @@ public final class TeleportWithCharm extends AbstractNpcAI
private TeleportWithCharm()
{
- super(TeleportWithCharm.class.getSimpleName(), "ai/npc/Teleports");
addStartNpc(WHIRPY, TAMIL);
addTalkId(WHIRPY, TAMIL);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490-06.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490-06.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490-06.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490-06.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490-07.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490-07.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490-07.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490-07.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490-08.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490-08.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490-08.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490-08.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36490.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36490.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36491.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36491.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36491.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36491.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36492.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36492.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36492.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36492.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36493.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36493.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36493.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36493.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36494.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36494.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36494.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36494.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36495.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36495.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36495.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36495.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36496.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36496.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36496.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36496.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36497.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36497.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36497.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36497.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36498.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36498.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/36498.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/36498.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java
similarity index 96%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java
index 02ad7fad67..ed1f7b174c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/TerritoryManagers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.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.TerritoryManagers;
+package ai.others.TerritoryManagers;
import com.l2jmobius.gameserver.data.xml.impl.MultisellData;
import com.l2jmobius.gameserver.enums.Race;
@@ -64,8 +64,6 @@ public final class TerritoryManagers extends AbstractNpcAI
private TerritoryManagers()
{
- super(TerritoryManagers.class.getSimpleName(), "ai/npc");
-
for (int i = 0; i < 9; i++)
{
addFirstTalkId(36490 + i);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/reward-0a.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/reward-0a.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/reward-0a.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/reward-0a.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/reward-0b.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/reward-0b.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/reward-0b.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/reward-0b.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/reward-1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/reward-1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/reward-1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/reward-1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/reward-2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/reward-2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/reward-2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/reward-2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/reward-3.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/reward-3.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TerritoryManagers/reward-3.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/reward-3.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TownPets/TownPets.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TownPets/TownPets.java
similarity index 92%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TownPets/TownPets.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TownPets/TownPets.java
index 6a12c75d3b..5770966596 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/TownPets/TownPets.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TownPets/TownPets.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.TownPets;
+package ai.others.TownPets;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.model.Location;
@@ -48,7 +48,6 @@ public final class TownPets extends AbstractNpcAI
private TownPets()
{
- super(TownPets.class.getSimpleName(), "ai/npc");
addSpawnId(PETS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/TurekOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TurekOrcs.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/TurekOrcs.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TurekOrcs.java
index e08d2ec95e..1d899c3fc4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/TurekOrcs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TurekOrcs.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.others;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.enums.ChatType;
@@ -48,7 +48,6 @@ public final class TurekOrcs extends AbstractNpcAI
private TurekOrcs()
{
- super(TurekOrcs.class.getSimpleName(), "ai/group_template");
addAttackId(MOBS);
addEventReceivedId(MOBS);
addMoveFinishedId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/VarkaKetra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/VarkaKetra.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/VarkaKetra.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/VarkaKetra.java
index 7b9872e949..f88819ab09 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/VarkaKetra.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/VarkaKetra.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.others;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -138,7 +138,6 @@ public class VarkaKetra extends AbstractNpcAI
private VarkaKetra()
{
- super(VarkaKetra.class.getSimpleName(), "ai/group_template");
addKillId(KETRA);
addKillId(VARKA);
addNpcHateId(KETRA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WarriorFishingBlock.java
index daba7f9601..88f73cb402 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WarriorFishingBlock.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.others;
import com.l2jmobius.gameserver.ai.CtrlEvent;
import com.l2jmobius.gameserver.enums.ChatType;
@@ -69,7 +69,6 @@ public final class WarriorFishingBlock extends AbstractNpcAI
public WarriorFishingBlock()
{
- super(WarriorFishingBlock.class.getSimpleName(), "ai/group_template");
addAttackId(MONSTERS);
addKillId(MONSTERS);
addSpawnId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32610-1.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32610-1.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32610-1.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32610-1.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32610-2.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32610-2.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32610-2.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32610-2.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32610-3.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32610-3.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32610-3.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32610-3.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32610-4.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32610-4.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32610-4.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32610-4.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32610-5.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32610-5.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32610-5.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32610-5.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32610-low.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32610-low.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32610-low.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32610-low.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32610-no.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32610-no.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32610-no.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32610-no.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32612-1.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32612-1.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32612-1.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32612-1.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32612-2.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32612-2.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32612-2.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32612-2.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32612-3.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32612-3.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32612-3.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32612-3.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32612-4.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32612-4.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32612-4.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32612-4.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32612-5.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32612-5.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32612-5.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32612-5.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32612-low.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32612-low.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32612-low.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32612-low.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32612-no.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32612-no.htm
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/32612-no.htm
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/32612-no.htm
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.java
index 18bbf738ce..52c6fa71fc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WeaverOlf/WeaverOlf.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.WeaverOlf;
+package ai.others.WeaverOlf;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -152,7 +152,6 @@ public final class WeaverOlf extends AbstractNpcAI
private WeaverOlf()
{
- super(WeaverOlf.class.getSimpleName(), "ai/npc");
addStartNpc(NPCs);
addTalkId(NPCs);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
index 5b68c301c9..abfe4635ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.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.WyvernManager;
+package ai.others.WyvernManager;
import java.util.HashMap;
import java.util.Map;
@@ -99,7 +99,6 @@ public final class WyvernManager extends AbstractNpcAI
private WyvernManager()
{
- super(WyvernManager.class.getSimpleName(), "ai/npc");
addStartNpc(MANAGERS.keySet());
addTalkId(MANAGERS.keySet());
addFirstTalkId(MANAGERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-03.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-03.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-03.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-03.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-03b.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-03b.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-03b.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-03b.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-04.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-04.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-04.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-04.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-05.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-05.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-05.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-05.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-06.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-06.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-06.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-06.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-07.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-07.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-07.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-07.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-dusk.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-dusk.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/WyvernManager/wyvernmanager-dusk.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/wyvernmanager-dusk.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java
index fa115e6571..5502371819 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java
@@ -46,7 +46,7 @@ public final class DevastatedCastle extends ClanHallSiegeEngine
private DevastatedCastle()
{
- super(DevastatedCastle.class.getSimpleName(), "conquerablehalls", DEVASTATED_CASTLE);
+ super(DEVASTATED_CASTLE);
addKillId(GUSTAV);
addSpawnId(MIKHAIL);
addSpawnId(DIETRICH);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
index df071ab6ec..3cbbdf5a54 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
@@ -54,7 +54,7 @@ public final class FortressOfResistance extends ClanHallSiegeEngine
private FortressOfResistance()
{
- super(FortressOfResistance.class.getSimpleName(), "conquerablehalls", FORTRESS_RESSISTANCE);
+ super(FORTRESS_RESSISTANCE);
addFirstTalkId(MESSENGER);
addKillId(BLOODY_LORD_NURKA);
addAttackId(BLOODY_LORD_NURKA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java
index 8fd9e86d3d..ffd47a6371 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java
@@ -44,7 +44,7 @@ public final class FortressOfTheDead extends ClanHallSiegeEngine
public FortressOfTheDead()
{
- super(FortressOfTheDead.class.getSimpleName(), "conquerablehalls", FORTRESS_OF_DEAD);
+ super(FORTRESS_OF_DEAD);
addKillId(LIDIA);
addKillId(ALFRED);
addKillId(GISELLE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
index de462e3d2f..d0e41479da 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -269,7 +269,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
public RainbowSpringsChateau()
{
- super(RainbowSpringsChateau.class.getSimpleName(), "conquerablehalls", RAINBOW_SPRINGS);
+ super(RAINBOW_SPRINGS);
addFirstTalkId(MESSENGER);
addTalkId(MESSENGER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java
index 0e568f5ce1..7cbf65dc7c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java
@@ -87,7 +87,7 @@ public final class BanditStronghold extends FlagWar
private BanditStronghold()
{
- super(BanditStronghold.class.getSimpleName(), BANDIT_STRONGHOLD);
+ super(BANDIT_STRONGHOLD);
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
index 95934662ee..57878e253d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
@@ -93,9 +93,9 @@ public abstract class FlagWar extends ClanHallSiegeEngine
protected L2Clan _winner;
private boolean _firstPhase;
- public FlagWar(String name, int hallId)
+ public FlagWar(int hallId)
{
- super(name, "conquerablehalls/flagwar", hallId);
+ super(hallId);
addStartNpc(MESSENGER);
addFirstTalkId(MESSENGER);
addTalkId(MESSENGER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java
index c811620c22..9965fe09b1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java
@@ -87,7 +87,7 @@ public final class WildBeastReserve extends FlagWar
private WildBeastReserve()
{
- super(WildBeastReserve.class.getSimpleName(), BEAST_FARM);
+ super(BEAST_FARM);
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
index 1b510669ec..331384fbc4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java
@@ -21,15 +21,16 @@ import java.util.Map;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.util.Util;
+import ai.AbstractNpcAI;
+
/**
* Echo Crystals AI.
* @author Plim
*/
-public final class EchoCrystals extends Quest
+public final class EchoCrystals extends AbstractNpcAI
{
private static final int[] NPCs =
{
@@ -81,7 +82,6 @@ public final class EchoCrystals extends Quest
private EchoCrystals()
{
- super(-1, EchoCrystals.class.getSimpleName(), "custom");
// Initialize Map
SCORES.put(4410, new ScoreData(4411, "01", "02", "03"));
SCORES.put(4409, new ScoreData(4412, "04", "05", "06"));
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
index 3324d9544b..694673e37a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
@@ -19,14 +19,15 @@ package custom.NewbieCoupons;
import com.l2jmobius.gameserver.data.xml.impl.MultisellData;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.quest.Quest;
+
+import ai.AbstractNpcAI;
/**
* Newbie Weapon/Accesories Coupons for the Hellbound opening event.
* Original Jython script by Vice.
* @author Nyaran
*/
-public final class NewbieCoupons extends Quest
+public final class NewbieCoupons extends AbstractNpcAI
{
private static final int COUPON_ONE = 7832;
private static final int COUPON_TWO = 7833;
@@ -58,8 +59,6 @@ public final class NewbieCoupons extends Quest
private NewbieCoupons()
{
- super(-1, NewbieCoupons.class.getSimpleName(), "custom");
-
for (int i : NPCs)
{
addStartNpc(i);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java
index 2df1a65623..26856c92b8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java
@@ -43,7 +43,6 @@ import com.l2jmobius.gameserver.model.actor.status.SummonStatus;
import com.l2jmobius.gameserver.model.effects.L2EffectType;
import com.l2jmobius.gameserver.model.entity.TvTEvent;
import com.l2jmobius.gameserver.model.olympiad.OlympiadManager;
-import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -53,7 +52,9 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.SetSummonRemainTime;
import com.l2jmobius.gameserver.network.serverpackets.SetupGauge;
-public class NpcBuffer extends Quest
+import ai.AbstractNpcAI;
+
+public class NpcBuffer extends AbstractNpcAI
{
private static final boolean DEBUG = false;
@@ -512,7 +513,6 @@ public class NpcBuffer extends Quest
private NpcBuffer()
{
- super(-1, NpcBuffer.class.getSimpleName(), "custom");
addStartNpc(NPC_ID);
addFirstTalkId(NPC_ID);
addTalkId(NPC_ID);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 9243c62ca1..ccc7a97ae6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -20,14 +20,15 @@ import com.l2jmobius.gameserver.datatables.SpawnTable;
import com.l2jmobius.gameserver.model.L2Spawn;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.util.Util;
+import ai.AbstractNpcAI;
+
/**
* Npc Location Info AI.
* @author Nyaran
*/
-public final class NpcLocationInfo extends Quest
+public final class NpcLocationInfo extends AbstractNpcAI
{
private static final int[] NPC =
{
@@ -261,7 +262,6 @@ public final class NpcLocationInfo extends Quest
private NpcLocationInfo()
{
- super(-1, NpcLocationInfo.class.getSimpleName(), "custom");
addStartNpc(NPC);
addTalkId(NPC);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
index bfa88a0d1c..e4d4e764bd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
@@ -26,15 +26,16 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
-import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.util.Util;
+import ai.AbstractNpcAI;
+
/**
* Raidboss Info AI.
* Original Jython script Kerberos.
* @author Nyaran
*/
-public final class RaidbossInfo extends Quest
+public final class RaidbossInfo extends AbstractNpcAI
{
// @formatter:off
private static final int[] NPC =
@@ -57,7 +58,6 @@ public final class RaidbossInfo extends Quest
private RaidbossInfo()
{
- super(-1, RaidbossInfo.class.getSimpleName(), "custom");
addStartNpc(NPC);
addTalkId(NPC);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
index 404c26866a..7b7ddfee83 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
@@ -18,14 +18,15 @@ package custom.ShadowWeapons;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.quest.Quest;
+
+import ai.AbstractNpcAI;
/**
* Shadow Weapons AI.
* Original Jython script by DrLecter.
* @author Nyaran, jurchiks
*/
-public final class ShadowWeapons extends Quest
+public final class ShadowWeapons extends AbstractNpcAI
{
// @formatter:off
private static final int[] NPCS =
@@ -44,7 +45,6 @@ public final class ShadowWeapons extends Quest
// @formatter:on
private ShadowWeapons()
{
- super(-1, ShadowWeapons.class.getSimpleName(), "custom");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java
index 38e7eff0d7..5bef235ec8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java
@@ -26,17 +26,18 @@ import com.l2jmobius.gameserver.enums.IllegalActionPunishmentType;
import com.l2jmobius.gameserver.model.PcCondOverride;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.util.Util;
+import ai.AbstractNpcAI;
+
/**
* Sub-class skills validator.
* TODO: Rewrite.
* @author DS
*/
-public final class SubClassSkills extends Quest
+public final class SubClassSkills extends AbstractNpcAI
{
// arrays must be sorted
// @formatter:off
@@ -88,7 +89,6 @@ public final class SubClassSkills extends Quest
private SubClassSkills()
{
- super(-1, SubClassSkills.class.getSimpleName(), "custom");
setOnEnterWorld(true);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java
index d1ac0ad152..371f41c4d1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java
@@ -67,7 +67,6 @@ public final class Elpies extends Event
private Elpies()
{
- super(Elpies.class.getSimpleName(), "custom/events");
addSpawnId(ELPY);
addKillId(ELPY);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index c90fd1b728..adc9ed55c4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -76,7 +76,6 @@ public final class Rabbits extends Event
private Rabbits()
{
- super(Rabbits.class.getSimpleName(), "custom/events");
addFirstTalkId(NPC_MANAGER, CHEST);
addTalkId(NPC_MANAGER);
addStartNpc(NPC_MANAGER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java
index 15c7c48988..fce85107f1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java
@@ -101,7 +101,6 @@ public final class Race extends Event
private Race()
{
- super(Race.class.getSimpleName(), "custom/events");
addStartNpc(_start_npc);
addFirstTalkId(_start_npc);
addTalkId(_start_npc);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
index 350d78d2f1..ee3f433968 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
@@ -44,7 +44,6 @@ public final class TvTManager extends AbstractNpcAI implements IVoicedCommandHan
public TvTManager()
{
- super(TvTManager.class.getSimpleName(), "custom/events/TvT");
addFirstTalkId(MANAGER_ID);
addTalkId(MANAGER_ID);
addStartNpc(MANAGER_ID);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java
index d11273f0dc..7954913a1a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java
@@ -44,7 +44,6 @@ public final class Wedding extends AbstractNpcAI
public Wedding()
{
- super(Wedding.class.getSimpleName(), "custom/events");
addFirstTalkId(MANAGER_ID);
addTalkId(MANAGER_ID);
addStartNpc(MANAGER_ID);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 07ce2fd248..545d371428 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -18,15 +18,16 @@ package events.CharacterBirthday;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.util.Util;
+import ai.AbstractNpcAI;
+
/**
* Character Birthday event AI.
* Updated to H5 by Nyaran.
* @author Gnacik
*/
-public final class CharacterBirthday extends Quest
+public final class CharacterBirthday extends AbstractNpcAI
{
private static final int ALEGRIA = 32600;
private static int SPAWNS = 0;
@@ -56,7 +57,6 @@ public final class CharacterBirthday extends Quest
private CharacterBirthday()
{
- super(-1, CharacterBirthday.class.getSimpleName(), "events");
addStartNpc(ALEGRIA);
addStartNpc(GK);
addTalkId(ALEGRIA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
index cecfe1e045..85aa878cbd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -20,8 +20,8 @@ import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.event.LongTimeEvent;
import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import com.l2jmobius.gameserver.model.quest.LongTimeEvent;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -65,7 +65,6 @@ public final class FreyaCelebration extends LongTimeEvent
private FreyaCelebration()
{
- super(FreyaCelebration.class.getSimpleName(), "events");
addStartNpc(FREYA);
addFirstTalkId(FREYA);
addTalkId(FREYA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
index 38dd566b5d..1f406f73a1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java
@@ -18,8 +18,8 @@ package events.GiftOfVitality;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.event.LongTimeEvent;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
+import com.l2jmobius.gameserver.model.quest.LongTimeEvent;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -79,7 +79,6 @@ public final class GiftOfVitality extends LongTimeEvent
private GiftOfVitality()
{
- super(GiftOfVitality.class.getSimpleName(), "events");
addStartNpc(STEVE_SHYAGEL);
addFirstTalkId(STEVE_SHYAGEL);
addTalkId(STEVE_SHYAGEL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index e8216dfa9a..9a0d91f428 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -19,7 +19,7 @@ package events.HeavyMedal;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.event.LongTimeEvent;
+import com.l2jmobius.gameserver.model.quest.LongTimeEvent;
/**
* Heavy Medals event AI.
@@ -50,7 +50,6 @@ public final class HeavyMedal extends LongTimeEvent
private HeavyMedal()
{
- super(HeavyMedal.class.getSimpleName(), "events");
addStartNpc(CAT_ROY);
addStartNpc(CAT_WINNIE);
addTalkId(CAT_ROY);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/L2Day/L2Day.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/L2Day/L2Day.java
index 3b309827f3..791657a656 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/L2Day/L2Day.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/L2Day/L2Day.java
@@ -21,8 +21,8 @@ import java.util.Map;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.event.LongTimeEvent;
import com.l2jmobius.gameserver.model.holders.QuestItemHolder;
+import com.l2jmobius.gameserver.model.quest.LongTimeEvent;
/**
* L2 Day event AI.
@@ -142,7 +142,6 @@ public final class L2Day extends LongTimeEvent
private L2Day()
{
- super(L2Day.class.getSimpleName(), "events");
addStartNpc(MANAGERS.keySet());
addFirstTalkId(MANAGERS.keySet());
addTalkId(MANAGERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
index 7f2c521dbd..e8358b466e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java
@@ -18,9 +18,9 @@ package events.LoveYourGatekeeper;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.event.LongTimeEvent;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import com.l2jmobius.gameserver.model.quest.LongTimeEvent;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -43,7 +43,6 @@ public final class LoveYourGatekeeper extends LongTimeEvent
private LoveYourGatekeeper()
{
- super(LoveYourGatekeeper.class.getSimpleName(), "events");
addStartNpc(GATEKEEPER);
addFirstTalkId(GATEKEEPER);
addTalkId(GATEKEEPER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index 1173172e2b..164d226a64 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -20,8 +20,8 @@ import java.util.Date;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.event.LongTimeEvent;
import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import com.l2jmobius.gameserver.model.quest.LongTimeEvent;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -67,7 +67,6 @@ public final class MasterOfEnchanting extends LongTimeEvent
private MasterOfEnchanting()
{
- super(MasterOfEnchanting.class.getSimpleName(), "events");
addStartNpc(MASTER_YOGI);
addFirstTalkId(MASTER_YOGI);
addTalkId(MASTER_YOGI);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java
index 50bf66f287..cf0bf7eca4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java
@@ -19,7 +19,7 @@ package events.TheValentineEvent;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.event.LongTimeEvent;
+import com.l2jmobius.gameserver.model.quest.LongTimeEvent;
/**
* The Valentine Event event AI.
@@ -36,7 +36,6 @@ public final class TheValentineEvent extends LongTimeEvent
private TheValentineEvent()
{
- super(TheValentineEvent.class.getSimpleName(), "events");
addStartNpc(NPC);
addFirstTalkId(NPC);
addTalkId(NPC);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java
index a27746fe81..26c23c0a00 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java
@@ -52,7 +52,6 @@ public final class SkillTransfer extends AbstractNpcAI
private SkillTransfer()
{
- super(SkillTransfer.class.getSimpleName(), "features");
setPlayerProfessionChangeId(this::onProfessionChange);
setPlayerProfessionCancelId(this::onProfessionCancel);
setOnEnterWorld(Config.SKILL_CHECK_ENABLE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
index 591ab7977d..2651a4eb44 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java
@@ -31,8 +31,8 @@ import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.zone.type.L2NoRestartZone;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import ai.individual.Antharas.Antharas;
-import ai.individual.Baium.Baium;
+import ai.bosses.Antharas.Antharas;
+import ai.bosses.Baium.Baium;
/**
* @author St3eT
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHellbound.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHellbound.java
index 2c6e974a74..1b86f6a939 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHellbound.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHellbound.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import hellbound.HellboundEngine;
+import ai.areas.Hellbound.HellboundEngine;
/**
* Hellbound admin command.
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
index ba052f887c..dd2754be55 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
@@ -253,7 +253,7 @@ public class AdminQuest implements IAdminCommandHandler
final StringBuilder sb = new StringBuilder();
sb.append("ID: " + quest.getId() + " |
|
");
sb.append("Name: " + quest.getName() + " |
|
");
- sb.append("Descr: " + quest.getDescr() + " |
|
");
+ sb.append("Descr: " + quest.getPath() + " |
|
");
sb.append("Path: " + quest.getClass().getName().substring(0, quest.getClass().getName().lastIndexOf('.')).replaceAll("\\.", "/") + " |
|
");
sb.append(" |
");
if (!npcs.isEmpty())
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
index af3c516ce7..a1f3ab8ba3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java
@@ -30,9 +30,9 @@ import com.l2jmobius.gameserver.data.xml.impl.BuyListData;
import com.l2jmobius.gameserver.data.xml.impl.DoorData;
import com.l2jmobius.gameserver.data.xml.impl.EnchantItemData;
import com.l2jmobius.gameserver.data.xml.impl.EnchantItemGroupsData;
-import com.l2jmobius.gameserver.data.xml.impl.PrimeShopData;
import com.l2jmobius.gameserver.data.xml.impl.MultisellData;
import com.l2jmobius.gameserver.data.xml.impl.NpcData;
+import com.l2jmobius.gameserver.data.xml.impl.PrimeShopData;
import com.l2jmobius.gameserver.data.xml.impl.TransformData;
import com.l2jmobius.gameserver.datatables.ItemTable;
import com.l2jmobius.gameserver.datatables.SkillData;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java
index 3a75e054c2..4ece7e22ba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java
@@ -72,7 +72,6 @@ public class AdminZones extends AbstractNpcAI implements IAdminCommandHandler
public AdminZones()
{
- super(AdminZones.class.getSimpleName(), "handlers");
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 749915d904..4a080ef615 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -128,7 +128,7 @@ public class QuestLink implements IBypassHandler
if (quest.isCustomQuest())
{
- sb.append(quest.getDescr() + state);
+ sb.append(quest.getPath() + state);
}
else
{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Hellbound.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Hellbound.java
index dde99ff783..2c221ea635 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Hellbound.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Hellbound.java
@@ -19,7 +19,7 @@ package handlers.voicedcommandhandlers;
import com.l2jmobius.gameserver.handler.IVoicedCommandHandler;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import hellbound.HellboundEngine;
+import ai.areas.Hellbound.HellboundEngine;
/**
* Hellbound voiced command.
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java
index 9181265a6b..9be48d03d5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java
@@ -44,14 +44,8 @@ public abstract class AbstractInstance extends AbstractNpcAI
{
public final Logger _log = Logger.getLogger(getClass().getSimpleName());
- public AbstractInstance(String name, String desc)
+ public AbstractInstance()
{
- super(name, desc);
- }
-
- public AbstractInstance(String name)
- {
- super(name, "instances");
}
protected void enterInstance(L2PcInstance player, String template, int templateId)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java
index ae4ac06127..11f5660d93 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java
@@ -103,7 +103,6 @@ public final class CastleDungeon extends AbstractInstance
public CastleDungeon()
{
- super(CastleDungeon.class.getSimpleName());
addFirstTalkId(CASTLE_DUNGEON.keySet());
addStartNpc(CASTLE_DUNGEON.keySet());
addTalkId(CASTLE_DUNGEON.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java
index 9c082d0204..0498591522 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java
@@ -157,7 +157,6 @@ public final class CavernOfThePirateCaptain extends AbstractInstance
public CavernOfThePirateCaptain()
{
- super(CavernOfThePirateCaptain.class.getSimpleName());
addStartNpc(PATHFINDER);
addTalkId(PATHFINDER);
addKillId(ZAKEN_60, ZAKEN_60_NIGHT, ZAKEN_83);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java
index bc469a55ce..e1bfca66e4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java
@@ -173,8 +173,6 @@ public abstract class Chamber extends AbstractInstance
protected Chamber(String name, String descr, int instanceId, String instanceTemplateName, int entranceGKId, int roomGKFirstId, int roomGKLastId, int aenkinelId, int boxId)
{
- super(name, descr);
-
INSTANCEID = instanceId;
INSTANCE_TEMPLATE = instanceTemplateName;
ENTRANCE_GATEKEEPER = entranceGKId;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
index f576652f81..841da07601 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
@@ -493,7 +493,6 @@ public final class CrystalCaverns extends AbstractInstance
public CrystalCaverns()
{
- super(CrystalCaverns.class.getSimpleName());
addStartNpc(ORACLE_GUIDE_1, ORACLE_GUIDE_4);
addTalkId(ORACLE_GUIDE_1, ORACLE_GUIDE_3, ORACLE_GUIDE_4, 32275, 32276, 32277);
addFirstTalkId(ORACLE_GUIDE_1, ORACLE_GUIDE_2, ORACLE_GUIDE_4, CRYSTAL_GOLEM, 32274, 32275, 32276, 32277);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
index 0af8b4ea82..00a60509f9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
@@ -206,7 +206,6 @@ public final class DarkCloudMansion extends AbstractInstance
public DarkCloudMansion()
{
- super(DarkCloudMansion.class.getSimpleName());
addFirstTalkId(BSM, SOTruth);
addStartNpc(YIYEN);
addTalkId(YIYEN, SOTruth);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java
index 221f30bd96..25d72e0d53 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java
@@ -121,7 +121,6 @@ public final class DisciplesNecropolisPast extends AbstractInstance
public DisciplesNecropolisPast()
{
- super(DisciplesNecropolisPast.class.getSimpleName());
addAttackId(SEAL_DEVICE);
addFirstTalkId(SHUNAIMAN, LEON, DISCIPLES_GATEKEEPER);
addKillId(LILIM_BUTCHER, LILIM_MAGUS, LILIM_KNIGHT_ERRANT, LILIM_KNIGHT, SHILENS_EVIL_THOUGHTS1, SHILENS_EVIL_THOUGHTS2, LILIM_SLAYER, LILIM_GREAT_MAGUS, LILIM_GUARD_KNIGHT);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java
index 5f591918ac..0fd90736cb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java
@@ -51,7 +51,6 @@ public final class ElcadiasTent extends AbstractInstance
public ElcadiasTent()
{
- super(ElcadiasTent.class.getSimpleName());
addFirstTalkId(GRUFF_LOOKING_MAN, ELCADIA);
addStartNpc(GRUFF_LOOKING_MAN, ELCADIA);
addTalkId(GRUFF_LOOKING_MAN, ELCADIA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
index 620e960154..8314a79883 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
@@ -233,7 +233,6 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm
public FinalEmperialTomb()
{
- super(FinalEmperialTomb.class.getSimpleName());
load();
addAttackId(SCARLET1, FRINTEZZA);
addAttackId(PORTRAITS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java
similarity index 94%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java
index 1289117955..6a78c43a9e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.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;
+package instances.FinalEmperialTomb;
import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW;
@@ -52,7 +52,6 @@ public final class ScarletVanHalisha extends AbstractNpcAI
public ScarletVanHalisha()
{
- super(ScarletVanHalisha.class.getSimpleName(), "ai/individual");
addAttackId(HALISHA2, HALISHA3);
addKillId(HALISHA2, HALISHA3);
addSpellFinishedId(HALISHA2, HALISHA3);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java
index ce80410915..c5d688a238 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java
@@ -45,7 +45,6 @@ public final class HideoutOfTheDawn extends AbstractInstance
public HideoutOfTheDawn()
{
- super(HideoutOfTheDawn.class.getSimpleName());
addFirstTalkId(JAINA);
addStartNpc(WOOD);
addTalkId(WOOD, JAINA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java
index 8f0d3c9580..5bb85c4866 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java
@@ -65,7 +65,6 @@ public final class IceQueensCastle extends AbstractInstance
public IceQueensCastle()
{
- super(IceQueensCastle.class.getSimpleName());
addStartNpc(JINIA);
addTalkId(JINIA);
addSeeCreatureId(BATTALION_LEADER, LEGIONNAIRE, MERCENARY_ARCHER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java
index e97860a461..3cccbe63c4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java
@@ -180,7 +180,6 @@ public final class IceQueensCastleNormalBattle extends AbstractInstance
public IceQueensCastleNormalBattle()
{
- super(IceQueensCastleNormalBattle.class.getSimpleName());
addStartNpc(SIRRA, SUPP_KEGOR, SUPP_JINIA);
addFirstTalkId(SUPP_KEGOR, SUPP_JINIA);
addTalkId(SIRRA, JINIA, SUPP_KEGOR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java
index c0839e7c79..8ccb32e833 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java
@@ -40,7 +40,6 @@ public final class JiniaGuildHideout1 extends AbstractInstance
public JiniaGuildHideout1()
{
- super(JiniaGuildHideout1.class.getSimpleName());
addStartNpc(RAFFORTY);
addTalkId(RAFFORTY);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java
index 5a92e849ce..c13b9ee97a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java
@@ -40,7 +40,6 @@ public final class JiniaGuildHideout2 extends AbstractInstance
public JiniaGuildHideout2()
{
- super(JiniaGuildHideout2.class.getSimpleName());
addStartNpc(RAFFORTY);
addTalkId(RAFFORTY);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java
index 33dfb1b112..7d2e6983e5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java
@@ -40,7 +40,6 @@ public final class JiniaGuildHideout3 extends AbstractInstance
public JiniaGuildHideout3()
{
- super(JiniaGuildHideout3.class.getSimpleName());
addStartNpc(RAFFORTY);
addTalkId(RAFFORTY);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java
index a84ff9ce8c..f048a82bac 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java
@@ -40,7 +40,6 @@ public final class JiniaGuildHideout4 extends AbstractInstance
public JiniaGuildHideout4()
{
- super(JiniaGuildHideout4.class.getSimpleName());
addStartNpc(RAFFORTY);
addTalkId(RAFFORTY);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
index 4707ee8487..4cade593b5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java
@@ -384,7 +384,6 @@ public final class Kamaloka extends AbstractInstance
public Kamaloka()
{
- super(Kamaloka.class.getSimpleName());
addFirstTalkId(TELEPORTER);
addTalkId(TELEPORTER);
for (int cap : CAPTAINS)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/LibraryOfSages/LibraryOfSages.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/LibraryOfSages/LibraryOfSages.java
index 42482e4c32..f043530100 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/LibraryOfSages/LibraryOfSages.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/LibraryOfSages/LibraryOfSages.java
@@ -64,7 +64,6 @@ public final class LibraryOfSages extends AbstractInstance
public LibraryOfSages()
{
- super(LibraryOfSages.class.getSimpleName());
addFirstTalkId(SOPHIA2, ELCADIA_INSTANCE, PILE_OF_BOOKS1, PILE_OF_BOOKS2, PILE_OF_BOOKS3, PILE_OF_BOOKS4, PILE_OF_BOOKS5);
addStartNpc(SOPHIA1, SOPHIA2, SOPHIA3);
addTalkId(SOPHIA1, SOPHIA2, SOPHIA3);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
index a77f33f267..d46746ed0f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java
@@ -68,7 +68,6 @@ public final class MithrilMine extends AbstractInstance
public MithrilMine()
{
- super(MithrilMine.class.getSimpleName(), "instances");
addFirstTalkId(KEGOR);
addKillId(KEGOR, MITHRIL_MILLIPEDE);
addStartNpc(TARUN, KRUN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java
index 58df1aace9..09e5f6605a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java
@@ -184,7 +184,6 @@ public final class MonasteryOfSilence1 extends AbstractInstance
public MonasteryOfSilence1()
{
- super(MonasteryOfSilence1.class.getSimpleName());
addFirstTalkId(TELEPORT_CONTROL_DEVICE1, TELEPORT_CONTROL_DEVICE2, TELEPORT_CONTROL_DEVICE3, TELEPORT_CONTROL_DEVICE4);
addKillId(SOLINAS_GUARDIAN_1, SOLINAS_GUARDIAN_2, SOLINAS_GUARDIAN_3, SOLINAS_GUARDIAN_4, GUARDIAN_OF_THE_TOMB_1, GUARDIAN_OF_THE_TOMB_2, GUARDIAN_OF_THE_TOMB_3, GUARDIAN_OF_THE_TOMB_4, ETIS_VAN_ETINA);
addSpawnId(ERIS_EVIL_THOUGHTS, TOMB_OF_THE_SAINTESS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
index f513d487bc..01a018df26 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -200,7 +200,6 @@ public final class NornilsGarden extends AbstractInstance
public NornilsGarden()
{
- super(NornilsGarden.class.getSimpleName());
addStartNpc(_garden_guard);
addFirstTalkId(_garden_guard);
addTalkId(_garden_guard);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java
index 1f2fdfada6..4a440af1b2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGardenQuest/NornilsGardenQuest.java
@@ -47,8 +47,6 @@ public final class NornilsGardenQuest extends AbstractInstance
public NornilsGardenQuest()
{
- super(NornilsGardenQuest.class.getSimpleName());
-
addStartNpc(RODENPICULA, MOTHER_NORNIL);
addTalkId(RODENPICULA, MOTHER_NORNIL);
addFirstTalkId(RODENPICULA, MOTHER_NORNIL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
index 84df967ded..819377decc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
@@ -91,7 +91,6 @@ public final class PailakaDevilsLegacy extends AbstractInstance
public PailakaDevilsLegacy()
{
- super(PailakaDevilsLegacy.class.getSimpleName());
addTalkId(SURVIVOR);
addAttackId(POWDER_KEG, TREASURE_BOX, LEMATAN);
addKillId(LEMATAN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
index d00205ef79..a8a20163bd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
@@ -53,7 +53,6 @@ public final class PailakaSongOfIceAndFire extends AbstractInstance
public PailakaSongOfIceAndFire()
{
- super(PailakaSongOfIceAndFire.class.getSimpleName());
addStartNpc(ADLER1);
addTalkId(ADLER1);
addAttackId(BOTTLE, BRAZIER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java
index 6ba05dd119..954a916fe8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java
@@ -85,7 +85,6 @@ public final class SanctumOftheLordsOfDawn extends AbstractInstance
public SanctumOftheLordsOfDawn()
{
- super(SanctumOftheLordsOfDawn.class.getSimpleName());
addStartNpc(LIGHT_OF_DAWN);
addTalkId(LIGHT_OF_DAWN, IDENTITY_CONFIRM_DEVICE, PASSWORD_ENTRY_DEVICE, DARKNESS_OF_DAWN, SHELF);
addAggroRangeEnterId(GUARDS_OF_THE_DAWN, GUARDS_OF_THE_DAWN_2, GUARDS_OF_THE_DAWN_3);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java
index f2b83988e0..7d8c2a206e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java
@@ -63,9 +63,9 @@ public abstract class AbstractSagaQuest extends Quest
};
// @formatter:on
- public AbstractSagaQuest(int questId, String name, String descr)
+ public AbstractSagaQuest(int questId)
{
- super(questId, name, descr);
+ super(questId);
}
private QuestState findQuest(L2PcInstance player)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
index 6252acf3ec..707c198cc1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
@@ -44,7 +44,7 @@ public class Q00001_LettersOfLove extends Quest
public Q00001_LettersOfLove()
{
- super(1, Q00001_LettersOfLove.class.getSimpleName(), "Letters of Love");
+ super(1);
addStartNpc(DARIN);
addTalkId(DARIN, ROXXY, BAULRO);
registerQuestItems(DARINS_LETTER, ROXXYS_KERCHIEF, DARINS_RECEIPT, BAULROS_POTION);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
index 5aa91a1cee..9fdb650947 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java
@@ -47,7 +47,7 @@ public class Q00002_WhatWomenWant extends Quest
public Q00002_WhatWomenWant()
{
- super(2, Q00002_WhatWomenWant.class.getSimpleName(), "What Women Want");
+ super(2);
addStartNpc(ARUJIEN);
addTalkId(ARUJIEN, MIRABEL, HERBIEL, GREENIS);
registerQuestItems(ARUJIENS_LETTER1, ARUJIENS_LETTER2, ARUJIENS_LETTER3, POETRY_BOOK, GREENIS_LETTER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
index deec139c0a..987341644d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
@@ -49,7 +49,7 @@ public class Q00003_WillTheSealBeBroken extends Quest
public Q00003_WillTheSealBeBroken()
{
- super(3, Q00003_WillTheSealBeBroken.class.getSimpleName(), "Will the Seal be Broken?");
+ super(3);
addStartNpc(TALLOTH);
addTalkId(TALLOTH);
addKillId(OMEN_BEAST, TAINTED_ZOMBIE, STINK_ZOMBIE, LESSER_SUCCUBUS, LESSER_SUCCUBUS_TILFO, LESSER_SUCCUBUS_TUREN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
index a2a8181d14..1b231ee065 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
@@ -52,7 +52,7 @@ public class Q00004_LongLiveThePaagrioLord extends Quest
public Q00004_LongLiveThePaagrioLord()
{
- super(4, Q00004_LongLiveThePaagrioLord.class.getSimpleName(), "Long Live the Pa'agrio Lord");
+ super(4);
addStartNpc(NAKUSIN);
addTalkId(NAKUSIN, VARKEES, URUTU, HESTUI, KUNAI, USKA, GROOKIN);
registerQuestItems(HONEY_KHANDAR, BEAR_FUR_CLOAK, BLOODY_AXE, ANCESTOR_SKULL, SPIDER_DUST, DEEP_SEA_ORB);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
index 8b5d4ed733..af4f6cafd9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java
@@ -49,7 +49,7 @@ public class Q00005_MinersFavor extends Quest
public Q00005_MinersFavor()
{
- super(5, Q00005_MinersFavor.class.getSimpleName(), "Miner's Favor");
+ super(5);
addStartNpc(BOLTER);
addTalkId(BOLTER, SHARI, GARITA, REED, BRUNON);
registerQuestItems(BOLTERS_LIST, MINING_BOOTS, MINERS_PICK, BOOMBOOM_POWDER, REDSTONE_BEER, BOLTERS_SMELLY_SOCKS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
index d2100227fd..0b04bdc049 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
@@ -42,7 +42,7 @@ public class Q00006_StepIntoTheFuture extends Quest
public Q00006_StepIntoTheFuture()
{
- super(6, Q00006_StepIntoTheFuture.class.getSimpleName(), "Step Into the Future");
+ super(6);
addStartNpc(ROXXY);
addTalkId(ROXXY, BAULRO, SIR_COLLIN);
registerQuestItems(BAULRO_LETTER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
index adf62db973..ac93c0f530 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
@@ -42,7 +42,7 @@ public class Q00007_ATripBegins extends Quest
public Q00007_ATripBegins()
{
- super(7, Q00007_ATripBegins.class.getSimpleName(), "A Trip Begins");
+ super(7);
addStartNpc(MIRABEL);
addTalkId(MIRABEL, ARIEL, ASTERIOS);
registerQuestItems(ARIELS_RECOMMENDATION);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
index 195321e5fa..656fc9af97 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
@@ -42,7 +42,7 @@ public class Q00008_AnAdventureBegins extends Quest
public Q00008_AnAdventureBegins()
{
- super(8, Q00008_AnAdventureBegins.class.getSimpleName(), "An Adventure Begins");
+ super(8);
addStartNpc(JASMINE);
addTalkId(JASMINE, ROSELYN, HARNE);
registerQuestItems(ROSELYNS_NOTE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
index c39d04b5d0..bda5b4d9b2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
@@ -41,7 +41,7 @@ public class Q00009_IntoTheCityOfHumans extends Quest
public Q00009_IntoTheCityOfHumans()
{
- super(9, Q00009_IntoTheCityOfHumans.class.getSimpleName(), "Into the City of Humans");
+ super(9);
addStartNpc(PETUKAI);
addTalkId(PETUKAI, TANAPI, TAMIL);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
index a66ea94098..f2cd9b1593 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
@@ -42,7 +42,7 @@ public class Q00010_IntoTheWorld extends Quest
public Q00010_IntoTheWorld()
{
- super(10, Q00010_IntoTheWorld.class.getSimpleName(), "Into the World");
+ super(10);
addStartNpc(BALANKI);
addTalkId(BALANKI, REED, GERALD);
registerQuestItems(VERY_EXPENSIVE_NECKLACE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
index 3727951350..477fcf52a2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
@@ -38,7 +38,7 @@ public class Q00011_SecretMeetingWithKetraOrcs extends Quest
public Q00011_SecretMeetingWithKetraOrcs()
{
- super(11, Q00011_SecretMeetingWithKetraOrcs.class.getSimpleName(), "Secret Meeting With Ketra Orcs");
+ super(11);
addStartNpc(CADMON);
addTalkId(CADMON, LEON, WAHKAN);
registerQuestItems(BOX);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
index a24a332759..3e18e8a7b9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
@@ -38,7 +38,7 @@ public class Q00012_SecretMeetingWithVarkaSilenos extends Quest
public Q00012_SecretMeetingWithVarkaSilenos()
{
- super(12, Q00012_SecretMeetingWithVarkaSilenos.class.getSimpleName(), "Secret Meeting With Varka Silenos");
+ super(12);
addStartNpc(CADMON);
addTalkId(CADMON, HELMUT, NARAN);
registerQuestItems(BOX);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
index 5ffdbc75d4..3d31f0cae7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
@@ -37,7 +37,7 @@ public class Q00013_ParcelDelivery extends Quest
public Q00013_ParcelDelivery()
{
- super(13, Q00013_ParcelDelivery.class.getSimpleName(), "Parcel Delivery");
+ super(13);
addStartNpc(FUNDIN);
addTalkId(FUNDIN, VULCAN);
registerQuestItems(PACKAGE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
index 60fb943f92..54a0c70fea 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
@@ -37,7 +37,7 @@ public class Q00014_WhereaboutsOfTheArchaeologist extends Quest
public Q00014_WhereaboutsOfTheArchaeologist()
{
- super(14, Q00014_WhereaboutsOfTheArchaeologist.class.getSimpleName(), "Whereabouts of the Archaeologist");
+ super(14);
addStartNpc(LIESEL);
addTalkId(LIESEL, GHOST_OF_ADVENTURER);
registerQuestItems(LETTER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
index d41e5d4033..cfbcfcc453 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
@@ -36,7 +36,7 @@ public class Q00015_SweetWhispers extends Quest
public Q00015_SweetWhispers()
{
- super(15, Q00015_SweetWhispers.class.getSimpleName(), "Sweet Whispers");
+ super(15);
addStartNpc(VLADIMIR);
addTalkId(VLADIMIR, HIERARCH, M_NECROMANCER);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
index 46a7fc8f28..c6aaaf9a69 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
@@ -44,7 +44,7 @@ public class Q00016_TheComingDarkness extends Quest
public Q00016_TheComingDarkness()
{
- super(16, Q00016_TheComingDarkness.class.getSimpleName(), "The Coming Darkness");
+ super(16);
addStartNpc(HIERARCH);
addTalkId(HIERARCH, EVIL_ALTAR_1, EVIL_ALTAR_2, EVIL_ALTAR_3, EVIL_ALTAR_4, EVIL_ALTAR_5);
registerQuestItems(CRYSTAL_OF_SEAL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
index 0818c972a5..504071242f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
@@ -42,7 +42,7 @@ public class Q00017_LightAndDarkness extends Quest
public Q00017_LightAndDarkness()
{
- super(17, Q00017_LightAndDarkness.class.getSimpleName(), "Light and Darkness");
+ super(17);
addStartNpc(HIERARCH);
addTalkId(HIERARCH, SAINT_ALTAR_1, SAINT_ALTAR_2, SAINT_ALTAR_3, SAINT_ALTAR_4);
registerQuestItems(BLOOD_OF_SAINT);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
index 374104d55a..3003245a4e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
@@ -38,7 +38,7 @@ public class Q00018_MeetingWithTheGoldenRam extends Quest
public Q00018_MeetingWithTheGoldenRam()
{
- super(18, Q00018_MeetingWithTheGoldenRam.class.getSimpleName(), "Meeting With The Golden Ram");
+ super(18);
addStartNpc(DONAL);
addTalkId(DONAL, DAISY, ABERCROMBIE);
registerQuestItems(BOX);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
index cc4bf42f4e..76b3373557 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
@@ -38,7 +38,7 @@ public class Q00019_GoToThePastureland extends Quest
public Q00019_GoToThePastureland()
{
- super(19, Q00019_GoToThePastureland.class.getSimpleName(), "Go to the Pastureland");
+ super(19);
addStartNpc(VLADIMIR);
addTalkId(VLADIMIR, TUNATUN);
registerQuestItems(VEAL, YOUNG_WILD_BEAST_MEAT);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
index f308eb44f9..84c9b245ba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
@@ -38,7 +38,7 @@ public class Q00020_BringUpWithLove extends Quest
public Q00020_BringUpWithLove()
{
- super(20, Q00020_BringUpWithLove.class.getSimpleName(), "Bring Up With Love");
+ super(20);
addStartNpc(TUNATUN);
addTalkId(TUNATUN);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
index d90e69d41f..0f92629851 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
@@ -64,7 +64,7 @@ public class Q00021_HiddenTruth extends Quest
public Q00021_HiddenTruth()
{
- super(21, Q00021_HiddenTruth.class.getSimpleName(), "Hidden Truth");
+ super(21);
addStartNpc(MYSTERIOUS_WIZARD);
addTalkId(MYSTERIOUS_WIZARD, TOMBSTONE, GHOST_OF_VON_HELLMAN, GHOST_OF_VON_HELLMANS_PAGE, BROKEN_BOOKSHELF, AGRIPEL, BENEDICT, DOMINIC, INNOCENTIN);
addSeeCreatureId(GHOST_OF_VON_HELLMANS_PAGE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java
index 2d59c6c74e..c947bc389e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00022_TragedyInVonHellmannForest/Q00022_TragedyInVonHellmannForest.java
@@ -70,7 +70,7 @@ public final class Q00022_TragedyInVonHellmannForest extends Quest
public Q00022_TragedyInVonHellmannForest()
{
- super(22, Q00022_TragedyInVonHellmannForest.class.getSimpleName(), "Tragedy in Von Hellmann Forest");
+ super(22);
addKillId(MOBS);
addKillId(SOUL_OF_WELL);
addAttackId(SOUL_OF_WELL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java
index 94d785b199..9b43b713a2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00023_LidiasHeart/Q00023_LidiasHeart.java
@@ -56,7 +56,7 @@ public final class Q00023_LidiasHeart extends Quest
public Q00023_LidiasHeart()
{
- super(23, Q00023_LidiasHeart.class.getSimpleName(), "Lidia's Heart");
+ super(23);
addStartNpc(HIGH_PRIEST_INNOCENTIN);
addTalkId(HIGH_PRIEST_INNOCENTIN, TRADER_VIOLET, TOMBSTONE, GHOST_OF_VON_HELLMANN, BROKEN_BOOKSHELF, BOX);
addSpawnId(GHOST_OF_VON_HELLMANN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
index b4334f2039..07d8280467 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
@@ -52,7 +52,7 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
public Q00024_InhabitantsOfTheForestOfTheDead()
{
- super(24, Q00024_InhabitantsOfTheForestOfTheDead.class.getSimpleName(), "Inhabitants of the Forest of the Dead");
+ super(24);
addStartNpc(DORIAN);
addTalkId(DORIAN, MYSTERIOUS_WIZARD, TOMBSTONE, LIDIA_MAID);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
index dccb322f08..9a9e6be396 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
@@ -70,7 +70,7 @@ public class Q00025_HidingBehindTheTruth extends Quest
public Q00025_HidingBehindTheTruth()
{
- super(25, Q00025_HidingBehindTheTruth.class.getSimpleName(), "Hiding Behind the Truth");
+ super(25);
addStartNpc(PRIEST_BENEDICT);
addTalkId(HIGH_PRIEST_AGRIPEL, PRIEST_BENEDICT, MYSTERIOUS_WIZARD, TOMBSTONE, MAID_OF_LIDIA, BROKEN_BOOKSHELF2, BROKEN_BOOKSHELF3, BROKEN_BOOKSHELF4, COFFIN);
registerQuestItems(GEMSTONE_KEY, CONTRACT, TOTEM_DOLL3, TOTEM_DOLL2, LIDAS_DRESS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
index b58e4a1253..b49e3b1223 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
@@ -45,7 +45,7 @@ public final class Q00026_TiredOfWaiting extends Quest
public Q00026_TiredOfWaiting()
{
- super(26, Q00026_TiredOfWaiting.class.getSimpleName(), "Tired of Waiting");
+ super(26);
addStartNpc(ISAEL_SILVERSHADOW);
addTalkId(ISAEL_SILVERSHADOW, KITZKA);
registerQuestItems(DELIVERY_BOX);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
index f0f4e2a18a..1945955d29 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
@@ -41,7 +41,7 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
public Q00027_ChestCaughtWithABaitOfWind()
{
- super(27, Q00027_ChestCaughtWithABaitOfWind.class.getSimpleName(), "Chest Caught With A Bait Of Wind");
+ super(27);
addStartNpc(LANOSCO);
addTalkId(LANOSCO, SHALING);
registerQuestItems(STRANGE_BLUESPRINT);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
index f72f792114..7cc18d5592 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
@@ -41,7 +41,7 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
public Q00028_ChestCaughtWithABaitOfIcyAir()
{
- super(28, Q00028_ChestCaughtWithABaitOfIcyAir.class.getSimpleName(), "Chest Caught With A Bait Of Icy Air");
+ super(28);
addStartNpc(OFULLE);
addTalkId(OFULLE, KIKI);
registerQuestItems(KIKIS_LETTER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
index a1dac145a2..65eb2cd2bc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
@@ -41,7 +41,7 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
public Q00029_ChestCaughtWithABaitOfEarth()
{
- super(29, Q00029_ChestCaughtWithABaitOfEarth.class.getSimpleName(), "Chest Caught With A Bait Of Earth");
+ super(29);
addStartNpc(WILLIE);
addTalkId(WILLIE, ANABEL);
registerQuestItems(SMALL_GLASS_BOX);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
index 1aea3d5339..535f33ade6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
@@ -41,7 +41,7 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest
public Q00030_ChestCaughtWithABaitOfFire()
{
- super(30, Q00030_ChestCaughtWithABaitOfFire.class.getSimpleName(), "Chest Caught With A Bait Of Fire");
+ super(30);
addStartNpc(LINNAEUS);
addTalkId(LINNAEUS, RUKAL);
registerQuestItems(RUKAL_MUSICAL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
index c740055316..a9d1f74d73 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
@@ -47,7 +47,7 @@ public final class Q00031_SecretBuriedInTheSwamp extends Quest
public Q00031_SecretBuriedInTheSwamp()
{
- super(31, Q00031_SecretBuriedInTheSwamp.class.getSimpleName(), "Secret Buried in the Swamp");
+ super(31);
addStartNpc(ABERCROMBIE);
addTalkId(ABERCROMBIE, CORPSE_OF_DWARF);
addTalkId(MONUMENTS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
index 93a7b28047..e182ced2d8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
@@ -55,7 +55,7 @@ public final class Q00032_AnObviousLie extends Quest
public Q00032_AnObviousLie()
{
- super(32, Q00032_AnObviousLie.class.getSimpleName(), "An Obvious Lie");
+ super(32);
addStartNpc(MAXIMILIAN);
addTalkId(MAXIMILIAN, GENTLER, MIKI_THE_CAT);
addKillId(ALLIGATOR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index aecd00c969..a1eeb24583 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -47,7 +47,7 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
public Q00033_MakeAPairOfDressShoes()
{
- super(33, Q00033_MakeAPairOfDressShoes.class.getSimpleName(), "Make a Pair of Dress Shoes");
+ super(33);
addStartNpc(WOODLEY);
addTalkId(WOODLEY, IAN, LEIKAR);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index 1de5b27834..146d3f4015 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -53,7 +53,7 @@ public class Q00034_InSearchOfCloth extends Quest
public Q00034_InSearchOfCloth()
{
- super(34, Q00034_InSearchOfCloth.class.getSimpleName(), "In Search of Cloth");
+ super(34);
addStartNpc(RADIA);
addTalkId(RADIA, RALFORD, VARAN);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index 909d306fc4..9cf9dc4362 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -49,7 +49,7 @@ public class Q00035_FindGlitteringJewelry extends Quest
public Q00035_FindGlitteringJewelry()
{
- super(35, Q00035_FindGlitteringJewelry.class.getSimpleName(), "Find Glittering Jewelry");
+ super(35);
addStartNpc(ELLIE);
addTalkId(ELLIE, FELTON);
addKillId(ALLIGATOR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index 0d9a654ed6..3b959f3b24 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -45,7 +45,7 @@ public class Q00036_MakeASewingKit extends Quest
public Q00036_MakeASewingKit()
{
- super(36, Q00036_MakeASewingKit.class.getSimpleName(), "Make a Sewing Kit");
+ super(36);
addStartNpc(FERRIS);
addTalkId(FERRIS);
addKillId(ENCHANTED_IRON_GOLEM);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index 4764663ef0..315c7dc2ee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -47,7 +47,7 @@ public class Q00037_MakeFormalWear extends Quest
public Q00037_MakeFormalWear()
{
- super(37, Q00037_MakeFormalWear.class.getSimpleName(), "Make Formal Wear");
+ super(37);
addStartNpc(ALEXIS);
addTalkId(ALEXIS, JEREMY, LEIKAR, MIST);
registerQuestItems(SIGNET_RING, ICE_WINE, BOX_OF_COOKIES);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
index 262f62d86e..d8865086a9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00038_DragonFangs/Q00038_DragonFangs.java
@@ -53,7 +53,7 @@ public final class Q00038_DragonFangs extends Quest
public Q00038_DragonFangs()
{
- super(38, Q00038_DragonFangs.class.getSimpleName(), "Dragon Fangs");
+ super(38);
addStartNpc(GUARD_LUIS);
addTalkId(GUARD_LUIS, IRIS, MAGISTER_ROHMER);
addKillId(LIZARDMAN_SENTINEL, LIZARDMAN_SHAMAN, LIZARDMAN_LEADER, LIZARDMAN_SUB_LEADER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
index 24335c53ec..0a3a89d2a1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00039_RedEyedInvaders/Q00039_RedEyedInvaders.java
@@ -50,7 +50,7 @@ public final class Q00039_RedEyedInvaders extends Quest
public Q00039_RedEyedInvaders()
{
- super(39, Q00039_RedEyedInvaders.class.getSimpleName(), "Red-eyed Invaders");
+ super(39);
addStartNpc(GUARD_BABENCO);
addTalkId(GUARD_BABENCO, CAPTAIN_BATHIA);
addKillId(MALE_LIZARDMAN_GUARD, MALE_LIZARDMAN_SCOUT, MALE_LIZARDMAN, GIANT_ARANE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
index e0531bc4b9..115dc247d2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
@@ -48,7 +48,7 @@ public final class Q00040_ASpecialOrder extends Quest
public Q00040_ASpecialOrder()
{
- super(40, Q00040_ASpecialOrder.class.getSimpleName(), "A Special Order");
+ super(40);
addStartNpc(HELVETIA);
addTalkId(HELVETIA, OFULLE, GESTO);
registerQuestItems(BOX_OF_FISH, BOX_OF_SEED);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index 72a66c77d7..f7d1f0f227 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -44,7 +44,7 @@ public class Q00042_HelpTheUncle extends Quest
public Q00042_HelpTheUncle()
{
- super(42, Q00042_HelpTheUncle.class.getSimpleName(), "Help The Uncle!");
+ super(42);
addStartNpc(WATERS);
addTalkId(WATERS, SOPHYA);
addKillId(MONSTER_EYE_DESTROYER, MONSTER_EYE_GAZER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index 205ef7ce2d..82254f4662 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -44,7 +44,7 @@ public class Q00043_HelpTheSister extends Quest
public Q00043_HelpTheSister()
{
- super(43, Q00043_HelpTheSister.class.getSimpleName(), "Help The Sister!");
+ super(43);
addStartNpc(COOPER);
addTalkId(COOPER, GALLADUCCI);
addKillId(SORROW_MAIDEN, SPECTER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index 5467a1c449..55666ebb0c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -45,7 +45,7 @@ public class Q00044_HelpTheSon extends Quest
public Q00044_HelpTheSon()
{
- super(44, Q00044_HelpTheSon.class.getSimpleName(), "Help The Son!");
+ super(44);
addStartNpc(LUNDY);
addTalkId(LUNDY, DRIKUS);
addKillId(MAILLE_GUARD, MAILLE_LIZARDMAN, MAILLE_SCOUT);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
index 03c65f29de..96a6ecdd38 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
@@ -62,7 +62,7 @@ public final class Q00045_ToTalkingIsland extends Quest
public Q00045_ToTalkingIsland()
{
- super(45, Q00045_ToTalkingIsland.class.getSimpleName(), "To Talking Island");
+ super(45);
addStartNpc(GALLADUCCI);
addTalkId(GALLADUCCI);
addTalkId(NPC_ITEMS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
index ec34b32f81..67838f43eb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
@@ -62,7 +62,7 @@ public final class Q00046_OnceMoreInTheArmsOfTheMotherTree extends Quest
public Q00046_OnceMoreInTheArmsOfTheMotherTree()
{
- super(46, Q00046_OnceMoreInTheArmsOfTheMotherTree.class.getSimpleName(), "Once More In the Arms of the Mother Tree");
+ super(46);
addStartNpc(GALLADUCCI);
addTalkId(GALLADUCCI);
addTalkId(NPC_ITEMS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
index 5f0f006f2b..55628504e2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
@@ -62,7 +62,7 @@ public final class Q00047_IntoTheDarkElvenForest extends Quest
public Q00047_IntoTheDarkElvenForest()
{
- super(47, Q00047_IntoTheDarkElvenForest.class.getSimpleName(), "Into the Dark Elven Forest");
+ super(47);
addStartNpc(GALLADUCCI);
addTalkId(GALLADUCCI);
addTalkId(NPC_ITEMS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
index 9d91295d78..4d1fb1b7be 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
@@ -62,7 +62,7 @@ public final class Q00048_ToTheImmortalPlateau extends Quest
public Q00048_ToTheImmortalPlateau()
{
- super(48, Q00048_ToTheImmortalPlateau.class.getSimpleName(), "To The Immortal Plateau");
+ super(48);
addStartNpc(GALLADUCCI);
addTalkId(GALLADUCCI);
addTalkId(NPC_ITEMS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
index 84fc9057af..9d61d7f1d1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
@@ -62,7 +62,7 @@ public final class Q00049_TheRoadHome extends Quest
public Q00049_TheRoadHome()
{
- super(49, Q00049_TheRoadHome.class.getSimpleName(), "The Road Home");
+ super(49);
addStartNpc(GALLADUCCI);
addTalkId(GALLADUCCI);
addTalkId(NPC_ITEMS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
index 5617f13201..c0b9d94b9f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
@@ -40,7 +40,7 @@ public class Q00050_LanoscosSpecialBait extends Quest
public Q00050_LanoscosSpecialBait()
{
- super(50, Q00050_LanoscosSpecialBait.class.getSimpleName(), "Lanosco's Special Bait");
+ super(50);
addStartNpc(LANOSCO);
addTalkId(LANOSCO);
addKillId(SINGING_WIND);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
index 4cecc6561d..bd5dfd2207 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
@@ -40,7 +40,7 @@ public class Q00051_OFullesSpecialBait extends Quest
public Q00051_OFullesSpecialBait()
{
- super(51, Q00051_OFullesSpecialBait.class.getSimpleName(), "O'Fulle's Special Bait");
+ super(51);
addStartNpc(OFULLE);
addTalkId(OFULLE);
addKillId(FETTERED_SOUL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
index 952c14c7b3..fd2b61076f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
@@ -40,7 +40,7 @@ public class Q00052_WilliesSpecialBait extends Quest
public Q00052_WilliesSpecialBait()
{
- super(52, Q00052_WilliesSpecialBait.class.getSimpleName(), "Willie's Special Bait");
+ super(52);
addStartNpc(WILLIE);
addTalkId(WILLIE);
addKillId(TARLK_BASILISK);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
index 0b49e8b28d..1bb61bd086 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
@@ -40,7 +40,7 @@ public class Q00053_LinnaeusSpecialBait extends Quest
public Q00053_LinnaeusSpecialBait()
{
- super(53, Q00053_LinnaeusSpecialBait.class.getSimpleName(), "Linnaeus Special Bait");
+ super(53);
addStartNpc(LINNAEUS);
addTalkId(LINNAEUS);
addKillId(CRIMSON_DRAKE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00060_GoodWorksReward/Q00060_GoodWorksReward.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00060_GoodWorksReward/Q00060_GoodWorksReward.java
index 812ce04ea1..11b87233e3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00060_GoodWorksReward/Q00060_GoodWorksReward.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00060_GoodWorksReward/Q00060_GoodWorksReward.java
@@ -101,7 +101,7 @@ public final class Q00060_GoodWorksReward extends Quest
public Q00060_GoodWorksReward()
{
- super(60, Q00060_GoodWorksReward.class.getSimpleName(), "Good Work's Reward");
+ super(60);
addStartNpc(BLUEPRINT_SELLER_DAEGER);
addTalkId(BLUEPRINT_SELLER_DAEGER, GROCER_HELVERIA, BLACK_MARKETEER_OF_MAMMON, MARK);
addKillId(PURSUER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
index 57ea33a7d2..d9c84edc85 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00061_LawEnforcement/Q00061_LawEnforcement.java
@@ -37,7 +37,7 @@ public final class Q00061_LawEnforcement extends Quest
public Q00061_LawEnforcement()
{
- super(61, Q00061_LawEnforcement.class.getSimpleName(), "Law Enforcement");
+ super(61);
addStartNpc(LIANE);
addTalkId(LIANE, KEKROPUS, EINDBURGH);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java
index 4c2249610e..bbf4a39b2c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java
@@ -51,7 +51,7 @@ public final class Q00062_PathOfTheTrooper extends Quest
public Q00062_PathOfTheTrooper()
{
- super(62, Q00062_PathOfTheTrooper.class.getSimpleName(), "Path Of The Trooper");
+ super(62);
addStartNpc(MASTER_GWAIN);
addTalkId(MASTER_GWAIN, MASTER_SHUBAIN);
addKillId(FELIM_LIZARDMAN_WARRIOR, VENOMOUS_SPIDER, TUMRAN_BUGBEAR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java
index ee69c85fa5..a09d2d3e27 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java
@@ -62,7 +62,7 @@ public final class Q00063_PathOfTheWarder extends Quest
public Q00063_PathOfTheWarder()
{
- super(63, Q00063_PathOfTheWarder.class.getSimpleName(), "Path Of The Warder");
+ super(63);
addStartNpc(MASTER_SIONE);
addTalkId(MASTER_SIONE, MASTER_GOBIE, MASTER_TOBIAS, CAPTAIN_BATHIS);
addKillId(OL_MAHUM_PATROL, OL_MAHUM_NOVICE, MAILLE_LIZARDMAN, MAILLE_LIZARDMAN_SCOUT, MAILLE_LIZARDMAN_GUARD, OL_MAHUM_OFFICER_TAK);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java
index 95aa385a1a..356021df8f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java
@@ -67,7 +67,7 @@ public final class Q00064_CertifiedBerserker extends Quest
public Q00064_CertifiedBerserker()
{
- super(64, Q00064_CertifiedBerserker.class.getSimpleName(), "Certified Berserker");
+ super(64);
addStartNpc(MASTER_ORKURUS);
addTalkId(MASTER_ORKURUS, MASTER_ENTIENS, MASTER_TENAIN, CARAVANER_GORT, HARKILGAMED);
addKillId(DEAD_SEEKER, MARSH_STAKATO_DRONE, BREKA_ORC, BREKA_ORC_ARCHER, BREKA_ORC_SHAMAN, BREKA_ORC_OVERLORD, BREKA_ORC_WARRIOR, ROAD_SCAVENGER, DIVINE_EMISSARY);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java
index e6a8f84ee2..6a1bb35ce3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00065_CertifiedSoulBreaker/Q00065_CertifiedSoulBreaker.java
@@ -72,7 +72,7 @@ public final class Q00065_CertifiedSoulBreaker extends Quest
public Q00065_CertifiedSoulBreaker()
{
- super(65, Q00065_CertifiedSoulBreaker.class.getSimpleName(), "Certified Soul Breaker");
+ super(65);
addStartNpc(GRAND_MASTER_VITUS);
addTalkId(GRAND_MASTER_VITUS, CAPTAIN_LUCAS, JACOB, GUARD_HARLAN, GUARD_XABER, GUARD_LIAM, GUARD_VESA, GUARD_ZEROME, WHARF_MANAGER_FELTON, KEKROPUS, VICE_HIERARCH_CASCA, GRAND_MASTER_HOLST, GRAND_MASTER_MELDINA, KATENAR, CARGO_BOX, SUSPICIOUS_MAN);
addKillId(WYRM, GUARDIAN_ANGEL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00066_CertifiedArbalester/Q00066_CertifiedArbalester.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00066_CertifiedArbalester/Q00066_CertifiedArbalester.java
index 36e1b3aa26..21c5eebd2b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00066_CertifiedArbalester/Q00066_CertifiedArbalester.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00066_CertifiedArbalester/Q00066_CertifiedArbalester.java
@@ -79,7 +79,7 @@ public final class Q00066_CertifiedArbalester extends Quest
public Q00066_CertifiedArbalester()
{
- super(66, Q00066_CertifiedArbalester.class.getSimpleName(), "Certified Arbalester");
+ super(66);
addStartNpc(MASTER_RINDY);
addTalkId(MASTER_RINDY, WAREHOUSE_KEEPER_HOLVAS, MAGISTER_GAIUS, BLACKSMITH_POITAN, MAGISTER_CLAYTON, MAGISTER_GAUEN, MAGISTER_KAIENA, GRAND_MASTER_MELDINA, MASTER_SELSIA);
addKillId(GRANITIC_GOLEM, HANGMAN_TREE, AMBER_BASILISK, STRAIN, GHOUL, DEAD_SEEKER, GRANDIS, MANASHEN_GARGOYLE, TIMAK_ORC, TIMAK_ORC_ARCHER, DELU_LIZARDMAN_SHAMAN, WATCHMAN_OF_THE_PLAINS, ROUGHLY_HEWN_ROCK_GOLEM, DELU_LIZARDMAN_SUPPLIER, DELU_LIZARDMAN_AGENT, CURSED_SEER, DELU_LIZARDMAN_COMMANDER, CRIMSON_LADY);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00067_SagaOfTheDoombringer/Q00067_SagaOfTheDoombringer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00067_SagaOfTheDoombringer/Q00067_SagaOfTheDoombringer.java
index 60dc27a74f..64c95c651b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00067_SagaOfTheDoombringer/Q00067_SagaOfTheDoombringer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00067_SagaOfTheDoombringer/Q00067_SagaOfTheDoombringer.java
@@ -28,7 +28,7 @@ public final class Q00067_SagaOfTheDoombringer extends AbstractSagaQuest
{
public Q00067_SagaOfTheDoombringer()
{
- super(67, Q00067_SagaOfTheDoombringer.class.getSimpleName(), "Saga of the Doombringer");
+ super(67);
_npc = new int[]
{
32138,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00068_SagaOfTheSoulHound/Q00068_SagaOfTheSoulHound.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00068_SagaOfTheSoulHound/Q00068_SagaOfTheSoulHound.java
index 5ed91b4501..0f66c6f243 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00068_SagaOfTheSoulHound/Q00068_SagaOfTheSoulHound.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00068_SagaOfTheSoulHound/Q00068_SagaOfTheSoulHound.java
@@ -28,7 +28,7 @@ public class Q00068_SagaOfTheSoulHound extends AbstractSagaQuest
{
public Q00068_SagaOfTheSoulHound()
{
- super(68, Q00068_SagaOfTheSoulHound.class.getSimpleName(), "Saga of the Soul Hound");
+ super(68);
_npc = new int[]
{
32138,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00069_SagaOfTheTrickster/Q00069_SagaOfTheTrickster.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00069_SagaOfTheTrickster/Q00069_SagaOfTheTrickster.java
index 57c40cc190..c4f30e8bc0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00069_SagaOfTheTrickster/Q00069_SagaOfTheTrickster.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00069_SagaOfTheTrickster/Q00069_SagaOfTheTrickster.java
@@ -28,7 +28,7 @@ public class Q00069_SagaOfTheTrickster extends AbstractSagaQuest
{
public Q00069_SagaOfTheTrickster()
{
- super(69, Q00069_SagaOfTheTrickster.class.getSimpleName(), "Saga of the Trickster");
+ super(69);
_npc = new int[]
{
32138,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
index e1a9e0b86c..6cf39926b4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java
@@ -28,7 +28,7 @@ public class Q00070_SagaOfThePhoenixKnight extends AbstractSagaQuest
{
public Q00070_SagaOfThePhoenixKnight()
{
- super(70, Q00070_SagaOfThePhoenixKnight.class.getSimpleName(), "Saga of the Phoenix Knight");
+ super(70);
_npc = new int[]
{
30849,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
index 8803f2e20f..5e4c084fdf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java
@@ -28,7 +28,7 @@ public class Q00071_SagaOfEvasTemplar extends AbstractSagaQuest
{
public Q00071_SagaOfEvasTemplar()
{
- super(71, Q00071_SagaOfEvasTemplar.class.getSimpleName(), "Saga of Eva's Templar");
+ super(71);
_npc = new int[]
{
30852,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
index f0288a8970..adad27190c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java
@@ -28,7 +28,7 @@ public class Q00072_SagaOfTheSwordMuse extends AbstractSagaQuest
{
public Q00072_SagaOfTheSwordMuse()
{
- super(72, Q00072_SagaOfTheSwordMuse.class.getSimpleName(), "Saga of the Sword Muse");
+ super(72);
_npc = new int[]
{
30853,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
index 409edfee4e..16c031a1ef 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java
@@ -37,7 +37,7 @@ public class Q00073_SagaOfTheDuelist extends AbstractSagaQuest
public Q00073_SagaOfTheDuelist()
{
- super(73, Q00073_SagaOfTheDuelist.class.getSimpleName(), "Saga of the Duelist");
+ super(73);
_npc = new int[]
{
30849,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
index 77abbb6395..460f470251 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java
@@ -28,7 +28,7 @@ public class Q00074_SagaOfTheDreadnought extends AbstractSagaQuest
{
public Q00074_SagaOfTheDreadnought()
{
- super(74, Q00074_SagaOfTheDreadnought.class.getSimpleName(), "Saga of the Dreadnought");
+ super(74);
_npc = new int[]
{
30850,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
index 4c90d54d77..c1ce49088b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java
@@ -28,7 +28,7 @@ public class Q00075_SagaOfTheTitan extends AbstractSagaQuest
{
public Q00075_SagaOfTheTitan()
{
- super(75, Q00075_SagaOfTheTitan.class.getSimpleName(), "Saga of the Titan");
+ super(75);
_npc = new int[]
{
31327,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
index 38955926db..1bf6fc6d52 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java
@@ -28,7 +28,7 @@ public class Q00076_SagaOfTheGrandKhavatari extends AbstractSagaQuest
{
public Q00076_SagaOfTheGrandKhavatari()
{
- super(76, Q00076_SagaOfTheGrandKhavatari.class.getSimpleName(), "Saga of the Grand Khavatari");
+ super(76);
_npc = new int[]
{
31339,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
index 3e19febe3c..5e495fd287 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java
@@ -28,7 +28,7 @@ public class Q00077_SagaOfTheDominator extends AbstractSagaQuest
{
public Q00077_SagaOfTheDominator()
{
- super(77, Q00077_SagaOfTheDominator.class.getSimpleName(), "Saga of the Dominator");
+ super(77);
_npc = new int[]
{
31336,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
index 4209e6071a..dd18b61d73 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java
@@ -28,7 +28,7 @@ public class Q00078_SagaOfTheDoomcryer extends AbstractSagaQuest
{
public Q00078_SagaOfTheDoomcryer()
{
- super(78, Q00078_SagaOfTheDoomcryer.class.getSimpleName(), "Saga of the Doomcryer");
+ super(78);
_npc = new int[]
{
31336,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
index 18206f3c77..030ac8eb48 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java
@@ -28,7 +28,7 @@ public class Q00079_SagaOfTheAdventurer extends AbstractSagaQuest
{
public Q00079_SagaOfTheAdventurer()
{
- super(79, Q00079_SagaOfTheAdventurer.class.getSimpleName(), "Saga of the Adventurer");
+ super(79);
_npc = new int[]
{
31603,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
index afb008f16f..bdcbe87da6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java
@@ -28,7 +28,7 @@ public class Q00080_SagaOfTheWindRider extends AbstractSagaQuest
{
public Q00080_SagaOfTheWindRider()
{
- super(80, Q00080_SagaOfTheWindRider.class.getSimpleName(), "Saga of the Wind Rider");
+ super(80);
_npc = new int[]
{
31603,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
index 4dad205dff..9934f9f907 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java
@@ -28,7 +28,7 @@ public class Q00081_SagaOfTheGhostHunter extends AbstractSagaQuest
{
public Q00081_SagaOfTheGhostHunter()
{
- super(81, Q00081_SagaOfTheGhostHunter.class.getSimpleName(), "Saga of the Ghost Hunter");
+ super(81);
_npc = new int[]
{
31603,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
index ac67230b47..342c516994 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java
@@ -28,7 +28,7 @@ public class Q00082_SagaOfTheSagittarius extends AbstractSagaQuest
{
public Q00082_SagaOfTheSagittarius()
{
- super(82, Q00082_SagaOfTheSagittarius.class.getSimpleName(), "Saga of the Sagittarius");
+ super(82);
_npc = new int[]
{
30702,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
index ea2fe73437..41bc8a06fd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java
@@ -28,7 +28,7 @@ public class Q00083_SagaOfTheMoonlightSentinel extends AbstractSagaQuest
{
public Q00083_SagaOfTheMoonlightSentinel()
{
- super(83, Q00083_SagaOfTheMoonlightSentinel.class.getSimpleName(), "Saga of the Moonlight Sentinel");
+ super(83);
_npc = new int[]
{
30702,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
index 8340e2976d..722f079cbc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java
@@ -28,7 +28,7 @@ public class Q00084_SagaOfTheGhostSentinel extends AbstractSagaQuest
{
public Q00084_SagaOfTheGhostSentinel()
{
- super(84, Q00084_SagaOfTheGhostSentinel.class.getSimpleName(), "Saga of the Ghost Sentinel");
+ super(84);
_npc = new int[]
{
30702,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
index 800d406a59..002fd240eb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java
@@ -28,7 +28,7 @@ public class Q00085_SagaOfTheCardinal extends AbstractSagaQuest
{
public Q00085_SagaOfTheCardinal()
{
- super(85, Q00085_SagaOfTheCardinal.class.getSimpleName(), "Saga of the Cardinal");
+ super(85);
_npc = new int[]
{
30191,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
index fb9408a5a6..df4ae3208f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java
@@ -28,7 +28,7 @@ public class Q00086_SagaOfTheHierophant extends AbstractSagaQuest
{
public Q00086_SagaOfTheHierophant()
{
- super(86, Q00086_SagaOfTheHierophant.class.getSimpleName(), "Saga of the Hierophant");
+ super(86);
_npc = new int[]
{
30191,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
index b3d6181391..513e0d20a9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java
@@ -28,7 +28,7 @@ public class Q00087_SagaOfEvasSaint extends AbstractSagaQuest
{
public Q00087_SagaOfEvasSaint()
{
- super(87, Q00087_SagaOfEvasSaint.class.getSimpleName(), "Saga of Eva's Saint");
+ super(87);
_npc = new int[]
{
30191,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
index a427a05b7c..39954024a1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java
@@ -28,7 +28,7 @@ public class Q00088_SagaOfTheArchmage extends AbstractSagaQuest
{
public Q00088_SagaOfTheArchmage()
{
- super(88, Q00088_SagaOfTheArchmage.class.getSimpleName(), "Saga of the Archmage");
+ super(88);
_npc = new int[]
{
30176,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
index 2b27b870db..3e537c895b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java
@@ -28,7 +28,7 @@ public class Q00089_SagaOfTheMysticMuse extends AbstractSagaQuest
{
public Q00089_SagaOfTheMysticMuse()
{
- super(89, Q00089_SagaOfTheMysticMuse.class.getSimpleName(), "Saga of the Mystic Muse");
+ super(89);
_npc = new int[]
{
30174,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
index 9f561c762e..8e20bd32ee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java
@@ -28,7 +28,7 @@ public class Q00090_SagaOfTheStormScreamer extends AbstractSagaQuest
{
public Q00090_SagaOfTheStormScreamer()
{
- super(90, Q00090_SagaOfTheStormScreamer.class.getSimpleName(), "Saga of the Storm Screamer");
+ super(90);
_npc = new int[]
{
30175,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
index 96864fc340..37f2600025 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java
@@ -28,7 +28,7 @@ public class Q00091_SagaOfTheArcanaLord extends AbstractSagaQuest
{
public Q00091_SagaOfTheArcanaLord()
{
- super(91, Q00091_SagaOfTheArcanaLord.class.getSimpleName(), "Saga of the Arcana Lord");
+ super(91);
_npc = new int[]
{
31605,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
index 5607bbe820..d29d3dd2a6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java
@@ -28,7 +28,7 @@ public class Q00092_SagaOfTheElementalMaster extends AbstractSagaQuest
{
public Q00092_SagaOfTheElementalMaster()
{
- super(92, Q00092_SagaOfTheElementalMaster.class.getSimpleName(), "Saga of the Elemental Master");
+ super(92);
_npc = new int[]
{
30174,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
index 7bf74a12ff..d4c241e24b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java
@@ -28,7 +28,7 @@ public class Q00093_SagaOfTheSpectralMaster extends AbstractSagaQuest
{
public Q00093_SagaOfTheSpectralMaster()
{
- super(93, Q00093_SagaOfTheSpectralMaster.class.getSimpleName(), "Saga of the Spectral Master");
+ super(93);
_npc = new int[]
{
30175,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
index 63b06b07f7..06fc1c4ab4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java
@@ -28,7 +28,7 @@ public class Q00094_SagaOfTheSoultaker extends AbstractSagaQuest
{
public Q00094_SagaOfTheSoultaker()
{
- super(94, Q00094_SagaOfTheSoultaker.class.getSimpleName(), "Saga of the Soultaker");
+ super(94);
_npc = new int[]
{
30832,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
index 3085d364b6..f3ced6b270 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java
@@ -28,7 +28,7 @@ public class Q00095_SagaOfTheHellKnight extends AbstractSagaQuest
{
public Q00095_SagaOfTheHellKnight()
{
- super(95, Q00095_SagaOfTheHellKnight.class.getSimpleName(), "Saga of the Hell Knight");
+ super(95);
_npc = new int[]
{
31582,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
index 356b59bd05..654dfb7840 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java
@@ -28,7 +28,7 @@ public class Q00096_SagaOfTheSpectralDancer extends AbstractSagaQuest
{
public Q00096_SagaOfTheSpectralDancer()
{
- super(96, Q00096_SagaOfTheSpectralDancer.class.getSimpleName(), "Saga of the Spectral Dancer");
+ super(96);
_npc = new int[]
{
31582,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
index ba952483e7..2df4cf52bf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java
@@ -28,7 +28,7 @@ public class Q00097_SagaOfTheShillienTemplar extends AbstractSagaQuest
{
public Q00097_SagaOfTheShillienTemplar()
{
- super(97, Q00097_SagaOfTheShillienTemplar.class.getSimpleName(), "Saga of the Shillien Templar");
+ super(97);
_npc = new int[]
{
31580,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
index 2c01173e86..2819a51496 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java
@@ -28,7 +28,7 @@ public class Q00098_SagaOfTheShillienSaint extends AbstractSagaQuest
{
public Q00098_SagaOfTheShillienSaint()
{
- super(98, Q00098_SagaOfTheShillienSaint.class.getSimpleName(), "Saga of the Shillien Saint");
+ super(98);
_npc = new int[]
{
31581,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
index 5fcb537e97..68e665d3f3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java
@@ -28,7 +28,7 @@ public class Q00099_SagaOfTheFortuneSeeker extends AbstractSagaQuest
{
public Q00099_SagaOfTheFortuneSeeker()
{
- super(99, Q00099_SagaOfTheFortuneSeeker.class.getSimpleName(), "Saga of the Fortune Seeker");
+ super(99);
_npc = new int[]
{
31594,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
index d3c52d80cf..d6c3df6ca3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java
@@ -28,7 +28,7 @@ public class Q00100_SagaOfTheMaestro extends AbstractSagaQuest
{
public Q00100_SagaOfTheMaestro()
{
- super(100, Q00100_SagaOfTheMaestro.class.getSimpleName(), "Saga of the Maestro");
+ super(100);
_npc = new int[]
{
31592,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
index 0fad8bf57a..c7d01ae488 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
@@ -65,7 +65,7 @@ public class Q00101_SwordOfSolidarity extends Quest
public Q00101_SwordOfSolidarity()
{
- super(101, Q00101_SwordOfSolidarity.class.getSimpleName(), "Sword of Solidarity");
+ super(101);
addStartNpc(ROIEN);
addKillId(MONSTERS);
addTalkId(ROIEN, ALTRAN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
index 57f5ffe756..6ced9b3500 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
@@ -77,7 +77,7 @@ public class Q00102_SeaOfSporesFever extends Quest
public Q00102_SeaOfSporesFever()
{
- super(102, Q00102_SeaOfSporesFever.class.getSimpleName(), "Sea of Spores Fever");
+ super(102);
addStartNpc(ALBERIUS);
addTalkId(ALBERIUS, COBENDELL, GARTRANDELL, BERROS, VELTRESS, RAYEN);
addKillId(DRYAD, DRYAD_ELDER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
index dbe71126b5..b30b50d6a2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
@@ -67,7 +67,7 @@ public final class Q00103_SpiritOfCraftsman extends Quest
public Q00103_SpiritOfCraftsman()
{
- super(103, Q00103_SpiritOfCraftsman.class.getSimpleName(), "Spirit of Craftsman");
+ super(103);
addStartNpc(BLACKSMITH_KAROYD);
addTalkId(BLACKSMITH_KAROYD, CECON, HARNE);
addKillId(MARSH_ZOMBIE, DOOM_SOLDIER, SKELETON_HUNTER, SKELETON_HUNTER_ARCHER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
index 260cbd5ed9..5b4ec7c16e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
@@ -71,7 +71,7 @@ public final class Q00104_SpiritOfMirrors extends Quest
public Q00104_SpiritOfMirrors()
{
- super(104, Q00104_SpiritOfMirrors.class.getSimpleName(), "Spirit of Mirrors");
+ super(104);
addStartNpc(GALLINT);
addTalkId(ARNOLD, GALLINT, JOHNSTONE, KENYOS);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
index a999588309..0a89bc772e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
@@ -77,7 +77,7 @@ public final class Q00105_SkirmishWithOrcs extends Quest
public Q00105_SkirmishWithOrcs()
{
- super(105, Q00105_SkirmishWithOrcs.class.getSimpleName(), "Skirmish with Orcs");
+ super(105);
addStartNpc(KENDNELL);
addTalkId(KENDNELL);
addKillId(MONSTER_DROP.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
index e7cb41049b..ec092dc248 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
@@ -50,7 +50,7 @@ public final class Q00106_ForgottenTruth extends Quest
public Q00106_ForgottenTruth()
{
- super(106, Q00106_ForgottenTruth.class.getSimpleName(), "Forgotten Truth");
+ super(106);
addStartNpc(THIFIELL);
addTalkId(THIFIELL, KARTA);
addKillId(TUMRAN_ORC_BRIGAND);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
index 8c43b86ae8..28a5e5577e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
@@ -63,7 +63,7 @@ public final class Q00107_MercilessPunishment extends Quest
public Q00107_MercilessPunishment()
{
- super(107, Q00107_MercilessPunishment.class.getSimpleName(), "Merciless Punishment");
+ super(107);
addStartNpc(URUTU_CHIEF_HATOS);
addTalkId(URUTU_CHIEF_HATOS, CENTURION_PARUGON);
addKillId(BARANKA_MESSENGER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
index de5ed6f559..598f5ac0ea 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
@@ -87,7 +87,7 @@ public final class Q00108_JumbleTumbleDiamondFuss extends Quest
public Q00108_JumbleTumbleDiamondFuss()
{
- super(108, Q00108_JumbleTumbleDiamondFuss.class.getSimpleName(), "Jumble, Tumble, Diamond Fuss");
+ super(108);
addStartNpc(COLLECTOR_GOUPH);
addTalkId(COLLECTOR_GOUPH, TRADER_REEP, CARRIER_TOROCCO, MINER_MARON, BLACKSMITH_BRUNON, WAREHOUSE_KEEPER_MURDOC, WAREHOUSE_KEEPER_AIRY);
addKillId(GOBLIN_BRIGAND_LEADER, GOBLIN_BRIGAND_LIEUTENANT, BLADE_BAT);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
index acf259169f..594f528bdf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
@@ -37,7 +37,7 @@ public class Q00109_InSearchOfTheNest extends Quest
public Q00109_InSearchOfTheNest()
{
- super(109, Q00109_InSearchOfTheNest.class.getSimpleName(), "In Search of the Nest");
+ super(109);
addStartNpc(PIERCE);
addTalkId(PIERCE, SCOUTS_CORPSE, KAHMAN);
registerQuestItems(SCOUTS_NOTE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
index ba03f6aee6..11eedbf9b3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
@@ -36,7 +36,7 @@ public class Q00110_ToThePrimevalIsle extends Quest
public Q00110_ToThePrimevalIsle()
{
- super(110, Q00110_ToThePrimevalIsle.class.getSimpleName(), "To the Primeval Isle");
+ super(110);
addStartNpc(ANTON);
addTalkId(ANTON, MARQUEZ);
registerQuestItems(ANCIENT_BOOK);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
index cb376ee39f..0aa67bcf2c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
@@ -77,7 +77,7 @@ public final class Q00111_ElrokianHuntersProof extends Quest
public Q00111_ElrokianHuntersProof()
{
- super(111, Q00111_ElrokianHuntersProof.class.getSimpleName(), "Elrokian Hunter's Proof");
+ super(111);
addStartNpc(MARQUEZ);
addTalkId(MARQUEZ, MUSHIKA, ASAMAH, KIRIKACHIN);
addKillId(MOBS_DROP_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
index 28eda39251..20f5920353 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
@@ -38,7 +38,7 @@ public class Q00112_WalkOfFate extends Quest
public Q00112_WalkOfFate()
{
- super(112, Q00112_WalkOfFate.class.getSimpleName(), "Walk of Fate");
+ super(112);
addStartNpc(LIVINA);
addTalkId(LIVINA, KARUDA);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
index ee07e7de3e..77922241ba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
@@ -38,7 +38,7 @@ public class Q00113_StatusOfTheBeaconTower extends Quest
public Q00113_StatusOfTheBeaconTower()
{
- super(113, Q00113_StatusOfTheBeaconTower.class.getSimpleName(), "Status of the Beacon Tower");
+ super(113);
addStartNpc(MOIRA);
addTalkId(MOIRA, TORRANT);
registerQuestItems(FIRE_BOX, FLAME_BOX);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
index ff3ce5cb3a..d73e02f809 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
@@ -57,7 +57,7 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest
public Q00114_ResurrectionOfAnOldManager()
{
- super(114, Q00114_ResurrectionOfAnOldManager.class.getSimpleName(), "Resurrection of an Old Manager");
+ super(114);
addStartNpc(YUMI);
addTalkId(YUMI, WENDY, BOX, STONES, NEWYEAR);
addKillId(GUARDIAN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index aa706faf82..b01e8ccd8f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -47,7 +47,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
public Q00115_TheOtherSideOfTruth()
{
- super(115, Q00115_TheOtherSideOfTruth.class.getSimpleName(), "The Other Side of Truth");
+ super(115);
addStartNpc(RAFFORTY);
addTalkId(RAFFORTY, MISA, KIER, ICE_SCULPTURE1, ICE_SCULPTURE2, ICE_SCULPTURE3, ICE_SCULPTURE4);
registerQuestItems(MISAS_LETTER, RAFFORTYS_LETTER, PIECE_OF_TABLET, REPORT_PIECE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
index 6d9ecce874..9040e4acff 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00116_BeyondTheHillsOfWinter/Q00116_BeyondTheHillsOfWinter.java
@@ -44,7 +44,7 @@ public final class Q00116_BeyondTheHillsOfWinter extends Quest
public Q00116_BeyondTheHillsOfWinter()
{
- super(116, Q00116_BeyondTheHillsOfWinter.class.getSimpleName(), "Beyond the Hills of Winter");
+ super(116);
addStartNpc(FILAUR);
addTalkId(FILAUR, OBI);
registerQuestItems(SUPPLYING_GOODS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
index 24fac89192..b767b73f57 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00117_TheOceanOfDistantStars/Q00117_TheOceanOfDistantStars.java
@@ -54,7 +54,7 @@ public final class Q00117_TheOceanOfDistantStars extends Quest
public Q00117_TheOceanOfDistantStars()
{
- super(117, Q00117_TheOceanOfDistantStars.class.getSimpleName(), "The Ocean of Distant Stars");
+ super(117);
addStartNpc(ABEY);
addTalkId(ABEY, GHOST_OF_A_RAILROAD_ENGINEER, GHOST_OF_AN_ANCIENT_RAILROAD_ENGINEER, BOX, OBI);
addKillId(BANDIT_WARRIOR, BANDIT_INSPECTOR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java
index 67c6bdf045..5a2ee43e0e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00118_ToLeadAndBeLed/Q00118_ToLeadAndBeLed.java
@@ -61,7 +61,7 @@ public final class Q00118_ToLeadAndBeLed extends Quest
public Q00118_ToLeadAndBeLed()
{
- super(118, Q00118_ToLeadAndBeLed.class.getSimpleName(), "To Lead And Be Led");
+ super(118);
addStartNpc(BLACKSMITH_PINTER);
addTalkId(BLACKSMITH_PINTER);
addKillId(MAILLE_LIZARDMAN, MAILLE_LIZARDMAN_SCOUT, MAILLE_LIZARDMAN_GUARD, KING_OF_THE_ARANEID);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index 80ad04dad1..e3a68b66ad 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -38,7 +38,7 @@ public class Q00119_LastImperialPrince extends Quest
public Q00119_LastImperialPrince()
{
- super(119, Q00119_LastImperialPrince.class.getSimpleName(), "Last Imperial Prince");
+ super(119);
addStartNpc(NAMELESS_SPIRIT);
addTalkId(NAMELESS_SPIRIT, DEVORIN);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
index b9772ac48e..9f772167fb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java
@@ -56,7 +56,7 @@ public final class Q00120_PavelsLastResearch extends Quest
public Q00120_PavelsLastResearch()
{
- super(120, Q00120_PavelsLastResearch.class.getSimpleName(), "Pavel's Last Research");
+ super(120);
addStartNpc(SUSPICIOUS_LOOKING_PILE_OF_STONES);
addTalkId(SUSPICIOUS_LOOKING_PILE_OF_STONES, WENDY, YUMI, WEATHERMASTER_1, WEATHERMASTER_2, WEATHERMASTER_3, DOCTOR_CHAOS_SECRET_BOOKSHELF);
addSkillSeeId(WEATHERMASTER_1, WEATHERMASTER_2, WEATHERMASTER_3);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
index b93f3f4d9e..cd484c5efc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
@@ -35,7 +35,7 @@ public class Q00121_PavelTheGiant extends Quest
public Q00121_PavelTheGiant()
{
- super(121, Q00121_PavelTheGiant.class.getSimpleName(), "Pavel the Giant");
+ super(121);
addStartNpc(NEWYEAR);
addTalkId(NEWYEAR, YUMI);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
index c67b581377..636cce9911 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
@@ -35,7 +35,7 @@ public class Q00122_OminousNews extends Quest
public Q00122_OminousNews()
{
- super(122, Q00122_OminousNews.class.getSimpleName(), "Ominous News");
+ super(122);
addStartNpc(MOIRA);
addTalkId(MOIRA, KARUDA);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java
index 4379fe2bbd..e0ffd96039 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00123_TheLeaderAndTheFollower/Q00123_TheLeaderAndTheFollower.java
@@ -59,7 +59,7 @@ public final class Q00123_TheLeaderAndTheFollower extends Quest
public Q00123_TheLeaderAndTheFollower()
{
- super(123, Q00123_TheLeaderAndTheFollower.class.getSimpleName(), "The Leader And The Follower");
+ super(123);
addStartNpc(HEAD_BLACKSMITH_NEWYEAR);
addTalkId(HEAD_BLACKSMITH_NEWYEAR);
addKillId(BRUIN_LIZARDMAN, PICOT_ARANEID);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
index b9682a349f..41e8b29712 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
@@ -39,7 +39,7 @@ public class Q00124_MeetingTheElroki extends Quest
public Q00124_MeetingTheElroki()
{
- super(124, Q00124_MeetingTheElroki.class.getSimpleName(), "Meeting the Elroki");
+ super(124);
addStartNpc(MARQUEZ);
addTalkId(MARQUEZ, MUSHIKA, ASAMAH, KARAKAWEI, MANTARASA);
registerQuestItems(MANTARASA_EGG);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
index 8a5649633f..5da2cdf7fc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
@@ -66,7 +66,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
public Q00125_TheNameOfEvil1()
{
- super(125, Q00125_TheNameOfEvil1.class.getSimpleName(), "The Name of Evil - 1");
+ super(125);
addStartNpc(MUSHIKA);
addTalkId(MUSHIKA, KARAKAWEI, ULU_KAIMU, BALU_KAIMU, CHUTA_KAIMU);
addKillId(ORNITHOMIMUS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index eaaf0fec2f..b65ef7910a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -48,7 +48,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
public Q00126_TheNameOfEvil2()
{
- super(126, Q00126_TheNameOfEvil2.class.getSimpleName(), "The Name of Evil - 2");
+ super(126);
addStartNpc(ASAMAH);
addTalkId(ASAMAH, ULU_KAIMU, BALU_KAIMU, CHUTA_KAIMU, WARRIORS_GRAVE, SHILENS_STONE_STATUE, MUSHIKA);
registerQuestItems(GAZKH_FRAGMENT, BONE_POWDER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
index ea8868e697..8d51b37391 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
@@ -74,7 +74,7 @@ public final class Q00128_PailakaSongOfIceAndFire extends Quest
public Q00128_PailakaSongOfIceAndFire()
{
- super(128, Q00128_PailakaSongOfIceAndFire.class.getSimpleName(), "Pailaka - Song of Ice and Fire");
+ super(128);
addStartNpc(ADLER1);
addTalkId(ADLER1, ADLER2, SINAI, INSPECTOR);
addKillId(HILLAS, PAPION, KINSUS, GARGOS, ADIANTUM);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
index 8718731ded..cc7f70060a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
@@ -63,7 +63,7 @@ public final class Q00129_PailakaDevilsLegacy extends Quest
public Q00129_PailakaDevilsLegacy()
{
- super(129, Q00129_PailakaDevilsLegacy.class.getSimpleName(), "Pailaka - Devil's Legacy");
+ super(129);
addStartNpc(SURVIVOR);
addFirstTalkId(SURVIVOR, SUPPORTER, ADVENTURER1, ADVENTURER2);
addTalkId(SURVIVOR, SUPPORTER, ADVENTURER1, ADVENTURER2);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
index dfdeaa71a3..98e744cec8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.model.quest.State;
-import hellbound.HellboundEngine;
+import ai.areas.Hellbound.HellboundEngine;
/**
* Path To Hellbound (130)
@@ -40,7 +40,7 @@ public class Q00130_PathToHellbound extends Quest
public Q00130_PathToHellbound()
{
- super(130, Q00130_PathToHellbound.class.getSimpleName(), "Path To Hellbound");
+ super(130);
addStartNpc(CASIAN);
addTalkId(CASIAN, GALATE);
registerQuestItems(CASIANS_BLUE_CRYSTAL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
index 5c306609ab..710373ae5c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
@@ -43,7 +43,7 @@ public class Q00131_BirdInACage extends Quest
public Q00131_BirdInACage()
{
- super(131, Q00131_BirdInACage.class.getSimpleName(), "Bird in a Cage");
+ super(131);
addStartNpc(KANIS);
addTalkId(KANIS, PARME);
registerQuestItems(ECHO_CRYSTAL_OF_FREE_THOUGHT, PARMES_LETTER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
index 80b7ef4786..3310ff94c0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
@@ -44,7 +44,7 @@ public final class Q00132_MatrasCuriosity extends Quest
public Q00132_MatrasCuriosity()
{
- super(132, Q00132_MatrasCuriosity.class.getSimpleName(), "Matras' Curiosity");
+ super(132);
addStartNpc(MATRAS);
addTalkId(MATRAS);
addKillId(RANKU, DEMON_PRINCE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
index 81212967ae..73b7a7b1cb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.model.quest.State;
-import hellbound.HellboundEngine;
+import ai.areas.Hellbound.HellboundEngine;
import quests.Q00131_BirdInACage.Q00131_BirdInACage;
/**
@@ -41,7 +41,7 @@ public class Q00133_ThatsBloodyHot extends Quest
public Q00133_ThatsBloodyHot()
{
- super(133, Q00133_ThatsBloodyHot.class.getSimpleName(), "That's Bloody Hot!");
+ super(133);
addStartNpc(KANIS);
addTalkId(KANIS, GALATE);
registerQuestItems(REFINED_CRYSTAL_SAMPLE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
index 6872320457..df014c9e6c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
@@ -63,7 +63,7 @@ public class Q00134_TempleMissionary extends Quest
public Q00134_TempleMissionary()
{
- super(134, Q00134_TempleMissionary.class.getSimpleName(), "Temple Missionary");
+ super(134);
addStartNpc(GLYVKA);
addTalkId(GLYVKA, ROUKE);
addKillId(CRUMA_MARSHLANDS_TRAITOR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
index 2244f2720d..2f2cf8dca8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
@@ -62,7 +62,7 @@ public class Q00135_TempleExecutor extends Quest
public Q00135_TempleExecutor()
{
- super(135, Q00135_TempleExecutor.class.getSimpleName(), "Temple Executor");
+ super(135);
addStartNpc(SHEGFIELD);
addTalkId(SHEGFIELD, ALEX, SONIN, PANO);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
index 0b4fa48673..f71368319b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
@@ -60,7 +60,7 @@ public class Q00136_MoreThanMeetsTheEye extends Quest
public Q00136_MoreThanMeetsTheEye()
{
- super(136, Q00136_MoreThanMeetsTheEye.class.getSimpleName(), "More Than Meets the Eye");
+ super(136);
addStartNpc(HARDIN);
addTalkId(HARDIN, ERRICKIN, CLAYTON);
addKillId(GHOST1, GHOST2, GHOST3, GLASS_JAGUAR, MIRROR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
index e697c23612..b691ce98c2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
@@ -46,7 +46,7 @@ public class Q00137_TempleChampionPart1 extends Quest
public Q00137_TempleChampionPart1()
{
- super(137, Q00137_TempleChampionPart1.class.getSimpleName(), "Temple Champion - 1");
+ super(137);
addStartNpc(SYLVAIN);
addTalkId(SYLVAIN);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
index 62b47dd9c4..c31134dd37 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
@@ -50,7 +50,7 @@ public class Q00138_TempleChampionPart2 extends Quest
public Q00138_TempleChampionPart2()
{
- super(138, Q00138_TempleChampionPart2.class.getSimpleName(), "Temple Champion - 2");
+ super(138);
addStartNpc(SYLVAIN);
addTalkId(SYLVAIN, PUPINA, ANGUS, SLA);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
index ca8126200d..fca43d053b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
@@ -51,7 +51,7 @@ public class Q00139_ShadowFoxPart1 extends Quest
public Q00139_ShadowFoxPart1()
{
- super(139, Q00139_ShadowFoxPart1.class.getSimpleName(), "Shadow Fox - 1");
+ super(139);
addStartNpc(MIA);
addTalkId(MIA);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
index 98c626ec39..103a05c19a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
@@ -60,7 +60,7 @@ public class Q00140_ShadowFoxPart2 extends Quest
public Q00140_ShadowFoxPart2()
{
- super(140, Q00140_ShadowFoxPart2.class.getSimpleName(), "Shadow Fox - 2");
+ super(140);
addStartNpc(KLUCK);
addTalkId(KLUCK, XENOVIA);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
index b2b18bab25..a024fbbd7e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
@@ -56,7 +56,7 @@ public class Q00141_ShadowFoxPart3 extends Quest
public Q00141_ShadowFoxPart3()
{
- super(141, Q00141_ShadowFoxPart3.class.getSimpleName(), "Shadow Fox - 3");
+ super(141);
addStartNpc(NATOOLS);
addTalkId(NATOOLS);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
index 753c2ac7b6..d763e7e8b1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
@@ -65,7 +65,7 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest
public Q00142_FallenAngelRequestOfDawn()
{
- super(142, Q00142_FallenAngelRequestOfDawn.class.getSimpleName(), "Fallen Angel - Request of Dawn");
+ super(142);
addTalkId(NATOOLS, RAYMOND, CASIAN, ROCK);
addKillId(MOBS.keySet());
addKillId(FALLEN_ANGEL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
index a093ea46ae..2cf372d3c1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
@@ -46,7 +46,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
public Q00143_FallenAngelRequestOfDusk()
{
- super(143, Q00143_FallenAngelRequestOfDusk.class.getSimpleName(), "Fallen Angel - Request of Dusk");
+ super(143);
addTalkId(NATOOLS, TOBIAS, CASIAN, ROCK, ANGEL);
registerQuestItems(SEALED_PROPHECY_PATH_OF_THE_GOD, PROPHECY_PATH_OF_THE_GOD, EMPTY_SOUND_CRYSTAL, ANGEL_MEDICINE, ANGELS_MESSAGE);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
index 6f72d3259c..ed7247d7b9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java
@@ -199,11 +199,11 @@ public class Q00144_PailakaInjuredDragon extends Quest
public Q00144_PailakaInjuredDragon()
{
- super(144, Q00144_PailakaInjuredDragon.class.getSimpleName(), "Pailaka - Injured Dragon");
+ super(144);
addStartNpc(KETRA_ORC_SHAMAN);
addKillId(LATANA);
- questItemIds = ITEMS;
+ _questItemIds = ITEMS;
for (int npcId : NPCS)
{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
index de64a89e0c..bd9cc4d14e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
@@ -39,7 +39,7 @@ public class Q00146_TheZeroHour extends Quest
public Q00146_TheZeroHour()
{
- super(146, Q00146_TheZeroHour.class.getSimpleName(), "The Zero Hour");
+ super(146);
addStartNpc(KAHMAN);
addTalkId(KAHMAN);
addKillId(QUEEN_SHYEED);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
index 6a1f5919b7..255e835445 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
@@ -48,7 +48,7 @@ public class Q00147_PathtoBecominganEliteMercenary extends Quest
public Q00147_PathtoBecominganEliteMercenary()
{
- super(147, Q00147_PathtoBecominganEliteMercenary.class.getSimpleName(), "Path to Becoming an Elite Mercenary");
+ super(147);
addStartNpc(MERC);
addTalkId(MERC);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
index 378098cca7..b016153e7d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
@@ -50,7 +50,7 @@ public class Q00148_PathtoBecominganExaltedMercenary extends Quest
public Q00148_PathtoBecominganExaltedMercenary()
{
- super(148, Q00148_PathtoBecominganExaltedMercenary.class.getSimpleName(), "Path to Becoming an Exalted Mercenary");
+ super(148);
addStartNpc(MERC);
addTalkId(MERC);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
index cb90d44068..b51d1beb8a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
@@ -49,7 +49,7 @@ public class Q00151_CureForFever extends Quest
public Q00151_CureForFever()
{
- super(151, Q00151_CureForFever.class.getSimpleName(), "Cure for Fever");
+ super(151);
addStartNpc(ELLIAS);
addTalkId(ELLIAS, YOHANES);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
index d0ac759acf..1f015f7d79 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
@@ -45,7 +45,7 @@ public class Q00152_ShardsOfGolem extends Quest
public Q00152_ShardsOfGolem()
{
- super(152, Q00152_ShardsOfGolem.class.getSimpleName(), "Shards of Golem");
+ super(152);
addStartNpc(HARRYS);
addTalkId(HARRYS, ALTRAN);
addKillId(STONE_GOLEM);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
index 94a8648148..6446f4c5d3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
@@ -49,7 +49,7 @@ public class Q00153_DeliverGoods extends Quest
public Q00153_DeliverGoods()
{
- super(153, Q00153_DeliverGoods.class.getSimpleName(), "Deliver Goods");
+ super(153);
addStartNpc(ARNOLD_ID);
addTalkId(JACKSON_ID, SILVIA_ID, ARNOLD_ID, RANT_ID);
registerQuestItems(DELIVERY_LIST_ID, HEAVY_WOOD_BOX_ID, CLOTH_BUNDLE_ID, CLAY_POT_ID, JACKSONS_RECEIPT_ID, SILVIAS_RECEIPT_ID, RANTS_RECEIPT_ID);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
index f536ef7934..84ba57bcdf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java
@@ -46,7 +46,7 @@ public final class Q00154_SacrificeToTheSea extends Quest
public Q00154_SacrificeToTheSea()
{
- super(154, Q00154_SacrificeToTheSea.class.getSimpleName(), "Sacrifice to the Sea");
+ super(154);
addStartNpc(ROCKSWELL);
addTalkId(ROCKSWELL, CRISTEL, ROLLFNAN);
addKillId(ELDER_KELTIR, YOUNG_KELTIR, KELTIR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
index 767c517dd7..d8252e2a21 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
@@ -39,7 +39,7 @@ public class Q00155_FindSirWindawood extends Quest
public Q00155_FindSirWindawood()
{
- super(155, Q00155_FindSirWindawood.class.getSimpleName(), "Find Sir Windawood");
+ super(155);
addStartNpc(ABELLOS);
addTalkId(ABELLOS, SIR_COLLIN_WINDAWOOD);
registerQuestItems(OFFICIAL_LETTER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
index e72d0765bf..e344638bbf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
@@ -40,7 +40,7 @@ public class Q00156_MillenniumLove extends Quest
public Q00156_MillenniumLove()
{
- super(156, Q00156_MillenniumLove.class.getSimpleName(), "Millennium Love");
+ super(156);
addStartNpc(LILITH);
addTalkId(LILITH, BAENEDES);
registerQuestItems(LILITHS_LETTER, THEONS_DIARY);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
index 80ed0f1c15..b30b2d3d72 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
@@ -41,7 +41,7 @@ public class Q00157_RecoverSmuggledGoods extends Quest
public Q00157_RecoverSmuggledGoods()
{
- super(157, Q00157_RecoverSmuggledGoods.class.getSimpleName(), "Recover Smuggled Goods");
+ super(157);
addStartNpc(WILFORD);
addTalkId(WILFORD);
addKillId(GIANT_TOAD);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
index c4f740f465..28690d9303 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
@@ -43,7 +43,7 @@ public class Q00158_SeedOfEvil extends Quest
public Q00158_SeedOfEvil()
{
- super(158, Q00158_SeedOfEvil.class.getSimpleName(), "Seed of Evil");
+ super(158);
addStartNpc(BIOTIN);
addTalkId(BIOTIN);
addAttackId(NERKAS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
index fcac326021..692b34f435 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
@@ -43,7 +43,7 @@ public class Q00159_ProtectTheWaterSource extends Quest
public Q00159_ProtectTheWaterSource()
{
- super(159, Q00159_ProtectTheWaterSource.class.getSimpleName(), "Protect the Water Source");
+ super(159);
addStartNpc(ASTERIOS);
addTalkId(ASTERIOS);
addKillId(PLAGUE_ZOMBIE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
index 40999023ac..2077237001 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java
@@ -46,7 +46,7 @@ public final class Q00160_NerupasRequest extends Quest
public Q00160_NerupasRequest()
{
- super(160, Q00160_NerupasRequest.class.getSimpleName(), "Nerupa's Request");
+ super(160);
addStartNpc(NERUPA);
addTalkId(NERUPA, UNOREN, CREAMEES, JULIA);
registerQuestItems(SILVERY_SPIDERSILK, UNOS_RECEIPT, CELS_TICKET, NIGHTSHADE_LEAF);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
index ed39e607cb..2f838a494f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
@@ -40,7 +40,7 @@ public class Q00161_FruitOfTheMotherTree extends Quest
public Q00161_FruitOfTheMotherTree()
{
- super(161, Q00161_FruitOfTheMotherTree.class.getSimpleName(), "Fruit of the Mother Tree");
+ super(161);
addStartNpc(ANDELLIA);
addTalkId(ANDELLIA, THALIA);
registerQuestItems(ANDELLRIAS_LETTER, MOTHERTREE_FRUIT);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
index 1719ed36b2..760820852e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
@@ -57,7 +57,7 @@ public class Q00162_CurseOfTheUndergroundFortress extends Quest
public Q00162_CurseOfTheUndergroundFortress()
{
- super(162, Q00162_CurseOfTheUndergroundFortress.class.getSimpleName(), "Curse of the Underground Fortress");
+ super(162);
addStartNpc(UNOREN);
addTalkId(UNOREN);
addKillId(MONSTERS_SKULLS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
index bfbaa18305..d175199885 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
@@ -48,7 +48,7 @@ public class Q00163_LegacyOfThePoet extends Quest
public Q00163_LegacyOfThePoet()
{
- super(163, Q00163_LegacyOfThePoet.class.getSimpleName(), "Legacy of the Poet");
+ super(163);
addStartNpc(STARDEN);
addTalkId(STARDEN);
addKillId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
index 15e9589349..d37f28b4b3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
@@ -43,7 +43,7 @@ public class Q00164_BloodFiend extends Quest
public Q00164_BloodFiend()
{
- super(164, Q00164_BloodFiend.class.getSimpleName(), "Blood Fiend");
+ super(164);
addStartNpc(CREAMEES);
addTalkId(CREAMEES);
addKillId(KIRUNAK);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
index d3d159d311..14b4b7eeb2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
@@ -53,7 +53,7 @@ public class Q00165_ShilensHunt extends Quest
public Q00165_ShilensHunt()
{
- super(165, Q00165_ShilensHunt.class.getSimpleName(), "Shilen's Hunt");
+ super(165);
addStartNpc(NELSYA);
addTalkId(NELSYA);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
index ab47e83891..d94930e927 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
@@ -55,7 +55,7 @@ public class Q00166_MassOfDarkness extends Quest
public Q00166_MassOfDarkness()
{
- super(166, Q00166_MassOfDarkness.class.getSimpleName(), "Mass of Darkness");
+ super(166);
addStartNpc(UNDRIAS);
addTalkId(UNDRIAS, IRIA, DORANKUS, TRUDY);
registerQuestItems(UNDRIAS_LETTER, CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIELS_SCRIPTURE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
index c12e126bff..2225b1177a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
@@ -40,7 +40,7 @@ public class Q00167_DwarvenKinship extends Quest
public Q00167_DwarvenKinship()
{
- super(167, Q00167_DwarvenKinship.class.getSimpleName(), "Dwarven Kinship");
+ super(167);
addStartNpc(CARLON);
addTalkId(CARLON, NORMAN, HAPROCK);
registerQuestItems(CARLONS_LETTER, NORMANS_LETTER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
index c16ea4a186..1807a23b42 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
@@ -54,7 +54,7 @@ public class Q00168_DeliverSupplies extends Quest
public Q00168_DeliverSupplies()
{
- super(168, Q00168_DeliverSupplies.class.getSimpleName(), "Deliver Supplies");
+ super(168);
addStartNpc(JENNA);
addTalkId(JENNA, ROSELYN, KRISTIN, HARANT);
registerQuestItems(JENNAS_LETTER, SENTRY_BLADE1, SENTRY_BLADE2, SENTRY_BLADE3, OLD_BRONZE_SWORD);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
index 5fa35bf8b7..863aa7380e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
@@ -45,7 +45,7 @@ public class Q00169_OffspringOfNightmares extends Quest
public Q00169_OffspringOfNightmares()
{
- super(169, Q00169_OffspringOfNightmares.class.getSimpleName(), "Offspring of Nightmares");
+ super(169);
addStartNpc(VLASTY);
addTalkId(VLASTY);
addKillId(LESSER_DARK_HORROR, DARK_HORROR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
index e837c642cb..2f18717835 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
@@ -46,7 +46,7 @@ public class Q00170_DangerousSeduction extends Quest
public Q00170_DangerousSeduction()
{
- super(170, Q00170_DangerousSeduction.class.getSimpleName(), "Dangerous Seduction");
+ super(170);
addStartNpc(VELLIOR);
addTalkId(VELLIOR);
addKillId(MERKENIS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
index f3a899c6cd..18b1e66898 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
@@ -67,7 +67,7 @@ public final class Q00171_ActsOfEvil extends Quest
public Q00171_ActsOfEvil()
{
- super(171, Q00171_ActsOfEvil.class.getSimpleName(), "Acts Of Evil");
+ super(171);
addStartNpc(GUARD_ALVAH);
addTalkId(GUARD_ALVAH, TRADER_ARODIN, TYRA, NETI, TRADER_ROLENTO, TUREK_CHIEF_BURAI);
addKillId(TUMRAN_BUGBEAR, TUMRAN_BUGBEAR_WARRIOR, OL_MAHUM_CAPTAIN, OL_MAHUM_GENERAL, TUREK_ORC_ARCHER, TUREK_ORC_SKIRMISHER, TUREK_ORC_SUPPLIER, TUREK_ORC_FOOTMAN, OL_MAHUM_SUPPORT_TROOP);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
index 73e865bfaa..85f5778a9e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
@@ -42,7 +42,7 @@ public class Q00172_NewHorizons extends Quest
public Q00172_NewHorizons()
{
- super(172, Q00172_NewHorizons.class.getSimpleName(), "New Horizons");
+ super(172);
addStartNpc(ZENYA);
addTalkId(ZENYA, RAGARA);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
index 8457f4c117..7334b38d12 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
@@ -43,7 +43,7 @@ public class Q00173_ToTheIsleOfSouls extends Quest
public Q00173_ToTheIsleOfSouls()
{
- super(173, Q00173_ToTheIsleOfSouls.class.getSimpleName(), "To the Isle of Souls");
+ super(173);
addStartNpc(GALLADUCCI);
addTalkId(GALLADUCCI, GENTLER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
index 531947782a..7219ce9515 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
@@ -51,7 +51,7 @@ public class Q00174_SupplyCheck extends Quest
public Q00174_SupplyCheck()
{
- super(174, Q00174_SupplyCheck.class.getSimpleName(), "Supply Check");
+ super(174);
addStartNpc(MARCELA);
addTalkId(MARCELA, BENIS, NIKA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java
index 02ddbadef6..9654578f6f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java
@@ -73,7 +73,7 @@ public final class Q00175_TheWayOfTheWarrior extends Quest
public Q00175_TheWayOfTheWarrior()
{
- super(175, Q00175_TheWayOfTheWarrior.class.getSimpleName(), "The Way of the Warrior");
+ super(175);
addStartNpc(KEKROPUS);
addTalkId(KEKROPUS, PERWAN);
addKillId(MOUNTAIN_WEREWOLF);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
index e6d878b336..54e49dce29 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
@@ -38,7 +38,7 @@ public class Q00176_StepsForHonor extends Quest
public Q00176_StepsForHonor()
{
- super(176, Q00176_StepsForHonor.class.getSimpleName(), "Steps for Honor");
+ super(176);
addStartNpc(RAPIDUS);
addTalkId(RAPIDUS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00178_IconicTrinity/Q00178_IconicTrinity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00178_IconicTrinity/Q00178_IconicTrinity.java
index 5894bc8211..0d6e5d2002 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00178_IconicTrinity/Q00178_IconicTrinity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00178_IconicTrinity/Q00178_IconicTrinity.java
@@ -42,7 +42,7 @@ public final class Q00178_IconicTrinity extends Quest
public Q00178_IconicTrinity()
{
- super(178, Q00178_IconicTrinity.class.getSimpleName(), "Iconic Trinity");
+ super(178);
addStartNpc(HIERARCH_KEKROPUS);
addTalkId(HIERARCH_KEKROPUS, ICON_OF_THE_PAST, ICON_OF_THE_PRESENT, ICON_OF_THE_FUTURE);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
index 437d7ae328..a22b8626ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
@@ -36,7 +36,7 @@ public class Q00179_IntoTheLargeCavern extends Quest
public Q00179_IntoTheLargeCavern()
{
- super(179, Q00179_IntoTheLargeCavern.class.getSimpleName(), "Into The Large Cavern");
+ super(179);
addStartNpc(KEKROPUS);
addTalkId(KEKROPUS, MENACING_MACHINE);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
index 3e0742115a..ed85bcd898 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
@@ -36,7 +36,7 @@ public class Q00182_NewRecruits extends Quest
public Q00182_NewRecruits()
{
- super(182, Q00182_NewRecruits.class.getSimpleName(), "New Recruits");
+ super(182);
addStartNpc(KEKROPUS);
addTalkId(KEKROPUS, MENACING_MACHINE);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
index 5c9705af9e..e84e480805 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java
@@ -41,7 +41,7 @@ public final class Q00183_RelicExploration extends Quest
public Q00183_RelicExploration()
{
- super(183, Q00183_RelicExploration.class.getSimpleName(), "Relic Exploration");
+ super(183);
addStartNpc(HEAD_BLACKSMITH_KUSTO);
addTalkId(HEAD_BLACKSMITH_KUSTO, RESEARCHER_LORAIN, MAESTRO_NIKOLA);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
index bf8fc9da50..6c85add66d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00184_ArtOfPersuasion/Q00184_ArtOfPersuasion.java
@@ -47,7 +47,7 @@ public final class Q00184_ArtOfPersuasion extends Quest
public Q00184_ArtOfPersuasion()
{
- super(184, Q00184_ArtOfPersuasion.class.getSimpleName(), "Art Of Persuasion");
+ super(184);
addStartNpc(MAESTRO_NIKOLA);
addTalkId(MAESTRO_NIKOLA, RESEARCHER_LORAIN, DESTROYED_DEVICE, ALARM_OF_GIANT);
registerQuestItems(METALLOGRAPH, BROKEN_METAL_PIECES, NIKOLAS_MAP);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
index b457e84361..8da0ac7e49 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00185_NikolasCooperation/Q00185_NikolasCooperation.java
@@ -47,7 +47,7 @@ public final class Q00185_NikolasCooperation extends Quest
public Q00185_NikolasCooperation()
{
- super(185, Q00185_NikolasCooperation.class.getSimpleName(), "Nikola's Cooperation");
+ super(185);
addStartNpc(MAESTRO_NIKOLA);
addTalkId(MAESTRO_NIKOLA, RESEARCHER_LORAIN, DESTROYED_DEVICE);
registerQuestItems(METALLOGRAPH, BROKEN_METAL_PIECES, NIKOLAS_MAP);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
index e74cc3963f..d424eb4274 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java
@@ -59,7 +59,7 @@ public final class Q00186_ContractExecution extends Quest
public Q00186_ContractExecution()
{
- super(186, Q00186_ContractExecution.class.getSimpleName(), "Contract Execution");
+ super(186);
addStartNpc(RESEARCHER_LORAIN);
addTalkId(RESEARCHER_LORAIN, BLUEPRINT_SELLER_LUKA, MAESTRO_NIKOLA);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
index 5ec085283e..afa5b7431e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00187_NikolasHeart/Q00187_NikolasHeart.java
@@ -42,7 +42,7 @@ public final class Q00187_NikolasHeart extends Quest
public Q00187_NikolasHeart()
{
- super(187, Q00187_NikolasHeart.class.getSimpleName(), "Nikola's Heart");
+ super(187);
addStartNpc(RESEARCHER_LORAIN);
addTalkId(HEAD_BLACKSMITH_KUSTO, RESEARCHER_LORAIN, MAESTRO_NIKOLA);
registerQuestItems(METALLOGRAPH);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
index 4052c6a1b0..a0adf0e65d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00188_SealRemoval/Q00188_SealRemoval.java
@@ -45,7 +45,7 @@ public final class Q00188_SealRemoval extends Quest
public Q00188_SealRemoval()
{
- super(188, Q00188_SealRemoval.class.getSimpleName(), "Seal Removal");
+ super(188);
addStartNpc(RESEARCHER_LORAIN);
addTalkId(RESEARCHER_LORAIN, MAESTRO_NIKOLA, DOROTHY_LOCKSMITH);
registerQuestItems(BROKEN_METAL_PIECES);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
index 4faf0f7930..fbdaf3e320 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00189_ContractCompletion/Q00189_ContractCompletion.java
@@ -42,7 +42,7 @@ public final class Q00189_ContractCompletion extends Quest
public Q00189_ContractCompletion()
{
- super(189, Q00189_ContractCompletion.class.getSimpleName(), "Contract Completion");
+ super(189);
addStartNpc(BLUEPRINT_SELLER_LUKA);
addTalkId(BLUEPRINT_SELLER_LUKA, HEAD_BLACKSMITH_KUSTO, RESEARCHER_LORAIN, SHEGFIELD);
registerQuestItems(SCROLL_OF_DECODING);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
index a8186828bf..a05f2de775 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00190_LostDream/Q00190_LostDream.java
@@ -40,7 +40,7 @@ public final class Q00190_LostDream extends Quest
public Q00190_LostDream()
{
- super(190, Q00190_LostDream.class.getSimpleName(), "Lost Dream");
+ super(190);
addStartNpc(HEAD_BLACKSMITH_KUSTO);
addTalkId(HEAD_BLACKSMITH_KUSTO, RESEARCHER_LORAIN, MAESTRO_NIKOLA, JURIS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
index b10f1a1de3..1478e6d1b2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00191_VainConclusion/Q00191_VainConclusion.java
@@ -42,7 +42,7 @@ public final class Q00191_VainConclusion extends Quest
public Q00191_VainConclusion()
{
- super(191, Q00191_VainConclusion.class.getSimpleName(), "Vain Conclusion");
+ super(191);
addStartNpc(DOROTHY_LOCKSMITH);
addTalkId(DOROTHY_LOCKSMITH, HEAD_BLACKSMITH_KUSTO, RESEARCHER_LORAIN, SHEGFIELD);
registerQuestItems(REPAIRED_METALLOGRAPH);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
index 3c73483a53..afe572f61f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
@@ -43,7 +43,7 @@ public final class Q00192_SevenSignsSeriesOfDoubt extends Quest
public Q00192_SevenSignsSeriesOfDoubt()
{
- super(192, Q00192_SevenSignsSeriesOfDoubt.class.getSimpleName(), "Seven Signs, Series of Doubt");
+ super(192);
addStartNpc(CROOP, UNIDENTIFIED_BODY);
addTalkId(CROOP, STAN, UNIDENTIFIED_BODY, HECTOR, HOLLINT);
registerQuestItems(CROOPS_INTRODUCTION, JACOBS_NECKLACE, CROOPS_LETTER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index bdb987e1b8..d1a0303b2b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -55,7 +55,7 @@ public final class Q00193_SevenSignsDyingMessage extends Quest
public Q00193_SevenSignsDyingMessage()
{
- super(193, Q00193_SevenSignsDyingMessage.class.getSimpleName(), "Seven Signs, Dying Message");
+ super(193);
addStartNpc(HOLLINT);
addTalkId(HOLLINT, CAIN, ERIC, SIR_GUSTAV_ATHEBALDT);
addKillId(SHILENS_EVIL_THOUGHTS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
index d9aa9c994d..97ad563f13 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
@@ -53,7 +53,7 @@ public final class Q00194_SevenSignsMammonsContract extends Quest
public Q00194_SevenSignsMammonsContract()
{
- super(194, Q00194_SevenSignsMammonsContract.class.getSimpleName(), "Seven Signs, Mammon's Contract");
+ super(194);
addStartNpc(SIR_GUSTAV_ATHEBALDT);
addTalkId(SIR_GUSTAV_ATHEBALDT, COLIN, FROG, TESS, KUTA, CLAUDIA_ATHEBALDT);
registerQuestItems(ATHEBALDTS_INTRODUCTION, NATIVES_GLOVE, FROG_KINGS_BEAD, GRANDA_TESS_CANDY_POUCH);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
index 8fa2c4ba5d..d84780d079 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
@@ -52,7 +52,7 @@ public final class Q00195_SevenSignsSecretRitualOfThePriests extends Quest
public Q00195_SevenSignsSecretRitualOfThePriests()
{
- super(195, Q00195_SevenSignsSecretRitualOfThePriests.class.getSimpleName(), "Seven Signs, Secret Ritual of the Priests");
+ super(195);
addFirstTalkId(IDENTITY_CONFIRM_DEVICE, PASSWORD_ENTRY_DEVICE, DARKNESS_OF_DAWN, SHELF);
addStartNpc(CLAUDIA_ATHEBALDT);
addTalkId(CLAUDIA_ATHEBALDT, JOHN, RAYMOND, IASON_HEINE, LIGHT_OF_DAWN, DARKNESS_OF_DAWN, IDENTITY_CONFIRM_DEVICE, PASSWORD_ENTRY_DEVICE, SHELF);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
index 552b4cb802..ec082ce6cc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java
@@ -51,7 +51,7 @@ public final class Q00196_SevenSignsSealOfTheEmperor extends Quest
public Q00196_SevenSignsSealOfTheEmperor()
{
- super(196, Q00196_SevenSignsSealOfTheEmperor.class.getSimpleName(), "Seven Signs, Seal of the Emperor");
+ super(196);
addFirstTalkId(MERCHANT_OF_MAMMON);
addStartNpc(IASON_HEINE);
addTalkId(IASON_HEINE, MERCHANT_OF_MAMMON, SHUNAIMAN, WOOD, COURT_MAGICIAN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
index 89a2528b77..817da3cc6f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
@@ -52,7 +52,7 @@ public final class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
public Q00197_SevenSignsTheSacredBookOfSeal()
{
- super(197, Q00197_SevenSignsTheSacredBookOfSeal.class.getSimpleName(), "Seven Signs, the Sacred Book of Seal");
+ super(197);
addStartNpc(WOOD);
addTalkId(WOOD, ORVEN, LEOPARD, LAWRENCE, SOPHIA);
addKillId(SHILENS_EVIL_THOUGHTS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index 18501a1120..6f74088572 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -52,7 +52,7 @@ public final class Q00198_SevenSignsEmbryo extends Quest
public Q00198_SevenSignsEmbryo()
{
- super(198, Q00198_SevenSignsEmbryo.class.getSimpleName(), "Seven Signs, Embryo");
+ super(198);
addStartNpc(WOOD);
addTalkId(WOOD, FRANZ);
addKillId(SHILENS_EVIL_THOUGHTS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
index ec0866c640..e1400e4a66 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
@@ -68,7 +68,7 @@ public final class Q00211_TrialOfTheChallenger extends Quest
public Q00211_TrialOfTheChallenger()
{
- super(211, Q00211_TrialOfTheChallenger.class.getSimpleName(), "Trial of the Challenger");
+ super(211);
addStartNpc(KASH);
addTalkId(FILAUR, KASH, MARTIAN, RALDO, CHEST_OF_SHYSLASSYS);
addKillId(SHYSLASSYS, GORR, BARAHAM, QUEEN_OF_SUCCUBUS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
index 2c8320405d..23d201265a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
@@ -80,7 +80,7 @@ public final class Q00212_TrialOfDuty extends Quest
public Q00212_TrialOfDuty()
{
- super(212, Q00212_TrialOfDuty.class.getSimpleName(), "Trial of Duty");
+ super(212);
addStartNpc(HANNAVALT);
addTalkId(HANNAVALT, DUSTIN, SIR_COLLIN_WINDAWOOD, SIR_ARON_TANFORD, SIR_KIEL_NIGHTHAWK, ISAEL_SILVERSHADOW, SPIRIT_OF_SIR_TALIANUS);
addKillId(HANGMAN_TREE, SKELETON_MARAUDER, SKELETON_RAIDER, STRAIN, GHOUL, BREKA_ORC_OVERLORD, LETO_LIZARDMAN, LETO_LIZARDMAN_ARCHER, LETO_LIZARDMAN_SOLDIER, LETO_LIZARDMAN_WARRIOR, LETO_LIZARDMAN_SHAMAN, LETO_LIZARDMAN_OVERLORD, SPIRIT_OF_SIR_HEROD);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
index 94d8a38304..d0cb4d8ac5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
@@ -84,7 +84,7 @@ public final class Q00213_TrialOfTheSeeker extends Quest
public Q00213_TrialOfTheSeeker()
{
- super(213, Q00213_TrialOfTheSeeker.class.getSimpleName(), "Trial Of The Seeker");
+ super(213);
addStartNpc(MASTER_DUFNER);
addTalkId(MASTER_DUFNER, MASTER_TERRY, BLACKSMITH_BRUNON, TRADER_VIKTOR, MAGISTER_MARINA);
addKillId(ANT_CAPTAIN, ANT_WARRIOR_CAPTAIN, MEDUSA, NEER_GHOUL_BERSERKER, OL_MAHUM_CAPTAIN, MARSH_STAKATO_DRONE, TURAK_BUGBEAR_WARRIOR, BREKA_ORC_OVERLORD, TUREK_ORC_WARLORD, LETO_LIZARDMAN_WARRIOR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
index 1844e43f4b..afe0c4ca4c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
@@ -112,7 +112,7 @@ public final class Q00214_TrialOfTheScholar extends Quest
public Q00214_TrialOfTheScholar()
{
- super(214, Q00214_TrialOfTheScholar.class.getSimpleName(), "Trial Of The Scholar");
+ super(214);
addStartNpc(MAGISTER_MIRIEN);
addTalkId(MAGISTER_MIRIEN, HIGH_PRIEST_SYLVAIN, CAPTAIN_LUCAS, WAREHOUSE_KEEPER_VALKON, MAGISTER_DIETER, GRAND_MAGISTER_JUREK, TRADER_EDROC, WAREHOUSE_KEEPER_RAUT, BLACKSMITH_POITAN, MARIA, ASTROLOGER_CRETA, ELDER_CRONOS, DRUNKARD_TRIFF, ELDER_CASIAN);
addKillId(MONSTER_EYE_DESTREOYER, MEDUSA, GHOUL, SHACKLE1, BREKA_ORC_SHAMAN, SHACKLE2, FETTERED_SOUL, GRANDIS, ENCHANTED_GARGOYLE, LETO_LIZARDMAN_WARRIOR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
index da378987dd..38d7f34453 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
@@ -69,7 +69,7 @@ public final class Q00215_TrialOfThePilgrim extends Quest
public Q00215_TrialOfThePilgrim()
{
- super(215, Q00215_TrialOfThePilgrim.class.getSimpleName(), "Trial Of The Pilgrim");
+ super(215);
addStartNpc(HERMIT_SANTIAGO);
addTalkId(HERMIT_SANTIAGO, PRIEST_PETRON, PRIEST_PRIMOS, ANDELLIA, GAURI_TWINKLEROCK, SEER_TANAPI, ELDER_CASIAN, ANCESTOR_MARTANKUS, PRIEST_OF_THE_EARTH_GERALD, WANDERER_DORF, URUHA);
addKillId(LAVA_SALAMANDER, NAHIR, BLACK_WILLOW);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
index 66a0e15192..ff68c34be8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java
@@ -86,7 +86,7 @@ public final class Q00216_TrialOfTheGuildsman extends Quest
public Q00216_TrialOfTheGuildsman()
{
- super(216, Q00216_TrialOfTheGuildsman.class.getSimpleName(), "Trial Of The Guildsman");
+ super(216);
addStartNpc(WAREHOUSE_KEEPER_VALKON);
addTalkId(WAREHOUSE_KEEPER_VALKON, WAREHOUSE_KEEPER_NORMAN, BLACKSMITH_ALTRAN, BLACKSMITH_PINTER, BLACKSMITH_DUNING);
addKillId(ANT, ANT_CAPTAIN, ANT_OVERSEER, GRANITE_GOLEM, MANDRAGORA_SPROUT1, MANDRAGORA_SAPLONG, MANDRAGORA_BLOSSOM, SILENOS, STRAIN, GHOUL, DEAD_SEEKER, MANDRAGORA_SPROUT2, BREKA_ORC, BREKA_ORC_ARCHER, BREKA_ORC_SHAMAN, BREKA_ORC_OVERLORD, BREKA_ORC_WARRIOR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
index 45e499e809..b21b3310e1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
@@ -99,7 +99,7 @@ public final class Q00217_TestimonyOfTrust extends Quest
public Q00217_TestimonyOfTrust()
{
- super(217, Q00217_TestimonyOfTrust.class.getSimpleName(), "Testimony Of Trust");
+ super(217);
addStartNpc(HIGH_PRIEST_HOLLINT);
addTalkId(HIGH_PRIEST_HOLLINT, HIGH_PRIEST_BIOTIN, HIERARCH_ASTERIOS, TETRARCH_THIFIELL, MAGISTER_CLAYTON, SEER_MANAKIA, IRON_GATES_LOCKIRIN, FLAME_LORD_KAKAI, MAESTRO_NIKOLA, CARDINAL_SERESIN);
addKillId(DRYAD, DRYAD_ELDER, LIREIN, LIREIN_ELDER, ANT_RECRUIT, ANT_PATROL, ANT_GUARD, ANT_SOLDIER, ANT_WARRIOR_CAPTAIN, MARSH_STAKATO, PORTA, MARSH_STAKATO_WORKER, MARSH_STAKATO_SOLDIER, MARSH_STAKATO_DRONE, GUARDIAN_BASILISK, WINDSUS, LUELL_OF_ZEPHYR_WINDS, ACTEA_OF_VERDANT_WILDS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
index 785d14c0c8..922cfe069f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
@@ -96,7 +96,7 @@ public final class Q00218_TestimonyOfLife extends Quest
public Q00218_TestimonyOfLife()
{
- super(218, Q00218_TestimonyOfLife.class.getSimpleName(), "Testimony Of Life");
+ super(218);
addStartNpc(MASTER_CARDIEN);
addTalkId(MASTER_CARDIEN, HIERARCH_ASTERIOS, BLACKSMITH_PUSHKIN, THALIA, PRIEST_ADONIUS, ARKENIA, ISAEL_SILVERSHADOW);
addKillId(ANT_RECRUIT, ANT_PATROL, ANT_GUARD, ANT_SOLDIER, ANT_WARRIOR_CAPTAIN, HARPY, WYRM, MARSH_SPIDER, GUARDIAN_BASILISK, LETO_LIZARDMAN_SHAMAN, LETO_LIZARDMAN_OVERLORD, UNICORN_OF_EVA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
index 65bd8ac730..66e25a9952 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
@@ -99,7 +99,7 @@ public final class Q00219_TestimonyOfFate extends Quest
public Q00219_TestimonyOfFate()
{
- super(219, Q00219_TestimonyOfFate.class.getSimpleName(), "Testimony Of Fate");
+ super(219);
addStartNpc(MAGISTER_KAIRA);
addTalkId(MAGISTER_KAIRA, MAGISTER_ROA, WAREHOUSE_KEEPER_NORMAN, TETRARCH_THIFIELL, ARKENIA, MASTER_IXIA, ALDERS_SPIRIT, BROTHER_METHEUS, BLOODY_PIXY, BLIGHT_TREANT);
addKillId(HANGMAN_TREE, MARSH_STAKATO, MEDUSA, TYRANT, TYRANT_KINGPIN, DEAD_SEEKER, MARSH_STAKATO_WORKER, MARSH_STAKATO_SOLDIER, MARSH_SPIDER, MARSH_STAKATO_DRONE, BREKA_ORC_OVERLORD, GRANDIS, LETO_LIZARDMAN_OVERLORD, KARUL_BUGBEAR, BLACK_WILLOW_LURKER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
index 3fa62e9a62..81d039cdcf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java
@@ -112,7 +112,7 @@ public final class Q00220_TestimonyOfGlory extends Quest
public Q00220_TestimonyOfGlory()
{
- super(220, Q00220_TestimonyOfGlory.class.getSimpleName(), "Testimony Of Glory");
+ super(220);
addStartNpc(PREFECT_VOKIAN);
addTalkId(PREFECT_VOKIAN, PREFECT_KASMAN, SEER_MANAKIA, FLAME_LORD_KAKAI, SEER_TANAPI, BREKA_CHIEF_VOLTAR, ENKU_CHIEF_KEPRA, TUREK_CHIEF_BURAI, LEUNT_CHIEF_HARAK, VUKU_CHIEF_DRIKO, GANDI_CHIEF_CHIANTA);
addKillId(TYRANT, TYRANT_KINGPIN, MARSH_STAKATO_DRONE, GUARDIAN_BASILISK, MANASHEN_GARGOYLE, TIMAK_ORC, TIMAK_ORC_ARCHER, TIMAK_ORC_SOLDIER, TIMAK_ORC_WARRIOR, TIMAK_ORC_SHAMAN, TIMAK_ORC_OVERLORD, TAMLIN_ORC, TAMLIN_ORC_ARCHER, RAGNA_ORC_OVERLORD, RAGNA_ORC_SEER, PASHIKA_SON_OF_VOLTAR, VULTUS_SON_OF_VOLTAR, ENKU_ORC_OVERLORD, MAKUM_BUGBEAR_THUG, REVENANT_OF_TANTOS_CHIEF);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
index 41c37867f4..52f8382eb9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
@@ -116,7 +116,7 @@ public final class Q00221_TestimonyOfProsperity extends Quest
public Q00221_TestimonyOfProsperity()
{
- super(221, Q00221_TestimonyOfProsperity.class.getSimpleName(), "Testimony Of Prosperity");
+ super(221);
addStartNpc(WAREHOUSE_KEEPER_PARMAN);
addTalkId(WAREHOUSE_KEEPER_PARMAN, WAREHOUSE_KEEPER_WILFORD, LILITH, GUARD_BRIGHT, TRADER_SHARI, TRADER_MION, IRON_GATES_LOCKIRIN, GOLDEN_WHEELS_SPIRON, SILVER_SCALES_BALANKI, BRONZE_KEYS_KEEF, GRAY_PILLAR_MEMBER_FILAUR, BLACK_ANVILS_ARIN, MARYSE_REDBONNET, MINER_BOLTER, CARRIER_TOROCCO, MASTER_TOMA, PIOTUR, EMILY, MAESTRO_NIKOLA, BOX_OF_TITAN);
addKillId(MANDRAGORA_SPROUT1, MANDRAGORA_SAPLING, MANDRAGORA_BLOSSOM, MARSH_STAKATO, MANDRAGORA_SPROUT2, GIANT_CRIMSON_ANT, MARSH_STAKATO_WORKER, TOAD_LORD, MARSH_STAKATO_SOLDIER, MARSH_SPIDER, MARSH_STAKATO_DRONE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
index 2d983e2b72..266bb23240 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
@@ -80,7 +80,7 @@ public final class Q00222_TestOfTheDuelist extends Quest
public Q00222_TestOfTheDuelist()
{
- super(222, Q00222_TestOfTheDuelist.class.getSimpleName(), "Test Of The Duelist");
+ super(222);
addStartNpc(DUELIST_KAIEN);
addTalkId(DUELIST_KAIEN);
addKillId(PUNCHER, NOBLE_ANT_LEADER, DEAD_SEEKER, EXCURO, KRATOR, MARSH_STAKATO_DRONE, BREKA_ORC_OVERLORD, FETTERED_SOUL, GRANDIS, ENCHANTED_MONSTEREYE, LETO_LIZARDMAN_OVERLORD, TIMAK_ORC_OVERLORD, TAMLIN_ORC, TAMLIN_ORC_ARCHER, LAKIN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
index 5564ff29cd..303e0b73fe 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java
@@ -76,7 +76,7 @@ public final class Q00223_TestOfTheChampion extends Quest
public Q00223_TestOfTheChampion()
{
- super(223, Q00223_TestOfTheChampion.class.getSimpleName(), "Test Of The Champion");
+ super(223);
addStartNpc(VETERAN_ASCALON);
addTalkId(VETERAN_ASCALON, TRADER_GROOT, CAPTAIN_MOUEN, MASON);
addKillId(HARPY, MEDUSA, WINDSUS, ROAD_SCAVENGER, LETO_LIZARDMAN, LETO_LIZARDMAN_ARCHER, LETO_LIZARDMAN_SOLDIER, LETO_LIZARDMAN_WARRIOR, LETO_LIZARDMAN_SHAMAN, LETO_LIZARDMAN_OCERLORD, BLOODY_AXE_ELITE, HARPY_MATRIARCH, ROAD_COLLECTOR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
index 6ce15a2a46..357393b733 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java
@@ -88,7 +88,7 @@ public final class Q00224_TestOfSagittarius extends Quest
public Q00224_TestOfSagittarius()
{
- super(224, Q00224_TestOfSagittarius.class.getSimpleName(), "Test Of Sagittarius");
+ super(224);
addStartNpc(GUILD_PRESIDENT_BERNARD);
addTalkId(GUILD_PRESIDENT_BERNARD, PREFECT_VOKIAN, SAGITTARIUS_HAMIL, SIR_ARON_TANFORD, MAGISTER_GAUEN);
addKillId(ANT, ANT_CAPTAIN, ANT_OVERSEER, ANT_RECRUIT, ANT_PATROL, ANT_GUARD, NOBLE_ANT, NOBLE_ANT_LEADER, MARSH_STAKATO_WORKER, MARSH_STAKATO_SOLDIER, MARSH_SPIDER, MARSH_STAKATO_DRONE, BREKA_ORC_SHAMAN, BREKA_ORC_OVERLORD, ROAD_SCAVENGER, MANASHEN_GARGOYLE, LETO_LIZARDMAN, LETO_LIZARDMAN_ARCHER, LETO_LIZARDMAN_SOLDIER, LETO_LIZARDMAN_WARRIOR, LETO_LIZARDMAN_SHAMAN, LETO_LIZARDMAN_OVERLORD, SERPENT_DEMON_KADESH);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
index 92dbe535c0..0613802d7b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
@@ -82,7 +82,7 @@ public final class Q00225_TestOfTheSearcher extends Quest
public Q00225_TestOfTheSearcher()
{
- super(225, Q00225_TestOfTheSearcher.class.getSimpleName(), "Test Of The Searcher");
+ super(225);
addStartNpc(MASTER_LUTHER);
addTalkId(MASTER_LUTHER, CAPTAIN_ALEX, TYRA, TREE, STRONG_WOODEN_CHEST, MILITIAMAN_LEIRYNN, DRUNKARD_BORYS, BODYGUARD_JAX);
addKillId(HANGMAN_TREE, ROAD_SCAVENGER, GIANT_FUNGUS, DELU_lIZARDMAN_SHAMAN, NEER_BODYGUARD, DELU_CHIEF_KALKIS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
index 09c611fe4f..a8a0077ebc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java
@@ -74,7 +74,7 @@ public final class Q00226_TestOfTheHealer extends Quest
public Q00226_TestOfTheHealer()
{
- super(226, Q00226_TestOfTheHealer.class.getSimpleName(), "Test Of The Healer");
+ super(226);
addStartNpc(PRIEST_BANDELLOS);
addTalkId(PRIEST_BANDELLOS, MASTER_SORIUS, ALLANA, PERRIN, FATHER_GUPU, ORPHAN_GIRL, WINDY_SHAORING, MYSTERIOUS_DARK_ELF, PIPER_LONGBOW, SLEIN_SHINING_BLADE, CAIN_FLYING_KNIFE, SAINT_KRISTINA, DAURIN_HAMMERCRUSH);
addKillId(LERO_LIZARDMAN_AGENT, LERO_LIZARDMAN_LEADER, LERO_LIZARDMAN_ASSASSIN, LERO_LIZARDMAN_SNIPER, LERO_LIZARDMAN_WIZARD, LERO_LIZARDMAN_LORD, TATOMA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
index 4609f4bb6f..ddbd9ead62 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java
@@ -104,7 +104,7 @@ public final class Q00227_TestOfTheReformer extends Quest
public Q00227_TestOfTheReformer()
{
- super(227, Q00227_TestOfTheReformer.class.getSimpleName(), "Test Of The Reformer");
+ super(227);
addStartNpc(PRIESTESS_PUPINA);
addTalkId(PRIESTESS_PUPINA, PREACHER_SLA, RAMUS, KATARI, KAKAN, NYAKURI, OL_MAHUM_PILGRIM);
addAttackId(NAMELESS_REVENANT, CRIMSON_WEREWOLF);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
index f002017fe7..eb7f7aef36 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java
@@ -91,7 +91,7 @@ public final class Q00228_TestOfMagus extends Quest
public Q00228_TestOfMagus()
{
- super(228, Q00228_TestOfMagus.class.getSimpleName(), "Test Of Magus");
+ super(228);
addStartNpc(BARD_RUKAL);
addTalkId(BARD_RUKAL, PARINA, EARTH_SNAKE, FLAME_SALAMANDER, WIND_SYLPH, WATER_UNDINE, ELDER_CASIAN);
addKillId(HARPY, MARSH_STAKATO, WYRM, MARSH_STAKATO_WORKER, TOAD_LORD, MARSH_STAKATO_SOLDIER, MARSH_STAKATO_DRONE, WINDSUS, ENCHANTED_MONSTEREYE, ENCHANTED_STOLEN_GOLEM, ENCHANTED_IRON_GOLEM, SINGING_FLOWER_PHANTASM, SINGING_FLOWER_NIGTMATE, SINGING_FLOWER_DARKLING, GHOST_FIRE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
index d6f8d1f6d1..f9e10533a9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java
@@ -104,7 +104,7 @@ public final class Q00229_TestOfWitchcraft extends Quest
public Q00229_TestOfWitchcraft()
{
- super(229, Q00229_TestOfWitchcraft.class.getSimpleName(), "Test Of Witchcraft");
+ super(229);
{
addStartNpc(SHADOW_ORIM);
addTalkId(SHADOW_ORIM, GROCER_LARA, TRADER_ALEXANDRIA, MAGISTER_IKER, PRIEST_VADIN, TRADER_NESTLE, SIR_KLAUS_VASPER, LEOPOLD, MAGISTER_KAIRA, WARDEN_RODERIK, WARDEN_ENDRIGO, FISHER_EVERT);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
index b3201b9852..3cd15540c4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java
@@ -153,7 +153,7 @@ public final class Q00230_TestOfTheSummoner extends Quest
public Q00230_TestOfTheSummoner()
{
- super(230, Q00230_TestOfTheSummoner.class.getSimpleName(), "Test Of The Summoner");
+ super(230);
addStartNpc(HIGH_SUMMONER_GALATEA);
addTalkId(HIGH_SUMMONER_GALATEA, GROCER_LARA, SUMMONER_ALMORS, SUMMONER_CAMONIELL, SUMMONER_BELTHUS, SUMMONER_BASILLA, SUMMONER_CELESTIEL, SUMMONER_BRYNTHEA);
addKillId(NOBLE_ANT, NOBLE_ANT_LEADER, WYRM, TYRANT, TYRANT_KINGPIN, BREKA_ORC, BREKA_ORC_ARCHER, BREKA_ORC_SHAMAN, BREKA_ORC_OVERLORD, BREKA_ORC_WARRIOR, FETTERED_SOUL, WINDSUS, GIANT_FUNGUS, MANASHEN_GARGOYLE, LETO_LIZARDMAN, LETO_LIZARDMAN_ARCHER, LETO_LIZARDMAN_SOLDIER, LETO_LIZARDMAN_WARRIOR, LETO_LIZARDMAN_SHAMAN, LETO_LIZARDMAN_OVERLORD, KARUL_BUGBEAR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
index 0b63f8f843..348e84776d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
@@ -73,7 +73,7 @@ public final class Q00231_TestOfTheMaestro extends Quest
public Q00231_TestOfTheMaestro()
{
- super(231, Q00231_TestOfTheMaestro.class.getSimpleName(), "Test Of The Maestro");
+ super(231);
addStartNpc(IRON_GATES_LOCKIRIN);
addTalkId(IRON_GATES_LOCKIRIN, GOLDEN_WHEELS_SPIRON, SILVER_SCALES_BALANKI, BRONZE_KEYS_KEEF, GRAY_PILLAR_MEMBER_FILAUR, BLACK_ANVILS_ARIN, MASTER_TOMA, CHIEF_CROTO, JAILER_DUBABAH, RESEARCHER_LORAIN);
addKillId(KING_BUGBEAR, GIANT_MIST_LEECH, STINGER_WASP, MARSH_SPIDER, EVIL_EYE_LORD);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
index c07c8822c1..7ed6bf5219 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
@@ -98,7 +98,7 @@ public final class Q00232_TestOfTheLord extends Quest
public Q00232_TestOfTheLord()
{
- super(232, Q00232_TestOfTheLord.class.getSimpleName(), "Test Of The Lord");
+ super(232);
addStartNpc(FLAME_LORD_KAKAI);
addTalkId(FLAME_LORD_KAKAI, SEER_SOMAK, SEER_MANAKIA, TRADER_JAKAL, BLACKSMITH_SUMARI, ATUBA_CHIEF_VARKEES, NERUGA_CHIEF_TANTUS, URUTU_CHIEF_HATOS, DUDA_MARA_CHIEF_TAKUNA, GANDI_CHIEF_CHIANTA, FIRST_ORC, ANCESTOR_MARTANKUS);
addKillId(MARSH_SPIDER, BREKA_ORC_SHAMAN, BREKA_ORC_OVERLORD, ENCHANTED_MONSTEREYE, TIMAK_ORC, TIMAK_ORC_ARCHER, TIMAK_ORC_SOLDIER, TIMAK_ORC_SOLDIER, TIMAK_ORC_WARRIOR, TIMAK_ORC_SHAMAN, TIMAK_ORC_OVERLORD, RAGNA_ORC_OVERLORD, RAGNA_ORC_SEER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
index a754b5ab19..16daf2d347 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
@@ -98,7 +98,7 @@ public final class Q00233_TestOfTheWarSpirit extends Quest
public Q00233_TestOfTheWarSpirit()
{
- super(233, Q00233_TestOfTheWarSpirit.class.getSimpleName(), "Test Of The War Spirit");
+ super(233);
addStartNpc(SEER_SOMAK);
addTalkId(SEER_SOMAK, PRIESTESS_VIVYAN, TRADER_SARIEN, SEER_RACOY, SEER_MANAKIA, SHADOW_ORIM, ANCESTOR_MARTANKUS, SEER_PEKIRON);
addKillId(NOBLE_ANT, NOBLE_ANT_LEADER, MEDUSA, PORTA, EXCURO, MORDERO, LETO_LIZARDMAN_SHAMAN, LETO_LIZARDMAN_OVERLORD, TAMLIN_ORC, TAMLIN_ORC_ARCHER, STENOA_GORGON_QUEEN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
index 1a69c0a42a..7e306ea258 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
@@ -142,7 +142,7 @@ public final class Q00234_FatesWhisper extends Quest
public Q00234_FatesWhisper()
{
- super(234, Q00234_FatesWhisper.class.getSimpleName(), "Fate's Whisper");
+ super(234);
addStartNpc(MAESTRO_LEORIN);
addTalkId(ZENKIN, CLIFF, MASTER_KASPAR, HEAD_BLACKSMITH_FERRIS, MAESTRO_LEORIN);
addTalkId(COFFER_OF_THE_DEAD, CHEST_OF_KERNON, CHEST_OF_HALLATE, CHEST_OF_GOLKONDA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
index fd518a4c43..91f6240851 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
@@ -62,7 +62,7 @@ public final class Q00235_MimirsElixir extends Quest
public Q00235_MimirsElixir()
{
- super(235, Q00235_MimirsElixir.class.getSimpleName(), "Mimir's Elixir");
+ super(235);
addStartNpc(LADD);
addTalkId(LADD, JOAN, ALCHEMISTS_MIXING_URN);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00236_SeedsOfChaos/Q00236_SeedsOfChaos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00236_SeedsOfChaos/Q00236_SeedsOfChaos.java
index 0a8e82bd1c..b90f76f2ee 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00236_SeedsOfChaos/Q00236_SeedsOfChaos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00236_SeedsOfChaos/Q00236_SeedsOfChaos.java
@@ -73,7 +73,7 @@ public final class Q00236_SeedsOfChaos extends Quest
public Q00236_SeedsOfChaos()
{
- super(236, Q00236_SeedsOfChaos.class.getSimpleName(), "Seeds Of Chaos");
+ super(236);
addStartNpc(HIERARCH_KEKROPUS);
addTalkId(HIERARCH_KEKROPUS, KURSTIN, MYSTERIOU_WIZARD, VICE_HIERARCH_MAO, KATENAR, HARKILGAMED, RODENPICULA, ROCK, MOTHER_NORNIL, KATENAR_A, KATENAR_B, HARKILGAMED_A);
addKillId(NEEDLE_STAKATO_DRONE, SHOUT_OF_SPLENDOR, ALLIANCE_OF_SPLENDOR, ALLIANCE_OF_SPLENDOR_1, SIGNET_OF_SPLENDOR, CROWN_OF_SPLENDOR, FANG_OF_SPLENDOR, FANG_OF_SPLENDOR_1, WAILINGOF_SPLENDOR, WAILINGOF_SPLENDOR_1, VAMPIRE_WIZARD, VAMPIRE_WIZARD_A);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
index 4231df13c0..004a6aec66 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
@@ -50,7 +50,7 @@ public class Q00237_WindsOfChange extends Quest
public Q00237_WindsOfChange()
{
- super(237, Q00237_WindsOfChange.class.getSimpleName(), "Winds of Change");
+ super(237);
addStartNpc(FLAUEN);
addTalkId(FLAUEN, IASON, ROMAN, MORELYN, HELVETICA, ATHENIA);
registerQuestItems(FLAUENS_LETTER, DOSKOZER_LETTER, ATHENIA_LETTER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
index 3ec0f42707..dd69c6791f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
@@ -51,7 +51,7 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
public Q00238_SuccessFailureOfBusiness()
{
- super(238, Q00238_SuccessFailureOfBusiness.class.getSimpleName(), "Success/Failure Of Business");
+ super(238);
addStartNpc(HELVETICA);
addTalkId(HELVETICA);
addKillId(BRAZIER_OF_PURITY, EVIL_SPIRITS, GUARDIAN_SPIRITS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
index 52d8df19e4..593cbb170a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
@@ -51,7 +51,7 @@ public class Q00239_WontYouJoinUs extends Quest
public Q00239_WontYouJoinUs()
{
- super(239, Q00239_WontYouJoinUs.class.getSimpleName(), "Won't You Join Us?");
+ super(239);
addStartNpc(ATHENIA);
addTalkId(ATHENIA);
addKillId(WASTE_LANDFILL_MACHINE, SUPPRESSOR, EXTERMINATOR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
index a34ef1eb03..b287e6f913 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
@@ -57,7 +57,7 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
public Q00240_ImTheOnlyOneYouCanTrust()
{
- super(240, Q00240_ImTheOnlyOneYouCanTrust.class.getSimpleName(), "I'm the Only One You Can Trust");
+ super(240);
addStartNpc(KINTAIJIN);
addTalkId(KINTAIJIN);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
index dbcdf15fd8..482f091b01 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
@@ -62,7 +62,7 @@ public class Q00241_PossessorOfAPreciousSoul1 extends Quest
public Q00241_PossessorOfAPreciousSoul1()
{
- super(241, Q00241_PossessorOfAPreciousSoul1.class.getSimpleName(), "Possessor Of A Precious Soul 1");
+ super(241);
addStartNpc(TALIEN);
addTalkId(TALIEN, STEDMIEL, GABRIELLE, GILMORE, KANTABILON, RAHORAKTI, CARADINE, KASSANDRA, VIRGIL, OGMAR);
addKillId(BARAHAM, MALRUK_SUCCUBUS_1, MALRUK_SUCCUBUS_TUREN_1, MALRUK_SUCCUBUS_2, MALRUK_SUCCUBUS_TUREN_2, TAIK_ORC_SUPPLY_LEADER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
index e3c5364c3f..3b13f7e56c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
@@ -56,7 +56,7 @@ public class Q00242_PossessorOfAPreciousSoul2 extends Quest
public Q00242_PossessorOfAPreciousSoul2()
{
- super(242, Q00242_PossessorOfAPreciousSoul2.class.getSimpleName(), "Possessor Of A Precious Soul 2");
+ super(242);
addStartNpc(VIRGIL);
addTalkId(VIRGIL, KASSANDRA, OGMAR, MYSTERIOUS_KNIGHT, ANGEL_CORPSE, KALIS, MATILD, FALLEN_UNICORN, CORNERSTONE, PURE_UNICORN);
addKillId(RESTRAINER_OF_GLORY);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
index e32795082f..5961a0c4ea 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
@@ -63,7 +63,7 @@ public class Q00246_PossessorOfAPreciousSoul3 extends Quest
public Q00246_PossessorOfAPreciousSoul3()
{
- super(246, Q00246_PossessorOfAPreciousSoul3.class.getSimpleName(), "Possessor Of A Precious Soul 3");
+ super(246);
addStartNpc(CARADINE);
addTalkId(LADD, CARADINE, OSSIAN);
addKillId(PILGRIM_OF_SPLENDOR, JUDGE_OF_SPLENDOR, BARAKIEL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
index e6b26fadac..297f37dfe1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
@@ -47,7 +47,7 @@ public class Q00247_PossessorOfAPreciousSoul4 extends Quest
public Q00247_PossessorOfAPreciousSoul4()
{
- super(247, Q00247_PossessorOfAPreciousSoul4.class.getSimpleName(), "Possessor Of A Precious Soul 4");
+ super(247);
addStartNpc(CARADINE);
addTalkId(CARADINE, LADY_OF_LAKE);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
index 3eaab6243c..868beba085 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
@@ -35,7 +35,7 @@ public class Q00249_PoisonedPlainsOfTheLizardmen extends Quest
public Q00249_PoisonedPlainsOfTheLizardmen()
{
- super(249, Q00249_PoisonedPlainsOfTheLizardmen.class.getSimpleName(), "Poisoned Plains of the Lizardmen");
+ super(249);
addStartNpc(MOUEN);
addTalkId(MOUEN, JOHNNY);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
index e1b06433b2..4ca90a735b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
@@ -51,7 +51,7 @@ public class Q00250_WatchWhatYouEat extends Quest
public Q00250_WatchWhatYouEat()
{
- super(250, Q00250_WatchWhatYouEat.class.getSimpleName(), "Watch What You Eat");
+ super(250);
addStartNpc(SALLY);
addFirstTalkId(SALLY);
addTalkId(SALLY);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
index d5c35cfedf..15c5a03d15 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
@@ -52,7 +52,7 @@ public class Q00251_NoSecrets extends Quest
public Q00251_NoSecrets()
{
- super(251, Q00251_NoSecrets.class.getSimpleName(), "No Secrets");
+ super(251);
addStartNpc(PINAPS);
addTalkId(PINAPS);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java
index f34e88a263..423b6a0d7d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java
@@ -49,7 +49,7 @@ public class Q00252_ItSmellsDelicious extends Quest
public Q00252_ItSmellsDelicious()
{
- super(252, Q00252_ItSmellsDelicious.class.getSimpleName(), "It Smells Delicious!");
+ super(252);
addStartNpc(STAN);
addTalkId(STAN);
addKillId(CHEF);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
index 40cf5c5a7d..30bf40bf4a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
@@ -92,7 +92,7 @@ public class Q00254_LegendaryTales extends Quest
public Q00254_LegendaryTales()
{
- super(254, Q00254_LegendaryTales.class.getSimpleName(), "Legendary Tales");
+ super(254);
addStartNpc(GILMORE);
addTalkId(GILMORE);
addKillId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index cd6a5f645a..efb974c1d4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -158,7 +158,7 @@ public class Q00255_Tutorial extends Quest
public Q00255_Tutorial()
{
- super(-1, Q00255_Tutorial.class.getSimpleName(), "Tutorial");
+ super(-1);
}
@Override
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
index a3426e8ba4..fd017b5f23 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
@@ -82,7 +82,7 @@ public final class Q00257_TheGuardIsBusy extends Quest
public Q00257_TheGuardIsBusy()
{
- super(257, Q00257_TheGuardIsBusy.class.getSimpleName(), "The Guard is Busy");
+ super(257);
addStartNpc(GILBERT);
addTalkId(GILBERT);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
index 48c0963cca..f80793b068 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
@@ -58,7 +58,7 @@ public final class Q00258_BringWolfPelts extends Quest
public Q00258_BringWolfPelts()
{
- super(258, Q00258_BringWolfPelts.class.getSimpleName(), "Bring Wolf Pelts");
+ super(258);
addStartNpc(LECTOR);
addTalkId(LECTOR);
addKillId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
index 7e7e96ee26..efebfe47bc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
@@ -61,7 +61,7 @@ public final class Q00259_RequestFromTheFarmOwner extends Quest
public Q00259_RequestFromTheFarmOwner()
{
- super(259, Q00259_RequestFromTheFarmOwner.class.getSimpleName(), "Request from the Farm Owner");
+ super(259);
addStartNpc(EDMOND);
addTalkId(EDMOND, MARIUS);
addKillId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
index c7f8ac68c7..3be898c741 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
@@ -56,7 +56,7 @@ public final class Q00260_OrcHunting extends Quest
public Q00260_OrcHunting()
{
- super(260, Q00260_OrcHunting.class.getSimpleName(), "Orc Hunting");
+ super(260);
addStartNpc(RAYEN);
addTalkId(RAYEN);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index cc6cd308ae..503abf8fed 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -51,7 +51,7 @@ public final class Q00261_CollectorsDream extends Quest
public Q00261_CollectorsDream()
{
- super(261, Q00261_CollectorsDream.class.getSimpleName(), "Collector's Dream");
+ super(261);
addStartNpc(ALSHUPES);
addTalkId(ALSHUPES);
addKillId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
index dd83263980..f45ade2418 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
@@ -51,7 +51,7 @@ public final class Q00262_TradeWithTheIvoryTower extends Quest
public Q00262_TradeWithTheIvoryTower()
{
- super(262, Q00262_TradeWithTheIvoryTower.class.getSimpleName(), "Trade With The Ivory Tower");
+ super(262);
addStartNpc(VOLLODOS);
addTalkId(VOLLODOS);
addKillId(MOBS_SAC.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
index 7b67ada3f5..1419eafabf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
@@ -52,7 +52,7 @@ public final class Q00263_OrcSubjugation extends Quest
public Q00263_OrcSubjugation()
{
- super(263, Q00263_OrcSubjugation.class.getSimpleName(), "Orc Subjugation");
+ super(263);
addStartNpc(KAYLEEN);
addTalkId(KAYLEEN);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
index 34d0df7ccd..14f323158b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
@@ -62,7 +62,7 @@ public final class Q00264_KeenClaws extends Quest
public Q00264_KeenClaws()
{
- super(264, Q00264_KeenClaws.class.getSimpleName(), "Keen Claws");
+ super(264);
addStartNpc(PAINT);
addTalkId(PAINT);
addKillId(MONSTER_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
index 7d678f0405..bae4110854 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
@@ -51,7 +51,7 @@ public final class Q00265_BondsOfSlavery extends Quest
public Q00265_BondsOfSlavery()
{
- super(265, Q00265_BondsOfSlavery.class.getSimpleName(), "Bonds of Slavery");
+ super(265);
addStartNpc(KRISTIN);
addTalkId(KRISTIN);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
index 5557a88bd9..d893fdaf41 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -63,7 +63,7 @@ public final class Q00266_PleasOfPixies extends Quest
public Q00266_PleasOfPixies()
{
- super(266, Q00266_PleasOfPixies.class.getSimpleName(), "Pleas of Pixies");
+ super(266);
addStartNpc(PIXY_MURIKA);
addTalkId(PIXY_MURIKA);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
index 446bfa01b3..8d8d95dbfc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
@@ -43,7 +43,7 @@ public final class Q00267_WrathOfVerdure extends Quest
public Q00267_WrathOfVerdure()
{
- super(267, Q00267_WrathOfVerdure.class.getSimpleName(), "Wrath of Verdure");
+ super(267);
addStartNpc(TREANT_BREMEC);
addTalkId(TREANT_BREMEC);
addKillId(GOBLIN_RAIDER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
index bc2bd6237f..8f13578a03 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
@@ -45,7 +45,7 @@ public final class Q00268_TracesOfEvil extends Quest
public Q00268_TracesOfEvil()
{
- super(268, Q00268_TracesOfEvil.class.getSimpleName(), "Traces of Evil");
+ super(268);
addStartNpc(KUNAI);
addTalkId(KUNAI);
addKillId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java
index aa36d6009c..98e83a9660 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java
@@ -52,7 +52,7 @@ public final class Q00269_InventionAmbition extends Quest
public Q00269_InventionAmbition()
{
- super(269, Q00269_InventionAmbition.class.getSimpleName(), "Invention Ambition");
+ super(269);
addStartNpc(INVENTOR_MARU);
addTalkId(INVENTOR_MARU);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
index 6335153f0e..1316b054f0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
@@ -52,7 +52,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest
public Q00270_TheOneWhoEndsSilence()
{
- super(270, Q00270_TheOneWhoEndsSilence.class.getSimpleName(), "The One Who Ends Silence");
+ super(270);
addStartNpc(FAKE_GREYMORE);
addTalkId(FAKE_GREYMORE);
addKillId(SEEKER_SOLINA, SAVIOR_SOLINA, ASCETIC_SOLINA, DIVINITY_JUDGE, DIVINITY_MANAGER, DIVINITY_SUPERVISOR, DIVINITY_WORSHIPPER, DIVINITY_PROTECTOR, DIVINITY_FIGHTER, DIVINITY_MAGUS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
index 690e858a24..e65eb4e8c9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
@@ -45,7 +45,7 @@ public final class Q00271_ProofOfValor extends Quest
public Q00271_ProofOfValor()
{
- super(271, Q00271_ProofOfValor.class.getSimpleName(), "Proof of Valor");
+ super(271);
addStartNpc(RUKAIN);
addTalkId(RUKAIN);
addKillId(KASHA_WOLF);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
index a220bae5bd..3a03ef7fd6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
@@ -45,7 +45,7 @@ public final class Q00272_WrathOfAncestors extends Quest
public Q00272_WrathOfAncestors()
{
- super(272, Q00272_WrathOfAncestors.class.getSimpleName(), "Wrath of Ancestors");
+ super(272);
addStartNpc(LIVINA);
addTalkId(LIVINA);
addKillId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
index 3d94a0fa90..b922e7719f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
@@ -53,7 +53,7 @@ public final class Q00273_InvadersOfTheHolyLand extends Quest
public Q00273_InvadersOfTheHolyLand()
{
- super(273, Q00273_InvadersOfTheHolyLand.class.getSimpleName(), "Invaders of the Holy Land");
+ super(273);
addStartNpc(VARKEES);
addTalkId(VARKEES);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
index b020db0c11..170746e3fd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
@@ -48,7 +48,7 @@ public final class Q00274_SkirmishWithTheWerewolves extends Quest
public Q00274_SkirmishWithTheWerewolves()
{
- super(274, Q00274_SkirmishWithTheWerewolves.class.getSimpleName(), "Skirmish with the Werewolves");
+ super(274);
addStartNpc(BRUKURSE);
addTalkId(BRUKURSE);
addKillId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
index 3d7227d696..e7d7c8ebb3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
@@ -48,7 +48,7 @@ public final class Q00275_DarkWingedSpies extends Quest
public Q00275_DarkWingedSpies()
{
- super(275, Q00275_DarkWingedSpies.class.getSimpleName(), "Dark Winged Spies");
+ super(275);
addStartNpc(NERUGA_CHIEF_TANTUS);
addTalkId(NERUGA_CHIEF_TANTUS);
addKillId(DARKWING_BAT, VARANGKAS_TRACKER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
index e6526c3850..311a0bf4f9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
@@ -65,7 +65,7 @@ public final class Q00276_TotemOfTheHestui extends Quest
public Q00276_TotemOfTheHestui()
{
- super(276, Q00276_TotemOfTheHestui.class.getSimpleName(), "Totem of the Hestui");
+ super(276);
addStartNpc(TANAPI);
addTalkId(TANAPI);
addKillId(KASHA_BEAR, KASHA_BEAR_TOTEM);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
index f74a2232f4..acd39e9da5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
@@ -42,7 +42,7 @@ public class Q00277_GatekeepersOffering extends Quest
public Q00277_GatekeepersOffering()
{
- super(277, Q00277_GatekeepersOffering.class.getSimpleName(), "Gatekeeper's Offering");
+ super(277);
addStartNpc(TAMIL);
addTalkId(TAMIL);
addKillId(GREYSTONE_GOLEM);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
index f73a1a567a..0d43c77a46 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
@@ -42,7 +42,7 @@ public class Q00278_HomeSecurity extends Quest
public Q00278_HomeSecurity()
{
- super(278, Q00278_HomeSecurity.class.getSimpleName(), "Home Security");
+ super(278);
addStartNpc(TUNATUN);
addTalkId(TUNATUN);
addKillId(MONSTER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
index 8411501c3f..fa8526a74c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
@@ -57,7 +57,7 @@ public final class Q00279_TargetOfOpportunity extends Quest
public Q00279_TargetOfOpportunity()
{
- super(279, Q00279_TargetOfOpportunity.class.getSimpleName(), "Target of Opportunity");
+ super(279);
addStartNpc(JERIAN);
addTalkId(JERIAN);
addKillId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
index 6ffa5a154d..704e7a161b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
@@ -71,7 +71,7 @@ public final class Q00280_TheFoodChain extends Quest
public Q00280_TheFoodChain()
{
- super(280, Q00280_TheFoodChain.class.getSimpleName(), "The Food Chain");
+ super(280);
addStartNpc(BIXON);
addTalkId(BIXON);
addKillId(MONSTER_ITEM.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
index c9c213ab29..9700b72d93 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
@@ -75,7 +75,7 @@ public final class Q00281_HeadForTheHills extends Quest
public Q00281_HeadForTheHills()
{
- super(281, Q00281_HeadForTheHills.class.getSimpleName(), "Head for the Hills!");
+ super(281);
addStartNpc(MERCELA);
addTalkId(MERCELA);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
index 5de046c8f8..b05fabaaf6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
@@ -43,7 +43,7 @@ public final class Q00283_TheFewTheProudTheBrave extends Quest
public Q00283_TheFewTheProudTheBrave()
{
- super(283, Q00283_TheFewTheProudTheBrave.class.getSimpleName(), "The Few, The Proud, The Brave");
+ super(283);
addKillId(CRIMSON_SPIDER);
addStartNpc(PERWAN);
addTalkId(PERWAN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00284_MuertosFeather/Q00284_MuertosFeather.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00284_MuertosFeather/Q00284_MuertosFeather.java
index 2af98c4a4b..c8af48676f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00284_MuertosFeather/Q00284_MuertosFeather.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00284_MuertosFeather/Q00284_MuertosFeather.java
@@ -50,7 +50,7 @@ public final class Q00284_MuertosFeather extends Quest
public Q00284_MuertosFeather()
{
- super(284, Q00284_MuertosFeather.class.getSimpleName(), "Muertos Feather");
+ super(284);
addStartNpc(TREVOR);
addTalkId(TREVOR);
addKillId(MOB_DROP_CHANCE.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00286_FabulousFeathers/Q00286_FabulousFeathers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00286_FabulousFeathers/Q00286_FabulousFeathers.java
index 16bb2d6c41..5548322be9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00286_FabulousFeathers/Q00286_FabulousFeathers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00286_FabulousFeathers/Q00286_FabulousFeathers.java
@@ -50,7 +50,7 @@ public final class Q00286_FabulousFeathers extends Quest
public Q00286_FabulousFeathers()
{
- super(286, Q00286_FabulousFeathers.class.getSimpleName(), "Fabulous Feathers");
+ super(286);
addStartNpc(ERINU);
addTalkId(ERINU);
addKillId(MOB_DROP_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
index 62a5431e0a..f872669457 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
@@ -87,7 +87,7 @@ public class Q00287_FiguringItOut extends Quest
public Q00287_FiguringItOut()
{
- super(287, Q00287_FiguringItOut.class.getSimpleName(), "Figuring It Out!");
+ super(287);
addStartNpc(LAKI);
addTalkId(LAKI);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java
index 356f3066f3..3d6be2a565 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java
@@ -55,7 +55,7 @@ public class Q00288_HandleWithCare extends Quest
public Q00288_HandleWithCare()
{
- super(288, Q00288_HandleWithCare.class.getSimpleName(), "Handle With Care");
+ super(288);
addStartNpc(ANKUMI);
addTalkId(ANKUMI);
addKillId(SEER_UGOROS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
index 56f6b1c2d0..5fd76d706b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
@@ -158,7 +158,7 @@ public class Q00289_NoMoreSoupForYou extends Quest
public Q00289_NoMoreSoupForYou()
{
- super(289, Q00289_NoMoreSoupForYou.class.getSimpleName(), "No More Soup For You");
+ super(289);
addStartNpc(STAN);
addTalkId(STAN);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
index 948f6b9321..a26376b92e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
@@ -63,7 +63,7 @@ public class Q00290_ThreatRemoval extends Quest
public Q00290_ThreatRemoval()
{
- super(290, Q00290_ThreatRemoval.class.getSimpleName(), "Threat Removal");
+ super(290);
addStartNpc(PINAPS);
addTalkId(PINAPS);
addKillId(MOBS_TAG.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
index 588b3abcc2..430e259bbf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
@@ -46,7 +46,7 @@ public final class Q00291_RevengeOfTheRedbonnet extends Quest
public Q00291_RevengeOfTheRedbonnet()
{
- super(291, Q00291_RevengeOfTheRedbonnet.class.getSimpleName(), "Revenge of the Redbonnet");
+ super(291);
addStartNpc(MARYSE_REDBONNET);
addTalkId(MARYSE_REDBONNET);
addKillId(BLACK_WOLF);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
index 1b9f8ffbd6..38049a0a0c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
@@ -58,7 +58,7 @@ public final class Q00292_BrigandsSweep extends Quest
public Q00292_BrigandsSweep()
{
- super(292, Q00292_BrigandsSweep.class.getSimpleName(), "Brigands Sweep");
+ super(292);
addStartNpc(SPIRON);
addTalkId(SPIRON, BALANKI);
addKillId(MOB_ITEM_DROP.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
index 0b7ddbc2b0..16aa5ff316 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
@@ -52,7 +52,7 @@ public final class Q00293_TheHiddenVeins extends Quest
public Q00293_TheHiddenVeins()
{
- super(293, Q00293_TheHiddenVeins.class.getSimpleName(), "The Hidden Veins");
+ super(293);
addStartNpc(FILAUR);
addTalkId(FILAUR, CHICHIRIN);
addKillId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
index 660d516f19..ed03bc4a64 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
@@ -52,7 +52,7 @@ public final class Q00294_CovertBusiness extends Quest
public Q00294_CovertBusiness()
{
- super(294, Q00294_CovertBusiness.class.getSimpleName(), "Covert Business");
+ super(294);
addStartNpc(KEEF);
addTalkId(KEEF);
addKillId(MONSTER_DROP_CHANCE.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
index 51179c7b02..b72ae6da7c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java
@@ -41,7 +41,7 @@ public final class Q00295_DreamingOfTheSkies extends Quest
public Q00295_DreamingOfTheSkies()
{
- super(295, Q00295_DreamingOfTheSkies.class.getSimpleName(), "Dreaming of the Skies");
+ super(295);
addStartNpc(ARIN);
addTalkId(ARIN);
addKillId(MAGICAL_WEAVER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
index 302bc34a9d..9b0440d698 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java
@@ -48,7 +48,7 @@ public final class Q00296_TarantulasSpiderSilk extends Quest
public Q00296_TarantulasSpiderSilk()
{
- super(296, Q00296_TarantulasSpiderSilk.class.getSimpleName(), "Tarantula's Spider Silk");
+ super(296);
addStartNpc(TRADER_MION);
addTalkId(TRADER_MION, DEFENDER_NATHAN);
addKillId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
index 5bfdea4a10..5c6c0844f4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
@@ -42,7 +42,7 @@ public class Q00297_GatekeepersFavor extends Quest
public Q00297_GatekeepersFavor()
{
- super(297, Q00297_GatekeepersFavor.class.getSimpleName(), "Gatekeeper's Favor");
+ super(297);
addStartNpc(WIRPHY);
addTalkId(WIRPHY);
addKillId(WHINSTONE_GOLEM);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
index cfe3be19e7..16668b586e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00298_LizardmensConspiracy/Q00298_LizardmensConspiracy.java
@@ -53,7 +53,7 @@ public final class Q00298_LizardmensConspiracy extends Quest
public Q00298_LizardmensConspiracy()
{
- super(298, Q00298_LizardmensConspiracy.class.getSimpleName(), "Lizardmen's Conspiracy");
+ super(298);
addStartNpc(GUARD_PRAGA);
addTalkId(GUARD_PRAGA, MAGISTER_ROHMER);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java
index bd5b786ddf..edb66c11f1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00299_GatherIngredientsForPie/Q00299_GatherIngredientsForPie.java
@@ -61,7 +61,7 @@ public final class Q00299_GatherIngredientsForPie extends Quest
public Q00299_GatherIngredientsForPie()
{
- super(299, Q00299_GatherIngredientsForPie.class.getSimpleName(), "Gather Ingredients for Pie");
+ super(299);
addStartNpc(EMILLY);
addTalkId(LARS, BRIGHT, EMILLY);
addKillId(MONSTERS_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index 588c04af89..509155c8a1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -58,7 +58,7 @@ public final class Q00300_HuntingLetoLizardman extends Quest
public Q00300_HuntingLetoLizardman()
{
- super(300, Q00300_HuntingLetoLizardman.class.getSimpleName(), "Hunting Leto Lizardman");
+ super(300);
addStartNpc(RATH);
addTalkId(RATH);
addKillId(MOBS_SAC.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
index 2e0806d803..19c56df151 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
@@ -40,7 +40,7 @@ public final class Q00303_CollectArrowheads extends Quest
public Q00303_CollectArrowheads()
{
- super(303, Q00303_CollectArrowheads.class.getSimpleName(), "Collect Arrowheads");
+ super(303);
addStartNpc(MINIA);
addTalkId(MINIA);
addKillId(TUNATH_ORC_MARKSMAN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
index bb4f86a1f9..83e53572b1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
@@ -55,7 +55,7 @@ public final class Q00306_CrystalOfFireAndIce extends Quest
public Q00306_CrystalOfFireAndIce()
{
- super(306, Q00306_CrystalOfFireAndIce.class.getSimpleName(), "Crystals of Fire and Ice");
+ super(306);
addStartNpc(KATERINA);
addTalkId(KATERINA);
addKillId(MONSTER_DROPS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
index b652b0da87..e8daa8b4bc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
@@ -49,7 +49,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
public Q00307_ControlDeviceOfTheGiants()
{
- super(307, Q00307_ControlDeviceOfTheGiants.class.getSimpleName(), "Control Device of the Giants");
+ super(307);
addStartNpc(DROPH);
addTalkId(DROPH);
addKillId(GORGOLOS, LAST_TITAN_UTENUS, GIANT_MARPANAK, HEKATON_PRIME);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
index be65612612..1fefa4d97a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
@@ -93,7 +93,7 @@ public class Q00308_ReedFieldMaintenance extends Quest
public Q00308_ReedFieldMaintenance()
{
- super(308, Q00308_ReedFieldMaintenance.class.getSimpleName(), "Reed Field Maintenance");
+ super(308);
addStartNpc(KATENSA);
addTalkId(KATENSA);
addKillId(MUCROKIAN.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
index f1baf250fb..f6229baf46 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
@@ -93,7 +93,7 @@ public class Q00309_ForAGoodCause extends Quest
public Q00309_ForAGoodCause()
{
- super(309, Q00309_ForAGoodCause.class.getSimpleName(), "For A Good Cause");
+ super(309);
addStartNpc(ATRA);
addTalkId(ATRA);
addKillId(MUCROKIANS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
index ae733f7120..611061d221 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
@@ -66,7 +66,7 @@ public class Q00310_OnlyWhatRemains extends Quest
public Q00310_OnlyWhatRemains()
{
- super(310, Q00310_OnlyWhatRemains.class.getSimpleName(), "Only What Remains");
+ super(310);
addStartNpc(KINTAIJIN);
addTalkId(KINTAIJIN);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
index bf4a1d4b3d..266b7b3748 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
@@ -61,7 +61,7 @@ public final class Q00311_ExpulsionOfEvilSpirits extends Quest
public Q00311_ExpulsionOfEvilSpirits()
{
- super(311, Q00311_ExpulsionOfEvilSpirits.class.getSimpleName(), "Expulsion of Evil Spirits");
+ super(311);
addStartNpc(CHAIREN);
addTalkId(CHAIREN);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
index 1c80de5575..6caff31871 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
@@ -59,7 +59,7 @@ public class Q00312_TakeAdvantageOfTheCrisis extends Quest
public Q00312_TakeAdvantageOfTheCrisis()
{
- super(312, Q00312_TakeAdvantageOfTheCrisis.class.getSimpleName(), "Take Advantage of the Crisis!");
+ super(312);
addStartNpc(FILAUR);
addTalkId(FILAUR);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
index 0dce7f7bf5..58dc534f86 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
@@ -41,7 +41,7 @@ public final class Q00313_CollectSpores extends Quest
public Q00313_CollectSpores()
{
- super(313, Q00313_CollectSpores.class.getSimpleName(), "Collect Spores");
+ super(313);
addStartNpc(HERBIEL);
addTalkId(HERBIEL);
addKillId(SPORE_FUNGUS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
index 9d8c028c9d..aea2150144 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
@@ -54,7 +54,7 @@ public final class Q00316_DestroyPlagueCarriers extends Quest
public Q00316_DestroyPlagueCarriers()
{
- super(316, Q00316_DestroyPlagueCarriers.class.getSimpleName(), "Destroy Plague Carriers");
+ super(316);
addStartNpc(ELLENIA);
addTalkId(ELLENIA);
addAttackId(VAROOL_FOULCLAW);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
index b0fe0ea50b..2235e1e152 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
@@ -43,7 +43,7 @@ public final class Q00317_CatchTheWind extends Quest
public Q00317_CatchTheWind()
{
- super(317, Q00317_CatchTheWind.class.getSimpleName(), "Catch The Wind");
+ super(317);
addStartNpc(RIZRAELL);
addTalkId(RIZRAELL);
addKillId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
index a8b468cdf3..23944d6b9b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -46,7 +46,7 @@ public class Q00319_ScentOfDeath extends Quest
public Q00319_ScentOfDeath()
{
- super(319, Q00319_ScentOfDeath.class.getSimpleName(), "Scent of Death");
+ super(319);
addStartNpc(MINALESS);
addTalkId(MINALESS);
addKillId(MARSH_ZOMBIE, MARSH_ZOMBIE_LORD);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
index f23b03d98a..f7b7112300 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
@@ -46,7 +46,7 @@ public final class Q00320_BonesTellTheFuture extends Quest
public Q00320_BonesTellTheFuture()
{
- super(320, Q00320_BonesTellTheFuture.class.getSimpleName(), "Bones Tell The Future");
+ super(320);
addStartNpc(TETRACH_KAITAR);
addTalkId(TETRACH_KAITAR);
addKillId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
index c50d699feb..a4273d5eff 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -51,7 +51,7 @@ public class Q00324_SweetestVenom extends Quest
public Q00324_SweetestVenom()
{
- super(324, Q00324_SweetestVenom.class.getSimpleName(), "Sweetest Venom");
+ super(324);
addStartNpc(ASTARON);
addTalkId(ASTARON);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
index 80d6cc6a6c..4e8f721133 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
@@ -70,7 +70,7 @@ public final class Q00325_GrimCollector extends Quest
public Q00325_GrimCollector()
{
- super(325, Q00325_GrimCollector.class.getSimpleName(), "Grim Collector");
+ super(325);
addStartNpc(GUARD_CURTIZ);
addTalkId(GUARD_CURTIZ, VARSAK, SAMED);
addKillId(MONSTER_DROPS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
index b6a7448894..8226086942 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -60,7 +60,7 @@ public final class Q00326_VanquishRemnants extends Quest
public Q00326_VanquishRemnants()
{
- super(326, Q00326_VanquishRemnants.class.getSimpleName(), "Vanquish Remnants");
+ super(326);
addStartNpc(LEOPOLD);
addTalkId(LEOPOLD);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
index 4afe98acb5..3c283b78e0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -97,7 +97,7 @@ public final class Q00327_RecoverTheFarmland extends Quest
public Q00327_RecoverTheFarmland()
{
- super(327, Q00327_RecoverTheFarmland.class.getSimpleName(), "Recover the Farmland");
+ super(327);
addStartNpc(LEIKAN, PIOTUR);
addTalkId(LEIKAN, PIOTUR, IRIS, ASHA, NESTLE);
addKillId(TUREK_ORK_WARLORD, TUREK_ORK_ARCHER, TUREK_ORK_SKIRMISHER, TUREK_ORK_SUPPLIER, TUREK_ORK_FOOTMAN, TUREK_ORK_SENTINEL, TUREK_ORK_SHAMAN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
index 7cd54a885f..2bb0e25fe8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -61,7 +61,7 @@ public class Q00328_SenseForBusiness extends Quest
public Q00328_SenseForBusiness()
{
- super(328, Q00328_SenseForBusiness.class.getSimpleName(), "Sense for Business");
+ super(328);
addStartNpc(SARIEN);
addTalkId(SARIEN);
addKillId(MONSTER_EYES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index c4ad40d506..0706a71e9a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -52,7 +52,7 @@ public final class Q00329_CuriosityOfADwarf extends Quest
public Q00329_CuriosityOfADwarf()
{
- super(329, Q00329_CuriosityOfADwarf.class.getSimpleName(), "Curiosity Of A Dwarf");
+ super(329);
addStartNpc(TRADER_ROLENTO);
addTalkId(TRADER_ROLENTO);
addKillId(MONSTER_DROPS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
index e1abcd7383..4aa8bb01b8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java
@@ -91,7 +91,7 @@ public final class Q00330_AdeptOfTaste extends Quest
public Q00330_AdeptOfTaste()
{
- super(330, Q00330_AdeptOfTaste.class.getSimpleName(), "Adept Of Taste");
+ super(330);
addStartNpc(JONAS);
addTalkId(JONAS, ACCESSORY_MERCHANT_SONIA, PRIESTESS_GLYVKA, MAGISTER_ROLLANT, GUARD_JACOB, GROCER_PANO, MAGISTER_MIRIEN);
addKillId(HOBGOBLIN, MANDRAGORA_SPROUT1, MANDRAGORA_SAPLING, MANDRAGORA_BLOSSOM, BLOODY_BEE, MANDRAGORA_SPROUT2, GRAY_ANT, GIANT_CRIMSON_ANT, STINGER_WASP, MONSTER_EYE_SEARCHER, MONSTER_EYE_GAZER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
index 254429855d..c15113f089 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -56,7 +56,7 @@ public class Q00331_ArrowOfVengeance extends Quest
public Q00331_ArrowOfVengeance()
{
- super(331, Q00331_ArrowOfVengeance.class.getSimpleName(), "Arrow for Vengeance");
+ super(331);
addStartNpc(BELTON);
addTalkId(BELTON);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
index 3961b6bbdd..58b676d48d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java
@@ -111,7 +111,7 @@ public final class Q00333_HuntOfTheBlackLion extends Quest
public Q00333_HuntOfTheBlackLion()
{
- super(333, Q00333_HuntOfTheBlackLion.class.getSimpleName(), "Hunt Of The Black Lion");
+ super(333);
addStartNpc(MERCENARY_CAPTAIN_SOPHYA);
addTalkId(MERCENARY_CAPTAIN_SOPHYA, ABYSSAL_CELEBRANT_UNDRIAS, BLACKSMITH_RUPIO, IRON_GATES_LOCKIRIN, MERCENARY_REEDFOOT, GUILDSMAN_MORGON);
addKillId(MARSH_STAKATO, NEER_CRAWLER, SPECTER, SORROW_MAIDEN, NEER_CRAWLER_BERSERKER, STRAIN, GHOUL, OL_MAHUM_GUERILLA, OL_MAHUM_RAIDER, OL_MAHUM_MARKSMAN, OL_MAHUM_SERGEANT, OL_MAHUM_CAPTAIN, MARSH_STAKATO_WORKER, MARSH_STAKATO_SOLDIER, MARSH_STAKATO_DRONE, DELU_LIZARDMAN, DELU_LIZARDMAN_SCOUT, DELU_LIZARDMAN_WARRIOR, DELU_LIZARDMAN_HEADHUNTER, MARSH_STAKATO_MARQUESS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
index 22ae4e6e61..9c01690a5d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
@@ -106,7 +106,7 @@ public final class Q00334_TheWishingPotion extends Quest
// Reward
public Q00334_TheWishingPotion()
{
- super(334, Q00334_TheWishingPotion.class.getSimpleName(), "The Wishing Potion");
+ super(334);
addStartNpc(ALCHEMIST_MATILD);
addTalkId(ALCHEMIST_MATILD, TORAI, FAIRY_RUPINA, WISDOM_CHEST);
addKillId(WHISPERING_WIND, ANT_SOLDIER, ANT_WARRIOR_CAPTAIN, SILENOS, TYRANT, TYRANT_KINGPIN, AMBER_BASILISK, MIST_HORROR_RIPPER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java
index 8624e549b2..088b84909a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java
@@ -420,7 +420,7 @@ public class Q00335_TheSongOfTheHunter extends Quest
public Q00335_TheSongOfTheHunter()
{
- super(335, Q00335_TheSongOfTheHunter.class.getSimpleName(), "The Song of the Hunter");
+ super(335);
addStartNpc(GREY);
addTalkId(GREY, TOR, CYBELLIN);
addKillId(BREKA_ORC_SHAMAN, BREKA_ORC_WARRIOR, GUARDIAN_BASILISK, FETTERED_SOUL, WINDSUS, GRANDIS, GIANT_FUNGUS, GIANT_MONSTEREYE, DIRE_WYRM, ROTTING_TREE, TRISALIM_SPIDER, TRISALIM_TARANTULA, SPORE_ZOMBIE, MANASHEN_GARGOYLE, ENCHANTED_STONE_GOLEM, ENCHANTED_GARGOYLE, TARLK_BUGBEAR_WARRIOR, LETO_LIZARDMAN_ARCHER, LETO_LIZARDMAN_SOLDIER, LETO_LIZARDMAN_SHAMAN, LETO_LIZARDMAN_OVERLORD, TIMAK_ORC_WARRIOR, TIMAK_ORC_OVERLORD, FLINE, LIELE, VALLEY_TREANT, SATYR, UNICORN, FOREST_RUNNER, VALLEY_TREANT_ELDER, SATYR_ELDER, UNICORN_ELDER, KARUL_BUGBEAR, TAMLIN_ORC, TAMLIN_ORC_ARCHER, KRONBE_SPIDER, TAIK_ORC_ARCHER, TAIK_ORC_WARRIOR, TAIK_ORC_SHAMAN, TAIK_ORC_CAPTAIN, MIRROR, HARIT_LIZARDMAN_GRUNT, HARIT_LIZARDMAN_ARCHER, HARIT_LIZARDMAN_WARRIOR, GRAVE_WANDERER, ARCHER_OF_GREED, HATAR_RATMAN_THIEF, HATAR_RATMAN_BOSS, DEPRIVE, FARCRAN, TAIRIM, JUDGE_OF_MARSH, VANOR_SILENOS_GRUNT, VANOR_SILENOS_SCOUT, VANOR_SILENOS_WARRIOR, BREKA_OVERLORD_HAKA, BREKA_OVERLORD_JAKA, BREKA_OVERLORD_MARKA, WINDSUS_ALEPH, TARLK_RAIDER_ATHU, TARLK_RAIDER_LANKA, TARLK_RAIDER_TRISKA, TARLK_RAIDER_MOTURA, TARLK_RAIDER_KALATH, GREMLIN_FILCHER, LETO_SHAMAN_KETZ, LETO_CHIEF_NARAK, TIMAK_RAIDER_KAIKEE, TIMAK_OVERLORD_OKUN, GOK_MAGOK, TAIK_OVERLORD_KAKRAN, HATAR_CHIEFTAIN_KUBEL, VANOR_ELDER_KERUNOS, KARUL_CHIEF_OROOTO, VANOR_SILENOS_CHIEFTAIN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
index 0b4110be77..6611c9238f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
@@ -151,7 +151,7 @@ public final class Q00336_CoinsOfMagic extends Quest
public Q00336_CoinsOfMagic()
{
- super(336, Q00336_CoinsOfMagic.class.getSimpleName(), "Coins of Magic");
+ super(336);
addStartNpc(WAREHOUSE_KEEPER_SORINT);
addTalkId(PANO, COLLOB, RAPIN, HAGGER, STAN, RESEARCHER_LORAIN, BLACKSMITH_DUNING, MAGISTER_PAGE, UNION_PRESIDENT_BERNARD, HEAD_BLACKSMITH_FERRIS);
addKillId(HEADLESS_KNIGHT, OEL_MAHUM, SHACKLE, ROYAL_CAVE_SERVANT, MALRUK_SUCCUBUS_TUREN, ROYAL_CAVE_SERVANT_HOLD, SHACKLE_HOLD, HEADLESS_KNIGHT_HOLD, H_MALRUK_SUCCUBUS_TUREN, BYFOOT, BYFOOT_SIGEL, TARLK_BUGBEAR_BOSS, OEL_MAHUM_WARRIOR, OEL_MAHUM_WITCH_DOCTOR, TIMAK_ORC, TIMAK_ORC_ARCHER, TIMAK_ORC_SOLDIER, TIMAK_ORC_SHAMAN, LAKIN, HARIT_LIZARDMAN_SHAMAN, HARIT_LIZARDM_MATRIARCH, HATAR_HANISHEE, DOOM_KNIGHT, PUNISHMENT_OF_UNDEAD, VANOR_SILENOS_SHAMAN, HUNGRY_CORPSE, NIHIL_INVADER, DARK_GUARD, BLOODY_GHOST, FLOAT_OF_GRAVE, DOOM_SERVANT, DOOM_ARCHER, KUKABURO, KUKABURO_A, KUKABURO_B, ANTELOPE, ANTELOPE_A, ANTELOPE_B, BANDERSNATCH, BANDERSNATCH_A, BANDERSNATCH_B, BUFFALO, BUFFALO_A, BUFFALO_B, BRILLIANT_CLAW, BRILLIANT_CLAW_1, BRILLIANT_WISDOM, BRILLIANT_VENGEANCE, BRILLIANT_VENGEANCE_1, BRILLIANT_ANGUISH, BRILLIANT_ANGUISH_1);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
index 34fb7d047f..be24553685 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java
@@ -82,7 +82,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest
public Q00337_AudienceWithTheLandDragon()
{
- super(337, Q00337_AudienceWithTheLandDragon.class.getSimpleName(), "Audience With The Land Dragon");
+ super(337);
addStartNpc(GABRIELLE);
addTalkId(GABRIELLE, WAREHOUSE_CHIEF_MOKE, BLACKSMITH_HELTON, PREFECT_CHAKIRIS, MAGISTER_KAIENA, ANTHARAS_WATCHMAN_GILMORE, ANTHARAS_WATCHMAN_THEODRIC, MASTER_KENDRA, HIGH_PRIEST_ORVEN);
addKillId(BLOOD_QUEEN, CAVE_MAIDEN, CAVE_KEEPER, CAVE_KEEPER_HOLD, CAVE_MAIDEN_HOLD, HARIT_LIZARDMAN_SHAMAN, HARIT_LIZARDMAN_MATRIARCH, HAMRUT, KRANROT, MARSH_STALKER, MARSH_DRAKE, ABYSSAL_JEWEL_1, ABYSSAL_JEWEL_2, ABYSSAL_JEWEL_3, JEWEL_GUARDIAN_MARA, JEWEL_GUARDIAN_MUSFEL, JEWEL_GUARDIAN_PYTON, GHOST_OF_OFFERING, HARIT_LIZARDMAN_ZEALOT);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
index fcc45c2611..c7930c1a09 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
@@ -44,7 +44,7 @@ public class Q00338_AlligatorHunter extends Quest
public Q00338_AlligatorHunter()
{
- super(338, Q00338_AlligatorHunter.class.getSimpleName(), "Alligator Hunter");
+ super(338);
addStartNpc(ENVERUN);
addTalkId(ENVERUN);
addKillId(ALLIGATOR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
index 7564ade2be..84f857bc64 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
@@ -53,7 +53,7 @@ public final class Q00340_SubjugationOfLizardmen extends Quest
public Q00340_SubjugationOfLizardmen()
{
- super(340, Q00340_SubjugationOfLizardmen.class.getSimpleName(), "Subjugation Of Lizardmen");
+ super(340);
addStartNpc(GUARD_WEISZ);
addTalkId(GUARD_WEISZ, HIGH_PRIESTESS_LEVIAN, PRIEST_ADONIUS, CHEST_OF_BIFRONS);
addKillId(FELIM_LIZARDMAN, FELIM_LIZARDMAN_SCOUT, FELIM_LIZARDMAN_WARRIOR, LANGK_LIZARDMAN_WARRIOR, LANGK_LIZARDMAN_SCOUT, LANGK_LIZARDMAN, SERPENT_DEMON_BIFRONS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
index eb795538f5..fbb4ffabdf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
@@ -52,7 +52,7 @@ public class Q00341_HuntingForWildBeasts extends Quest
public Q00341_HuntingForWildBeasts()
{
- super(341, Q00341_HuntingForWildBeasts.class.getSimpleName(), "Hunting for Wild Beasts");
+ super(341);
addStartNpc(PANO);
addTalkId(PANO);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
index 91a3c4d144..88af6c1598 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java
@@ -60,7 +60,7 @@ public final class Q00343_UnderTheShadowOfTheIvoryTower extends Quest
public Q00343_UnderTheShadowOfTheIvoryTower()
{
- super(343, Q00343_UnderTheShadowOfTheIvoryTower.class.getSimpleName(), "Under The Shadow Of The Ivory Tower");
+ super(343);
addStartNpc(MAGIC_TRADER_CEMA);
addTalkId(MAGIC_TRADER_CEMA, LICH_KING_ICARUS, COLLECTOR_MARSHA, COLLECTOR_TRUMPIN);
addKillId(MANASHEN_GARGOYLE, ENCHANTED_MONSTEREYE, ENCHANTED_STONE_GOLEM, ENCHANTED_IRON_GOLEM);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
index 5f406e7877..98088c6790 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
@@ -75,7 +75,7 @@ public final class Q00344_1000YearsTheEndOfLamentation extends Quest
public Q00344_1000YearsTheEndOfLamentation()
{
- super(344, Q00344_1000YearsTheEndOfLamentation.class.getSimpleName(), "1000 years, the End of Lamentation");
+ super(344);
addStartNpc(GILMORE);
addTalkId(KAIEN, GARVARENTZ, GILMORE, RODEMAI, ORVEN);
addKillId(MONSTER_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
index ca3c804d3d..e01a885eff 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java
@@ -53,7 +53,7 @@ public final class Q00345_MethodToRaiseTheDead extends Quest
public Q00345_MethodToRaiseTheDead()
{
- super(345, Q00345_MethodToRaiseTheDead.class.getSimpleName(), "Method to Raise the Dead");
+ super(345);
addStartNpc(DOROTHY);
addTalkId(DOROTHY, ORPHEUS, MEDIUM_JAR, XENOVIA);
addKillId(CROKIAN, CROKIAN_WARRIOR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java
index a8fd602041..f4c71ba00a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00347_GoGetTheCalculator/Q00347_GoGetTheCalculator.java
@@ -47,7 +47,7 @@ public final class Q00347_GoGetTheCalculator extends Quest
public Q00347_GoGetTheCalculator()
{
- super(347, Q00347_GoGetTheCalculator.class.getSimpleName(), "Go Get the Calculator");
+ super(347);
addStartNpc(BRUNON);
addTalkId(BRUNON, SILVERA, SPIRON, BALANKI);
addKillId(GEMSTONE_BEAST);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
index bfa6a812df..7c8b70180a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
@@ -107,7 +107,7 @@ public class Q00348_AnArrogantSearch extends Quest
public Q00348_AnArrogantSearch()
{
- super(348, Q00348_AnArrogantSearch.class.getSimpleName(), "An Arrogant Search");
+ super(348);
addAttackId(ARK_GUARDIAN_ELBEROTH, ARK_GUARDIAN_SHADOWFANG, ANGEL_KILLER, PLATINUM_TRIBE_SHAMAN, PLATINUM_TRIBE_OVERLORD);
addSpawnId(ARK_GUARDIAN_ELBEROTH, ARK_GUARDIAN_SHADOWFANG, ANGEL_KILLER);
addStartNpc(HANELLIN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
index 9d761c5e40..6cb4891196 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
@@ -135,7 +135,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
public Q00350_EnhanceYourWeapon()
{
- super(350, Q00350_EnhanceYourWeapon.class.getSimpleName(), "Enhance Your Weapon");
+ super(350);
addStartNpc(STARTING_NPCS);
addTalkId(STARTING_NPCS);
load();
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
index 61c18e6a79..cfcf1e5d62 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
@@ -60,7 +60,7 @@ public final class Q00351_BlackSwan extends Quest
public Q00351_BlackSwan()
{
- super(351, Q00351_BlackSwan.class.getSimpleName(), "Black Swan");
+ super(351);
addStartNpc(GOSTA, ROMAN);
addTalkId(GOSTA, IASON_HEINE, ROMAN);
addKillId(TASABA_LIZARDMAN1, TASABA_LIZARDMAN_SHAMAN1, TASABA_LIZARDMAN2, TASABA_LIZARDMAN_SHAMAN2);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java
index 2f71a06434..192cafe47f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00352_HelpRoodRaiseANewPet/Q00352_HelpRoodRaiseANewPet.java
@@ -71,7 +71,7 @@ public final class Q00352_HelpRoodRaiseANewPet extends Quest
public Q00352_HelpRoodRaiseANewPet()
{
- super(352, Q00352_HelpRoodRaiseANewPet.class.getSimpleName(), "Help Rood Raise A New Pet!");
+ super(352);
addStartNpc(ROOD);
addTalkId(ROOD);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index 5874f15b1f..89232e6a6d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -53,7 +53,7 @@ public final class Q00354_ConquestOfAlligatorIsland extends Quest
public Q00354_ConquestOfAlligatorIsland()
{
- super(354, Q00354_ConquestOfAlligatorIsland.class.getSimpleName(), "Conquest of Alligator Island");
+ super(354);
addStartNpc(KLUCK);
addTalkId(KLUCK);
addKillId(MOB1.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
index 131c0dab21..874011a815 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java
@@ -77,7 +77,7 @@ public final class Q00355_FamilyHonor extends Quest
public Q00355_FamilyHonor()
{
- super(355, Q00355_FamilyHonor.class.getSimpleName(), "Family Honor");
+ super(355);
addStartNpc(GALIBREDO);
addTalkId(GALIBREDO, PATRIN);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index c7dc1c1f99..31ef57ca9a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -51,7 +51,7 @@ public final class Q00356_DigUpTheSeaOfSpores extends Quest
public Q00356_DigUpTheSeaOfSpores()
{
- super(356, Q00356_DigUpTheSeaOfSpores.class.getSimpleName(), "Dig Up the Sea of Spores!");
+ super(356);
addStartNpc(GAUEN);
addTalkId(GAUEN);
addKillId(ROTTING_TREE, SPORE_ZOMBIE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
index f4c30a96c3..65ee67ff46 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java
@@ -47,7 +47,7 @@ public final class Q00357_WarehouseKeepersAmbition extends Quest
public Q00357_WarehouseKeepersAmbition()
{
- super(357, Q00357_WarehouseKeepersAmbition.class.getSimpleName(), "Warehouse Keeper's Ambition");
+ super(357);
addStartNpc(SILVA);
addTalkId(SILVA);
addKillId(DROP_DATA.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
index 52bf62d69f..175880756c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
@@ -59,7 +59,7 @@ public final class Q00358_IllegitimateChildOfTheGoddess extends Quest
public Q00358_IllegitimateChildOfTheGoddess()
{
- super(358, Q00358_IllegitimateChildOfTheGoddess.class.getSimpleName(), "Illegitimate Child of the Goddess");
+ super(358);
addStartNpc(OLTRAN);
addTalkId(OLTRAN);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
index c4cb22ba06..3d2d468353 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
@@ -60,7 +60,7 @@ public final class Q00359_ForASleeplessDeadman extends Quest
public Q00359_ForASleeplessDeadman()
{
- super(359, Q00359_ForASleeplessDeadman.class.getSimpleName(), "For a Sleepless Deadman");
+ super(359);
addStartNpc(ORVEN);
addTalkId(ORVEN);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
index eef5da9b03..f204efa994 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -52,7 +52,7 @@ public final class Q00360_PlunderTheirSupplies extends Quest
public Q00360_PlunderTheirSupplies()
{
- super(360, Q00360_PlunderTheirSupplies.class.getSimpleName(), "Plunder Their Supplies");
+ super(360);
addStartNpc(COLEMAN);
addTalkId(COLEMAN);
addKillId(MONSTER_DROP_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
index 101a55b2de..127129da8b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
@@ -42,7 +42,7 @@ public final class Q00362_BardsMandolin extends Quest
public Q00362_BardsMandolin()
{
- super(362, Q00362_BardsMandolin.class.getSimpleName(), "Bard's Mandolin");
+ super(362);
addStartNpc(SWAN);
addTalkId(SWAN, GALION, WOODROW, NANARIN);
registerQuestItems(SWANS_FLUTE, SWANS_LETTER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
index e1a0dc5293..afad3b7667 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
@@ -47,7 +47,7 @@ public final class Q00363_SorrowfulSoundOfFlute extends Quest
public Q00363_SorrowfulSoundOfFlute()
{
- super(363, Q00363_SorrowfulSoundOfFlute.class.getSimpleName(), "Sorrowful Sound of Flute");
+ super(363);
addStartNpc(NANARIN);
addTalkId(NANARIN, POITAN, RANSPO, ALDO, HOLVAS, OPIX, BARBADO);
registerQuestItems(EVENT_CLOTHES, NANARINS_FLUTE, SABRINS_BLACK_BEER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
index a532125edb..89ced04f75 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java
@@ -47,7 +47,7 @@ public final class Q00364_JovialAccordion extends Quest
public Q00364_JovialAccordion()
{
- super(364, Q00364_JovialAccordion.class.getSimpleName(), "Jovial Accordion");
+ super(364);
addStartNpc(BARBADO);
addTalkId(BARBADO, BEER_CHEST, CLOTH_CHEST, SABRIN, XABER, SWAN);
registerQuestItems(STOLEN_BLACK_BEER, STOLEN_EVENT_CLOTHES, CLOTHES_CHEST_KEY, BEER_CHEST_KEY);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
index 9053cd3588..b2a16ad0a0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
@@ -65,7 +65,7 @@ public final class Q00365_DevilsLegacy extends Quest
public Q00365_DevilsLegacy()
{
- super(365, Q00365_DevilsLegacy.class.getSimpleName(), "Devil's Legacy");
+ super(365);
addStartNpc(RANDOLF);
addTalkId(RANDOLF, COLLOB);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java
index 8955db2efd..3dbdb84fec 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00366_SilverHairedShaman/Q00366_SilverHairedShaman.java
@@ -47,7 +47,7 @@ public final class Q00366_SilverHairedShaman extends Quest
public Q00366_SilverHairedShaman()
{
- super(366, Q00366_SilverHairedShaman.class.getSimpleName(), "Silver Haired Shaman");
+ super(366);
addStartNpc(DIETER);
addTalkId(DIETER);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
index 9f40a2e024..12702dcf53 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
@@ -48,7 +48,7 @@ public final class Q00367_ElectrifyingRecharge extends Quest
public Q00367_ElectrifyingRecharge()
{
- super(367, Q00367_ElectrifyingRecharge.class.getSimpleName(), "Electrifying Recharge!");
+ super(367);
addStartNpc(LORAIN);
addTalkId(LORAIN);
addAttackId(CATHEROK);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
index 1b20a33343..3681f85de9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
@@ -48,7 +48,7 @@ public final class Q00368_TrespassingIntoTheHolyGround extends Quest
public Q00368_TrespassingIntoTheHolyGround()
{
- super(368, Q00368_TrespassingIntoTheHolyGround.class.getSimpleName(), "Trespassing into the Holy Ground");
+ super(368);
addStartNpc(RESTINA);
addTalkId(RESTINA);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
index ef41cb3cd7..fa07d6bc04 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java
@@ -52,7 +52,7 @@ public final class Q00369_CollectorOfJewels extends Quest
public Q00369_CollectorOfJewels()
{
- super(369, Q00369_CollectorOfJewels.class.getSimpleName(), "Collector of Jewels");
+ super(369);
addStartNpc(NELL);
addTalkId(NELL);
addKillId(MOBS_DROP_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
index 721ee2bf3c..0267429ba2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
@@ -55,7 +55,7 @@ public final class Q00370_AnElderSowsSeeds extends Quest
public Q00370_AnElderSowsSeeds()
{
- super(370, Q00370_AnElderSowsSeeds.class.getSimpleName(), "An Elder Sows Seeds");
+ super(370);
addStartNpc(CASIAN);
addTalkId(CASIAN);
addKillId(MOBS1.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
index 8ab70fc4c8..911c9f03f7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java
@@ -76,7 +76,7 @@ public final class Q00371_ShrieksOfGhosts extends Quest
public Q00371_ShrieksOfGhosts()
{
- super(371, Q00371_ShrieksOfGhosts.class.getSimpleName(), "Shrieks of Ghosts");
+ super(371);
addStartNpc(REVA);
addTalkId(REVA, PATRIN);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
index b83293a22a..b8c50fbcfd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java
@@ -118,7 +118,7 @@ public final class Q00372_LegacyOfInsolence extends Quest
public Q00372_LegacyOfInsolence()
{
- super(372, Q00372_LegacyOfInsolence.class.getSimpleName(), "Legacy Of Insolence");
+ super(372);
addStartNpc(WAREHOUSE_KEEPER_WALDERAL);
addTalkId(WAREHOUSE_KEEPER_WALDERAL, TRADER_HOLLY, MAGISTER_DESMOND, ANTIQUE_DEALER_PATRIN, CLAUDIA_ATHEBALDT);
addKillId(MONSTER_REWARDS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
index 529cc904e7..6f3ade1e26 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
@@ -148,7 +148,7 @@ public final class Q00373_SupplierOfReagents extends Quest
public Q00373_SupplierOfReagents()
{
- super(373, Q00373_SupplierOfReagents.class.getSimpleName(), "Supplier of Reagents");
+ super(373);
addStartNpc(WESLEY);
addKillId(HALLATE_GUARDIAN, HALLATE_MAID, HAMES_ORC_SHAMAN, LAVA_WYRM, CRENDION, PLATINUM_GUARDIAN_SHAMAN, PLATINUM_TRIBE_SHAMAN);
addTalkId(WESLEY, ALCHEMIST_MIXING_URN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
index 63cee314cc..5af24c7824 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
@@ -56,7 +56,7 @@ public class Q00376_ExplorationOfTheGiantsCavePart1 extends Quest
public Q00376_ExplorationOfTheGiantsCavePart1()
{
- super(376, Q00376_ExplorationOfTheGiantsCavePart1.class.getSimpleName(), "Exploration of the Giants' Cave - Part 1");
+ super(376);
addStartNpc(SOBLING);
addTalkId(SOBLING);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
index c7b469c537..5fceee7821 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
@@ -59,7 +59,7 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest
public Q00377_ExplorationOfTheGiantsCavePart2()
{
- super(377, Q00377_ExplorationOfTheGiantsCavePart2.class.getSimpleName(), "Exploration of the Giants' Cave - Part 2");
+ super(377);
addStartNpc(SOBLING);
addTalkId(SOBLING);
addKillId(MOBS1.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java
index 1bc9ce6381..6db3cb39e4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00378_GrandFeast/Q00378_GrandFeast.java
@@ -51,7 +51,7 @@ public final class Q00378_GrandFeast extends Quest
public Q00378_GrandFeast()
{
- super(378, Q00378_GrandFeast.class.getSimpleName(), "Grand Feast");
+ super(378);
addStartNpc(RANSPO);
addTalkId(RANSPO);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java
index 0d49adbb64..9013b462ae 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java
@@ -45,7 +45,7 @@ public final class Q00379_FantasyWine extends Quest
public Q00379_FantasyWine()
{
- super(379, Q00379_FantasyWine.class.getSimpleName(), "Fantasy Wine");
+ super(379);
addStartNpc(HARLAN);
addTalkId(HARLAN);
addKillId(ENKU_ORC_CHAMPION, ENKU_ORC_SHAMAN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
index d057b689e8..8d7fc8c4d4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
@@ -54,7 +54,7 @@ public final class Q00380_BringOutTheFlavorOfIngredients extends Quest
public Q00380_BringOutTheFlavorOfIngredients()
{
- super(380, Q00380_BringOutTheFlavorOfIngredients.class.getSimpleName(), "Bring Out the Flavor of Ingredients!");
+ super(380);
addStartNpc(ROLLAND);
addTalkId(ROLLAND);
addKillId(MONSTER_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
index 6ae5bc6d23..14bded8414 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java
@@ -47,7 +47,7 @@ public final class Q00381_LetsBecomeARoyalMember extends Quest
public Q00381_LetsBecomeARoyalMember()
{
- super(381, Q00381_LetsBecomeARoyalMember.class.getSimpleName(), "Let's Become a Royal Member!");
+ super(381);
addStartNpc(SORINT);
addTalkId(SORINT, SANDRA);
addKillId(ANCIENT_GARGOYLE, FALLEN_CHIEF_VERGUS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
index 9e8bf64766..2ebb31064d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java
@@ -59,7 +59,7 @@ public final class Q00382_KailsMagicCoin extends Quest
public Q00382_KailsMagicCoin()
{
- super(382, Q00382_KailsMagicCoin.class.getSimpleName(), "Kail's Magic Coin");
+ super(382);
addStartNpc(VERGARA);
addTalkId(VERGARA);
addKillId(FALLEN_ORC, FALLEN_ORC_ARCHER, FALLEN_ORC_SHAMAN, FALLEN_ORC_CAPTAIN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
index ae1ca90224..87c379f187 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
@@ -67,7 +67,7 @@ public final class Q00383_TreasureHunt extends Quest
public Q00383_TreasureHunt()
{
- super(383, Q00383_TreasureHunt.class.getSimpleName(), "Treasure Hunt");
+ super(383);
addStartNpc(ESPEN);
addTalkId(ESPEN, PIRATES_CHEST);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
index cad7782846..5d9c5e8b1b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
@@ -89,7 +89,7 @@ public final class Q00384_WarehouseKeepersPastime extends Quest
public Q00384_WarehouseKeepersPastime()
{
- super(384, Q00384_WarehouseKeepersPastime.class.getSimpleName(), "Warehouse Keeper's Pastime");
+ super(384);
addStartNpc(CLIFF);
addTalkId(CLIFF, WAREHOUSE_CHIEF_BAXT);
addKillId(WAREHOUSE_CHIEF_BAXT, DUST_WIND, INNERSEN, CLIFF, CONGERER, CARINKAIN, CONNABI, HUNTER_GARGOYLE, NIGHTMARE_GUIDE, DRAGON_BEARER_WARRIOR, DRAGON_BEARER_CHIEF, DUST_WIND_HOLD, WEIRD_DRAKE, THUNDER_WYRM_HOLD, CADEINE, CONGERER_LORD, DRAGON_BEARER_ARCHER, NIGHTMARE_LORD, SANHIDRO, GIANT_MONSTEREYE, BARTAL, HUNTER_GARGOYLE_HOLD, ROT_GOLEM, GRAVE_GUARD, TULBEN, NIGHTMARE_KEEPER, LUMINUN, THUNDER_WYRM);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java
index de3f2889cf..939c2804b1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java
@@ -97,7 +97,7 @@ public final class Q00385_YokeOfThePast extends Quest
public Q00385_YokeOfThePast()
{
- super(385, Q00385_YokeOfThePast.class.getSimpleName(), "Yoke of the Past");
+ super(385);
addStartNpc(ZIGGURATS);
addTalkId(ZIGGURATS);
addKillId(MONSTER_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index d53a83eb89..8e96c264e3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -102,7 +102,7 @@ public final class Q00386_StolenDignity extends Quest
public Q00386_StolenDignity()
{
- super(386, Q00386_StolenDignity.class.getSimpleName(), "Stolen Dignity");
+ super(386);
addStartNpc(WAREHOUSE_KEEPER_ROMP);
addTalkId(WAREHOUSE_KEEPER_ROMP);
addKillId(CRIMSON_DRAKE, KADIOS, HUNGRY_CORPSE, PAST_KNIGHT, BLADE_DEATH, DARK_GUARD, BLOODY_GHOST, BLOODY_LORD, PAST_CREATURE, GIANT_SHADOW, ANCIENTS_SOLDIER, ANCIENTS_WARRIOR, SPITE_SOUL_LEADER, SPITE_SOUL_WIZARD, WRECKED_ARCHER, FLOAT_OF_GRAVE, GRAVE_PREDATOR, FALLEN_ORC_SHAMAN, SHARP_TALON_TIGER, GLOW_WISP, MARSH_PREDATOR, HAMES_ORC_SNIPER, CURSED_GUARDIAN, HAMES_ORC_CHIEFTAIN, FALLEN_ORC_SHAMAN_TRANS, SHARP_TALON_TIGER_TRANS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
index 5bec02986b..d6d600ec30 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
@@ -55,7 +55,7 @@ public final class Q00401_PathOfTheWarrior extends Quest
public Q00401_PathOfTheWarrior()
{
- super(401, Q00401_PathOfTheWarrior.class.getSimpleName(), "Path Of The Warrior");
+ super(401);
addStartNpc(MASTER_AURON);
addTalkId(MASTER_AURON, TRADER_SIMPLON);
addAttackId(VENOMOUS_SPIDERS, ARACHNID_TRACKER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
index 88bbabd7bb..b2219b8d2f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
@@ -81,7 +81,7 @@ public final class Q00402_PathOfTheHumanKnight extends Quest
public Q00402_PathOfTheHumanKnight()
{
- super(402, Q00402_PathOfTheHumanKnight.class.getSimpleName(), "Path Of The Human Knight");
+ super(402);
addStartNpc(SIR_KLAUS_VASPER);
addTalkId(SIR_KLAUS_VASPER, HIGH_PRIEST_BIOTIN, LEVIAN, HIGH_PRIEST_RAYMOND, CAPTAIN_GILBERT, CAPTAIN_BATHIS, CAPTAIN_BEZIQUE, SIR_ARON_TANFORD);
addKillId(LANGK_LIZARDMAN_WARRIOR, LANGK_LIZARDMAN_SCOUT, LANGK_LIZARDMAN, VENOMOUS_SPIDER, ARACHNID_TRACKER, ARACHNID_PREDATOR, GIANT_SPIDER, TALON_SPIDER, BLADE_SPIDER, SILENT_HORROR, BUGBEAR_RAIDER, UNDEAD_PRIEST);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
index 18dfee8b88..de1e35c1c7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
@@ -81,7 +81,7 @@ public final class Q00403_PathOfTheRogue extends Quest
public Q00403_PathOfTheRogue()
{
- super(403, Q00403_PathOfTheRogue.class.getSimpleName(), "Path Of The Rogue");
+ super(403);
addStartNpc(CAPTAIN_BEZIQUE);
addTalkId(CAPTAIN_BEZIQUE, NETI);
addAttackId(MONSTER_DROPS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
index 39ae974258..3162550bda 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
@@ -63,7 +63,7 @@ public final class Q00404_PathOfTheHumanWizard extends Quest
public Q00404_PathOfTheHumanWizard()
{
- super(404, Q00404_PathOfTheHumanWizard.class.getSimpleName(), "Path Of The Human Wizard");
+ super(404);
addStartNpc(PARINA);
addTalkId(PARINA, EARTH_SNAKE, WASTELAND_LIZARDMAN, FLAME_SALAMANDER, WIND_SYLPH, WATER_UNDINE);
addKillId(RED_BEAR, RATMAN_WARRIOR, WATER_SEER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
index be3e03cc1e..3d5be72a17 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
@@ -59,7 +59,7 @@ public final class Q00405_PathOfTheCleric extends Quest
public Q00405_PathOfTheCleric()
{
- super(405, Q00405_PathOfTheCleric.class.getSimpleName(), "Path Of The Cleric");
+ super(405);
addStartNpc(ZIGAUNT);
addTalkId(ZIGAUNT, GALLINT, VIVYAN, TRADER_SIMPLON, GUARD_PRAGA, LIONEL);
addKillId(RUIN_ZOMBIE, RUIN_ZOMBIE_LEADER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
index 57518cff8b..1fd48afab7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
@@ -64,7 +64,7 @@ public final class Q00406_PathOfTheElvenKnight extends Quest
public Q00406_PathOfTheElvenKnight()
{
- super(406, Q00406_PathOfTheElvenKnight.class.getSimpleName(), "Path Of The Elven Knight");
+ super(406);
addStartNpc(MASTER_SORIUS);
addTalkId(MASTER_SORIUS, BLACKSMITH_KLUTO);
addKillId(MONSTER_DROPS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
index 87ad2bf1c7..f3fb043b61 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
@@ -57,7 +57,7 @@ public final class Q00407_PathOfTheElvenScout extends Quest
public Q00407_PathOfTheElvenScout()
{
- super(407, Q00407_PathOfTheElvenScout.class.getSimpleName(), "Path of the Elven Scout");
+ super(407);
addStartNpc(MASTER_REORIA);
addTalkId(MASTER_REORIA, GUARD_BABENCO, GUARD_MORETTI, PRIAS);
addKillId(OL_MAHUM_PATROL, OL_MAHUM_SENTRY);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
index a74739fb06..ccdbb4d96f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
@@ -61,7 +61,7 @@ public final class Q00408_PathOfTheElvenWizard extends Quest
public Q00408_PathOfTheElvenWizard()
{
- super(408, Q00408_PathOfTheElvenWizard.class.getSimpleName(), "Path Of The Elven Wizard");
+ super(408);
addStartNpc(ROSSELA);
addTalkId(ROSSELA, GREENIS, THALIA, NORTHWIND);
addKillId(DRYAD_ELDER, SUKAR_WERERAT_LEADER, PINCER_SPIDER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
index e9dc7f5b6a..b6fe5d4fca 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
@@ -56,7 +56,7 @@ public final class Q00409_PathOfTheElvenOracle extends Quest
public Q00409_PathOfTheElvenOracle()
{
- super(409, Q00409_PathOfTheElvenOracle.class.getSimpleName(), "Path of the Elven Oracle");
+ super(409);
addStartNpc(PRIEST_MANUEL);
addTalkId(PRIEST_MANUEL, ALLANA, PERRIN);
addKillId(TAMIL, lIZARDMAN_WARRIOR, LIZARDMAN_SCOUT, LIZARDMAN_SOLDIER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
index c0d9befd77..0cdc8ced26 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
@@ -53,7 +53,7 @@ public final class Q00410_PathOfThePalusKnight extends Quest
public Q00410_PathOfThePalusKnight()
{
- super(410, Q00410_PathOfThePalusKnight.class.getSimpleName(), "Path Of The Palus Knight");
+ super(410);
addStartNpc(MASTER_VIRGIL);
addTalkId(MASTER_VIRGIL, KALINTA);
addKillId(VENOMOUS_SPIDER, ARACHNID_TRACKER, LYCANTHROPE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
index 0832865b39..79b86c6cfc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
@@ -53,7 +53,7 @@ public final class Q00411_PathOfTheAssassin extends Quest
public Q00411_PathOfTheAssassin()
{
- super(411, Q00411_PathOfTheAssassin.class.getSimpleName(), "Path Of The Assassin");
+ super(411);
addStartNpc(TRISKEL);
addTalkId(TRISKEL, GUARD_LEIKAN, ARKENIA);
addKillId(MOONSTONE_BEAST, CALPICO);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
index 85a52e9a2c..523a3321a2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
@@ -60,7 +60,7 @@ public final class Q00412_PathOfTheDarkWizard extends Quest
public Q00412_PathOfTheDarkWizard()
{
- super(412, Q00412_PathOfTheDarkWizard.class.getSimpleName(), "Path Of The Dark Wizard");
+ super(412);
addStartNpc(VARIKA);
addTalkId(VARIKA, CHARKEREN, ANNIKA, ARKENIA);
addKillId(MARSH_ZOMBIE, MISERY_SKELETON, SKELETON_SCOUT, SKELETON_HUNTER, SKELETON_HUNTER_ARCHER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
index 924b67a849..14686af958 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
@@ -57,7 +57,7 @@ public final class Q00413_PathOfTheShillienOracle extends Quest
public Q00413_PathOfTheShillienOracle()
{
- super(413, Q00413_PathOfTheShillienOracle.class.getSimpleName(), "Path of the Shillien Oracle");
+ super(413);
addStartNpc(MAGISTER_SIDRA);
addTalkId(MAGISTER_SIDRA, PRIEST_ADONIUS, MAGISTER_TALBOT);
addKillId(ZOMBIE_SOLDIER, ZOMBIE_WARRIOR, SHIELD_SKELETON, SKELETON_INFANTRYMAN, DARK_SUCCUBUS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
index 546564e30e..64842af099 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
@@ -56,7 +56,7 @@ public final class Q00414_PathOfTheOrcRaider extends Quest
public Q00414_PathOfTheOrcRaider()
{
- super(414, Q00414_PathOfTheOrcRaider.class.getSimpleName(), "Path Of The Orc Raider");
+ super(414);
addStartNpc(PREFECT_KARUKIA);
addTalkId(PREFECT_KARUKIA, PREFRCT_KASMAN, PREFRCT_TAZEER);
addKillId(KURUKA_RATMAN_LEADER, UMBAR_ORC, TIMORA_ORC, GOBLIN_TOMB_RAIDER_LEADER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
index 527053d6c0..633111742a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
@@ -82,7 +82,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest
public Q00415_PathOfTheOrcMonk()
{
- super(415, Q00415_PathOfTheOrcMonk.class.getSimpleName(), "Path Of The Orc Monk");
+ super(415);
addStartNpc(GANTAKI_ZU_URUTU);
addTalkId(GANTAKI_ZU_URUTU, PREFECT_KASMAN, KHAVATARI_ROSHEEK, KHAVATARI_TORUKU, SEER_MOIRA, KHAVATARI_AREN);
addAttackId(FELIM_LIZARDMAN_WARRIOR, VUKU_ORC_FIGHTER, LANGK_LIZZARDMAN_WARRIOR, RATMAN_WARRIOR, SCARLET_SALAMANDER, KASHA_FANG_SPIDER, KASHA_BLADE_SPIDER, KASHA_BEAR, BAAR_DRE_VANUL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
index 66647757c4..ac8fb1a639 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
@@ -82,7 +82,7 @@ public final class Q00416_PathOfTheOrcShaman extends Quest
public Q00416_PathOfTheOrcShaman()
{
- super(416, Q00416_PathOfTheOrcShaman.class.getSimpleName(), "Path of the Orc Shaman");
+ super(416);
addStartNpc(TATARU_ZU_HESTUI);
addTalkId(TATARU_ZU_HESTUI, UMOS, MOIRA, DEAD_LEOPARDS_CARCASS, DUDA_MARA_TOTEM_SPIRIT, HESTUI_TOTEM_SPIRIT, TOTEM_SPIRIT_OF_GANDI);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
index 54673f994e..2d54a3a127 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
@@ -76,7 +76,7 @@ public final class Q00417_PathOfTheScavenger extends Quest
public Q00417_PathOfTheScavenger()
{
- super(417, Q00417_PathOfTheScavenger.class.getSimpleName(), "Path Of The Scavenger");
+ super(417);
addStartNpc(COLLECTOR_PIPI);
addTalkId(COLLECTOR_PIPI, WAREHOUSE_KEEPER_RAUT, TRADER_MION, TRADER_SHARI, HEAD_BLACKSMITH_BRONK, PRIEST_OF_THE_EARTH_ZIMENF, MASTER_TOMA, TORAI, WAREHOUSE_CHIEF_YASENI);
addAttackId(HUNTER_TARANTULA, PLUNDER_TARANTULA, HUNTER_BEAR, HONEY_BEAR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
index b971dae81d..4eb7cdb31f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
@@ -60,7 +60,7 @@ public final class Q00418_PathOfTheArtisan extends Quest
public Q00418_PathOfTheArtisan()
{
- super(418, Q00418_PathOfTheArtisan.class.getSimpleName(), "Path Of The Artisan");
+ super(418);
addStartNpc(BLACKSMITH_SILVERA);
addTalkId(BLACKSMITH_SILVERA, BLACKSMITH_PINTER, BLACKSMITH_KLUTO, IRON_GATES_LOCKIRIN, WAREHOUSE_KEEPER_RYDEL, MINERAL_TRADER_HITCHI, RAILROAD_WORKER_OBI);
addKillId(VUKU_ORC_FIGHTER, BOOGLE_RATMAN, BOOGLE_RATMAN_LEADER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
index e0bf3fe289..433471ac3d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java
@@ -151,7 +151,7 @@ public final class Q00419_GetAPet extends Quest
public Q00419_GetAPet()
{
- super(419, Q00419_GetAPet.class.getSimpleName(), "Get A Pet");
+ super(419);
addStartNpc(PET_MENAGER_MARTIN);
addTalkId(PET_MENAGER_MARTIN, GUARD_METTY, ACCESSORY_MERCHANT_ELICE, GATEKEEPER_BELLA);
addKillId(LESSER_DARK_HORROR, PROWLER, GIANT_SPIDER, DARK_HORROR, TALON_SPIDER, BLADE_SPIDER, HOOK_SPIDER, HUNTER_TARANTULA, CRIMSON_SPIDER, PINCER_SPIDER, KASHA_SPIDER, KASHA_FANG_SPIDER, KASHA_BLADE_SPIDER, PLUNDER_TARANTULA, CRIMSON_SPIDER2);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
index 14ba8c7a15..edfd0475fa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java
@@ -119,7 +119,7 @@ public final class Q00420_LittleWing extends Quest
public Q00420_LittleWing()
{
- super(420, Q00420_LittleWing.class.getSimpleName(), "Little Wing");
+ super(420);
addStartNpc(COOPER);
addTalkId(MARIA, CRONOS, BYRON, MIMYU, EXARION, ZWOV, KALIBRAN, SUZET, SHAMHAI, COOPER);
addAttackId(DELUXE_STONE_BREAKERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
index 7fb130c380..71f52a5046 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
@@ -76,7 +76,7 @@ public final class Q00421_LittleWingsBigAdventure extends Quest
public Q00421_LittleWingsBigAdventure()
{
- super(421, Q00421_LittleWingsBigAdventure.class.getSimpleName(), "Little Wing's Big Adventure");
+ super(421);
addStartNpc(CRONOS);
addTalkId(CRONOS, MIMYU);
addAttackId(NPC_DATA.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
index d5e7fecde5..4ad45a950d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
@@ -62,7 +62,7 @@ public final class Q00422_RepentYourSins extends Quest
public Q00422_RepentYourSins()
{
- super(422, Q00422_RepentYourSins.class.getSimpleName(), "Repent Your Sins");
+ super(422);
addStartNpc(BLACK_JUDGE);
addTalkId(BLACK_JUDGE, BLACKSMITH_PUSHKIN, PIOTUR, ELDER_CASIAN, KATARI, MAGISTER_JOAN);
addKillId(SCAVENGER_WERERAT, TYRANT_KINGPIN, TUREK_WAR_HOUND, TRISALIM_TARANTULA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java
index b6e0b54000..ef763ee6dc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java
@@ -46,7 +46,7 @@ public class Q00423_TakeYourBestShot extends Quest
public Q00423_TakeYourBestShot()
{
- super(423, Q00423_TakeYourBestShot.class.getSimpleName(), "Take Your Best Shot!");
+ super(423);
addStartNpc(JOHNNY, BATRACOS);
addTalkId(JOHNNY, BATRACOS);
addFirstTalkId(BATRACOS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
index 20cab43b8b..edb7c917f5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
@@ -326,7 +326,7 @@ public class Q00426_QuestForFishingShot extends Quest
public Q00426_QuestForFishingShot()
{
- super(426, Q00426_QuestForFishingShot.class.getSimpleName(), "Quest for Fishing Shot");
+ super(426);
addStartNpc(NPC);
addTalkId(NPC);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
index 31c1ce65ef..4e62935742 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
@@ -47,7 +47,7 @@ public class Q00431_WeddingMarch extends Quest
public Q00431_WeddingMarch()
{
- super(431, Q00431_WeddingMarch.class.getSimpleName(), "Wedding March");
+ super(431);
addStartNpc(KANTABILON);
addTalkId(KANTABILON);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
index 8e50341b49..9e50e648f8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
@@ -41,7 +41,7 @@ public class Q00432_BirthdayPartySong extends Quest
public Q00432_BirthdayPartySong()
{
- super(432, Q00432_BirthdayPartySong.class.getSimpleName(), "Birthday Party Song");
+ super(432);
addStartNpc(OCTAVIA);
addTalkId(OCTAVIA);
addKillId(GOLEM);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
index 1aaf71f506..e942a343e8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
@@ -48,7 +48,7 @@ public class Q00450_GraveRobberRescue extends Quest
public Q00450_GraveRobberRescue()
{
- super(450, Q00450_GraveRobberRescue.class.getSimpleName(), "Grave Robber Rescue");
+ super(450);
addStartNpc(KANEMIKA);
addTalkId(KANEMIKA, WARRIOR);
registerQuestItems(EVIDENCE_OF_MIGRATION);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
index 66a0544326..49258743de 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
@@ -49,7 +49,7 @@ public class Q00451_LuciensAltar extends Quest
public Q00451_LuciensAltar()
{
- super(451, Q00451_LuciensAltar.class.getSimpleName(), "Lucien's Altar");
+ super(451);
addStartNpc(DAICHIR);
addTalkId(ALTARS);
addTalkId(DAICHIR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
index 1e677d6a8b..b70e1c4997 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
@@ -42,7 +42,7 @@ public class Q00452_FindingtheLostSoldiers extends Quest
public Q00452_FindingtheLostSoldiers()
{
- super(452, Q00452_FindingtheLostSoldiers.class.getSimpleName(), "Finding the Lost Soldiers");
+ super(452);
addStartNpc(JAKAN);
addTalkId(JAKAN);
addTalkId(SOLDIER_CORPSES);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
index 684be01139..849b4f2130 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -98,7 +98,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
public Q00453_NotStrongEnoughAlone()
{
- super(453, Q00453_NotStrongEnoughAlone.class.getSimpleName(), "Not Strong Enought Alone");
+ super(453);
addStartNpc(KLEMIS);
addTalkId(KLEMIS);
addKillId(MONSTER1);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
index 4c3ff65216..888e4e74fb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
@@ -54,7 +54,7 @@ public final class Q00454_CompletelyLost extends Quest
public Q00454_CompletelyLost()
{
- super(454, Q00454_CompletelyLost.class.getSimpleName(), "Completely Lost");
+ super(454);
addStartNpc(INJURED_SOLDIER);
addTalkId(INJURED_SOLDIER, ERMIAN);
addSpawnId(ERMIAN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
index d899618008..9ea3fa4c72 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
@@ -63,7 +63,7 @@ public class Q00455_WingsOfSand extends Quest
public Q00455_WingsOfSand()
{
- super(455, Q00455_WingsOfSand.class.getSimpleName(), "Wings of Sand");
+ super(455);
addStartNpc(SEPARATED_SOULS);
addTalkId(SEPARATED_SOULS);
addKillId(EMERALD_HORN, DUST_RIDER, BLEEDING_FLY, BLACK_DAGGER_WING, SHADOW_SUMMONER, SPIKE_SLASHER, MUSCLE_BOMBER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
index ecc7b528ab..eb37a4ee9b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
@@ -134,7 +134,7 @@ public final class Q00456_DontKnowDontCare extends Quest
public Q00456_DontKnowDontCare()
{
- super(456, Q00456_DontKnowDontCare.class.getSimpleName(), "Don't Know, Don't Care");
+ super(456);
addStartNpc(SEPARATED_SOUL);
addTalkId(SEPARATED_SOUL);
addFirstTalkId(DRAKE_LORD_CORPSE, BEHEMOTH_LEADER_CORPSE, DRAGON_BEAST_CORPSE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
index 76fc2f182d..145f9555ff 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
@@ -56,7 +56,7 @@ public final class Q00457_LostAndFound extends Quest
public Q00457_LostAndFound()
{
- super(457, Q00457_LostAndFound.class.getSimpleName(), "Lost and Found");
+ super(457);
addStartNpc(GUMIEL);
addSpawnId(ESCORT_CHECKER);
addFirstTalkId(GUMIEL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
index 1c15d49e89..06f8245746 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
@@ -73,7 +73,7 @@ public class Q00458_PerfectForm extends Quest
public Q00458_PerfectForm()
{
- super(458, Q00458_PerfectForm.class.getSimpleName(), "Perfect Form");
+ super(458);
addStartNpc(KELLEYIA);
addTalkId(KELLEYIA);
addKillId(KOOKABURRAS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
index 0cf1eedd70..f50d14ddc6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
@@ -56,7 +56,7 @@ public class Q00461_RumbleInTheBase extends Quest
public Q00461_RumbleInTheBase()
{
- super(461, Q00461_RumbleInTheBase.class.getSimpleName(), "Rumble in the Base");
+ super(461);
addStartNpc(STAN);
addTalkId(STAN);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
index a510622d49..94e105cb4c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
@@ -104,7 +104,7 @@ public class Q00463_IMustBeaGenius extends Quest
public Q00463_IMustBeaGenius()
{
- super(463, Q00463_IMustBeaGenius.class.getSimpleName(), "I Must Be a Genius");
+ super(463);
addStartNpc(GUTENHAGEN);
addTalkId(GUTENHAGEN);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
index de92e8f77e..05f5c6c756 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
@@ -76,7 +76,7 @@ public class Q00464_Oath extends Quest
public Q00464_Oath()
{
- super(464, Q00464_Oath.class.getSimpleName(), "Oath");
+ super(464);
for (int[] npc : NPC)
{
addTalkId(npc[0]);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
index e773944ea9..a617090b54 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java
@@ -97,7 +97,7 @@ public final class Q00501_ProofOfClanAlliance extends Quest
public Q00501_ProofOfClanAlliance()
{
- super(501, Q00501_ProofOfClanAlliance.class.getSimpleName(), "Proof of Clan Alliance");
+ super(501);
addStartNpc(SIR_KRISTOF_RODEMAI, STATUE_OF_OFFERING);
addTalkId(SIR_KRISTOF_RODEMAI, STATUE_OF_OFFERING, ATHREA, KALIS);
addKillId(OEL_MAHUM_WITCH_DOCTOR, HARIT_LIZARDMAN_SHAMAN, VANOR_SILENOS_SHAMAN, BOX_OF_ATHREA_1, BOX_OF_ATHREA_2, BOX_OF_ATHREA_3, BOX_OF_ATHREA_4, BOX_OF_ATHREA_5);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
index ca58aa3e1f..54716b20ba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java
@@ -76,7 +76,7 @@ public final class Q00503_PursuitOfClanAmbition extends Quest
public Q00503_PursuitOfClanAmbition()
{
- super(503, Q00503_PursuitOfClanAmbition.class.getSimpleName(), "Pursuit Of Clan Ambition");
+ super(503);
addStartNpc(SIR_GUSTAV_ATHEBALDT);
addTalkId(SIR_GUSTAV_ATHEBALDT, HEAD_BLACKSMITH_KUSTO, MARTIEN, WITCH_ATHREA, WITCH_KALIS, CORPSE_OF_FRITZ, CORPSE_OF_LUTZ, CORPSE_OF_KURTZ, BALTHAZAR, IMPERIAL_COFFER, WITCH_CLEO, SIR_ERIC_RODEMAI);
addKillId(DRAKE, DRAKE2, THUNDER_WYRM, THUNDER_WYRM2, GRAVE_GUARD, SPITEFUL_SOUL_LEADER, GRAVE_KEYMASTER, BLITZ_WYRM, IMPERIAL_GRAVEKEEPER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
index ee12026250..c4731697ac 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
@@ -57,7 +57,7 @@ public final class Q00504_CompetitionForTheBanditStronghold extends Quest
public Q00504_CompetitionForTheBanditStronghold()
{
- super(504, Q00504_CompetitionForTheBanditStronghold.class.getSimpleName(), "Competition for the Bandit Stronghold");
+ super(504);
addStartNpc(MESSENGER);
addTalkId(MESSENGER);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 92f7413641..d3975f53bc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
@@ -66,7 +66,7 @@ public class Q00508_AClansReputation extends Quest
public Q00508_AClansReputation()
{
- super(508, Q00508_AClansReputation.class.getSimpleName(), "A Clan's Reputation");
+ super(508);
addStartNpc(SIR_ERIC_RODEMAI);
addTalkId(SIR_ERIC_RODEMAI);
addKillId(RAID_BOSS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index 579533a78b..e8758cc0c4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -61,7 +61,7 @@ public class Q00509_AClansFame extends Quest
public Q00509_AClansFame()
{
- super(509, Q00509_AClansFame.class.getSimpleName(), "A Clan's Fame");
+ super(509);
addStartNpc(VALDIS);
addTalkId(VALDIS);
addKillId(RAID_BOSS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index 2d3e4216bd..c5da319b81 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -47,7 +47,7 @@ public class Q00510_AClansPrestige extends Quest
public Q00510_AClansPrestige()
{
- super(510, Q00510_AClansPrestige.class.getSimpleName(), "A Clan's Prestige");
+ super(510);
addStartNpc(VALDIS);
addTalkId(VALDIS);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index f34c5371dd..5e99868d01 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -151,7 +151,7 @@ public final class Q00511_AwlUnderFoot extends Quest
public Q00511_AwlUnderFoot()
{
- super(511, Q00511_AwlUnderFoot.class.getSimpleName(), "instances");
+ super(511);
_fortDungeons.put(35666, new FortDungeon(22));
_fortDungeons.put(35698, new FortDungeon(23));
_fortDungeons.put(35735, new FortDungeon(24));
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
index 14ecccd75a..03d90bbf03 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
@@ -86,7 +86,7 @@ public class Q00512_BladeUnderFoot extends Quest
public Q00512_BladeUnderFoot()
{
- super(512, Q00512_BladeUnderFoot.class.getSimpleName(), "Blade Under Foot");
+ super(512);
addStartNpc(WARDEN);
addTalkId(WARDEN);
addKillId(RAID_BOSSES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
index 5a566997c8..fbfc0c2393 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
@@ -43,7 +43,7 @@ public class Q00551_OlympiadStarter extends Quest
public Q00551_OlympiadStarter()
{
- super(551, Q00551_OlympiadStarter.class.getSimpleName(), "Olympiad Starter");
+ super(551);
addStartNpc(MANAGER);
addTalkId(MANAGER);
registerQuestItems(CERT_3, CERT_5, CERT_10);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
index 4efb9f6ec1..4866f84d4f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
@@ -41,7 +41,7 @@ public class Q00552_OlympiadVeteran extends Quest
public Q00552_OlympiadVeteran()
{
- super(552, Q00552_OlympiadVeteran.class.getSimpleName(), "Olympiad Veteran");
+ super(552);
addStartNpc(MANAGER);
addTalkId(MANAGER);
registerQuestItems(TEAM_EVENT_CERTIFICATE, CLASS_FREE_BATTLE_CERTIFICATE, CLASS_BATTLE_CERTIFICATE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
index 919122a90a..f08e25bb6a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
@@ -42,7 +42,7 @@ public class Q00553_OlympiadUndefeated extends Quest
public Q00553_OlympiadUndefeated()
{
- super(553, Q00553_OlympiadUndefeated.class.getSimpleName(), "Olympiad Undefeated");
+ super(553);
addStartNpc(MANAGER);
addTalkId(MANAGER);
registerQuestItems(WIN_CONF_2, WIN_CONF_5, WIN_CONF_10);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
index d01f8dc401..440caa17c0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
@@ -72,7 +72,7 @@ public class Q00601_WatchingEyes extends Quest
public Q00601_WatchingEyes()
{
- super(601, Q00601_WatchingEyes.class.getSimpleName(), "Watching Eyes");
+ super(601);
addStartNpc(EYE_OF_ARGOS);
addTalkId(EYE_OF_ARGOS);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
index a23dbd7252..5f36e613f3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
@@ -72,7 +72,7 @@ public class Q00602_ShadowOfLight extends Quest
public Q00602_ShadowOfLight()
{
- super(602, Q00602_ShadowOfLight.class.getSimpleName(), "Shadow of Light");
+ super(602);
addStartNpc(EYE_OF_ARGOS);
addTalkId(EYE_OF_ARGOS);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java
index 4a709db948..f25be007af 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java
@@ -55,7 +55,7 @@ public final class Q00603_DaimonTheWhiteEyedPart1 extends Quest
public Q00603_DaimonTheWhiteEyedPart1()
{
- super(603, Q00603_DaimonTheWhiteEyedPart1.class.getSimpleName(), "Daimon the White-Eyed - Part 1");
+ super(603);
addStartNpc(EYE_OF_ARGOS);
addTalkId(EYE_OF_ARGOS, TABLET_1, TABLET_2, TABLET_3, TABLET_4, TABLET_5);
addKillId(MONSTER_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
index 4e433126da..3e2e007665 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java
@@ -57,7 +57,7 @@ public final class Q00604_DaimonTheWhiteEyedPart2 extends Quest
public Q00604_DaimonTheWhiteEyedPart2()
{
- super(604, Q00604_DaimonTheWhiteEyedPart2.class.getSimpleName(), "Daimon the White-Eyed - Part 2");
+ super(604);
addStartNpc(EYE_OF_ARGOS);
addTalkId(EYE_OF_ARGOS, DAIMONS_ALTAR);
addSpawnId(DAIMON_THE_WHITE_EYED);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
index 2b78fc2f6a..6028fb6a77 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
@@ -157,7 +157,7 @@ public class Q00605_AllianceWithKetraOrcs extends Quest
public Q00605_AllianceWithKetraOrcs()
{
- super(605, Q00605_AllianceWithKetraOrcs.class.getSimpleName(), "Alliance with Ketra Orcs");
+ super(605);
addStartNpc(WAHKAN);
addTalkId(WAHKAN);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
index 471eac3791..1348ee90f3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
@@ -63,7 +63,7 @@ public class Q00606_BattleAgainstVarkaSilenos extends Quest
public Q00606_BattleAgainstVarkaSilenos()
{
- super(606, Q00606_BattleAgainstVarkaSilenos.class.getSimpleName(), "Battle against Varka Silenos");
+ super(606);
addStartNpc(KADUN);
addTalkId(KADUN);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
index 2e01fe3a21..aa6be7363b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
@@ -42,7 +42,7 @@ public class Q00607_ProveYourCourageKetra extends Quest
public Q00607_ProveYourCourageKetra()
{
- super(607, Q00607_ProveYourCourageKetra.class.getSimpleName(), "Prove Your Courage! (Ketra)");
+ super(607);
addStartNpc(KADUN);
addTalkId(KADUN);
addKillId(SHADITH);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
index 272eb395ae..6b127ee883 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
@@ -42,7 +42,7 @@ public class Q00608_SlayTheEnemyCommanderKetra extends Quest
public Q00608_SlayTheEnemyCommanderKetra()
{
- super(608, Q00608_SlayTheEnemyCommanderKetra.class.getSimpleName(), "Slay the Enemy Commander! (Ketra)");
+ super(608);
addStartNpc(KADUN);
addTalkId(KADUN);
addKillId(MOS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
index 468b201b0a..33e7961439 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
@@ -83,7 +83,7 @@ public class Q00609_MagicalPowerOfWaterPart1 extends Quest
public Q00609_MagicalPowerOfWaterPart1()
{
- super(609, Q00609_MagicalPowerOfWaterPart1.class.getSimpleName(), "Magical Power of Water - Part 1");
+ super(609);
addStartNpc(WAHKAN);
addTalkId(ASEFA, WAHKAN, UDANS_BOX);
addAttackId(VARKA_MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
index 0fac3d0585..831e4a14fd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
@@ -47,7 +47,7 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest
public Q00610_MagicalPowerOfWaterPart2()
{
- super(610, Q00610_MagicalPowerOfWaterPart2.class.getSimpleName(), "Magical Power of Water - Part 2");
+ super(610);
addStartNpc(ASEFA);
addTalkId(ASEFA, VARKA_TOTEM);
addKillId(ASHUTAR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
index 5da4648c5b..e75309c23d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
@@ -157,7 +157,7 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest
public Q00611_AllianceWithVarkaSilenos()
{
- super(611, Q00611_AllianceWithVarkaSilenos.class.getSimpleName(), "Alliance with Varka Silenos");
+ super(611);
addStartNpc(NARAN_ASHANUK);
addTalkId(NARAN_ASHANUK);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
index a2acb29651..212a8cda4b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
@@ -63,7 +63,7 @@ public class Q00612_BattleAgainstKetraOrcs extends Quest
public Q00612_BattleAgainstKetraOrcs()
{
- super(612, Q00612_BattleAgainstKetraOrcs.class.getSimpleName(), "Battle against Ketra Orcs");
+ super(612);
addStartNpc(ASHAS);
addTalkId(ASHAS);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
index cde7c51e7a..b11f45148b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
@@ -42,7 +42,7 @@ public class Q00613_ProveYourCourageVarka extends Quest
public Q00613_ProveYourCourageVarka()
{
- super(613, Q00613_ProveYourCourageVarka.class.getSimpleName(), "Prove Your Courage! (Varka)");
+ super(613);
addStartNpc(ASHAS);
addTalkId(ASHAS);
addKillId(HEKATON);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
index 807933a250..9946b62339 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
@@ -42,7 +42,7 @@ public class Q00614_SlayTheEnemyCommanderVarka extends Quest
public Q00614_SlayTheEnemyCommanderVarka()
{
- super(614, Q00614_SlayTheEnemyCommanderVarka.class.getSimpleName(), "Slay the Enemy Commander! (Varka)");
+ super(614);
addStartNpc(ASHAS);
addTalkId(ASHAS);
addKillId(TAYR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
index 5349c521b3..2f1380ed3a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
@@ -83,7 +83,7 @@ public class Q00615_MagicalPowerOfFirePart1 extends Quest
public Q00615_MagicalPowerOfFirePart1()
{
- super(615, Q00615_MagicalPowerOfFirePart1.class.getSimpleName(), "Magical Power of Fire - Part 1");
+ super(615);
addStartNpc(NARAN);
addTalkId(UDAN, NARAN, ASEFA_BOX);
addAttackId(KETRA_MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
index dc500ad700..354938a7a3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
@@ -47,7 +47,7 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest
public Q00616_MagicalPowerOfFirePart2()
{
- super(616, Q00616_MagicalPowerOfFirePart2.class.getSimpleName(), "Magical Power of Fire - Part 2");
+ super(616);
addStartNpc(UDAN);
addTalkId(UDAN, KETRA_TOTEM);
addKillId(NASTRON);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index ba5768d6a5..972b206631 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -76,7 +76,7 @@ public class Q00617_GatherTheFlames extends Quest
public Q00617_GatherTheFlames()
{
- super(617, Q00617_GatherTheFlames.class.getSimpleName(), "Gather the Flames");
+ super(617);
addStartNpc(HILDA, VULCAN);
addTalkId(ROONEY, HILDA, VULCAN);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
index 30f3f52bd7..c46b719554 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -57,7 +57,7 @@ public class Q00618_IntoTheFlame extends Quest
public Q00618_IntoTheFlame()
{
- super(618, Q00618_IntoTheFlame.class.getSimpleName(), "Into the Flame");
+ super(618);
addStartNpc(KLEIN);
addTalkId(HILDA, KLEIN);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
index 5e08dd3233..538251575e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
@@ -213,7 +213,7 @@ public final class Q00619_RelicsOfTheOldEmpire extends Quest
public Q00619_RelicsOfTheOldEmpire()
{
- super(619, Q00619_RelicsOfTheOldEmpire.class.getSimpleName(), "Relics of the Old Empire");
+ super(619);
addStartNpc(GHOST_OF_ADVENTURER);
addTalkId(GHOST_OF_ADVENTURER);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
index f2fff5270c..b2d31104f9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
@@ -219,7 +219,7 @@ public class Q00620_FourGoblets extends Quest
public Q00620_FourGoblets()
{
- super(620, Q00620_FourGoblets.class.getSimpleName(), "Four Goblets");
+ super(620);
addStartNpc(NAMELESS_SPIRIT);
addTalkId(NAMELESS_SPIRIT, GHOST_OF_WIGOTH_1, GHOST_OF_WIGOTH_2, GHOST_CHAMBERLAIN_OF_ELMOREDEN_1, CONQUERORS_SEPULCHER_MANAGER, EMPERORS_SEPULCHER_MANAGER, GREAT_SAGES_SEPULCHER_MANAGER, JUDGES_SEPULCHER_MANAGER);
addKillId(HALISHA_ALECTIA, HALISHA_TISHAS, HALISHA_MEKARA, HALISHA_MORIGUL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
index 7407b7a47e..f98cceb255 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
@@ -54,7 +54,7 @@ public final class Q00621_EggDelivery extends Quest
public Q00621_EggDelivery()
{
- super(621, Q00621_EggDelivery.class.getSimpleName(), "Egg Delivery");
+ super(621);
addStartNpc(JEREMY);
addTalkId(JEREMY, PULIN, VALENTINE);
addTalkId(TALKERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
index 949643cff6..e23e1ffb6e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
@@ -54,7 +54,7 @@ public final class Q00622_SpecialtyLiquorDelivery extends Quest
public Q00622_SpecialtyLiquorDelivery()
{
- super(622, Q00622_SpecialtyLiquorDelivery.class.getSimpleName(), "Specialty Liquor Delivery");
+ super(622);
addStartNpc(JEREMY);
addTalkId(JEREMY, BOELIN, LIETTA);
addTalkId(TALKERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
index 0ab368ed9d..403fe8f223 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00623_TheFinestFood/Q00623_TheFinestFood.java
@@ -58,7 +58,7 @@ public final class Q00623_TheFinestFood extends Quest
public Q00623_TheFinestFood()
{
- super(623, Q00623_TheFinestFood.class.getSimpleName(), "The Finest Food");
+ super(623);
addStartNpc(JEREMY);
addTalkId(JEREMY);
addKillId(THERMAL_BUFFALO, THERMAL_FLAVA, THERMAL_ANTELOPE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
index e985b094eb..5c0e50ac11 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
@@ -54,7 +54,7 @@ public final class Q00624_TheFinestIngredientsPart1 extends Quest
public Q00624_TheFinestIngredientsPart1()
{
- super(624, Q00624_TheFinestIngredientsPart1.class.getSimpleName(), "The Finest Ingredients - Part 1");
+ super(624);
addStartNpc(JEREMY);
addTalkId(JEREMY);
addKillId(MONSTER_DROPS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
index 13c5b106c7..da15aab860 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java
@@ -58,7 +58,7 @@ public final class Q00625_TheFinestIngredientsPart2 extends Quest
public Q00625_TheFinestIngredientsPart2()
{
- super(625, Q00625_TheFinestIngredientsPart2.class.getSimpleName(), "The Finest Ingredients - Part 2");
+ super(625);
addStartNpc(JEREMY);
addTalkId(JEREMY, YETIS_TABLE);
addSpawnId(ICICLE_EMPEROR_BUMBALUMP);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
index 6fd5ac1851..909faab130 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
@@ -68,7 +68,7 @@ public class Q00626_ADarkTwilight extends Quest
public Q00626_ADarkTwilight()
{
- super(626, Q00626_ADarkTwilight.class.getSimpleName(), "A Dark Twilight");
+ super(626);
addStartNpc(HIERARCH);
addTalkId(HIERARCH);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
index 5c75accd32..8b815dc419 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
@@ -70,7 +70,7 @@ public class Q00627_HeartInSearchOfPower extends Quest
public Q00627_HeartInSearchOfPower()
{
- super(627, Q00627_HeartInSearchOfPower.class.getSimpleName(), "Heart in Search of Power");
+ super(627);
addStartNpc(MYSTERIOUS_NECROMANCER);
addTalkId(MYSTERIOUS_NECROMANCER, ENFEUX);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
index 597a3b479e..fc6ff9e081 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
@@ -61,7 +61,7 @@ public final class Q00628_HuntGoldenRam extends Quest
public Q00628_HuntGoldenRam()
{
- super(628, Q00628_HuntGoldenRam.class.getSimpleName(), "Hunt of the Golden Ram Mercenary Force");
+ super(628);
addStartNpc(KAHMAN);
addTalkId(KAHMAN);
addKillId(MOBS_DROP_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
index 60c1bb8c40..5c19bb1b63 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
@@ -57,7 +57,7 @@ public final class Q00629_CleanUpTheSwampOfScreams extends Quest
public Q00629_CleanUpTheSwampOfScreams()
{
- super(629, Q00629_CleanUpTheSwampOfScreams.class.getSimpleName(), "Clean Up The Swamp Of Screams");
+ super(629);
addStartNpc(PIERCE);
addTalkId(PIERCE);
addKillId(MOBS_DROP_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
index 07ab554698..2b98e0b5f0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
@@ -80,7 +80,7 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
public Q00631_DeliciousTopChoiceMeat()
{
- super(631, Q00631_DeliciousTopChoiceMeat.class.getSimpleName(), "Delicious Top Choice Meat");
+ super(631);
addStartNpc(TUNATUN);
addTalkId(TUNATUN);
addKillId(MOBS_MEAT.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
index 77bf1cf1bf..6947e22e61 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
@@ -77,7 +77,7 @@ public final class Q00632_NecromancersRequest extends Quest
public Q00632_NecromancersRequest()
{
- super(632, Q00632_NecromancersRequest.class.getSimpleName(), "Necromancer's Request");
+ super(632);
addStartNpc(MYSTERIOUS_WIZARD);
addTalkId(MYSTERIOUS_WIZARD);
addKillId(BRAIN_MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
index efa479d407..611ab39496 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
@@ -74,7 +74,7 @@ public final class Q00633_InTheForgottenVillage extends Quest
public Q00633_InTheForgottenVillage()
{
- super(633, Q00633_InTheForgottenVillage.class.getSimpleName(), "In The Forgotten Village");
+ super(633);
addStartNpc(MINA);
addTalkId(MINA);
addKillId(MOBS_DROP_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
index fd77c0b2fb..969abaf0ef 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00634_InSearchOfFragmentsOfDimension/Q00634_InSearchOfFragmentsOfDimension.java
@@ -106,7 +106,7 @@ public final class Q00634_InSearchOfFragmentsOfDimension extends Quest
public Q00634_InSearchOfFragmentsOfDimension()
{
- super(634, Q00634_InSearchOfFragmentsOfDimension.class.getSimpleName(), "In Search of Fragments of Dimension");
+ super(634);
addStartNpc(DIMENSIONAL_GATE_KEEPER);
addTalkId(DIMENSIONAL_GATE_KEEPER);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00635_IntoTheDimensionalRift/Q00635_IntoTheDimensionalRift.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00635_IntoTheDimensionalRift/Q00635_IntoTheDimensionalRift.java
index dec53aec2e..2515f1a786 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00635_IntoTheDimensionalRift/Q00635_IntoTheDimensionalRift.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00635_IntoTheDimensionalRift/Q00635_IntoTheDimensionalRift.java
@@ -27,6 +27,6 @@ public class Q00635_IntoTheDimensionalRift extends Quest
{
public Q00635_IntoTheDimensionalRift()
{
- super(635, Q00635_IntoTheDimensionalRift.class.getSimpleName(), "Into the Dimensional Rift");
+ super(635);
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
index a7faaeb058..a29bc49532 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
@@ -40,7 +40,7 @@ public final class Q00636_TruthBeyond extends Quest
public Q00636_TruthBeyond()
{
- super(636, Q00636_TruthBeyond.class.getSimpleName(), "The Truth Beyond the Gate");
+ super(636);
addStartNpc(ELIYAH);
addTalkId(ELIYAH, FLAURON);
addEnterZoneId(ZONE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
index 628643654d..c70868a5a4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
@@ -47,7 +47,7 @@ public final class Q00637_ThroughOnceMore extends Quest
public Q00637_ThroughOnceMore()
{
- super(637, Q00637_ThroughOnceMore.class.getSimpleName(), "Through the Gate Once More");
+ super(637);
addStartNpc(FLAURON);
addTalkId(FLAURON);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
index f6c5a5e9ee..b9a0b27e42 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
@@ -136,7 +136,7 @@ public final class Q00638_SeekersOfTheHolyGrail extends Quest
public Q00638_SeekersOfTheHolyGrail()
{
- super(638, Q00638_SeekersOfTheHolyGrail.class.getSimpleName(), "Seekers Of The Holy Grail");
+ super(638);
addStartNpc(INNOCENTIN);
addTalkId(INNOCENTIN);
addKillId(MOBS_DROP_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
index d0dfd0a95b..b01eb611d6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java
@@ -33,7 +33,7 @@ public final class Q00639_GuardiansOfTheHolyGrail extends Quest
public Q00639_GuardiansOfTheHolyGrail()
{
- super(639, Q00639_GuardiansOfTheHolyGrail.class.getSimpleName(), "Guardians of the Holy Grail");
+ super(639);
addStartNpc(DOMINIC);
addTalkId(DOMINIC);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
index 2bc192434a..a4194673af 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
@@ -49,7 +49,7 @@ public class Q00641_AttackSailren extends Quest
public Q00641_AttackSailren()
{
- super(641, Q00641_AttackSailren.class.getSimpleName(), "Attack Sailren!");
+ super(641);
addStartNpc(SHILENS_STONE_STATUE);
addTalkId(SHILENS_STONE_STATUE);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
index a28768afa9..b2e5ad1524 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
@@ -56,7 +56,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
public Q00642_APowerfulPrimevalCreature()
{
- super(642, Q00642_APowerfulPrimevalCreature.class.getSimpleName(), "A Powerful Primeval Creature");
+ super(642);
addStartNpc(DINN);
addTalkId(DINN);
addKillId(ANCIENT_EGG);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
index 9b678a8925..cd64b6fbd1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -93,7 +93,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
public Q00643_RiseAndFallOfTheElrokiTribe()
{
- super(643, Q00643_RiseAndFallOfTheElrokiTribe.class.getSimpleName(), "Rise and Fall of the Elroki Tribe");
+ super(643);
addStartNpc(SINGSING);
addTalkId(SINGSING, KARAKAWEI);
addKillId(MOBS1);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
index c38d1f28d9..73e83c7a4d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
@@ -62,7 +62,7 @@ public final class Q00644_GraveRobberAnnihilation extends Quest
public Q00644_GraveRobberAnnihilation()
{
- super(644, Q00644_GraveRobberAnnihilation.class.getSimpleName(), "Grave Robber Annihilation");
+ super(644);
addStartNpc(KARUDA);
addTalkId(KARUDA);
addKillId(MONSTER_DROP_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
index d7305a2872..1ddc07b9d4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
@@ -50,7 +50,7 @@ public class Q00645_GhostsOfBatur extends Quest
public Q00645_GhostsOfBatur()
{
- super(645, Q00645_GhostsOfBatur.class.getSimpleName(), "Ghosts of Batur");
+ super(645);
addStartNpc(KARUDA);
addTalkId(KARUDA);
addKillId(CONTAMINATED_MOREK_WARRIOR, CONTAMINATED_BATUR_WARRIOR, CONTAMINATED_BATUR_COMMANDER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java
index 584ce2deb0..133e56f2fd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java
@@ -35,7 +35,7 @@ public class Q00646_SignsOfRevolt extends Quest
public Q00646_SignsOfRevolt()
{
- super(646, Q00646_SignsOfRevolt.class.getSimpleName(), "Signs of Revolt");
+ super(646);
addStartNpc(TORRANT);
addTalkId(TORRANT);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
index 9b45019627..0ac67c49cc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
@@ -72,7 +72,7 @@ public class Q00647_InfluxOfMachines extends Quest
public Q00647_InfluxOfMachines()
{
- super(647, Q00647_InfluxOfMachines.class.getSimpleName(), "Influx of Machines");
+ super(647);
addStartNpc(GUTENHAGEN);
addTalkId(GUTENHAGEN);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
index 879d9df25f..d1600dcd69 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
@@ -91,7 +91,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest
public Q00648_AnIceMerchantsDream()
{
- super(648, Q00648_AnIceMerchantsDream.class.getSimpleName(), "An Ice Merchants Dream");
+ super(648);
addStartNpc(RAFFORTY);
addTalkId(RAFFORTY, ICE_SHELF);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
index 4d86e4db07..05e2df0604 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
@@ -56,7 +56,7 @@ public final class Q00649_ALooterAndARailroadMan extends Quest
public Q00649_ALooterAndARailroadMan()
{
- super(649, Q00649_ALooterAndARailroadMan.class.getSimpleName(), "A Looter and a Railroad Man");
+ super(649);
addStartNpc(RAILMAN_OBI);
addTalkId(RAILMAN_OBI);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
index 49100a96a3..0388c6e331 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
@@ -53,7 +53,7 @@ public final class Q00650_ABrokenDream extends Quest
public Q00650_ABrokenDream()
{
- super(650, Q00650_ABrokenDream.class.getSimpleName(), "A Broken Dream");
+ super(650);
addStartNpc(GHOST_OF_A_RAILROAD_ENGINEER);
addTalkId(GHOST_OF_A_RAILROAD_ENGINEER);
addKillId(MONSTER_DROP_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
index e6e01db633..f3ee647d99 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
@@ -38,7 +38,7 @@ public class Q00651_RunawayYouth extends Quest
public Q00651_RunawayYouth()
{
- super(651, Q00651_RunawayYouth.class.getSimpleName(), "Runaway Youth");
+ super(651);
addStartNpc(IVAN);
addTalkId(BATIDAE, IVAN);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
index 7650b02619..84e502141f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
@@ -37,7 +37,7 @@ public class Q00652_AnAgedExAdventurer extends Quest
public Q00652_AnAgedExAdventurer()
{
- super(652, Q00652_AnAgedExAdventurer.class.getSimpleName(), "An Aged Ex-Adventurer");
+ super(652);
addStartNpc(TANTAN);
addTalkId(TANTAN, SARA);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
index 4d7bd9300a..23705ccdd5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
@@ -38,7 +38,7 @@ public class Q00653_WildMaiden extends Quest
public Q00653_WildMaiden()
{
- super(653, Q00653_WildMaiden.class.getSimpleName(), "Wild Maiden");
+ super(653);
addStartNpc(SUKI);
addTalkId(GALIBREDO, SUKI);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
index 07fde9fb54..e5fe8b8c6b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
@@ -49,7 +49,7 @@ public final class Q00654_JourneyToASettlement extends Quest
public Q00654_JourneyToASettlement()
{
- super(654, Q00654_JourneyToASettlement.class.getSimpleName(), "Journey to a Settlement");
+ super(654);
addStartNpc(NAMELESS_SPIRIT);
addTalkId(NAMELESS_SPIRIT);
addKillId(MOBS_SKIN.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
index ec197933e5..543854d89a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java
@@ -50,7 +50,7 @@ public final class Q00655_AGrandPlanForTamingWildBeasts extends Quest
public Q00655_AGrandPlanForTamingWildBeasts()
{
- super(655, Q00655_AGrandPlanForTamingWildBeasts.class.getSimpleName(), "A Grand Plan for Taming Wild Beasts");
+ super(655);
addStartNpc(MESSENGER);
addTalkId(MESSENGER);
registerQuestItems(CRYSTAL_OF_PURITY, TRAINER_LICENSE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
index 400791afb4..59340613da 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
@@ -49,7 +49,7 @@ public final class Q00659_IdRatherBeCollectingFairyBreath extends Quest
public Q00659_IdRatherBeCollectingFairyBreath()
{
- super(659, Q00659_IdRatherBeCollectingFairyBreath.class.getSimpleName(), "I'd Rather Be Collecting Fairy Breath");
+ super(659);
addStartNpc(GALATEA);
addTalkId(GALATEA);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
index 3e4cb023e4..0b85c23918 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
@@ -67,7 +67,7 @@ public final class Q00660_AidingTheFloranVillage extends Quest
public Q00660_AidingTheFloranVillage()
{
- super(660, Q00660_AidingTheFloranVillage.class.getSimpleName(), "Aiding the Floran Village");
+ super(660);
addStartNpc(MARIA, ALEX);
addTalkId(MARIA, ALEX);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java
index cdf8f8801a..e2f6c72a26 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00661_MakingTheHarvestGroundsSafe/Q00661_MakingTheHarvestGroundsSafe.java
@@ -50,7 +50,7 @@ public final class Q00661_MakingTheHarvestGroundsSafe extends Quest
public Q00661_MakingTheHarvestGroundsSafe()
{
- super(661, Q00661_MakingTheHarvestGroundsSafe.class.getSimpleName(), "Making the Harvest Grounds Safe");
+ super(661);
addStartNpc(NORMAN);
addTalkId(NORMAN);
addKillId(MONSTER_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index 211d00a558..2a2c7985a0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -89,7 +89,7 @@ public final class Q00662_AGameOfCards extends Quest
public Q00662_AGameOfCards()
{
- super(662, Q00662_AGameOfCards.class.getSimpleName(), "A Game of Cards");
+ super(662);
addStartNpc(KLUMP);
addTalkId(KLUMP);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index b50113816f..44b07d8eb1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -123,7 +123,7 @@ public class Q00663_SeductiveWhispers extends Quest
public Q00663_SeductiveWhispers()
{
- super(663, Q00663_SeductiveWhispers.class.getSimpleName(), "Seductive Whispers");
+ super(663);
addStartNpc(WILBERT);
addTalkId(WILBERT);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
index 8054787ace..e57b75525f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -41,7 +41,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
public Q00688_DefeatTheElrokianRaiders()
{
- super(688, Q00688_DefeatTheElrokianRaiders.class.getSimpleName(), "Defeat the Elrokian Raiders!");
+ super(688);
addStartNpc(DINN);
addTalkId(DINN);
addKillId(ELROKI);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
index 36735f9651..bc38934a8a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
@@ -64,7 +64,7 @@ public class Q00690_JudesRequest extends Quest
public Q00690_JudesRequest()
{
- super(690, Q00690_JudesRequest.class.getSimpleName(), "Jude's Request");
+ super(690);
addStartNpc(JUDE);
addTalkId(JUDE);
addKillId(LESSER_EVIL, GREATER_EVIL);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
index d759ff627e..85aa9c7442 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
@@ -58,7 +58,7 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest
public Q00691_MatrasSuspiciousRequest()
{
- super(691, Q00691_MatrasSuspiciousRequest.class.getSimpleName(), "Matras' Suspicious Request");
+ super(691);
addStartNpc(MATRAS);
addTalkId(MATRAS);
addKillId(REWARD_CHANCES.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
index 1ec66a82c1..d9130208f3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
@@ -102,7 +102,7 @@ public final class Q00692_HowtoOpposeEvil extends Quest
public Q00692_HowtoOpposeEvil()
{
- super(692, Q00692_HowtoOpposeEvil.class.getSimpleName(), "How to Oppose Evil");
+ super(692);
addStartNpc(DILIOS);
addTalkId(DILIOS, KIRKLAN);
addKillId(QUEST_MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java
index fc80b4a046..0c944c4b2c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java
@@ -39,7 +39,7 @@ public final class Q00694_BreakThroughTheHallOfSuffering extends Quest
public Q00694_BreakThroughTheHallOfSuffering()
{
- super(694, Q00694_BreakThroughTheHallOfSuffering.class.getSimpleName(), "Break Through The Hall Of Suffering");
+ super(694);
addStartNpc(TEPIOS);
addTalkId(TEPIOS);
addTalkId(TEPIOS2);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java
index 914f7cf1e4..4840d1ead6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java
@@ -39,7 +39,7 @@ public final class Q00695_DefendTheHallOfSuffering extends Quest
public Q00695_DefendTheHallOfSuffering()
{
- super(695, Q00695_DefendTheHallOfSuffering.class.getSimpleName(), "Defend The Hall of Suffering");
+ super(695);
addStartNpc(TEPIOS);
addTalkId(TEPIOS);
addTalkId(TEPIOS2);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java
index e9e21fe9a1..2912ce27b9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java
@@ -30,7 +30,7 @@ public final class Q00696_ConquerTheHallOfErosion extends Quest
public Q00696_ConquerTheHallOfErosion()
{
- super(696, Q00696_ConquerTheHallOfErosion.class.getSimpleName(), "Conquer the Hall of Erosion");
+ super(696);
addStartNpc(TEPIOS);
addTalkId(TEPIOS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java
index 6be7ad753f..cb27e48438 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java
@@ -31,7 +31,7 @@ public class Q00697_DefendTheHallOfErosion extends Quest
public Q00697_DefendTheHallOfErosion()
{
- super(697, Q00697_DefendTheHallOfErosion.class.getSimpleName(), "Defend the Hall of Erosion");
+ super(697);
addStartNpc(TEPIOS);
addTalkId(TEPIOS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java
index fa91a1648c..7594da26b7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java
@@ -31,7 +31,7 @@ public class Q00698_BlockTheLordsEscape extends Quest
public Q00698_BlockTheLordsEscape()
{
- super(698, Q00698_BlockTheLordsEscape.class.getSimpleName(), "Block the Lords Escape");
+ super(698);
addStartNpc(TEPIOS);
addTalkId(TEPIOS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
index 0d1ab46874..49d390bb7d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
@@ -55,7 +55,7 @@ public class Q00699_GuardianOfTheSkies extends Quest
public Q00699_GuardianOfTheSkies()
{
- super(699, Q00699_GuardianOfTheSkies.class.getSimpleName(), "Guardian of the Skies");
+ super(699);
addStartNpc(LEKON);
addTalkId(LEKON);
addKillId(VALDSTONE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
index 135b6bebc3..8481524345 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
@@ -63,7 +63,7 @@ public class Q00700_CursedLife extends Quest
public Q00700_CursedLife()
{
- super(700, Q00700_CursedLife.class.getSimpleName(), "Cursed Life");
+ super(700);
addStartNpc(ORBYU);
addTalkId(ORBYU);
addKillId(ROK);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
index a53aee4373..a99b439119 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
@@ -56,7 +56,7 @@ public class Q00701_ProofOfExistence extends Quest
public Q00701_ProofOfExistence()
{
- super(701, Q00701_ProofOfExistence.class.getSimpleName(), "Proof of Existence");
+ super(701);
addStartNpc(ARTIUS);
addTalkId(ARTIUS);
addKillId(MOBS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
index 0626a146b6..13fff4ca85 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
@@ -54,7 +54,7 @@ public class Q00702_ATrapForRevenge extends Quest
public Q00702_ATrapForRevenge()
{
- super(702, Q00702_ATrapForRevenge.class.getSimpleName(), "A Trap for Revenge");
+ super(702);
addStartNpc(PLENOS);
addTalkId(PLENOS, LEKON, TENIUS);
addKillId(MONSTERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java
index 5b05ddf85b..3d686dec42 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java
@@ -52,13 +52,13 @@ public class Q00708_PathToBecomingALordGludio extends Quest
public Q00708_PathToBecomingALordGludio()
{
- super(708, Q00708_PathToBecomingALordGludio.class.getSimpleName(), "Path to Becoming a Lord - Gludio");
+ super(708);
addStartNpc(Sayres);
addTalkId(Sayres);
addTalkId(Pinter);
addTalkId(Bathis);
addKillId(Mobs);
- questItemIds = new int[]
+ _questItemIds = new int[]
{
HeadlessKnightsArmor
};
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java
index 90bd701ce8..22f0cf66ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java
@@ -58,12 +58,12 @@ public class Q00709_PathToBecomingALordDion extends Quest
public Q00709_PathToBecomingALordDion()
{
- super(709, Q00709_PathToBecomingALordDion.class.getSimpleName(), "Path to Becoming a Lord - Dion");
+ super(709);
addStartNpc(Crosby);
addTalkId(Crosby);
addTalkId(Sophia);
addTalkId(Rouke);
- questItemIds = new int[]
+ _questItemIds = new int[]
{
Epaulette,
MandragoraRoot
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java
index 6db3fa4e26..c9c713de5a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java
@@ -57,13 +57,13 @@ public class Q00710_PathToBecomingALordGiran extends Quest
public Q00710_PathToBecomingALordGiran()
{
- super(710, Q00710_PathToBecomingALordGiran.class.getSimpleName(), "Path to Becoming a Lord - Giran");
+ super(710);
addStartNpc(Saul);
addTalkId(Saul);
addTalkId(Gesto);
addTalkId(Felton);
addTalkId(CargoBox);
- questItemIds = new int[]
+ _questItemIds = new int[]
{
FreightChest,
GestoBox
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java
index ed6e18c70c..18048f6ad0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java
@@ -52,7 +52,7 @@ public class Q00711_PathToBecomingALordInnadril extends Quest
public Q00711_PathToBecomingALordInnadril()
{
- super(711, Q00711_PathToBecomingALordInnadril.class.getSimpleName(), "Path to Becoming a Lord - Innadril");
+ super(711);
addStartNpc(Neurath);
addTalkId(Neurath);
addTalkId(IasonHeine);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java
index 96d861fd33..b1c3d1aef4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java
@@ -48,7 +48,7 @@ public class Q00712_PathToBecomingALordOren extends Quest
public Q00712_PathToBecomingALordOren()
{
- super(712, Q00712_PathToBecomingALordOren.class.getSimpleName(), "Path to Becoming a Lord - Oren");
+ super(712);
addStartNpc(new int[]
{
Brasseur,
@@ -58,7 +58,7 @@ public class Q00712_PathToBecomingALordOren extends Quest
addTalkId(Croop);
addTalkId(Marty);
addTalkId(Valleria);
- questItemIds = new int[]
+ _questItemIds = new int[]
{
NebuliteOrb
};
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java
index e09863b06f..05f640357f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java
@@ -42,7 +42,7 @@ public class Q00713_PathToBecomingALordAden extends Quest
public Q00713_PathToBecomingALordAden()
{
- super(713, Q00713_PathToBecomingALordAden.class.getSimpleName(), "Path to Becoming a Lord - Aden");
+ super(713);
addStartNpc(Logan);
addTalkId(Logan);
addTalkId(Orven);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java
index 03e376580d..018d50b234 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java
@@ -43,7 +43,7 @@ public class Q00714_PathToBecomingALordSchuttgart extends Quest
public Q00714_PathToBecomingALordSchuttgart()
{
- super(714, Q00714_PathToBecomingALordSchuttgart.class.getSimpleName(), "Path to Becoming a Lord - Schuttgart");
+ super(714);
addStartNpc(August);
addTalkId(August);
addTalkId(Newyear);
@@ -52,7 +52,7 @@ public class Q00714_PathToBecomingALordSchuttgart extends Quest
{
addKillId(i);
}
- questItemIds = new int[]
+ _questItemIds = new int[]
{
GolemShard
};
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java
index 69abd7ed3d..72658f7a2c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java
@@ -39,7 +39,7 @@ public class Q00715_PathToBecomingALordGoddard extends Quest
public Q00715_PathToBecomingALordGoddard()
{
- super(715, Q00715_PathToBecomingALordGoddard.class.getSimpleName(), "Path to Becoming a Lord - Goddard");
+ super(715);
addStartNpc(Alfred);
addTalkId(Alfred);
addKillId(WaterSpiritAshutar);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java
index 744bfd6e35..d26ee73622 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java
@@ -58,7 +58,7 @@ public class Q00716_PathToBecomingALordRune extends Quest
public Q00716_PathToBecomingALordRune()
{
- super(716, Q00716_PathToBecomingALordRune.class.getSimpleName(), "Path to Becoming a Lord - Rune");
+ super(716);
addStartNpc(Frederick);
addTalkId(Frederick);
addTalkId(new int[]
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index 58cfab00ea..297e78d41e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -89,7 +89,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
public Q00726_LightWithinTheDarkness()
{
- super(726, Q00726_LightWithinTheDarkness.class.getSimpleName(), "Light within the Darkness");
+ super(726);
_fortDungeons.put(35666, new FortDungeon(80));
_fortDungeons.put(35698, new FortDungeon(81));
_fortDungeons.put(35735, new FortDungeon(82));
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
index 6902f1bab4..abb318f329 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -174,7 +174,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
public Q00727_HopeWithinTheDarkness()
{
- super(727, Q00727_HopeWithinTheDarkness.class.getSimpleName(), "Hope Within The Darkness");
+ super(727);
for (int i : CASTLE_DUNGEONS.keySet())
{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
index e84e7cdc77..47480e3db1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
@@ -50,7 +50,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
public Q00901_HowLavasaurusesAreMade()
{
- super(901, Q00901_HowLavasaurusesAreMade.class.getSimpleName(), "How Lavasauruses Are Made");
+ super(901);
addStartNpc(ROONEY);
addTalkId(ROONEY);
addKillId(LAVASAURUS_NEWBORN, LAVASAURUS_FLEDGIING, LAVASAURUS_ADULT, LAVASAURUS_ELDERLY);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
index 5d9ade1491..5935fc47ab 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
@@ -61,7 +61,7 @@ public final class Q00902_ReclaimOurEra extends Quest
public Q00902_ReclaimOurEra()
{
- super(902, Q00902_ReclaimOurEra.class.getSimpleName(), "Reclaim Our Era");
+ super(902);
addStartNpc(MATHIAS);
addTalkId(MATHIAS);
addKillId(MONSTER_DROPS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
index ce95f8e5bf..8a8a6d6f0d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
@@ -46,7 +46,7 @@ public class Q00903_TheCallOfAntharas extends Quest
public Q00903_TheCallOfAntharas()
{
- super(903, Q00903_TheCallOfAntharas.class.getSimpleName(), "The Call of Antharas");
+ super(903);
addStartNpc(THEODRIC);
addTalkId(THEODRIC);
addKillId(BEHEMOTH_DRAGON, TARASK_DRAGON);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
index 99f3cf9312..2fac97862f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
@@ -43,7 +43,7 @@ public final class Q00904_DragonTrophyAntharas extends Quest
public Q00904_DragonTrophyAntharas()
{
- super(904, Q00904_DragonTrophyAntharas.class.getSimpleName(), "Dragon Trophy - Antharas");
+ super(904);
addStartNpc(THEODRIC);
addTalkId(THEODRIC);
addKillId(ANTHARAS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
index 905273e941..ca23b5e885 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
@@ -72,7 +72,7 @@ public final class Q00905_RefinedDragonBlood extends Quest
public Q00905_RefinedDragonBlood()
{
- super(905, Q00905_RefinedDragonBlood.class.getSimpleName(), "Refined Dragon Blood");
+ super(905);
addStartNpc(SEPARATED_SOULS);
addTalkId(SEPARATED_SOULS);
addKillId(MONSTERS.keySet());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
index 6687d047fc..fe2949dc93 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
@@ -44,7 +44,7 @@ public class Q00906_TheCallOfValakas extends Quest
public Q00906_TheCallOfValakas()
{
- super(906, Q00906_TheCallOfValakas.class.getSimpleName(), "The Call of Valakas");
+ super(906);
addStartNpc(KLEIN);
addTalkId(KLEIN);
addKillId(LAVASAURUS_ALPHA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
index 07478dd437..82d47b1d32 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
@@ -43,7 +43,7 @@ public class Q00907_DragonTrophyValakas extends Quest
public Q00907_DragonTrophyValakas()
{
- super(907, Q00907_DragonTrophyValakas.class.getSimpleName(), "Dragon Trophy - Valakas");
+ super(907);
addStartNpc(KLEIN);
addTalkId(KLEIN);
addKillId(VALAKAS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java
index 0307151a41..7943aa7a94 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java
@@ -41,7 +41,7 @@ public class Q00998_FallenAngelSelect extends Quest
public Q00998_FallenAngelSelect()
{
- super(998, Q00998_FallenAngelSelect.class.getSimpleName(), "Fallen Angel - Select");
+ super(998);
setIsCustom(true);
addStartNpc(NATOOLS);
addTalkId(NATOOLS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00999_T1Tutorial/Q00999_T1Tutorial.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00999_T1Tutorial/Q00999_T1Tutorial.java
index 123a18fe72..d6842f6e6c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00999_T1Tutorial/Q00999_T1Tutorial.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00999_T1Tutorial/Q00999_T1Tutorial.java
@@ -83,7 +83,7 @@ public class Q00999_T1Tutorial extends Quest
public Q00999_T1Tutorial()
{
- super(-1, Q00999_T1Tutorial.class.getSimpleName(), "Kamael Tutorial");
+ super(-1);
// @formatter:off
Event.put("32133_02", new Object[]{"32133-03.htm", -119692, 44504, 380, DIPLOMA, 0x7b, SOULSHOT_NOVICE, 200, 0x7c, SOULSHOT_NOVICE, 200});
Event.put("30008_02", new Object[]{"30008-03.htm", 0, 0, 0, RECOMMENDATION_01, 0x00, SOULSHOT_NOVICE, 200, 0x00, 0, 0});
@@ -306,9 +306,9 @@ public class Q00999_T1Tutorial extends Quest
st.setState(State.STARTED);
}
}
- else if ((step == 1) && (getQuestItemsCount(player, talk.item) == 0) && (Ex <= 2))
+ else if ((step == 1) && !hasQuestItems(player, talk.item) && (Ex <= 2))
{
- if (getQuestItemsCount(player, BLUE_GEM) != 0)
+ if (hasQuestItems(player, BLUE_GEM))
{
takeItems(player, BLUE_GEM, -1);
giveItems(player, talk.item, 1);
@@ -417,7 +417,7 @@ public class Q00999_T1Tutorial extends Quest
qs.set("Ex", "2");
}
- if ((Ex == 2) && (getQuestItemsCount(player, BLUE_GEM) < 1))
+ if ((Ex == 2) && !hasQuestItems(player, BLUE_GEM))
{
((L2MonsterInstance) npc).dropItem(player, BLUE_GEM, 1);
playSound(player, "ItemSound.quest_tutorial");
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
index ef2151b3bb..9d90e7385b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
@@ -38,7 +38,7 @@ public class Q10267_JourneyToGracia extends Quest
public Q10267_JourneyToGracia()
{
- super(10267, Q10267_JourneyToGracia.class.getSimpleName(), "Journey to Gracia");
+ super(10267);
addStartNpc(ORVEN);
addTalkId(ORVEN, KEUCEREUS, PAPIKU);
registerQuestItems(LETTER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
index 2929176f2c..62f504a269 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
@@ -37,7 +37,7 @@ public class Q10268_ToTheSeedOfInfinity extends Quest
public Q10268_ToTheSeedOfInfinity()
{
- super(10268, Q10268_ToTheSeedOfInfinity.class.getSimpleName(), "To the Seed of Infinity");
+ super(10268);
addStartNpc(KEUCEREUS);
addTalkId(KEUCEREUS, TEPIOS);
registerQuestItems(INTRODUCTION);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
index 1b24bd5d49..667221dfd6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
@@ -37,7 +37,7 @@ public class Q10269_ToTheSeedOfDestruction extends Quest
public Q10269_ToTheSeedOfDestruction()
{
- super(10269, Q10269_ToTheSeedOfDestruction.class.getSimpleName(), "To the Seed of Destruction");
+ super(10269);
addStartNpc(KEUCEREUS);
addTalkId(KEUCEREUS, ALLENOS);
registerQuestItems(INTRODUCTION);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10270_BirthOfTheSeed/Q10270_BirthOfTheSeed.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10270_BirthOfTheSeed/Q10270_BirthOfTheSeed.java
index f8ba7788eb..1d2859b44e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10270_BirthOfTheSeed/Q10270_BirthOfTheSeed.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10270_BirthOfTheSeed/Q10270_BirthOfTheSeed.java
@@ -54,7 +54,7 @@ public final class Q10270_BirthOfTheSeed extends Quest
public Q10270_BirthOfTheSeed()
{
- super(10270, Q10270_BirthOfTheSeed.class.getSimpleName(), "Birth of the Seed");
+ super(10270);
addStartNpc(PLENOS);
addTalkId(PLENOS, GINBY, LELRIKIA, ARTIUS);
addKillId(COHEMENES, YEHAN_KLODEKUS, YEHAN_KLANIKUS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
index 6b56afb566..478a778c81 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
@@ -37,7 +37,7 @@ public class Q10271_TheEnvelopingDarkness extends Quest
public Q10271_TheEnvelopingDarkness()
{
- super(10271, Q10271_TheEnvelopingDarkness.class.getSimpleName(), "The Enveloping Darkness");
+ super(10271);
addStartNpc(ORBYU);
addTalkId(ORBYU, EL, MEDIBAL_CORPSE);
registerQuestItems(MEDIBAL_DOCUMENT);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
index 1e6adae933..a31211b382 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
@@ -63,7 +63,7 @@ public class Q10272_LightFragment extends Quest
public Q10272_LightFragment()
{
- super(10272, Q10272_LightFragment.class.getSimpleName(), "Light Fragment");
+ super(10272);
addStartNpc(ORBYU);
addTalkId(ORBYU, ARTIUS, GINBY, LELRIKIA, LEKON);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
index 2884a27a1f..ee93fae768 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -47,7 +47,7 @@ public class Q10273_GoodDayToFly extends Quest
public Q10273_GoodDayToFly()
{
- super(10273, Q10273_GoodDayToFly.class.getSimpleName(), "Good Day to Fly");
+ super(10273);
addStartNpc(LEKON);
addTalkId(LEKON);
addKillId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
index b0235e4c05..6ca2a3fcc5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
@@ -57,7 +57,7 @@ public class Q10274_CollectingInTheAir extends Quest
public Q10274_CollectingInTheAir()
{
- super(10274, Q10274_CollectingInTheAir.class.getSimpleName(), "Collecting in the Air");
+ super(10274);
addStartNpc(LEKON);
addTalkId(LEKON);
addSkillSeeId(MOBS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
index 9815705d64..cff94a8340 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
@@ -52,7 +52,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
public Q10275_ContainingTheAttributePower()
{
- super(10275, Q10275_ContainingTheAttributePower.class.getSimpleName(), "Containing the Attribute Power");
+ super(10275);
addStartNpc(HOLLY, WEBER);
addTalkId(HOLLY, WEBER, YIN, YANG);
addKillId(AIR, WATER);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
index 982ea877ff..e2df986cf8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
@@ -44,7 +44,7 @@ public class Q10276_MutatedKaneusGludio extends Quest
public Q10276_MutatedKaneusGludio()
{
- super(10276, Q10276_MutatedKaneusGludio.class.getSimpleName(), "Mutated Kaneus - Gludio");
+ super(10276);
addStartNpc(BATHIS);
addTalkId(BATHIS, ROHMER);
addKillId(TOMLAN_KAMOS, OL_ARIOSH);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
index c9e5d0a4c9..ae510ff1ed 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
@@ -44,7 +44,7 @@ public class Q10277_MutatedKaneusDion extends Quest
public Q10277_MutatedKaneusDion()
{
- super(10277, Q10277_MutatedKaneusDion.class.getSimpleName(), "Mutated Kaneus - Dion");
+ super(10277);
addStartNpc(LUKAS);
addTalkId(LUKAS, MIRIEN);
addKillId(CRIMSON_HATU, SEER_FLOUROS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
index 4746d0dd31..0d525afc99 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
@@ -44,7 +44,7 @@ public class Q10278_MutatedKaneusHeine extends Quest
public Q10278_MutatedKaneusHeine()
{
- super(10278, Q10278_MutatedKaneusHeine.class.getSimpleName(), "Mutated Kaneus - Heine");
+ super(10278);
addStartNpc(GOSTA);
addTalkId(GOSTA, MINEVIA);
addKillId(BLADE_OTIS, WEIRD_BUNEI);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
index ccd3f8052c..b67ca26e0c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
@@ -44,7 +44,7 @@ public class Q10279_MutatedKaneusOren extends Quest
public Q10279_MutatedKaneusOren()
{
- super(10279, Q10279_MutatedKaneusOren.class.getSimpleName(), "Mutated Kaneus - Oren");
+ super(10279);
addStartNpc(MOUEN);
addTalkId(MOUEN, ROVIA);
addKillId(KAIM_ABIGORE, KNIGHT_MONTAGNAR);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
index 7f4d3f97c3..5e5b159709 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
@@ -44,7 +44,7 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
public Q10280_MutatedKaneusSchuttgart()
{
- super(10280, Q10280_MutatedKaneusSchuttgart.class.getSimpleName(), "Mutated Kaneus - Schuttgart");
+ super(10280);
addStartNpc(VISHOTSKY);
addTalkId(VISHOTSKY, ATRAXIA);
addKillId(VENOMOUS_STORACE, KEL_BILETTE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
index d9a8ff18e3..44c42aa904 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
@@ -42,7 +42,7 @@ public class Q10281_MutatedKaneusRune extends Quest
public Q10281_MutatedKaneusRune()
{
- super(10281, Q10281_MutatedKaneusRune.class.getSimpleName(), "Mutated Kaneus - Rune");
+ super(10281);
addStartNpc(MATHIAS);
addTalkId(MATHIAS, KAYAN);
addKillId(WHITE_ALLOSCE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
index 93a487ea9a..1e004aaf1f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
@@ -37,7 +37,7 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
public Q10282_ToTheSeedOfAnnihilation()
{
- super(10282, Q10282_ToTheSeedOfAnnihilation.class.getSimpleName(), "To the Seed of Annihilation");
+ super(10282);
addStartNpc(KBALDIR);
addTalkId(KBALDIR, KLEMIS);
registerQuestItems(SOA_ORDERS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
index e29c6be8c4..ad35542ad8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
@@ -42,7 +42,7 @@ public class Q10283_RequestOfIceMerchant extends Quest
public Q10283_RequestOfIceMerchant()
{
- super(10283, Q10283_RequestOfIceMerchant.class.getSimpleName(), "Request of Ice Merchant");
+ super(10283);
addStartNpc(RAFFORTY);
addTalkId(RAFFORTY, KIER, JINIA);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
index b523d3fa30..b946673a6c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java
@@ -47,7 +47,7 @@ public final class Q10284_AcquisitionOfDivineSword extends Quest
public Q10284_AcquisitionOfDivineSword()
{
- super(10284, Q10284_AcquisitionOfDivineSword.class.getSimpleName(), "Acquisition of Divine Sword");
+ super(10284);
addStartNpc(RAFFORTY);
addTalkId(RAFFORTY, JINIA, TARUN, KRUN);
registerQuestItems(COLD_RESISTANCE_POTION);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
index 37aeb7b201..bf79dfba8b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java
@@ -51,7 +51,7 @@ public final class Q10285_MeetingSirra extends Quest
public Q10285_MeetingSirra()
{
- super(10285, Q10285_MeetingSirra.class.getSimpleName(), "Meeting Sirra");
+ super(10285);
addStartNpc(RAFFORTY);
addTalkId(RAFFORTY, JINIA, KEGOR, SIRRA, JINIA2, FREYAS_STEWARD);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
index cde2f0c1fb..b8f4ca38e3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java
@@ -50,7 +50,7 @@ public final class Q10286_ReunionWithSirra extends Quest
public Q10286_ReunionWithSirra()
{
- super(10286, Q10286_ReunionWithSirra.class.getSimpleName(), "Reunion with Sirra");
+ super(10286);
addStartNpc(RAFFORTY);
addTalkId(RAFFORTY, JINIA, SIRRA, JINIA2);
registerQuestItems(BLACK_FROZEN_CORE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
index 991473bdb3..cd5b2788f4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java
@@ -44,7 +44,7 @@ public final class Q10287_StoryOfThoseLeft extends Quest
public Q10287_StoryOfThoseLeft()
{
- super(10287, Q10287_StoryOfThoseLeft.class.getSimpleName(), "Story of Those Left");
+ super(10287);
addStartNpc(RAFFORTY);
addTalkId(RAFFORTY, JINIA, KEGOR);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
index a185135976..4c4de250dc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
@@ -40,7 +40,7 @@ public class Q10288_SecretMission extends Quest
public Q10288_SecretMission()
{
- super(10288, Q10288_SecretMission.class.getSimpleName(), "Secret Mission");
+ super(10288);
addStartNpc(AQUILANI, DOMINIC);
addFirstTalkId(AQUILANI);
addTalkId(DOMINIC, GREYMORE, AQUILANI);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
index 101e80fb37..57cc21ff92 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
@@ -40,7 +40,7 @@ public class Q10289_FadeToBlack extends Quest
public Q10289_FadeToBlack()
{
- super(10289, Q10289_FadeToBlack.class.getSimpleName(), "Fade to Black");
+ super(10289);
addStartNpc(GREYMORE);
addTalkId(GREYMORE);
addKillId(ANAYS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
index a97cbe71cc..d42245e9ba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
@@ -46,7 +46,7 @@ public final class Q10290_LandDragonConqueror extends Quest
public Q10290_LandDragonConqueror()
{
- super(10290, Q10290_LandDragonConqueror.class.getSimpleName(), "Land Dragon Conqueror");
+ super(10290);
addStartNpc(THEODRIC);
addTalkId(THEODRIC);
addKillId(ANTHARAS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
index 6a90624d88..34a634485e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
@@ -44,7 +44,7 @@ public class Q10291_FireDragonDestroyer extends Quest
public Q10291_FireDragonDestroyer()
{
- super(10291, Q10291_FireDragonDestroyer.class.getSimpleName(), "Fire Dragon Destroyer");
+ super(10291);
addStartNpc(KLEIN);
addTalkId(KLEIN);
addKillId(VALAKAS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
index f599dae21c..34d59013d5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
@@ -59,7 +59,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
public Q10292_SevenSignsGirlOfDoubt()
{
- super(10292, Q10292_SevenSignsGirlOfDoubt.class.getSimpleName(), "Seven Signs, Girl of Doubt");
+ super(10292);
addStartNpc(WOOD);
addSpawnId(ELCADIA);
addTalkId(WOOD, FRANZ, ELCADIA, HARDIN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
index 765b940266..a0e4fe05dd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java
@@ -47,7 +47,7 @@ public final class Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom extends
public Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom()
{
- super(10293, Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.class.getSimpleName(), "Seven Signs, Forbidden Book of the Elmore-Aden Kingdom");
+ super(10293);
addFirstTalkId(SOPHIA3);
addStartNpc(ELCADIA);
addTalkId(ELCADIA, ELCADIA_INSTANCE, SOPHIA1, SOPHIA2, SOPHIA3, PILE_OF_BOOKS1, PILE_OF_BOOKS2, PILE_OF_BOOKS3, PILE_OF_BOOKS4, PILE_OF_BOOKS5);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
index d25c574937..a55d55ff13 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java
@@ -84,7 +84,7 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
public Q10294_SevenSignsToTheMonasteryOfSilence()
{
- super(10294, Q10294_SevenSignsToTheMonasteryOfSilence.class.getSimpleName(), "Seven Signs, To the Monastery of Silence");
+ super(10294);
addFirstTalkId(ELCADIA_INSTANCE);
addStartNpc(ELCADIA, ODD_GLOBE, ELCADIA_INSTANCE, RELIC_GUARDIAN);
addTalkId(ELCADIA, ELCADIA_INSTANCE, ERIS_EVIL_THOUGHTS, RELIC_GUARDIAN, ODD_GLOBE, READING_DESK1, READING_DESK2, READING_DESK3, READING_DESK4, READING_DESK5, READING_DESK6, READING_DESK7, READING_DESK8, READING_DESK9, READING_DESK10, READING_DESK11, READING_DESK12, READING_DESK13, READING_DESK14, READING_DESK15, READING_DESK16, JUDE_VAN_ETINA, SOLINAS_EVIL_THOUGHTS, RELIC_WATCHER1, RELIC_WATCHER2, RELIC_WATCHER3, RELIC_WATCHER4);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
index 7d95ae17fd..260f4ea1ab 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java
@@ -60,7 +60,7 @@ public final class Q10295_SevenSignsSolinasTomb extends Quest
public Q10295_SevenSignsSolinasTomb()
{
- super(10295, Q10295_SevenSignsSolinasTomb.class.getSimpleName(), "Seven Signs, Solina's Tomb");
+ super(10295);
addStartNpc(ERISS_EVIL_THOUGHTS);
addTalkId(ERISS_EVIL_THOUGHTS, SOLINAS_EVIL_THOUGHTS, SOLINA, ERIS, ANAIS, JUDE_VAN_ETINA, TELEPORT_CONTROL_DEVICE_1, POWERFUL_DEVICE_1, POWERFUL_DEVICE_2, POWERFUL_DEVICE_3, POWERFUL_DEVICE_4, TELEPORT_CONTROL_DEVICE_2, TOMB_OF_THE_SAINTESS, TELEPORT_CONTROL_DEVICE_3, ALTAR_OF_HALLOWS_1, ALTAR_OF_HALLOWS_2, ALTAR_OF_HALLOWS_3, ALTAR_OF_HALLOWS_4, ELCADIA);
registerQuestItems(SCROLL_OF_ABSTINENCE, SHIELD_OF_SACRIFICE, SWORD_OF_HOLY_SPIRIT, STAFF_OF_BLESSING);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
index 787fd12855..9e48856ae0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java
@@ -45,7 +45,7 @@ public final class Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal extends Quest
public Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal()
{
- super(10296, Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.class.getSimpleName(), "Seven Signs, One Who Seeks the Power of the Seal");
+ super(10296);
addStartNpc(ERISS_EVIL_THOUGHTS, ODD_GLOBE);
addTalkId(ERISS_EVIL_THOUGHTS, ODD_GLOBE, HARDIN, WOOD, FRANZ, ELCADIA, ELCADIA_2);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
index 17c286bb41..d33179dc82 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java
@@ -43,7 +43,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
public Q10501_ZakenEmbroideredSoulCloak()
{
- super(10501, Q10501_ZakenEmbroideredSoulCloak.class.getSimpleName(), "Zaken Embroidered Soul Cloak");
+ super(10501);
addStartNpc(OLF_ADAMS);
addTalkId(OLF_ADAMS);
addKillId(ZAKEN);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
index b60165a7bb..9a4ec68ac1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
@@ -43,7 +43,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
public Q10502_FreyaEmbroideredSoulCloak()
{
- super(10502, Q10502_FreyaEmbroideredSoulCloak.class.getSimpleName(), "Freya Embroidered Soul Cloak");
+ super(10502);
addStartNpc(OLF_ADAMS);
addTalkId(OLF_ADAMS);
addKillId(FREYA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
index 4934e1fa48..25ec6e9edc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java
@@ -44,7 +44,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
public Q10503_FrintezzaEmbroideredSoulCloak()
{
- super(10503, Q10503_FrintezzaEmbroideredSoulCloak.class.getSimpleName(), "Frintezza Embroidered Soul Cloak");
+ super(10503);
addStartNpc(OLF_ADAMS);
addTalkId(OLF_ADAMS);
addKillId(SCARLET_VAN_HALISHA);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
index 388847fa10..1d52fe383d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java
@@ -44,7 +44,7 @@ public final class Q10504_JewelOfAntharas extends Quest
public Q10504_JewelOfAntharas()
{
- super(10504, Q10504_JewelOfAntharas.class.getSimpleName(), "Jewel of Antharas");
+ super(10504);
addStartNpc(THEODRIC);
addTalkId(THEODRIC);
addKillId(ANTHARAS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
index eb749afe5f..7bca212a88 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java
@@ -44,7 +44,7 @@ public class Q10505_JewelOfValakas extends Quest
public Q10505_JewelOfValakas()
{
- super(10505, Q10505_JewelOfValakas.class.getSimpleName(), "Jewel of Valakas");
+ super(10505);
addStartNpc(KLEIN);
addTalkId(KLEIN);
addKillId(VALAKAS);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00717_ForTheSakeOfTheTerritoryGludio.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00717_ForTheSakeOfTheTerritoryGludio.java
index 03b094bbfc..5f83f3be79 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00717_ForTheSakeOfTheTerritoryGludio.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00717_ForTheSakeOfTheTerritoryGludio.java
@@ -26,7 +26,7 @@ public final class Q00717_ForTheSakeOfTheTerritoryGludio extends TerritoryWarSup
{
public Q00717_ForTheSakeOfTheTerritoryGludio()
{
- super(717, Q00717_ForTheSakeOfTheTerritoryGludio.class.getSimpleName(), "For the Sake of the Territory - Gludio");
+ super(717);
CATAPULT_ID = 36499;
TERRITORY_ID = 81;
LEADER_IDS = new int[]
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00718_ForTheSakeOfTheTerritoryDion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00718_ForTheSakeOfTheTerritoryDion.java
index 75c4a72012..4313829287 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00718_ForTheSakeOfTheTerritoryDion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00718_ForTheSakeOfTheTerritoryDion.java
@@ -26,7 +26,7 @@ public final class Q00718_ForTheSakeOfTheTerritoryDion extends TerritoryWarSuper
{
public Q00718_ForTheSakeOfTheTerritoryDion()
{
- super(718, Q00718_ForTheSakeOfTheTerritoryDion.class.getSimpleName(), "For the Sake of the Territory - Dion");
+ super(718);
CATAPULT_ID = 36500;
TERRITORY_ID = 82;
LEADER_IDS = new int[]
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00719_ForTheSakeOfTheTerritoryGiran.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00719_ForTheSakeOfTheTerritoryGiran.java
index 7e35cb6971..a678353cb9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00719_ForTheSakeOfTheTerritoryGiran.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00719_ForTheSakeOfTheTerritoryGiran.java
@@ -26,7 +26,7 @@ public final class Q00719_ForTheSakeOfTheTerritoryGiran extends TerritoryWarSupe
{
public Q00719_ForTheSakeOfTheTerritoryGiran()
{
- super(719, Q00719_ForTheSakeOfTheTerritoryGiran.class.getSimpleName(), "For the Sake of the Territory - Giran");
+ super(719);
CATAPULT_ID = 36501;
TERRITORY_ID = 83;
LEADER_IDS = new int[]
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00720_ForTheSakeOfTheTerritoryOren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00720_ForTheSakeOfTheTerritoryOren.java
index 703db21649..58a1814bdb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00720_ForTheSakeOfTheTerritoryOren.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00720_ForTheSakeOfTheTerritoryOren.java
@@ -26,7 +26,7 @@ public final class Q00720_ForTheSakeOfTheTerritoryOren extends TerritoryWarSuper
{
public Q00720_ForTheSakeOfTheTerritoryOren()
{
- super(720, Q00720_ForTheSakeOfTheTerritoryOren.class.getSimpleName(), "For the Sake of the Territory - Oren");
+ super(720);
CATAPULT_ID = 36502;
TERRITORY_ID = 84;
LEADER_IDS = new int[]
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00721_ForTheSakeOfTheTerritoryAden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00721_ForTheSakeOfTheTerritoryAden.java
index 78674e0849..9d5d9a50ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00721_ForTheSakeOfTheTerritoryAden.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00721_ForTheSakeOfTheTerritoryAden.java
@@ -26,7 +26,7 @@ public final class Q00721_ForTheSakeOfTheTerritoryAden extends TerritoryWarSuper
{
public Q00721_ForTheSakeOfTheTerritoryAden()
{
- super(721, Q00721_ForTheSakeOfTheTerritoryAden.class.getSimpleName(), "For the Sake of the Territory - Aden");
+ super(721);
CATAPULT_ID = 36503;
TERRITORY_ID = 85;
LEADER_IDS = new int[]
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00722_ForTheSakeOfTheTerritoryInnadril.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00722_ForTheSakeOfTheTerritoryInnadril.java
index 87e7774e95..2df8cd2117 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00722_ForTheSakeOfTheTerritoryInnadril.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00722_ForTheSakeOfTheTerritoryInnadril.java
@@ -26,7 +26,7 @@ public final class Q00722_ForTheSakeOfTheTerritoryInnadril extends TerritoryWarS
{
public Q00722_ForTheSakeOfTheTerritoryInnadril()
{
- super(722, Q00722_ForTheSakeOfTheTerritoryInnadril.class.getSimpleName(), "For the Sake of the Territory - Innadril");
+ super(722);
CATAPULT_ID = 36504;
TERRITORY_ID = 86;
LEADER_IDS = new int[]
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00723_ForTheSakeOfTheTerritoryGoddard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00723_ForTheSakeOfTheTerritoryGoddard.java
index f981cfa005..4962d9c296 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00723_ForTheSakeOfTheTerritoryGoddard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00723_ForTheSakeOfTheTerritoryGoddard.java
@@ -26,7 +26,7 @@ public final class Q00723_ForTheSakeOfTheTerritoryGoddard extends TerritoryWarSu
{
public Q00723_ForTheSakeOfTheTerritoryGoddard()
{
- super(723, Q00723_ForTheSakeOfTheTerritoryGoddard.class.getSimpleName(), "For the Sake of the Territory - Goddard");
+ super(723);
CATAPULT_ID = 36505;
TERRITORY_ID = 87;
LEADER_IDS = new int[]
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00724_ForTheSakeOfTheTerritoryRune.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00724_ForTheSakeOfTheTerritoryRune.java
index d0544d29b2..be3e030bbd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00724_ForTheSakeOfTheTerritoryRune.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00724_ForTheSakeOfTheTerritoryRune.java
@@ -26,7 +26,7 @@ public final class Q00724_ForTheSakeOfTheTerritoryRune extends TerritoryWarSuper
{
public Q00724_ForTheSakeOfTheTerritoryRune()
{
- super(724, Q00724_ForTheSakeOfTheTerritoryRune.class.getSimpleName(), "For the Sake of the Territory - Rune");
+ super(724);
CATAPULT_ID = 36506;
TERRITORY_ID = 88;
LEADER_IDS = new int[]
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00725_ForTheSakeOfTheTerritorySchuttgart.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00725_ForTheSakeOfTheTerritorySchuttgart.java
index 7ed839a5fb..c5ea08b988 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00725_ForTheSakeOfTheTerritorySchuttgart.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00725_ForTheSakeOfTheTerritorySchuttgart.java
@@ -26,7 +26,7 @@ public final class Q00725_ForTheSakeOfTheTerritorySchuttgart extends TerritoryWa
{
public Q00725_ForTheSakeOfTheTerritorySchuttgart()
{
- super(725, Q00725_ForTheSakeOfTheTerritorySchuttgart.class.getSimpleName(), "For the Sake of the Territory - Schuttgart");
+ super(725);
CATAPULT_ID = 36507;
TERRITORY_ID = 89;
LEADER_IDS = new int[]
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00729_ProtectTheTerritoryCatapult.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00729_ProtectTheTerritoryCatapult.java
index 7c7b6a155a..11d9a578b0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00729_ProtectTheTerritoryCatapult.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00729_ProtectTheTerritoryCatapult.java
@@ -24,7 +24,7 @@ public final class Q00729_ProtectTheTerritoryCatapult extends TerritoryWarSuperC
{
public Q00729_ProtectTheTerritoryCatapult()
{
- super(729, Q00729_ProtectTheTerritoryCatapult.class.getSimpleName(), "Protect the Territory Catapult");
+ super(729);
NPC_IDS = new int[]
{
36499,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00730_ProtectTheSuppliesSafe.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00730_ProtectTheSuppliesSafe.java
index 5ecddfd2e0..890e1a2ed6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00730_ProtectTheSuppliesSafe.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00730_ProtectTheSuppliesSafe.java
@@ -24,7 +24,7 @@ public final class Q00730_ProtectTheSuppliesSafe extends TerritoryWarSuperClass
{
public Q00730_ProtectTheSuppliesSafe()
{
- super(730, Q00730_ProtectTheSuppliesSafe.class.getSimpleName(), "Protect the Supplies Safe");
+ super(730);
NPC_IDS = new int[]
{
36591,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00731_ProtectTheMilitaryAssociationLeader.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00731_ProtectTheMilitaryAssociationLeader.java
index 6579ba31c8..31c7d47ec1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00731_ProtectTheMilitaryAssociationLeader.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00731_ProtectTheMilitaryAssociationLeader.java
@@ -24,7 +24,7 @@ public final class Q00731_ProtectTheMilitaryAssociationLeader extends TerritoryW
{
public Q00731_ProtectTheMilitaryAssociationLeader()
{
- super(731, Q00731_ProtectTheMilitaryAssociationLeader.class.getSimpleName(), "Protect the Military Association Leader");
+ super(731);
NPC_IDS = new int[]
{
36508,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00732_ProtectTheReligiousAssociationLeader.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00732_ProtectTheReligiousAssociationLeader.java
index a663992b11..639a5103ec 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00732_ProtectTheReligiousAssociationLeader.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00732_ProtectTheReligiousAssociationLeader.java
@@ -24,7 +24,7 @@ public final class Q00732_ProtectTheReligiousAssociationLeader extends Territory
{
public Q00732_ProtectTheReligiousAssociationLeader()
{
- super(732, Q00732_ProtectTheReligiousAssociationLeader.class.getSimpleName(), "Protect the Religious Association Leader");
+ super(732);
NPC_IDS = new int[]
{
36510,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00733_ProtectTheEconomicAssociationLeader.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00733_ProtectTheEconomicAssociationLeader.java
index 3a1d072402..a87f8cb23d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00733_ProtectTheEconomicAssociationLeader.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00733_ProtectTheEconomicAssociationLeader.java
@@ -24,7 +24,7 @@ public final class Q00733_ProtectTheEconomicAssociationLeader extends TerritoryW
{
public Q00733_ProtectTheEconomicAssociationLeader()
{
- super(733, Q00733_ProtectTheEconomicAssociationLeader.class.getSimpleName(), "Protect the Economic Association Leader");
+ super(733);
NPC_IDS = new int[]
{
36513,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00734_PierceThroughAShield.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00734_PierceThroughAShield.java
index 296ecf2de0..828c1b21eb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00734_PierceThroughAShield.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00734_PierceThroughAShield.java
@@ -26,7 +26,7 @@ public final class Q00734_PierceThroughAShield extends TerritoryWarSuperClass
{
public Q00734_PierceThroughAShield()
{
- super(734, Q00734_PierceThroughAShield.class.getSimpleName(), "Pierce through a Shield");
+ super(734);
CLASS_IDS = new int[]
{
6,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00735_MakeSpearsDull.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00735_MakeSpearsDull.java
index ac7ef7a234..0621ff6f7f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00735_MakeSpearsDull.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00735_MakeSpearsDull.java
@@ -26,7 +26,7 @@ public final class Q00735_MakeSpearsDull extends TerritoryWarSuperClass
{
public Q00735_MakeSpearsDull()
{
- super(735, Q00735_MakeSpearsDull.class.getSimpleName(), "Make Spears Dull");
+ super(735);
CLASS_IDS = new int[]
{
23,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00736_WeakenTheMagic.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00736_WeakenTheMagic.java
index 577597fc50..37fd785ee5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00736_WeakenTheMagic.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00736_WeakenTheMagic.java
@@ -26,7 +26,7 @@ public final class Q00736_WeakenTheMagic extends TerritoryWarSuperClass
{
public Q00736_WeakenTheMagic()
{
- super(736, Q00736_WeakenTheMagic.class.getSimpleName(), "Weaken the magic");
+ super(736);
CLASS_IDS = new int[]
{
40,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00737_DenyBlessings.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00737_DenyBlessings.java
index 935190bd07..9f98bf1b2b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00737_DenyBlessings.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00737_DenyBlessings.java
@@ -26,7 +26,7 @@ public final class Q00737_DenyBlessings extends TerritoryWarSuperClass
{
public Q00737_DenyBlessings()
{
- super(737, Q00737_DenyBlessings.class.getSimpleName(), "Deny Blessings");
+ super(737);
CLASS_IDS = new int[]
{
43,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00738_DestroyKeyTargets.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00738_DestroyKeyTargets.java
index 84b2305f6d..7ab60466ae 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00738_DestroyKeyTargets.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/Q00738_DestroyKeyTargets.java
@@ -26,7 +26,7 @@ public final class Q00738_DestroyKeyTargets extends TerritoryWarSuperClass
{
public Q00738_DestroyKeyTargets()
{
- super(738, Q00738_DestroyKeyTargets.class.getSimpleName(), "Destroy Key Targets");
+ super(738);
CLASS_IDS = new int[]
{
51,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
index 082878d328..5feafb35b4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
@@ -59,9 +59,9 @@ public class TerritoryWarSuperClass extends Quest
public int RANDOM_MIN;
public int RANDOM_MAX;
- public TerritoryWarSuperClass(int questId, String name, String descr)
+ public TerritoryWarSuperClass(int questId)
{
- super(questId, name, descr);
+ super(questId);
if (questId < 0)
{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClassLoader.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClassLoader.java
index f7a89262a8..b35cbaa9ce 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClassLoader.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClassLoader.java
@@ -46,7 +46,7 @@ public class TerritoryWarSuperClassLoader
public static void main(String[] args)
{
// initialize superclass
- new TerritoryWarSuperClass(-1, TerritoryWarSuperClass.class.getSimpleName(), "Territory War Superclass");
+ new TerritoryWarSuperClass(-1);
// initialize subclasses
// "For The Sake" quests
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/Alliance/Alliance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/Alliance/Alliance.java
index 9bb1710fec..a20412112a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/Alliance/Alliance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/Alliance/Alliance.java
@@ -18,12 +18,13 @@ package village_master.Alliance;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.quest.Quest;
+
+import ai.AbstractNpcAI;
/**
* @author UnAfraid
*/
-public final class Alliance extends Quest
+public final class Alliance extends AbstractNpcAI
{
// @formatter:off
private static final int[] NPCS =
@@ -45,7 +46,6 @@ public final class Alliance extends Quest
private Alliance()
{
- super(-1, Alliance.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/Clan/Clan.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/Clan/Clan.java
index 513ed9336e..1d42130e43 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/Clan/Clan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/Clan/Clan.java
@@ -21,12 +21,13 @@ import java.util.Map;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.quest.Quest;
+
+import ai.AbstractNpcAI;
/**
* @author UnAfraid
*/
-public final class Clan extends Quest
+public final class Clan extends AbstractNpcAI
{
// @formatter:off
private static final int[] NPCS =
@@ -63,7 +64,6 @@ public final class Clan extends Quest
private Clan()
{
- super(-1, Clan.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 543157fc0d..eca8c7233d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -21,14 +21,15 @@ import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.base.ClassId;
-import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.util.Util;
+import ai.AbstractNpcAI;
+
/**
* Dark Elven Change Part 1.
* @author nonom
*/
-public final class DarkElfChange1 extends Quest
+public final class DarkElfChange1 extends AbstractNpcAI
{
// NPCs
private static int[] NPCS =
@@ -56,7 +57,6 @@ public final class DarkElfChange1 extends Quest
// @formatter:on
private DarkElfChange1()
{
- super(-1, DarkElfChange1.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index d827e71f46..ffbdeccae6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -21,14 +21,15 @@ import com.l2jmobius.gameserver.enums.Race;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.base.ClassId;
-import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.util.Util;
+import ai.AbstractNpcAI;
+
/**
* Dark Elven Change Part 2.
* @author nonom
*/
-public final class DarkElfChange2 extends Quest
+public final class DarkElfChange2 extends AbstractNpcAI
{
// NPCs
private static int[] NPCS =
@@ -72,7 +73,6 @@ public final class DarkElfChange2 extends Quest
// @formatter:on
private DarkElfChange2()
{
- super(-1, DarkElfChange2.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index a49ca69db4..2c81feca3c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -46,7 +46,6 @@ public final class DwarfBlacksmithChange1 extends AbstractNpcAI
private DwarfBlacksmithChange1()
{
- super(DwarfBlacksmithChange1.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index 86a0778127..a4e85c3be8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -52,7 +52,6 @@ public final class DwarfBlacksmithChange2 extends AbstractNpcAI
private DwarfBlacksmithChange2()
{
- super(DwarfBlacksmithChange2.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index 0856dd8fd7..1774baf884 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -46,7 +46,6 @@ public final class DwarfWarehouseChange1 extends AbstractNpcAI
private DwarfWarehouseChange1()
{
- super(DwarfWarehouseChange1.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index 7a4309368e..4c03818e94 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -52,7 +52,6 @@ public final class DwarfWarehouseChange2 extends AbstractNpcAI
private DwarfWarehouseChange2()
{
- super(DwarfWarehouseChange2.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index 42a86224e7..9965ac8f06 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -55,7 +55,6 @@ public final class ElfHumanClericChange2 extends AbstractNpcAI
private ElfHumanClericChange2()
{
- super(ElfHumanClericChange2.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index 0cf4ce62e2..a920a03441 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -55,7 +55,6 @@ public final class ElfHumanFighterChange1 extends AbstractNpcAI
private ElfHumanFighterChange1()
{
- super(ElfHumanFighterChange1.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index b4ad03f6d2..ab5cfc80fc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -70,7 +70,6 @@ public final class ElfHumanFighterChange2 extends AbstractNpcAI
private ElfHumanFighterChange2()
{
- super(ElfHumanFighterChange2.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index e5acad22fa..29d57ea9bf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -54,7 +54,6 @@ public final class ElfHumanWizardChange1 extends AbstractNpcAI
private ElfHumanWizardChange1()
{
- super(ElfHumanWizardChange1.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 5f5af512bc..8b9016111d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -59,7 +59,6 @@ public final class ElfHumanWizardChange2 extends AbstractNpcAI
private ElfHumanWizardChange2()
{
- super(ElfHumanWizardChange2.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_fighter.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_fighter.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_fighter.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_fighter.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_knight_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_knight_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_knight_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_knight_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_knight_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_knight_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_knight_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_knight_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_rogue_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_rogue_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_rogue_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_rogue_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_rogue_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_rogue_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_rogue_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_rogue_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_warrior_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_warrior_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_warrior_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_warrior_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_warrior_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_warrior_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30026_warrior_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30026_warrior_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_cleric_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_cleric_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_cleric_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_cleric_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_cleric_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_cleric_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_cleric_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_cleric_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_human_wizard_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_human_wizard_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_human_wizard_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_human_wizard_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_human_wizard_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_human_wizard_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_human_wizard_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_human_wizard_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_mystic.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_mystic.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_mystic.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_mystic.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30031_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30031_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_knight_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_knight_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_knight_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_knight_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_knight_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_knight_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_knight_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_knight_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_oracle_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_oracle_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_oracle_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_oracle_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_oracle_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_oracle_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_oracle_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_oracle_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_scout_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_scout_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_scout_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_scout_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_scout_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_scout_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_scout_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_scout_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_wizard_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_wizard_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_wizard_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_wizard_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_wizard_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_wizard_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_elven_wizard_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_elven_wizard_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_fighter.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_fighter.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_fighter.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_fighter.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_mystic.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_mystic.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_mystic.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_mystic.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30154_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30154_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_assassin_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_assassin_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_assassin_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_assassin_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_assassin_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_assassin_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_assassin_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_assassin_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_dark_wizard_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_dark_wizard_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_dark_wizard_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_dark_wizard_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_dark_wizard_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_dark_wizard_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_dark_wizard_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_dark_wizard_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_fighter.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_fighter.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_fighter.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_fighter.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_mystic.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_mystic.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_mystic.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_mystic.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_palus_knight_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_palus_knight_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_palus_knight_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_palus_knight_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_palus_knight_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_palus_knight_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_palus_knight_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_palus_knight_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_shillien_oracle_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_shillien_oracle_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_shillien_oracle_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_shillien_oracle_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_shillien_oracle_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_shillien_oracle_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_shillien_oracle_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_shillien_oracle_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30358_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30358_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30520_artisan.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30520_artisan.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30520_artisan.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30520_artisan.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30520_fighter.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30520_fighter.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30520_fighter.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30520_fighter.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30520_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30520_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30520_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30520_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30520_scavenger_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30520_scavenger_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30520_scavenger_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30520_scavenger_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30520_scavenger_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30520_scavenger_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30520_scavenger_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30520_scavenger_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30520_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30520_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30520_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30520_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30520_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30520_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30520_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30520_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30525_artisan_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30525_artisan_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30525_artisan_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30525_artisan_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30525_artisan_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30525_artisan_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30525_artisan_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30525_artisan_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30525_fighter.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30525_fighter.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30525_fighter.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30525_fighter.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30525_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30525_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30525_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30525_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30525_scavenger.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30525_scavenger.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30525_scavenger.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30525_scavenger.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30525_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30525_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30525_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30525_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30525_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30525_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30525_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30525_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_fighter.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_fighter.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_fighter.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_fighter.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_monk_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_monk_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_monk_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_monk_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_monk_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_monk_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_monk_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_monk_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_mystic.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_mystic.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_mystic.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_mystic.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_orc_raider_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_orc_raider_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_orc_raider_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_orc_raider_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_orc_raider_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_orc_raider_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_orc_raider_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_orc_raider_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_orc_shaman_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_orc_shaman_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_orc_shaman_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_orc_shaman_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_orc_shaman_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_orc_shaman_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_orc_shaman_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_orc_shaman_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/30565_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/30565_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_elven_knight_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_elven_knight_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_elven_knight_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_elven_knight_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_elven_knight_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_elven_knight_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_elven_knight_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_elven_knight_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_elven_scout_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_elven_scout_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_elven_scout_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_elven_scout_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_elven_scout_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_elven_scout_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_elven_scout_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_elven_scout_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_elven_wizard_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_elven_wizard_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_elven_wizard_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_elven_wizard_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_elven_wizard_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_elven_wizard_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_elven_wizard_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_elven_wizard_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_fighter.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_fighter.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_fighter.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_fighter.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_mystic.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_mystic.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_mystic.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_mystic.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_oracle_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_oracle_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_oracle_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_oracle_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_oracle_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_oracle_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_oracle_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_oracle_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32147_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32147_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_fighter.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_fighter.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_fighter.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_fighter.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_mystic.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_mystic.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_mystic.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_mystic.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_orc_monk_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_orc_monk_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_orc_monk_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_orc_monk_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_orc_monk_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_orc_monk_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_orc_monk_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_orc_monk_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_orc_raider_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_orc_raider_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_orc_raider_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_orc_raider_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_orc_raider_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_orc_raider_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_orc_raider_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_orc_raider_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_orc_shaman_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_orc_shaman_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_orc_shaman_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_orc_shaman_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_orc_shaman_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_orc_shaman_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_orc_shaman_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_orc_shaman_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32150_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32150_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_cleric_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_cleric_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_cleric_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_cleric_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_cleric_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_cleric_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_cleric_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_cleric_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_mystic.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_mystic.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_mystic.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_mystic.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_wizard_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_wizard_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_wizard_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_wizard_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_wizard_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_wizard_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32153_wizard_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32153_wizard_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_fighter.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_fighter.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_fighter.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_fighter.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_knight_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_knight_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_knight_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_knight_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_knight_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_knight_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_knight_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_knight_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_rogue_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_rogue_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_rogue_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_rogue_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_rogue_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_rogue_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_rogue_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_rogue_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_warrior_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_warrior_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_warrior_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_warrior_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_warrior_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_warrior_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32154_warrior_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32154_warrior_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32157_artisan_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32157_artisan_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32157_artisan_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32157_artisan_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32157_artisan_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32157_artisan_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32157_artisan_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32157_artisan_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32157_fighter.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32157_fighter.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32157_fighter.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32157_fighter.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32157_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32157_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32157_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32157_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32157_scavenger.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32157_scavenger.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32157_scavenger.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32157_scavenger.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32157_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32157_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32157_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32157_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32157_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32157_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32157_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32157_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32158_artisan.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32158_artisan.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32158_artisan.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32158_artisan.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32158_fighter.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32158_fighter.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32158_fighter.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32158_fighter.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32158_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32158_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32158_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32158_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32158_scavenger_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32158_scavenger_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32158_scavenger_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32158_scavenger_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32158_scavenger_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32158_scavenger_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32158_scavenger_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32158_scavenger_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32158_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32158_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32158_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32158_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32158_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32158_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32158_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32158_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_assassin_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_assassin_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_assassin_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_assassin_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_assassin_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_assassin_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_assassin_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_assassin_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_dark_wizard_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_dark_wizard_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_dark_wizard_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_dark_wizard_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_dark_wizard_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_dark_wizard_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_dark_wizard_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_dark_wizard_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_fighter.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_fighter.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_fighter.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_fighter.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_mystic.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_mystic.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_mystic.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_mystic.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_palus_knight_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_palus_knight_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_palus_knight_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_palus_knight_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_palus_knight_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_palus_knight_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_palus_knight_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_palus_knight_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_shillien_oracle_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_shillien_oracle_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_shillien_oracle_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_shillien_oracle_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_shillien_oracle_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_shillien_oracle_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_shillien_oracle_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_shillien_oracle_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32160_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32160_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32171_artisan.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32171_artisan.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32171_artisan.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32171_artisan.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32171_fighter.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32171_fighter.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32171_fighter.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32171_fighter.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32171_no.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32171_no.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32171_no.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32171_no.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32171_scavenger_01.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32171_scavenger_01.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32171_scavenger_01.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32171_scavenger_01.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32171_scavenger_02.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32171_scavenger_02.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32171_scavenger_02.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32171_scavenger_02.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32171_transfer_1.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32171_transfer_1.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32171_transfer_1.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32171_transfer_1.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32171_transfer_2.html b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32171_transfer_2.html
similarity index 100%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/32171_transfer_2.html
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/32171_transfer_2.html
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
similarity index 93%
rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java
rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java
index 7aa01df324..ec298aa1fe 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.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.VillageMasters.FirstClassTransferTalk;
+package village_master.FirstClassTransferTalk;
import java.util.HashMap;
import java.util.Map;
@@ -57,7 +57,6 @@ public final class FirstClassTransferTalk extends AbstractNpcAI
private FirstClassTransferTalk()
{
- super(FirstClassTransferTalk.class.getSimpleName(), "ai/npc/VillageMasters");
addStartNpc(MASTERS.keySet());
addTalkId(MASTERS.keySet());
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java
index f7a61fc3c5..a9b157d9a4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange1/KamaelChange1.java
@@ -51,7 +51,6 @@ public final class KamaelChange1 extends AbstractNpcAI
private KamaelChange1()
{
- super(KamaelChange1.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java
index d4a23a3ed6..f2dfbcebea 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java
@@ -70,7 +70,6 @@ public final class KamaelChange2 extends AbstractNpcAI
private KamaelChange2()
{
- super(KamaelChange2.class.getSimpleName(), "village_master");
addStartNpc(NPCS_MALE);
addStartNpc(NPCS_FEMALE);
addTalkId(NPCS_MALE);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
index 7ed756030d..1446419d68 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange1/OrcChange1.java
@@ -47,7 +47,6 @@ public final class OrcChange1 extends AbstractNpcAI
private OrcChange1()
{
- super(OrcChange1.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
index 005550b139..7a4638d0f8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/OrcChange2/OrcChange2.java
@@ -60,7 +60,6 @@ public final class OrcChange2 extends AbstractNpcAI
private OrcChange2()
{
- super(OrcChange2.class.getSimpleName(), "village_master");
addStartNpc(NPCS);
addTalkId(NPCS);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
index 88283237e0..0eb339666d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
@@ -46,17 +46,18 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Siegable;
-import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.gameserver.util.Broadcast;
+import ai.AbstractNpcAI;
+
/**
* @author BiggBoss
*/
-public abstract class ClanHallSiegeEngine extends Quest implements Siegable
+public abstract class ClanHallSiegeEngine extends AbstractNpcAI implements Siegable
{
private static final String SQL_LOAD_ATTACKERS = "SELECT attacker_id FROM clanhall_siege_attackers WHERE clanhall_id = ?";
private static final String SQL_SAVE_ATTACKERS = "INSERT INTO clanhall_siege_attackers VALUES (?,?)";
@@ -78,9 +79,8 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
public ScheduledFuture> _siegeTask;
public boolean _missionAccomplished = false;
- public ClanHallSiegeEngine(String name, String descr, int hallId)
+ public ClanHallSiegeEngine(int hallId)
{
- super(-1, name, descr);
_log = Logger.getLogger(getClass().getName());
_hall = CHSiegeManager.getInstance().getSiegableHall(hallId);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Event.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Event.java
index a3923399f3..f2349ee11a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Event.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Event.java
@@ -24,9 +24,9 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
*/
public abstract class Event extends Quest
{
- public Event(String name, String descr)
+ public Event()
{
- super(-1, name, descr);
+ super(-1);
}
public abstract boolean eventStart(L2PcInstance eventMaker);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/event/LongTimeEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
similarity index 95%
rename from L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/event/LongTimeEvent.java
rename to L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.java
index 4e49a61eee..f09312d056 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/event/LongTimeEvent.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/LongTimeEvent.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 com.l2jmobius.gameserver.model.event;
+package com.l2jmobius.gameserver.model.quest;
import java.io.File;
import java.text.SimpleDateFormat;
@@ -38,7 +38,6 @@ import com.l2jmobius.gameserver.datatables.ItemTable;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.announce.EventAnnouncement;
import com.l2jmobius.gameserver.model.holders.DropHolder;
-import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.script.DateRange;
import com.l2jmobius.gameserver.util.Broadcast;
@@ -76,10 +75,9 @@ public class LongTimeEvent extends Quest
}
}
- public LongTimeEvent(String name, String descr)
+ public LongTimeEvent()
{
- super(-1, name, descr);
-
+ super(-1);
loadConfig();
if (_eventPeriod != null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java
index f4fb280ba8..324e0ff9fe 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/Quest.java
@@ -65,8 +65,8 @@ import com.l2jmobius.gameserver.model.olympiad.Participant;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.zone.L2ZoneType;
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.network.serverpackets.ExNpcQuestHtmlMessage;
+import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jmobius.gameserver.scripting.ScriptEngineManager;
/**
@@ -84,13 +84,11 @@ public class Quest extends AbstractScript implements IIdentifiable
private volatile Map, String> _startCondition = null;
private final int _questId;
- private final String _name;
- private final String _descr;
private final byte _initialState = State.CREATED;
protected boolean _onEnterWorld = false;
private boolean _isCustom = false;
- public int[] questItemIds = null;
+ public int[] _questItemIds = null;
private static final String DEFAULT_NO_QUEST_MSG = "You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.";
private static final String DEFAULT_ALREADY_COMPLETED_MSG = "This quest has already been completed.";
@@ -101,18 +99,30 @@ public class Quest extends AbstractScript implements IIdentifiable
private static final int RESET_HOUR = 6;
private static final int RESET_MINUTES = 30;
+ /**
+ * @return the reset hour for a daily quest, could be overridden on a script.
+ */
+ public int getResetHour()
+ {
+ return RESET_HOUR;
+ }
+
+ /**
+ * @return the reset minutes for a daily quest, could be overridden on a script.
+ */
+ public int getResetMinutes()
+ {
+ return RESET_MINUTES;
+ }
+
/**
* The Quest object constructor.
* Constructing a quest also calls the {@code init_LoadGlobalData} convenience method.
* @param questId ID of the quest
- * @param name String corresponding to the name of the quest
- * @param descr String for the description of the quest
*/
- public Quest(int questId, String name, String descr)
+ public Quest(int questId)
{
_questId = questId;
- _name = name;
- _descr = descr;
if (questId > 0)
{
QuestManager.getInstance().addQuest(this);
@@ -125,24 +135,6 @@ public class Quest extends AbstractScript implements IIdentifiable
onLoad();
}
- /**
- * Gets the reset hour for a daily quest.
- * @return the reset hour
- */
- public int getResetHour()
- {
- return RESET_HOUR;
- }
-
- /**
- * Gets the reset minutes for a daily quest.
- * @return the reset minutes
- */
- public int getResetMinutes()
- {
- return RESET_MINUTES;
- }
-
/**
* This method is, by default, called by the constructor of all scripts.
* Children of this class can implement this function in order to define what variables to load and what structures to save them in.
@@ -201,8 +193,12 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public QuestState getQuestState(L2PcInstance player, boolean initIfNone)
{
- final QuestState qs = player.getQuestState(_name);
- return (qs != null) || !initIfNone ? qs : newQuestState(player);
+ final QuestState qs = player.getQuestState(getName());
+ if ((qs != null) || !initIfNone)
+ {
+ return qs;
+ }
+ return newQuestState(player);
}
/**
@@ -213,17 +209,21 @@ public class Quest extends AbstractScript implements IIdentifiable
return _initialState;
}
+ /**
+ * @return the name of the quest
+ */
public String getName()
{
- return _name;
+ return getClass().getSimpleName();
}
/**
- * @return the description of the quest
+ * @return the path of the quest script
*/
- public String getDescr()
+ public String getPath()
{
- return _descr;
+ final String path = getClass().getName().replace('.', '/');
+ return path.substring(0, path.lastIndexOf('/' + getClass().getSimpleName()));
}
/**
@@ -249,7 +249,10 @@ public class Quest extends AbstractScript implements IIdentifiable
{
synchronized (this)
{
- _questTimers = new ConcurrentHashMap<>(1);
+ if (_questTimers == null)
+ {
+ _questTimers = new ConcurrentHashMap<>(1);
+ }
}
}
return _questTimers;
@@ -269,18 +272,17 @@ public class Quest extends AbstractScript implements IIdentifiable
final List timers = getQuestTimers().computeIfAbsent(name, k -> new ArrayList<>(1));
// if there exists a timer with this name, allow the timer only if the [npc, player] set is unique
// nulls act as wildcards
- if (getQuestTimer(name, npc, player) != null)
+ if (getQuestTimer(name, npc, player) == null)
{
- return;
- }
- _writeLock.lock();
- try
- {
- timers.add(new QuestTimer(this, name, time, npc, player, repeating));
- }
- finally
- {
- _writeLock.unlock();
+ _writeLock.lock();
+ try
+ {
+ timers.add(new QuestTimer(this, name, time, npc, player, repeating));
+ }
+ finally
+ {
+ _writeLock.unlock();
+ }
}
}
@@ -332,26 +334,24 @@ public class Quest extends AbstractScript implements IIdentifiable
}
final List timers = getQuestTimers().get(name);
- if (timers == null)
+ if (timers != null)
{
- return;
- }
-
- _writeLock.lock();
- try
- {
- for (QuestTimer timer : timers)
+ _writeLock.lock();
+ try
{
- if (timer != null)
+ for (QuestTimer timer : timers)
{
- timer.cancel();
+ if (timer != null)
+ {
+ timer.cancel();
+ }
}
+ timers.clear();
+ }
+ finally
+ {
+ _writeLock.unlock();
}
- timers.clear();
- }
- finally
- {
- _writeLock.unlock();
}
}
@@ -377,23 +377,21 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public void removeQuestTimer(QuestTimer timer)
{
- if ((timer == null) || (_questTimers == null))
+ if ((timer != null) && (_questTimers != null))
{
- return;
- }
- final List timers = getQuestTimers().get(timer.getName());
- if (timers == null)
- {
- return;
- }
- _writeLock.lock();
- try
- {
- timers.remove(timer);
- }
- finally
- {
- _writeLock.unlock();
+ final List timers = getQuestTimers().get(timer.getName());
+ if (timers != null)
+ {
+ _writeLock.lock();
+ try
+ {
+ timers.remove(timer);
+ }
+ finally
+ {
+ _writeLock.unlock();
+ }
+ }
}
}
@@ -606,7 +604,7 @@ public class Quest extends AbstractScript implements IIdentifiable
try
{
final String startConditionHtml = getStartConditionHtml(player);
- if (!player.hasQuestState(_name) && (startConditionHtml != null))
+ if (!player.hasQuestState(getName()) && (startConditionHtml != null))
{
res = startConditionHtml;
}
@@ -707,9 +705,12 @@ public class Quest extends AbstractScript implements IIdentifiable
try
{
res = onItemEvent(item, player, event);
- if ((res != null) && (res.equalsIgnoreCase("true") || res.equalsIgnoreCase("false")))
+ if (res != null)
{
- return;
+ if (res.equalsIgnoreCase("true") || res.equalsIgnoreCase("false"))
+ {
+ return;
+ }
}
}
catch (Exception e)
@@ -790,7 +791,11 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public final void notifySeeCreature(L2Npc npc, L2Character creature, boolean isSummon)
{
- final L2PcInstance player = isSummon || creature.isPlayer() ? creature.getActingPlayer() : null;
+ L2PcInstance player = null;
+ if (isSummon || creature.isPlayer())
+ {
+ player = creature.getActingPlayer();
+ }
String res = null;
try
{
@@ -1399,7 +1404,12 @@ public class Quest extends AbstractScript implements IIdentifiable
{
_log.warning(getClass().getSimpleName() + ": " + t.getMessage());
}
- return (player != null) && player.getAccessLevel().isGm() && showResult(player, "Script error" + CommonUtil.getStackTrace(t) + "");
+ if ((player != null) && player.getAccessLevel().isGm())
+ {
+ final String res = "Script error" + CommonUtil.getStackTrace(t) + "";
+ return showResult(player, res);
+ }
+ return false;
}
/**
@@ -1547,14 +1557,14 @@ public class Quest extends AbstractScript implements IIdentifiable
public static void createQuestVarInDb(QuestState qs, String var, String value)
{
try (Connection con = DatabaseFactory.getInstance().getConnection();
- PreparedStatement ps = con.prepareStatement("INSERT INTO character_quests (charId,name,var,value) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE value=?"))
+ PreparedStatement statement = con.prepareStatement("INSERT INTO character_quests (charId,name,var,value) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE value=?"))
{
- ps.setInt(1, qs.getPlayer().getObjectId());
- ps.setString(2, qs.getQuestName());
- ps.setString(3, var);
- ps.setString(4, value);
- ps.setString(5, value);
- ps.executeUpdate();
+ statement.setInt(1, qs.getPlayer().getObjectId());
+ statement.setString(2, qs.getQuestName());
+ statement.setString(3, var);
+ statement.setString(4, value);
+ statement.setString(5, value);
+ statement.executeUpdate();
}
catch (Exception e)
{
@@ -1571,13 +1581,13 @@ public class Quest extends AbstractScript implements IIdentifiable
public static void updateQuestVarInDb(QuestState qs, String var, String value)
{
try (Connection con = DatabaseFactory.getInstance().getConnection();
- PreparedStatement ps = con.prepareStatement("UPDATE character_quests SET value=? WHERE charId=? AND name=? AND var = ?"))
+ PreparedStatement statement = con.prepareStatement("UPDATE character_quests SET value=? WHERE charId=? AND name=? AND var = ?"))
{
- ps.setString(1, value);
- ps.setInt(2, qs.getPlayer().getObjectId());
- ps.setString(3, qs.getQuestName());
- ps.setString(4, var);
- ps.executeUpdate();
+ statement.setString(1, value);
+ statement.setInt(2, qs.getPlayer().getObjectId());
+ statement.setString(3, qs.getQuestName());
+ statement.setString(4, var);
+ statement.executeUpdate();
}
catch (Exception e)
{
@@ -1593,12 +1603,12 @@ public class Quest extends AbstractScript implements IIdentifiable
public static void deleteQuestVarInDb(QuestState qs, String var)
{
try (Connection con = DatabaseFactory.getInstance().getConnection();
- PreparedStatement ps = con.prepareStatement("DELETE FROM character_quests WHERE charId=? AND name=? AND var=?"))
+ PreparedStatement statement = con.prepareStatement("DELETE FROM character_quests WHERE charId=? AND name=? AND var=?"))
{
- ps.setInt(1, qs.getPlayer().getObjectId());
- ps.setString(2, qs.getQuestName());
- ps.setString(3, var);
- ps.executeUpdate();
+ statement.setInt(1, qs.getPlayer().getObjectId());
+ statement.setString(2, qs.getQuestName());
+ statement.setString(3, var);
+ statement.executeUpdate();
}
catch (Exception e)
{
@@ -2475,10 +2485,10 @@ public class Quest extends AbstractScript implements IIdentifiable
public String getHtm(String prefix, String fileName)
{
final HtmCache hc = HtmCache.getInstance();
- String content = hc.getHtm(prefix, fileName.startsWith("data/") ? fileName : "data/scripts/" + getDescr().toLowerCase() + "/" + getName() + "/" + fileName);
+ String content = hc.getHtm(prefix, fileName.startsWith("data/") ? fileName : "data/scripts/" + getPath().toLowerCase() + "/" + fileName);
if (content == null)
{
- content = hc.getHtm(prefix, "data/scripts/" + getDescr() + "/" + getName() + "/" + fileName);
+ content = hc.getHtm(prefix, "data/scripts/" + getPath() + "/" + fileName);
if (content == null)
{
content = hc.getHtmForce(prefix, "data/scripts/quests/" + getName() + "/" + fileName);
@@ -2492,7 +2502,7 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public int[] getRegisteredItemIds()
{
- return questItemIds;
+ return _questItemIds;
}
/**
@@ -2508,7 +2518,7 @@ public class Quest extends AbstractScript implements IIdentifiable
_log.severe(super.getClass().getSimpleName() + ": Found registerQuestItems for non existing item: " + id + "!");
}
}
- questItemIds = items;
+ _questItemIds = items;
}
/**
@@ -2517,7 +2527,7 @@ public class Quest extends AbstractScript implements IIdentifiable
*/
public void removeRegisteredQuestItems(L2PcInstance player)
{
- takeItems(player, -1, questItemIds);
+ takeItems(player, -1, _questItemIds);
}
@Override