From d289113ea2431d8fef76e4bcf08fcc4b882ba33c Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 18 Nov 2017 23:05:12 +0000 Subject: [PATCH] Steel Door coins removed from story quest rewards. --- .../Q10390_KekropusLetter/Q10390_KekropusLetter.java | 2 +- .../Q10391_ASuspiciousHelper.java | 2 +- .../Q10392_FailureAndItsConsequences.java | 2 +- .../Q10393_KekropusLetterAClueCompleted.java | 2 +- .../Q10394_MutualBenefit/Q10394_MutualBenefit.java | 2 +- .../quests/Q10395_NotATraitor/Q10395_NotATraitor.java | 2 +- .../Q10397_KekropusLetterASuspiciousBadge.java | 2 +- .../Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java | 2 +- .../Q10399_TheAlphabetOfTheGiants.java | 2 +- .../Q10401_KekropusLetterDecodingTheBadge.java | 2 +- .../Q10402_NowhereToTurn/Q10402_NowhereToTurn.java | 2 +- .../Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java | 2 +- .../Q10404_KekropusLetterAHiddenMeaning.java | 2 +- .../quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java | 2 +- .../Q10406_BeforeDarknessBearsFruit.java | 2 +- .../Q10408_KekropusLetterTheSwampOfScreams.java | 2 +- .../Q10409_ASuspiciousVagabondInTheSwamp.java | 2 +- .../Q10410_EmbryoInTheSwampOfScreams.java | 2 +- .../Q10411_KekropusLetterTheForestOfTheDead.java | 2 +- .../Q10412_ASuspiciousVagabondInTheForest.java | 2 +- .../Q10413_EmbryoInTheForestOfTheDead.java | 2 +- .../Q10414_KekropusLetterWithCourage.java | 2 +- .../Q10415_KekropusLetterWithWisdom.java | 2 +- .../Q10416_InSearchOfTheEyeOfArgos.java | 2 +- .../Q10417_DaimonTheWhiteEyed.java | 2 +- .../Q10419_KekropusLetterKampfsWhereabouts.java | 2 +- .../Q10420_TheVarkaSilenosSupporters.java | 2 +- .../Q10421_AssassinationOfTheVarkaSilenosCommander.java | 2 +- .../Q10422_AssassinationOfTheVarkaSilenosChief.java | 2 +- .../Q10424_KekropusLetterBelosWhereabouts.java | 2 +- .../Q10425_TheKetraOrcSupporters.java | 2 +- .../Q10426_AssassinationOfTheKetraOrcCommander.java | 2 +- .../Q10427_AssassinationOfTheKetraOrcChief.java | 2 +- .../Q10460_ReturnOfTheAlligatorHunter.java | 2 +- .../Q10521_QueenNavarisLetterVarkaSilenosBarracks.java | 2 +- .../Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java | 2 +- .../Q10708_StrengthenTheBarrier.java | 2 +- .../Q10709_TheStolenSeed/Q10709_TheStolenSeed.java | 2 +- .../Q10710_LifeEnergyRepository.java | 2 +- .../Q10753_WindsOfFateChoices.java | 4 ++-- .../Q10755_LettersFromTheQueenWindyHill.java | 2 +- .../Q10756_AnInterdimensionalDraft.java | 2 +- .../Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java | 2 +- .../Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java | 2 +- .../Q10760_LettersFromTheQueenOrcBarracks.java | 2 +- .../quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java | 2 +- .../Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java | 2 +- .../Q10763_TerrifyingChertuba.java | 2 +- .../quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java | 2 +- .../Q10769_LettersFromTheQueenCrumaTowerPart1.java | 2 +- .../Q10770_InSearchOfTheGrail.java | 2 +- .../Q10771_VolatilePower/Q10771_VolatilePower.java | 2 +- .../Q10772_ReportsFromCrumaTowerPart1.java | 2 +- .../Q10774_LettersFromTheQueenCrumaTowerPart2.java | 2 +- .../Q10775_InSearchOfAnAncientGiant.java | 2 +- .../Q10776_TheWrathOfTheGiants.java | 2 +- .../Q10777_ReportsFromCrumaTowerPart2.java | 2 +- .../Q10779_LettersFromTheQueenSeaOfSpores.java | 2 +- .../Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java | 2 +- .../Q10781_IngredientsToEnforcements.java | 2 +- .../Q10782_LettersFromTheQueenForsakenPlains.java | 2 +- .../Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java | 2 +- .../Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java | 2 +- .../Q10785_LettersFromTheQueenFieldsOfMassacre.java | 2 +- .../Q10786_ResidentProblemSolver.java | 2 +- .../quests/Q10787_ASpyMission/Q10787_ASpyMission.java | 2 +- .../Q10789_LettersFromTheQueenSwampOfScreams.java | 2 +- .../Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java | 2 +- .../Q10791_TheManOfMystery/Q10791_TheManOfMystery.java | 2 +- .../Q10792_LettersFromTheQueenForestOfTheDead.java | 2 +- .../quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java | 2 +- .../Q10794_InvestigateTheForest.java | 2 +- .../Q10795_LettersFromTheQueenWallOfAgros.java | 2 +- .../Q10796_TheEyeThatDefiedTheGods.java | 2 +- .../quests/Q10797_CrossingFate/Q10797_CrossingFate.java | 2 +- .../Q10798_LettersFromTheQueenDragonValley.java | 2 +- .../Q10799_StrangeThingsAfootInTheValley.java | 2 +- .../Q10800_ReconnaissanceAtDragonValley.java | 2 +- .../java/com/l2jmobius/gameserver/model/quest/Quest.java | 9 ++++----- 79 files changed, 83 insertions(+), 84 deletions(-) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java index d51eb93794..565f75266b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java @@ -150,7 +150,7 @@ public final class Q10390_KekropusLetter extends Quest if (st.isCond(4)) { giveItems(player, EWC, 3); - giveStoryQuestReward(player, 21); + giveStoryQuestReward(npc, player); addExpAndSp(player, 370440, 88); st.exitQuest(false, true); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_KEKROPUS_AT_LV_46, ExShowScreenMessage.TOP_CENTER, 6000); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java index 48f8796e59..b785ad5c30 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10391_ASuspiciousHelper/Q10391_ASuspiciousHelper.java @@ -95,7 +95,7 @@ public final class Q10391_ASuspiciousHelper extends Quest if (st.isCond(2)) { st.exitQuest(false, true); - giveStoryQuestReward(player, 1); + giveStoryQuestReward(npc, player); giveItems(player, EAC, 1); addExpAndSp(player, 388290, 93); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java index ccebb640a5..5d3d7ea12d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10392_FailureAndItsConsequences/Q10392_FailureAndItsConsequences.java @@ -100,7 +100,7 @@ public final class Q10392_FailureAndItsConsequences extends Quest { st.exitQuest(false, true); giveItems(player, EAC, 5); - giveStoryQuestReward(player, 17); + giveStoryQuestReward(npc, player); addExpAndSp(player, 2329740, 559); htmltext = event; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java index 51d3d3bbf6..df88090b6a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10393_KekropusLetterAClueCompleted/Q10393_KekropusLetterAClueCompleted.java @@ -92,7 +92,7 @@ public final class Q10393_KekropusLetterAClueCompleted extends LetterQuest { st.exitQuest(false, true); giveItems(player, EAC, 4); - giveStoryQuestReward(player, 15); + giveStoryQuestReward(npc, player); addExpAndSp(player, 483840, 116); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_KEKROPUS_AT_LV_52, ExShowScreenMessage.TOP_CENTER, 6000); htmltext = event; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java index cee0832d94..7f9be44ca4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java @@ -85,7 +85,7 @@ public final class Q10394_MutualBenefit extends Quest { st.exitQuest(false, true); giveItems(player, EAC, 6); - giveStoryQuestReward(player, 26); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 3_151_312, 756); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java index 890e1008e8..f04db07b91 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java @@ -94,7 +94,7 @@ public final class Q10395_NotATraitor extends Quest { st.exitQuest(false, true); giveItems(player, EAC, 5); - giveStoryQuestReward(player, 32); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 3_781_574, 907); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java index 3260c6aef8..6d55763f7c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10397_KekropusLetterASuspiciousBadge/Q10397_KekropusLetterASuspiciousBadge.java @@ -92,7 +92,7 @@ public final class Q10397_KekropusLetterASuspiciousBadge extends LetterQuest { st.exitQuest(false, true); giveItems(player, EWB, 2); - giveStoryQuestReward(player, 20); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 635_250, 152); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java index a6218a9a73..2341ae996c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10398_ASuspiciousBadge/Q10398_ASuspiciousBadge.java @@ -88,7 +88,7 @@ public final class Q10398_ASuspiciousBadge extends Quest { st.exitQuest(false, true); giveItems(player, EAB, 5); - giveStoryQuestReward(player, 36); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 6135787, 914); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java index fb1f324a24..7f9598a6e9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10399_TheAlphabetOfTheGiants/Q10399_TheAlphabetOfTheGiants.java @@ -86,7 +86,7 @@ public final class Q10399_TheAlphabetOfTheGiants extends Quest { st.exitQuest(false, true); giveItems(player, EAB, 5); - giveStoryQuestReward(player, 37); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 8779765, 914); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java index 26c9b61513..00c3e90277 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10401_KekropusLetterDecodingTheBadge/Q10401_KekropusLetterDecodingTheBadge.java @@ -92,7 +92,7 @@ public final class Q10401_KekropusLetterDecodingTheBadge extends LetterQuest { st.exitQuest(false, true); giveItems(player, EAB, 5); - giveStoryQuestReward(player, 30); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 731_010, 175); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java index 21670e9e07..d4e26690e8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java @@ -94,7 +94,7 @@ public final class Q10402_NowhereToTurn extends Quest { st.exitQuest(false, true); giveItems(player, EAB, 5); - giveStoryQuestReward(player, 34); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 5_482_574, 1_315); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java index bccae607cf..e25b938cb9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10403_TheGuardianGiant/Q10403_TheGuardianGiant.java @@ -93,7 +93,7 @@ public final class Q10403_TheGuardianGiant extends Quest { st.exitQuest(false, true); giveItems(player, EAB, 5); - giveStoryQuestReward(player, 40); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 6_579_090, 1_578); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java index e1acc91b98..3f4b9087e5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10404_KekropusLetterAHiddenMeaning/Q10404_KekropusLetterAHiddenMeaning.java @@ -92,7 +92,7 @@ public final class Q10404_KekropusLetterAHiddenMeaning extends LetterQuest { st.exitQuest(false, true); giveItems(player, EWA, 1); - giveStoryQuestReward(player, 71); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 807_240, 193); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java index 3e08d2c92d..44401d8c21 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10405_KartiasSeed/Q10405_KartiasSeed.java @@ -96,7 +96,7 @@ public final class Q10405_KartiasSeed extends Quest { st.exitQuest(false, true); giveItems(player, EAA, 5); - giveStoryQuestReward(player, 57); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 6_251_174, 1_500); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java index 9f3c8eec89..2db37da4d3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java @@ -86,7 +86,7 @@ public final class Q10406_BeforeDarknessBearsFruit extends Quest { st.exitQuest(false, true); giveItems(player, EAA, 3); - giveStoryQuestReward(player, 10); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 3_125_586, 750); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java index 630b977fe7..577e9bce66 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10408_KekropusLetterTheSwampOfScreams/Q10408_KekropusLetterTheSwampOfScreams.java @@ -93,7 +93,7 @@ public final class Q10408_KekropusLetterTheSwampOfScreams extends LetterQuest { st.exitQuest(false, true); giveItems(player, EWA, 2); - giveStoryQuestReward(player, 91); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 942_690, 226); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java index e6b1d5c993..626cdfdf8c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java @@ -79,7 +79,7 @@ public final class Q10409_ASuspiciousVagabondInTheSwamp extends Quest { st.exitQuest(false, true); giveItems(player, EAA, 3); - giveStoryQuestReward(player, 3); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 942_690, 226); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java index 7a5f138937..5c14116f99 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java @@ -104,7 +104,7 @@ public final class Q10410_EmbryoInTheSwampOfScreams extends Quest { st.exitQuest(false, true); giveItems(player, EAA, 5); - giveStoryQuestReward(player, 63); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 161_046_201, 4072); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java index 2d74b7de32..d4fcefa334 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10411_KekropusLetterTheForestOfTheDead/Q10411_KekropusLetterTheForestOfTheDead.java @@ -93,7 +93,7 @@ public final class Q10411_KekropusLetterTheForestOfTheDead extends LetterQuest { st.exitQuest(false, true); giveItems(player, EWA, 2); - giveStoryQuestReward(player, 91); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 942_690, 226); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java index b485792a30..d073d590ae 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java @@ -79,7 +79,7 @@ public final class Q10412_ASuspiciousVagabondInTheForest extends Quest { st.exitQuest(false, true); giveItems(player, EAA, 3); - giveStoryQuestReward(player, 3); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 942_690, 226); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java index 0bbaac0a18..7d4564a2fd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java @@ -133,7 +133,7 @@ public final class Q10413_EmbryoInTheForestOfTheDead extends Quest { st.exitQuest(false, true); giveItems(player, EAA, 5); - giveStoryQuestReward(player, 63); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 16_968_420, 4072); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java index b5f3b4c80d..bcda55beef 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10414_KekropusLetterWithCourage/Q10414_KekropusLetterWithCourage.java @@ -93,7 +93,7 @@ public final class Q10414_KekropusLetterWithCourage extends LetterQuest { st.exitQuest(false, true); giveItems(player, EAA, 5); - giveStoryQuestReward(player, 123); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 1_088_640, 261); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java index 0b6d28448d..a0cf08a369 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10415_KekropusLetterWithWisdom/Q10415_KekropusLetterWithWisdom.java @@ -94,7 +94,7 @@ public class Q10415_KekropusLetterWithWisdom extends LetterQuest { qs.exitQuest(false, true); giveItems(player, EAA, 5); - giveStoryQuestReward(player, 123); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 1_088_640, 261); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java index edafc33194..2c9939160d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java @@ -77,7 +77,7 @@ public final class Q10416_InSearchOfTheEyeOfArgos extends Quest { st.exitQuest(false, true); giveItems(player, EAA, 2); - giveStoryQuestReward(player, 2); + giveStoryQuestReward(npc, player); if (player.getLevel() > MIN_LEVEL) { addExpAndSp(player, 1_088_640, 261); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java index 1e59ea9823..5ba45cc9ee 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java @@ -91,7 +91,7 @@ public final class Q10417_DaimonTheWhiteEyed extends Quest { st.exitQuest(false, true); giveItems(player, EAA, 5); - giveStoryQuestReward(player, 26); + giveStoryQuestReward(npc, player); if (player.getLevel() > MIN_LEVEL) { addExpAndSp(player, 2_721_600, 653); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java index b036f86b5d..18efa32327 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10419_KekropusLetterKampfsWhereabouts/Q10419_KekropusLetterKampfsWhereabouts.java @@ -93,7 +93,7 @@ public final class Q10419_KekropusLetterKampfsWhereabouts extends LetterQuest { st.exitQuest(false, true); giveItems(player, EWS, 1); - giveStoryQuestReward(player, 182); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 1_277_640, 306); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java index 58d2195cee..35813ddbd2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java @@ -106,7 +106,7 @@ public final class Q10420_TheVarkaSilenosSupporters extends Quest { st.exitQuest(false, true); giveItems(player, EAS, 2); - giveStoryQuestReward(player, 89); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 22_997_520, 5519); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java index 29bd933d85..9b90364255 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10421_AssassinationOfTheVarkaSilenosCommander/Q10421_AssassinationOfTheVarkaSilenosCommander.java @@ -89,7 +89,7 @@ public final class Q10421_AssassinationOfTheVarkaSilenosCommander extends Quest st.exitQuest(false, true); giveItems(player, stoneId, 15); giveItems(player, EAS, 2); - giveStoryQuestReward(player, 30); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 7_665_840, 1839); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java index d065756bd4..c639cfdcb9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java @@ -93,7 +93,7 @@ public final class Q10422_AssassinationOfTheVarkaSilenosChief extends Quest st.exitQuest(false, true); giveItems(player, stoneId, 15); giveItems(player, EAS, 2); - giveStoryQuestReward(player, 30); + giveStoryQuestReward(npc, player); if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) { addExpAndSp(player, 7_665_840, 1839); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java index d82b98f469..b523d3dd29 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10424_KekropusLetterBelosWhereabouts/Q10424_KekropusLetterBelosWhereabouts.java @@ -92,7 +92,7 @@ public final class Q10424_KekropusLetterBelosWhereabouts extends LetterQuest { qs.exitQuest(false, true); giveItems(player, EWS, 1); - giveStoryQuestReward(player, 182); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 1_277_640, 306); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java index 1b023f5648..216f3569bd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java @@ -109,7 +109,7 @@ public final class Q10425_TheKetraOrcSupporters extends Quest { qs.exitQuest(false, true); giveItems(player, EAS, 2); - giveStoryQuestReward(player, 89); + giveStoryQuestReward(npc, player); if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) { addExpAndSp(player, 22_997_520, 5519); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java index e2d054e6ab..fc8427beda 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10426_AssassinationOfTheKetraOrcCommander/Q10426_AssassinationOfTheKetraOrcCommander.java @@ -91,7 +91,7 @@ public final class Q10426_AssassinationOfTheKetraOrcCommander extends Quest qs.exitQuest(false, true); giveItems(player, stoneId, 15); giveItems(player, EAS, 2); - giveStoryQuestReward(player, 30); + giveStoryQuestReward(npc, player); if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) { addExpAndSp(player, 7_665_840, 1839); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java index ba0ab82b44..70bfa2048e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java @@ -93,7 +93,7 @@ public final class Q10427_AssassinationOfTheKetraOrcChief extends Quest qs.exitQuest(false, true); giveItems(player, stoneId, 15); giveItems(player, EAS, 2); - giveStoryQuestReward(player, 30); + giveStoryQuestReward(npc, player); if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) { addExpAndSp(player, 7_665_840, 1839); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java index 65bb97c8d9..973a7b7b65 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10460_ReturnOfTheAlligatorHunter/Q10460_ReturnOfTheAlligatorHunter.java @@ -90,7 +90,7 @@ public final class Q10460_ReturnOfTheAlligatorHunter extends Quest { st.exitQuest(false, true); giveItems(player, EAC, 7); - giveStoryQuestReward(player, 26); + giveStoryQuestReward(npc, player); addExpAndSp(player, 2795688, 670); htmltext = event; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java index c7aa676cf5..32796a0672 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10521_QueenNavarisLetterVarkaSilenosBarracks/Q10521_QueenNavarisLetterVarkaSilenosBarracks.java @@ -92,7 +92,7 @@ public class Q10521_QueenNavarisLetterVarkaSilenosBarracks extends LetterQuest if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 1277640, 306); - // TODO: giveStoryQuestReward(npc, player); + giveStoryQuestReward(npc, player); showOnScreenMsg(player, NpcStringId.YOU_HAVE_FINISHED_ALL_OF_QUEEN_NAVARI_S_LETTERS_GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_LETTERS_FROM_A_MINSTREL_AT_LV_85, ExShowScreenMessage.TOP_CENTER, 8000); qs.exitQuest(QuestType.ONE_TIME, true); htmltext = event; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java index 3d92416050..459d185ce6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java @@ -92,7 +92,7 @@ public final class Q10707_FlamesOfSorrow extends Quest { st.exitQuest(false, true); giveItems(player, EAC, 2); - giveStoryQuestReward(player, 10); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 483_840, 116); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java index 7b18986f53..ed50632e35 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java @@ -101,7 +101,7 @@ public final class Q10708_StrengthenTheBarrier extends Quest { st.exitQuest(false, true); giveItems(player, EWB, 1); - giveStoryQuestReward(player, 17); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 20881876, 152); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java index 5f6306e46f..96ba82d4ea 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10709_TheStolenSeed/Q10709_TheStolenSeed.java @@ -118,7 +118,7 @@ public final class Q10709_TheStolenSeed extends Quest st.exitQuest(false, true); takeItems(player, FRAGMENT, -1); giveItems(player, EAB, 5); - giveStoryQuestReward(player, 30); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 731_010, 175); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java index b29fb54937..de1f9420b1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10710_LifeEnergyRepository/Q10710_LifeEnergyRepository.java @@ -114,7 +114,7 @@ public final class Q10710_LifeEnergyRepository extends Quest { st.exitQuest(false, true); giveItems(player, EAA, 2); - giveStoryQuestReward(player, 19); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 3_125_586, 750); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index 65f0d20c26..12aadde2e0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -364,7 +364,7 @@ public final class Q10753_WindsOfFateChoices extends Quest player.sendSkillList(); player.sendPacket(new SocialAction(player.getObjectId(), 24)); showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_YOU_WILL_NOW_GRADUATE_FROM_THE_CLAN_ACADEMY_AND_LEAVE_YOUR_CURRENT_CLAN_YOU_CAN_NOW_JOIN_A_CLAN_AS_A_REGULAR_MEMBER_WITHOUT_BEING_SUBJECT_TO_ANY_PENALTIES, ExShowScreenMessage.TOP_CENTER, 10000); - giveStoryQuestReward(player, 400); + giveStoryQuestReward(npc, player); giveItems(player, SAYHAS_BOX_W, 1); giveItems(player, CHAOS_POMANDER, 2); giveItems(player, MENTEE_CARTIFICATE, 1); @@ -387,7 +387,7 @@ public final class Q10753_WindsOfFateChoices extends Quest player.sendSkillList(); player.sendPacket(new SocialAction(player.getObjectId(), 24)); showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_YOU_WILL_NOW_GRADUATE_FROM_THE_CLAN_ACADEMY_AND_LEAVE_YOUR_CURRENT_CLAN_YOU_CAN_NOW_JOIN_A_CLAN_AS_A_REGULAR_MEMBER_WITHOUT_BEING_SUBJECT_TO_ANY_PENALTIES, ExShowScreenMessage.TOP_CENTER, 10000); - giveStoryQuestReward(player, 400); + giveStoryQuestReward(npc, player); giveItems(player, SAYHAS_BOX_M, 1); giveItems(player, CHAOS_POMANDER, 2); giveItems(player, MENTEE_CARTIFICATE, 1); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java index 4369dd3f3b..51230e1cb7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10755_LettersFromTheQueenWindyHill/Q10755_LettersFromTheQueenWindyHill.java @@ -86,7 +86,7 @@ public final class Q10755_LettersFromTheQueenWindyHill extends LetterQuest { if (qs.isCond(2)) { - giveStoryQuestReward(player, 5); + giveStoryQuestReward(npc, player); addExpAndSp(player, 120960, 29); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_QUEEN_NAVARI_AT_LV_30, ExShowScreenMessage.TOP_CENTER, 8000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java index a9e5b60ef9..7a95e12ae4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java @@ -89,7 +89,7 @@ public final class Q10756_AnInterdimensionalDraft extends Quest { if (qs.isCond(2)) { - giveStoryQuestReward(player, 8); + giveStoryQuestReward(npc, player); addExpAndSp(player, 174222, 41); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java index 676269a77f..0ef27c749a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java @@ -87,7 +87,7 @@ public final class Q10757_QuietingTheStorm extends Quest { if (qs.isCond(2)) { - giveStoryQuestReward(player, 7); + giveStoryQuestReward(npc, player); addExpAndSp(player, 632051, 151); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java index c3de2d720f..00f02f4fa9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10758_TheOathOfTheWind/Q10758_TheOathOfTheWind.java @@ -89,7 +89,7 @@ public final class Q10758_TheOathOfTheWind extends Quest { if (qs.isCond(2)) { - giveStoryQuestReward(player, 3); + giveStoryQuestReward(npc, player); addExpAndSp(player, 561645, 134); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java index fb08a9c72c..e047a2c261 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10760_LettersFromTheQueenOrcBarracks/Q10760_LettersFromTheQueenOrcBarracks.java @@ -86,7 +86,7 @@ public class Q10760_LettersFromTheQueenOrcBarracks extends LetterQuest { if (qs.isCond(2)) { - giveStoryQuestReward(player, 5); + giveStoryQuestReward(npc, player); addExpAndSp(player, 242760, 58); showOnScreenMsg(player, NpcStringId.TRY_TALKING_TO_VORBOS_BY_THE_WELL_NYOU_CAN_RECEIVE_QUEEN_NAVARI_S_NEXT_LETTER_AT_LV_40, ExShowScreenMessage.TOP_CENTER, 8000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java index c650191204..99edda0279 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java @@ -91,7 +91,7 @@ public class Q10761_AnOrcInLove extends Quest { if (qs.isCond(2)) { - giveStoryQuestReward(player, 20); + giveStoryQuestReward(npc, player); addExpAndSp(player, 354546, 85); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java index bb735c2799..1e44a79f34 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10762_MarionetteSpirit/Q10762_MarionetteSpirit.java @@ -79,7 +79,7 @@ public final class Q10762_MarionetteSpirit extends Quest { if (qs.isCond(2)) { - giveStoryQuestReward(player, 5); + giveStoryQuestReward(npc, player); addExpAndSp(player, 896996, 215); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java index d41d71d6e1..a8d0138a16 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java @@ -79,7 +79,7 @@ public final class Q10763_TerrifyingChertuba extends Quest { if (qs.isCond(2)) { - giveStoryQuestReward(player, 10); + giveStoryQuestReward(npc, player); addExpAndSp(player, 896996, 215); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java index b9c000b96a..d100bc9de4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java @@ -89,7 +89,7 @@ public final class Q10764_FreeSpirit extends Quest if (qs.isCond(2)) { addSpawn(SYLPH, SYLPH_LOCATION, false, 4000); - giveStoryQuestReward(player, 10); + giveStoryQuestReward(npc, player); addExpAndSp(player, 1312934, 315); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java index 9894acae60..f21bb6d827 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10769_LettersFromTheQueenCrumaTowerPart1/Q10769_LettersFromTheQueenCrumaTowerPart1.java @@ -90,7 +90,7 @@ public final class Q10769_LettersFromTheQueenCrumaTowerPart1 extends LetterQuest { giveItems(player, ENCHANT_WEAPON_C, 1); giveItems(player, ENCHANT_ARMOR_C, 1); - giveStoryQuestReward(player, 11); + giveStoryQuestReward(npc, player); addExpAndSp(player, 370440, 88); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_QUEEN_NAVARI_AT_LV_46, ExShowScreenMessage.TOP_CENTER, 8000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java index c8184c680d..86108bc53e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java @@ -99,7 +99,7 @@ public final class Q10770_InSearchOfTheGrail extends Quest { giveItems(player, ENCHANT_WEAPON_C, 2); giveItems(player, ENCHANT_ARMOR_C, 5); - giveStoryQuestReward(player, 30); + giveStoryQuestReward(npc, player); addExpAndSp(player, 2342300, 562); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java index c4711263e4..8e00ff8296 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java @@ -89,7 +89,7 @@ public final class Q10771_VolatilePower extends Quest if (qs.isCond(3)) { giveItems(player, ENCHANT_ARMOR_C, 5); - giveStoryQuestReward(player, 20); + giveStoryQuestReward(npc, player); addExpAndSp(player, 2708350, 650); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java index e9716c0a3b..264a570532 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java @@ -111,7 +111,7 @@ public final class Q10772_ReportsFromCrumaTowerPart1 extends Quest if (qs.isCond(2)) { giveItems(player, ENCHANT_ARMOR_C, 2); - giveStoryQuestReward(player, 4); + giveStoryQuestReward(npc, player); addExpAndSp(player, 127575, 30); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java index 8df276a587..5941903b90 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java @@ -88,7 +88,7 @@ public final class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest if (qs.isCond(2)) { giveItems(player, ENCHANT_ARMOR_C, 2); - giveStoryQuestReward(player, 11); + giveStoryQuestReward(npc, player); addExpAndSp(player, 483840, 116); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_QUEEN_NAVARI_AT_LV_52, ExShowScreenMessage.TOP_CENTER, 8000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java index ed005274ec..d331d664be 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java @@ -93,7 +93,7 @@ public final class Q10775_InSearchOfAnAncientGiant extends Quest if (qs.isCond(2)) { giveItems(player, ENCHANT_ARMOR_C, 9); - giveStoryQuestReward(player, 46); + giveStoryQuestReward(npc, player); addExpAndSp(player, 4443600, 1066); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java index 1f987787b0..220510f5e0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java @@ -139,7 +139,7 @@ public final class Q10776_TheWrathOfTheGiants extends Quest if (qs.isCond(4)) { giveItems(player, ENCHANT_ARMOR_C, 4); - giveStoryQuestReward(player, 20); + giveStoryQuestReward(npc, player); addExpAndSp(player, 4838400, 1161); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java index 631a337d75..701eaf7157 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java @@ -113,7 +113,7 @@ public final class Q10777_ReportsFromCrumaTowerPart2 extends Quest if (qs.isCond(2)) { giveItems(player, ENCHANT_ARMOR_C, 2); - giveStoryQuestReward(player, 4); + giveStoryQuestReward(npc, player); addExpAndSp(player, 151263, 36); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java index ed2ef3824a..9964726bf5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java @@ -87,7 +87,7 @@ public final class Q10779_LettersFromTheQueenSeaOfSpores extends LetterQuest if (qs.isCond(2)) { giveItems(player, ENCHANT_WEAPON_B, 3); - giveStoryQuestReward(player, 37); + giveStoryQuestReward(npc, player); addExpAndSp(player, 635250, 152); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_QUEEN_NAVARI_AT_LV_58, ExShowScreenMessage.TOP_CENTER, 8000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java index 6f584abff5..8161211e43 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java @@ -92,7 +92,7 @@ public final class Q10780_AWeakenedBarrier extends Quest if (qs.isCond(2)) { giveItems(player, ENCHANT_ARMOR_B, 5); - giveStoryQuestReward(player, 36); + giveStoryQuestReward(npc, player); addExpAndSp(player, 15108843, 914); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java index 903d6fe7b3..2aeeecbe06 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java @@ -87,7 +87,7 @@ public final class Q10781_IngredientsToEnforcements extends Quest if (qs.isCond(2)) { giveItems(player, ENCHANT_ARMOR_B, 5); - giveStoryQuestReward(player, 37); + giveStoryQuestReward(npc, player); addExpAndSp(player, 19688585, 914); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java index c93d98995c..7067dbac4c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java @@ -89,7 +89,7 @@ public final class Q10782_LettersFromTheQueenForsakenPlains extends LetterQuest if (qs.isCond(2)) { giveItems(player, ENCHANT_ARMOR_B, 10); - giveStoryQuestReward(player, 60); + giveStoryQuestReward(npc, player); addExpAndSp(player, 731010, 175); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_QUEEN_NAVARI_AT_LV_61, ExShowScreenMessage.TOP_CENTER, 8000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java index c4553f9101..e6a84c3d3e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java @@ -103,7 +103,7 @@ public final class Q10783_TracesOfAnAmbush extends Quest case "33866-08.html": { giveItems(player, ENCHANT_ARMOR_B, 5); - giveStoryQuestReward(player, 34); + giveStoryQuestReward(npc, player); addExpAndSp(player, 5482574, 1315); qs.exitQuest(false, true); break; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java index ddca456440..07de10d4e8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java @@ -91,7 +91,7 @@ public final class Q10784_TheBrokenDevice extends Quest { if (qs.isCond(2)) { - giveStoryQuestReward(player, 40); + giveStoryQuestReward(npc, player); giveAdena(player, 990_000, true); giveItems(player, SOULSHOT, 6000); giveItems(player, SPIRITSHOT, 6000); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java index 2f13cd391e..8985e0564b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java @@ -89,7 +89,7 @@ public final class Q10785_LettersFromTheQueenFieldsOfMassacre extends LetterQues if (qs.isCond(2)) { giveItems(player, ENCHANT_WEAPON_A, 1); - giveStoryQuestReward(player, 71); + giveStoryQuestReward(npc, player); addExpAndSp(player, 807240, 193); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_QUEEN_NAVARI_AT_LV_65, ExShowScreenMessage.TOP_CENTER, 8000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java index 69ee846d25..c77fe968ae 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java @@ -100,7 +100,7 @@ public final class Q10786_ResidentProblemSolver extends Quest if (qs.isCond(2)) { giveItems(player, ENCHANT_ARMOR_A, 5); - giveStoryQuestReward(player, 57); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 6251174, 1500); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java index db06dd5383..10b86cb157 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java @@ -104,7 +104,7 @@ public final class Q10787_ASpyMission extends Quest if (qs.isCond(2)) { giveItems(player, ENCHANT_ARMOR_A, 5); - giveStoryQuestReward(player, 29); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 3125586, 750); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java index 084fdf5908..14fb94e577 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java @@ -89,7 +89,7 @@ public final class Q10789_LettersFromTheQueenSwampOfScreams extends LetterQuest if (qs.isCond(2)) { giveItems(player, ENCHANT_WEAPON_A, 2); - giveStoryQuestReward(player, 91); + giveStoryQuestReward(npc, player); addExpAndSp(player, 942690, 226); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_QUEEN_NAVARI_AT_LV_70, ExShowScreenMessage.TOP_CENTER, 8000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java index 99af2ad387..78c92c0b09 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java @@ -101,7 +101,7 @@ public class Q10790_AMercenaryHelper extends Quest if (qs.isCond(2) && (player.getLevel() >= MIN_LEVEL)) { qs.exitQuest(false, true); - giveStoryQuestReward(player, 3); + giveStoryQuestReward(npc, player); giveItems(player, EAA, 3); addExpAndSp(player, 942650, 226); htmltext = "33847-07.html"; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java index 424a90be84..79ff1a1679 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java @@ -100,7 +100,7 @@ public class Q10791_TheManOfMystery extends Quest if (qs.isCond(3)) { addExpAndSp(player, 16968420, 4072); - giveStoryQuestReward(player, 63); + giveStoryQuestReward(npc, player); giveItems(player, EAA, 2); qs.exitQuest(false, true); htmltext = "33847-07.html"; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java index c1d885ae4b..38eb7b3015 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java @@ -87,7 +87,7 @@ public final class Q10792_LettersFromTheQueenForestOfTheDead extends LetterQuest if (qs.isCond(2)) { giveItems(player, ENCHANT_WEAPON_A, 2); - giveStoryQuestReward(player, 91); + giveStoryQuestReward(npc, player); addExpAndSp(player, 942690, 226); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_QUEEN_NAVARI_AT_LV_70, ExShowScreenMessage.TOP_CENTER, 8000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java index f37c466a81..9f8d696c86 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java @@ -98,7 +98,7 @@ public final class Q10793_SaveTheSouls extends Quest if (qs.isCond(2)) { giveItems(player, ENCHANT_ARMOR_A, 3); - giveStoryQuestReward(player, 3); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 942690, 226); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java index 33ee666a78..5bfe1c80ff 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java @@ -132,7 +132,7 @@ public final class Q10794_InvestigateTheForest extends Quest { takeItems(player, OLD_JEWELRY_BOX, -1); giveItems(player, ENCHANT_ARMOR_A, 5); - giveStoryQuestReward(player, 63); + giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 16968420, 4072); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java index 482321ba54..357c28967d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java @@ -74,7 +74,7 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest if (qs.isCond(2)) { giveItems(player, EAA, 5); - giveStoryQuestReward(player, 123); + giveStoryQuestReward(npc, player); addExpAndSp(player, 1088640, 261); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_QUEEN_NAVARI_AT_LV_76, ExShowScreenMessage.TOP_CENTER, 8000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index 0827a835e0..1ae9b45e06 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -96,7 +96,7 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest if (player.getLevel() >= MIN_LEVEL) { addExpAndSp(player, 1088640, 261); - giveStoryQuestReward(player, 2); + giveStoryQuestReward(npc, player); giveItems(player, EAA, 2); qs.exitQuest(false, true); htmltext = event; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java index fee8051211..c7eecaa201 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java @@ -78,7 +78,7 @@ public class Q10797_CrossingFate extends Quest if (qs.isCond(2)) { addExpAndSp(player, 2721600, 653); - giveStoryQuestReward(player, 26); + giveStoryQuestReward(npc, player); giveItems(player, EAA, 5); qs.exitQuest(false, true); break; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java index 17d030fb46..91d595b696 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java @@ -89,7 +89,7 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest if (qs.isCond(2)) { giveItems(player, EWS, 2); - giveStoryQuestReward(player, 182); + giveStoryQuestReward(npc, player); addExpAndSp(player, 1277640, 306); showOnScreenMsg(player, NpcStringId.YOU_HAVE_FINISHED_ALL_OF_QUEEN_NAVARI_S_LETTERS_GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_LETTERS_FROM_A_MINSTREL_AT_LV_85, ExShowScreenMessage.TOP_CENTER, 8000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java index 5ec4df769c..b29e9be5cf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java @@ -100,7 +100,7 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest { final int itemId = Integer.parseInt(event.replace("giveReward_", "")); qs.exitQuest(false, true); - giveStoryQuestReward(player, 196); + giveStoryQuestReward(npc, player); giveItems(player, EAS, 10); giveItems(player, itemId, 30); addExpAndSp(player, 76658400, 18398); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java index d34c3e3c90..ab151894ee 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java @@ -101,7 +101,7 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest { final int itemId = Integer.parseInt(event.replace("giveReward_", "")); qs.exitQuest(false, true); - giveStoryQuestReward(player, 235); + giveStoryQuestReward(npc, player); giveItems(player, EAS, 10); giveItems(player, itemId, 30); addExpAndSp(player, 84722400, 20333); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java index 144704b1d0..4bd1e734a4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -71,6 +71,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.olympiad.CompetitionType; import com.l2jmobius.gameserver.model.olympiad.Participant; import com.l2jmobius.gameserver.model.skills.Skill; +import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.zone.L2ZoneType; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList; @@ -108,8 +109,7 @@ public class Quest extends AbstractScript implements IIdentifiable private static final int RESET_HOUR = 6; private static final int RESET_MINUTES = 30; - private static final int STEEL_DOOR_COIN = 37045; // Steel Door Guild Coin - private static final SkillHolder STORY_QUEST_REWARD = new SkillHolder(27580, 1); + private static final SkillHolder STORY_QUEST_BUFF_REWARD = new SkillHolder(27580, 1); /** * @return the reset hour for a daily quest, could be overridden on a script. @@ -3335,12 +3335,11 @@ public class Quest extends AbstractScript implements IIdentifiable } - public void giveStoryQuestReward(L2PcInstance player, int steelDoorCoinCount) + public void giveStoryQuestReward(L2Npc npc, L2PcInstance player) { - giveItems(player, STEEL_DOOR_COIN, steelDoorCoinCount); if (Config.ENABLE_STORY_QUEST_BUFF_REWARD) { - STORY_QUEST_REWARD.getSkill().applyEffects(player, player); + SkillCaster.triggerCast(npc, player, STORY_QUEST_BUFF_REWARD.getSkill()); } } }