diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryGludio.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00717_ForTheSakeOfTheTerritoryGludio.java similarity index 77% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryGludio.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00717_ForTheSakeOfTheTerritoryGludio.java index 84ad16f9cf677bc65b36427c79dff0a995128841..8c68510eb3226870bebf169c6e7a4395c0a05e91 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryGludio.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00717_ForTheSakeOfTheTerritoryGludio.java @@ -24,15 +24,11 @@ import com.l2jserver.gameserver.network.NpcStringId; * For the Sake of the Territory - Gludio (717) * @author Gigiikun */ -public class TheTerritoryGludio extends TerritoryWarSuperClass +public final class Q00717_ForTheSakeOfTheTerritoryGludio extends TerritoryWarSuperClass { - public static String qn1 = "717_FortheSakeoftheTerritoryGludio"; - public static int qnu = 717; - public static String qna = "For the Sake of the Territory - Gludio"; - - public TheTerritoryGludio() + public Q00717_ForTheSakeOfTheTerritoryGludio() { - super(qnu, qn1, qna); + super(717, Q00717_ForTheSakeOfTheTerritoryGludio.class.getSimpleName(), "For the Sake of the Territory - Gludio"); CATAPULT_ID = 36499; TERRITORY_ID = 81; LEADER_IDS = new int[] @@ -48,7 +44,6 @@ public class TheTerritoryGludio extends TerritoryWarSuperClass 36511, 36512 }; - qn = qn1; npcString = new NpcStringId[] { NpcStringId.THE_CATAPULT_OF_GLUDIO_HAS_BEEN_DESTROYED diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryDion.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00718_ForTheSakeOfTheTerritoryDion.java similarity index 77% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryDion.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00718_ForTheSakeOfTheTerritoryDion.java index b2b4fa9419ffa14393728e3d184161bcc676e420..ecdc21210a10dcefed04689a99fd13cb92f4822a 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryDion.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00718_ForTheSakeOfTheTerritoryDion.java @@ -24,15 +24,11 @@ import com.l2jserver.gameserver.network.NpcStringId; * For the Sake of the Territory - Dion (718) * @author Gigiikun */ -public class TheTerritoryDion extends TerritoryWarSuperClass +public final class Q00718_ForTheSakeOfTheTerritoryDion extends TerritoryWarSuperClass { - public static String qn1 = "718_FortheSakeoftheTerritoryDion"; - public static int qnu = 718; - public static String qna = "For the Sake of the Territory - Dion"; - - public TheTerritoryDion() + public Q00718_ForTheSakeOfTheTerritoryDion() { - super(qnu, qn1, qna); + super(718, Q00718_ForTheSakeOfTheTerritoryDion.class.getSimpleName(), "For the Sake of the Territory - Dion"); CATAPULT_ID = 36500; TERRITORY_ID = 82; LEADER_IDS = new int[] @@ -48,7 +44,6 @@ public class TheTerritoryDion extends TerritoryWarSuperClass 36517, 36518 }; - qn = qn1; npcString = new NpcStringId[] { NpcStringId.THE_CATAPULT_OF_DION_HAS_BEEN_DESTROYED diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryGiran.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00719_ForTheSakeOfTheTerritoryGiran.java similarity index 77% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryGiran.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00719_ForTheSakeOfTheTerritoryGiran.java index c0e209a55512d6e457730eb68dc35182bdc76fc5..521daa21ac7458aef8453a6855697ff4fbfcd4dc 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryGiran.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00719_ForTheSakeOfTheTerritoryGiran.java @@ -24,15 +24,11 @@ import com.l2jserver.gameserver.network.NpcStringId; * For the Sake of the Territory - Giran (719) * @author Gigiikun */ -public class TheTerritoryGiran extends TerritoryWarSuperClass +public final class Q00719_ForTheSakeOfTheTerritoryGiran extends TerritoryWarSuperClass { - public static String qn1 = "719_FortheSakeoftheTerritoryGiran"; - public static int qnu = 719; - public static String qna = "For the Sake of the Territory - Giran"; - - public TheTerritoryGiran() + public Q00719_ForTheSakeOfTheTerritoryGiran() { - super(qnu, qn1, qna); + super(719, Q00719_ForTheSakeOfTheTerritoryGiran.class.getSimpleName(), "For the Sake of the Territory - Giran"); CATAPULT_ID = 36501; TERRITORY_ID = 83; LEADER_IDS = new int[] @@ -48,7 +44,6 @@ public class TheTerritoryGiran extends TerritoryWarSuperClass 36523, 36524 }; - qn = qn1; npcString = new NpcStringId[] { NpcStringId.THE_CATAPULT_OF_GIRAN_HAS_BEEN_DESTROYED diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryOren.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00720_ForTheSakeOfTheTerritoryOren.java similarity index 77% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryOren.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00720_ForTheSakeOfTheTerritoryOren.java index 72cccb982a3ce0f6bbbfc4ebbfe7a2a50b0f03a5..d2bb17244f6e7fe552b86efc45a15e301240e838 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryOren.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00720_ForTheSakeOfTheTerritoryOren.java @@ -24,15 +24,11 @@ import com.l2jserver.gameserver.network.NpcStringId; * For the Sake of the Territory - Oren (720) * @author Gigiikun */ -public class TheTerritoryOren extends TerritoryWarSuperClass +public final class Q00720_ForTheSakeOfTheTerritoryOren extends TerritoryWarSuperClass { - public static String qn1 = "720_FortheSakeoftheTerritoryOren"; - public static int qnu = 720; - public static String qna = "For the Sake of the Territory - Oren"; - - public TheTerritoryOren() + public Q00720_ForTheSakeOfTheTerritoryOren() { - super(qnu, qn1, qna); + super(720, Q00720_ForTheSakeOfTheTerritoryOren.class.getSimpleName(), "For the Sake of the Territory - Oren"); CATAPULT_ID = 36502; TERRITORY_ID = 84; LEADER_IDS = new int[] @@ -48,7 +44,6 @@ public class TheTerritoryOren extends TerritoryWarSuperClass 36529, 36530 }; - qn = qn1; npcString = new NpcStringId[] { NpcStringId.THE_CATAPULT_OF_OREN_HAS_BEEN_DESTROYED diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryAden.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00721_ForTheSakeOfTheTerritoryAden.java similarity index 77% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryAden.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00721_ForTheSakeOfTheTerritoryAden.java index 8f3847b03c53c936f83964e3543243a21eb6cfd5..5cd8a1c41139c0df39d70f4dc3b3d4c46d13f81f 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryAden.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00721_ForTheSakeOfTheTerritoryAden.java @@ -24,15 +24,11 @@ import com.l2jserver.gameserver.network.NpcStringId; * For the Sake of the Territory - Aden (721) * @author Gigiikun */ -public class TheTerritoryAden extends TerritoryWarSuperClass +public final class Q00721_ForTheSakeOfTheTerritoryAden extends TerritoryWarSuperClass { - public static String qn1 = "721_FortheSakeoftheTerritoryAden"; - public static int qnu = 721; - public static String qna = "For the Sake of the Territory - Aden"; - - public TheTerritoryAden() + public Q00721_ForTheSakeOfTheTerritoryAden() { - super(qnu, qn1, qna); + super(721, Q00721_ForTheSakeOfTheTerritoryAden.class.getSimpleName(), "For the Sake of the Territory - Aden"); CATAPULT_ID = 36503; TERRITORY_ID = 85; LEADER_IDS = new int[] @@ -48,7 +44,6 @@ public class TheTerritoryAden extends TerritoryWarSuperClass 36535, 36536 }; - qn = qn1; npcString = new NpcStringId[] { NpcStringId.THE_CATAPULT_OF_ADEN_HAS_BEEN_DESTROYED diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryInnadril.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00722_ForTheSakeOfTheTerritoryInnadril.java similarity index 77% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryInnadril.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00722_ForTheSakeOfTheTerritoryInnadril.java index 5c2a685a85cb08dffbea76d40b2b4cc8c810a3a7..f3cfe7d35b68a5968e466f68419923bc4fb9c144 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryInnadril.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00722_ForTheSakeOfTheTerritoryInnadril.java @@ -24,15 +24,11 @@ import com.l2jserver.gameserver.network.NpcStringId; * For the Sake of the Territory - Innadril (722) * @author Gigiikun */ -public class TheTerritoryInnadril extends TerritoryWarSuperClass +public final class Q00722_ForTheSakeOfTheTerritoryInnadril extends TerritoryWarSuperClass { - public static String qn1 = "722_FortheSakeoftheTerritoryInnadril"; - public static int qnu = 722; - public static String qna = "For the Sake of the Territory - Innadril"; - - public TheTerritoryInnadril() + public Q00722_ForTheSakeOfTheTerritoryInnadril() { - super(qnu, qn1, qna); + super(722, Q00722_ForTheSakeOfTheTerritoryInnadril.class.getSimpleName(), "For the Sake of the Territory - Innadril"); CATAPULT_ID = 36504; TERRITORY_ID = 86; LEADER_IDS = new int[] @@ -48,7 +44,6 @@ public class TheTerritoryInnadril extends TerritoryWarSuperClass 36541, 36542 }; - qn = qn1; npcString = new NpcStringId[] { NpcStringId.THE_CATAPULT_OF_INNADRIL_HAS_BEEN_DESTROYED diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryGoddard.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00723_ForTheSakeOfTheTerritoryGoddard.java similarity index 77% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryGoddard.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00723_ForTheSakeOfTheTerritoryGoddard.java index f4022236db06c0c8acdf78f4bb0dfc5986939d9d..0ceaa4c4767448098d42ddf11041e62847aa14f6 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryGoddard.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00723_ForTheSakeOfTheTerritoryGoddard.java @@ -24,15 +24,11 @@ import com.l2jserver.gameserver.network.NpcStringId; * For the Sake of the Territory - Goddard (723) * @author Gigiikun */ -public class TheTerritoryGoddard extends TerritoryWarSuperClass +public final class Q00723_ForTheSakeOfTheTerritoryGoddard extends TerritoryWarSuperClass { - public static String qn1 = "723_FortheSakeoftheTerritoryGoddard"; - public static int qnu = 723; - public static String qna = "For the Sake of the Territory - Goddard"; - - public TheTerritoryGoddard() + public Q00723_ForTheSakeOfTheTerritoryGoddard() { - super(qnu, qn1, qna); + super(723, Q00723_ForTheSakeOfTheTerritoryGoddard.class.getSimpleName(), "For the Sake of the Territory - Goddard"); CATAPULT_ID = 36505; TERRITORY_ID = 87; LEADER_IDS = new int[] @@ -48,7 +44,6 @@ public class TheTerritoryGoddard extends TerritoryWarSuperClass 36547, 36548 }; - qn = qn1; npcString = new NpcStringId[] { NpcStringId.THE_CATAPULT_OF_GODDARD_HAS_BEEN_DESTROYED diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryRune.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00724_ForTheSakeOfTheTerritoryRune.java similarity index 77% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryRune.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00724_ForTheSakeOfTheTerritoryRune.java index 9002336042e65be442acb86efab95c3c194c2c46..820f30ff7ff2a62c0fb24fdafd03a7053bbfd113 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritoryRune.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00724_ForTheSakeOfTheTerritoryRune.java @@ -24,15 +24,11 @@ import com.l2jserver.gameserver.network.NpcStringId; * For the Sake of the Territory - Rune (724) * @author Gigiikun */ -public class TheTerritoryRune extends TerritoryWarSuperClass +public final class Q00724_ForTheSakeOfTheTerritoryRune extends TerritoryWarSuperClass { - public static String qn1 = "724_FortheSakeoftheTerritoryRune"; - public static int qnu = 724; - public static String qna = "For the Sake of the Territory - Rune"; - - public TheTerritoryRune() + public Q00724_ForTheSakeOfTheTerritoryRune() { - super(qnu, qn1, qna); + super(724, Q00724_ForTheSakeOfTheTerritoryRune.class.getSimpleName(), "For the Sake of the Territory - Rune"); CATAPULT_ID = 36506; TERRITORY_ID = 88; LEADER_IDS = new int[] @@ -48,7 +44,6 @@ public class TheTerritoryRune extends TerritoryWarSuperClass 36553, 36554 }; - qn = qn1; npcString = new NpcStringId[] { NpcStringId.THE_CATAPULT_OF_RUNE_HAS_BEEN_DESTROYED diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritorySchuttgart.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00725_ForTheSakeOfTheTerritorySchuttgart.java similarity index 76% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritorySchuttgart.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00725_ForTheSakeOfTheTerritorySchuttgart.java index 429a57e13531092601ff44733a57ace31bb8321b..10b007245f44933ac20b2368a4484b506db844c5 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TheTerritorySchuttgart.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00725_ForTheSakeOfTheTerritorySchuttgart.java @@ -24,15 +24,11 @@ import com.l2jserver.gameserver.network.NpcStringId; * For the Sake of the Territory - Schuttgart (725) * @author Gigiikun */ -public class TheTerritorySchuttgart extends TerritoryWarSuperClass +public final class Q00725_ForTheSakeOfTheTerritorySchuttgart extends TerritoryWarSuperClass { - public static String qn1 = "725_FortheSakeoftheTerritorySchuttgart"; - public static int qnu = 725; - public static String qna = "For the Sake of the Territory - Schuttgart"; - - public TheTerritorySchuttgart() + public Q00725_ForTheSakeOfTheTerritorySchuttgart() { - super(qnu, qn1, qna); + super(725, Q00725_ForTheSakeOfTheTerritorySchuttgart.class.getSimpleName(), "For the Sake of the Territory - Schuttgart"); CATAPULT_ID = 36507; TERRITORY_ID = 89; LEADER_IDS = new int[] @@ -48,7 +44,6 @@ public class TheTerritorySchuttgart extends TerritoryWarSuperClass 36559, 36560 }; - qn = qn1; npcString = new NpcStringId[] { NpcStringId.THE_CATAPULT_OF_SCHUTTGART_HAS_BEEN_DESTROYED diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheCatapult.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00729_ProtectTheTerritoryCatapult.java similarity index 71% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheCatapult.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00729_ProtectTheTerritoryCatapult.java index 8d697070ddf8fdc8f3232bd2497e17d9e7264cde..95eb086072a432b45b68d1143794b80b57d0eb5d 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheCatapult.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00729_ProtectTheTerritoryCatapult.java @@ -22,15 +22,11 @@ package quests.TerritoryWarScripts; * Protect the Territory Catapult! (729) * @author Gigiikun */ -public class ProtectTheCatapult extends TerritoryWarSuperClass +public final class Q00729_ProtectTheTerritoryCatapult extends TerritoryWarSuperClass { - public static String qn1 = "729_Protecttheterritorycatapult"; - public static int qnu = 729; - public static String qna = "Protect the territory catapult"; - - public ProtectTheCatapult() + public Q00729_ProtectTheTerritoryCatapult() { - super(qnu, qn1, qna); + super(729, Q00729_ProtectTheTerritoryCatapult.class.getSimpleName(), "Protect the Territory Catapult"); NPC_IDS = new int[] { 36499, @@ -43,13 +39,12 @@ public class ProtectTheCatapult extends TerritoryWarSuperClass 36506, 36507 }; - qn = qn1; addAttackId(NPC_IDS); } @Override - public int getTerritoryIdForThisNPCId(int npcid) + public int getTerritoryIdForThisNPCId(int npcId) { - return npcid - 36418; + return npcId - 36418; } } diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheSupplies.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00730_ProtectTheSuppliesSafe.java similarity index 71% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheSupplies.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00730_ProtectTheSuppliesSafe.java index 1440b413a71558b0efdb44279494716729c501c5..cd92cbbace6e7b76cfa3989da6675efb964676b7 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheSupplies.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00730_ProtectTheSuppliesSafe.java @@ -22,15 +22,11 @@ package quests.TerritoryWarScripts; * Protect the Supplies Safe (730) * @author Gigiikun */ -public class ProtectTheSupplies extends TerritoryWarSuperClass +public final class Q00730_ProtectTheSuppliesSafe extends TerritoryWarSuperClass { - public static String qn1 = "730_ProtecttheSuppliesSafe."; - public static int qnu = 730; - public static String qna = "Protect the Supplies Safe"; - - public ProtectTheSupplies() + public Q00730_ProtectTheSuppliesSafe() { - super(qnu, qn1, qna); + super(730, Q00730_ProtectTheSuppliesSafe.class.getSimpleName(), "Protect the Supplies Safe"); NPC_IDS = new int[] { 36591, @@ -43,13 +39,12 @@ public class ProtectTheSupplies extends TerritoryWarSuperClass 36598, 36599 }; - qn = qn1; addAttackId(NPC_IDS); } @Override - public int getTerritoryIdForThisNPCId(int npcid) + public int getTerritoryIdForThisNPCId(int npcId) { - return npcid - 36510; + return npcId - 36510; } } diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheMilitary.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00731_ProtectTheMilitaryAssociationLeader.java similarity index 69% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheMilitary.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00731_ProtectTheMilitaryAssociationLeader.java index 39d3db513c1e0a16f1731494e30a9337a3328984..fcd3942c9762950031bacc664ca4c742eb4c2018 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheMilitary.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00731_ProtectTheMilitaryAssociationLeader.java @@ -22,15 +22,11 @@ package quests.TerritoryWarScripts; * Protect the Military Association Leader (731) * @author Gigiikun */ -public class ProtectTheMilitary extends TerritoryWarSuperClass +public final class Q00731_ProtectTheMilitaryAssociationLeader extends TerritoryWarSuperClass { - public static String qn1 = "731_ProtecttheMilitaryAssociationLeader"; - public static int qnu = 731; - public static String qna = "Protect the Military Association Leader"; - - public ProtectTheMilitary() + public Q00731_ProtectTheMilitaryAssociationLeader() { - super(qnu, qn1, qna); + super(731, Q00731_ProtectTheMilitaryAssociationLeader.class.getSimpleName(), "Protect the Military Association Leader"); NPC_IDS = new int[] { 36508, @@ -43,13 +39,12 @@ public class ProtectTheMilitary extends TerritoryWarSuperClass 36550, 36556 }; - qn = qn1; addAttackId(NPC_IDS); } @Override - public int getTerritoryIdForThisNPCId(int npcid) + public int getTerritoryIdForThisNPCId(int npcId) { - return 81 + ((npcid - 36508) / 6); + return 81 + ((npcId - 36508) / 6); } } diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheReligious.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00732_ProtectTheReligiousAssociationLeader.java similarity index 69% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheReligious.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00732_ProtectTheReligiousAssociationLeader.java index 804cf6e9a1b589b821f7981385972a694769c5d4..789c6fa5972c1d956233b59f782ec9c51da4e591 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheReligious.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00732_ProtectTheReligiousAssociationLeader.java @@ -22,15 +22,11 @@ package quests.TerritoryWarScripts; * Protect the Religious Association Leader (732) * @author Gigiikun */ -public class ProtectTheReligious extends TerritoryWarSuperClass +public final class Q00732_ProtectTheReligiousAssociationLeader extends TerritoryWarSuperClass { - public static String qn1 = "732_ProtecttheReligiousAssociationLeader"; - public static int qnu = 732; - public static String qna = "Protect the Religious Association Leader"; - - public ProtectTheReligious() + public Q00732_ProtectTheReligiousAssociationLeader() { - super(qnu, qn1, qna); + super(732, Q00732_ProtectTheReligiousAssociationLeader.class.getSimpleName(), "Protect the Religious Association Leader"); NPC_IDS = new int[] { 36510, @@ -43,13 +39,12 @@ public class ProtectTheReligious extends TerritoryWarSuperClass 36552, 36558 }; - qn = qn1; addAttackId(NPC_IDS); } @Override - public int getTerritoryIdForThisNPCId(int npcid) + public int getTerritoryIdForThisNPCId(int npcId) { - return 81 + ((npcid - 36510) / 6); + return 81 + ((npcId - 36510) / 6); } } diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheEconomic.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00733_ProtectTheEconomicAssociationLeader.java similarity index 69% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheEconomic.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00733_ProtectTheEconomicAssociationLeader.java index 8958561874d90fc37d107c4e66e921acc87432d0..68d68a587ef39ec397c3ed6a521756229816c359 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/ProtectTheEconomic.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00733_ProtectTheEconomicAssociationLeader.java @@ -22,15 +22,11 @@ package quests.TerritoryWarScripts; * Protect the Economic Association Leader (733) * @author Gigiikun */ -public class ProtectTheEconomic extends TerritoryWarSuperClass +public final class Q00733_ProtectTheEconomicAssociationLeader extends TerritoryWarSuperClass { - public static String qn1 = "733_ProtecttheEconomicAssociationLeader"; - public static int qnu = 733; - public static String qna = "Protect the Economic Association Leader"; - - public ProtectTheEconomic() + public Q00733_ProtectTheEconomicAssociationLeader() { - super(qnu, qn1, qna); + super(733, Q00733_ProtectTheEconomicAssociationLeader.class.getSimpleName(), "Protect the Economic Association Leader"); NPC_IDS = new int[] { 36513, @@ -43,13 +39,12 @@ public class ProtectTheEconomic extends TerritoryWarSuperClass 36555, 36561 }; - qn = qn1; addAttackId(NPC_IDS); } @Override - public int getTerritoryIdForThisNPCId(int npcid) + public int getTerritoryIdForThisNPCId(int npcId) { - return 81 + ((npcid - 36513) / 6); + return 81 + ((npcId - 36513) / 6); } } diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillTheKnights.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00734_PierceThroughAShield.java similarity index 78% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillTheKnights.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00734_PierceThroughAShield.java index 5830f96aee4f9b6b9108336c1630d52bc47a80ef..471a9b8ffd18d721f5365bd5bb4fe29a3d9fd7af 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillTheKnights.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00734_PierceThroughAShield.java @@ -24,15 +24,11 @@ import com.l2jserver.gameserver.network.NpcStringId; * Pierce through a Shield! (734) * @author Gigiikun */ -public class KillTheKnights extends TerritoryWarSuperClass +public final class Q00734_PierceThroughAShield extends TerritoryWarSuperClass { - public static String qn1 = "734_Piercethroughashield"; - public static int qnu = 734; - public static String qna = "Pierce through a shield"; - - public KillTheKnights() + public Q00734_PierceThroughAShield() { - super(qnu, qn1, qna); + super(734, Q00734_PierceThroughAShield.class.getSimpleName(), "Pierce through a Shield"); CLASS_IDS = new int[] { 6, @@ -44,7 +40,6 @@ public class KillTheKnights extends TerritoryWarSuperClass 33, 106 }; - qn = qn1; RANDOM_MIN = 10; RANDOM_MAX = 15; npcString = new NpcStringId[] diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillTheWarriors.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00735_MakeSpearsDull.java similarity index 80% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillTheWarriors.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00735_MakeSpearsDull.java index fb1a4605ac5b98bd8b1165463e68d86cb966f536..03fb2f3968757b92b7132a7d736d1e4231481b21 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillTheWarriors.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00735_MakeSpearsDull.java @@ -24,15 +24,11 @@ import com.l2jserver.gameserver.network.NpcStringId; * Make Spears Dull! (735) * @author Gigiikun */ -public class KillTheWarriors extends TerritoryWarSuperClass +public final class Q00735_MakeSpearsDull extends TerritoryWarSuperClass { - public static String qn1 = "735_Makespearsdull"; - public static int qnu = 735; - public static String qna = "Make spears dull"; - - public KillTheWarriors() + public Q00735_MakeSpearsDull() { - super(qnu, qn1, qna); + super(735, Q00735_MakeSpearsDull.class.getSimpleName(), "Make Spears Dull"); CLASS_IDS = new int[] { 23, @@ -72,7 +68,6 @@ public class KillTheWarriors extends TerritoryWarSuperClass 135, 136 }; - qn = qn1; RANDOM_MIN = 15; RANDOM_MAX = 20; npcString = new NpcStringId[] diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillTheWizards.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00736_WeakenTheMagic.java similarity index 79% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillTheWizards.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00736_WeakenTheMagic.java index 71cf21a8d5505eb37d0219e4679d1e5df928ed03..05695825962ade4f349b63ad6d40a3852f70004c 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillTheWizards.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00736_WeakenTheMagic.java @@ -24,15 +24,11 @@ import com.l2jserver.gameserver.network.NpcStringId; * Weaken the magic! (736) * @author Gigiikun */ -public class KillTheWizards extends TerritoryWarSuperClass +public final class Q00736_WeakenTheMagic extends TerritoryWarSuperClass { - public static String qn1 = "736_Weakenmagic"; - public static int qnu = 736; - public static String qna = "Weaken magic"; - - public KillTheWizards() + public Q00736_WeakenTheMagic() { - super(qnu, qn1, qna); + super(736, Q00736_WeakenTheMagic.class.getSimpleName(), "Weaken the magic"); CLASS_IDS = new int[] { 40, @@ -50,7 +46,6 @@ public class KillTheWizards extends TerritoryWarSuperClass 14, 96 }; - qn = qn1; RANDOM_MIN = 10; RANDOM_MAX = 15; npcString = new NpcStringId[] diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillThePriests.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00737_DenyBlessings.java similarity index 79% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillThePriests.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00737_DenyBlessings.java index 6ad7f94ad27b8b9276bb9306d41bb2dbaf49e6bc..084bb97f5795757d747eb57d8271673e03ee93b2 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillThePriests.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00737_DenyBlessings.java @@ -24,15 +24,11 @@ import com.l2jserver.gameserver.network.NpcStringId; * Deny Blessings (737) * @author Gigiikun */ -public class KillThePriests extends TerritoryWarSuperClass +public final class Q00737_DenyBlessings extends TerritoryWarSuperClass { - public static String qn1 = "737_DenyBlessings"; - public static int qnu = 737; - public static String qna = "Deny Blessings"; - - public KillThePriests() + public Q00737_DenyBlessings() { - super(qnu, qn1, qna); + super(737, Q00737_DenyBlessings.class.getSimpleName(), "Deny Blessings"); CLASS_IDS = new int[] { 43, @@ -46,7 +42,6 @@ public class KillThePriests extends TerritoryWarSuperClass 52, 116 }; - qn = qn1; RANDOM_MIN = 3; RANDOM_MAX = 8; npcString = new NpcStringId[] diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillTheKeyTargets.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00738_DestroyKeyTargets.java similarity index 78% rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillTheKeyTargets.java rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00738_DestroyKeyTargets.java index 5b262b2c925deb01c5caccf9ce9310aa7201f7cc..1199d1b967fba59b875f8978dcff4f33b2e1816d 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/KillTheKeyTargets.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/Q00738_DestroyKeyTargets.java @@ -24,15 +24,11 @@ import com.l2jserver.gameserver.network.NpcStringId; * Destroy Key Targets (738) * @author Gigiikun */ -public class KillTheKeyTargets extends TerritoryWarSuperClass +public final class Q00738_DestroyKeyTargets extends TerritoryWarSuperClass { - public static String qn1 = "738_DestroyKeyTargets"; - public static int qnu = 738; - public static String qna = "Destroy Key Targets"; - - public KillTheKeyTargets() + public Q00738_DestroyKeyTargets() { - super(qnu, qn1, qna); + super(738, Q00738_DestroyKeyTargets.class.getSimpleName(), "Destroy Key Targets"); CLASS_IDS = new int[] { 51, @@ -40,7 +36,6 @@ public class KillTheKeyTargets extends TerritoryWarSuperClass 57, 118 }; - qn = qn1; RANDOM_MIN = 3; RANDOM_MAX = 8; npcString = new NpcStringId[] diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java index 7dd70d8577bf135147f5ae95a3387600373cb29b..8bccecdbdb7891ff65f6199f583582850bfb929b 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java @@ -53,8 +53,6 @@ public class TerritoryWarSuperClass extends Quest private static L2FastMap<Integer, TerritoryWarSuperClass> _protectTheScripts = new L2FastMap<>(); private static L2FastMap<Integer, TerritoryWarSuperClass> _killTheScripts = new L2FastMap<>(); - public static String qn = "TerritoryWarSuperClass"; - // "For the Sake of the Territory ..." quests variables public int CATAPULT_ID; public int TERRITORY_ID; @@ -255,8 +253,8 @@ public class TerritoryWarSuperClass extends Quest } if (!st.isStarted()) { - st.setCond(1); st.setState(State.STARTED, false); + st.setCond(1); } } } @@ -467,14 +465,12 @@ public class TerritoryWarSuperClass extends Quest } else { - st.setState(State.COMPLETED, false); st.exitQuest(false); for (Quest q : _protectTheScripts.values()) { st = player.getQuestState(q.getName()); if (st != null) { - st.setState(State.COMPLETED, false); st.exitQuest(false); } } @@ -506,48 +502,26 @@ public class TerritoryWarSuperClass extends Quest if ((st != null) && st.isStarted()) { + final int cond = st.getCond(); if (catapult) { - if (st.isCond(1) || st.isCond(2)) + if ((cond == 1) || (cond == 2)) { - int count = st.getInt("catapult"); - count++; + final int count = st.getInt("catapult") + 1; st.set("catapult", String.valueOf(count)); if (count >= catapultCount) { - if (st.isCond(1)) - { - st.setCond(3); - } - else - { - st.setCond(4); - } + st.setCond((cond == 1) ? 3 : 4); } } } - else + else if ((cond == 1) || (cond == 3)) { - if (st.isCond(1) || st.isCond(3)) + final int kills = st.getInt("kills") + 1; + st.set("kills", Integer.toString(kills)); + if (kills >= enemyCount) { - // Get - int _kills = st.getInt("kills"); - // Increase - _kills++; - // Save - st.set("kills", String.valueOf(_kills)); - // Check - if (_kills >= enemyCount) - { - if (st.isCond(1)) - { - st.setCond(2); - } - else - { - st.setCond(4); - } - } + st.setCond((cond == 1) ? 2 : 4); } } } @@ -555,22 +529,14 @@ public class TerritoryWarSuperClass extends Quest private static void handleStepsForHonor(L2PcInstance player) { - int kills = 0; - int cond = 0; - // Additional Handle for Quest final QuestState _sfh = player.getQuestState(Q00176_StepsForHonor.class.getSimpleName()); if ((_sfh != null) && _sfh.isStarted()) { - cond = _sfh.getCond(); + final int cond = _sfh.getCond(); if ((cond == 1) || (cond == 3) || (cond == 5) || (cond == 7)) { - // Get kills - kills = _sfh.getInt("kills"); - // Increase - kills++; - // Save - _sfh.set("kills", String.valueOf(kills)); - // Check + final int kills = _sfh.getInt("kills") + 1; + _sfh.set("kills", kills); if ((cond == 1) && (kills >= 9)) { _sfh.setCond(2); @@ -598,61 +564,61 @@ public class TerritoryWarSuperClass extends Quest public static void main(String[] args) { // initialize superclass - new TerritoryWarSuperClass(-1, qn, "Territory_War"); + new TerritoryWarSuperClass(-1, TerritoryWarSuperClass.class.getSimpleName(), "Territory War Superclass"); // initialize subclasses // "For The Sake" quests - TerritoryWarSuperClass gludio = new TheTerritoryGludio(); + TerritoryWarSuperClass gludio = new Q00717_ForTheSakeOfTheTerritoryGludio(); _forTheSakeScripts.put(gludio.TERRITORY_ID, gludio); - TerritoryWarSuperClass dion = new TheTerritoryDion(); + TerritoryWarSuperClass dion = new Q00718_ForTheSakeOfTheTerritoryDion(); _forTheSakeScripts.put(dion.TERRITORY_ID, dion); - TerritoryWarSuperClass giran = new TheTerritoryGiran(); + TerritoryWarSuperClass giran = new Q00719_ForTheSakeOfTheTerritoryGiran(); _forTheSakeScripts.put(giran.TERRITORY_ID, giran); - TerritoryWarSuperClass oren = new TheTerritoryOren(); + TerritoryWarSuperClass oren = new Q00720_ForTheSakeOfTheTerritoryOren(); _forTheSakeScripts.put(oren.TERRITORY_ID, oren); - TerritoryWarSuperClass aden = new TheTerritoryAden(); + TerritoryWarSuperClass aden = new Q00721_ForTheSakeOfTheTerritoryAden(); _forTheSakeScripts.put(aden.TERRITORY_ID, aden); - TerritoryWarSuperClass innadril = new TheTerritoryInnadril(); + TerritoryWarSuperClass innadril = new Q00722_ForTheSakeOfTheTerritoryInnadril(); _forTheSakeScripts.put(innadril.TERRITORY_ID, innadril); - TerritoryWarSuperClass goddard = new TheTerritoryGoddard(); + TerritoryWarSuperClass goddard = new Q00723_ForTheSakeOfTheTerritoryGoddard(); _forTheSakeScripts.put(goddard.TERRITORY_ID, goddard); - TerritoryWarSuperClass rune = new TheTerritoryRune(); + TerritoryWarSuperClass rune = new Q00724_ForTheSakeOfTheTerritoryRune(); _forTheSakeScripts.put(rune.TERRITORY_ID, rune); - TerritoryWarSuperClass schuttgart = new TheTerritorySchuttgart(); + TerritoryWarSuperClass schuttgart = new Q00725_ForTheSakeOfTheTerritorySchuttgart(); _forTheSakeScripts.put(schuttgart.TERRITORY_ID, schuttgart); // "Protect the" quests - TerritoryWarSuperClass catapult = new ProtectTheCatapult(); + TerritoryWarSuperClass catapult = new Q00729_ProtectTheTerritoryCatapult(); _protectTheScripts.put(catapult.getId(), catapult); - TerritoryWarSuperClass military = new ProtectTheMilitary(); + TerritoryWarSuperClass supplies = new Q00730_ProtectTheSuppliesSafe(); + _protectTheScripts.put(supplies.getId(), supplies); + TerritoryWarSuperClass military = new Q00731_ProtectTheMilitaryAssociationLeader(); _protectTheScripts.put(military.getId(), military); - TerritoryWarSuperClass religious = new ProtectTheReligious(); + TerritoryWarSuperClass religious = new Q00732_ProtectTheReligiousAssociationLeader(); _protectTheScripts.put(religious.getId(), religious); - TerritoryWarSuperClass supplies = new ProtectTheSupplies(); - _protectTheScripts.put(supplies.getId(), supplies); - TerritoryWarSuperClass economic = new ProtectTheEconomic(); + TerritoryWarSuperClass economic = new Q00733_ProtectTheEconomicAssociationLeader(); _protectTheScripts.put(economic.getId(), economic); - // "Kill the" quests - TerritoryWarSuperClass knights = new KillTheKnights(); + // "Kill" quests + TerritoryWarSuperClass knights = new Q00734_PierceThroughAShield(); for (int i : knights.CLASS_IDS) { _killTheScripts.put(i, knights); } - TerritoryWarSuperClass warriors = new KillTheWarriors(); + TerritoryWarSuperClass warriors = new Q00735_MakeSpearsDull(); for (int i : warriors.CLASS_IDS) { _killTheScripts.put(i, warriors); } - TerritoryWarSuperClass wizards = new KillTheWizards(); + TerritoryWarSuperClass wizards = new Q00736_WeakenTheMagic(); for (int i : wizards.CLASS_IDS) { _killTheScripts.put(i, wizards); } - TerritoryWarSuperClass priests = new KillThePriests(); + TerritoryWarSuperClass priests = new Q00737_DenyBlessings(); for (int i : priests.CLASS_IDS) { _killTheScripts.put(i, priests); } - TerritoryWarSuperClass keys = new KillTheKeyTargets(); + TerritoryWarSuperClass keys = new Q00738_DestroyKeyTargets(); for (int i : keys.CLASS_IDS) { _killTheScripts.put(i, keys);