diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java index 3083c06f4d..41e252b731 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java @@ -69,8 +69,8 @@ public class Q11024_PathOfDestinyBeginning extends Quest private static final Location TRAINING_GROUNDS_TELEPORT2 = new Location(-16744, 140209, -3872); // Misc private static final String SHOTS_REWARD_CHECK_VAR = "SHOTS_REWARD_CHECK"; - private static final String EXPSP_REWARD_CHECK_VAR = "EXPSP_REWARD_CHECK"; - private static final String EXPSP_REWARD_CHECK_VAR2 = "EXPSP_REWARD_CHECK2"; + private static final String REWARD_CHECK_VAR1 = "Q11024_REWARD_1"; + private static final String REWARD_CHECK_VAR2 = "Q11024_REWARD_2"; private static final String KILL_COUNT_VAR = "KillCount"; private static final String KILL_COUNT_VAR2 = "KillCount2"; private static boolean INSTANT_LEVEL_20 = false; @@ -133,9 +133,9 @@ public class Q11024_PathOfDestinyBeginning extends Quest if (qs.isCond(7)) { qs.setCond(8, true); - if (!player.getVariables().getBoolean(EXPSP_REWARD_CHECK_VAR2, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR2, false)) { - player.getVariables().set(EXPSP_REWARD_CHECK_VAR2, true); + player.getVariables().set(REWARD_CHECK_VAR2, true); if (INSTANT_LEVEL_20 && (player.getLevel() < 20)) { addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(20) + 100) - player.getExp(), 708); @@ -182,9 +182,9 @@ public class Q11024_PathOfDestinyBeginning extends Quest if (qs.isCond(4)) { qs.setCond(5, true); - if (!player.getVariables().getBoolean(EXPSP_REWARD_CHECK_VAR, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR1, false)) { - player.getVariables().set(EXPSP_REWARD_CHECK_VAR, true); + player.getVariables().set(REWARD_CHECK_VAR1, true); addExpAndSp(player, 48229, 43); } htmltext = event; diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java index 8816b9bd12..7dd6140dca 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java @@ -106,9 +106,9 @@ public class Q11025_PathOfDestinyProving extends Quest private static final String R_GRADE_ITEMS_REWARDED_VAR = "R_GRADE_ITEMS_REWARDED"; private static final String KILL_COUNT_VAR = "KillCount"; private static final String KILL_COUNT_VAR2 = "KillCount2"; - private static final String EXPSP_REWARD_CHECK_VAR1 = "EXPSP_REWARD_CHECK"; - private static final String EXPSP_REWARD_CHECK_VAR2 = "EXPSP_REWARD_CHECK2"; - private static final String EXPSP_REWARD_CHECK_VAR3 = "EXPSP_REWARD_CHECK3"; + private static final String REWARD_CHECK_VAR1 = "Q11025_REWARD_1"; + private static final String REWARD_CHECK_VAR2 = "Q11025_REWARD_2"; + private static final String REWARD_CHECK_VAR3 = "Q11025_REWARD_3"; private static final int LEVEL_20 = 20; private static final int LEVEL_40 = 40; private static boolean INSTANT_LEVEL_40 = false; @@ -176,9 +176,9 @@ public class Q11025_PathOfDestinyProving extends Quest { takeItems(player, SECRET_MATERIAL, 15); qs.setCond(3, true); - if (!player.getVariables().getBoolean(EXPSP_REWARD_CHECK_VAR1, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR1, false)) { - player.getVariables().set(EXPSP_REWARD_CHECK_VAR1, true); + player.getVariables().set(REWARD_CHECK_VAR1, true); addExpAndSp(player, 1640083, 1476); } htmltext = event; @@ -201,9 +201,9 @@ public class Q11025_PathOfDestinyProving extends Quest if (qs.isCond(5)) { qs.setCond(6, true); - if (!player.getVariables().getBoolean(EXPSP_REWARD_CHECK_VAR2, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR2, false)) { - player.getVariables().set(EXPSP_REWARD_CHECK_VAR2, true); + player.getVariables().set(REWARD_CHECK_VAR2, true); addExpAndSp(player, 913551, 822); } htmltext = event; @@ -227,9 +227,9 @@ public class Q11025_PathOfDestinyProving extends Quest { takeItems(player, BREATH_OF_DEATH, 15); qs.setCond(9, true); - if (!player.getVariables().getBoolean(EXPSP_REWARD_CHECK_VAR3, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR3, false)) { - player.getVariables().set(EXPSP_REWARD_CHECK_VAR3, true); + player.getVariables().set(REWARD_CHECK_VAR3, true); if (INSTANT_LEVEL_40 && (player.getLevel() < LEVEL_40)) { addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(LEVEL_40) + 100) - player.getExp(), 4457); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java index 2756afa483..ec8674fcd6 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java @@ -84,11 +84,11 @@ public class Q11026_PathOfDestinyConviction extends Quest private static final String KILL_COUNT_VAR = "KillCount"; private static final String KILL_COUNT_VAR2 = "KillCount2"; private static final String KILL_COUNT_VAR3 = "KillCount3"; - private static final String EXPSPADENA_REWARD_CHECK_VAR1 = "EXPSPADENA_REWARD_CHECK_VAR1"; - private static final String EXPSPADENA_REWARD_CHECK_VAR2 = "EXPSPADENA_REWARD_CHECK_VAR2"; - private static final String EXPSPADENA_REWARD_CHECK_VAR3 = "EXPSPADENA_REWARD_CHECK_VAR3"; - private static final String EXPSPADENA_REWARD_CHECK_VAR4 = "EXPSPADENA_REWARD_CHECK_VAR4"; - private static final String EXPSPADENA_REWARD_CHECK_VAR5 = "EXPSPADENA_REWARD_CHECK_VAR5"; + private static final String REWARD_CHECK_VAR1 = "Q11026_REWARD_1"; + private static final String REWARD_CHECK_VAR2 = "Q11026_REWARD_2"; + private static final String REWARD_CHECK_VAR3 = "Q11026_REWARD_3"; + private static final String REWARD_CHECK_VAR4 = "Q11026_REWARD_4"; + private static final String REWARD_CHECK_VAR5 = "Q11026_REWARD_5"; private static final int LEVEL_40 = 40; private static final int LEVEL_76 = 76; private static boolean INSTANT_LEVEL_76 = false; @@ -153,9 +153,9 @@ public class Q11026_PathOfDestinyConviction extends Quest { qs.setCond(3, true); htmltext = event; - if (!player.getVariables().getBoolean(EXPSPADENA_REWARD_CHECK_VAR1, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR1, false)) { - player.getVariables().set(EXPSPADENA_REWARD_CHECK_VAR1, true); + player.getVariables().set(REWARD_CHECK_VAR1, true); addExpAndSp(player, 14281098, 12852); } } @@ -176,9 +176,9 @@ public class Q11026_PathOfDestinyConviction extends Quest if (qs.isCond(5)) { qs.setCond(6, true); - if (!player.getVariables().getBoolean(EXPSPADENA_REWARD_CHECK_VAR2, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR2, false)) { - player.getVariables().set(EXPSPADENA_REWARD_CHECK_VAR2, true); + player.getVariables().set(REWARD_CHECK_VAR2, true); addExpAndSp(player, 30949789, 27854); } } @@ -202,9 +202,9 @@ public class Q11026_PathOfDestinyConviction extends Quest takeItems(player, CORRUPTED_ENERGY, 15); qs.setCond(9, true); htmltext = event; - if (!player.getVariables().getBoolean(EXPSPADENA_REWARD_CHECK_VAR3, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR3, false)) { - player.getVariables().set(EXPSPADENA_REWARD_CHECK_VAR3, true); + player.getVariables().set(REWARD_CHECK_VAR3, true); addExpAndSp(player, 76142825, 68528); } } @@ -227,9 +227,9 @@ public class Q11026_PathOfDestinyConviction extends Quest takeItems(player, EMBEDDED_SHARD, 15); qs.setCond(12, true); htmltext = event; - if (!player.getVariables().getBoolean(EXPSPADENA_REWARD_CHECK_VAR4, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR4, false)) { - player.getVariables().set(EXPSPADENA_REWARD_CHECK_VAR4, true); + player.getVariables().set(REWARD_CHECK_VAR4, true); addExpAndSp(player, 174520303, 157068); } } @@ -250,9 +250,9 @@ public class Q11026_PathOfDestinyConviction extends Quest if (qs.isCond(14)) { qs.setCond(15, true); - if (!player.getVariables().getBoolean(EXPSPADENA_REWARD_CHECK_VAR5, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR5, false)) { - player.getVariables().set(EXPSPADENA_REWARD_CHECK_VAR5, true); + player.getVariables().set(REWARD_CHECK_VAR5, true); if (INSTANT_LEVEL_76 && (player.getLevel() < LEVEL_76)) { addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(LEVEL_76) + 100) - player.getExp(), 595042); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java index 90b8ed363f..deb5849aba 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java @@ -109,12 +109,12 @@ public class Q11027_PathOfDestinyOvercome extends Quest private static final String KILL_COUNT_VAR2 = "KillCount2"; private static final String KILL_COUNT_VAR3 = "KillCount3"; private static final String KILL_COUNT_VAR4 = "KillCount3"; - private static final String EXPSPADENA_REWARD_CHECK_VAR1 = "EXPSPADENA_REWARD_CHECK_VAR1"; - private static final String EXPSPADENA_REWARD_CHECK_VAR2 = "EXPSPADENA_REWARD_CHECK_VAR2"; - private static final String EXPSPADENA_REWARD_CHECK_VAR3 = "EXPSPADENA_REWARD_CHECK_VAR3"; - private static final String EXPSPADENA_REWARD_CHECK_VAR4 = "EXPSPADENA_REWARD_CHECK_VAR4"; - private static final String EXPSPADENA_REWARD_CHECK_VAR5 = "EXPSPADENA_REWARD_CHECK_VAR5"; - private static final String EXPSPADENA_REWARD_CHECK_VAR6 = "EXPSPADENA_REWARD_CHECK_VAR6"; + private static final String REWARD_CHECK_VAR1 = "Q11027_REWARD_1"; + private static final String REWARD_CHECK_VAR2 = "Q11027_REWARD_2"; + private static final String REWARD_CHECK_VAR3 = "Q11027_REWARD_3"; + private static final String REWARD_CHECK_VAR4 = "Q11027_REWARD_4"; + private static final String REWARD_CHECK_VAR5 = "Q11027_REWARD_5"; + private static final String REWARD_CHECK_VAR6 = "Q11027_REWARD_6"; private static final String AWAKE_POWER_REWARDED_VAR = "AWAKE_POWER_REWARDED"; private static final int LEVEL_76 = 76; private static final int LEVEL_85 = 85; @@ -187,9 +187,9 @@ public class Q11027_PathOfDestinyOvercome extends Quest { qs.setCond(3, true); htmltext = event; - if (!player.getVariables().getBoolean(EXPSPADENA_REWARD_CHECK_VAR1, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR1, false)) { - player.getVariables().set(EXPSPADENA_REWARD_CHECK_VAR1, true); + player.getVariables().set(REWARD_CHECK_VAR1, true); addExpAndSp(player, 392513005, 353261); } } @@ -211,9 +211,9 @@ public class Q11027_PathOfDestinyOvercome extends Quest { qs.setCond(6, true); htmltext = event; - if (!player.getVariables().getBoolean(EXPSPADENA_REWARD_CHECK_VAR2, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR2, false)) { - player.getVariables().set(EXPSPADENA_REWARD_CHECK_VAR2, true); + player.getVariables().set(REWARD_CHECK_VAR2, true); addExpAndSp(player, 581704958, 523534); } } @@ -236,9 +236,9 @@ public class Q11027_PathOfDestinyOvercome extends Quest takeItems(player, ORC_EMPOWERING_POTION, 15); qs.setCond(9, true); htmltext = event; - if (!player.getVariables().getBoolean(EXPSPADENA_REWARD_CHECK_VAR3, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR3, false)) { - player.getVariables().set(EXPSPADENA_REWARD_CHECK_VAR3, true); + player.getVariables().set(REWARD_CHECK_VAR3, true); addExpAndSp(player, 750392145, 675352); } } @@ -260,9 +260,9 @@ public class Q11027_PathOfDestinyOvercome extends Quest { qs.setCond(12, true); htmltext = event; - if (!player.getVariables().getBoolean(EXPSPADENA_REWARD_CHECK_VAR4, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR4, false)) { - player.getVariables().set(EXPSPADENA_REWARD_CHECK_VAR4, true); + player.getVariables().set(REWARD_CHECK_VAR4, true); addExpAndSp(player, 452984693, 407686); } } @@ -285,9 +285,9 @@ public class Q11027_PathOfDestinyOvercome extends Quest takeItems(player, KETRA_ORDER, 15); qs.setCond(15, true); htmltext = event; - if (!player.getVariables().getBoolean(EXPSPADENA_REWARD_CHECK_VAR5, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR5, false)) { - player.getVariables().set(EXPSPADENA_REWARD_CHECK_VAR5, true); + player.getVariables().set(REWARD_CHECK_VAR5, true); addExpAndSp(player, 514892511, 463403); } } @@ -309,9 +309,9 @@ public class Q11027_PathOfDestinyOvercome extends Quest { qs.setCond(18, true); htmltext = event; - if (!player.getVariables().getBoolean(EXPSPADENA_REWARD_CHECK_VAR6, false)) + if (!player.getVariables().getBoolean(REWARD_CHECK_VAR6, false)) { - player.getVariables().set(EXPSPADENA_REWARD_CHECK_VAR6, true); + player.getVariables().set(REWARD_CHECK_VAR6, true); if (INSTANT_LEVEL_85 && (player.getLevel() < LEVEL_85)) { addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(LEVEL_85) + 100) - player.getExp(), 527586);