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 7a95e12ae4..8264bb8bc0 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 @@ -90,7 +90,7 @@ public final class Q10756_AnInterdimensionalDraft extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - addExpAndSp(player, 174222, 41); + addExpAndSp(player, 267479, 41); qs.exitQuest(false, true); } break; 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 67e4602ebe..fbba278e0a 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 @@ -88,7 +88,7 @@ public final class Q10757_QuietingTheStorm extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - addExpAndSp(player, 632051, 151); + addExpAndSp(player, 808754, 151); qs.exitQuest(false, true); } break; 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 8373ae1a8a..b5f663f699 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 @@ -92,7 +92,7 @@ public class Q10761_AnOrcInLove extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - addExpAndSp(player, 354546, 85); + addExpAndSp(player, 706841, 85); qs.exitQuest(false, true); } break; 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 a8d0138a16..720dc39043 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 @@ -80,7 +80,7 @@ public final class Q10763_TerrifyingChertuba extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - addExpAndSp(player, 896996, 215); + addExpAndSp(player, 1529848, 215); qs.exitQuest(false, true); } break; 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 86108bc53e..088ba62d22 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 @@ -43,8 +43,6 @@ public final class Q10770_InSearchOfTheGrail extends Quest }; // Items private static final int MYSTERIOUS_FRAGMENT = 39711; - private static final int ENCHANT_WEAPON_C = 951; - private static final int ENCHANT_ARMOR_C = 952; // Misc private static final int MIN_LEVEL = 40; private static final double DROP_RATE = 0.4; @@ -97,10 +95,8 @@ public final class Q10770_InSearchOfTheGrail extends Quest { if (qs.isCond(3)) { - giveItems(player, ENCHANT_WEAPON_C, 2); - giveItems(player, ENCHANT_ARMOR_C, 5); giveStoryQuestReward(npc, player); - addExpAndSp(player, 2342300, 562); + addExpAndSp(player, 4175045, 562); qs.exitQuest(false, true); } break; @@ -165,7 +161,7 @@ public final class Q10770_InSearchOfTheGrail extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, MYSTERIOUS_FRAGMENT, 1, 30, DROP_RATE, true)) + if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, MYSTERIOUS_FRAGMENT, 1, 20, DROP_RATE, true)) { qs.setCond(2, 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 8e00ff8296..55a3ebf25e 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 @@ -43,7 +43,6 @@ public final class Q10771_VolatilePower extends Quest // Items private static final int SHINING_MYSTERIOUS_FRAGMENT = 39713; private static final int NORMAL_FRAGMENT_DUST = 39714; - private static final int ENCHANT_ARMOR_C = 952; // Misc private static final int MIN_LEVEL = 44; @@ -88,9 +87,8 @@ public final class Q10771_VolatilePower extends Quest { if (qs.isCond(3)) { - giveItems(player, ENCHANT_ARMOR_C, 5); giveStoryQuestReward(npc, player); - addExpAndSp(player, 2708350, 650); + addExpAndSp(player, 4150144, 650); qs.exitQuest(false, true); } break; 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 377ea5fb51..6d63c61edd 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 @@ -40,8 +40,6 @@ public final class Q10772_ReportsFromCrumaTowerPart1 extends Quest // NPCs private static final int JANSSEN = 30484; private static final int MAGIC_OWL = 33991; - // Items - private static final int ENCHANT_ARMOR_C = 952; // Location private static final Location OWL_LOC = new Location(17698, 115064, -11736); // Skill @@ -110,9 +108,8 @@ public final class Q10772_ReportsFromCrumaTowerPart1 extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_C, 2); giveStoryQuestReward(npc, player); - addExpAndSp(player, 127575, 30); + addExpAndSp(player, 838290, 30); qs.exitQuest(false, true); } break; 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 4cd18e72da..a384e31505 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 @@ -37,7 +37,6 @@ public final class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest // Items private static final int SOE_DION_TOWN = 39595; private static final int SOE_CRUMA_TOWER = 39596; - private static final int ENCHANT_ARMOR_C = 952; // Location private static final Location TELEPORT_LOC = new Location(16014, 142326, -2688); // Misc @@ -87,7 +86,6 @@ public final class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_C, 2); 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); 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 4c3759c9d5..ef81ac79ca 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 @@ -47,7 +47,6 @@ public final class Q10775_InSearchOfAnAncientGiant extends Quest }; // Items private static final int ENERGY_OF_REGENERATION = 39715; - private static final int ENCHANT_ARMOR_C = 952; // Misc private static final int MIN_LEVEL = 46; @@ -92,9 +91,8 @@ public final class Q10775_InSearchOfAnAncientGiant extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_C, 9); giveStoryQuestReward(npc, player); - addExpAndSp(player, 4443600, 1066); + addExpAndSp(player, 10526523, 1066); qs.exitQuest(false, true); } break; 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 220510f5e0..adcb9bda9f 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 @@ -44,7 +44,6 @@ public final class Q10776_TheWrathOfTheGiants extends Quest private static final int GIANT_MINION = 27535; // Items private static final int REGENERATION_DEVICE_CORE = 39716; - private static final int ENCHANT_ARMOR_C = 952; // Location private static final Location NARSIDES_LOC = new Location(16422, 113281, -9064); private static final Location ENRAGED_NARSIDES_LOC = new Location(16422, 113281, -9064); @@ -138,9 +137,8 @@ public final class Q10776_TheWrathOfTheGiants extends Quest { if (qs.isCond(4)) { - giveItems(player, ENCHANT_ARMOR_C, 4); giveStoryQuestReward(npc, player); - addExpAndSp(player, 4838400, 1161); + addExpAndSp(player, 10046941, 1161); qs.exitQuest(false, true); } break; 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 56161f3028..5534c17ee3 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 @@ -40,8 +40,6 @@ public final class Q10777_ReportsFromCrumaTowerPart2 extends Quest // NPCs private static final int BELKADHI = 30485; private static final int MAGIC_OWL = 33991; - // Items - private static final int ENCHANT_ARMOR_C = 952; // Location private static final Location OWL_LOC = new Location(17666, 108589, -9072); // Skill @@ -112,9 +110,8 @@ public final class Q10777_ReportsFromCrumaTowerPart2 extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_C, 2); giveStoryQuestReward(npc, player); - addExpAndSp(player, 151263, 36); + addExpAndSp(player, 1257435, 36); qs.exitQuest(false, true); } break; 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 9964726bf5..9576d58df1 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 @@ -37,7 +37,6 @@ public final class Q10779_LettersFromTheQueenSeaOfSpores extends LetterQuest // Items private static final int SOE_OREN = 39574; private static final int SOE_SEA_OF_SPORES = 39575; - private static final int ENCHANT_WEAPON_B = 947; // Location private static final Location TELEPORT_LOC = new Location(83633, 53064, -1456); // Misc @@ -86,7 +85,6 @@ public final class Q10779_LettersFromTheQueenSeaOfSpores extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_WEAPON_B, 3); 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); 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 457f06c852..e2900506d5 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 @@ -47,8 +47,6 @@ public final class Q10780_AWeakenedBarrier extends Quest 23307, // Corpse Spider 23308, // Explosive Spider }; - // Items - private static final int ENCHANT_ARMOR_B = 948; // Misc private static final int MIN_LEVEL = 52; private static final int MAX_LEVEL = 58; @@ -91,7 +89,6 @@ public final class Q10780_AWeakenedBarrier extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_B, 5); 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 2aeeecbe06..1587e04c27 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 @@ -42,7 +42,6 @@ public final class Q10781_IngredientsToEnforcements extends Quest }; // Items private static final int WIND_SPIRIT_FRAGMENT = 39721; - private static final int ENCHANT_ARMOR_B = 948; // Misc private static final int MIN_LEVEL = 52; private static final int MAX_LEVEL = 58; @@ -86,7 +85,6 @@ public final class Q10781_IngredientsToEnforcements extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_B, 5); 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 7067dbac4c..a46a46b5ca 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 @@ -37,7 +37,6 @@ public final class Q10782_LettersFromTheQueenForsakenPlains extends LetterQuest // Items private static final int SOE_ADEN = 39576; private static final int SOE_FORSAKEN_PLAINS = 39577; - private static final int ENCHANT_ARMOR_B = 948; // Location private static final Location TELEPORT_LOC = new Location(147446, 22761, -1984); // Misc @@ -88,7 +87,6 @@ public final class Q10782_LettersFromTheQueenForsakenPlains extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_B, 10); 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); 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 e6a84c3d3e..1ad7a44858 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 @@ -51,7 +51,6 @@ public final class Q10783_TracesOfAnAmbush extends Quest }; // Items private static final int MISSIVE_SCRAPS = 39722; - private static final int ENCHANT_ARMOR_B = 948; // Messages private static final NpcStringId[] MESSAGES = { @@ -102,9 +101,8 @@ public final class Q10783_TracesOfAnAmbush extends Quest } case "33866-08.html": { - giveItems(player, ENCHANT_ARMOR_B, 5); giveStoryQuestReward(npc, player); - addExpAndSp(player, 5482574, 1315); + addExpAndSp(player, 12146608, 1315); qs.exitQuest(false, true); break; } @@ -154,7 +152,7 @@ public final class Q10783_TracesOfAnAmbush extends Quest if (getRandom(100) < DROP_RATE) { giveItems(killer, MISSIVE_SCRAPS, 1); - if (getQuestItemsCount(killer, MISSIVE_SCRAPS) >= 10) + if (getQuestItemsCount(killer, MISSIVE_SCRAPS) >= 50) { qs.setCond(2, true); } 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 07de10d4e8..41a72f11d4 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 @@ -92,7 +92,7 @@ public final class Q10784_TheBrokenDevice extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - giveAdena(player, 990_000, true); + giveAdena(player, 990000, true); giveItems(player, SOULSHOT, 6000); giveItems(player, SPIRITSHOT, 6000); giveItems(player, BLESSED_SCROLL_OF_ESCAPE, 3); @@ -144,7 +144,7 @@ public final class Q10784_TheBrokenDevice extends Quest if ((qs != null) && qs.isCond(1)) { giveItems(killer, BROKE_MAGIC_DEVICE_FRAGMENT, 1); - if (getQuestItemsCount(killer, BROKE_MAGIC_DEVICE_FRAGMENT) >= 20) + if (getQuestItemsCount(killer, BROKE_MAGIC_DEVICE_FRAGMENT) >= 100) { qs.setCond(2, true); } 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 8985e0564b..d41a649c4d 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 @@ -37,7 +37,6 @@ public final class Q10785_LettersFromTheQueenFieldsOfMassacre extends LetterQues // Items private static final int SOE_ADEN = 39578; private static final int SOE_FIELDS_OF_MASSACRE = 39579; - private static final int ENCHANT_WEAPON_A = 26350; // Location private static final Location TELEPORT_LOC = new Location(147446, 22761, -1984); // Misc @@ -88,7 +87,6 @@ public final class Q10785_LettersFromTheQueenFieldsOfMassacre extends LetterQues { if (qs.isCond(2)) { - giveItems(player, ENCHANT_WEAPON_A, 1); 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); 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 e189617ab8..fd38b9a6e0 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 @@ -55,8 +55,6 @@ public final class Q10786_ResidentProblemSolver extends Quest 20975, // Spiteful Soul Wizard 20976, // Spiteful Soul Warrior }; - // Items - private static final int ENCHANT_ARMOR_A = 26351; // Misc private static final int MIN_LEVEL = 61; private static final int MAX_LEVEL = 65; @@ -99,11 +97,10 @@ public final class Q10786_ResidentProblemSolver extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_A, 5); giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 6251174, 1500); + addExpAndSp(player, 38226567, 1500); } qs.exitQuest(false, true); } 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 32b499f285..bb587579de 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 @@ -39,7 +39,6 @@ public final class Q10787_ASpyMission extends Quest // Monster private static final int EMBRYO_PURIFIER = 27540; // Items - private static final int ENCHANT_ARMOR_A = 26351; private static final int EMBRYO_MISSIVES = 39724; // Misc private static final int MIN_LEVEL = 61; @@ -103,11 +102,10 @@ public final class Q10787_ASpyMission extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_A, 5); giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 3125586, 750); + addExpAndSp(player, 17234475, 750); } qs.exitQuest(false, true); } 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 14fb94e577..fe3262b88f 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 @@ -37,7 +37,6 @@ public final class Q10789_LettersFromTheQueenSwampOfScreams extends LetterQuest // Items private static final int SOE_RUNE = 39580; private static final int SOE_SWAMP_OF_SCREAMS = 39581; - private static final int ENCHANT_WEAPON_A = 26350; // Location private static final Location TELEPORT_LOC = new Location(36563, -49178, -1128); // Misc @@ -88,7 +87,6 @@ public final class Q10789_LettersFromTheQueenSwampOfScreams extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_WEAPON_A, 2); 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); 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 74813b3df8..5e75883721 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 @@ -56,8 +56,6 @@ public class Q10790_AMercenaryHelper extends Quest 21518, // Frenzied Stakato Soldier 21519 // Frenzied Stakato Drone }; - // Items - private static final int EAA = 730; // Misc private static final int MIN_LEVEL = 65; private static final int MAX_LEVEL = 70; @@ -102,8 +100,7 @@ public class Q10790_AMercenaryHelper extends Quest { qs.exitQuest(false, true); giveStoryQuestReward(npc, player); - giveItems(player, EAA, 3); - addExpAndSp(player, 942650, 226); + addExpAndSp(player, 134158421, 226); htmltext = "33847-07.html"; } } @@ -146,7 +143,7 @@ public class Q10790_AMercenaryHelper extends Quest { int count = qs.getInt(KILL_COUNT_VAR); qs.set(KILL_COUNT_VAR, ++count); - if (count >= 50) + if (count >= 300) { qs.setCond(2, true); } 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 79ff1a1679..baf33fe38b 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 @@ -45,8 +45,6 @@ public class Q10791_TheManOfMystery extends Quest private static final int SUSPICIOUS_COCOON2 = 27538; private static final int NEEDLE_STAKATO_CAPTAIN = 27542; private static final int NEEDLE_STAKATO = 27543; - // Items - private static final int EAA = 730; // Misc private static final int MIN_LEVEL = 65; private static final int MAX_LEVEL = 70; @@ -99,9 +97,8 @@ public class Q10791_TheManOfMystery extends Quest { if (qs.isCond(3)) { - addExpAndSp(player, 16968420, 4072); + addExpAndSp(player, 46334481, 4072); giveStoryQuestReward(npc, player); - giveItems(player, EAA, 2); qs.exitQuest(false, true); htmltext = "33847-07.html"; break; 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 38eb7b3015..b5cecf9e6b 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 @@ -37,7 +37,6 @@ public final class Q10792_LettersFromTheQueenForestOfTheDead extends LetterQuest // Items private static final int SOE_RUNE = 39582; private static final int SOE_FOREST_OF_DEAD = 39583; - private static final int ENCHANT_WEAPON_A = 26350; // Location private static final Location TELEPORT_LOC = new Location(36563, -49178, -1128); // Misc @@ -86,7 +85,6 @@ public final class Q10792_LettersFromTheQueenForestOfTheDead extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_WEAPON_A, 2); 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); 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 b7753d4e9f..3d31dc6dcc 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 @@ -52,8 +52,6 @@ public final class Q10793_SaveTheSouls extends Quest 21560, // Bone Shaper 21561, // Sacrificed Man }; - // Items - private static final int ENCHANT_ARMOR_A = 26351; // Misc private static final int MIN_LEVEL = 65; private static final int MAX_LEVEL = 70; @@ -97,11 +95,10 @@ public final class Q10793_SaveTheSouls extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_A, 3); giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 942690, 226); + addExpAndSp(player, 86636593, 226); } qs.exitQuest(false, true); } 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 7a7a4b7e33..2aeebe3b12 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 @@ -78,7 +78,6 @@ public final class Q10794_InvestigateTheForest extends Quest private static final int MAX_LEVEL = 70; private static final String KILL_COUNT_VAR = "KillCount"; // Items - private static final int ENCHANT_ARMOR_A = 730; private static final int OLD_JEWELRY_BOX = 39725; public Q10794_InvestigateTheForest() @@ -131,11 +130,10 @@ public final class Q10794_InvestigateTheForest extends Quest if (qs.isCond(4)) { takeItems(player, OLD_JEWELRY_BOX, -1); - giveItems(player, ENCHANT_ARMOR_A, 5); giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 16968420, 4072); + addExpAndSp(player, 93856309, 4072); } htmltext = event; qs.exitQuest(false, true); @@ -171,7 +169,7 @@ public final class Q10794_InvestigateTheForest extends Quest case TOMBSTONE: { final int count = qs.getInt(KILL_COUNT_VAR); - if ((count >= 50) && (getQuestItemsCount(player, OLD_JEWELRY_BOX) < 1)) + if ((count >= 100) && (getQuestItemsCount(player, OLD_JEWELRY_BOX) < 1)) { htmltext = "31531-01.html"; } @@ -197,7 +195,7 @@ public final class Q10794_InvestigateTheForest extends Quest { final int count = qs.getInt(KILL_COUNT_VAR) + 1; qs.set(KILL_COUNT_VAR, count); - if (count >= 50) + if (count >= 100) { qs.setCond(1, true); } 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 357c28967d..e0ef24c7ff 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 @@ -22,7 +22,6 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest // Items private static final int SOE_WAAL_OF_ARGOS = 39585; private static final int SOE_GODDARD = 39584; - private static final int EAA = 730; // Misc private static final int MIN_LEVEL = 70; private static final int MAX_LEVEL = 75; @@ -73,7 +72,6 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, EAA, 5); 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); 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 447b5ba2c6..5a22e69d54 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 @@ -50,8 +50,6 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest 21299, // Valley Buffalo Slave 21304 // Valley Grendel Slave }; - // Items - private static final int EAA = 730; // Misc private static final int MIN_LEVEL = 70; private static final int MAX_LEVEL = 75; @@ -95,9 +93,8 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 1088640, 261); + addExpAndSp(player, 178732196, 261); 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 b3734b8122..21c4d4ea6a 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 @@ -97,7 +97,7 @@ public class Q10797_CrossingFate extends Quest { if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 306_167_814, 653); + addExpAndSp(player, 306167814, 653); giveStoryQuestReward(npc, player); qs.exitQuest(QuestType.ONE_TIME, true); htmltext = event; 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 91d595b696..9dc9096151 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 @@ -38,7 +38,6 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest // Items private static final int SOE_DRAGON_VALLEY = 39587; private static final int SOE_TOWN_OF_GIRAN = 39586; - private static final int EWS = 959; // Misc private static final int MIN_LEVEL = 81; private static final int MAX_LEVEL = 84; @@ -88,7 +87,6 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, EWS, 2); 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); 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 a6685c2070..63f1395fb4 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 @@ -53,8 +53,6 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest 23439, // Iron Cave Servant 23440, // Headless Knight }; - // Items - private static final int EAS = 960; // Misc private static final int MIN_LEVEL = 76; private static final int MAX_LEVEL = 85; @@ -101,9 +99,8 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest final int itemId = Integer.parseInt(event.replace("giveReward_", "")); qs.exitQuest(false, true); giveStoryQuestReward(npc, player); - giveItems(player, EAS, 10); giveItems(player, itemId, 30); - addExpAndSp(player, 76658400, 18398); + addExpAndSp(player, 543080087, 23435); htmltext = "33973-08.html"; } } @@ -146,7 +143,7 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest { int count = qs.getInt(KILL_COUNT_VAR); qs.set(KILL_COUNT_VAR, ++count); - if (count >= 100) + if (count >= 200) { qs.setCond(2, true); } 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 fab382ab35..ba5e58f734 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 @@ -52,8 +52,6 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest 23443, // Dark Grave Wizard 23444, // Dark Grave Knight }; - // Item - private static final int EAS = 960; // Misc private static final int MIN_LEVEL = 76; private static final int MAX_LEVEL = 85; @@ -102,9 +100,8 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest final int itemId = Integer.parseInt(event.replace("giveReward_", "")); qs.exitQuest(false, true); giveStoryQuestReward(npc, player); - giveItems(player, EAS, 10); giveItems(player, itemId, 30); - addExpAndSp(player, 84722400, 20333); + addExpAndSp(player, 543080087, 30466); htmltext = "33973-08.html"; } break; @@ -148,7 +145,7 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest { int count = qs.getInt(KILL_COUNT_VAR); qs.set(KILL_COUNT_VAR, ++count); - if (count >= 100) + if (count >= 200) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java index 7a95e12ae4..8264bb8bc0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java @@ -90,7 +90,7 @@ public final class Q10756_AnInterdimensionalDraft extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - addExpAndSp(player, 174222, 41); + addExpAndSp(player, 267479, 41); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java index 67e4602ebe..fbba278e0a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java @@ -88,7 +88,7 @@ public final class Q10757_QuietingTheStorm extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - addExpAndSp(player, 632051, 151); + addExpAndSp(player, 808754, 151); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java index 8373ae1a8a..b5f663f699 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java @@ -92,7 +92,7 @@ public class Q10761_AnOrcInLove extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - addExpAndSp(player, 354546, 85); + addExpAndSp(player, 706841, 85); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java index a8d0138a16..720dc39043 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java @@ -80,7 +80,7 @@ public final class Q10763_TerrifyingChertuba extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - addExpAndSp(player, 896996, 215); + addExpAndSp(player, 1529848, 215); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java index 86108bc53e..088ba62d22 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java @@ -43,8 +43,6 @@ public final class Q10770_InSearchOfTheGrail extends Quest }; // Items private static final int MYSTERIOUS_FRAGMENT = 39711; - private static final int ENCHANT_WEAPON_C = 951; - private static final int ENCHANT_ARMOR_C = 952; // Misc private static final int MIN_LEVEL = 40; private static final double DROP_RATE = 0.4; @@ -97,10 +95,8 @@ public final class Q10770_InSearchOfTheGrail extends Quest { if (qs.isCond(3)) { - giveItems(player, ENCHANT_WEAPON_C, 2); - giveItems(player, ENCHANT_ARMOR_C, 5); giveStoryQuestReward(npc, player); - addExpAndSp(player, 2342300, 562); + addExpAndSp(player, 4175045, 562); qs.exitQuest(false, true); } break; @@ -165,7 +161,7 @@ public final class Q10770_InSearchOfTheGrail extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, MYSTERIOUS_FRAGMENT, 1, 30, DROP_RATE, true)) + if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, MYSTERIOUS_FRAGMENT, 1, 20, DROP_RATE, true)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java index 8e00ff8296..55a3ebf25e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java @@ -43,7 +43,6 @@ public final class Q10771_VolatilePower extends Quest // Items private static final int SHINING_MYSTERIOUS_FRAGMENT = 39713; private static final int NORMAL_FRAGMENT_DUST = 39714; - private static final int ENCHANT_ARMOR_C = 952; // Misc private static final int MIN_LEVEL = 44; @@ -88,9 +87,8 @@ public final class Q10771_VolatilePower extends Quest { if (qs.isCond(3)) { - giveItems(player, ENCHANT_ARMOR_C, 5); giveStoryQuestReward(npc, player); - addExpAndSp(player, 2708350, 650); + addExpAndSp(player, 4150144, 650); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java index 377ea5fb51..6d63c61edd 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java @@ -40,8 +40,6 @@ public final class Q10772_ReportsFromCrumaTowerPart1 extends Quest // NPCs private static final int JANSSEN = 30484; private static final int MAGIC_OWL = 33991; - // Items - private static final int ENCHANT_ARMOR_C = 952; // Location private static final Location OWL_LOC = new Location(17698, 115064, -11736); // Skill @@ -110,9 +108,8 @@ public final class Q10772_ReportsFromCrumaTowerPart1 extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_C, 2); giveStoryQuestReward(npc, player); - addExpAndSp(player, 127575, 30); + addExpAndSp(player, 838290, 30); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java index 4cd18e72da..a384e31505 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java @@ -37,7 +37,6 @@ public final class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest // Items private static final int SOE_DION_TOWN = 39595; private static final int SOE_CRUMA_TOWER = 39596; - private static final int ENCHANT_ARMOR_C = 952; // Location private static final Location TELEPORT_LOC = new Location(16014, 142326, -2688); // Misc @@ -87,7 +86,6 @@ public final class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_C, 2); 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); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java index 4c3759c9d5..ef81ac79ca 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java @@ -47,7 +47,6 @@ public final class Q10775_InSearchOfAnAncientGiant extends Quest }; // Items private static final int ENERGY_OF_REGENERATION = 39715; - private static final int ENCHANT_ARMOR_C = 952; // Misc private static final int MIN_LEVEL = 46; @@ -92,9 +91,8 @@ public final class Q10775_InSearchOfAnAncientGiant extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_C, 9); giveStoryQuestReward(npc, player); - addExpAndSp(player, 4443600, 1066); + addExpAndSp(player, 10526523, 1066); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java index 220510f5e0..adcb9bda9f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java @@ -44,7 +44,6 @@ public final class Q10776_TheWrathOfTheGiants extends Quest private static final int GIANT_MINION = 27535; // Items private static final int REGENERATION_DEVICE_CORE = 39716; - private static final int ENCHANT_ARMOR_C = 952; // Location private static final Location NARSIDES_LOC = new Location(16422, 113281, -9064); private static final Location ENRAGED_NARSIDES_LOC = new Location(16422, 113281, -9064); @@ -138,9 +137,8 @@ public final class Q10776_TheWrathOfTheGiants extends Quest { if (qs.isCond(4)) { - giveItems(player, ENCHANT_ARMOR_C, 4); giveStoryQuestReward(npc, player); - addExpAndSp(player, 4838400, 1161); + addExpAndSp(player, 10046941, 1161); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java index 56161f3028..5534c17ee3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java @@ -40,8 +40,6 @@ public final class Q10777_ReportsFromCrumaTowerPart2 extends Quest // NPCs private static final int BELKADHI = 30485; private static final int MAGIC_OWL = 33991; - // Items - private static final int ENCHANT_ARMOR_C = 952; // Location private static final Location OWL_LOC = new Location(17666, 108589, -9072); // Skill @@ -112,9 +110,8 @@ public final class Q10777_ReportsFromCrumaTowerPart2 extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_C, 2); giveStoryQuestReward(npc, player); - addExpAndSp(player, 151263, 36); + addExpAndSp(player, 1257435, 36); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java index 9964726bf5..9576d58df1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10779_LettersFromTheQueenSeaOfSpores/Q10779_LettersFromTheQueenSeaOfSpores.java @@ -37,7 +37,6 @@ public final class Q10779_LettersFromTheQueenSeaOfSpores extends LetterQuest // Items private static final int SOE_OREN = 39574; private static final int SOE_SEA_OF_SPORES = 39575; - private static final int ENCHANT_WEAPON_B = 947; // Location private static final Location TELEPORT_LOC = new Location(83633, 53064, -1456); // Misc @@ -86,7 +85,6 @@ public final class Q10779_LettersFromTheQueenSeaOfSpores extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_WEAPON_B, 3); 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); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java index 457f06c852..e2900506d5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java @@ -47,8 +47,6 @@ public final class Q10780_AWeakenedBarrier extends Quest 23307, // Corpse Spider 23308, // Explosive Spider }; - // Items - private static final int ENCHANT_ARMOR_B = 948; // Misc private static final int MIN_LEVEL = 52; private static final int MAX_LEVEL = 58; @@ -91,7 +89,6 @@ public final class Q10780_AWeakenedBarrier extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_B, 5); giveStoryQuestReward(npc, player); addExpAndSp(player, 15108843, 914); qs.exitQuest(false, true); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java index 2aeeecbe06..1587e04c27 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10781_IngredientsToEnforcements/Q10781_IngredientsToEnforcements.java @@ -42,7 +42,6 @@ public final class Q10781_IngredientsToEnforcements extends Quest }; // Items private static final int WIND_SPIRIT_FRAGMENT = 39721; - private static final int ENCHANT_ARMOR_B = 948; // Misc private static final int MIN_LEVEL = 52; private static final int MAX_LEVEL = 58; @@ -86,7 +85,6 @@ public final class Q10781_IngredientsToEnforcements extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_B, 5); giveStoryQuestReward(npc, player); addExpAndSp(player, 19688585, 914); qs.exitQuest(false, true); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java index 7067dbac4c..a46a46b5ca 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java @@ -37,7 +37,6 @@ public final class Q10782_LettersFromTheQueenForsakenPlains extends LetterQuest // Items private static final int SOE_ADEN = 39576; private static final int SOE_FORSAKEN_PLAINS = 39577; - private static final int ENCHANT_ARMOR_B = 948; // Location private static final Location TELEPORT_LOC = new Location(147446, 22761, -1984); // Misc @@ -88,7 +87,6 @@ public final class Q10782_LettersFromTheQueenForsakenPlains extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_B, 10); 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); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java index e6a84c3d3e..1ad7a44858 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java @@ -51,7 +51,6 @@ public final class Q10783_TracesOfAnAmbush extends Quest }; // Items private static final int MISSIVE_SCRAPS = 39722; - private static final int ENCHANT_ARMOR_B = 948; // Messages private static final NpcStringId[] MESSAGES = { @@ -102,9 +101,8 @@ public final class Q10783_TracesOfAnAmbush extends Quest } case "33866-08.html": { - giveItems(player, ENCHANT_ARMOR_B, 5); giveStoryQuestReward(npc, player); - addExpAndSp(player, 5482574, 1315); + addExpAndSp(player, 12146608, 1315); qs.exitQuest(false, true); break; } @@ -154,7 +152,7 @@ public final class Q10783_TracesOfAnAmbush extends Quest if (getRandom(100) < DROP_RATE) { giveItems(killer, MISSIVE_SCRAPS, 1); - if (getQuestItemsCount(killer, MISSIVE_SCRAPS) >= 10) + if (getQuestItemsCount(killer, MISSIVE_SCRAPS) >= 50) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java index 07de10d4e8..41a72f11d4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java @@ -92,7 +92,7 @@ public final class Q10784_TheBrokenDevice extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - giveAdena(player, 990_000, true); + giveAdena(player, 990000, true); giveItems(player, SOULSHOT, 6000); giveItems(player, SPIRITSHOT, 6000); giveItems(player, BLESSED_SCROLL_OF_ESCAPE, 3); @@ -144,7 +144,7 @@ public final class Q10784_TheBrokenDevice extends Quest if ((qs != null) && qs.isCond(1)) { giveItems(killer, BROKE_MAGIC_DEVICE_FRAGMENT, 1); - if (getQuestItemsCount(killer, BROKE_MAGIC_DEVICE_FRAGMENT) >= 20) + if (getQuestItemsCount(killer, BROKE_MAGIC_DEVICE_FRAGMENT) >= 100) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java index 8985e0564b..d41a649c4d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java @@ -37,7 +37,6 @@ public final class Q10785_LettersFromTheQueenFieldsOfMassacre extends LetterQues // Items private static final int SOE_ADEN = 39578; private static final int SOE_FIELDS_OF_MASSACRE = 39579; - private static final int ENCHANT_WEAPON_A = 26350; // Location private static final Location TELEPORT_LOC = new Location(147446, 22761, -1984); // Misc @@ -88,7 +87,6 @@ public final class Q10785_LettersFromTheQueenFieldsOfMassacre extends LetterQues { if (qs.isCond(2)) { - giveItems(player, ENCHANT_WEAPON_A, 1); 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); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java index e189617ab8..fd38b9a6e0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java @@ -55,8 +55,6 @@ public final class Q10786_ResidentProblemSolver extends Quest 20975, // Spiteful Soul Wizard 20976, // Spiteful Soul Warrior }; - // Items - private static final int ENCHANT_ARMOR_A = 26351; // Misc private static final int MIN_LEVEL = 61; private static final int MAX_LEVEL = 65; @@ -99,11 +97,10 @@ public final class Q10786_ResidentProblemSolver extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_A, 5); giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 6251174, 1500); + addExpAndSp(player, 38226567, 1500); } qs.exitQuest(false, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java index 32b499f285..bb587579de 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java @@ -39,7 +39,6 @@ public final class Q10787_ASpyMission extends Quest // Monster private static final int EMBRYO_PURIFIER = 27540; // Items - private static final int ENCHANT_ARMOR_A = 26351; private static final int EMBRYO_MISSIVES = 39724; // Misc private static final int MIN_LEVEL = 61; @@ -103,11 +102,10 @@ public final class Q10787_ASpyMission extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_A, 5); giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 3125586, 750); + addExpAndSp(player, 17234475, 750); } qs.exitQuest(false, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java index 14fb94e577..fe3262b88f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java @@ -37,7 +37,6 @@ public final class Q10789_LettersFromTheQueenSwampOfScreams extends LetterQuest // Items private static final int SOE_RUNE = 39580; private static final int SOE_SWAMP_OF_SCREAMS = 39581; - private static final int ENCHANT_WEAPON_A = 26350; // Location private static final Location TELEPORT_LOC = new Location(36563, -49178, -1128); // Misc @@ -88,7 +87,6 @@ public final class Q10789_LettersFromTheQueenSwampOfScreams extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_WEAPON_A, 2); 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); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java index 74813b3df8..5e75883721 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java @@ -56,8 +56,6 @@ public class Q10790_AMercenaryHelper extends Quest 21518, // Frenzied Stakato Soldier 21519 // Frenzied Stakato Drone }; - // Items - private static final int EAA = 730; // Misc private static final int MIN_LEVEL = 65; private static final int MAX_LEVEL = 70; @@ -102,8 +100,7 @@ public class Q10790_AMercenaryHelper extends Quest { qs.exitQuest(false, true); giveStoryQuestReward(npc, player); - giveItems(player, EAA, 3); - addExpAndSp(player, 942650, 226); + addExpAndSp(player, 134158421, 226); htmltext = "33847-07.html"; } } @@ -146,7 +143,7 @@ public class Q10790_AMercenaryHelper extends Quest { int count = qs.getInt(KILL_COUNT_VAR); qs.set(KILL_COUNT_VAR, ++count); - if (count >= 50) + if (count >= 300) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java index 79ff1a1679..baf33fe38b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java @@ -45,8 +45,6 @@ public class Q10791_TheManOfMystery extends Quest private static final int SUSPICIOUS_COCOON2 = 27538; private static final int NEEDLE_STAKATO_CAPTAIN = 27542; private static final int NEEDLE_STAKATO = 27543; - // Items - private static final int EAA = 730; // Misc private static final int MIN_LEVEL = 65; private static final int MAX_LEVEL = 70; @@ -99,9 +97,8 @@ public class Q10791_TheManOfMystery extends Quest { if (qs.isCond(3)) { - addExpAndSp(player, 16968420, 4072); + addExpAndSp(player, 46334481, 4072); giveStoryQuestReward(npc, player); - giveItems(player, EAA, 2); qs.exitQuest(false, true); htmltext = "33847-07.html"; break; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java index 38eb7b3015..b5cecf9e6b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java @@ -37,7 +37,6 @@ public final class Q10792_LettersFromTheQueenForestOfTheDead extends LetterQuest // Items private static final int SOE_RUNE = 39582; private static final int SOE_FOREST_OF_DEAD = 39583; - private static final int ENCHANT_WEAPON_A = 26350; // Location private static final Location TELEPORT_LOC = new Location(36563, -49178, -1128); // Misc @@ -86,7 +85,6 @@ public final class Q10792_LettersFromTheQueenForestOfTheDead extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_WEAPON_A, 2); 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); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java index b7753d4e9f..3d31dc6dcc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java @@ -52,8 +52,6 @@ public final class Q10793_SaveTheSouls extends Quest 21560, // Bone Shaper 21561, // Sacrificed Man }; - // Items - private static final int ENCHANT_ARMOR_A = 26351; // Misc private static final int MIN_LEVEL = 65; private static final int MAX_LEVEL = 70; @@ -97,11 +95,10 @@ public final class Q10793_SaveTheSouls extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_A, 3); giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 942690, 226); + addExpAndSp(player, 86636593, 226); } qs.exitQuest(false, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java index 7a7a4b7e33..2aeebe3b12 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java @@ -78,7 +78,6 @@ public final class Q10794_InvestigateTheForest extends Quest private static final int MAX_LEVEL = 70; private static final String KILL_COUNT_VAR = "KillCount"; // Items - private static final int ENCHANT_ARMOR_A = 730; private static final int OLD_JEWELRY_BOX = 39725; public Q10794_InvestigateTheForest() @@ -131,11 +130,10 @@ public final class Q10794_InvestigateTheForest extends Quest if (qs.isCond(4)) { takeItems(player, OLD_JEWELRY_BOX, -1); - giveItems(player, ENCHANT_ARMOR_A, 5); giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 16968420, 4072); + addExpAndSp(player, 93856309, 4072); } htmltext = event; qs.exitQuest(false, true); @@ -171,7 +169,7 @@ public final class Q10794_InvestigateTheForest extends Quest case TOMBSTONE: { final int count = qs.getInt(KILL_COUNT_VAR); - if ((count >= 50) && (getQuestItemsCount(player, OLD_JEWELRY_BOX) < 1)) + if ((count >= 100) && (getQuestItemsCount(player, OLD_JEWELRY_BOX) < 1)) { htmltext = "31531-01.html"; } @@ -197,7 +195,7 @@ public final class Q10794_InvestigateTheForest extends Quest { final int count = qs.getInt(KILL_COUNT_VAR) + 1; qs.set(KILL_COUNT_VAR, count); - if (count >= 50) + if (count >= 100) { qs.setCond(1, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java index 357c28967d..e0ef24c7ff 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java @@ -22,7 +22,6 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest // Items private static final int SOE_WAAL_OF_ARGOS = 39585; private static final int SOE_GODDARD = 39584; - private static final int EAA = 730; // Misc private static final int MIN_LEVEL = 70; private static final int MAX_LEVEL = 75; @@ -73,7 +72,6 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, EAA, 5); 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); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index 447b5ba2c6..5a22e69d54 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -50,8 +50,6 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest 21299, // Valley Buffalo Slave 21304 // Valley Grendel Slave }; - // Items - private static final int EAA = 730; // Misc private static final int MIN_LEVEL = 70; private static final int MAX_LEVEL = 75; @@ -95,9 +93,8 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 1088640, 261); + addExpAndSp(player, 178732196, 261); giveStoryQuestReward(npc, player); - giveItems(player, EAA, 2); qs.exitQuest(false, true); htmltext = event; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java index b3734b8122..21c4d4ea6a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java @@ -97,7 +97,7 @@ public class Q10797_CrossingFate extends Quest { if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 306_167_814, 653); + addExpAndSp(player, 306167814, 653); giveStoryQuestReward(npc, player); qs.exitQuest(QuestType.ONE_TIME, true); htmltext = event; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java index c2471a7721..1708a8d92c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java @@ -38,7 +38,6 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest // Items private static final int SOE_DRAGON_VALLEY = 39587; private static final int SOE_TOWN_OF_GIRAN = 39586; - private static final int EWS = 959; // Misc private static final int MIN_LEVEL = 81; private static final int MAX_LEVEL = 84; @@ -88,7 +87,6 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, EWS, 2); giveStoryQuestReward(npc, player); addExpAndSp(player, 1277640, 306); showOnScreenMsg(player, NpcStringId.YOU_HAVE_COMPLETED_ALL_OF_QUEEN_NAVARI_S_LETTER, ExShowScreenMessage.TOP_CENTER, 8000); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java index a6685c2070..63f1395fb4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java @@ -53,8 +53,6 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest 23439, // Iron Cave Servant 23440, // Headless Knight }; - // Items - private static final int EAS = 960; // Misc private static final int MIN_LEVEL = 76; private static final int MAX_LEVEL = 85; @@ -101,9 +99,8 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest final int itemId = Integer.parseInt(event.replace("giveReward_", "")); qs.exitQuest(false, true); giveStoryQuestReward(npc, player); - giveItems(player, EAS, 10); giveItems(player, itemId, 30); - addExpAndSp(player, 76658400, 18398); + addExpAndSp(player, 543080087, 23435); htmltext = "33973-08.html"; } } @@ -146,7 +143,7 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest { int count = qs.getInt(KILL_COUNT_VAR); qs.set(KILL_COUNT_VAR, ++count); - if (count >= 100) + if (count >= 200) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java index fab382ab35..ba5e58f734 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java @@ -52,8 +52,6 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest 23443, // Dark Grave Wizard 23444, // Dark Grave Knight }; - // Item - private static final int EAS = 960; // Misc private static final int MIN_LEVEL = 76; private static final int MAX_LEVEL = 85; @@ -102,9 +100,8 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest final int itemId = Integer.parseInt(event.replace("giveReward_", "")); qs.exitQuest(false, true); giveStoryQuestReward(npc, player); - giveItems(player, EAS, 10); giveItems(player, itemId, 30); - addExpAndSp(player, 84722400, 20333); + addExpAndSp(player, 543080087, 30466); htmltext = "33973-08.html"; } break; @@ -148,7 +145,7 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest { int count = qs.getInt(KILL_COUNT_VAR); qs.set(KILL_COUNT_VAR, ++count); - if (count >= 100) + if (count >= 200) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java index 7a95e12ae4..8264bb8bc0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10756_AnInterdimensionalDraft/Q10756_AnInterdimensionalDraft.java @@ -90,7 +90,7 @@ public final class Q10756_AnInterdimensionalDraft extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - addExpAndSp(player, 174222, 41); + addExpAndSp(player, 267479, 41); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java index 67e4602ebe..fbba278e0a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java @@ -88,7 +88,7 @@ public final class Q10757_QuietingTheStorm extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - addExpAndSp(player, 632051, 151); + addExpAndSp(player, 808754, 151); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java index 8373ae1a8a..b5f663f699 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java @@ -92,7 +92,7 @@ public class Q10761_AnOrcInLove extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - addExpAndSp(player, 354546, 85); + addExpAndSp(player, 706841, 85); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java index a8d0138a16..720dc39043 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10763_TerrifyingChertuba/Q10763_TerrifyingChertuba.java @@ -80,7 +80,7 @@ public final class Q10763_TerrifyingChertuba extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - addExpAndSp(player, 896996, 215); + addExpAndSp(player, 1529848, 215); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java index 86108bc53e..088ba62d22 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10770_InSearchOfTheGrail/Q10770_InSearchOfTheGrail.java @@ -43,8 +43,6 @@ public final class Q10770_InSearchOfTheGrail extends Quest }; // Items private static final int MYSTERIOUS_FRAGMENT = 39711; - private static final int ENCHANT_WEAPON_C = 951; - private static final int ENCHANT_ARMOR_C = 952; // Misc private static final int MIN_LEVEL = 40; private static final double DROP_RATE = 0.4; @@ -97,10 +95,8 @@ public final class Q10770_InSearchOfTheGrail extends Quest { if (qs.isCond(3)) { - giveItems(player, ENCHANT_WEAPON_C, 2); - giveItems(player, ENCHANT_ARMOR_C, 5); giveStoryQuestReward(npc, player); - addExpAndSp(player, 2342300, 562); + addExpAndSp(player, 4175045, 562); qs.exitQuest(false, true); } break; @@ -165,7 +161,7 @@ public final class Q10770_InSearchOfTheGrail extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, MYSTERIOUS_FRAGMENT, 1, 30, DROP_RATE, true)) + if ((qs != null) && qs.isCond(1) && giveItemRandomly(killer, MYSTERIOUS_FRAGMENT, 1, 20, DROP_RATE, true)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java index 8e00ff8296..55a3ebf25e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10771_VolatilePower/Q10771_VolatilePower.java @@ -43,7 +43,6 @@ public final class Q10771_VolatilePower extends Quest // Items private static final int SHINING_MYSTERIOUS_FRAGMENT = 39713; private static final int NORMAL_FRAGMENT_DUST = 39714; - private static final int ENCHANT_ARMOR_C = 952; // Misc private static final int MIN_LEVEL = 44; @@ -88,9 +87,8 @@ public final class Q10771_VolatilePower extends Quest { if (qs.isCond(3)) { - giveItems(player, ENCHANT_ARMOR_C, 5); giveStoryQuestReward(npc, player); - addExpAndSp(player, 2708350, 650); + addExpAndSp(player, 4150144, 650); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java index 377ea5fb51..6d63c61edd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10772_ReportsFromCrumaTowerPart1/Q10772_ReportsFromCrumaTowerPart1.java @@ -40,8 +40,6 @@ public final class Q10772_ReportsFromCrumaTowerPart1 extends Quest // NPCs private static final int JANSSEN = 30484; private static final int MAGIC_OWL = 33991; - // Items - private static final int ENCHANT_ARMOR_C = 952; // Location private static final Location OWL_LOC = new Location(17698, 115064, -11736); // Skill @@ -110,9 +108,8 @@ public final class Q10772_ReportsFromCrumaTowerPart1 extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_C, 2); giveStoryQuestReward(npc, player); - addExpAndSp(player, 127575, 30); + addExpAndSp(player, 838290, 30); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java index 54df4b73e9..ad2170c739 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10774_LettersFromTheQueenCrumaTowerPart2/Q10774_LettersFromTheQueenCrumaTowerPart2.java @@ -37,7 +37,6 @@ public final class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest // Items private static final int SOE_DION_TOWN = 39595; private static final int SOE_CRUMA_TOWER = 39596; - private static final int ENCHANT_ARMOR_C = 952; // Location private static final Location TELEPORT_LOC = new Location(16014, 142326, -2688); // Misc @@ -87,7 +86,6 @@ public final class Q10774_LettersFromTheQueenCrumaTowerPart2 extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_C, 2); giveStoryQuestReward(npc, player); addExpAndSp(player, 483840, 116); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_NUNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_QUEEN_NAVARI_AT_LV_56, ExShowScreenMessage.TOP_CENTER, 8000); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java index 4c3759c9d5..ef81ac79ca 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10775_InSearchOfAnAncientGiant/Q10775_InSearchOfAnAncientGiant.java @@ -47,7 +47,6 @@ public final class Q10775_InSearchOfAnAncientGiant extends Quest }; // Items private static final int ENERGY_OF_REGENERATION = 39715; - private static final int ENCHANT_ARMOR_C = 952; // Misc private static final int MIN_LEVEL = 46; @@ -92,9 +91,8 @@ public final class Q10775_InSearchOfAnAncientGiant extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_C, 9); giveStoryQuestReward(npc, player); - addExpAndSp(player, 4443600, 1066); + addExpAndSp(player, 10526523, 1066); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java index 220510f5e0..adcb9bda9f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10776_TheWrathOfTheGiants/Q10776_TheWrathOfTheGiants.java @@ -44,7 +44,6 @@ public final class Q10776_TheWrathOfTheGiants extends Quest private static final int GIANT_MINION = 27535; // Items private static final int REGENERATION_DEVICE_CORE = 39716; - private static final int ENCHANT_ARMOR_C = 952; // Location private static final Location NARSIDES_LOC = new Location(16422, 113281, -9064); private static final Location ENRAGED_NARSIDES_LOC = new Location(16422, 113281, -9064); @@ -138,9 +137,8 @@ public final class Q10776_TheWrathOfTheGiants extends Quest { if (qs.isCond(4)) { - giveItems(player, ENCHANT_ARMOR_C, 4); giveStoryQuestReward(npc, player); - addExpAndSp(player, 4838400, 1161); + addExpAndSp(player, 10046941, 1161); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java index 56161f3028..5534c17ee3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10777_ReportsFromCrumaTowerPart2/Q10777_ReportsFromCrumaTowerPart2.java @@ -40,8 +40,6 @@ public final class Q10777_ReportsFromCrumaTowerPart2 extends Quest // NPCs private static final int BELKADHI = 30485; private static final int MAGIC_OWL = 33991; - // Items - private static final int ENCHANT_ARMOR_C = 952; // Location private static final Location OWL_LOC = new Location(17666, 108589, -9072); // Skill @@ -112,9 +110,8 @@ public final class Q10777_ReportsFromCrumaTowerPart2 extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_C, 2); giveStoryQuestReward(npc, player); - addExpAndSp(player, 151263, 36); + addExpAndSp(player, 1257435, 36); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java index 7067dbac4c..a46a46b5ca 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10782_LettersFromTheQueenForsakenPlains/Q10782_LettersFromTheQueenForsakenPlains.java @@ -37,7 +37,6 @@ public final class Q10782_LettersFromTheQueenForsakenPlains extends LetterQuest // Items private static final int SOE_ADEN = 39576; private static final int SOE_FORSAKEN_PLAINS = 39577; - private static final int ENCHANT_ARMOR_B = 948; // Location private static final Location TELEPORT_LOC = new Location(147446, 22761, -1984); // Misc @@ -88,7 +87,6 @@ public final class Q10782_LettersFromTheQueenForsakenPlains extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_B, 10); 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); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java index e6a84c3d3e..1ad7a44858 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10783_TracesOfAnAmbush/Q10783_TracesOfAnAmbush.java @@ -51,7 +51,6 @@ public final class Q10783_TracesOfAnAmbush extends Quest }; // Items private static final int MISSIVE_SCRAPS = 39722; - private static final int ENCHANT_ARMOR_B = 948; // Messages private static final NpcStringId[] MESSAGES = { @@ -102,9 +101,8 @@ public final class Q10783_TracesOfAnAmbush extends Quest } case "33866-08.html": { - giveItems(player, ENCHANT_ARMOR_B, 5); giveStoryQuestReward(npc, player); - addExpAndSp(player, 5482574, 1315); + addExpAndSp(player, 12146608, 1315); qs.exitQuest(false, true); break; } @@ -154,7 +152,7 @@ public final class Q10783_TracesOfAnAmbush extends Quest if (getRandom(100) < DROP_RATE) { giveItems(killer, MISSIVE_SCRAPS, 1); - if (getQuestItemsCount(killer, MISSIVE_SCRAPS) >= 10) + if (getQuestItemsCount(killer, MISSIVE_SCRAPS) >= 50) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java index 07de10d4e8..41a72f11d4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10784_TheBrokenDevice/Q10784_TheBrokenDevice.java @@ -92,7 +92,7 @@ public final class Q10784_TheBrokenDevice extends Quest if (qs.isCond(2)) { giveStoryQuestReward(npc, player); - giveAdena(player, 990_000, true); + giveAdena(player, 990000, true); giveItems(player, SOULSHOT, 6000); giveItems(player, SPIRITSHOT, 6000); giveItems(player, BLESSED_SCROLL_OF_ESCAPE, 3); @@ -144,7 +144,7 @@ public final class Q10784_TheBrokenDevice extends Quest if ((qs != null) && qs.isCond(1)) { giveItems(killer, BROKE_MAGIC_DEVICE_FRAGMENT, 1); - if (getQuestItemsCount(killer, BROKE_MAGIC_DEVICE_FRAGMENT) >= 20) + if (getQuestItemsCount(killer, BROKE_MAGIC_DEVICE_FRAGMENT) >= 100) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java index 8985e0564b..d41a649c4d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10785_LettersFromTheQueenFieldsOfMassacre/Q10785_LettersFromTheQueenFieldsOfMassacre.java @@ -37,7 +37,6 @@ public final class Q10785_LettersFromTheQueenFieldsOfMassacre extends LetterQues // Items private static final int SOE_ADEN = 39578; private static final int SOE_FIELDS_OF_MASSACRE = 39579; - private static final int ENCHANT_WEAPON_A = 26350; // Location private static final Location TELEPORT_LOC = new Location(147446, 22761, -1984); // Misc @@ -88,7 +87,6 @@ public final class Q10785_LettersFromTheQueenFieldsOfMassacre extends LetterQues { if (qs.isCond(2)) { - giveItems(player, ENCHANT_WEAPON_A, 1); 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); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java index e189617ab8..fd38b9a6e0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java @@ -55,8 +55,6 @@ public final class Q10786_ResidentProblemSolver extends Quest 20975, // Spiteful Soul Wizard 20976, // Spiteful Soul Warrior }; - // Items - private static final int ENCHANT_ARMOR_A = 26351; // Misc private static final int MIN_LEVEL = 61; private static final int MAX_LEVEL = 65; @@ -99,11 +97,10 @@ public final class Q10786_ResidentProblemSolver extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_A, 5); giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 6251174, 1500); + addExpAndSp(player, 38226567, 1500); } qs.exitQuest(false, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java index 32b499f285..bb587579de 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10787_ASpyMission/Q10787_ASpyMission.java @@ -39,7 +39,6 @@ public final class Q10787_ASpyMission extends Quest // Monster private static final int EMBRYO_PURIFIER = 27540; // Items - private static final int ENCHANT_ARMOR_A = 26351; private static final int EMBRYO_MISSIVES = 39724; // Misc private static final int MIN_LEVEL = 61; @@ -103,11 +102,10 @@ public final class Q10787_ASpyMission extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_A, 5); giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 3125586, 750); + addExpAndSp(player, 17234475, 750); } qs.exitQuest(false, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java index 14fb94e577..fe3262b88f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10789_LettersFromTheQueenSwampOfScreams/Q10789_LettersFromTheQueenSwampOfScreams.java @@ -37,7 +37,6 @@ public final class Q10789_LettersFromTheQueenSwampOfScreams extends LetterQuest // Items private static final int SOE_RUNE = 39580; private static final int SOE_SWAMP_OF_SCREAMS = 39581; - private static final int ENCHANT_WEAPON_A = 26350; // Location private static final Location TELEPORT_LOC = new Location(36563, -49178, -1128); // Misc @@ -88,7 +87,6 @@ public final class Q10789_LettersFromTheQueenSwampOfScreams extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_WEAPON_A, 2); 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); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java index 74813b3df8..5e75883721 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java @@ -56,8 +56,6 @@ public class Q10790_AMercenaryHelper extends Quest 21518, // Frenzied Stakato Soldier 21519 // Frenzied Stakato Drone }; - // Items - private static final int EAA = 730; // Misc private static final int MIN_LEVEL = 65; private static final int MAX_LEVEL = 70; @@ -102,8 +100,7 @@ public class Q10790_AMercenaryHelper extends Quest { qs.exitQuest(false, true); giveStoryQuestReward(npc, player); - giveItems(player, EAA, 3); - addExpAndSp(player, 942650, 226); + addExpAndSp(player, 134158421, 226); htmltext = "33847-07.html"; } } @@ -146,7 +143,7 @@ public class Q10790_AMercenaryHelper extends Quest { int count = qs.getInt(KILL_COUNT_VAR); qs.set(KILL_COUNT_VAR, ++count); - if (count >= 50) + if (count >= 300) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java index 79ff1a1679..baf33fe38b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java @@ -45,8 +45,6 @@ public class Q10791_TheManOfMystery extends Quest private static final int SUSPICIOUS_COCOON2 = 27538; private static final int NEEDLE_STAKATO_CAPTAIN = 27542; private static final int NEEDLE_STAKATO = 27543; - // Items - private static final int EAA = 730; // Misc private static final int MIN_LEVEL = 65; private static final int MAX_LEVEL = 70; @@ -99,9 +97,8 @@ public class Q10791_TheManOfMystery extends Quest { if (qs.isCond(3)) { - addExpAndSp(player, 16968420, 4072); + addExpAndSp(player, 46334481, 4072); giveStoryQuestReward(npc, player); - giveItems(player, EAA, 2); qs.exitQuest(false, true); htmltext = "33847-07.html"; break; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java index 38eb7b3015..b5cecf9e6b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10792_LettersFromTheQueenForestOfTheDead/Q10792_LettersFromTheQueenForestOfTheDead.java @@ -37,7 +37,6 @@ public final class Q10792_LettersFromTheQueenForestOfTheDead extends LetterQuest // Items private static final int SOE_RUNE = 39582; private static final int SOE_FOREST_OF_DEAD = 39583; - private static final int ENCHANT_WEAPON_A = 26350; // Location private static final Location TELEPORT_LOC = new Location(36563, -49178, -1128); // Misc @@ -86,7 +85,6 @@ public final class Q10792_LettersFromTheQueenForestOfTheDead extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_WEAPON_A, 2); 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); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java index b7753d4e9f..3d31dc6dcc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java @@ -52,8 +52,6 @@ public final class Q10793_SaveTheSouls extends Quest 21560, // Bone Shaper 21561, // Sacrificed Man }; - // Items - private static final int ENCHANT_ARMOR_A = 26351; // Misc private static final int MIN_LEVEL = 65; private static final int MAX_LEVEL = 70; @@ -97,11 +95,10 @@ public final class Q10793_SaveTheSouls extends Quest { if (qs.isCond(2)) { - giveItems(player, ENCHANT_ARMOR_A, 3); giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 942690, 226); + addExpAndSp(player, 86636593, 226); } qs.exitQuest(false, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java index 7a7a4b7e33..2aeebe3b12 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java @@ -78,7 +78,6 @@ public final class Q10794_InvestigateTheForest extends Quest private static final int MAX_LEVEL = 70; private static final String KILL_COUNT_VAR = "KillCount"; // Items - private static final int ENCHANT_ARMOR_A = 730; private static final int OLD_JEWELRY_BOX = 39725; public Q10794_InvestigateTheForest() @@ -131,11 +130,10 @@ public final class Q10794_InvestigateTheForest extends Quest if (qs.isCond(4)) { takeItems(player, OLD_JEWELRY_BOX, -1); - giveItems(player, ENCHANT_ARMOR_A, 5); giveStoryQuestReward(npc, player); if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 16968420, 4072); + addExpAndSp(player, 93856309, 4072); } htmltext = event; qs.exitQuest(false, true); @@ -171,7 +169,7 @@ public final class Q10794_InvestigateTheForest extends Quest case TOMBSTONE: { final int count = qs.getInt(KILL_COUNT_VAR); - if ((count >= 50) && (getQuestItemsCount(player, OLD_JEWELRY_BOX) < 1)) + if ((count >= 100) && (getQuestItemsCount(player, OLD_JEWELRY_BOX) < 1)) { htmltext = "31531-01.html"; } @@ -197,7 +195,7 @@ public final class Q10794_InvestigateTheForest extends Quest { final int count = qs.getInt(KILL_COUNT_VAR) + 1; qs.set(KILL_COUNT_VAR, count); - if (count >= 50) + if (count >= 100) { qs.setCond(1, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java index 357c28967d..e0ef24c7ff 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10795_LettersFromTheQueenWallOfAgros/Q10795_LettersFromTheQueenWallOfAgros.java @@ -22,7 +22,6 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest // Items private static final int SOE_WAAL_OF_ARGOS = 39585; private static final int SOE_GODDARD = 39584; - private static final int EAA = 730; // Misc private static final int MIN_LEVEL = 70; private static final int MAX_LEVEL = 75; @@ -73,7 +72,6 @@ public class Q10795_LettersFromTheQueenWallOfAgros extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, EAA, 5); 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); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index 447b5ba2c6..5a22e69d54 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -50,8 +50,6 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest 21299, // Valley Buffalo Slave 21304 // Valley Grendel Slave }; - // Items - private static final int EAA = 730; // Misc private static final int MIN_LEVEL = 70; private static final int MAX_LEVEL = 75; @@ -95,9 +93,8 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 1088640, 261); + addExpAndSp(player, 178732196, 261); giveStoryQuestReward(npc, player); - giveItems(player, EAA, 2); qs.exitQuest(false, true); htmltext = event; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java index b3734b8122..21c4d4ea6a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java @@ -97,7 +97,7 @@ public class Q10797_CrossingFate extends Quest { if (player.getLevel() >= MIN_LEVEL) { - addExpAndSp(player, 306_167_814, 653); + addExpAndSp(player, 306167814, 653); giveStoryQuestReward(npc, player); qs.exitQuest(QuestType.ONE_TIME, true); htmltext = event; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java index 89e481deff..7198005fe9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10798_LettersFromTheQueenDragonValley/Q10798_LettersFromTheQueenDragonValley.java @@ -38,7 +38,6 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest // Items private static final int SOE_DRAGON_VALLEY = 39587; private static final int SOE_TOWN_OF_GIRAN = 39586; - private static final int EWS = 959; // Misc private static final int MIN_LEVEL = 81; private static final int MAX_LEVEL = 84; @@ -88,7 +87,6 @@ public class Q10798_LettersFromTheQueenDragonValley extends LetterQuest { if (qs.isCond(2)) { - giveItems(player, EWS, 2); giveStoryQuestReward(npc, player); addExpAndSp(player, 1277640, 306); showOnScreenMsg(player, NpcStringId.YOU_HAVE_COMPLETED_QUEEN_NAVARI_S_LETTER, ExShowScreenMessage.TOP_CENTER, 8000); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java index a6685c2070..63f1395fb4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java @@ -53,8 +53,6 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest 23439, // Iron Cave Servant 23440, // Headless Knight }; - // Items - private static final int EAS = 960; // Misc private static final int MIN_LEVEL = 76; private static final int MAX_LEVEL = 85; @@ -101,9 +99,8 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest final int itemId = Integer.parseInt(event.replace("giveReward_", "")); qs.exitQuest(false, true); giveStoryQuestReward(npc, player); - giveItems(player, EAS, 10); giveItems(player, itemId, 30); - addExpAndSp(player, 76658400, 18398); + addExpAndSp(player, 543080087, 23435); htmltext = "33973-08.html"; } } @@ -146,7 +143,7 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest { int count = qs.getInt(KILL_COUNT_VAR); qs.set(KILL_COUNT_VAR, ++count); - if (count >= 100) + if (count >= 200) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java index fab382ab35..ba5e58f734 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java @@ -52,8 +52,6 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest 23443, // Dark Grave Wizard 23444, // Dark Grave Knight }; - // Item - private static final int EAS = 960; // Misc private static final int MIN_LEVEL = 76; private static final int MAX_LEVEL = 85; @@ -102,9 +100,8 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest final int itemId = Integer.parseInt(event.replace("giveReward_", "")); qs.exitQuest(false, true); giveStoryQuestReward(npc, player); - giveItems(player, EAS, 10); giveItems(player, itemId, 30); - addExpAndSp(player, 84722400, 20333); + addExpAndSp(player, 543080087, 30466); htmltext = "33973-08.html"; } break; @@ -148,7 +145,7 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest { int count = qs.getInt(KILL_COUNT_VAR); qs.set(KILL_COUNT_VAR, ++count); - if (count >= 100) + if (count >= 200) { qs.setCond(2, true); }