diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java index 503409b586..c77ecad163 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java @@ -151,7 +151,7 @@ public class Q10290_ATripBegins extends Quest if (qs.isCond(3)) { showOnScreenMsg(player, NpcStringId.YOU_VE_GOT_ADVENTURER_S_BRACELET_AND_ADVENTURER_S_TALISMAN_NCOMPLETE_THE_TUTORIAL_AND_TRY_TO_USE_THE_TALISMAN, ExShowScreenMessage.TOP_CENTER, 10000); - addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(25) + 100) - player.getExp(), 42000); + addExpAndSp(player, player.getLevel() < MAX_LEVEL ? (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL) + 100) - player.getExp() : 0, 42000); // TODO: find a better way to do this: Tempfix for not giving items when already have them in inventory (bugging abort and re-accepting). if (player.getInventory().getAllItemsByItemId(BSOE_EVENT.getId()).size() <= 20) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java index 29f687d24e..18564c0452 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java @@ -96,7 +96,7 @@ public class Q10291_MoreExperience extends Quest case "30332-06.html": { showOnScreenMsg(player, NpcStringId.YOU_VE_GOT_ADVENTURER_S_BROOCH_AND_ADVENTURER_S_ROUGH_JEWEL_NCOMPLETE_THE_TUTORIAL_AND_TRY_TO_ENCHASE_THE_JEWEL, ExShowScreenMessage.TOP_CENTER, 10000); - addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(30) + 100) - player.getExp(), 117500); + addExpAndSp(player, player.getLevel() < MAX_LEVEL ? (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL) + 100) - player.getExp() : 0, 117500); giveItems(player, ADVENTURERS_BROOCH); giveItems(player, ADVENTURERS_BROOCH_GEMS); giveItems(player, SCROLL_ENCHANT_ADEN_WEAPON); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java index 6c058fcb1d..e2c62e7cf6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java @@ -120,7 +120,7 @@ public class Q10292_SecretGarden extends Quest if (qs.isStarted()) { player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_VE_GOT_ADVENTURER_S_AGATHION_BRACELET_AND_ADVENTURER_S_AGATHION_GRIFFIN_NCOMPLETE_THE_TUTORIAL_AND_TRY_TO_USE_THE_AGATHION, 2, 5000)); - addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(35) + 100) - player.getExp(), 135000); + addExpAndSp(player, player.getLevel() < MAX_LEVEL ? (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL) + 100) - player.getExp() : 0, 135000); giveItems(player, TRAVELER_AGATHION_SUMMON_BRACELET); giveItems(player, TRAVELER_AGATHION_GRIFFIN); giveItems(player, SCROLL_ENCHANT_ADEN_WEAPON); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java index 2214262892..64c6a91059 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java @@ -130,7 +130,7 @@ public class Q10293_DeathMysteries extends Quest { if (qs.isStarted()) { - addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(40) + 100) - player.getExp(), 160000); + addExpAndSp(player, player.getLevel() < MAX_LEVEL ? (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL) + 100) - player.getExp() : 0, 160000); giveItems(player, SAYHA_GUST); giveItems(player, MAGIC_LAMP_CHARGING_POTION); giveItems(player, SCROLL_OF_ENCHANT_ADEN_WEAPON); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java index 7a8a4e676b..29a4bf7553 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java @@ -151,7 +151,7 @@ public class Q10290_ATripBegins extends Quest if (qs.isCond(3)) { showOnScreenMsg(player, NpcStringId.YOU_VE_GOT_ADVENTURER_S_BRACELET_AND_ADVENTURER_S_TALISMAN_COMPLETE_THE_TUTORIAL_AND_TRY_TO_USE_THE_TALISMAN, ExShowScreenMessage.TOP_CENTER, 10000); - addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(25) + 100) - player.getExp(), 42000); + addExpAndSp(player, player.getLevel() < MAX_LEVEL ? (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL) + 100) - player.getExp() : 0, 42000); // TODO: find a better way to do this: Tempfix for not giving items when already have them in inventory (bugging abort and re-accepting). if (player.getInventory().getAllItemsByItemId(BSOE_EVENT.getId()).size() <= 20) { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java index 31dd312eee..f621f0f0d1 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java @@ -96,7 +96,7 @@ public class Q10291_MoreExperience extends Quest case "30332-06.html": { showOnScreenMsg(player, NpcStringId.YOU_VE_GOT_ADVENTURER_S_BROOCH_AND_ADVENTURER_S_ROUGH_JEWEL_COMPLETE_THE_TUTORIAL_AND_TRY_TO_ENCHASE_THE_JEWEL, ExShowScreenMessage.TOP_CENTER, 10000); - addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(30) + 100) - player.getExp(), 117500); + addExpAndSp(player, player.getLevel() < MAX_LEVEL ? (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL) + 100) - player.getExp() : 0, 117500); giveItems(player, ADVENTURERS_BROOCH); giveItems(player, ADVENTURERS_BROOCH_GEMS); giveItems(player, SCROLL_ENCHANT_ADEN_WEAPON); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java index 26d62040c1..39959904bd 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java @@ -120,7 +120,7 @@ public class Q10292_SecretGarden extends Quest if (qs.isStarted()) { player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_VE_GOT_ADVENTURER_S_AGATHION_BRACELET_AND_ADVENTURER_S_AGATHION_GRIFFIN_COMPLETE_THE_TUTORIAL_AND_TRY_TO_USE_THE_AGATHION, 2, 5000)); - addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(35) + 100) - player.getExp(), 135000); + addExpAndSp(player, player.getLevel() < MAX_LEVEL ? (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL) + 100) - player.getExp() : 0, 135000); giveItems(player, TRAVELER_AGATHION_SUMMON_BRACELET); giveItems(player, TRAVELER_AGATHION_GRIFFIN); giveItems(player, SCROLL_ENCHANT_ADEN_WEAPON); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java index db1c8db91f..f26d672449 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java @@ -130,7 +130,7 @@ public class Q10293_DeathMysteries extends Quest { if (qs.isStarted()) { - addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(40) + 100) - player.getExp(), 160000); + addExpAndSp(player, player.getLevel() < MAX_LEVEL ? (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL) + 100) - player.getExp() : 0, 160000); giveItems(player, SAYHA_GUST); giveItems(player, MAGIC_LAMP_CHARGING_POTION); giveItems(player, SCROLL_OF_ENCHANT_ADEN_WEAPON); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java index 7a8a4e676b..29a4bf7553 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java @@ -151,7 +151,7 @@ public class Q10290_ATripBegins extends Quest if (qs.isCond(3)) { showOnScreenMsg(player, NpcStringId.YOU_VE_GOT_ADVENTURER_S_BRACELET_AND_ADVENTURER_S_TALISMAN_COMPLETE_THE_TUTORIAL_AND_TRY_TO_USE_THE_TALISMAN, ExShowScreenMessage.TOP_CENTER, 10000); - addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(25) + 100) - player.getExp(), 42000); + addExpAndSp(player, player.getLevel() < MAX_LEVEL ? (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL) + 100) - player.getExp() : 0, 42000); // TODO: find a better way to do this: Tempfix for not giving items when already have them in inventory (bugging abort and re-accepting). if (player.getInventory().getAllItemsByItemId(BSOE_EVENT.getId()).size() <= 20) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java index 31dd312eee..f621f0f0d1 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java @@ -96,7 +96,7 @@ public class Q10291_MoreExperience extends Quest case "30332-06.html": { showOnScreenMsg(player, NpcStringId.YOU_VE_GOT_ADVENTURER_S_BROOCH_AND_ADVENTURER_S_ROUGH_JEWEL_COMPLETE_THE_TUTORIAL_AND_TRY_TO_ENCHASE_THE_JEWEL, ExShowScreenMessage.TOP_CENTER, 10000); - addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(30) + 100) - player.getExp(), 117500); + addExpAndSp(player, player.getLevel() < MAX_LEVEL ? (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL) + 100) - player.getExp() : 0, 117500); giveItems(player, ADVENTURERS_BROOCH); giveItems(player, ADVENTURERS_BROOCH_GEMS); giveItems(player, SCROLL_ENCHANT_ADEN_WEAPON); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java index 26d62040c1..39959904bd 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10292_SecretGarden/Q10292_SecretGarden.java @@ -120,7 +120,7 @@ public class Q10292_SecretGarden extends Quest if (qs.isStarted()) { player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_VE_GOT_ADVENTURER_S_AGATHION_BRACELET_AND_ADVENTURER_S_AGATHION_GRIFFIN_COMPLETE_THE_TUTORIAL_AND_TRY_TO_USE_THE_AGATHION, 2, 5000)); - addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(35) + 100) - player.getExp(), 135000); + addExpAndSp(player, player.getLevel() < MAX_LEVEL ? (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL) + 100) - player.getExp() : 0, 135000); giveItems(player, TRAVELER_AGATHION_SUMMON_BRACELET); giveItems(player, TRAVELER_AGATHION_GRIFFIN); giveItems(player, SCROLL_ENCHANT_ADEN_WEAPON); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java index db1c8db91f..f26d672449 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10293_DeathMysteries/Q10293_DeathMysteries.java @@ -130,7 +130,7 @@ public class Q10293_DeathMysteries extends Quest { if (qs.isStarted()) { - addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(40) + 100) - player.getExp(), 160000); + addExpAndSp(player, player.getLevel() < MAX_LEVEL ? (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL) + 100) - player.getExp() : 0, 160000); giveItems(player, SAYHA_GUST); giveItems(player, MAGIC_LAMP_CHARGING_POTION); giveItems(player, SCROLL_OF_ENCHANT_ADEN_WEAPON);