diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Character.ini b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Character.ini
index 46785a0469..74d56ca84a 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Character.ini
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Character.ini
@@ -163,8 +163,8 @@ LifeCrystalNeeded = True
DivineInspirationSpBookNeeded = True
# Allow player to sub-class without checking for unique quest items.
-# Default: False
-AltSubClassWithoutQuests = False
+# Default: True
+AltSubClassWithoutQuests = True
# Allow player to upgrade sub-class to dualclass from Raina without finish Split Destiny quest.
# Default: False
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/ChamberOfProphecies.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/ChamberOfProphecies.xml
deleted file mode 100644
index 0f0392172d..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/ChamberOfProphecies.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/EvasHiddenSpace.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/EvasHiddenSpace.xml
deleted file mode 100644
index b0a26a1d6c..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/EvasHiddenSpace.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/FaeronTrainingGrounds1.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/FaeronTrainingGrounds1.xml
deleted file mode 100644
index 48971bf02c..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/FaeronTrainingGrounds1.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/FaeronTrainingGrounds2.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/FaeronTrainingGrounds2.xml
deleted file mode 100644
index 412ddc16cd..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/FaeronTrainingGrounds2.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/FortressOfTheDead.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/FortressOfTheDead.xml
deleted file mode 100644
index 1cc6458446..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/FortressOfTheDead.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/HarnakUndergroundRuins.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/HarnakUndergroundRuins.xml
deleted file mode 100644
index 6a254b7273..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/HarnakUndergroundRuins.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/KaraphonHabitat.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/KaraphonHabitat.xml
deleted file mode 100644
index 64e815db99..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/KaraphonHabitat.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/LabyrinthOfBelis.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/LabyrinthOfBelis.xml
deleted file mode 100644
index 9a8c4ddf0e..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/LabyrinthOfBelis.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/MuseumDungeon.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/MuseumDungeon.xml
deleted file mode 100644
index 0851ab3c04..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/MuseumDungeon.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/Pailaka/PailakaDevilsLegacy.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/Pailaka/PailakaDevilsLegacy.xml
deleted file mode 100644
index 602fc156b9..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/Pailaka/PailakaDevilsLegacy.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/Pailaka/PailakaInjuredDragon.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/Pailaka/PailakaInjuredDragon.xml
deleted file mode 100644
index 191e977a9f..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/Pailaka/PailakaInjuredDragon.xml
+++ /dev/null
@@ -1,524 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/Pailaka/PailakaSongOfIceAndFire.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/Pailaka/PailakaSongOfIceAndFire.xml
deleted file mode 100644
index 47d4b887e2..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/Pailaka/PailakaSongOfIceAndFire.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQDisciplesNecropolisPast.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQDisciplesNecropolisPast.xml
deleted file mode 100644
index 954879c765..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQDisciplesNecropolisPast.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQElcadiasTent.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQElcadiasTent.xml
deleted file mode 100644
index 7747d76cfd..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQElcadiasTent.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQHideoutOfTheDawn.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQHideoutOfTheDawn.xml
deleted file mode 100644
index abf451a02c..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQHideoutOfTheDawn.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQLibraryOfSages.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQLibraryOfSages.xml
deleted file mode 100644
index 8208730c45..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQLibraryOfSages.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQMonasteryOfSilence.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQMonasteryOfSilence.xml
deleted file mode 100644
index 2ea2ba4467..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQMonasteryOfSilence.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQSanctumOfTheLordsOfDawn.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQSanctumOfTheLordsOfDawn.xml
deleted file mode 100644
index b910f284cf..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/SSQSanctumOfTheLordsOfDawn.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/TaintedDimension.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/TaintedDimension.xml
deleted file mode 100644
index f806a83d79..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/TaintedDimension.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/TalkingIslandPast.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/TalkingIslandPast.xml
deleted file mode 100644
index d693a54f97..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/TalkingIslandPast.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
index 58889933f8..084d7cda54 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AncientCityArcan/AncientArcanCity.java
@@ -20,14 +20,11 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.enums.Movie;
-import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.quest.Quest;
-import org.l2jmobius.gameserver.model.quest.QuestState;
import org.l2jmobius.gameserver.model.spawns.SpawnGroup;
import org.l2jmobius.gameserver.model.spawns.SpawnTemplate;
import org.l2jmobius.gameserver.model.zone.ZoneType;
@@ -38,8 +35,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import org.l2jmobius.gameserver.network.serverpackets.OnEventTrigger;
import ai.AbstractNpcAI;
-import instances.TaintedDimension.TaintedDimension;
-import quests.Q10301_ShadowOfTerrorBlackishRedFog.Q10301_ShadowOfTerrorBlackishRedFog;
/**
* Ancient Arcan City AI.
@@ -111,19 +106,19 @@ public class AncientArcanCity extends AbstractNpcAI
if (zone.getId() == TELEPORT_ZONE.getId())
{
- final QuestState qs = creature.getActingPlayer().getQuestState(Q10301_ShadowOfTerrorBlackishRedFog.class.getSimpleName());
- if ((qs != null) && qs.isCond(3))
- {
- final Quest instance = QuestManager.getInstance().getQuest(TaintedDimension.class.getSimpleName());
- if (instance != null)
- {
- instance.notifyEvent("enterInstance", null, player);
- }
- }
- else
- {
- player.teleToLocation(ANCIENT_ARCAN_CITY);
- }
+ // final QuestState qs = creature.getActingPlayer().getQuestState(Q10301_ShadowOfTerrorBlackishRedFog.class.getSimpleName());
+ // if ((qs != null) && qs.isCond(3))
+ // {
+ // final Quest instance = QuestManager.getInstance().getQuest(TaintedDimension.class.getSimpleName());
+ // if (instance != null)
+ // {
+ // instance.notifyEvent("enterInstance", null, player);
+ // }
+ // }
+ // else
+ // {
+ player.teleToLocation(ANCIENT_ARCAN_CITY);
+ // }
}
else
{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-01.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-01.html
deleted file mode 100644
index 8adab3b56c..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-01.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
Alarm System:
-As the alarm rings, a window for the passcode pops up. On the screen you see the number 120, which begins counting down. It looks like the alarm system will be activated in about 2 minutes unless the passcode is successfully entered.
-Enter the passcode.
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-02.html
deleted file mode 100644
index 8162c07de0..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-02.html
+++ /dev/null
@@ -1,4 +0,0 @@
-Alarm System:
-The alarm is ringing loudly. You should leave here immediately.
-(Another person has already undertaken the quest.)
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_02.html
deleted file mode 100644
index e2599b3c8b..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_02.html
+++ /dev/null
@@ -1,42 +0,0 @@
-Alarm System:
-########################
-Enter the passcode for communication.
-Passcode :|
-########################
-The first number is...
-
-
-
- 1
-
-
- 2
-
-
- 3
-
-
-
-
- 4
-
-
- 5
-
-
- 6
-
-
-
-
- 7
-
-
- 8
-
-
- 9
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_04.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_04.html
deleted file mode 100644
index 1aee734416..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_04.html
+++ /dev/null
@@ -1,42 +0,0 @@
-Alarm System:
-########################
-Enter the passcode for communication.
-Passcode : *|
-########################
-The second number is...
-
-
-
- 1
-
-
- 2
-
-
- 3
-
-
-
-
- 4
-
-
- 5
-
-
- 6
-
-
-
-
- 7
-
-
- 8
-
-
- 9
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_06.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_06.html
deleted file mode 100644
index aec1dc91b6..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_06.html
+++ /dev/null
@@ -1,42 +0,0 @@
-Alarm System:
-########################
-Enter the passcode for communication.
-Passcode : **|
-########################
-The third number is...
-
-
-
- 1
-
-
- 2
-
-
- 3
-
-
-
-
- 4
-
-
- 5
-
-
- 6
-
-
-
-
- 7
-
-
- 8
-
-
- 9
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_08.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_08.html
deleted file mode 100644
index 76b5f1f008..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_08.html
+++ /dev/null
@@ -1,43 +0,0 @@
-
-Alarm System:
-########################
-Enter the passcode for communication.
-Passcode : ***|
-########################
-The fourth number is...
-
-
-
- 1
-
-
- 2
-
-
- 3
-
-
-
-
- 4
-
-
- 5
-
-
- 6
-
-
-
-
- 7
-
-
- 8
-
-
- 9
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_09.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_09.html
deleted file mode 100644
index 0f19759184..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_09.html
+++ /dev/null
@@ -1,7 +0,0 @@
-Alarm System:
-########################
-Enter the passcode for communication.
-Passcode : ****
-########################
-Validation completed. Alarm has been disabled.
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_10.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_10.html
deleted file mode 100644
index 39765348ef..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-184_10.html
+++ /dev/null
@@ -1,9 +0,0 @@
-Alarm System:
-########################
-Enter the passcode for communication.
-Passcode : ****
-########################
-Validation has failed.
-
-Re-enter passcode.
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_02.html
deleted file mode 100644
index df49ab874f..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_02.html
+++ /dev/null
@@ -1,42 +0,0 @@
-Alarm System:
-########################
-Enter the passcode for communication.
-Passcode :|
-########################
- The first number is...
-
-
-
- 1
-
-
- 2
-
-
- 3
-
-
-
-
- 4
-
-
- 5
-
-
- 6
-
-
-
-
- 7
-
-
- 8
-
-
- 9
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_04.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_04.html
deleted file mode 100644
index 25e5634376..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_04.html
+++ /dev/null
@@ -1,43 +0,0 @@
-Alarm System:
-########################
-Enter the passcode for communication.
-Passcode : *|
-########################
- The second number is...
-
-
-
- 1
-
-
- 2
-
-
- 3
-
-
-
-
- 4
-
-
- 5
-
-
- 6
-
-
-
-
- 7
-
-
- 8
-
-
- 9
-
-
-
-
-
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_06.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_06.html
deleted file mode 100644
index e2899d317d..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_06.html
+++ /dev/null
@@ -1,41 +0,0 @@
-Alarm System:
-########################
-Enter the passcode for communication.
-Passcode : **|
-########################
-The third number is...
-
-
-
- 1
-
-
- 2
-
- 3
-
-
-
-
- 4
-
-
- 5
-
-
- 6
-
-
-
-
- 7
-
-
- 8
-
-
- 9
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_08.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_08.html
deleted file mode 100644
index f6492a5a88..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_08.html
+++ /dev/null
@@ -1,42 +0,0 @@
-Alarm System:
-########################
-Enter the passcode for communication.
-Passcode : ***|
-########################
-The fourth number is...
-
-
-
- 1
-
-
- 2
-
-
- 3
-
-
-
-
- 4
-
-
- 5
-
-
- 6
-
-
-
-
- 7
-
-
- 8
-
-
- 9
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_09.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_09.html
deleted file mode 100644
index 0d4a724182..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_09.html
+++ /dev/null
@@ -1,7 +0,0 @@
-Alarm System:
-########################
-Enter the passcode for communication.
-Passcode : ****
-########################
-Validation completed. Alarm has been disabled.
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_10.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_10.html
deleted file mode 100644
index 10f98afb92..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/32367-185_10.html
+++ /dev/null
@@ -1,8 +0,0 @@
-Alarm System:
-########################
-Enter passcode for communication.
-Passcode : **** ########################
-Validation has failed.
-
-Re-enter passcode.
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
deleted file mode 100644
index 27ed9f0cc5..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/CrumaTower/Alarm/Alarm.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package ai.areas.CrumaTower.Alarm;
-
-import org.l2jmobius.gameserver.enums.ChatType;
-import org.l2jmobius.gameserver.enums.QuestSound;
-import org.l2jmobius.gameserver.model.actor.Npc;
-import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.quest.QuestState;
-import org.l2jmobius.gameserver.network.NpcStringId;
-
-import ai.AbstractNpcAI;
-import quests.Q00184_ArtOfPersuasion.Q00184_ArtOfPersuasion;
-import quests.Q00185_NikolasCooperation.Q00185_NikolasCooperation;
-
-/**
- * Alarm AI for quests Art of Persuasion (184) and Nikola's Cooperation (185).
- * @author Zoey76
- */
-public class Alarm extends AbstractNpcAI
-{
- // NPC
- private static final int ALARM = 32367;
- // Misc
- private static final int ART_OF_PERSUASION_ID = 184;
- private static final int NIKOLAS_COOPERATION_ID = 185;
-
- private Alarm()
- {
- addStartNpc(ALARM);
- addTalkId(ALARM);
- addFirstTalkId(ALARM);
- addSpawnId(ALARM);
- }
-
- @Override
- public String onAdvEvent(String event, Npc npc, PlayerInstance player)
- {
- String htmltext = null;
- final PlayerInstance player0 = npc.getVariables().getObject("player0", PlayerInstance.class);
- final Npc npc0 = npc.getVariables().getObject("npc0", Npc.class);
- switch (event)
- {
- case "SELF_DESTRUCT_IN_60":
- {
- startQuestTimer("SELF_DESTRUCT_IN_30", 30000, npc, null);
- npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_ALARM_WILL_SELF_DESTRUCT_IN_60_SECONDS_ENTER_PASSCODE_TO_OVERRIDE);
- break;
- }
- case "SELF_DESTRUCT_IN_30":
- {
- startQuestTimer("SELF_DESTRUCT_IN_10", 20000, npc, null);
- npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_ALARM_WILL_SELF_DESTRUCT_IN_30_SECONDS_ENTER_PASSCODE_TO_OVERRIDE);
- break;
- }
- case "SELF_DESTRUCT_IN_10":
- {
- startQuestTimer("RECORDER_CRUSHED", 10000, npc, null);
- npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_ALARM_WILL_SELF_DESTRUCT_IN_10_SECONDS_ENTER_PASSCODE_TO_OVERRIDE);
- break;
- }
- case "RECORDER_CRUSHED":
- {
- if (npc0 != null)
- {
- if (npc0.getVariables().getBoolean("SPAWNED"))
- {
- npc0.getVariables().set("SPAWNED", false);
- if (player0 != null)
- {
- npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.RECORDER_CRUSHED);
- if (verifyMemoState(player0, ART_OF_PERSUASION_ID, -1))
- {
- setMemoState(player0, ART_OF_PERSUASION_ID, 5);
- }
- else if (verifyMemoState(player0, NIKOLAS_COOPERATION_ID, -1))
- {
- setMemoState(player0, NIKOLAS_COOPERATION_ID, 5);
- }
- }
- }
- }
- npc.deleteMe();
- break;
- }
- case "32367-184_04.html":
- case "32367-184_06.html":
- case "32367-184_08.html":
- {
- htmltext = event;
- break;
- }
- case "2":
- {
- if (player0 == player)
- {
- if (verifyMemoState(player, ART_OF_PERSUASION_ID, 3))
- {
- htmltext = "32367-184_02.html";
- }
- else if (verifyMemoState(player, NIKOLAS_COOPERATION_ID, 3))
- {
- htmltext = "32367-185_02.html";
- }
- }
- break;
- }
- case "3":
- {
- if (verifyMemoState(player, ART_OF_PERSUASION_ID, 3))
- {
- setMemoStateEx(player, ART_OF_PERSUASION_ID, 1, 1);
- htmltext = "32367-184_04.html";
- }
- else if (verifyMemoState(player, NIKOLAS_COOPERATION_ID, 3))
- {
- setMemoStateEx(player, NIKOLAS_COOPERATION_ID, 1, 1);
- htmltext = "32367-185_04.html";
- }
- break;
- }
- case "4":
- {
- if (verifyMemoState(player, ART_OF_PERSUASION_ID, 3))
- {
- setMemoStateEx(player, ART_OF_PERSUASION_ID, 1, getMemoStateEx(player, ART_OF_PERSUASION_ID, 1) + 1);
- htmltext = "32367-184_06.html";
- }
- else if (verifyMemoState(player, NIKOLAS_COOPERATION_ID, 3))
- {
- setMemoStateEx(player, NIKOLAS_COOPERATION_ID, 1, getMemoStateEx(player, NIKOLAS_COOPERATION_ID, 1) + 1);
- htmltext = "32367-185_06.html";
- }
- break;
- }
- case "5":
- {
- if (verifyMemoState(player, ART_OF_PERSUASION_ID, 3))
- {
- setMemoStateEx(player, ART_OF_PERSUASION_ID, 1, getMemoStateEx(player, ART_OF_PERSUASION_ID, 1) + 1);
- htmltext = "32367-184_08.html";
- }
- else if (verifyMemoState(player, NIKOLAS_COOPERATION_ID, 3))
- {
- setMemoStateEx(player, NIKOLAS_COOPERATION_ID, 1, getMemoStateEx(player, NIKOLAS_COOPERATION_ID, 1) + 1);
- htmltext = "32367-185_08.html";
- }
- break;
- }
- case "6":
- {
- if (verifyMemoState(player, ART_OF_PERSUASION_ID, 3))
- {
- final int i0 = getMemoStateEx(player, ART_OF_PERSUASION_ID, 1);
- if (i0 >= 3)
- {
- if ((npc0 != null) && npc0.getVariables().getBoolean("SPAWNED"))
- {
- npc0.getVariables().set("SPAWNED", false);
- }
- npc.deleteMe();
- setMemoState(player, ART_OF_PERSUASION_ID, 4);
- htmltext = "32367-184_09.html";
- }
- else
- {
- setMemoStateEx(player, ART_OF_PERSUASION_ID, 1, 0);
- htmltext = "32367-184_10.html";
- }
- }
- else if (verifyMemoState(player, NIKOLAS_COOPERATION_ID, 3))
- {
- final int i0 = getMemoStateEx(player, NIKOLAS_COOPERATION_ID, 1);
- if (i0 >= 3)
- {
- if ((npc0 != null) && npc0.getVariables().getBoolean("SPAWNED"))
- {
- npc0.getVariables().set("SPAWNED", false);
- }
-
- npc.deleteMe();
- setMemoState(player, NIKOLAS_COOPERATION_ID, 4);
- htmltext = "32367-185_09.html";
- }
- else
- {
- setMemoStateEx(player, NIKOLAS_COOPERATION_ID, 1, 0);
- htmltext = "32367-185_10.html";
- }
- }
- break;
- }
- }
- return htmltext;
- }
-
- @Override
- public String onFirstTalk(Npc npc, PlayerInstance talker)
- {
- String htmltext = getNoQuestMsg(talker);
- if (verifyMemoState(talker, ART_OF_PERSUASION_ID, 3) || verifyMemoState(talker, NIKOLAS_COOPERATION_ID, 3))
- {
- final PlayerInstance player = npc.getVariables().getObject("player0", PlayerInstance.class);
- if (player == talker)
- {
- htmltext = "32367-01.html";
- }
- else
- {
- htmltext = "32367-02.html";
- }
- }
- return htmltext;
- }
-
- @Override
- public String onSpawn(Npc npc)
- {
- cancelQuestTimer("SELF_DESTRUCT_IN_60", npc, null);
- startQuestTimer("SELF_DESTRUCT_IN_60", 60000, npc, null);
- npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.INTRUDER_ALERT_THE_ALARM_WILL_SELF_DESTRUCT_IN_2_MINUTES);
- final PlayerInstance player = npc.getVariables().getObject("player0", PlayerInstance.class);
- if (player != null)
- {
- playSound(player, QuestSound.ITEMSOUND_SIREN);
- }
- return super.onSpawn(npc);
- }
-
- /**
- * Verifies if the given player has the require memo state.
- * @param player the player
- * @param questId the quest ID
- * @param memoState the memo state, if memo state is less than zero, only quest state is checked
- * @return {@code true} if the player has the memo state, {@code false} otherwise
- */
- private static boolean verifyMemoState(PlayerInstance player, int questId, int memoState)
- {
- QuestState qs = null;
- switch (questId)
- {
- case ART_OF_PERSUASION_ID:
- {
- qs = player.getQuestState(Q00184_ArtOfPersuasion.class.getSimpleName());
- break;
- }
- case NIKOLAS_COOPERATION_ID:
- {
- qs = player.getQuestState(Q00185_NikolasCooperation.class.getSimpleName());
- break;
- }
- }
- return (qs != null) && ((memoState < 0) || qs.isMemoState(memoState));
- }
-
- /**
- * Sets the memo state for the given player and quest.
- * @param player the player
- * @param questId the quest ID
- * @param memoState the memo state
- */
- private void setMemoState(PlayerInstance player, int questId, int memoState)
- {
- QuestState qs = null;
- switch (questId)
- {
- case ART_OF_PERSUASION_ID:
- {
- qs = player.getQuestState(Q00184_ArtOfPersuasion.class.getSimpleName());
- break;
- }
- case NIKOLAS_COOPERATION_ID:
- {
- qs = player.getQuestState(Q00185_NikolasCooperation.class.getSimpleName());
- break;
- }
- }
- if (qs != null)
- {
- qs.setMemoState(memoState);
- }
- }
-
- /**
- * Gets the memo state ex for the given player, quest and slot.
- * @param player the player
- * @param questId the quest ID
- * @param slot the slot
- * @return the memo state ex
- */
- private static int getMemoStateEx(PlayerInstance player, int questId, int slot)
- {
- QuestState qs = null;
- switch (questId)
- {
- case ART_OF_PERSUASION_ID:
- {
- qs = player.getQuestState(Q00184_ArtOfPersuasion.class.getSimpleName());
- break;
- }
- case NIKOLAS_COOPERATION_ID:
- {
- qs = player.getQuestState(Q00185_NikolasCooperation.class.getSimpleName());
- break;
- }
- }
- return (qs != null) ? qs.getMemoStateEx(slot) : -1;
- }
-
- /**
- * Sets the memo state ex for the given player and quest.
- * @param player the player
- * @param questId the quest ID
- * @param slot the slot
- * @param memoStateEx the memo state ex
- */
- private void setMemoStateEx(PlayerInstance player, int questId, int slot, int memoStateEx)
- {
- QuestState qs = null;
- switch (questId)
- {
- case ART_OF_PERSUASION_ID:
- {
- qs = player.getQuestState(Q00184_ArtOfPersuasion.class.getSimpleName());
- break;
- }
- case NIKOLAS_COOPERATION_ID:
- {
- qs = player.getQuestState(Q00185_NikolasCooperation.class.getSimpleName());
- break;
- }
- }
- if (qs != null)
- {
- qs.setMemoStateEx(slot, memoStateEx);
- }
- }
-
- public static void main(String[] args)
- {
- new Alarm();
- }
-}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
index 7eacaa8ae3..fab0c0e1af 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/LargeCocoon/LargeCocoon.java
@@ -16,15 +16,12 @@
*/
package ai.areas.FairySettlement.LargeCocoon;
-import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Playable;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttacked;
-import org.l2jmobius.gameserver.model.quest.Quest;
import ai.AbstractNpcAI;
-import quests.Q10305_UnstoppableFutileEfforts.Q10305_UnstoppableFutileEfforts;
/**
* Large Cocoon AI.
@@ -72,11 +69,11 @@ public class LargeCocoon extends AbstractNpcAI
case "attackPowerful":
{
// TODO: Quest 466 stuffs
- final Quest qs10305 = QuestManager.getInstance().getQuest(Q10305_UnstoppableFutileEfforts.class.getSimpleName());
- if (qs10305 != null)
- {
- qs10305.notifyEvent("NOTIFY_Q10305", npc, player);
- }
+ // final Quest qs10305 = QuestManager.getInstance().getQuest(Q10305_UnstoppableFutileEfforts.class.getSimpleName());
+ // if (qs10305 != null)
+ // {
+ // qs10305.notifyEvent("NOTIFY_Q10305", npc, player);
+ // }
if (getRandom(3) < 1)
{
@@ -274,11 +271,11 @@ public class LargeCocoon extends AbstractNpcAI
final Playable playable = (Playable) event.getAttacker();
// TODO: Quest 466 stuffs
- final Quest qs10305 = QuestManager.getInstance().getQuest(Q10305_UnstoppableFutileEfforts.class.getSimpleName());
- if (qs10305 != null)
- {
- qs10305.notifyEvent("NOTIFY_Q10305", npc, playable.getActingPlayer());
- }
+ // final Quest qs10305 = QuestManager.getInstance().getQuest(Q10305_UnstoppableFutileEfforts.class.getSimpleName());
+ // if (qs10305 != null)
+ // {
+ // qs10305.notifyEvent("NOTIFY_Q10305", npc, playable.getActingPlayer());
+ // }
if (getRandom(3) < 1)
{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index cb6d2892f6..bfbf1eaeea 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.model.events.ListenerRegisterType;
import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
import org.l2jmobius.gameserver.model.events.annotations.RegisterType;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass;
-import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.quest.QuestState;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -46,7 +45,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
import ai.AbstractNpcAI;
-import quests.Q10472_WindsOfFateEncroachingShadows.Q10472_WindsOfFateEncroachingShadows;
/**
* AwakeningMaster AI.
@@ -81,14 +79,14 @@ public class AwakeningMaster extends AbstractNpcAI
}
// Skills
- private static final SkillHolder WYNN_POWER = new SkillHolder(16390, 1);
- private static final SkillHolder FEOH_POWER = new SkillHolder(16391, 1);
- private static final SkillHolder TYRR_POWER = new SkillHolder(16392, 1);
- private static final SkillHolder OTHELL_POWER = new SkillHolder(16393, 1);
- private static final SkillHolder ISS_POWER = new SkillHolder(16394, 1);
- private static final SkillHolder YUL_POWER = new SkillHolder(16395, 1);
- private static final SkillHolder SIGEL_POWER = new SkillHolder(16396, 1);
- private static final SkillHolder AEORE_POWER = new SkillHolder(16397, 1);
+ // private static final SkillHolder WYNN_POWER = new SkillHolder(16390, 1);
+ // private static final SkillHolder FEOH_POWER = new SkillHolder(16391, 1);
+ // private static final SkillHolder TYRR_POWER = new SkillHolder(16392, 1);
+ // private static final SkillHolder OTHELL_POWER = new SkillHolder(16393, 1);
+ // private static final SkillHolder ISS_POWER = new SkillHolder(16394, 1);
+ // private static final SkillHolder YUL_POWER = new SkillHolder(16395, 1);
+ // private static final SkillHolder SIGEL_POWER = new SkillHolder(16396, 1);
+ // private static final SkillHolder AEORE_POWER = new SkillHolder(16397, 1);
private AwakeningMaster()
{
@@ -209,54 +207,21 @@ public class AwakeningMaster extends AbstractNpcAI
if (player.getRace() == Race.ERTHEIA)
{
// Ertheia dual class quest
- final QuestState qs = player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName());
- if (qs != null)
- {
- if ((npc.getId() == WYNN_MASTER) && qs.isCond(8))
- {
- return setNextErtheiaQuestState(npc, qs, WYNN_MASTER, 9, WYNN_POWER);
- }
- else if ((npc.getId() == FEOH_MASTER) && qs.isCond(9))
- {
- return setNextErtheiaQuestState(npc, qs, FEOH_MASTER, 10, FEOH_POWER);
- }
- else if ((npc.getId() == TYRR_MASTER) && qs.isCond(10))
- {
- return setNextErtheiaQuestState(npc, qs, TYRR_MASTER, 11, TYRR_POWER);
- }
- else if ((npc.getId() == OTHELL_MASTER) && qs.isCond(11))
- {
- return setNextErtheiaQuestState(npc, qs, OTHELL_MASTER, 12, OTHELL_POWER);
- }
- else if ((npc.getId() == ISS_MASTER) && qs.isCond(12))
- {
- return setNextErtheiaQuestState(npc, qs, ISS_MASTER, 13, ISS_POWER);
- }
- else if ((npc.getId() == YUL_MASTER) && qs.isCond(13))
- {
- return setNextErtheiaQuestState(npc, qs, YUL_MASTER, 14, YUL_POWER);
- }
- else if ((npc.getId() == SIGEL_MASTER) && qs.isCond(14))
- {
- return setNextErtheiaQuestState(npc, qs, SIGEL_MASTER, 15, SIGEL_POWER);
- }
- else if ((npc.getId() == AEORE_MASTER) && qs.isCond(15))
- {
- return setNextErtheiaQuestState(npc, qs, AEORE_MASTER, 16, AEORE_POWER);
- }
- }
+ /*
+ * final QuestState qs = player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName()); if (qs != null) { if ((npc.getId() == WYNN_MASTER) && qs.isCond(8)) { return setNextErtheiaQuestState(npc, qs, WYNN_MASTER, 9, WYNN_POWER); } else if ((npc.getId() == FEOH_MASTER)
+ * && qs.isCond(9)) { return setNextErtheiaQuestState(npc, qs, FEOH_MASTER, 10, FEOH_POWER); } else if ((npc.getId() == TYRR_MASTER) && qs.isCond(10)) { return setNextErtheiaQuestState(npc, qs, TYRR_MASTER, 11, TYRR_POWER); } else if ((npc.getId() == OTHELL_MASTER) && qs.isCond(11)) {
+ * return setNextErtheiaQuestState(npc, qs, OTHELL_MASTER, 12, OTHELL_POWER); } else if ((npc.getId() == ISS_MASTER) && qs.isCond(12)) { return setNextErtheiaQuestState(npc, qs, ISS_MASTER, 13, ISS_POWER); } else if ((npc.getId() == YUL_MASTER) && qs.isCond(13)) { return
+ * setNextErtheiaQuestState(npc, qs, YUL_MASTER, 14, YUL_POWER); } else if ((npc.getId() == SIGEL_MASTER) && qs.isCond(14)) { return setNextErtheiaQuestState(npc, qs, SIGEL_MASTER, 15, SIGEL_POWER); } else if ((npc.getId() == AEORE_MASTER) && qs.isCond(15)) { return
+ * setNextErtheiaQuestState(npc, qs, AEORE_MASTER, 16, AEORE_POWER); } }
+ */
return "ertheia.html";
}
return npc.getId() + ".html";
}
- private String setNextErtheiaQuestState(Npc npc, QuestState qs, int npcId, int cond, SkillHolder skill)
- {
- npc.setTarget(qs.getPlayer());
- npc.doCast(skill.getSkill());
- qs.setCond(cond, true);
- return npcId + "-01.html";
- }
+ /*
+ * private String setNextErtheiaQuestState(Npc npc, QuestState qs, int npcId, int cond, SkillHolder skill) { npc.setTarget(qs.getPlayer()); npc.doCast(skill.getSkill()); qs.setCond(cond, true); return npcId + "-01.html"; }
+ */
@RegisterEvent(EventType.ON_PLAYER_CHANGE_TO_AWAKENED_CLASS)
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index 796746f264..60c5d009af 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -30,14 +30,12 @@ import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.base.ClassId;
import org.l2jmobius.gameserver.model.olympiad.Olympiad;
-import org.l2jmobius.gameserver.model.quest.QuestState;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import ai.AbstractNpcAI;
-import quests.Q10472_WindsOfFateEncroachingShadows.Q10472_WindsOfFateEncroachingShadows;
/**
* Hardin (Agent of Chaos) AI.
@@ -188,11 +186,11 @@ public class Hardin extends AbstractNpcAI
{
if (player.getRace() == Race.ERTHEIA)
{
- final QuestState qs = player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName());
- if ((qs != null) && (qs.getCond() >= 7) && (qs.getCond() <= 17))
- {
- return "33870-03.html";
- }
+ // final QuestState qs = player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName());
+ // if ((qs != null) && (qs.getCond() >= 7) && (qs.getCond() <= 17))
+ // {
+ // return "33870-03.html";
+ // }
if (!Config.HARDIN_ENABLE_ERTHEIAS)
{
return "33870-02.html";
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
index 4e62d72345..4fee077b17 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Pantheon/Pantheon.java
@@ -20,12 +20,9 @@ import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.quest.QuestState;
import org.l2jmobius.gameserver.network.NpcStringId;
-import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import ai.AbstractNpcAI;
-import quests.Q10320_LetsGoToTheCentralSquare.Q10320_LetsGoToTheCentralSquare;
/**
* Pantheon AI.
@@ -80,17 +77,6 @@ public class Pantheon extends AbstractNpcAI
return htmltext;
}
- @Override
- public String onFirstTalk(Npc npc, PlayerInstance player)
- {
- final QuestState qs = player.getQuestState(Q10320_LetsGoToTheCentralSquare.class.getSimpleName());
- if (qs == null)
- {
- showOnScreenMsg(player, NpcStringId.BEGIN_TUTORIAL_QUESTS, ExShowScreenMessage.TOP_CENTER, 4500);
- }
- return super.onFirstTalk(npc, player);
- }
-
@Override
public String onSpawn(Npc npc)
{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
index 7785084e4f..a451969206 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Raina/Raina.java
@@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.model.events.annotations.Id;
import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
import org.l2jmobius.gameserver.model.events.annotations.RegisterType;
import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect;
-import org.l2jmobius.gameserver.model.quest.QuestState;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.AcquireSkillList;
import org.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
@@ -55,8 +54,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import ai.AbstractNpcAI;
-import quests.Q10385_RedThreadOfFate.Q10385_RedThreadOfFate;
-import quests.Q10472_WindsOfFateEncroachingShadows.Q10472_WindsOfFateEncroachingShadows;
/**
* Raina AI.
@@ -631,8 +628,12 @@ public class Raina extends AbstractNpcAI
break;
}
- final QuestState qs = player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName());
- if (((qs == null) || !qs.isCompleted()) && !Config.ALT_GAME_SUBCLASS_WITHOUT_QUESTS)
+ // final QuestState qs = player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName());
+ // if (((qs == null) || !qs.isCompleted()) && !Config.ALT_GAME_SUBCLASS_WITHOUT_QUESTS)
+ // {
+ // break;
+ // }
+ if (!Config.ALT_GAME_SUBCLASS_WITHOUT_QUESTS)
{
break;
}
@@ -733,8 +734,9 @@ public class Raina extends AbstractNpcAI
private boolean haveDoneQuest(PlayerInstance player, boolean isErtheia)
{
- final QuestState qs = isErtheia ? player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName()) : player.getQuestState(Q10385_RedThreadOfFate.class.getSimpleName());
- return (((qs != null) && qs.isCompleted()) || Config.ALT_GAME_SUBCLASS_WITHOUT_QUESTS);
+ // final QuestState qs = isErtheia ? player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName()) : player.getQuestState(Q10385_RedThreadOfFate.class.getSimpleName());
+ // return (((qs != null) && qs.isCompleted()) || Config.ALT_GAME_SUBCLASS_WITHOUT_QUESTS);
+ return (Config.ALT_GAME_SUBCLASS_WITHOUT_QUESTS);
}
/**
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/33004-01.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/33004-01.html
deleted file mode 100644
index 4dddad5fe5..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/33004-01.html
+++ /dev/null
@@ -1,4 +0,0 @@
-Toyron:
-Alright now, let's search for the intruder. It appears it's the Giant's Book he is after. Let us search around the bookshelf.
-Keep the tension up while searching, as the intruder may suddenly show himself.
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/33004-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/33004-02.html
deleted file mode 100644
index 5b1c6cf5f1..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/33004-02.html
+++ /dev/null
@@ -1,4 +0,0 @@
-Toyron:
-We cannot let the intruder be. Let us find him, and slay him.
-The intruder will not be easy to take down. Please use skills to bring him down.
-
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/33004.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/33004.html
deleted file mode 100644
index 49f22c2736..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Toyron/33004.html
+++ /dev/null
@@ -1,6 +0,0 @@
-Toyron:
-This museum displays the Giants' relics. Unfortunately, it's sometimes plagued by thieves.
-The Giants disappeared long ago, but we still uncover treasures in their ruins, even now.
-Return to the Museum Lobby
-Quest
-