From 8227a23ad789b149c1e4fd4cc95cc344684c146f Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 3 Jan 2019 19:52:29 +0000 Subject: [PATCH] Quest reward changes according to Grand Crusade client. Contributed by champzix1. --- .../Q10320_LetsGoToTheCentralSquare.java | 2 +- .../Q10543_SheddingWeight/Q10543_SheddingWeight.java | 8 ++++++++ .../quests/Q10732_AForeignLand/Q10732_AForeignLand.java | 1 - .../Q10733_TheTestForSurvival.java | 1 - .../scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java | 1 - .../quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java | 1 - .../Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java | 1 - .../quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java | 1 - .../Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java | 3 +-- .../quests/Q10740_NeverForget/Q10740_NeverForget.java | 3 +-- .../Q10741_ADraughtForTheCold.java | 1 - .../quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java | 3 +-- .../quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java | 3 +-- .../Q10744_StrongerThanSteel.java | 3 +-- .../Q10745_TheSecretIngredients.java | 1 - .../quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java | 2 +- .../Q10320_LetsGoToTheCentralSquare.java | 2 +- .../Q10543_SheddingWeight/Q10543_SheddingWeight.java | 8 ++++++++ .../quests/Q10732_AForeignLand/Q10732_AForeignLand.java | 1 - .../Q10733_TheTestForSurvival.java | 1 - .../scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java | 1 - .../quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java | 1 - .../Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java | 1 - .../quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java | 1 - .../Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java | 3 +-- .../quests/Q10740_NeverForget/Q10740_NeverForget.java | 3 +-- .../Q10741_ADraughtForTheCold.java | 1 - .../quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java | 3 +-- .../quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java | 3 +-- .../Q10744_StrongerThanSteel.java | 3 +-- .../Q10745_TheSecretIngredients.java | 1 - .../quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java | 2 +- .../Q10320_LetsGoToTheCentralSquare.java | 2 +- .../Q10543_SheddingWeight/Q10543_SheddingWeight.java | 8 ++++++++ .../quests/Q10732_AForeignLand/Q10732_AForeignLand.java | 1 - .../Q10733_TheTestForSurvival.java | 1 - .../scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java | 1 - .../quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java | 1 - .../Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java | 1 - .../quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java | 1 - .../Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java | 3 +-- .../quests/Q10740_NeverForget/Q10740_NeverForget.java | 3 +-- .../Q10741_ADraughtForTheCold.java | 1 - .../quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java | 3 +-- .../quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java | 3 +-- .../Q10744_StrongerThanSteel.java | 3 +-- .../Q10745_TheSecretIngredients.java | 1 - .../quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java | 2 +- 48 files changed, 45 insertions(+), 60 deletions(-) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java index 7c95607e4d..f36d166ac2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java @@ -87,7 +87,7 @@ public final class Q10320_LetsGoToTheCentralSquare extends Quest { if (qs.isStarted()) { - addExpAndSp(player, 300, 6); + addExpAndSp(player, 70, 5); qs.exitQuest(false, true); htmltext = event; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java index 2375aa17aa..49c92bee72 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java @@ -40,7 +40,11 @@ public final class Q10543_SheddingWeight extends Quest private static final int WILFORD = 30005; // Items // private static final int NOVICE_TRAINING_LOG = 1835; // TODO Find item ID + private static final int APPRENTICE_ADVENTURERS_STAFF = 7816; + private static final int APPRENTICE_ADVENTURERS_BONE_CLUB = 7817; private static final int APPRENTICE_ADVENTURERS_KNIFE = 7818; + private static final int APPRENTICE_ADVENTURERS_CESTUS = 7819; + private static final int APPRENTICE_ADVENTURERS_BOW = 7820; private static final int APPRENTICE_ADVENTURERS_LONG_SWORD = 7821; // Misc private static final int MAX_LEVEL = 20; @@ -85,7 +89,11 @@ public final class Q10543_SheddingWeight extends Quest } case "30005-03.html": { + giveItems(player, APPRENTICE_ADVENTURERS_STAFF, 1); + giveItems(player, APPRENTICE_ADVENTURERS_BONE_CLUB, 1); giveItems(player, APPRENTICE_ADVENTURERS_KNIFE, 1); + giveItems(player, APPRENTICE_ADVENTURERS_CESTUS, 1); + giveItems(player, APPRENTICE_ADVENTURERS_BOW, 1); giveItems(player, APPRENTICE_ADVENTURERS_LONG_SWORD, 1); player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_007_post_01.htm", TutorialShowHtml.LARGE_WINDOW)); showOnScreenMsg(player, NpcStringId.WEAPONS_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java index 60f9d99520..827152196b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java @@ -74,7 +74,6 @@ public final class Q10732_AForeignLand extends Quest if (qs.isStarted()) { player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_001_Radar_01.htm", TutorialShowHtml.LARGE_WINDOW)); - giveAdena(player, 3000, true); addExpAndSp(player, 75, 2); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java index d6a59e2bd2..994f907c27 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java @@ -94,7 +94,6 @@ public final class Q10733_TheTestForSurvival extends Quest { if ((qs.isCond(2) || qs.isCond(3)) && hasQuestItems(player, GERETH_RECOMMENDATION)) { - giveAdena(player, 5000, true); addExpAndSp(player, 295, 2); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java index f520544a72..97779a167c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java @@ -214,7 +214,6 @@ public final class Q10734_DoOrDie extends Quest } case 7: { - giveAdena(player, 7000, true); addExpAndSp(player, 805, 2); qs.exitQuest(false, true); htmltext = "33942-07.html"; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java index 4950de922f..daf4e60f36 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java @@ -107,7 +107,6 @@ public final class Q10736_ASpecialPower extends Quest } case 7: { - giveAdena(player, 900, true); rewardItems(player, SOULSHOTS_REWARD); addExpAndSp(player, 3154, 0); qs.exitQuest(false, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java index 1cbe1fb0ec..68d56d1b8f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java @@ -91,7 +91,6 @@ public final class Q10737_GrakonsWarehouse extends Quest { player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2text\\QT_007_post_01.htm", TutorialShowHtml.LARGE_WINDOW)); showOnScreenMsg(player, NpcStringId.WEAPONS_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); - giveAdena(player, 11000, true); if (player.isMageClass()) { giveItems(player, APPRENTICE_ADVENTURER_STAFF); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java index ecf9398627..a136827a27 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java @@ -81,7 +81,6 @@ public final class Q10738_AnInnerBeauty extends Quest { if (qs.isStarted()) { - giveAdena(player, 12000, true); addExpAndSp(player, 2625, 1); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java index 6c165b3ead..11bffac1fc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java @@ -45,7 +45,7 @@ public final class Q10739_SupplyAndDemand extends Quest private static final ItemHolder ARMOR_SUPPLY_BOX = new ItemHolder(39523, 1); private static final ItemHolder GROCERY_SUPPLY_BOX = new ItemHolder(39524, 1); private static final ItemHolder ACCESSORY_SUPPLY_BOX = new ItemHolder(39525, 1); - private static final ItemHolder LEATHER_SHIRT = new ItemHolder(21, 1); + private static final ItemHolder LEATHER_SHIRT = new ItemHolder(22, 1); private static final ItemHolder LEATHER_PANTS = new ItemHolder(29, 1); private static final ItemHolder APPRENTICE_EARRING = new ItemHolder(112, 2); private static final ItemHolder NECKLACE_OF_KNOWNLEDGE = new ItemHolder(906, 1); @@ -206,7 +206,6 @@ public final class Q10739_SupplyAndDemand extends Quest giveItems(player, LEATHER_PANTS); giveItems(player, APPRENTICE_EARRING); giveItems(player, NECKLACE_OF_KNOWNLEDGE); - giveAdena(player, 1400, true); addExpAndSp(player, 8136, 0); showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java index b67cf8548e..331dd7e17c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java @@ -142,10 +142,9 @@ public final class Q10740_NeverForget extends Quest case 3: { showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); - giveAdena(player, 1600, true); giveItems(player, RING_OF_KNOWLEDGE); giveItems(player, HEALING_POTION); - addExpAndSp(player, 16851, 0); + addExpAndSp(player, 24001, 0); qs.exitQuest(false, true); htmltext = "33951-06.html"; break; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java index 09ad5efb15..f5cf061204 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java @@ -83,7 +83,6 @@ public final class Q10741_ADraughtForTheCold extends Quest { if (qs.isCond(2)) { - giveAdena(player, 2000, true); addExpAndSp(player, 22973, 2); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java index 083aba3e40..052688a9f1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java @@ -200,8 +200,7 @@ public final class Q10742_AFurryFriend extends Quest } else if (qs.isCond(2)) { - giveAdena(player, 2500, true); - addExpAndSp(player, 52516, 5); + addExpAndSp(player, 68007, 5); qs.exitQuest(false, true); htmltext = "33952-04.html"; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index 0c33b4c672..926b41794b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -90,8 +90,7 @@ public final class Q10743_StrangeFungus extends Quest { if (qs.isCond(2)) { - giveAdena(player, 62000, true); - addExpAndSp(player, 62876, 0); + addExpAndSp(player, 93982, 0); giveItems(player, LEATHER_SHOES); showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java index 03679c1aeb..714a19cd8b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java @@ -130,8 +130,7 @@ public final class Q10744_StrongerThanSteel extends Quest } else if (qs.isCond(3)) { - giveAdena(player, 34000, true); - addExpAndSp(player, 112001, 5); + addExpAndSp(player, 153994, 5); qs.exitQuest(false, true); htmltext = "33954-05.html"; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java index 9bfbf0792c..9a7c657030 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java @@ -91,7 +91,6 @@ public final class Q10745_TheSecretIngredients extends Quest { if (qs.isCond(3)) { - giveAdena(player, 48000, true); addExpAndSp(player, 241076, 5); if (player.isMageClass()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java index 85e53c8f48..de187d6be1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java @@ -148,7 +148,7 @@ public final class Q10746_SeeTheWorld extends Quest giveItems(player, SCROLL_OF_ESCAPE, 10); giveItems(player, PAULINA_EQUIPMENT_SET, 1); giveAdena(player, 147600, true); - addExpAndSp(player, 53422, 5); + addExpAndSp(player, 161998, 5); showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); qs.exitQuest(false, true); htmltext = "30037-01.html"; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java index 7c95607e4d..f36d166ac2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java @@ -87,7 +87,7 @@ public final class Q10320_LetsGoToTheCentralSquare extends Quest { if (qs.isStarted()) { - addExpAndSp(player, 300, 6); + addExpAndSp(player, 70, 5); qs.exitQuest(false, true); htmltext = event; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java index 2375aa17aa..49c92bee72 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java @@ -40,7 +40,11 @@ public final class Q10543_SheddingWeight extends Quest private static final int WILFORD = 30005; // Items // private static final int NOVICE_TRAINING_LOG = 1835; // TODO Find item ID + private static final int APPRENTICE_ADVENTURERS_STAFF = 7816; + private static final int APPRENTICE_ADVENTURERS_BONE_CLUB = 7817; private static final int APPRENTICE_ADVENTURERS_KNIFE = 7818; + private static final int APPRENTICE_ADVENTURERS_CESTUS = 7819; + private static final int APPRENTICE_ADVENTURERS_BOW = 7820; private static final int APPRENTICE_ADVENTURERS_LONG_SWORD = 7821; // Misc private static final int MAX_LEVEL = 20; @@ -85,7 +89,11 @@ public final class Q10543_SheddingWeight extends Quest } case "30005-03.html": { + giveItems(player, APPRENTICE_ADVENTURERS_STAFF, 1); + giveItems(player, APPRENTICE_ADVENTURERS_BONE_CLUB, 1); giveItems(player, APPRENTICE_ADVENTURERS_KNIFE, 1); + giveItems(player, APPRENTICE_ADVENTURERS_CESTUS, 1); + giveItems(player, APPRENTICE_ADVENTURERS_BOW, 1); giveItems(player, APPRENTICE_ADVENTURERS_LONG_SWORD, 1); player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_007_post_01.htm", TutorialShowHtml.LARGE_WINDOW)); showOnScreenMsg(player, NpcStringId.WEAPONS_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java index 60f9d99520..827152196b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java @@ -74,7 +74,6 @@ public final class Q10732_AForeignLand extends Quest if (qs.isStarted()) { player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_001_Radar_01.htm", TutorialShowHtml.LARGE_WINDOW)); - giveAdena(player, 3000, true); addExpAndSp(player, 75, 2); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java index d6a59e2bd2..994f907c27 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java @@ -94,7 +94,6 @@ public final class Q10733_TheTestForSurvival extends Quest { if ((qs.isCond(2) || qs.isCond(3)) && hasQuestItems(player, GERETH_RECOMMENDATION)) { - giveAdena(player, 5000, true); addExpAndSp(player, 295, 2); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java index f520544a72..97779a167c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java @@ -214,7 +214,6 @@ public final class Q10734_DoOrDie extends Quest } case 7: { - giveAdena(player, 7000, true); addExpAndSp(player, 805, 2); qs.exitQuest(false, true); htmltext = "33942-07.html"; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java index 4950de922f..daf4e60f36 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java @@ -107,7 +107,6 @@ public final class Q10736_ASpecialPower extends Quest } case 7: { - giveAdena(player, 900, true); rewardItems(player, SOULSHOTS_REWARD); addExpAndSp(player, 3154, 0); qs.exitQuest(false, true); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java index 1cbe1fb0ec..68d56d1b8f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java @@ -91,7 +91,6 @@ public final class Q10737_GrakonsWarehouse extends Quest { player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2text\\QT_007_post_01.htm", TutorialShowHtml.LARGE_WINDOW)); showOnScreenMsg(player, NpcStringId.WEAPONS_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); - giveAdena(player, 11000, true); if (player.isMageClass()) { giveItems(player, APPRENTICE_ADVENTURER_STAFF); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java index ecf9398627..a136827a27 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java @@ -81,7 +81,6 @@ public final class Q10738_AnInnerBeauty extends Quest { if (qs.isStarted()) { - giveAdena(player, 12000, true); addExpAndSp(player, 2625, 1); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java index 6c165b3ead..11bffac1fc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java @@ -45,7 +45,7 @@ public final class Q10739_SupplyAndDemand extends Quest private static final ItemHolder ARMOR_SUPPLY_BOX = new ItemHolder(39523, 1); private static final ItemHolder GROCERY_SUPPLY_BOX = new ItemHolder(39524, 1); private static final ItemHolder ACCESSORY_SUPPLY_BOX = new ItemHolder(39525, 1); - private static final ItemHolder LEATHER_SHIRT = new ItemHolder(21, 1); + private static final ItemHolder LEATHER_SHIRT = new ItemHolder(22, 1); private static final ItemHolder LEATHER_PANTS = new ItemHolder(29, 1); private static final ItemHolder APPRENTICE_EARRING = new ItemHolder(112, 2); private static final ItemHolder NECKLACE_OF_KNOWNLEDGE = new ItemHolder(906, 1); @@ -206,7 +206,6 @@ public final class Q10739_SupplyAndDemand extends Quest giveItems(player, LEATHER_PANTS); giveItems(player, APPRENTICE_EARRING); giveItems(player, NECKLACE_OF_KNOWNLEDGE); - giveAdena(player, 1400, true); addExpAndSp(player, 8136, 0); showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java index b67cf8548e..331dd7e17c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java @@ -142,10 +142,9 @@ public final class Q10740_NeverForget extends Quest case 3: { showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); - giveAdena(player, 1600, true); giveItems(player, RING_OF_KNOWLEDGE); giveItems(player, HEALING_POTION); - addExpAndSp(player, 16851, 0); + addExpAndSp(player, 24001, 0); qs.exitQuest(false, true); htmltext = "33951-06.html"; break; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java index 09ad5efb15..f5cf061204 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java @@ -83,7 +83,6 @@ public final class Q10741_ADraughtForTheCold extends Quest { if (qs.isCond(2)) { - giveAdena(player, 2000, true); addExpAndSp(player, 22973, 2); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java index 083aba3e40..052688a9f1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java @@ -200,8 +200,7 @@ public final class Q10742_AFurryFriend extends Quest } else if (qs.isCond(2)) { - giveAdena(player, 2500, true); - addExpAndSp(player, 52516, 5); + addExpAndSp(player, 68007, 5); qs.exitQuest(false, true); htmltext = "33952-04.html"; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index 0c33b4c672..926b41794b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -90,8 +90,7 @@ public final class Q10743_StrangeFungus extends Quest { if (qs.isCond(2)) { - giveAdena(player, 62000, true); - addExpAndSp(player, 62876, 0); + addExpAndSp(player, 93982, 0); giveItems(player, LEATHER_SHOES); showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java index 03679c1aeb..714a19cd8b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java @@ -130,8 +130,7 @@ public final class Q10744_StrongerThanSteel extends Quest } else if (qs.isCond(3)) { - giveAdena(player, 34000, true); - addExpAndSp(player, 112001, 5); + addExpAndSp(player, 153994, 5); qs.exitQuest(false, true); htmltext = "33954-05.html"; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java index 9bfbf0792c..9a7c657030 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java @@ -91,7 +91,6 @@ public final class Q10745_TheSecretIngredients extends Quest { if (qs.isCond(3)) { - giveAdena(player, 48000, true); addExpAndSp(player, 241076, 5); if (player.isMageClass()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java index 85e53c8f48..de187d6be1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java @@ -148,7 +148,7 @@ public final class Q10746_SeeTheWorld extends Quest giveItems(player, SCROLL_OF_ESCAPE, 10); giveItems(player, PAULINA_EQUIPMENT_SET, 1); giveAdena(player, 147600, true); - addExpAndSp(player, 53422, 5); + addExpAndSp(player, 161998, 5); showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); qs.exitQuest(false, true); htmltext = "30037-01.html"; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java index 7c95607e4d..f36d166ac2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java @@ -87,7 +87,7 @@ public final class Q10320_LetsGoToTheCentralSquare extends Quest { if (qs.isStarted()) { - addExpAndSp(player, 300, 6); + addExpAndSp(player, 70, 5); qs.exitQuest(false, true); htmltext = event; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java index 2375aa17aa..49c92bee72 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java @@ -40,7 +40,11 @@ public final class Q10543_SheddingWeight extends Quest private static final int WILFORD = 30005; // Items // private static final int NOVICE_TRAINING_LOG = 1835; // TODO Find item ID + private static final int APPRENTICE_ADVENTURERS_STAFF = 7816; + private static final int APPRENTICE_ADVENTURERS_BONE_CLUB = 7817; private static final int APPRENTICE_ADVENTURERS_KNIFE = 7818; + private static final int APPRENTICE_ADVENTURERS_CESTUS = 7819; + private static final int APPRENTICE_ADVENTURERS_BOW = 7820; private static final int APPRENTICE_ADVENTURERS_LONG_SWORD = 7821; // Misc private static final int MAX_LEVEL = 20; @@ -85,7 +89,11 @@ public final class Q10543_SheddingWeight extends Quest } case "30005-03.html": { + giveItems(player, APPRENTICE_ADVENTURERS_STAFF, 1); + giveItems(player, APPRENTICE_ADVENTURERS_BONE_CLUB, 1); giveItems(player, APPRENTICE_ADVENTURERS_KNIFE, 1); + giveItems(player, APPRENTICE_ADVENTURERS_CESTUS, 1); + giveItems(player, APPRENTICE_ADVENTURERS_BOW, 1); giveItems(player, APPRENTICE_ADVENTURERS_LONG_SWORD, 1); player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_007_post_01.htm", TutorialShowHtml.LARGE_WINDOW)); showOnScreenMsg(player, NpcStringId.WEAPONS_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java index 60f9d99520..827152196b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java @@ -74,7 +74,6 @@ public final class Q10732_AForeignLand extends Quest if (qs.isStarted()) { player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_001_Radar_01.htm", TutorialShowHtml.LARGE_WINDOW)); - giveAdena(player, 3000, true); addExpAndSp(player, 75, 2); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java index d6a59e2bd2..994f907c27 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10733_TheTestForSurvival/Q10733_TheTestForSurvival.java @@ -94,7 +94,6 @@ public final class Q10733_TheTestForSurvival extends Quest { if ((qs.isCond(2) || qs.isCond(3)) && hasQuestItems(player, GERETH_RECOMMENDATION)) { - giveAdena(player, 5000, true); addExpAndSp(player, 295, 2); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java index f520544a72..97779a167c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java @@ -214,7 +214,6 @@ public final class Q10734_DoOrDie extends Quest } case 7: { - giveAdena(player, 7000, true); addExpAndSp(player, 805, 2); qs.exitQuest(false, true); htmltext = "33942-07.html"; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java index 4950de922f..daf4e60f36 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java @@ -107,7 +107,6 @@ public final class Q10736_ASpecialPower extends Quest } case 7: { - giveAdena(player, 900, true); rewardItems(player, SOULSHOTS_REWARD); addExpAndSp(player, 3154, 0); qs.exitQuest(false, true); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java index 1cbe1fb0ec..68d56d1b8f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java @@ -91,7 +91,6 @@ public final class Q10737_GrakonsWarehouse extends Quest { player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2text\\QT_007_post_01.htm", TutorialShowHtml.LARGE_WINDOW)); showOnScreenMsg(player, NpcStringId.WEAPONS_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); - giveAdena(player, 11000, true); if (player.isMageClass()) { giveItems(player, APPRENTICE_ADVENTURER_STAFF); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java index ecf9398627..a136827a27 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10738_AnInnerBeauty/Q10738_AnInnerBeauty.java @@ -81,7 +81,6 @@ public final class Q10738_AnInnerBeauty extends Quest { if (qs.isStarted()) { - giveAdena(player, 12000, true); addExpAndSp(player, 2625, 1); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java index 6c165b3ead..11bffac1fc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10739_SupplyAndDemand/Q10739_SupplyAndDemand.java @@ -45,7 +45,7 @@ public final class Q10739_SupplyAndDemand extends Quest private static final ItemHolder ARMOR_SUPPLY_BOX = new ItemHolder(39523, 1); private static final ItemHolder GROCERY_SUPPLY_BOX = new ItemHolder(39524, 1); private static final ItemHolder ACCESSORY_SUPPLY_BOX = new ItemHolder(39525, 1); - private static final ItemHolder LEATHER_SHIRT = new ItemHolder(21, 1); + private static final ItemHolder LEATHER_SHIRT = new ItemHolder(22, 1); private static final ItemHolder LEATHER_PANTS = new ItemHolder(29, 1); private static final ItemHolder APPRENTICE_EARRING = new ItemHolder(112, 2); private static final ItemHolder NECKLACE_OF_KNOWNLEDGE = new ItemHolder(906, 1); @@ -206,7 +206,6 @@ public final class Q10739_SupplyAndDemand extends Quest giveItems(player, LEATHER_PANTS); giveItems(player, APPRENTICE_EARRING); giveItems(player, NECKLACE_OF_KNOWNLEDGE); - giveAdena(player, 1400, true); addExpAndSp(player, 8136, 0); showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java index b67cf8548e..331dd7e17c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java @@ -142,10 +142,9 @@ public final class Q10740_NeverForget extends Quest case 3: { showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); - giveAdena(player, 1600, true); giveItems(player, RING_OF_KNOWLEDGE); giveItems(player, HEALING_POTION); - addExpAndSp(player, 16851, 0); + addExpAndSp(player, 24001, 0); qs.exitQuest(false, true); htmltext = "33951-06.html"; break; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java index 09ad5efb15..f5cf061204 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java @@ -83,7 +83,6 @@ public final class Q10741_ADraughtForTheCold extends Quest { if (qs.isCond(2)) { - giveAdena(player, 2000, true); addExpAndSp(player, 22973, 2); qs.exitQuest(false, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java index 083aba3e40..052688a9f1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java @@ -200,8 +200,7 @@ public final class Q10742_AFurryFriend extends Quest } else if (qs.isCond(2)) { - giveAdena(player, 2500, true); - addExpAndSp(player, 52516, 5); + addExpAndSp(player, 68007, 5); qs.exitQuest(false, true); htmltext = "33952-04.html"; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index 0c33b4c672..926b41794b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -90,8 +90,7 @@ public final class Q10743_StrangeFungus extends Quest { if (qs.isCond(2)) { - giveAdena(player, 62000, true); - addExpAndSp(player, 62876, 0); + addExpAndSp(player, 93982, 0); giveItems(player, LEATHER_SHOES); showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); qs.exitQuest(false, true); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java index 03679c1aeb..714a19cd8b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java @@ -130,8 +130,7 @@ public final class Q10744_StrongerThanSteel extends Quest } else if (qs.isCond(3)) { - giveAdena(player, 34000, true); - addExpAndSp(player, 112001, 5); + addExpAndSp(player, 153994, 5); qs.exitQuest(false, true); htmltext = "33954-05.html"; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java index 9bfbf0792c..9a7c657030 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java @@ -91,7 +91,6 @@ public final class Q10745_TheSecretIngredients extends Quest { if (qs.isCond(3)) { - giveAdena(player, 48000, true); addExpAndSp(player, 241076, 5); if (player.isMageClass()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java index 85e53c8f48..de187d6be1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java @@ -148,7 +148,7 @@ public final class Q10746_SeeTheWorld extends Quest giveItems(player, SCROLL_OF_ESCAPE, 10); giveItems(player, PAULINA_EQUIPMENT_SET, 1); giveAdena(player, 147600, true); - addExpAndSp(player, 53422, 5); + addExpAndSp(player, 161998, 5); showOnScreenMsg(player, NpcStringId.CHECK_YOUR_EQUIPMENT_IN_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000); qs.exitQuest(false, true); htmltext = "30037-01.html";