From 71a59d889bf2b2fdb7ee5df8935c3c3d5b7c5d0c Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 6 Mar 2018 08:31:59 +0000 Subject: [PATCH] Quest reward related changes. Contributed by quangnguyen. --- .../Q00001_LettersOfLove.java | 2 +- .../Q00002_WhatWomenWant.java | 2 +- .../Q00003_WillTheSealBeBroken.java | 3 +- .../Q00004_LongLiveThePaagrioLord.java | 7 +- .../Q00005_MinersFavor.java | 4 +- .../Q00101_SwordOfSolidarity.java | 19 +- .../Q00102_SeaOfSporesFever.java | 23 +- .../Q00103_SpiritOfCraftsman.java | 20 +- .../Q00104_SpiritOfMirrors.java | 19 +- .../Q00105_SkirmishWithOrcs.java | 13 +- .../Q00106_ForgottenTruth.java | 5 +- .../Q00107_MercilessPunishment.java | 18 +- .../Q00108_JumbleTumbleDiamondFuss.java | 18 +- .../Q00151_CureForFever.java | 3 +- .../Q00152_ShardsOfGolem.java | 3 +- .../Q00153_DeliverGoods.java | 8 +- .../Q00154_SacrificeToTheSea.java | 3 +- .../Q00155_FindSirWindawood.java | 4 +- .../Q00157_RecoverSmuggledGoods.java | 2 +- .../Q00158_SeedOfEvil/Q00158_SeedOfEvil.java | 8 +- .../Q00159_ProtectTheWaterSource.java | 6 +- .../Q00160_NerupasRequest.java | 3 +- .../Q00161_FruitOfTheMotherTree.java | 3 +- .../Q00162_CurseOfTheUndergroundFortress.java | 4 +- .../Q00163_LegacyOfThePoet.java | 5 +- .../Q00164_BloodFiend/Q00164_BloodFiend.java | 3 +- .../Q00165_ShilensHunt.java | 3 +- .../Q00166_MassOfDarkness.java | 3 +- .../Q00167_DwarvenKinship.java | 6 +- .../Q00168_DeliverSupplies.java | 2 +- .../Q00169_OffspringOfNightmares.java | 3 +- .../Q00170_DangerousSeduction.java | 8 +- .../Q00257_TheGuardIsBusy.java | 5 +- .../Q00258_BringWolfPelts.java | 8 +- .../Q00260_OrcHunting/Q00260_OrcHunting.java | 2 +- .../Q00261_CollectorsDream.java | 3 +- .../Q00262_TradeWithTheIvoryTower.java | 2 +- .../Q00263_OrcSubjugation.java | 2 +- .../Q00264_KeenClaws/Q00264_KeenClaws.java | 10 +- .../Q00265_BondsOfSlavery.java | 2 +- .../Q00266_PleasOfPixies.java | 8 +- .../Q00267_WrathOfVerdure.java | 9 +- .../Q00271_ProofOfValor.java | 13 +- .../Q00272_WrathOfAncestors.java | 2 +- .../Q00273_InvadersOfTheHolyLand.java | 2 +- .../Q00274_SkirmishWithTheWerewolves.java | 2 +- .../Q00275_DarkWingedSpies.java | 2 +- .../Q00291_RevengeOfTheRedbonnet.java | 9 +- .../Q00292_BrigandsSweep.java | 4 +- .../Q00293_TheHiddenVeins.java | 2 +- .../Q00294_CovertBusiness.java | 4 +- .../Q00295_DreamingOfTheSkies.java | 2 +- .../Q00296_TarantulasSpiderSilk.java | 2 +- .../Q00300_HuntingLetoLizardman.java | 2 +- .../Q00303_CollectArrowheads.java | 3 +- .../Q00306_CrystalOfFireAndIce.java | 2 +- .../Q00313_CollectSpores.java | 2 +- .../Q00316_DestroyPlagueCarriers.java | 2 +- .../Q00317_CatchTheWind.java | 2 +- .../Q00319_ScentOfDeath.java | 5 +- .../Q00320_BonesTellTheFuture.java | 2 +- .../Q00324_SweetestVenom.java | 2 +- .../Q00325_GrimCollector.java | 2 +- .../Q00326_VanquishRemnants.java | 2 +- .../Q00327_RecoverTheFarmland.java | 2 +- .../Q00328_SenseForBusiness.java | 8 +- .../Q00329_CuriosityOfADwarf.java | 2 +- .../Q00331_ArrowOfVengeance.java | 8 +- .../Q00333_HuntOfTheBlackLion.java | 10 +- .../Q00354_ConquestOfAlligatorIsland.java | 34 +- .../Q00355_FamilyHonor.java | 4 +- .../Q00356_DigUpTheSeaOfSpores.java | 16 +- .../Q00358_IllegitimateChildOfTheGoddess.java | 16 +- .../Q00360_PlunderTheirSupplies.java | 51 +- .../Q00369_CollectorOfJewels.java | 4 +- .../game/data/stats/items/06600-06699.xml | 14 +- .../game/data/stats/items/29000-29099.xml | 52 + .../game/data/stats/items/29500-29599.xml | 103 +- .../game/data/stats/items/29600-29699.xml | 189 ++- .../game/data/stats/items/29700-29799.xml | 188 +++ .../game/data/stats/items/29800-29899.xml | 68 ++ .../game/data/stats/items/29900-29999.xml | 27 +- .../game/data/stats/items/34900-34999.xml | 14 + .../game/data/stats/items/36000-36099.xml | 28 +- .../game/data/stats/items/37700-37799.xml | 14 + .../game/data/stats/items/49000-49099.xml | 76 +- .../game/data/stats/items/49400-49499.xml | 23 +- .../game/data/stats/items/49500-49599.xml | 87 +- .../game/data/stats/items/49600-49699.xml | 32 + .../game/data/stats/items/49700-49799.xml | 172 +++ .../game/data/stats/items/70000-70099.xml | 80 ++ .../game/data/stats/items/70100-70199.xml | 3 + .../game/data/stats/items/70200-70299.xml | 15 + .../game/data/stats/items/70300-70399.xml | 5 + .../game/data/stats/items/70400-70499.xml | 14 +- .../game/data/stats/items/70500-70599.xml | 2 +- .../game/data/stats/items/90000-90099.xml | 4 +- .../game/data/stats/items/90100-90199.xml | 68 +- .../dist/game/data/stats/npcs/20800-20899.xml | 3 + .../dist/game/data/stats/npcs/20900-20999.xml | 2 +- .../dist/game/data/stats/npcs/21000-21099.xml | 3 + .../dist/game/data/stats/npcs/21200-21299.xml | 2 +- .../dist/game/data/stats/npcs/24000-24099.xml | 2 +- .../dist/game/data/stats/npcs/25000-25099.xml | 90 +- .../dist/game/data/stats/npcs/29000-29099.xml | 481 ++++---- .../game/data/stats/skills/00200-00299.xml | 4 +- .../game/data/stats/skills/00300-00399.xml | 126 +- .../game/data/stats/skills/01300-01399.xml | 14 +- .../game/data/stats/skills/01600-01699.xml | 744 +++++++++++- .../game/data/stats/skills/01800-01899.xml | 9 +- .../game/data/stats/skills/02100-02199.xml | 4 +- .../game/data/stats/skills/03200-03299.xml | 786 ++++++------ .../game/data/stats/skills/03500-03599.xml | 245 +++- .../game/data/stats/skills/04000-04099.xml | 6 - .../game/data/stats/skills/04200-04299.xml | 6 - .../game/data/stats/skills/09400-09499.xml | 29 +- .../game/data/stats/skills/09500-09599.xml | 12 +- .../game/data/stats/skills/09600-09699.xml | 31 +- .../game/data/stats/skills/13100-13199.xml | 40 +- .../game/data/stats/skills/17100-17199.xml | 31 +- .../game/data/stats/skills/19000-19099.xml | 118 +- .../game/data/stats/skills/19100-19199.xml | 38 +- .../game/data/stats/skills/35000-35099.xml | 576 ++++++++- .../game/data/stats/skills/39000-39099.xml | 354 +++++- .../game/data/stats/skills/39100-39199.xml | 126 +- .../game/data/stats/skills/39200-39299.xml | 180 ++- .../game/data/stats/skills/55000-55099.xml | 1055 +++++++++++++++-- .../game/data/stats/skills/55100-55199.xml | 733 +++++++++++- .../game/data/stats/skills/55200-55299.xml | 140 ++- .../game/data/stats/skills/55300-55399.xml | 42 +- .../dist/game/data/xsd/skills.xsd | 64 +- .../gameserver/model/skills/AbnormalType.java | 1 + L2J_Mobius_Classic_2.0_Saviors/readme.txt | 1 - 133 files changed, 6156 insertions(+), 1729 deletions(-) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java index 61a8e5b52f..3784a52a76 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java @@ -37,7 +37,7 @@ public class Q00001_LettersOfLove extends Quest private static final int ROXXYS_KERCHIEF = 688; private static final int DARINS_RECEIPT = 1079; private static final int BAULROS_POTION = 1080; - private static final int NECKLACE_OF_KNOWLEDGE = 29471; + private static final int NECKLACE_OF_KNOWLEDGE = 49039; // Misc private static final int MIN_LEVEL = 2; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java index 42b0e260b7..0d1874907c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java @@ -41,7 +41,7 @@ public class Q00002_WhatWomenWant extends Quest private static final int ARUJIENS_LETTER3 = 1094; private static final int POETRY_BOOK = 689; private static final int GREENIS_LETTER = 693; - private static final int EARRING = 29486; + private static final int EARRING = 49040; // Misc private static final int MIN_LEVEL = 2; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java index 987341644d..148c88be4d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java @@ -43,7 +43,6 @@ public class Q00003_WillTheSealBeBroken extends Quest private static final int OMEN_BEAST_EYE = 1081; private static final int TAINT_STONE = 1082; private static final int SUCCUBUS_BLOOD = 1083; - private static final int ENCHANT = 956; // Misc private static final int MIN_LEVEL = 16; @@ -139,7 +138,7 @@ public class Q00003_WillTheSealBeBroken extends Quest } else { - giveItems(player, ENCHANT, 1); + giveAdena(player, 3800, true); st.exitQuest(false, true); htmltext = "30141-06.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java index dce94d7b39..c08056feea 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java @@ -40,13 +40,14 @@ public class Q00004_LongLiveThePaagrioLord extends Quest private static final int HESTUI = 30585; private static final int URUTU = 30587; // Items - private static final int CLUB = 4; private static final int HONEY_KHANDAR = 1541; private static final int BEAR_FUR_CLOAK = 1542; private static final int BLOODY_AXE = 1543; private static final int ANCESTOR_SKULL = 1544; private static final int SPIDER_DUST = 1545; private static final int DEEP_SEA_ORB = 1546; + // Rewards + private static final int CLUB = 49051; // Club (Novice) // Misc private static final int MIN_LEVEL = 2; @@ -112,11 +113,9 @@ public class Q00004_LongLiveThePaagrioLord extends Quest } else { - giveItems(player, CLUB, 1); // Newbie Guide showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_HELPER, 2, 5000); - addExpAndSp(player, 4254, 335); - giveAdena(player, 1850, true); + rewardItems(player, CLUB, 1); st.exitQuest(false, true); htmltext = "30578-06.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java index 8b5f6489a5..b3899dfaf1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java @@ -43,7 +43,7 @@ public class Q00005_MinersFavor extends Quest private static final int BOOMBOOM_POWDER = 1550; private static final int REDSTONE_BEER = 1551; private static final int BOLTERS_SMELLY_SOCKS = 1552; - private static final int NECKLACE = 906; + private static final int NECKLACE = 49039; // Necklace (Novice) // Misc private static final int MIN_LEVEL = 2; @@ -122,8 +122,6 @@ public class Q00005_MinersFavor extends Quest } else { - giveAdena(player, 2466, true); - addExpAndSp(player, 5672, 446); giveItems(player, NECKLACE, 1); st.exitQuest(false, true); // Newbie Guide diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java index df3dc4b791..e196dce27e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java @@ -20,7 +20,6 @@ import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.gameserver.model.holders.ItemHolder; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; @@ -48,16 +47,7 @@ public class Q00101_SwordOfSolidarity extends Quest 20362, // Tunath Orc Warrior }; // Rewards - private static final ItemHolder[] REWARDS = - { - new ItemHolder(738, 1), // Sword of Solidarity - new ItemHolder(1060, 100), // Lesser Healing Potion - new ItemHolder(4412, 10), // Echo Crystal - Theme of Battle - new ItemHolder(4413, 10), // Echo Crystal - Theme of Love - new ItemHolder(4414, 10), // Echo Crystal - Theme of Solitude - new ItemHolder(4415, 10), // Echo Crystal - Theme of Feast - new ItemHolder(4416, 10), // Echo Crystal - Theme of Celebration - }; + private static final int REWARDS = 49043; // Sword of Solidarity // Misc private static final int MIN_LVL = 9; @@ -108,12 +98,7 @@ public class Q00101_SwordOfSolidarity extends Quest if (st.isCond(5) && hasQuestItems(player, BROKEN_SWORD_HANDLE)) { // Q00281_HeadForTheHills.giveNewbieReward(player); - for (ItemHolder reward : REWARDS) - { - giveItems(player, reward); - } - addExpAndSp(player, 25747, 2171); - giveAdena(player, 10981, true); + rewardItems(player, REWARDS, 1); st.exitQuest(false, true); htmltext = event; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java index 6ced9b3500..706bc37199 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java @@ -44,25 +44,18 @@ public class Q00102_SeaOfSporesFever extends Quest private static final int DRYAD = 20013; private static final int DRYAD_ELDER = 20019; // Items - private static final int SWORD_OF_SENTINEL = 743; - private static final int STAFF_OF_SENTINEL = 744; + private static final int SWORD_OF_SENTINEL = 49047; + private static final int STAFF_OF_SENTINEL = 49048; private static final int ALBERIUS_LIST = 746; private static final int ALBERIUS_LETTER = 964; private static final int EVERGREEN_AMULET = 965; private static final int DRYADS_TEAR = 966; - private static final int LESSER_HEALING_POTION = 1060; private static final int COBENDELLS_MEDICINE1 = 1130; private static final int COBENDELLS_MEDICINE2 = 1131; private static final int COBENDELLS_MEDICINE3 = 1132; private static final int COBENDELLS_MEDICINE4 = 1133; private static final int COBENDELLS_MEDICINE5 = 1134; - private static final int SOULSHOT_NO_GRADE = 1835; - private static final int SPIRITSHOT_NO_GRADE = 2509; - private static final int ECHO_CRYSTAL_THEME_OF_BATTLE = 4412; - private static final int ECHO_CRYSTAL_THEME_OF_LOVE = 4413; - private static final int ECHO_CRYSTAL_THEME_OF_SOLITUDE = 4414; - private static final int ECHO_CRYSTAL_THEME_OF_FEAST = 4415; - private static final int ECHO_CRYSTAL_THEME_OF_CELEBRATION = 4416; + // Misc private static final int MIN_LVL = 12; private static final Map SENTINELS = new HashMap<>(); @@ -176,24 +169,14 @@ public class Q00102_SeaOfSporesFever extends Quest { if (!hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) { - giveItems(player, LESSER_HEALING_POTION, 100); - giveItems(player, ECHO_CRYSTAL_THEME_OF_BATTLE, 10); - giveItems(player, ECHO_CRYSTAL_THEME_OF_LOVE, 10); - giveItems(player, ECHO_CRYSTAL_THEME_OF_SOLITUDE, 10); - giveItems(player, ECHO_CRYSTAL_THEME_OF_FEAST, 10); - giveItems(player, ECHO_CRYSTAL_THEME_OF_CELEBRATION, 10); if (player.isMageClass()) { giveItems(player, STAFF_OF_SENTINEL, 1); - giveItems(player, SPIRITSHOT_NO_GRADE, 500); } else { giveItems(player, SWORD_OF_SENTINEL, 1); - giveItems(player, SOULSHOT_NO_GRADE, 500); } - addExpAndSp(player, 30202, 1339); - giveAdena(player, 6331, true); st.exitQuest(false, true); htmltext = "30284-06.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java index c67394d5c6..231d865318 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java @@ -19,7 +19,6 @@ package quests.Q00103_SpiritOfCraftsman; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.gameserver.model.holders.ItemHolder; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.network.serverpackets.SocialAction; @@ -50,16 +49,7 @@ public final class Q00103_SpiritOfCraftsman extends Quest private static final int SKELETON_HUNTER = 20517; private static final int SKELETON_HUNTER_ARCHER = 20518; // Rewards - private static final int BLOODSABER = 975; - private static final ItemHolder[] REWARDS = - { - new ItemHolder(1060, 100), // Lesser Healing Potion - new ItemHolder(4412, 10), // Echo Crystal - Theme of Battle - new ItemHolder(4413, 10), // Echo Crystal - Theme of Love - new ItemHolder(4414, 10), // Echo Crystal - Theme of Solitude - new ItemHolder(4415, 10), // Echo Crystal - Theme of Feast - new ItemHolder(4416, 10), // Echo Crystal - Theme of Celebration - }; + private static final int REWARDS = 49050; // Blood Saber // Misc private static final int MIN_LVL = 10; @@ -135,13 +125,7 @@ public final class Q00103_SpiritOfCraftsman extends Quest else if (hasQuestItems(talker, STEELBENDERS_HEAD)) { // Q00281_HeadForTheHills.giveNewbieReward(talker); - addExpAndSp(talker, 46663, 3999); - giveAdena(talker, 19799, true); - for (ItemHolder reward : REWARDS) - { - rewardItems(talker, reward); - } - rewardItems(talker, BLOODSABER, 1); + rewardItems(talker, REWARDS, 1); qs.exitQuest(false, true); talker.sendPacket(new SocialAction(talker.getObjectId(), 3)); htmltext = "30307-07.html"; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java index 204fa315f8..d3d349c15a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java @@ -23,7 +23,6 @@ import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.gameserver.model.holders.ItemHolder; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; @@ -54,16 +53,7 @@ public final class Q00104_SpiritOfMirrors extends Quest MONSTERS.put(27005, SPIRITBOUND_WAND3); // Spirit Of Mirrors } // Rewards - private static final ItemHolder[] REWARDS = - { - new ItemHolder(1060, 100), // Lesser Healing Potion - new ItemHolder(4412, 10), // Echo Crystal - Theme of Battle - new ItemHolder(4413, 10), // Echo Crystal - Theme of Love - new ItemHolder(4414, 10), // Echo Crystal - Theme of Solitude - new ItemHolder(4415, 10), // Echo Crystal - Theme of Feast - new ItemHolder(4416, 10), // Echo Crystal - Theme of Celebration - new ItemHolder(747, 1), // Wand of Adept - }; + private static final int REWARDS = 49044; // Wand of Adept // Misc private static final int MIN_LVL = 10; @@ -131,12 +121,7 @@ public final class Q00104_SpiritOfMirrors extends Quest if (st.isCond(3) && hasQuestItems(player, SPIRITBOUND_WAND1, SPIRITBOUND_WAND2, SPIRITBOUND_WAND3)) { // Q00281_HeadForTheHills.giveNewbieReward(player); - for (ItemHolder reward : REWARDS) - { - giveItems(player, reward); - } - addExpAndSp(player, 39750, 3407); - giveAdena(player, 16866, true); + rewardItems(player, REWARDS, 1); st.exitQuest(false, true); htmltext = "30017-06.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java index 79dd5b0ef8..5b6aadeb6a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java @@ -70,6 +70,9 @@ public final class Q00105_SkirmishWithOrcs extends Quest KENDELLS_7TH_ORDER, KENDELLS_8TH_ORDER }; + // Rewards + private static final int SWORD_OF_SUNSET = 49046; + private static final int STAFF_OF_SUNSET = 49045; // Misc private static final int MIN_LVL = 10; @@ -193,9 +196,15 @@ public final class Q00105_SkirmishWithOrcs extends Quest if (st.isCond(4) && hasQuestItems(talker, KABOO_CHIEFS_2ST_TORQUE)) { // Q00281_HeadForTheHills.giveNewbieReward(talker); + if (talker.isMageClass()) + { + giveItems(talker, STAFF_OF_SUNSET, 1); + } + else + { + giveItems(talker, SWORD_OF_SUNSET, 1); + } talker.sendPacket(new SocialAction(talker.getObjectId(), 3)); - giveAdena(talker, 17599, true); - addExpAndSp(talker, 41478, 3555); st.exitQuest(false, true); htmltext = "30218-09.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java index 16f9b0764b..98b5e04214 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java @@ -43,6 +43,8 @@ public final class Q00106_ForgottenTruth extends Quest private static final int ANCIENT_SCROLL = 986; private static final int ANCIENT_CLAY_TABLET = 987; private static final int KARTAS_TRANSLATION = 988; + // Reward + private static final int REWARDS = 49049; // Eldritch Dagger (Novice) // Misc private static final int MIN_LVL = 10; @@ -141,9 +143,8 @@ public final class Q00106_ForgottenTruth extends Quest else if (st.isCond(4) && hasQuestItems(talker, KARTAS_TRANSLATION)) { // Q00281_HeadForTheHills.giveNewbieReward(talker); + rewardItems(talker, REWARDS, 1); talker.sendPacket(new SocialAction(talker.getObjectId(), 3)); - giveAdena(talker, 10266, true); - addExpAndSp(talker, 24195, 2074); st.exitQuest(false, true); htmltext = "30358-07.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java index 3271652f5e..de98d79843 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java @@ -20,7 +20,6 @@ import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.gameserver.model.holders.ItemHolder; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; @@ -46,16 +45,7 @@ public final class Q00107_MercilessPunishment extends Quest // Monster private static final int BARANKA_MESSENGER = 27041; // Rewards - private static final int BUTCHER = 1510; - private static final ItemHolder[] REWARDS = - { - new ItemHolder(1060, 100), // Lesser Healing Potion - new ItemHolder(4412, 10), // Echo Crystal - Theme of Battle - new ItemHolder(4413, 10), // Echo Crystal - Theme of Love - new ItemHolder(4414, 10), // Echo Crystal - Theme of Solitude - new ItemHolder(4415, 10), // Echo Crystal - Theme of Feast - new ItemHolder(4416, 10), // Echo Crystal - Theme of Celebration - }; + private static final int BUTCHER = 49052; // Misc private static final int MIN_LVL = 10; @@ -200,12 +190,6 @@ public final class Q00107_MercilessPunishment extends Quest if (hasQuestItems(talker, HATOSS_ORDER_3, LETTER_TO_HUMAN, LETTER_TO_DARK_ELF, LETTER_TO_ELF)) { // Q00281_HeadForTheHills.giveNewbieReward(talker); - addExpAndSp(talker, 34565, 2962); - giveAdena(talker, 14666, true); - for (ItemHolder reward : REWARDS) - { - giveItems(talker, reward); - } giveItems(talker, BUTCHER, 1); qs.exitQuest(false, true); talker.sendPacket(new SocialAction(talker.getObjectId(), 3)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java index fcb9e9b9c3..25b59bd873 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java @@ -23,7 +23,6 @@ import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.gameserver.model.holders.ItemHolder; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; @@ -63,16 +62,7 @@ public final class Q00108_JumbleTumbleDiamondFuss extends Quest private static final int BAT_DIAGRAM = 1570; private static final int STAR_DIAMOND = 1571; // Rewards - private static final ItemHolder[] REWARDS = - { - new ItemHolder(1060, 100), // Lesser Healing Potion - new ItemHolder(4412, 10), // Echo Crystal - Theme of Battle - new ItemHolder(4413, 10), // Echo Crystal - Theme of Love - new ItemHolder(4414, 10), // Echo Crystal - Theme of Solitude - new ItemHolder(4415, 10), // Echo Crystal - Theme of Feast - new ItemHolder(4416, 10), // Echo Crystal - Theme of Celebration - }; - private static final int SILVERSMITH_HAMMER = 1511; + private static final int SILVERSMITH_HAMMER = 49053; // Misc private static final int MIN_LVL = 10; private static final int MAX_GEM_COUNT = 10; @@ -218,12 +208,6 @@ public final class Q00108_JumbleTumbleDiamondFuss extends Quest if (hasQuestItems(talker, STAR_DIAMOND)) { // Q00281_HeadForTheHills.giveNewbieReward(talker); - addExpAndSp(talker, 34565, 2962); - giveAdena(talker, 14666, true); - for (ItemHolder reward : REWARDS) - { - giveItems(talker, reward); - } giveItems(talker, SILVERSMITH_HAMMER, 1); st.exitQuest(false, true); talker.sendPacket(new SocialAction(talker.getObjectId(), 3)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java index 9a3284f0d1..26a98339ba 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java @@ -40,7 +40,7 @@ public class Q00151_CureForFever extends Quest 20108, // Blade Spider }; // Items - private static final int ROUND_SHIELD = 102; + private static final int ROUND_SHIELD = 735; private static final int POISON_SAC = 703; private static final int FEVER_MEDICINE = 704; // Misc @@ -102,7 +102,6 @@ public class Q00151_CureForFever extends Quest if (st.isCond(3) && hasQuestItems(player, FEVER_MEDICINE)) { giveItems(player, ROUND_SHIELD, 1); - addExpAndSp(player, 13106, 613); st.exitQuest(false, true); showOnScreenMsg(player, NpcStringId.LAST_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_HELPER, 2, 5000); // TODO: Newbie Guide htmltext = "30050-06.html"; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java index 1f015f7d79..5a7671e26d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java @@ -35,7 +35,7 @@ public class Q00152_ShardsOfGolem extends Quest // Monster private static final int STONE_GOLEM = 20016; // Items - private static final int WOODEN_BREASTPLATE = 23; + private static final int WOODEN_BREASTPLATE = 1100; private static final int HARRYS_1ST_RECIEPT = 1008; private static final int HARRYS_2ND_RECIEPT = 1009; private static final int GOLEM_SHARD = 1010; @@ -146,7 +146,6 @@ public class Q00152_ShardsOfGolem extends Quest if (hasQuestItems(player, HARRYS_2ND_RECIEPT, TOOL_BOX)) { giveItems(player, WOODEN_BREASTPLATE, 1); - addExpAndSp(player, 5000, 0); st.exitQuest(false, true); htmltext = "30035-05.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java index b5e91c3dc4..14e2031e0a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java @@ -43,9 +43,7 @@ public class Q00153_DeliverGoods extends Quest private static final int SILVIAS_RECEIPT_ID = 1017; private static final int RANTS_RECEIPT_ID = 1018; // Rewards - private static final int SOULSHOT_NO_GRADE_ID = 1835; // You get 3 Soulshots no grade. - private static final int RING_OF_KNOWLEDGE_ID = 875; - private static final int XP_REWARD_AMOUNT = 600; + private static final int RING_OF_KNOWLEDGE_ID = 49041; public Q00153_DeliverGoods() { @@ -100,10 +98,7 @@ public class Q00153_DeliverGoods extends Quest takeItems(player, JACKSONS_RECEIPT_ID, -1); takeItems(player, SILVIAS_RECEIPT_ID, -1); takeItems(player, RANTS_RECEIPT_ID, -1); - // On retail it gives 2 rings but one at the time. giveItems(player, RING_OF_KNOWLEDGE_ID, 1); - giveItems(player, RING_OF_KNOWLEDGE_ID, 1); - addExpAndSp(player, XP_REWARD_AMOUNT, 0); st.exitQuest(false, true); htmltext = "30041-04.html"; } @@ -137,7 +132,6 @@ public class Q00153_DeliverGoods extends Quest { takeItems(player, CLOTH_BUNDLE_ID, -1); giveItems(player, SILVIAS_RECEIPT_ID, 1); - giveItems(player, SOULSHOT_NO_GRADE_ID, 3); htmltext = "30003-01.html"; } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java index 84ba57bcdf..61629e9a10 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java @@ -40,7 +40,7 @@ public final class Q00154_SacrificeToTheSea extends Quest private static final int YOUNG_KELTIR = 20545; private static final int KELTIR = 20481; // Reward - private static final int MAGE_EARING = 113; + private static final int MAGE_EARING = 49040; // Misc private static final int MIN_LVL = 2; @@ -102,7 +102,6 @@ public final class Q00154_SacrificeToTheSea extends Quest { takeItems(talker, MAIDEN_DOLL, -1); rewardItems(talker, MAGE_EARING, 1); - addExpAndSp(talker, 0, 1000); qs.exitQuest(false, true); htmltext = "30312-06.html"; break; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java index d8252e2a21..b3157059bb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java @@ -33,7 +33,7 @@ public class Q00155_FindSirWindawood extends Quest private static final int SIR_COLLIN_WINDAWOOD = 30311; // Items private static final int OFFICIAL_LETTER = 1019; - private static final int HASTE_POTION = 734; + private static final int HASTE_POTION = 49036; // Misc private static final int MIN_LEVEL = 3; @@ -92,7 +92,7 @@ public class Q00155_FindSirWindawood extends Quest { if (st.isStarted() && hasQuestItems(player, OFFICIAL_LETTER)) { - giveItems(player, HASTE_POTION, 1); + giveItems(player, HASTE_POTION, 2); st.exitQuest(false, true); htmltext = "30311-01.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java index b30b2d3d72..e59cadc797 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java @@ -34,7 +34,7 @@ public class Q00157_RecoverSmuggledGoods extends Quest // Monster private static final int GIANT_TOAD = 20121; // Items - private static final int BUCKLER = 20; + private static final int BUCKLER = 49042; private static final int ADAMANTITE_ORE = 1024; // Misc private static final int MIN_LVL = 5; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java index 28690d9303..adb33c6cb1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java @@ -36,8 +36,9 @@ public class Q00158_SeedOfEvil extends Quest // Monster private static final int NERKAS = 27016; // Items - private static final int ENCHANT_ARMOR_D = 956; private static final int CLAY_TABLET = 1025; + // Reward + private static final int SICKLE = 153; // Misc private static final int MIN_LEVEL = 21; @@ -108,9 +109,8 @@ public class Q00158_SeedOfEvil extends Quest } else if (st.isCond(2) && hasQuestItems(player, CLAY_TABLET)) { - giveItems(player, ENCHANT_ARMOR_D, 1); - addExpAndSp(player, 17818, 927); - giveAdena(player, 1495, true); + rewardItems(player, SICKLE, 1); + giveAdena(player, 5000, true); st.exitQuest(false, true); htmltext = "30031-05.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java index 692b34f435..cb7082d1de 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java @@ -38,6 +38,9 @@ public class Q00159_ProtectTheWaterSource extends Quest private static final int PLAGUE_DUST = 1035; private static final int HYACINTH_CHARM = 1071; private static final int HYACINTH_CHARM2 = 1072; + // Rewards + private static final int SCROLL_OF_ESCAPSE = 736; + private static final int RING_NOVICE = 49041; // Misc private static final int MIN_LVL = 12; @@ -151,7 +154,8 @@ public class Q00159_ProtectTheWaterSource extends Quest { if (hasQuestItems(player, HYACINTH_CHARM2) && (getQuestItemsCount(player, PLAGUE_DUST) >= 5)) { - giveAdena(player, 18250, true); + rewardItems(player, SCROLL_OF_ESCAPSE, 1); + rewardItems(player, RING_NOVICE, 1); st.exitQuest(false, true); htmltext = "30154-08.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java index 8cc28dc447..70fbd00bce 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java @@ -112,8 +112,7 @@ public final class Q00160_NerupasRequest extends Quest } else if (hasQuestItems(player, NIGHTSHADE_LEAF)) { - rewardItems(player, LESSER_HEALING_POTION, 5); - addExpAndSp(player, 1000, 0); + rewardItems(player, LESSER_HEALING_POTION, 1); qs.exitQuest(false, true); htmltext = "30370-06.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java index 2f838a494f..5c700b687f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java @@ -102,8 +102,7 @@ public class Q00161_FruitOfTheMotherTree extends Quest } else if (st.isCond(2) && hasQuestItems(player, MOTHERTREE_FRUIT)) { - giveAdena(player, 1000, true); - addExpAndSp(player, 1000, 0); + giveAdena(player, 100, true); st.exitQuest(false, true); htmltext = "30362-06.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java index 760820852e..d60847b69c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java @@ -48,7 +48,7 @@ public class Q00162_CurseOfTheUndergroundFortress extends Quest MONSTERS_BONES.put(20504, 26); // Dread Soldier } // Items - private static final int BONE_SHIELD = 625; + private static final int BONE_SHIELD = 20; private static final int BONE_FRAGMENT = 1158; private static final int ELF_SKULL = 1159; // Misc @@ -156,8 +156,6 @@ public class Q00162_CurseOfTheUndergroundFortress extends Quest if ((getQuestItemsCount(player, BONE_FRAGMENT) + getQuestItemsCount(player, ELF_SKULL)) >= REQUIRED_COUNT) { giveItems(player, BONE_SHIELD, 1); - addExpAndSp(player, 22652, 1004); - giveAdena(player, 24000, true); st.exitQuest(false, true); htmltext = "30147-06.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java index d175199885..491ca67c15 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java @@ -43,6 +43,8 @@ public class Q00163_LegacyOfThePoet extends Quest private static final int RUMIELS_2ND_POEM = 1039; private static final int RUMIELS_3RD_POEM = 1040; private static final int RUMIELS_4TH_POEM = 1041; + // Reward + private static final int LEATHER_SHIRT = 22; // Misc private static final int MIN_LVL = 11; @@ -156,8 +158,7 @@ public class Q00163_LegacyOfThePoet extends Quest { if (hasQuestItems(player, RUMIELS_1ST_POEM, RUMIELS_2ND_POEM, RUMIELS_3RD_POEM, RUMIELS_4TH_POEM)) { - addExpAndSp(player, 21643, 943); - giveAdena(player, 13890, true); + giveItems(player, LEATHER_SHIRT, 1); st.exitQuest(false, true); htmltext = "30220-07.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java index 2565ebf43a..55bd57331f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java @@ -92,8 +92,7 @@ public class Q00164_BloodFiend extends Quest { if (st.isCond(2) && hasQuestItems(player, KIRUNAK_SKULL)) { - giveAdena(player, 42130, true); - addExpAndSp(player, 35637, 1854); + giveAdena(player, 12000, true); st.exitQuest(false, true); htmltext = "30149-06.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java index 14b4b7eeb2..f88383088d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java @@ -108,8 +108,7 @@ public class Q00165_ShilensHunt extends Quest { if (st.isCond(2) && (getQuestItemsCount(player, DARK_BEZOAR) >= REQUIRED_COUNT)) { - giveItems(player, LESSER_HEALING_POTION, 5); - addExpAndSp(player, 1000, 0); + giveItems(player, LESSER_HEALING_POTION, 2); st.exitQuest(false, true); htmltext = "30348-05.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java index a5eafc41e7..67952beb4a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java @@ -96,8 +96,7 @@ public class Q00166_MassOfDarkness extends Quest if (st.isCond(2) && hasQuestItems(player, UNDRIAS_LETTER, CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIELS_SCRIPTURE)) { showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_HELPER, 2, 5000); // TODO: Newbie Guide - addExpAndSp(player, 5672, 466); - giveAdena(player, 2966, true); + giveAdena(player, 50, true); st.exitQuest(false, true); htmltext = "30130-05.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java index 2225b1177a..e6c76ef51f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java @@ -59,7 +59,7 @@ public class Q00167_DwarvenKinship extends Quest { if (st.isCond(2) && hasQuestItems(player, NORMANS_LETTER)) { - giveAdena(player, 20000, true); + giveAdena(player, 3000, true); st.exitQuest(false, true); htmltext = event; } @@ -76,7 +76,7 @@ public class Q00167_DwarvenKinship extends Quest { takeItems(player, CARLONS_LETTER, -1); giveItems(player, NORMANS_LETTER, 1); - giveAdena(player, 2000, true); + giveAdena(player, 3000, true); st.setCond(2); htmltext = event; } @@ -86,7 +86,7 @@ public class Q00167_DwarvenKinship extends Quest { if (st.isCond(1) && hasQuestItems(player, CARLONS_LETTER)) { - giveAdena(player, 15000, true); + giveAdena(player, 3000, true); st.exitQuest(false, true); htmltext = event; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java index 1807a23b42..b251d2d4da 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java @@ -124,7 +124,7 @@ public class Q00168_DeliverSupplies extends Quest { if (getQuestItemsCount(player, OLD_BRONZE_SWORD) >= 2) { - giveAdena(player, 820, true); + giveAdena(player, 100, true); st.exitQuest(false, true); htmltext = "30349-07.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java index 6b316b8a44..898c26cffd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java @@ -72,8 +72,7 @@ public class Q00169_OffspringOfNightmares extends Quest if (st.isCond(2) && hasQuestItems(player, PERFECT_SKULL)) { giveItems(player, BONE_GAITERS, 1); - addExpAndSp(player, 17475, 818); - giveAdena(player, 17030 + (10 * getQuestItemsCount(player, CRACKED_SKULL)), true); + giveAdena(player, 3000 + (10 * getQuestItemsCount(player, CRACKED_SKULL)), true); st.exitQuest(false, true); showOnScreenMsg(player, NpcStringId.LAST_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_HELPER, 2, 5000); // TODO: Newbie Guide htmltext = event; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java index 2f18717835..15c748a742 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java @@ -34,13 +34,12 @@ public class Q00170_DangerousSeduction extends Quest { // NPC private static final int VELLIOR = 30305; - // Monster private static final int MERKENIS = 27022; - // Item private static final int NIGHTMARE_CRYSTAL = 1046; - + // Reward + private static final int PIECE_BONE_BREASTPLATE = 25; // Misc private static final int MIN_LEVEL = 21; @@ -105,8 +104,7 @@ public class Q00170_DangerousSeduction extends Quest } else { - giveAdena(player, 102680, true); - addExpAndSp(player, 38607, 4018); + rewardItems(player, PIECE_BONE_BREASTPLATE, 1); st.exitQuest(false, true); htmltext = "30305-06.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java index 80a31ad57f..d2e6467649 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java @@ -160,8 +160,9 @@ public final class Q00257_TheGuardIsBusy extends Quest if (hasAtLeastOneQuestItem(player, ORC_AMULET, ORC_NECKLACE, WEREWOLF_FANG)) { final long amulets = getQuestItemsCount(player, ORC_AMULET); - final long common = getQuestItemsCount(player, ORC_NECKLACE, WEREWOLF_FANG); - giveAdena(player, ((amulets * 10) + (common * 20) + (((amulets + common) >= 10) ? 1000 : 0)), true); + final long necklace = getQuestItemsCount(player, ORC_NECKLACE); + final long fang = getQuestItemsCount(player, WEREWOLF_FANG); + giveAdena(player, ((amulets * 5) + (necklace * 8) + (fang * 10) + (((amulets + necklace + fang) >= 10) ? 1000 : 0)), true); takeItems(player, -1, ORC_AMULET, ORC_NECKLACE, WEREWOLF_FANG); // Q00281_HeadForTheHills.giveNewbieReward(player); htmltext = "30039-07.html"; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java index f80793b068..5e73aa2a3f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java @@ -46,11 +46,9 @@ public final class Q00258_BringWolfPelts extends Quest private static final Map REWARDS = new HashMap<>(); static { - REWARDS.put(390, 1); // Cotton Shirt - REWARDS.put(29, 6); // Leather Pants - REWARDS.put(22, 9); // Leather Shirt - REWARDS.put(1119, 13); // Short Leather Gloves - REWARDS.put(426, 16); // Tunic + REWARDS.put(41, 1); // Cloth Cap + REWARDS.put(42, 6); // Leather Cap + REWARDS.put(462, 9); // Stockings } // Misc private static final int MIN_LVL = 3; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java index b18bfd6a44..f9c3a2eb73 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java @@ -125,7 +125,7 @@ public final class Q00260_OrcHunting extends Quest { final long amulets = getQuestItemsCount(player, ORC_AMULET); final long necklaces = getQuestItemsCount(player, ORC_NECKLACE); - giveAdena(player, ((amulets * 12) + (necklaces * 30) + ((amulets + necklaces) >= 10 ? 1000 : 0)), true); + giveAdena(player, ((amulets * 4) + (necklaces * 10) + ((amulets + necklaces) >= 10 ? 1000 : 0)), true); takeItems(player, -1, getRegisteredItemIds()); // Q00281_HeadForTheHills.giveNewbieReward(player); htmltext = "30221-06.html"; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java index 335132485e..98563b536a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java @@ -111,8 +111,7 @@ public final class Q00261_CollectorsDream extends Quest if (getQuestItemsCount(player, SPIDER_LEG) >= MAX_LEG_COUNT) { giveNewbieReward(player); - giveAdena(player, 1000, true); - addExpAndSp(player, 2000, 0); + giveAdena(player, 700, true); st.exitQuest(true, true); htmltext = "30222-05.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java index d1da3151a1..a194ca4875 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java @@ -125,7 +125,7 @@ public final class Q00262_TradeWithTheIvoryTower extends Quest if (getQuestItemsCount(player, SPORE_SAC) >= REQUIRED_ITEM_COUNT) { htmltext = "30137-05.html"; - giveAdena(player, 3000, true); + giveAdena(player, 300, true); st.exitQuest(true, true); } break; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java index 1419eafabf..e41b5f38aa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java @@ -123,7 +123,7 @@ public final class Q00263_OrcSubjugation extends Quest { final long amulets = getQuestItemsCount(player, ORC_AMULET); final long necklaces = getQuestItemsCount(player, ORC_NECKLACE); - giveAdena(player, ((amulets * 20) + (necklaces * 30) + ((amulets + necklaces) >= 10 ? 1100 : 0)), true); + giveAdena(player, ((amulets * 8) + (necklaces * 10) + ((amulets + necklaces) >= 10 ? 1100 : 0)), true); takeItems(player, -1, getRegisteredItemIds()); htmltext = "30346-06.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java index 14f323158b..702749664a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java @@ -51,13 +51,9 @@ public final class Q00264_KeenClaws extends Quest MONSTER_CHANCES.put(20003, Arrays.asList(new ItemHolder(2, 25), new ItemHolder(8, 50))); MONSTER_CHANCES.put(20456, Arrays.asList(new ItemHolder(1, 80), new ItemHolder(2, 100))); - REWARDS.put(1, Arrays.asList(new ItemHolder(4633, 1))); - REWARDS.put(2, Arrays.asList(new ItemHolder(57, 2000))); - REWARDS.put(5, Arrays.asList(new ItemHolder(5140, 1))); - REWARDS.put(8, Arrays.asList(new ItemHolder(735, 1), new ItemHolder(57, 50))); - REWARDS.put(11, Arrays.asList(new ItemHolder(737, 1))); - REWARDS.put(14, Arrays.asList(new ItemHolder(734, 1))); - REWARDS.put(17, Arrays.asList(new ItemHolder(35, 1), new ItemHolder(57, 50))); + REWARDS.put(0, Arrays.asList(new ItemHolder(735, 1))); + REWARDS.put(1, Arrays.asList(new ItemHolder(734, 1))); + REWARDS.put(2, Arrays.asList(new ItemHolder(35, 1))); } public Q00264_KeenClaws() diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java index d41d738ef5..64e0b4c44c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java @@ -119,7 +119,7 @@ public final class Q00265_BondsOfSlavery extends Quest if (hasQuestItems(player, IMP_SHACKLES)) { final long shackles = getQuestItemsCount(player, IMP_SHACKLES); - giveAdena(player, (shackles * 12) + (shackles >= 10 ? 500 : 0), true); + giveAdena(player, (shackles * 5) + (shackles >= 10 ? 500 : 0), true); takeItems(player, IMP_SHACKLES, -1); // Q00281_HeadForTheHills.giveNewbieReward(player); htmltext = "30357-06.html"; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java index d893fdaf41..00f61e3adc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java @@ -53,10 +53,10 @@ public final class Q00266_PleasOfPixies extends Quest private static final Map> REWARDS = new HashMap<>(); static { - REWARDS.put(0, Arrays.asList(new ItemHolder(1337, 1), new ItemHolder(3032, 1))); // Emerald, Recipe: Spiritshot D - REWARDS.put(1, Arrays.asList(new ItemHolder(2176, 1), new ItemHolder(1338, 1))); // Recipe: Leather Boots, Blue Onyx - REWARDS.put(2, Arrays.asList(new ItemHolder(1339, 1), new ItemHolder(1061, 1))); // Onyx, Greater Healing Potion - REWARDS.put(3, Arrays.asList(new ItemHolder(1336, 1), new ItemHolder(1060, 1))); // Glass Shard, Lesser Healing Potion + REWARDS.put(0, Arrays.asList(new ItemHolder(1336, 1), new ItemHolder(57, 100))); // Glass Shard, Adena + REWARDS.put(1, Arrays.asList(new ItemHolder(1339, 1), new ItemHolder(57, 300))); // Onyx, Adena + REWARDS.put(2, Arrays.asList(new ItemHolder(1338, 1), new ItemHolder(57, 500))); // Blue Onyx, Adena + REWARDS.put(3, Arrays.asList(new ItemHolder(1337, 1), new ItemHolder(57, 5000))); // Emerald , Adena } // Misc private static final int MIN_LVL = 3; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java index 8d8d95dbfc..dd32897dd5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java @@ -36,8 +36,6 @@ public final class Q00267_WrathOfVerdure extends Quest private static final int GOBLIN_CLUB = 1335; // Monster private static final int GOBLIN_RAIDER = 20325; - // Reward - private static final int SILVERY_LEAF = 1340; // Misc private static final int MIN_LVL = 4; @@ -110,12 +108,7 @@ public final class Q00267_WrathOfVerdure extends Quest { if (hasQuestItems(player, GOBLIN_CLUB)) { - final long count = getQuestItemsCount(player, GOBLIN_CLUB); - rewardItems(player, SILVERY_LEAF, count); - if (count >= 10) - { - giveAdena(player, 600, true); - } + giveAdena(player, 2 + getQuestItemsCount(player, GOBLIN_CLUB), true); takeItems(player, GOBLIN_CLUB, -1); htmltext = "31853-06.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java index 559d977cb3..a82fd50e63 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java @@ -37,9 +37,8 @@ public final class Q00271_ProofOfValor extends Quest // Monsters private static final int KASHA_WOLF = 20475; // Rewards - private static final int HEALING_POTION = 1061; - private static final int NECKLACE_OF_COURAGE = 1506; - private static final int NECKLACE_OF_VALOR = 1507; + private static final int HEALING_POTION = 1539; + private static final int NECKLACE_OF_VALOR = 49039; // Misc private static final int MIN_LVL = 4; @@ -59,7 +58,7 @@ public final class Q00271_ProofOfValor extends Quest if ((st != null) && event.equalsIgnoreCase("30577-04.htm")) { st.startQuest(); - return hasAtLeastOneQuestItem(player, NECKLACE_OF_VALOR, NECKLACE_OF_COURAGE) ? "30577-08.html" : event; + return hasAtLeastOneQuestItem(player, NECKLACE_OF_VALOR) ? "30577-08.html" : event; } return null; } @@ -95,7 +94,7 @@ public final class Q00271_ProofOfValor extends Quest { case State.CREATED: { - htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? (hasAtLeastOneQuestItem(player, NECKLACE_OF_VALOR, NECKLACE_OF_COURAGE)) ? "30577-07.htm" : "30577-03.htm" : "30577-02.htm" : "30577-01.htm"; + htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? (hasAtLeastOneQuestItem(player, NECKLACE_OF_VALOR)) ? "30577-07.htm" : "30577-03.htm" : "30577-02.htm" : "30577-01.htm"; break; } case State.STARTED: @@ -114,11 +113,11 @@ public final class Q00271_ProofOfValor extends Quest if (getRandom(100) <= 13) { rewardItems(player, NECKLACE_OF_VALOR, 1); - rewardItems(player, HEALING_POTION, 10); + rewardItems(player, HEALING_POTION, 1); } else { - rewardItems(player, NECKLACE_OF_COURAGE, 1); + rewardItems(player, NECKLACE_OF_VALOR, 1); } takeItems(player, KASHA_WOLF_FANG, -1); st.exitQuest(true, true); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java index 3a03ef7fd6..762364fad6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java @@ -107,7 +107,7 @@ public final class Q00272_WrathOfAncestors extends Quest } case 2: { - giveAdena(player, 1500, true); + giveAdena(player, 100, true); st.exitQuest(true, true); htmltext = "30572-06.html"; break; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java index 954860fef6..c14cc7ecf4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java @@ -127,7 +127,7 @@ public final class Q00273_InvadersOfTheHolyLand extends Quest { final long black = getQuestItemsCount(player, BLACK_SOULSTONE); final long red = getQuestItemsCount(player, RED_SOULSTONE); - giveAdena(player, (red * 10) + (black * 3) + ((red > 0) ? (((red + black) >= 10) ? 1800 : 0) : ((black >= 10) ? 1500 : 0)), true); + giveAdena(player, (red * 5) + (black * 3) + (((red + black) >= 10) ? 1000 : 0), true); takeItems(player, -1, BLACK_SOULSTONE, RED_SOULSTONE); // Q00281_HeadForTheHills.giveNewbieReward(player); htmltext = (red > 0) ? "30566-07.html" : "30566-06.html"; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java index 170746e3fd..5b68bc6cdd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java @@ -125,7 +125,7 @@ public final class Q00274_SkirmishWithTheWerewolves extends Quest if (heads >= 40) { final long totems = getQuestItemsCount(player, WEREWOLF_TOTEM); - giveAdena(player, (heads * 30) + (totems * 600) + 2300, true); + giveAdena(player, 200, true); st.exitQuest(true, true); htmltext = (totems > 0) ? "30569-07.html" : "30569-06.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java index e7d7c8ebb3..2bef38f2c8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java @@ -43,7 +43,7 @@ public final class Q00275_DarkWingedSpies extends Quest private static final int VARANGKAS_TRACKER = 27043; // Misc private static final int MIN_LVL = 11; - private static final int FANG_PRICE = 60; + private static final int FANG_PRICE = 5; private static final int MAX_BAT_FANG_COUNT = 70; public Q00275_DarkWingedSpies() diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java index a6e92e1910..34d0af5a4e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java @@ -37,7 +37,7 @@ public final class Q00291_RevengeOfTheRedbonnet extends Quest private static final int BLACK_WOLF = 20317; private static final int BLACK_TIMBER_WOLF = 20318; // Rewards - private static final int SCROLL_OF_ESCAPE = 736; + private static final int ADENA = 57; private static final int GRANDMAS_PEARL = 1502; private static final int GRANDMAS_MIRROR = 1503; private static final int GRANDMAS_NECKLACE = 1504; @@ -103,14 +103,17 @@ public final class Q00291_RevengeOfTheRedbonnet extends Quest { giveItems(player, GRANDMAS_MIRROR, 1); } + else if (chance <= 30) + { + giveItems(player, GRANDMAS_HAIRPIN, 1); + } else if (chance <= 45) { giveItems(player, GRANDMAS_NECKLACE, 1); } else { - giveItems(player, GRANDMAS_HAIRPIN, 1); - giveItems(player, SCROLL_OF_ESCAPE, 1); + giveItems(player, ADENA, 20); } qs.exitQuest(true, true); html = "30553-05.html"; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java index 54317bd775..f0a25b75d2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java @@ -170,7 +170,7 @@ public final class Q00292_BrigandsSweep extends Quest final long sum = necklaces + pendants + lordPendants; if (sum > 0) { - giveAdena(talker, (necklaces * 12) + (pendants * 36) + (lordPendants * 33) + (sum >= 10 ? 1000 : 0), true); + giveAdena(talker, (necklaces * 6) + (pendants * 8) + (lordPendants * 10) + (sum >= 10 ? 1000 : 0), true); takeItems(talker, -1, GOBLIN_NECKLACE, GOBLIN_PENDANT, GOBLIN_LORD_PENDANT); } if ((sum > 0) && !hasAtLeastOneQuestItem(talker, SUSPICIOUS_MEMO, SUSPICIOUS_CONTRACT)) @@ -182,7 +182,7 @@ public final class Q00292_BrigandsSweep extends Quest final long memos = getQuestItemsCount(talker, SUSPICIOUS_MEMO); if ((memos == 0) && hasQuestItems(talker, SUSPICIOUS_CONTRACT)) { - giveAdena(talker, 1120, true); + giveAdena(talker, 100, true); takeItems(talker, -1, SUSPICIOUS_CONTRACT); // Retail like, reward is given in 2 pieces if both conditions are meet. html = "30532-10.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java index fd1de8dadc..2d052ecce7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java @@ -147,7 +147,7 @@ public final class Q00293_TheHiddenVeins extends Quest { final long ores = getQuestItemsCount(player, CHRYSOLITE_ORE); final long maps = getQuestItemsCount(player, HIDDEN_ORE_MAP); - giveAdena(player, (ores * 5) + (maps * 500) + (((ores + maps) >= 10) ? 2000 : 0), true); + giveAdena(player, (ores * 5) + (maps * 150) + (((ores + maps) >= 10) ? 1000 : 0), true); takeItems(player, -1, CHRYSOLITE_ORE, HIDDEN_ORE_MAP); // Q00281_HeadForTheHills.giveNewbieReward(player); htmltext = (ores > 0) ? (maps > 0) ? "30535-10.html" : "30535-06.html" : "30535-09.html"; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java index ed03bc4a64..4fd6a58200 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java @@ -110,7 +110,7 @@ public final class Q00294_CovertBusiness extends Quest { if (hasQuestItems(talker, RING_OF_RACCOON)) { - giveAdena(talker, 2400, true); + giveAdena(talker, 200, true); html = "30534-06.html"; } else @@ -118,7 +118,7 @@ public final class Q00294_CovertBusiness extends Quest giveItems(talker, RING_OF_RACCOON, 1); html = "30534-05.html"; } - addExpAndSp(talker, 0, 600); + takeItems(talker, BAT_FANG, -1); qs.exitQuest(true, true); } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java index b72ae6da7c..f136b28b71 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00295_DreamingOfTheSkies/Q00295_DreamingOfTheSkies.java @@ -89,7 +89,7 @@ public final class Q00295_DreamingOfTheSkies extends Quest { if (hasQuestItems(talker, RING_OF_FIREFLY)) { - giveAdena(talker, 2400, true); + giveAdena(talker, 200, true); html = "30536-06.html"; } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java index adb0289549..5260600f0a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00296_TarantulasSpiderSilk/Q00296_TarantulasSpiderSilk.java @@ -147,7 +147,7 @@ public final class Q00296_TarantulasSpiderSilk extends Quest final long silk = getQuestItemsCount(talker, TARANTULA_SPIDER_SILK); if (silk >= 1) { - giveAdena(talker, (silk * 30) + (silk >= 10 ? 2000 : 0), true); + giveAdena(talker, (silk * 5) + (silk >= 10 ? 1000 : 0), true); takeItems(talker, TARANTULA_SPIDER_SILK, -1); // Q00281_HeadForTheHills.giveNewbieReward(talker);// TODO: It's using wrong bitmask, need to create a general bitmask for this using EnumIntBitmask class inside Quest class for handling Quest rewards. html = "30519-05.html"; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java index 7d4bf4bb4f..8eb023bb84 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java @@ -38,7 +38,7 @@ public final class Q00300_HuntingLetoLizardman extends Quest private static final int RATH = 30126; // Items private static final int BRACELET_OF_LIZARDMAN = 7139; - private static final ItemHolder REWARD_ADENA = new ItemHolder(Inventory.ADENA_ID, 30000); + private static final ItemHolder REWARD_ADENA = new ItemHolder(Inventory.ADENA_ID, 5000); private static final ItemHolder REWARD_ANIMAL_BONE = new ItemHolder(1872, 50); private static final ItemHolder REWARD_ANIMAL_SKIN = new ItemHolder(1867, 50); // Misc diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java index 19c56df151..8991e696ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java @@ -103,8 +103,7 @@ public final class Q00303_CollectArrowheads extends Quest { if (getQuestItemsCount(player, ORCISH_ARROWHEAD) >= REQUIRED_ITEM_COUNT) { - giveAdena(player, 1000, true); - addExpAndSp(player, 2000, 0); + giveAdena(player, 500, true); st.exitQuest(true, true); htmltext = "30029-06.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java index 83e53572b1..3ecb803339 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java @@ -139,7 +139,7 @@ public final class Q00306_CrystalOfFireAndIce extends Quest { final long flame = getQuestItemsCount(player, FLAME_SHARD); final long ice = getQuestItemsCount(player, ICE_SHARD); - giveAdena(player, ((flame * 40) + (ice * 40) + ((flame + ice) >= 10 ? 5000 : 0)), true); + giveAdena(player, ((flame * 15) + (ice * 15) + ((flame + ice) >= 10 ? 5000 : 0)), true); takeItems(player, -1, getRegisteredItemIds()); htmltext = "30004-07.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java index 58dc534f86..226972ec52 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java @@ -120,7 +120,7 @@ public final class Q00313_CollectSpores extends Quest { if (getQuestItemsCount(player, SPORE_SAC) >= REQUIRED_SAC_COUNT) { - giveAdena(player, 3500, true); + giveAdena(player, 500, true); st.exitQuest(true, true); htmltext = "30150-07.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java index eeeb29266e..6be88a40b1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java @@ -155,7 +155,7 @@ public final class Q00316_DestroyPlagueCarriers extends Quest { final long wererars = getQuestItemsCount(player, WERERAT_FANG); final long foulclaws = getQuestItemsCount(player, VAROOL_FOULCLAW_FANG); - giveAdena(player, ((wererars * 30) + (foulclaws * 10000) + ((wererars + foulclaws) >= 10 ? 5000 : 0)), true); + giveAdena(player, ((wererars * 5) + (foulclaws * 1000) + ((wererars + foulclaws) >= 10 ? 5000 : 0)), true); takeItems(player, -1, getRegisteredItemIds()); htmltext = "30155-07.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java index 2235e1e152..a259c9cfd3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java @@ -77,7 +77,7 @@ public final class Q00317_CatchTheWind extends Quest final long shardCount = getQuestItemsCount(player, WIND_SHARD); if (shardCount > 0) { - giveAdena(player, ((shardCount * 40) + (shardCount >= 10 ? 2988 : 0)), true); + giveAdena(player, ((shardCount * 10) + (shardCount >= 10 ? 2988 : 0)), true); takeItems(player, WIND_SHARD, -1); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java index 23944d6b9b..83fe8ed9cf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java @@ -19,7 +19,6 @@ package quests.Q00319_ScentOfDeath; import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.gameserver.model.holders.ItemHolder; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; @@ -38,7 +37,6 @@ public class Q00319_ScentOfDeath extends Quest private static final int MARSH_ZOMBIE_LORD = 20020; // Item private static final int ZOMBIES_SKIN = 1045; - private static final ItemHolder LESSER_HEALING_POTION = new ItemHolder(1060, 1); // Misc private static final int MIN_LEVEL = 11; private static final int MIN_CHANCE = 7; @@ -124,8 +122,7 @@ public class Q00319_ScentOfDeath extends Quest } case 2: { - giveAdena(player, 3350, false); - giveItems(player, LESSER_HEALING_POTION); + giveAdena(player, 500, false); takeItems(player, ZOMBIES_SKIN, -1); st.exitQuest(true, true); htmltext = "30138-06.html"; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java index f7b7112300..51090b7e11 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java @@ -94,7 +94,7 @@ public final class Q00320_BonesTellTheFuture extends Quest if (getQuestItemsCount(player, BONE_FRAGMENT) >= REQUIRED_BONE_COUNT) { htmltext = "30359-06.html"; - giveAdena(player, 8470, true); + giveAdena(player, 500, true); st.exitQuest(true, true); } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java index a4273d5eff..a3439b8d08 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java @@ -47,7 +47,7 @@ public class Q00324_SweetestVenom extends Quest // Misc private static final int MIN_LVL = 18; private static final int REQUIRED_COUNT = 10; - private static final int ADENA_COUNT = 5810; + private static final int ADENA_COUNT = 1000; public Q00324_SweetestVenom() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java index 4e8f721133..bd0be86351 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java @@ -147,7 +147,7 @@ public final class Q00325_GrimCollector extends Quest final long totalCount = (head + heart + liver + skull + rib + spine + arm + thigh + complete); if (totalCount > 0) { - long sum = ((head * 30) + (heart * 20) + (liver * 20) + (skull * 100) + (rib * 40) + (spine * 14) + (arm * 14) + (thigh * 14)); + long sum = ((head * 8) + (heart * 5) + (liver * 5) + (skull * 25) + (rib * 5) + (spine * 5) + (arm * 5) + (thigh * 5)); if (totalCount >= 10) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java index 8226086942..1561a19e24 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java @@ -135,7 +135,7 @@ public final class Q00326_VanquishRemnants extends Quest { giveItems(player, BLACK_LION_MARK, 1); } - giveAdena(player, ((red_badges * 46) + (blue_badges * 52) + (black_badges * 58) + ((sum >= 10) ? 4320 : 0)), true); + giveAdena(player, ((red_badges * 10) + (blue_badges * 10) + (black_badges * 12) + ((sum >= 10) ? 1000 : 0)), true); takeItems(player, -1, RED_CROSS_BADGE, BLUE_CROSS_BADGE, BLACK_CROSS_BADGE); htmltext = (sum >= 100) ? (hasQuestItems(player, BLACK_LION_MARK)) ? "30435-09.html" : "30435-06.html" : "30435-05.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java index 3c283b78e0..4cabf086dc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java @@ -418,7 +418,7 @@ public final class Q00327_RecoverTheFarmland extends Quest html = "30597-05.html"; final long dogTags = getQuestItemsCount(player, TUREK_DOG_TAG); final long medallions = getQuestItemsCount(player, TUREK_MEDALLION); - final long rewardCount = (dogTags * 40) + (medallions * 50) + (((dogTags + medallions) >= 10) ? 619 : 0); + final long rewardCount = (dogTags * 8) + (medallions * 8) + (((dogTags + medallions) >= 10) ? 1000 : 0); giveAdena(player, rewardCount, true); takeItems(player, TUREK_DOG_TAG, -1); takeItems(player, TUREK_MEDALLION, -1); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java index 2bb0e25fe8..8dbe5e63fc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java @@ -52,10 +52,10 @@ public class Q00328_SenseForBusiness extends Quest private static final int MONSTER_EYE_LENS = 1366; private static final int BASILISK_GIZZARD = 1348; // Misc - private static final int MONSTER_EYE_CARCASS_ADENA = 25; - private static final int MONSTER_EYE_LENS_ADENA = 1000; - private static final int BASILISK_GIZZARD_ADENA = 60; - private static final int BONUS = 618; + private static final int MONSTER_EYE_CARCASS_ADENA = 2; + private static final int MONSTER_EYE_LENS_ADENA = 10; + private static final int BASILISK_GIZZARD_ADENA = 2; + private static final int BONUS = 100; private static final int BONUS_COUNT = 10; private static final int MIN_LVL = 21; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java index 0706a71e9a..d034c268e5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java @@ -133,7 +133,7 @@ public final class Q00329_CuriosityOfADwarf extends Quest { final long broken = getQuestItemsCount(player, BROKEN_HEARTSTONE); final long golem = getQuestItemsCount(player, GOLEM_HEARTSTONE); - giveAdena(player, ((broken * 50) + (golem * 1000) + ((broken + golem) >= 10 ? 1183 : 0)), true); + giveAdena(player, ((broken * 5) + (golem * 40) + ((broken + golem) >= 700 ? 700 : 1000)), true); takeItems(player, -1, getRegisteredItemIds()); htmltext = "30437-05.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java index c15113f089..19bddf7d4b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java @@ -48,10 +48,10 @@ public class Q00331_ArrowOfVengeance extends Quest } // Misc private static final int MIN_LVL = 32; - private static final int HARPY_FEATHER_ADENA = 78; - private static final int MEDUSA_VENOM_ADENA = 88; - private static final int WYRMS_TOOTH_ADENA = 92; - private static final int BONUS = 3100; + private static final int HARPY_FEATHER_ADENA = 6; + private static final int MEDUSA_VENOM_ADENA = 7; + private static final int WYRMS_TOOTH_ADENA = 9; + private static final int BONUS = 1000; private static final int BONUS_COUNT = 10; public Q00331_ArrowOfVengeance() diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java index 58b676d48d..2c1dd30ffe 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java @@ -1067,7 +1067,7 @@ public final class Q00333_HuntOfTheBlackLion extends Quest final long insignia = getQuestItemsCount(player, BLOODY_AXE_INSIGNIA); final long fang = getQuestItemsCount(player, DELU_LIZARDMAN_FANG); final long talon = getQuestItemsCount(player, STAKATO_TALON); - giveAdena(player, ((ash * 35) + (insignia * 35) + (((fang + 35) + (talon * 35)))), true); + giveAdena(player, ((ash * 10) + (insignia * 10) + (((fang + 7) + (talon * 8)))), true); takeItems(player, UNDEAD_ASH, -1); takeItems(player, BLOODY_AXE_INSIGNIA, -1); takeItems(player, DELU_LIZARDMAN_FANG, -1); @@ -1094,10 +1094,10 @@ public final class Q00333_HuntOfTheBlackLion extends Quest { giveItems(player, LIONS_CLAW, 3); } - giveAdena(player, (getQuestItemsCount(player, UNDEAD_ASH) * 35), true); - giveAdena(player, (getQuestItemsCount(player, BLOODY_AXE_INSIGNIA) * 35), true); - giveAdena(player, (getQuestItemsCount(player, DELU_LIZARDMAN_FANG) * 35), true); - giveAdena(player, (getQuestItemsCount(player, STAKATO_TALON) * 35), true); + giveAdena(player, (getQuestItemsCount(player, UNDEAD_ASH) * 10), true); + giveAdena(player, (getQuestItemsCount(player, BLOODY_AXE_INSIGNIA) * 10), true); + giveAdena(player, (getQuestItemsCount(player, DELU_LIZARDMAN_FANG) * 7), true); + giveAdena(player, (getQuestItemsCount(player, STAKATO_TALON) * 8), true); takeItems(player, UNDEAD_ASH, -1); takeItems(player, BLOODY_AXE_INSIGNIA, -1); takeItems(player, DELU_LIZARDMAN_FANG, -1); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java index b11de62e51..99142977c0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java @@ -34,8 +34,6 @@ public final class Q00354_ConquestOfAlligatorIsland extends Quest private static final int KLUCK = 30895; // Items private static final int ALLIGATOR_TOOTH = 5863; - private static final int MYSTERIOUS_MAP_PIECE = 5864; - private static final int PIRATES_TREASURE_MAP = 5915; // Misc private static final int MIN_LEVEL = 38; // Mobs @@ -48,7 +46,6 @@ public final class Q00354_ConquestOfAlligatorIsland extends Quest MOB1.put(20806, 0.88); // crokian_lad_warrior MOB1.put(20807, 0.92); // farhite_lad MOB2.put(20808, 14); // nos_lad - MOB2.put(20991, 69); // tribe_of_swamp } public Q00354_ConquestOfAlligatorIsland() @@ -58,7 +55,7 @@ public final class Q00354_ConquestOfAlligatorIsland extends Quest addTalkId(KLUCK); addKillId(MOB1.keySet()); addKillId(MOB2.keySet()); - registerQuestItems(ALLIGATOR_TOOTH, MYSTERIOUS_MAP_PIECE); + registerQuestItems(ALLIGATOR_TOOTH); } @Override @@ -89,18 +86,12 @@ public final class Q00354_ConquestOfAlligatorIsland extends Quest case "ADENA": { final long count = getQuestItemsCount(player, ALLIGATOR_TOOTH); - if (count >= 100) + if (count >= 400) { - giveAdena(player, (count * 220) + 10700, true); + giveAdena(player, 2000, true); takeItems(player, ALLIGATOR_TOOTH, -1); htmltext = "30895-06.html"; } - else if (count > 0) - { - giveAdena(player, (count * 220) + 3100, true); - takeItems(player, ALLIGATOR_TOOTH, -1); - htmltext = "30895-07.html"; - } else { htmltext = "30895-08.html"; @@ -113,21 +104,6 @@ public final class Q00354_ConquestOfAlligatorIsland extends Quest htmltext = event; break; } - case "REWARD": - { - final long count = getQuestItemsCount(player, MYSTERIOUS_MAP_PIECE); - if (count >= 10) - { - giveItems(player, PIRATES_TREASURE_MAP, 1); - takeItems(player, MYSTERIOUS_MAP_PIECE, 10); - htmltext = "30895-13.html"; - } - else if (count > 0) - { - htmltext = "30895-12.html"; - } - break; - } } return htmltext; } @@ -148,8 +124,6 @@ public final class Q00354_ConquestOfAlligatorIsland extends Quest final int itemCount = ((getRandom(100) < MOB2.get(npcId)) ? 2 : 1); giveItemRandomly(st.getPlayer(), npc, ALLIGATOR_TOOTH, itemCount, 0, 1.0, true); } - - giveItemRandomly(st.getPlayer(), npc, MYSTERIOUS_MAP_PIECE, 1, 0, 0.1, false); } return super.onKill(npc, player, isSummon); } @@ -166,7 +140,7 @@ public final class Q00354_ConquestOfAlligatorIsland extends Quest } else if (st.isStarted()) { - htmltext = (hasQuestItems(player, MYSTERIOUS_MAP_PIECE) ? "30895-11.html" : "30895-04.html"); + htmltext = "30895-04.html"; } return htmltext; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java index cba9922311..b704c9e643 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00355_FamilyHonor/Q00355_FamilyHonor.java @@ -120,13 +120,13 @@ public final class Q00355_FamilyHonor extends Quest } else if (galfredoRomersBustCount >= 100) { - giveAdena(player, (galfredoRomersBustCount * 120) + 7800, true); + giveAdena(player, (galfredoRomersBustCount * 20), true); takeItems(player, GALFREDO_ROMERS_BUST, -1); htmltext = "30181-07.html"; } else { - giveAdena(player, (galfredoRomersBustCount * 120) + 2800, true); + giveAdena(player, (galfredoRomersBustCount * 20), true); takeItems(player, GALFREDO_ROMERS_BUST, -1); htmltext = "30181-08.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java index 31ef57ca9a..3cf34593cc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java @@ -87,7 +87,6 @@ public final class Q00356_DigUpTheSeaOfSpores extends Quest } case "30717-09.html": { - addExpAndSp(player, 31850, 0); takeItems(player, CARNIVORE_SPORE, -1); takeItems(player, HERBIVOROUS_SPORE, -1); htmltext = event; @@ -101,7 +100,6 @@ public final class Q00356_DigUpTheSeaOfSpores extends Quest } case "30717-14.html": { - addExpAndSp(player, 45500, 2600); qs.exitQuest(true, true); htmltext = event; break; @@ -112,17 +110,17 @@ public final class Q00356_DigUpTheSeaOfSpores extends Quest int adena = 0; if (value < 20) { - adena = 44000; + adena = 3000; htmltext = "30717-15.html"; } else if (value < 70) { - adena = 20950; + adena = 1300; htmltext = "30717-16.html"; } else { - adena = 10400; + adena = 1300; htmltext = "30717-17.html"; } giveAdena(player, adena, true); @@ -146,9 +144,9 @@ public final class Q00356_DigUpTheSeaOfSpores extends Quest final int dropItem = ((npc.getId() == ROTTING_TREE) ? HERBIVOROUS_SPORE : CARNIVORE_SPORE); final int otherItem = ((dropItem == HERBIVOROUS_SPORE) ? CARNIVORE_SPORE : HERBIVOROUS_SPORE); - if (giveItemRandomly(qs.getPlayer(), npc, dropItem, 1, 50, MONSTER_DROP_CHANCES.get(npc.getId()), true)) + if (giveItemRandomly(qs.getPlayer(), npc, dropItem, 1, 100, MONSTER_DROP_CHANCES.get(npc.getId()), true)) { - if (getQuestItemsCount(killer, otherItem) >= 50) + if (getQuestItemsCount(killer, otherItem) >= 100) { qs.setCond(3); } @@ -171,8 +169,8 @@ public final class Q00356_DigUpTheSeaOfSpores extends Quest } else if (qs.isStarted()) { - final boolean hasAllHerbSpores = (getQuestItemsCount(player, HERBIVOROUS_SPORE) >= 50); - final boolean hasAllCarnSpores = (getQuestItemsCount(player, CARNIVORE_SPORE) >= 50); + final boolean hasAllHerbSpores = (getQuestItemsCount(player, HERBIVOROUS_SPORE) >= 100); + final boolean hasAllCarnSpores = (getQuestItemsCount(player, CARNIVORE_SPORE) >= 100); if (hasAllHerbSpores && hasAllCarnSpores) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java index 175880756c..40e521a7a9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java @@ -40,14 +40,14 @@ public final class Q00358_IllegitimateChildOfTheGoddess extends Quest // Rewards private static final int[] REWARDS = new int[] { - 5364, // Recipe: Sealed Dark Crystal Shield(60%) - 5366, // Recipe: Sealed Shield of Nightmare(60%) - 6329, // Recipe: Sealed Phoenix Necklace(70%) - 6331, // Recipe: Sealed Phoenix Earring(70%) - 6333, // Recipe: Sealed Phoenix Ring(70%) - 6335, // Recipe: Sealed Majestic Necklace(70%) - 6337, // Recipe: Sealed Majestic Earring(70%) - 6339, // Recipe: Sealed Majestic Ring(70%) + 4975, // Recipe: BlackOrc Neckalce + 4973, // Recipe: BlackOrc Earring + 4974, // Recipe: BlackOrc Ring + 4939, // Recipe: Adam Neckalce + 4937, // Recipe: Adam Earring + 4938, // Recipe: Adam Ring + 4936, // Recipe: Avadon Shield + 4980, // Recipe: Doom Shield }; // Mobs private static final Map MOBS = new HashMap<>(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java index f204efa994..a4e3e75872 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java @@ -39,10 +39,8 @@ public final class Q00360_PlunderTheirSupplies extends Quest private static final int MIN_LVL = 52; // Monsters private static final Map MONSTER_DROP_CHANCES = new HashMap<>(); - // Items - private static final int RECIPE_OF_SUPPLY = 5870; + // Item private static final int SUPPLY_ITEMS = 5872; - private static final int SUSPICIOUS_DOCUMENT_PIECE = 5871; static { @@ -56,7 +54,7 @@ public final class Q00360_PlunderTheirSupplies extends Quest addStartNpc(COLEMAN); addTalkId(COLEMAN); addKillId(MONSTER_DROP_CHANCES.keySet()); - registerQuestItems(SUPPLY_ITEMS, SUSPICIOUS_DOCUMENT_PIECE, RECIPE_OF_SUPPLY); + registerQuestItems(SUPPLY_ITEMS); } @Override @@ -108,19 +106,6 @@ public final class Q00360_PlunderTheirSupplies extends Quest playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } - if (getRandom(100) < 10) - { - if (getQuestItemsCount(killer, SUSPICIOUS_DOCUMENT_PIECE) < 4) - { - giveItems(killer, SUSPICIOUS_DOCUMENT_PIECE, 1); - } - else - { - giveItems(killer, RECIPE_OF_SUPPLY, 1); - takeItems(killer, SUSPICIOUS_DOCUMENT_PIECE, -1); - } - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - } return super.onKill(npc, killer, isPet); } @@ -140,35 +125,15 @@ public final class Q00360_PlunderTheirSupplies extends Quest case State.STARTED: { final long supplyCount = getQuestItemsCount(player, SUPPLY_ITEMS); - final long recipeCount = getQuestItemsCount(player, RECIPE_OF_SUPPLY); - if (supplyCount == 0) + if (supplyCount < 0) { - if (recipeCount == 0) - { - htmltext = "30873-05.html"; - } - else - { - giveAdena(player, (recipeCount * 6000), true); - takeItems(player, RECIPE_OF_SUPPLY, -1); - htmltext = "30873-08.html"; - } + htmltext = "30873-05.html"; } - else + else if (supplyCount >= 500) { - if (recipeCount == 0) - { - giveAdena(player, ((supplyCount * 100) + 6000), true); - takeItems(player, SUPPLY_ITEMS, -1); - htmltext = "30873-06.html"; - } - else - { - giveAdena(player, (((supplyCount * 100) + 6000) + (recipeCount * 6000)), true); - takeItems(player, SUPPLY_ITEMS, -1); - takeItems(player, RECIPE_OF_SUPPLY, -1); - htmltext = "30873-07.html"; - } + giveAdena(player, 14000, true); + takeItems(player, SUPPLY_ITEMS, -1); + htmltext = "30873-06.html"; } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java index 096b3e0faf..a25520f4df 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00369_CollectorOfJewels/Q00369_CollectorOfJewels.java @@ -149,7 +149,7 @@ public final class Q00369_CollectorOfJewels extends Quest { if (getQuestItemsCount(player, FLARE_SHARD, FREEZING_SHARD) >= 100) { - giveAdena(player, 31810, true); + giveAdena(player, 3000, true); takeItems(player, -1, FLARE_SHARD, FREEZING_SHARD); st.setMemoState(2); htmltext = "30376-04.html"; @@ -169,7 +169,7 @@ public final class Q00369_CollectorOfJewels extends Quest { if (getQuestItemsCount(player, FLARE_SHARD, FREEZING_SHARD) >= 400) { - giveAdena(player, 84415, true); + giveAdena(player, 12000, true); takeItems(player, -1, FLARE_SHARD, FREEZING_SHARD); st.exitQuest(true, true); htmltext = "30376-10.html"; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/06600-06699.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/06600-06699.xml index 23e1bc91ff..d7a34f8b0a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/06600-06699.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/06600-06699.xml @@ -488,8 +488,6 @@ - - @@ -510,8 +508,6 @@ - - @@ -522,8 +518,8 @@ - 71 - 31 + 51 + 19 @@ -532,8 +528,6 @@ - - @@ -544,8 +538,8 @@ - 48 - 21 + 32 + 9 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29000-29099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29000-29099.xml index 8582defbc6..df07ecd379 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29000-29099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29000-29099.xml @@ -102,6 +102,14 @@ + + + + + + + + @@ -109,8 +117,19 @@ + + + + + + + + + + + @@ -118,8 +137,19 @@ + + + + + + + + + + + @@ -132,6 +162,12 @@ + + + + + + @@ -144,6 +180,12 @@ + + + + + + @@ -345,6 +387,11 @@ + + + + + @@ -357,6 +404,11 @@ + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29500-29599.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29500-29599.xml index a9775b5072..bfa456180b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29500-29599.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29500-29599.xml @@ -240,8 +240,19 @@ + + + + + + + + + + + @@ -632,6 +643,12 @@ + + + + + + @@ -644,6 +661,12 @@ + + + + + + @@ -656,6 +679,11 @@ + + + + + @@ -668,6 +696,11 @@ + + + + + @@ -764,14 +797,37 @@ + + + + + + + + + + + - + + + + + + + + + + + + + @@ -882,6 +938,10 @@ + + + + 32 9 @@ -900,6 +960,10 @@ + + + + 51 19 @@ -918,6 +982,10 @@ + + + + 32 9 @@ -933,6 +1001,10 @@ + + + + @@ -992,6 +1064,10 @@ + + + + @@ -1006,6 +1082,10 @@ + + + + @@ -1023,14 +1103,25 @@ - - - - + + + - + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29600-29699.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29600-29699.xml index 832d5cf144..bebaa235ae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29600-29699.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29600-29699.xml @@ -913,6 +913,14 @@ + + + + + + + + @@ -928,7 +936,7 @@ - + @@ -941,11 +949,20 @@ + + + - - + + + + + + + + @@ -961,12 +978,11 @@ - - + - + - + @@ -1023,6 +1039,17 @@ + + + + + + + + + + + @@ -1043,14 +1070,7 @@ - - - - - - - - + @@ -1072,21 +1092,7 @@ - - - - - - - - - - - - - - - + @@ -1252,6 +1258,12 @@ + + + + + + @@ -1261,6 +1273,12 @@ + + + + + + @@ -1270,6 +1288,11 @@ + + + + + @@ -1282,6 +1305,11 @@ + + + + + @@ -1291,6 +1319,13 @@ + + + + + + + @@ -1300,6 +1335,13 @@ + + + + + + + @@ -1311,6 +1353,13 @@ + + + + + + + @@ -1320,6 +1369,13 @@ + + + + + + + @@ -1332,6 +1388,12 @@ + + + + + + 32 @@ -1344,6 +1406,11 @@ + + + + + 32 @@ -1359,6 +1426,12 @@ + + + + + + 48 10 @@ -1372,6 +1445,11 @@ + + + + + 48 10 @@ -1388,6 +1466,12 @@ + + + + + + 64 20 @@ -1401,6 +1485,11 @@ + + + + + 64 20 @@ -1427,6 +1516,12 @@ + + + + + + @@ -1436,6 +1531,12 @@ + + + + + + @@ -1445,6 +1546,8 @@ + + @@ -1523,6 +1626,11 @@ + + + + + @@ -1532,6 +1640,11 @@ + + + + + @@ -1539,8 +1652,16 @@ + + + + + + + + @@ -1548,8 +1669,16 @@ + + + + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29700-29799.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29700-29799.xml index cdb51e2580..6d162c0d11 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29700-29799.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29700-29799.xml @@ -603,6 +603,10 @@ + + + + @@ -616,6 +620,10 @@ + + + + @@ -629,6 +637,10 @@ + + + + @@ -642,6 +654,10 @@ + + + + @@ -655,6 +671,10 @@ + + + + @@ -668,6 +688,10 @@ + + + + @@ -681,6 +705,10 @@ + + + + @@ -694,6 +722,10 @@ + + + + @@ -707,6 +739,10 @@ + + + + @@ -720,6 +756,10 @@ + + + + @@ -733,6 +773,10 @@ + + + + @@ -746,6 +790,10 @@ + + + + @@ -759,6 +807,10 @@ + + + + @@ -772,6 +824,10 @@ + + + + @@ -785,6 +841,10 @@ + + + + @@ -798,6 +858,10 @@ + + + + @@ -811,6 +875,10 @@ + + + + @@ -824,6 +892,10 @@ + + + + @@ -837,6 +909,10 @@ + + + + @@ -850,6 +926,10 @@ + + + + @@ -863,6 +943,10 @@ + + + + @@ -876,6 +960,10 @@ + + + + @@ -889,6 +977,10 @@ + + + + @@ -902,6 +994,10 @@ + + + + @@ -915,6 +1011,10 @@ + + + + @@ -928,6 +1028,10 @@ + + + + @@ -941,6 +1045,10 @@ + + + + @@ -954,6 +1062,10 @@ + + + + @@ -967,6 +1079,10 @@ + + + + @@ -980,6 +1096,10 @@ + + + + @@ -993,6 +1113,10 @@ + + + + @@ -1006,6 +1130,10 @@ + + + + @@ -1017,6 +1145,10 @@ + + + + @@ -1028,6 +1160,10 @@ + + + + @@ -1039,6 +1175,10 @@ + + + + @@ -1050,6 +1190,10 @@ + + + + @@ -1061,6 +1205,10 @@ + + + + @@ -1072,6 +1220,10 @@ + + + + @@ -1083,6 +1235,10 @@ + + + + @@ -1094,6 +1250,10 @@ + + + + @@ -1105,6 +1265,10 @@ + + + + @@ -1116,6 +1280,10 @@ + + + + @@ -1127,6 +1295,10 @@ + + + + @@ -1138,6 +1310,10 @@ + + + + @@ -1149,6 +1325,10 @@ + + + + @@ -1160,6 +1340,10 @@ + + + + @@ -1171,5 +1355,9 @@ + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29800-29899.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29800-29899.xml index f22c2b3d30..6348297ba1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29800-29899.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29800-29899.xml @@ -10,6 +10,10 @@ + + + + @@ -21,6 +25,10 @@ + + + + @@ -32,6 +40,10 @@ + + + + @@ -43,6 +55,10 @@ + + + + @@ -54,6 +70,10 @@ + + + + @@ -65,6 +85,10 @@ + + + + @@ -76,6 +100,10 @@ + + + + @@ -87,6 +115,10 @@ + + + + @@ -98,6 +130,10 @@ + + + + @@ -109,6 +145,10 @@ + + + + @@ -120,6 +160,10 @@ + + + + @@ -131,6 +175,10 @@ + + + + @@ -142,6 +190,10 @@ + + + + @@ -153,6 +205,10 @@ + + + + @@ -164,6 +220,10 @@ + + + + @@ -175,6 +235,10 @@ + + + + @@ -186,6 +250,10 @@ + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29900-29999.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29900-29999.xml index 7e26a4f952..e0b4b2b843 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29900-29999.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/29900-29999.xml @@ -550,7 +550,6 @@ - @@ -559,12 +558,16 @@ + + + + + - @@ -573,6 +576,11 @@ + + + + + @@ -587,6 +595,11 @@ + + + + + @@ -601,6 +614,11 @@ + + + + + @@ -615,6 +633,11 @@ + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/34900-34999.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/34900-34999.xml index 18d3a79db5..08da6823af 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/34900-34999.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/34900-34999.xml @@ -11,6 +11,13 @@ + + + + + + + @@ -23,6 +30,13 @@ + + + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/36000-36099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/36000-36099.xml index 79952e9502..2709d18283 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/36000-36099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/36000-36099.xml @@ -3,18 +3,34 @@ - + + + + - + + + + + + - + + + + - + + + + + + @@ -27,5 +43,9 @@ + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/37700-37799.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/37700-37799.xml index ca1a029d5b..f6e32edc74 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/37700-37799.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/37700-37799.xml @@ -92,6 +92,20 @@ + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49000-49099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49000-49099.xml index 0e596dc0b1..95341a68c6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49000-49099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49000-49099.xml @@ -252,6 +252,18 @@ + + + + + + + + + + + + @@ -261,6 +273,18 @@ + + + + + + + + + + + + @@ -270,6 +294,18 @@ + + + + + + + + + + + + @@ -279,6 +315,18 @@ + + + + + + + + + + + + @@ -288,6 +336,18 @@ + + + + + + + + + + + + @@ -361,13 +421,27 @@ - + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49400-49499.xml index 978d4594e5..6457b22ce9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49400-49499.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49400-49499.xml @@ -1371,6 +1371,7 @@ 51 + 19 @@ -1446,15 +1447,27 @@ - + - - - + + + - + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49500-49599.xml index 802b8bcb98..89bf2e1bc2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49500-49599.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49500-49599.xml @@ -164,7 +164,7 @@ - + @@ -206,6 +206,13 @@ + + + + + + + @@ -834,6 +841,13 @@ + + + + + + + 40 15 @@ -847,6 +861,13 @@ + + + + + + + 61 25 @@ -860,6 +881,13 @@ + + + + + + + 40 15 @@ -873,6 +901,13 @@ + + + + + + + 48 21 @@ -886,6 +921,13 @@ + + + + + + + 71 31 @@ -899,6 +941,14 @@ + + + + + + + + 48 21 @@ -912,6 +962,13 @@ + + + + + + + 32 9 @@ -925,6 +982,13 @@ + + + + + + + 40 15 @@ -938,6 +1002,13 @@ + + + + + + + 48 21 @@ -1060,6 +1131,11 @@ + + + + + 48 21 @@ -1078,6 +1154,10 @@ + + + + 71 31 @@ -1096,6 +1176,11 @@ + + + + + 48 21 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49600-49699.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49600-49699.xml index 611a8ed545..96a49d4bdb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49600-49699.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49600-49699.xml @@ -114,6 +114,7 @@ + @@ -121,11 +122,15 @@ + + + + @@ -133,11 +138,15 @@ + + + + @@ -146,11 +155,15 @@ + + + + @@ -158,11 +171,15 @@ + + + + @@ -170,15 +187,25 @@ + + + + + + + + + + @@ -190,10 +217,15 @@ + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49700-49799.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49700-49799.xml index 439e75a426..783b08dcfa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49700-49799.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49700-49799.xml @@ -61,6 +61,10 @@ + + + + @@ -74,6 +78,10 @@ + + + + @@ -87,6 +95,10 @@ + + + + @@ -100,6 +112,10 @@ + + + + @@ -113,6 +129,10 @@ + + + + @@ -126,6 +146,10 @@ + + + + @@ -139,6 +163,10 @@ + + + + @@ -152,6 +180,10 @@ + + + + @@ -165,6 +197,10 @@ + + + + @@ -178,6 +214,10 @@ + + + + @@ -191,6 +231,10 @@ + + + + @@ -202,6 +246,10 @@ + + + + @@ -213,6 +261,10 @@ + + + + @@ -224,6 +276,10 @@ + + + + @@ -235,6 +291,10 @@ + + + + @@ -246,6 +306,10 @@ + + + + @@ -257,6 +321,10 @@ + + + + @@ -268,6 +336,10 @@ + + + + @@ -279,6 +351,10 @@ + + + + @@ -290,6 +366,10 @@ + + + + @@ -301,6 +381,10 @@ + + + + @@ -312,6 +396,10 @@ + + + + @@ -323,6 +411,10 @@ + + + + @@ -334,6 +426,10 @@ + + + + @@ -345,6 +441,10 @@ + + + + @@ -356,6 +456,10 @@ + + + + @@ -367,6 +471,11 @@ + + + + + @@ -378,6 +487,11 @@ + + + + + @@ -389,6 +503,11 @@ + + + + + @@ -400,6 +519,11 @@ + + + + + @@ -411,6 +535,11 @@ + + + + + @@ -422,6 +551,11 @@ + + + + + @@ -430,6 +564,10 @@ + + + + @@ -439,6 +577,12 @@ + + + + + + @@ -449,6 +593,12 @@ + + + + + + @@ -459,6 +609,12 @@ + + + + + + @@ -469,6 +625,12 @@ + + + + + + @@ -479,6 +641,12 @@ + + + + + + @@ -664,6 +832,10 @@ + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70000-70099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70000-70099.xml index d915862ae1..689f4d4903 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70000-70099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70000-70099.xml @@ -224,6 +224,11 @@ + + + + + @@ -237,6 +242,11 @@ + + + + + @@ -250,6 +260,11 @@ + + + + + @@ -263,6 +278,11 @@ + + + + + @@ -285,6 +305,10 @@ + + + + @@ -297,6 +321,10 @@ + + + + @@ -309,6 +337,10 @@ + + + + @@ -321,6 +353,10 @@ + + + + @@ -334,6 +370,10 @@ + + + + @@ -347,6 +387,10 @@ + + + + @@ -360,6 +404,10 @@ + + + + @@ -373,6 +421,10 @@ + + + + @@ -386,6 +438,10 @@ + + + + @@ -399,6 +455,10 @@ + + + + @@ -412,6 +472,10 @@ + + + + @@ -425,6 +489,10 @@ + + + + @@ -438,6 +506,10 @@ + + + + @@ -451,6 +523,10 @@ + + + + @@ -464,6 +540,10 @@ + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70100-70199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70100-70199.xml index ddbe5f2019..20f17add92 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70100-70199.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70100-70199.xml @@ -322,6 +322,9 @@ + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70200-70299.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70200-70299.xml index e0122e1fa7..3191f63360 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70200-70299.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70200-70299.xml @@ -255,6 +255,11 @@ + + + + + 48 21 @@ -273,6 +278,11 @@ + + + + + 71 31 @@ -291,6 +301,11 @@ + + + + + 48 21 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70300-70399.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70300-70399.xml index 72eb25b51a..77f532e0a6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70300-70399.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70300-70399.xml @@ -313,6 +313,11 @@ + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70400-70499.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70400-70499.xml index ead5f1208a..212e2928f4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70400-70499.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70400-70499.xml @@ -278,6 +278,10 @@ + + + + @@ -287,6 +291,10 @@ + + + + @@ -311,7 +319,7 @@ - + @@ -344,7 +352,7 @@ - + @@ -355,7 +363,7 @@ - + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70500-70599.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70500-70599.xml index 69612130a2..9d3d673b4e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70500-70599.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/70500-70599.xml @@ -262,7 +262,7 @@ - + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/90000-90099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/90000-90099.xml index 2f576e3396..a675987697 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/90000-90099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/90000-90099.xml @@ -345,7 +345,7 @@ - + @@ -363,7 +363,7 @@ - + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/90100-90199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/90100-90199.xml index 58e9d7d8e3..454b744f21 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/90100-90199.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/90100-90199.xml @@ -599,6 +599,10 @@ + + + + @@ -620,7 +624,7 @@ - + @@ -646,6 +650,10 @@ + + + + @@ -669,6 +677,10 @@ + + + + @@ -682,6 +694,10 @@ + + + + @@ -723,34 +739,76 @@ + + + + + + + + + + - + + + + + + + + + + + - + + + + + + + + + + + - + + + + + + + + + + + + + - + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20800-20899.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20800-20899.xml index 7047217556..c429b22a6f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20800-20899.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20800-20899.xml @@ -2114,6 +2114,7 @@ DIVINE MALE + @@ -4125,6 +4126,7 @@ DIVINE MALE + @@ -4199,6 +4201,7 @@ DIVINE MALE + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20900-20999.xml index 0656f46990..1edc09fb47 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20900-20999.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20900-20999.xml @@ -3805,7 +3805,7 @@ - + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21000-21099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21000-21099.xml index 94769d92a4..30e286d7c9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21000-21099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21000-21099.xml @@ -2913,6 +2913,7 @@ DIVINE MALE + @@ -3255,6 +3256,7 @@ DIVINE MALE + @@ -3388,6 +3390,7 @@ DIVINE MALE + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21200-21299.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21200-21299.xml index 7f267ff19f..2fc5131b2c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21200-21299.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/21200-21299.xml @@ -1925,7 +1925,7 @@ HUMANOID MALE - + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/24000-24099.xml index f0245e0739..b11566c8e5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/24000-24099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/24000-24099.xml @@ -309,9 +309,9 @@ - HUMANOID FEMALE + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/25000-25099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/25000-25099.xml index 1d5cbd8b2b..5d08e9ced5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/25000-25099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/25000-25099.xml @@ -1592,52 +1592,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/29000-29099.xml index 11211edf7f..f0bb0ac728 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/29000-29099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/29000-29099.xml @@ -10,10 +10,10 @@ BUG FEMALE - - - - + + + + @@ -21,7 +21,7 @@ 370 - + @@ -50,104 +50,104 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -330,17 +330,17 @@ CONSTRUCT MALE - - - - + + + + - + @@ -366,82 +366,82 @@ - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -920,10 +920,10 @@ ELEMENTAL FEMALE - - - - + + + + @@ -931,7 +931,7 @@ 710 - + @@ -960,56 +960,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + @@ -1298,11 +1298,12 @@ - - CONSTRUCT + + UNDEAD MALE - - + + + @@ -1312,7 +1313,7 @@ - + @@ -1417,7 +1418,7 @@ DIVINE MALE - + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00200-00299.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00200-00299.xml index d681e25115..fcb488ffe0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00200-00299.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00200-00299.xml @@ -2663,8 +2663,8 @@ 4000 icon.skill0247 2 - 300 - 2131 + 500 + 1458 30 30 A1 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00300-00399.xml index 7eabca91f4..cce46193cc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00300-00399.xml @@ -1175,9 +1175,6 @@ -1 ENEMY SINGLE - - - 15005 @@ -1189,7 +1186,7 @@ icon.skill0326 2 300 - 2131 + 2132 -1 30 A1 @@ -2741,7 +2738,6 @@ - icon.skill0370 1 P @@ -2749,18 +2745,17 @@ - 3 - 4 - 5 - 6 - 7 + 100 + 200 + 400 + 700 + 1000 - PER + DIFF - icon.skill0371 1 P @@ -2768,18 +2763,17 @@ - 6 - 8 - 10 - 12 - 14 + 200 + 400 + 600 + 900 + 1200 - PER + DIFF - icon.skill0372 1 P @@ -2787,13 +2781,13 @@ - 3 - 4 - 5 - 6 - 7 + 70 + 140 + 280 + 500 + 700 - PER + DIFF @@ -2901,11 +2895,11 @@ - 6 - 8 - 10 - 12 - 14 + 4 + 5 + 6 + 7 + 8 PER @@ -3189,11 +3183,13 @@ P 5 - + 1 2 3 + 4 + 5 P 5 @@ -3201,6 +3197,8 @@ 1 2 3 + 4 + 5 @@ -3208,6 +3206,8 @@ 3 6 10 + 4 + 5 PER @@ -3235,7 +3235,7 @@ 1000 icon.skill0395 40 - 1785 + 3031 -1 72 A2 @@ -3248,22 +3248,22 @@ SELF SINGLE - - 5 + + 5400 DIFF 4050 DIFF - - 5400 - DIFF - -80 BUFF + + 5 + DIFF + @@ -3276,7 +3276,7 @@ 1000 icon.skill0396 40 - 1785 + 3031 -1 72 A2 @@ -3289,7 +3289,10 @@ SELF SINGLE - + + 8 + DIFF + 500 DIFF @@ -3298,26 +3301,6 @@ 500 DIFF - - 20 - DIFF - - - -25 - DIFF - - - -25 - PER - - - -8 - DIFF - - - 8 - DIFF - 100 DIFF @@ -3326,13 +3309,30 @@ 100 DIFF + + 20 + DIFF + + + -80 + BUFF + 100 PER - - -80 - BUFF + + + -25 + PER + + + -25 + PER + + + -8 + DIFF diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01300-01399.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01300-01399.xml index cc3b90939d..8926edb015 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01300-01399.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01300-01399.xml @@ -3035,7 +3035,7 @@ 2 - 60 + 15 HERO_DEBUFF 80 1000 @@ -3065,14 +3065,11 @@ POINT_BLANK NOT_FRIEND - - - - + -50 PER - + -50 PER @@ -3088,12 +3085,15 @@ 100 DIFF + + + 1 - 30 + 8 HERO_DEBUFF TURN_FLEE 80 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01600-01699.xml index efc60f594d..73194458d1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01600-01699.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01600-01699.xml @@ -89,7 +89,7 @@ PD_UP 0 900 - 2000 + 4000 1 7 @@ -132,29 +132,489 @@ - - icon.skill0000 - A1 + 1 + 5 + STUN + STUN + 50 + true + 5-12 + 150 + PHYSICAL + 900 + 1000 + 2500 + + -213 + -218 + -223 + -228 + -233 + -237 + -242 + -247 + -252 + -257 + + + 42 + 46 + 50 + 54 + 58 + 62 + 66 + 70 + 74 + 78 + + + 63 + 70 + 78 + 85 + 92 + 99 + 106 + 112 + 121 + 133 + + icon.skill1606 + A2 + 10000 + NONE + 5 + SHOCK + ENEMY + RANGE + NOT_FRIEND + + + + POLE + + + + + + + 801 + 1002 + 1234 + 1497 + 1788 + 2104 + 2437 + 2726 + 3123 + 3435 + + true + true + + + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 + + - - icon.skill0000 + 40 + 720 + + -183 + -188 + -193 + -198 + -203 + -208 + -213 + -218 + -223 + -228 + -233 + -237 + -242 + -247 + -252 + -257 + -261 + -266 + -271 + -275 + -279 + -284 + -288 + -292 + -296 + -300 + -304 + -307 + -311 + -314 + -317 + -320 + -323 + -326 + -328 + -331 + -333 + -336 + -338 + -341 + + 400 + 1080 + icon.skill1607 + + 40 + 40 + 40 + 41 + 42 + 43 + 44 + 45 + 46 + 47 + 48 + 49 + 50 + 51 + 52 + 53 + 54 + 55 + 56 + 57 + 58 + 59 + 60 + 61 + 62 + 63 + 64 + 65 + 66 + 67 + 68 + 69 + 70 + 71 + 72 + 73 + 74 + 76 + 77 + 80 + + + 42 + 43 + 45 + 45 + 46 + 47 + 49 + 50 + 52 + 53 + 55 + 56 + 58 + 58 + 59 + 61 + 62 + 64 + 65 + 67 + 68 + 70 + 71 + 71 + 73 + 74 + 75 + 77 + 78 + 79 + 80 + 82 + 83 + 84 + 85 + 86 + 87 + 94 + 95 + 96 + + ATTACK A1 + 3000 + NONE + 5 + ENEMY + SINGLE + + + + SWORD + BLUNT + + + + + + + 465 + 494 + 525 + 557 + 590 + 625 + 662 + 699 + 738 + 779 + 821 + 864 + 909 + 956 + 1004 + 1052 + 1103 + 1155 + 1208 + 1262 + 1318 + 1374 + 1432 + 1490 + 1550 + 1610 + 1671 + 1733 + 1796 + 1859 + 1922 + 1985 + 2049 + 2112 + 2175 + 2239 + 2301 + 2361 + 2420 + 2478 + + true + 15 + true + 0.2 + + - - icon.skill0000 - A1 + + + 1 + 2 + + + 5 + + RESIST_DEATH + icon.skill10022 + A2 + SELF + SINGLE + + 38 + 42 + + 1080 + 300 + 600000 + 2 + S + NONE + NONE + 0 + + + + + + + 20 + 30 + + + - - icon.skill0000 - A1 + + 46 + 58 + 70 + + + 1 + 2 + 3 + + T + NONE + 5 + NONE + icon.skill1609 + + + + SWORD + BLUNT + + + + + + + 1 + 2 + 3 + + 2 + + + + 40 + 50 + 60 + + DIFF + + + + 1 + 2 + 3 + + DIFF + + + + 30 + 30 + 30 + + DIFF + + - - icon.skill0000 - A1 + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + + 15 + LIFE_FORCE_ORC + 50-50 + 1000 + 3500 + icon.skill1610 + 1 + + 20 + 22 + 26 + 30 + 34 + 40 + 42 + 46 + 50 + 54 + 56 + 58 + 60 + 62 + 64 + 66 + 68 + 70 + + + 32 + 39 + 45 + 51 + 58 + 62 + 67 + 72 + 75 + 81 + 85 + 88 + 90 + 91 + 92 + 93 + 95 + 96 + + A2 + 3000 + 600 + 500 + NONE;STRIDER;WYVERN;WOLF + NONE + 5 + TARGET + SINGLE + + + + 12 + 15 + 17 + 20 + 22 + 25 + 28 + 30 + 33 + 36 + 38 + 41 + 44 + 46 + 49 + 51 + 54 + 57 + + 1 + + icon.skill1611 @@ -195,29 +655,224 @@ A1 - - icon.skill0000 - A1 + 2 + 5 + STUN + STUN + 100 + PHYSICAL + 40 + 1200 + 500 + + 680 + 850 + 1047 + 1271 + 1518 + 1786 + 2069 + 2361 + 2652 + 2942 + + + 42 + 46 + 50 + 54 + 58 + 62 + 66 + 70 + 74 + 78 + + + 38 + 43 + 47 + 51 + 56 + 60 + 64 + 68 + 72 + 79 + + icon.skill1613 + true + 20 + A2 + 5000 + true + 500 + ATTACK + NONE + 5 + SHOCK + ENEMY + SINGLE + + + + BLUNT + + + + + + + 680 + 850 + 1047 + 1271 + 1518 + 1786 + 2069 + 2361 + 2652 + 2942 + + true + 15 + true + + + BUFF + 25 + 1 + + + + - - icon.skill0000 - A1 + 2000 + 500 + 2000 + + 42 + 52 + 62 + + + 12 + 15 + 18 + + 1 + 300 + icon.skill1615 + A2 + SELF + SINGLE + + + + 3 + 4 + 5 + + PER + + POLE + BLUNT + + + + L2Character + 1 + 99 + 10 + ENEMY + 60 + 1616 + 1 + + - - icon.skill0000 - A1 + icon.skill1616 + A2 + true + ENEMY + SINGLE + 1 + 15 + 100 + true + + + -10 + PER + + + -10 + PER + + - - icon.skill0000 - A1 + 2000 + 500 + 2000 + + 44 + 56 + 64 + + + 12 + 15 + 18 + + 1 + 300 + icon.skill1617 + A2 + SELF + SINGLE + + + + 3 + 4 + 5 + + + + L2Character + 1 + 99 + 5 + SELF + 50 + 1618 + 1 + + - - icon.skill0000 + 5000 + + 44 + 56 + 64 + + icon.skill1618 A1 + SELF + SINGLE + + + + 188 + 289 + 361 + + + @@ -233,9 +888,9 @@ 1 180 SHIELD_PROB_UP - 7 1000 - 2500 + 2000 + 500 icon.skill1621 A2 80 @@ -249,9 +904,6 @@ FRIEND - - 7 - @@ -266,15 +918,29 @@ 20 PER + + -20 + PER + - - -20 - PER - + 1 + 180 + 4 + 80 icon.skill1622 - A1 + A2 + true + SELF + SINGLE + NOT_FRIEND + + + -20 + PER + + 1 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01800-01899.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01800-01899.xml index 3251f808bb..b5b4c26efb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01800-01899.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01800-01899.xml @@ -12,12 +12,13 @@ 56 A2 7200000 + true + true 3000 NONE;STRIDER;WYVERN;WOLF NONE 5 0 - true SELF SINGLE 49543 @@ -81,12 +82,13 @@ 56 A2 7200000 + true 3000 + true NONE;STRIDER;WYVERN;WOLF NONE 5 0 - true SELF SINGLE 49543 @@ -150,12 +152,13 @@ 56 A2 3600000 + true 3000 + true NONE;STRIDER;WYVERN;WOLF NONE 5 0 - true SELF SINGLE 49543 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/02100-02199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/02100-02199.xml index 93901f6765..c856d8a675 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/02100-02199.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/02100-02199.xml @@ -954,8 +954,8 @@ - 500 - 5000 + 2000 + 10000 100000 500000 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03200-03299.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03200-03299.xml index 9d985a3496..a71c827b19 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03200-03299.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03200-03299.xml @@ -2491,374 +2491,208 @@ - - - 1 - 120 - TALISMAN - 532 - 4000 + icon.etc_talisman_i01 - 2 55 - 40 - 10 - A2 - 360000 - NONE;STRIDER;WYVERN;WOLF - NONE + P + 5 + + + + 10 + 20 + + DIFF + + + + + icon.etc_talisman_i01 + + 55 + 55 + 55 + + P 5 - true - SELF - SINGLE - 63 - DIFF - - - - - - 1 - 120 - TALISMAN - 532 - 4000 - icon.etc_talisman_i01 - 2 - 55 - 40 - 10 - A2 - 360000 - NONE;STRIDER;WYVERN;WOLF - NONE - 5 - true - SELF - SINGLE - - - 72 - DIFF - - - - - - 532 - 1200 - icon.etc_talisman_i00 - 2 - 55 - 40 - 10 - A1 - 300000 - NONE;STRIDER;WYVERN;WOLF - 5 - true - SELF - SINGLE - - - 200 - - - 200 - DIFF - - - - - - 1 - 120 - TALISMAN - 532 - 4000 - icon.etc_talisman_i01 - 2 - 55 - 40 - 10 - A2 - 360000 - NONE;STRIDER;WYVERN;WOLF - NONE - 5 - true - SELF - SINGLE - - - 220 - DIFF - - - - - - 1 - 120 - TALISMAN - 532 - 4000 - icon.etc_talisman_i01 - 2 - 55 - 40 - 10 - A2 - 360000 - NONE;STRIDER;WYVERN;WOLF - NONE - 5 - true - SELF - SINGLE - - - 30 + + 3 + 4 + 5 + PER - - - 1 - 120 - TALISMAN - 532 - 4000 - icon.etc_talisman_i01 - 2 - 55 - 40 - 10 - A2 - 360000 - NONE;STRIDER;WYVERN;WOLF - NONE + + icon.etc_talisman_i00 + + 55 + 55 + 55 + + P 5 - true - SELF - SINGLE - - 100 - DIFF + + + 3 + 5 + 6 + + PER - - - 1 - 120 - TALISMAN - 532 - 4000 + icon.etc_talisman_i01 - 2 - 55 - 40 - 10 - A2 - 360000 - NONE;STRIDER;WYVERN;WOLF - NONE + + 55 + 55 + 55 + + P + 5 + + + + 10 + 15 + 18 + + PER + + + + + icon.etc_talisman_i01 + + 55 + 55 + + P 5 - true - SELF - SINGLE - 2 + + 10 + 20 + DIFF - - - 1 - 120 - TALISMAN - 532 - 4000 - icon.etc_talisman_i00 - 2 - 55 - 40 - 10 - A2 - 360000 - NONE;STRIDER;WYVERN;WOLF - NONE - 5 - true - SELF - SINGLE - - - 10 - PER - - - - - - 1 - 30 - TALISMAN - 532 - 4000 - icon.etc_talisman_i00 - 2 - 55 - 40 - 10 - A2 - true - 900000 - NONE;STRIDER;WYVERN;WOLF - NONE - 5 - true - SELF - SINGLE - - - - - 27 - 5 - - - -90 - PER - - - - - - 1 - 120 - TALISMAN - STEALTH - 532 - 4000 + icon.etc_talisman_i01 - 2 - 55 - 40 - 10 - A2 - 240000 - NONE;STRIDER;WYVERN;WOLF - NONE + + 55 + 55 + 55 + + P 5 - true - SELF - SINGLE - - 100 + + + 3 + 4 + 5 + + PER - - -40 + + + + icon.etc_talisman_i01 + + 55 + 55 + 55 + + P + 5 + + + + 3 + 5 + 6 + + PER + + + + + icon.etc_talisman_i00 + + 55 + 55 + 55 + + P + 5 + + + + 10 + 15 + 18 + + PER + + + + + icon.etc_talisman_i00 + + 55 + 55 + 55 + + P + 5 + + + + 3 + 5 + 7 + + PER + + + + + icon.etc_talisman_i01 + + 55 + 55 + 55 + + P + 5 + + + + 3 + 5 + 7 + PER - 1 - 300 + 10 TALISMAN 532 - 4000 + 3000 icon.etc_talisman_i00 2 55 - 40 - 10 - A2 - 360000 - NONE;STRIDER;WYVERN;WOLF - NONE - 5 - true - SELF - SINGLE - - - -4 - PER - 1 - - - -10 - PER - 0 - - - -10 - PER - 3 - - - - - - 1 - 90 - TALISMAN - 532 - 4000 - icon.etc_talisman_i00 - 2 - 55 - 40 - 10 - A2 - 900000 - NONE;STRIDER;WYVERN;WOLF - NONE - 5 - true - SELF - SINGLE - - - -100 - PER - 1 - - - -100 - PER - 0 - - - -100 - PER - 3 - - - - - - 1 - 120 - TALISMAN - 532 - 4000 - icon.etc_talisman_i01 - 2 - 55 - 40 - 10 A2 300000 NONE;STRIDER;WYVERN;WOLF @@ -2868,24 +2702,44 @@ SELF SINGLE - - 100 - DIFF + + -100 + DEBUFF + 5 - - + + 532 + 3000 + icon.etc_talisman_i00 + 2 + 55 + A2 + 300000 + true + NONE;STRIDER;WYVERN;WOLF + NONE + 5 + SELF + SINGLE + + + DEBUFF + 100 + -1 + + + + 1 10 TALISMAN 532 - 1200 + 4000 icon.etc_talisman_i01 2 55 - 40 - 10 A2 900000 NONE;STRIDER;WYVERN;WOLF @@ -2895,247 +2749,273 @@ SELF SINGLE - - 2700 + + 1800 DIFF - - 3600 + + 1620 DIFF + + -80 + BUFF + + + + + 1 + 15 + TALISMAN + 70 + 532 + 3000 + 900 + icon.etc_talisman_i01 + 2 + 55 + A2 + 180000 + NONE;STRIDER;WYVERN;WOLF + MAGIC + 5 + true + ENEMY + SINGLE + + + -70 + PER + - 1 - 120 + 15 TALISMAN + 600 532 - 4000 + 70 + 3000 icon.etc_talisman_i01 2 + true 55 - 40 - 10 A2 - 360000 + 180000 NONE;STRIDER;WYVERN;WOLF NONE 5 - true - SELF + ENEMY SINGLE - - 8.7 - DIFF - - - 10.1 - DIFF - - - 3 - DIFF - - - -11 - DIFF - - - -13.6 - DIFF - - - -1 - DIFF - - 4 - DIFF + -20 + PER - 3 - DIFF + -20 + PER - + 1 + 15 + TALISMAN + 70 532 - 1200 + 3000 + 600 icon.etc_talisman_i05 2 55 - 40 - 10 - A1 - 360000 + A2 + 180000 + true NONE;STRIDER;WYVERN;WOLF 5 - true - SELF + ENEMY SINGLE - - BLEEDING,9 + + -30 + PER - + 1 + 10 + TALISMAN 532 - 1200 + 3000 icon.etc_talisman_i05 2 55 - 40 - 10 - A1 - 360000 + A2 + 240000 NONE;STRIDER;WYVERN;WOLF 5 - true SELF SINGLE - - ROOT_PHYSICALLY,9 + + -100 + DEBUFF + 5 - 532 - 1200 + 3000 icon.etc_talisman_i05 2 55 - 40 - 10 - A1 - 360000 + A2 + 240000 + true NONE;STRIDER;WYVERN;WOLF 5 - true SELF SINGLE - - ROOT_MAGICALLY,9 + + DEBUFF + 100 + -1 - + 1 + 10 + TALISMAN 532 - 1200 + 3000 icon.etc_talisman_i05 2 55 - 40 - 10 - A1 - 360000 + A2 + 900000 NONE;STRIDER;WYVERN;WOLF 5 - true SELF SINGLE - - ROOT_PHYSICALLY,3;ROOT_MAGICALLY,3 + + 3600 + DIFF + + + 3240 + DIFF + + + -80 + BUFF - + 1 + 15 + TALISMAN 532 - 1200 + 3000 + 900 + 70 icon.etc_talisman_i05 2 55 - 40 - 10 - A1 - 360000 + true + A2 + 120000 NONE;STRIDER;WYVERN;WOLF 5 - true - SELF + ENEMY SINGLE - - SILENCE_PHYSICAL,9 + + -70 + PER - + 1 + 15 + TALISMAN + 600 + 70 532 - 1200 + 3000 + true icon.etc_talisman_i05 2 55 - 40 - 10 - A1 - 360000 + A2 + 120000 NONE;STRIDER;WYVERN;WOLF 5 - true - SELF + ENEMY SINGLE - - SILENCE,9 + + -20 + PER + + + -20 + PER - + 1 + 15 + TALISMAN + 70 532 - 1200 + 600 + 3000 icon.etc_talisman_i05 2 55 - 40 - 10 - A1 - 360000 + A2 + 120000 NONE;STRIDER;WYVERN;WOLF 5 - true - SELF + ENEMY SINGLE - - SILENCE_ALL,9 + + -30 + PER - icon.etc_talisman_i02 55 P 5 - - 20.8 - DIFF + + 4 + PER - icon.etc_talisman_i02 55 P 5 - - 24.3 + + 43 DIFF diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03500-03599.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03500-03599.xml index b9950a8b27..9cda4e9e4d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03500-03599.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03500-03599.xml @@ -1034,104 +1034,201 @@ - - + icon.accessory_earring_of_orfen_i00 75 P 5 - 10 - 10 + + 5 + 10 + 15 + + + 10 + 15 + 20 + - 5 - 5 + + 5 + 10 + 15 + + + 10 + 15 + 20 + - 2 + + 2 + 4 + 6 + PER - - 19 - DIFF - - 2 + + 2 + 3 + 5 + PER + + 3 + 80 + - - - + icon.accessory_ring_of_baium_i00 75 P 5 - 40 - 30 + + 10 + 15 + 20 + + + 5 + 10 + 15 + - 40 - 30 - - - 2 - DIFF + + 10 + 15 + 20 + + + 5 + 10 + 15 + - 4 + + 2 + 3 + 4 + PER - 4 + + 2 + 3 + 4 + PER - + + + 2 + 4 + 6 + + PER + + + + 2 + 4 + 6 + + PER + + 15 PER + + 10 + PER + - - - + icon.accessory_ring_of_queen_ant_i00 75 P 5 - 10 - 10 + + 10 + 15 + 20 + - 10 - 10 + + 10 + 15 + 20 + - 2 + + 1 + 2 + 3 + DIFF - - 4 - PER - - - 4 - PER - - - 9 + + + 1 + 2 + 3 + DIFF + + + 4 + 6 + 10 + + PER + + + + 4 + 6 + 10 + + PER + + + + 0 + 0 + 10 + + PER + + + + 0 + 0 + 10 + + PER + - + icon.accessory_ring_of_core_i00 75 @@ -1139,35 +1236,75 @@ 5 - 10 + + 10 + 15 + 20 + - 10 + + 10 + 15 + 20 + - - 1 + + + 1 + 2 + 3 + + DIFF + + + + 1 + 2 + 3 + DIFF - 2 + + 2 + 4 + 6 + ENEMY_ALL PER - 2 + + 2 + 4 + 6 + ENEMY_ALL PER - 2 + + 2 + 4 + 6 + PER - 2 + + 2 + 4 + 6 + PER - 2 + + 2 + 4 + 6 + PER diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/04000-04099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/04000-04099.xml index 0278e4e1f7..d0c5349b73 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/04000-04099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/04000-04099.xml @@ -3047,9 +3047,6 @@ -5 ENEMY SINGLE - - - 665060 @@ -3070,9 +3067,6 @@ -5 TARGET SINGLE - - - 628 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/04200-04299.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/04200-04299.xml index 855706eaea..01ade1ebe4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/04200-04299.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/04200-04299.xml @@ -1392,9 +1392,6 @@ -5 ENEMY SINGLE - - - 1330120 @@ -1444,9 +1441,6 @@ -5 ENEMY SINGLE - - - diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/09400-09499.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/09400-09499.xml index dde3a51aa5..9a7f15e503 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/09400-09499.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/09400-09499.xml @@ -1,8 +1,7 @@  - - + icon.skilltransform4 A2 1800000 @@ -15,8 +14,34 @@ 2 3600 true + true 4 SELF SINGLE + + + 1 + 85 + CASTER + + + + + 5 + PER + + + 5 + PER + + + 20 + PER + + + 20 + PER + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/09500-09599.xml index 1eaa58e312..09ac7e4afd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/09500-09599.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/09500-09599.xml @@ -1,11 +1,12 @@  - icon.skill0000 A1 2000 200 + 35751 + 1 NONE;STRIDER;WYVERN;WOLF 5 1 @@ -26,11 +27,12 @@ - icon.skill0000 A1 2000 200 + 35752 + 1 NONE;STRIDER;WYVERN;WOLF 5 1 @@ -51,11 +53,12 @@ - icon.skill0000 A1 2000 200 + 35753 + 1 NONE;STRIDER;WYVERN;WOLF 5 1 @@ -76,11 +79,12 @@ - icon.skill0000 A1 2000 200 + 35754 + 1 NONE;STRIDER;WYVERN;WOLF 5 1 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/09600-09699.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/09600-09699.xml index 5b3f2bebed..aef320cd56 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/09600-09699.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/09600-09699.xml @@ -4,10 +4,14 @@ etc_whiteday_candy_i05 P - 1 + 500 - 25 + 15 + PER + + + 15 PER @@ -16,27 +20,36 @@ etc_whiteday_candy_i06 P - 1 + 500 - 25 + 15 + PER + + + 15 PER - - 36081 + icon.skill9620 + 2 1 - icon.skill0000 + 36081 + 1 A1 NONE;STRIDER;WYVERN;WOLF 5 0 - 1 - 500 SELF SINGLE + + + 20 + 10 + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/13100-13199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/13100-13199.xml index 3a2b18fb49..f8fd5c40d6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/13100-13199.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/13100-13199.xml @@ -7,6 +7,18 @@ 5 55 + + 10 + PER + + + 10 + PER + + + 10 + PER + 5 PER @@ -15,17 +27,23 @@ 10 PER - - 10 - PER + + 5 + 5 + 5 + 5 + 5 + 5 + 5 + 5 - - 10 - PER + + 20 + DIFF - - 10 - PER + + 20 + DIFF 10 @@ -43,10 +61,6 @@ 4 PER - - 20 - PER - diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/17100-17199.xml index a5d907b7fd..ec26a650c6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/17100-17199.xml @@ -52,38 +52,35 @@ - icon.etc_whiteday_herb - 37704 - 1 - A2 - NONE - 1 + 2 + 5 120 - TRANSFORM + RHAPSODY CHANGE_VALENTINE - 5 - 0 - 2 - 1 + icon.etc_whiteday_herb + A2 + 100 + 100 2000 NONE;STRIDER;WYVERN;WOLF SELF SINGLE + true - 100.0 + 15 PER - 100.0 + 15 PER - - 100.0 + + 15 PER - - 100.0 + + 15 PER diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/19000-19099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/19000-19099.xml index 99e2f42e78..eb1391bb90 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/19000-19099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/19000-19099.xml @@ -1,7 +1,7 @@  - + icon.skill19009 A2 100 @@ -24,27 +24,13 @@ FRIEND - 5 - PER - - - 5 - PER - - - 5 + 2 PER - 6 + 2 PER - - 5 - - - 5 - @@ -187,7 +173,6 @@ - icon.amor_goodness_cloak 1 P @@ -199,86 +184,97 @@ - + 5 PER - + 5 PER - + 5 PER - - 2 - STR + + 3 + PER - - 2 - INT + + 5 + PER - - 2 - CON + + 3 + 3 + 3 + 3 + 3 + 3 + 3 + 3 - - 2 - DEX + + 10 + DIFF - - 2 - WIT + + 10 + DIFF - - 2 - MEN + + 3 + DIFF - icon.amor_evilness_cloak 1 P 5 - + 5 PER - + 5 PER - + 5 PER - - 2 - STR + + 3 + PER - - 2 - INT + + 5 + PER - - 2 - CON + + 3 + 3 + 3 + 3 + 3 + 3 + 3 + 3 - - 2 - DEX + + 10 + DIFF - - 2 - WIT + + 10 + DIFF - - 2 - MEN + + 3 + DIFF diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/19100-19199.xml index 2d59c64568..9dca4fda73 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/19100-19199.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/19100-19199.xml @@ -1,8 +1,10 @@  - - + + 1 + 30 + PUBLIC_SLOT icon.skill_recall A2 600 @@ -10,19 +12,43 @@ 1800000 -100 true + -1 + A2 + NONE;STRIDER;WYVERN;WOLF + -5 + ENEMY + SINGLE + 49758 + 2 + true + + + - - + icon.skill_resurrection + 1 + 30 + PUBLIC_SLOT A2 600 2000 - 500 1800000 - 1 -100 true + -1 + A2 + NONE;STRIDER;WYVERN;WOLF + -5 + ENEMY + SINGLE + true + 49758 + 2 + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/35000-35099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/35000-35099.xml index 7dca9a6fcf..3050fcb4b3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/35000-35099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/35000-35099.xml @@ -142,34 +142,100 @@ A1 - - icon.skill0000 + icon.skill35016 + 1800000 + 200 A1 + 1 + SELF + SINGLE + + + DEBUFF + 100 + 5 + + - - icon.skill0000 + icon.skill35017 A1 - - icon.skill0000 - A1 + icon.tallisman_oman_i01 + SEED_TALISMAN1 + SEED_TALISMAN5 + A2 + NONE + NONE;STRIDER;WYVERN;WOLF + 5 + -2 + 0 + 31 + 40 + 6 + -1 + true + true + 3 + SELF + SINGLE - - icon.skill0000 + icon.tallisman_oman_i01 A1 + 1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + 40 + HOLD + 2 + SELF + SINGLE + + + SEED_TALISMAN1,-1 + + - - icon.skill0000 - A1 + icon.skill35020 + SEED_TALISMAN1 + SEED_TALISMAN4 + A2 + NONE + NONE;STRIDER;WYVERN;WOLF + 5 + -2 + 0 + 31 + 40 + 6 + -1 + true + true + 3 + SELF + SINGLE - - icon.skill0000 + icon.skill35021 A1 + 1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + 40 + HOLD + 2 + SELF + SINGLE + + + SEED_TALISMAN1,-1 + + @@ -182,24 +248,368 @@ A1 - - icon.skill0000 - A1 + + icon.bm_magic_square_talisman + icon.bm_magic_square_talisman + icon.bm_magic_square_talisman + icon.bm_magic_square_talisman + icon.bm_magic_square_talisman + icon.bm_magic_square_talisman + icon.bm_magic_square_talisman + icon.bm_magic_square_talisman + icon.bm_magic_square_talisman + icon.bm_magic_square_talisman + icon.bm_blessed_magic_square_talisman + + P + 55 + true + + + + 12 + 14 + 17 + 19 + 22 + 24 + 29 + 34 + 38 + 43 + 48 + + DIFF + + + + 12 + 14 + 17 + 19 + 22 + 24 + 29 + 34 + 38 + 43 + 48 + + DIFF + + + + 0 + 1 + 1 + 1 + 1 + 2 + 2 + 2 + 2 + 2 + 2 + + DIFF + + + + 0 + 1 + 1 + 1 + 1 + 2 + 2 + 2 + 2 + 2 + 2 + + PER + + + + 0 + 0 + 80 + 80 + 120 + 160 + 160 + 200 + 240 + 280 + 320 + + DIFF + + + + 0 + 0 + 80 + 80 + 120 + 160 + 160 + 200 + 240 + 280 + 320 + + DIFF + + + + 0 + 0 + 80 + 80 + 120 + 160 + 160 + 200 + 240 + 280 + 320 + + DIFF + + + + 0 + 0 + 3 + 3 + 5 + 5 + 7 + 7 + 8 + 8 + 8 + + DIFF + + + + 0 + 0 + 0 + 7 + 10 + 15 + 15 + 15 + 15 + 20 + 30 + + DIFF + + + + 0 + 0 + 0 + 7 + 10 + 15 + 15 + 15 + 15 + 20 + 30 + + DIFF + + + + 0 + 0 + 3 + 3 + 4 + 4 + 5 + 5 + 5 + 5 + 5 + + PER + + + + 0 + 0 + 3 + 3 + 4 + 4 + 5 + 5 + 5 + 5 + 5 + + PER + + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 4 + 6 + 8 + + DIFF + + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 4 + 6 + 8 + + DIFF + + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 4 + 6 + 8 + + DIFF + + + L2Playable + 1 + 111 + 35027 + + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 2 + 2 + 3 + 4 + + 1 + 10 + SELF + + - - icon.skill0000 + icon.skill35025 + 60000 + 600 + 3000 + NONE;STRIDER;WYVERN;WOLF + 500 + 566 + TARGET + SINGLE + 1 A1 + + + POISON,9 + + + BLEEDING,9 + + + PARALYZE,1 + + + TURN_STONE,1 + + - icon.skill0000 A1 - - icon.skill0000 - A1 + icon.skill35027 + 1 + 15 + 55 + 5 + true + 4 + 0 + SELF + SINGLE + A2 + + + + 2 + 5 + 7 + 10 + + PER + + + + 2 + 5 + 7 + 10 + + PER + + + + 10 + 30 + 40 + 40 + + PER + + + + 10 + 30 + 40 + 40 + + PER + + @@ -242,14 +652,95 @@ A1 - - icon.skill0000 - A1 + icon.skill35036 + P + 5 + true + 1 + -1 + + + 3 + PER + + + 3 + PER + + + 3 + PER + + + 20 + DIFF + + + 20 + DIFF + + + 2 + PER + + + 2 + PER + + + 1 + DIFF + + + 1 + DIFF + + + 5 + DIFF + + - - icon.skill0000 - A1 + icon.skill35037 + P + 5 + true + 1 + -1 + + + 3 + PER + + + 3 + PER + + + 3 + PER + + + 2 + PER + + + 4 + PER + + + 4 + PER + + + -3 + DEBUFF + + + 10 + + @@ -265,13 +756,21 @@ PER - -3 + 3 + PER + + + 3 PER 20 DIFF + + 20 + DIFF + 2 PER @@ -280,8 +779,8 @@ 1 DIFF - - 5 + + 1 DIFF @@ -296,19 +795,26 @@ -1 - 3 + -3 PER -3 PER + + -3 + PER + 2 PER - - 0 + + 4 + PER + + 4 PER diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39000-39099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39000-39099.xml index 3f686f29cb..df4623d095 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39000-39099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39000-39099.xml @@ -71,29 +71,128 @@ A1 - - icon.skill0000 - A1 + 4 + 1200 + PA_UP + 4000 + icon.etc_scroll_white_i00 + 2 + 1 + 29685 + 1 + A2 + NONE;STRIDER;WYVERN;WOLF + NONE + 5 + SELF + SINGLE + + + 12 + PER + + - - icon.skill0000 - A1 + 4 + 1200 + PD_UP + 4000 + icon.etc_scroll_white_i00 + 2 + 1 + 29684 + 1 + A2 + NONE;STRIDER;WYVERN;WOLF + NONE + 5 + SELF + SINGLE + + + 12 + PER + + - - icon.skill0000 - A1 + 1 + 300 + AGATHION_SONG_DANCE + 1000 + 549 + 2500 + icon.skill39016 + 4 + 58 + 60 + A2 + 3000 + NONE + NONE + 5 + SELF + SINGLE + FRIEND + + + 5 + PER + + - - icon.skill0000 - A1 + 1 + 300 + AGATHION_SONG_DANCE + 1000 + 495 + 2500 + icon.skill39017 + 4 + 52 + 60 + A2 + 3000 + NONE + NONE + 5 + SELF + SINGLE + FRIEND + + + 5 + PER + + - - icon.skill0000 - A1 + 1 + 300 + AGATHION_SONG_DANCE + 1000 + 438 + 2500 + icon.skill39018 + 4 + 46 + 60 + A2 + 3000 + NONE + NONE + 5 + SELF + SINGLE + FRIEND + + + 20 + DIFF + + icon.event_classic_ring @@ -120,29 +219,134 @@ - - icon.skill0000 + icon.skill39020 A1 + 2000 + 200 + 49026 + 1 + NONE;STRIDER;WYVERN;WOLF + 5 + 1 + 2 + 3000 + SELF + SINGLE + + + + CASTER + + + + + -1 + + - - icon.skill0000 + icon.skill39021 A1 + 2000 + 200 + 49027 + 1 + NONE;STRIDER;WYVERN;WOLF + 5 + 1 + 2 + 3000 + SELF + SINGLE + + + + CASTER + + + + + -1 + + - - icon.skill0000 + icon.skill39022 A1 + 2000 + 200 + 49028 + 1 + NONE;STRIDER;WYVERN;WOLF + 5 + 1 + 2 + 3000 + SELF + SINGLE + + + + CASTER + + + + + -1 + + - - icon.skill0000 + icon.skill39023 A1 + 2000 + 200 + 49029 + 1 + NONE;STRIDER;WYVERN;WOLF + 5 + 1 + 2 + 3000 + SELF + SINGLE + + + + CASTER + + + + + -1 + + - - icon.skill0000 + icon.skill39024 A1 + 2000 + 200 + 49030 + 1 + NONE;STRIDER;WYVERN;WOLF + 5 + 1 + 2 + 3000 + SELF + SINGLE + + + + CASTER + + + + + -1 + + @@ -160,9 +364,25 @@ A1 - - icon.skill0000 - A1 + 1 + 1200 + SPEED_UP + icon.etc_potion_green_i00 + 2 + 1 + A2 + NONE;STRIDER;WYVERN;WOLF + NONE + 5 + 0 + SELF + SINGLE + + + 20 + DIFF + + icon.skill39029 @@ -572,9 +792,48 @@ A1 - - icon.skill0000 - A1 + + icon.skilltransform4 + A2 + 1800000 + 1 + BR_EVENT_BUF1 + NONE + NONE;STRIDER;WYVERN;WOLF + 5 + -3 + 2 + 1800 + true + true + 4 + SELF + SINGLE + + + 1 + 85 + CASTER + + + + + 5 + PER + + + 5 + PER + + + 20 + PER + + + 20 + PER + + @@ -668,9 +927,36 @@ A1 - - icon.skill0000 - A1 + icon.skill39082 + P + 5 + 1 + + + 1 + STR + + + 1 + DEX + + + 1 + CON + + + 1 + INT + + + 1 + WIT + + + 1 + MEN + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39100-39199.xml index e06306b4d2..26a2a9402f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39100-39199.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39100-39199.xml @@ -259,19 +259,133 @@ A1 - - icon.skill0000 + icon.skill39147 + 2 + 1 + 49706 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 20 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - icon.skill0000 + icon.skill39148 + 2 + 1 + 49738 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 20 + 10 + + + + + + + + + + + - - icon.skill0000 + icon.skill39149 + 2 + 1 + 49755 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 20 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39200-39299.xml index 4e9c935602..a2b903add3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39200-39299.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39200-39299.xml @@ -116,24 +116,180 @@ A1 - - icon.skill0000 - A1 + icon.skill39223 + A2 + true + 2 + 300 + PA_UP_HERB + 1 + true + true + true + SELF + PARTY + FRIEND + + + 10 + PER + + + 10 + PER + + + 15 + PER + + + 15 + PER + + + 15 + PER + + + 15 + PER + + + 10 + PER + + + 10 + PER + + + 10 + DIFF + + - - icon.skill0000 - A1 + icon.skill39224 + A2 + 1 + 3600 + BUFF_SPECIAL_MULTI + 1 + NONE + NONE;STRIDER;WYVERN;WOLF + 5 + -2 + -2 + 1 + SELF + SINGLE + true + + + 10 + PER + + + 10 + PER + + + 10 + PER + + + 10 + PER + + + 5 + PER + + + -10 + DEBUFF + + - - icon.skill0000 - A1 + icon.skill39225 + A2 + 1 + 3600 + BUFF_SPECIAL_MULTI + 1 + NONE + NONE;STRIDER;WYVERN;WOLF + 5 + -2 + -2 + 1 + SELF + SINGLE + + + 10 + PER + + + 10 + PER + + + 10 + PER + + + 5 + PER + + + -10 + DEBUFF + + - - icon.skill0000 - A1 + icon.skill39226 + A2 + 1 + 3600 + BUFF_SPECIAL_MULTI + 1 + NONE + NONE;STRIDER;WYVERN;WOLF + 5 + -2 + -2 + 1 + SELF + SINGLE + + + 3 + DIFF + + + 3 + DIFF + + + 10 + PER + + + 15 + PER + + + 10 + PER + + + -10 + DEBUFF + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55000-55099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55000-55099.xml index 0c587d97b3..0afe75d925 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55000-55099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55000-55099.xml @@ -2,10 +2,14 @@ icon.skill55000 - 1 - 29648 - 1 + + 1 + 2 + 3 + 4 + 1200 + VOTE A2 5 1 @@ -21,11 +25,21 @@ - 30 + + 30 + 40 + 50 + 100 + PER - 30 + + 30 + 40 + 50 + 100 + PER @@ -41,14 +55,130 @@ A1 - - icon.skill0000 - A1 + icon.skill55003 + A2 + 1 + 1200 + 29011 + 1 + 1 + 1 + NONE;STRIDER;WYVERN;WOLF + true + 5 + SELF + SINGLE + + + 12 + PER + + + 20 + DIFF + + + 2 + DIFF + + + 20 + PER + + + 55 + PER + + + 15 + PER + + + 12 + PER + + + -25 + DIFF + + - - icon.skill0000 - A1 + icon.skill55004 + A2 + 1 + 1200 + 29012 + 1 + 1 + 1 + NONE;STRIDER;WYVERN;WOLF + true + 5 + SELF + SINGLE + + + 15 + PER + + + 33 + DIFF + + + 3 + DIFF + + + 25 + PER + + + 65 + PER + + + 23 + PER + + + 15 + PER + + + -36 + DIFF + + + 10 + PER + + + 2 + DIFF + + + 25 + PER + + + 23 + PER + + + 10 + PER + + + 10 + PER + + + 15 + PER + + @@ -101,14 +231,41 @@ A1 - - icon.skill0000 + icon.skill55015 + 1 + 29031 + 2 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 435 + DIFF + + - - icon.skill0000 + 1 + 29032 + 2 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 1000 + DIFF + + @@ -201,24 +358,168 @@ A1 - - icon.skill0000 - A1 + icon.skill55035 + A2 + 1 + 1200 + 29552 + 1 + 1 + 1 + NONE;STRIDER;WYVERN;WOLF + true + 5 + SELF + SINGLE + + + 12 + PER + + + 20 + DIFF + + + 2 + DIFF + + + 20 + PER + + + 55 + PER + + + 15 + PER + + + 12 + PER + + + -25 + DIFF + + - - icon.skill0000 - A1 + icon.skill55036 + A2 + 1 + 1200 + 29553 + 1 + 1 + 1 + NONE;STRIDER;WYVERN;WOLF + true + 5 + SELF + SINGLE + + + 15 + PER + + + 33 + DIFF + + + 3 + DIFF + + + 25 + PER + + + 65 + PER + + + 23 + PER + + + 15 + PER + + + -36 + DIFF + + + 10 + PER + + + 2 + DIFF + + + 25 + PER + + + 23 + PER + + + 10 + PER + + + 10 + PER + + + 15 + PER + + - - icon.skill0000 + icon.skill55037 + 1 + 29554 + 2 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 435 + DIFF + + - - icon.skill0000 + icon.skill55038 + 1 + 29555 + 2 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 1000 + DIFF + + @@ -231,14 +532,57 @@ A1 - - icon.skill0000 - A1 + icon.skill55041 + 1 + 3600 + VOTE + A2 + 5 + 1 + true + SELF + SINGLE + + + 1 + 85 + CASTER + + + + + 20 + PER + + + 20 + PER + + - - icon.skill0000 - A1 + icon.skill55042 + P + 5 + 1 + true + + + 1 + 85 + CASTER + + + + + 10 + PER + + + 10 + PER + + @@ -301,7 +645,7 @@ SINGLE - 33 + 20 DIFF @@ -317,9 +661,33 @@ A1 - - icon.skill0000 - A1 + icon.skill55051 + 1 + 1200 + VOTE + A2 + 5 + 1 + true + SELF + SINGLE + + + 1 + 85 + CASTER + + + + + 30 + PER + + + 30 + PER + + @@ -337,14 +705,130 @@ A1 - - icon.skill0000 - A1 + icon.skill55055 + A2 + 1 + 1200 + 29654 + 1 + 1 + 1 + NONE;STRIDER;WYVERN;WOLF + true + 5 + SELF + SINGLE + + + 12 + PER + + + 20 + DIFF + + + 2 + DIFF + + + 20 + PER + + + 55 + PER + + + 15 + PER + + + 12 + PER + + + -25 + DIFF + + - - icon.skill0000 - A1 + icon.skill55056 + A2 + 1 + 1200 + 29655 + 1 + 1 + 1 + NONE;STRIDER;WYVERN;WOLF + true + 5 + SELF + SINGLE + + + 15 + PER + + + 33 + DIFF + + + 3 + DIFF + + + 25 + PER + + + 65 + PER + + + 23 + PER + + + 15 + PER + + + -36 + DIFF + + + 10 + PER + + + 2 + DIFF + + + 25 + PER + + + 23 + PER + + + 10 + PER + + + 10 + PER + + + 15 + PER + + @@ -362,59 +846,293 @@ A1 - - icon.skill0000 - A1 + icon.skill55061 + + 1 + 2 + + 1200 + VOTE + A2 + 5 + 1 + true + SELF + SINGLE + + + 1 + 85 + CASTER + + + + + + 35 + 35 + + PER + + + + 35 + 35 + + PER + + - - icon.skill0000 - A1 + icon.skill55062 + + 3 + 3 + + 1200 + VOTE + A2 + 5 + 1 + true + SELF + SINGLE + + + 1 + 85 + CASTER + + + + + + 45 + 45 + + PER + + + + 45 + 45 + + PER + + - - icon.skill0000 + icon.skill55063 + 1 + 29671 + 2 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 435 + DIFF + + - - icon.skill0000 + icon.skill55064 + 1 + 29672 + 2 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 1000 + DIFF + + - - icon.skill0000 - A1 + icon.skill55065 + 4 + 1200 + 2 + 1 + 29673 + 1 + A2 + NONE;STRIDER;WYVERN;WOLF + NONE + 5 + SELF + SINGLE + + + -5 + PER + + + -10 + PER + + + -2 + PER + + + 5 + PER + + + 10 + PER + + + 5 + PER + + + 5 + PER + + + 5 + DIFF + + - - icon.skill0000 - A1 + icon.skill55066 + 4 + 1200 + 2 + 1 + 29674 + 1 + A2 + NONE;STRIDER;WYVERN;WOLF + NONE + 5 + SELF + SINGLE + + + 25 + PER + + - - icon.skill0000 + icon.skill55067 + 200 + 2 + 1 + 29675 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + + CASTLE + + + + + CASTLE + + - - icon.skill0000 - A1 + icon.skill55068 + 1 + 1200 + PRESERVE_ABNORMAL + 400 + 1 + 900 + 4000 + 1 + 1 + 29676 + 99 + 55 + 14 + A2 + 2000 + NONE;STRIDER;WYVERN;WOLF + NONE + 5 + TARGET + SINGLE + + + - - icon.skill0000 - A1 + icon.skill55069 + P + + + 20 + DIFF + + + 5 + DIFF + + + 3 + DIFF + + - - icon.skill0000 - A1 + icon.skill55070 + P + + + 0.2 + PER + + + 2 + PER + + + 10 + DIFF + + - - icon.skill0000 - A1 + icon.skill55071 + P + + + 20 + DIFF + + + 3 + DIFF + + + 5 + DIFF + + @@ -472,24 +1190,168 @@ A1 - - icon.skill0000 + icon.skill55083 + 1 + 29695 + 2 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 435 + DIFF + + - icon.skill0000 + 1 + 29696 + 2 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 1000 + DIFF + + - - icon.skill0000 - A1 + icon.skill55085 + A2 + 1 + 600 + 29697 + 1 + 1 + 1 + NONE;STRIDER;WYVERN;WOLF + true + 5 + SELF + SINGLE + + + 12 + PER + + + 20 + DIFF + + + 2 + DIFF + + + 20 + PER + + + 55 + PER + + + 15 + PER + + + 12 + PER + + + -25 + DIFF + + - - icon.skill0000 - A1 + icon.skill55086 + A2 + 1 + 600 + 29698 + 1 + 1 + 1 + NONE;STRIDER;WYVERN;WOLF + true + 5 + SELF + SINGLE + + + 15 + PER + + + 33 + DIFF + + + 3 + DIFF + + + 25 + PER + + + 65 + PER + + + 23 + PER + + + 15 + PER + + + -36 + DIFF + + + 10 + PER + + + 2 + DIFF + + + 25 + PER + + + 23 + PER + + + 10 + PER + + + 10 + PER + + + 15 + PER + + @@ -502,9 +1364,38 @@ A1 - - icon.skill0000 + icon.skil55089 + 2 + 1 + 29578 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 20 + 10 + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55100-55199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55100-55199.xml index 57d3ade1c9..469e2acf03 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55100-55199.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55100-55199.xml @@ -380,99 +380,730 @@ A1 - - icon.skill0000 - A1 + icon.skill155168 + A2 + 1 + 10800 + CLAN_TEAMWORK + SELF + + + 3 + PER + + + 3 + PER + + - - icon.skill0000 - A1 + icon.skill55169 + A2 + 2 + 10800 + CLAN_TEAMWORK + SELF + + + 5 + PER + + + 5 + PER + + + 2 + PER + + + 2 + PER + + + 2 + PER + + - - icon.skill0000 - A1 + icon.skill55170 + A2 + 2 + 10800 + CLAN_TEAMWORK + SELF + + + 7 + PER + + + 7 + PER + + + 5 + PER + + + 5 + PER + + + 5 + PER + + - - icon.skill0000 - A1 + icon.skill55171 + A2 + 2 + 10800 + CLAN_TEAMWORK + SELF + + + 10 + PER + + + 10 + PER + + + 8 + PER + + + 8 + PER + + + 8 + PER + + + 7 + PER + + + 7 + PER + + + 7 + PER + + - - icon.skill0000 + icon.skill55172 + 2 + 1 + 70025 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 20 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - icon.skill0000 + icon.skill55173 + 2 + 1 + 70026 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 20 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - icon.skill0000 + 2 + 1 + 70027 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 20 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - icon.skill0000 + 2 + 1 + 70028 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 20 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - icon.skill0000 - A1 + icon.skill55176 + P + + + 8 + PER + + - - icon.skill0000 - A1 + icon.skill55177 + P + + + 8 + PER + + - - icon.skill0000 - A1 + icon.skill55178 + P + + + 6 + PER + + - - icon.skill0000 - A1 + icon.skill55179 + P + + + 6 + PER + + - - icon.skill0000 - A1 + icon.skill55180 + P + + + 8 + PER + + - - icon.skill0000 - A1 + icon.skill55181 + P + + + 5 + PER + + + 5 + PER + + - - icon.skill0000 - A1 + icon.skill55182 + P + + + 6 + PER + + - - icon.skill0000 - A1 + icon.skill55183 + P + + + 10 + DIFF + + - - icon.skill0000 - A1 + icon.skill55184 + P + + + 5 + DIFF + + + 5 + DIFF + + - - icon.skill0000 - A1 + icon.skill55185 + P + + + 15 + DIFF + + - - icon.skill0000 - A1 + icon.skill55186 + 240000 + 4000 + 7 + NONE;STRIDER;WYVERN;WOLF + STEALTH + 40 + T + + + 9 + 5 + + + 100 + + + -20 + PER + + icon.skill55187 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55200-55299.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55200-55299.xml index df93a375c0..bdaa70e44b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55200-55299.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55200-55299.xml @@ -505,8 +505,8 @@ SINGLE - 15 - PER + 20 + DIFF @@ -530,8 +530,8 @@ SINGLE - 15 - PER + 20 + DIFF @@ -621,6 +621,18 @@ SELF SINGLE + + -5 + PER + + + -10 + PER + + + -2 + DIFF + 5 PER @@ -633,18 +645,6 @@ 5 DIFF - - -10 - PER - - - -5 - PER - - - -10 - DIFF - 5 PER @@ -728,29 +728,111 @@ - - icon.skill0000 - A1 + icon.skill55248 + 20 + P + 5 + + + 1 + + - icon.skill0000 - A1 + 20 + P + 5 + + + 1 + + + 1 + CON + + - - icon.skill0000 - A1 + icon.skill55250 + 20 + P + 5 + + + 2 + + + 1 + CON + + + 1 + MEN + + - - icon.skill0000 - A1 + icon.skill55251 + 20 + P + 5 + + + 2 + + + 1 + CON + + + 1 + MEN + + + 1 + WIT + + + 1 + DEX + + - icon.skill0000 - A1 + 20 + P + 5 + + + 3 + + + 1 + CON + + + 1 + MEN + + + 1 + WIT + + + 1 + DEX + + + 1 + STR + + + 1 + INT + + icon.skill55253 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55300-55399.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55300-55399.xml index 933e4d1419..e9ccac6b10 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55300-55399.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55300-55399.xml @@ -136,9 +136,47 @@ A1 - - icon.skill0000 + icon.skill55327 A1 + 1 + 7200 + BUFF_SPECIAL_MULTI + 1 + NONE + NONE;STRIDER;WYVERN;WOLF + 5 + -2 + -2 + 1 + SELF + SINGLE + true + + + 10 + PER + + + 10 + PER + + + 10 + PER + + + 10 + PER + + + 5 + PER + + + -10 + DEBUFF + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skills.xsd index 85593abe8d..be1183aaf8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skills.xsd +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skills.xsd @@ -570,8 +570,8 @@ - - + + @@ -1354,7 +1354,7 @@ - + @@ -1760,12 +1760,21 @@ + + + + + + + + + - + @@ -1788,23 +1797,29 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -1973,23 +1988,17 @@ - - - - - - - - - + + + + + - - - + @@ -2001,6 +2010,7 @@ + diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java index 58a65a181c..a6479d1d4c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java @@ -512,6 +512,7 @@ public enum AbnormalType AIRBIND(365), KNOCKDOWN(367), EARTHWORM_DEBUFF(424), + AGATHION_SONG_DANCE(444), INSIDE_POSITION(593), STEEL_MIND(596); diff --git a/L2J_Mobius_Classic_2.0_Saviors/readme.txt b/L2J_Mobius_Classic_2.0_Saviors/readme.txt index 480d27e143..4042aa34c7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/readme.txt +++ b/L2J_Mobius_Classic_2.0_Saviors/readme.txt @@ -58,5 +58,4 @@ Custom work TODO list -Parse retail monster spawns by zone --Test quests and update rewards -Provisional Clan Halls