diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java index e1400e4a66..b063673f7f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java @@ -21,10 +21,8 @@ import com.l2jmobius.gameserver.enums.CategoryType; 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.variables.PlayerVariables; import com.l2jmobius.gameserver.network.serverpackets.RadarControl; import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.util.Util; @@ -41,17 +39,19 @@ public final class Q00211_TrialOfTheChallenger extends Quest private static final int MARTIAN = 30645; private static final int RALDO = 30646; private static final int CHEST_OF_SHYSLASSYS = 30647; + // Monsters + private static final int SHYSLASSYS = 27110; + private static final int CAVEBASILISK = 27111; + private static final int GORR = 27112; + private static final int BARAHAM = 27113; + private static final int QUEEN_OF_SUCCUBUS = 27114; // Items private static final int LETTER_OF_KASH = 2628; private static final int WATCHERS_EYE1 = 2629; private static final int WATCHERS_EYE2 = 2630; private static final int SCROLL_OF_SHYSLASSYS = 2631; private static final int BROKEN_KEY = 2632; - // Monsters - private static final int SHYSLASSYS = 27110; - private static final int GORR = 27112; - private static final int BARAHAM = 27113; - private static final int QUEEN_OF_SUCCUBUS = 27114; + // Rewards private static final int ELVEN_NECKLACE_BEADS = 1904; private static final int WHITE_TUNIC_PATTERN = 1936; @@ -62,7 +62,6 @@ public final class Q00211_TrialOfTheChallenger extends Quest private static final int BRIGAMDINE_GAUNTLET_PATTERN = 2927; private static final int TOME_OF_BLOOD_PAGE = 2030; private static final int MARK_OF_CHALLENGER = 2627; - private static final ItemHolder DIMENSIONAL_DIAMONDS = new ItemHolder(7562, 61); // Misc private static final int MIN_LVL = 35; @@ -71,7 +70,7 @@ public final class Q00211_TrialOfTheChallenger extends Quest super(211); addStartNpc(KASH); addTalkId(FILAUR, KASH, MARTIAN, RALDO, CHEST_OF_SHYSLASSYS); - addKillId(SHYSLASSYS, GORR, BARAHAM, QUEEN_OF_SUCCUBUS); + addKillId(SHYSLASSYS, CAVEBASILISK, GORR, BARAHAM, QUEEN_OF_SUCCUBUS); registerQuestItems(LETTER_OF_KASH, WATCHERS_EYE1, WATCHERS_EYE2, SCROLL_OF_SHYSLASSYS, BROKEN_KEY); } @@ -105,21 +104,8 @@ public final class Q00211_TrialOfTheChallenger extends Quest } case "30644-06.htm": { - if (qs.isCreated()) - { - final PlayerVariables vars = player.getVariables(); - if (vars.getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMONDS); - vars.set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = event; - } - else - { - htmltext = "30644-05.htm"; - } - qs.startQuest(); - } + qs.startQuest(); + htmltext = event; break; } case "30647-02.html": @@ -333,15 +319,6 @@ public final class Q00211_TrialOfTheChallenger extends Quest addExpAndSp(talker, 1067606, 69242); giveAdena(talker, 194556, true); giveItems(talker, MARK_OF_CHALLENGER, 1); - - // redundant retail check - already rewarded at beginning of quest - final PlayerVariables vars = talker.getVariables(); - if (vars.getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(talker, DIMENSIONAL_DIAMONDS); - vars.set("2ND_CLASS_DIAMOND_REWARD", 1); - } - talker.sendPacket(new SocialAction(talker.getObjectId(), 3)); qs.exitQuest(false, true); htmltext = "30646-07.html"; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java index 23d201265a..c25a388821 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java @@ -20,12 +20,10 @@ import com.l2jmobius.gameserver.enums.CategoryType; 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.base.ClassId; import com.l2jmobius.gameserver.model.holders.ItemHolder; import com.l2jmobius.gameserver.model.items.L2Weapon; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; -import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.util.Util; @@ -64,7 +62,7 @@ public final class Q00212_TrialOfDuty extends Quest private static final int SKELETON_RAIDER = 20191; private static final int STRAIN = 20200; private static final int GHOUL = 20201; - private static final int BREKA_ORC_OVERLORD = 20270; + private static final int BREKA_ORC_PREFECT = 20270; private static final int LETO_LIZARDMAN = 20577; private static final int LETO_LIZARDMAN_ARCHER = 20578; private static final int LETO_LIZARDMAN_SOLDIER = 20579; @@ -74,7 +72,6 @@ public final class Q00212_TrialOfDuty extends Quest private static final int SPIRIT_OF_SIR_HEROD = 27119; // Rewards private static final int MARK_OF_DUTY = 2633; - private static final int DIMENSIONAL_DIAMOND = 7562; // Misc private static final int MIN_LEVEL = 35; @@ -83,7 +80,7 @@ public final class Q00212_TrialOfDuty extends Quest super(212); addStartNpc(HANNAVALT); addTalkId(HANNAVALT, DUSTIN, SIR_COLLIN_WINDAWOOD, SIR_ARON_TANFORD, SIR_KIEL_NIGHTHAWK, ISAEL_SILVERSHADOW, SPIRIT_OF_SIR_TALIANUS); - addKillId(HANGMAN_TREE, SKELETON_MARAUDER, SKELETON_RAIDER, STRAIN, GHOUL, BREKA_ORC_OVERLORD, LETO_LIZARDMAN, LETO_LIZARDMAN_ARCHER, LETO_LIZARDMAN_SOLDIER, LETO_LIZARDMAN_WARRIOR, LETO_LIZARDMAN_SHAMAN, LETO_LIZARDMAN_OVERLORD, SPIRIT_OF_SIR_HEROD); + addKillId(HANGMAN_TREE, SKELETON_MARAUDER, SKELETON_RAIDER, STRAIN, GHOUL, BREKA_ORC_PREFECT, LETO_LIZARDMAN, LETO_LIZARDMAN_ARCHER, LETO_LIZARDMAN_SOLDIER, LETO_LIZARDMAN_WARRIOR, LETO_LIZARDMAN_SHAMAN, LETO_LIZARDMAN_OVERLORD, SPIRIT_OF_SIR_HEROD); registerQuestItems(LETTER_OF_DUSTIN, KNIGHTS_TEAR, MIRROR_OF_ORPIC, TEAR_OF_CONFESSION, REPORT_PIECE.getId(), TALIANUSS_REPORT, TEAR_OF_LOYALTY, MILITAS_ARTICLE.getId(), SAINTS_ASHES_URN, ATHEBALDTS_SKULL, ATHEBALDTS_RIBS, ATHEBALDTS_SHIN, LETTER_OF_WINDAWOOD, OLD_KNIGHTS_SWORD); } @@ -107,15 +104,6 @@ public final class Q00212_TrialOfDuty extends Quest qs.startQuest(); qs.setMemoState(1); qs.set("flag", 0); - - if (rewardDimensionalDiamonds(player)) - { - html = "30109-04a.htm"; - } - else - { - html = "30109-04.htm"; - } } break; } @@ -236,7 +224,7 @@ public final class Q00212_TrialOfDuty extends Quest } break; } - case BREKA_ORC_OVERLORD: + case BREKA_ORC_PREFECT: { if (qs.isMemoState(11)) { @@ -307,7 +295,6 @@ public final class Q00212_TrialOfDuty extends Quest giveItems(talker, MARK_OF_DUTY, 1); qs.exitQuest(false, true); talker.sendPacket(new SocialAction(talker.getObjectId(), 3)); - rewardDimensionalDiamonds(talker); } break; } @@ -563,25 +550,4 @@ public final class Q00212_TrialOfDuty extends Quest } return html; } - - private static boolean rewardDimensionalDiamonds(L2PcInstance player) - { - final PlayerVariables vars = player.getVariables(); - - if (vars.getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - if (player.getClassId() == ClassId.KNIGHT) - { - rewardItems(player, DIMENSIONAL_DIAMOND, 45); - } - else - { - rewardItems(player, DIMENSIONAL_DIAMOND, 61); - } - - vars.set("2ND_CLASS_DIAMOND_REWARD", 1); - return true; - } - return false; - } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java index d0cb4d8ac5..f1c5f7bf08 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java @@ -66,7 +66,6 @@ public final class Q00213_TrialOfTheSeeker extends Quest private static final int TERRYS_REPORT = 2672; // Reward private static final int MARK_OF_SEEKER = 2673; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monsters private static final int ANT_CAPTAIN = 20080; private static final int ANT_WARRIOR_CAPTAIN = 20088; @@ -113,16 +112,6 @@ public final class Q00213_TrialOfTheSeeker extends Quest giveItems(player, DUFNERS_LETTER, 1); } playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 128); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30106-05a.htm"; - } - else - { - htmltext = "30106-05.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java index afe0c4ca4c..3998cbd93a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java @@ -94,7 +94,6 @@ public final class Q00214_TrialOfTheScholar extends Quest private static final int SYMBOL_OF_CRONOS = 2720; // Reward private static final int MARK_OF_SCHOLAR = 2674; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monsters private static final int MONSTER_EYE_DESTREOYER = 20068; private static final int MEDUSA = 20158; @@ -141,16 +140,6 @@ public final class Q00214_TrialOfTheScholar extends Quest giveItems(player, MIRIENS_1ST_SIGIL, 1); } playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 168); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30461-04a.htm"; - } - else - { - htmltext = "30461-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java index 38d7f34453..8e837708da 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java @@ -59,7 +59,6 @@ public final class Q00215_TrialOfThePilgrim extends Quest private static final int TAG_OF_RUMOR = 2733; // Reward private static final int MARK_OF_PILGRIM = 2721; - private static final int DIMENSIONAL_DIAMOND = 7562; // Quest Monster private static final int LAVA_SALAMANDER = 27116; private static final int NAHIR = 27117; @@ -96,16 +95,6 @@ public final class Q00215_TrialOfThePilgrim extends Quest qs.setMemoState(1); giveItems(player, VOUCHER_OF_TRIAL, 1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 49); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30648-04a.htm"; - } - else - { - htmltext = "30648-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java index ff68c34be8..42efc705da 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java @@ -62,7 +62,6 @@ public final class Q00216_TrialOfTheGuildsman extends Quest private static final int JOURNEYMAN_RING = 3139; // Reward private static final int MARK_OF_GUILDSMAN = 3119; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monsters private static final int ANT = 20079; private static final int ANT_CAPTAIN = 20080; @@ -116,16 +115,6 @@ public final class Q00216_TrialOfTheGuildsman extends Quest giveItems(player, VALKONS_RECOMMENDATION, 1); } playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 85); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30103-06d.htm"; - } - else - { - htmltext = "30103-06.htm"; - } } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java index b21b3310e1..f66c7c68bd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java @@ -73,7 +73,6 @@ public final class Q00217_TestimonyOfTrust extends Quest private static final int HEART_OF_PORTA = 2761; // Reward private static final int MARK_OF_TRUST = 2734; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int DRYAD = 20013; private static final int DRYAD_ELDER = 20019; @@ -127,16 +126,6 @@ public final class Q00217_TestimonyOfTrust extends Quest giveItems(player, LETTER_TO_ELF, 1); giveItems(player, LETTER_TO_DARKELF, 1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 96); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30191-04a.htm"; - } - else - { - htmltext = "30191-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java index 922cfe069f..50e512a79b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java @@ -75,7 +75,6 @@ public final class Q00218_TestimonyOfLife extends Quest private static final int TALINS_PERIDOT = 3171; // Reward private static final int MARK_OF_LIFE = 3140; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int ANT_RECRUIT = 20082; private static final int ANT_PATROL = 20084; @@ -125,16 +124,7 @@ public final class Q00218_TestimonyOfLife extends Quest giveItems(player, CARDIENS_LETTER, 1); } playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 102); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30460-04a.htm"; - } - else - { - htmltext = "30460-04.htm"; - } + htmltext = "30460-04.htm"; } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java index 66e25a9952..7a89655864 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java @@ -76,7 +76,6 @@ public final class Q00219_TestimonyOfFate extends Quest private static final int ARKENIAS_LETTER = 3202; // Reward private static final int MARK_OF_FATE = 3172; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int HANGMAN_TREE = 20144; private static final int MARSH_STAKATO = 20157; @@ -125,16 +124,6 @@ public final class Q00219_TestimonyOfFate extends Quest qs.startQuest(); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, KAIRAS_LETTER, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 98); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30476-05a.htm"; - } - else - { - htmltext = "30476-05.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java index b8de47e6ea..0633a48772 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java @@ -84,7 +84,6 @@ public final class Q00220_TestimonyOfGlory extends Quest private static final int RITUAL_BOX = 3237; // Reward private static final int MARK_OF_GLORY = 3203; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int TYRANT = 20192; private static final int TYRANT_KINGPIN = 20193; @@ -139,16 +138,6 @@ public final class Q00220_TestimonyOfGlory extends Quest qs.startQuest(); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, VOKIANS_ORDER, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 109); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30514-05a.htm"; - } - else - { - htmltext = "30514-05.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java index 52f8382eb9..4f49e360c7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java @@ -98,7 +98,6 @@ public final class Q00221_TestimonyOfProsperity extends Quest private static final int CRYSTAL_BROOCH = 3428; // Reward private static final int MARK_OF_PROSPERITY = 3238; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int MANDRAGORA_SPROUT1 = 20154; private static final int MANDRAGORA_SAPLING = 20155; @@ -145,16 +144,6 @@ public final class Q00221_TestimonyOfProsperity extends Quest giveItems(player, RING_OF_TESTIMONY_1ST, 1); } playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 50); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30104-04e.htm"; - } - else - { - htmltext = "30104-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java index 266bb23240..344c85fcb6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java @@ -58,7 +58,6 @@ public final class Q00222_TestOfTheDuelist extends Quest private static final int LAKINS_MACE = 2783; // Reward private static final int MARK_OF_DUELIST = 2762; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int PUNCHER = 20085; private static final int NOBLE_ANT_LEADER = 20090; @@ -111,23 +110,6 @@ public final class Q00222_TestOfTheDuelist extends Quest giveItems(player, ORDER_OREN, 1); giveItems(player, ORDER_ADEN, 1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - if (player.getClassId() == ClassId.PALUS_KNIGHT) - { - giveItems(player, DIMENSIONAL_DIAMOND, 104); - } - else - { - giveItems(player, DIMENSIONAL_DIAMOND, 72); - } - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30623-07a.htm"; - } - else - { - htmltext = "30623-07.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java index 746b5c3cd2..9fea4a5104 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java @@ -55,7 +55,6 @@ public final class Q00223_TestOfTheChampion extends Quest private static final int LETO_LIZARDMAN_FANG = 3292; // Reward private static final int MARK_OF_CHAMPION = 3276; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int HARPY = 20145; private static final int MEDUSA = 20158; @@ -103,23 +102,6 @@ public final class Q00223_TestOfTheChampion extends Quest qs.startQuest(); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, ASCALONS_1ST_LETTER, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - if (player.getClassId() == ClassId.WARRIOR) - { - giveItems(player, DIMENSIONAL_DIAMOND, 72); - } - else - { - giveItems(player, DIMENSIONAL_DIAMOND, 64); - } - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30624-06a.htm"; - } - else - { - htmltext = "30624-06.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java index 5e05f048ff..633dfcd735 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java @@ -55,7 +55,6 @@ public final class Q00224_TestOfSagittarius extends Quest private static final int BLOOD_OF_LIZARDMAN = 3306; // Reward private static final int MARK_OF_SAGITTARIUS = 3293; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int ANT = 20079; private static final int ANT_CAPTAIN = 20080; @@ -113,16 +112,6 @@ public final class Q00224_TestOfSagittarius extends Quest qs.setMemoState(1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, BERNARDS_INTRODUCTION, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 96); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30702-04a.htm"; - } - else - { - htmltext = "30702-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java index 5774af8c35..5057010c45 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java @@ -68,7 +68,6 @@ public final class Q00225_TestOfTheSearcher extends Quest private static final int ALEXS_RECOMMEND = 2808; // Reward private static final int MARK_OF_SEARCHER = 2809; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int HANGMAN_TREE = 20144; private static final int ROAD_SCAVENGER = 20551; @@ -110,23 +109,6 @@ public final class Q00225_TestOfTheSearcher extends Quest qs.setMemoState(1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, LUTHERS_LETTER, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - if (player.getClassId() == ClassId.SCAVENGER) - { - giveItems(player, DIMENSIONAL_DIAMOND, 82); - } - else - { - giveItems(player, DIMENSIONAL_DIAMOND, 96); - } - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30690-05a.htm"; - } - else - { - htmltext = "30690-05.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java index f8339b6b60..42028af2d6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java @@ -20,7 +20,6 @@ import com.l2jmobius.gameserver.enums.CategoryType; 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.base.ClassId; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.network.serverpackets.SocialAction; @@ -60,7 +59,6 @@ public final class Q00226_TestOfTheHealer extends Quest private static final int SECRET_LETTER4 = 2819; // Reward private static final int MARK_OF_HEALER = 2820; - private static final int DIMENSIONAL_DIAMOND = 7562; // Quest Monster private static final int LERO_LIZARDMAN_AGENT = 27122; private static final int LERO_LIZARDMAN_LEADER = 27123; @@ -101,31 +99,6 @@ public final class Q00226_TestOfTheHealer extends Quest qs.setMemoState(1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, REPORT_OF_PERRIN, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - if (player.getClassId() == ClassId.CLERIC) - { - giveItems(player, DIMENSIONAL_DIAMOND, 60); - } - else if (player.getClassId() == ClassId.KNIGHT) - { - giveItems(player, DIMENSIONAL_DIAMOND, 104); - } - else if (player.getClassId() == ClassId.ORACLE) - { - giveItems(player, DIMENSIONAL_DIAMOND, 45); - } - else - { - giveItems(player, DIMENSIONAL_DIAMOND, 72); - } - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30473-04a.htm"; - } - else - { - htmltext = "30473-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java index 9a8611284d..d1b18b95e8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java @@ -72,7 +72,6 @@ public final class Q00227_TestOfTheReformer extends Quest private static final int LETTER_GREETINGS2 = 5568; // Rewards private static final int MARK_OF_REFORMER = 2821; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monsters private static final int MISERY_SKELETON = 20022; private static final int SKELETON_ARCHER = 20100; @@ -147,16 +146,6 @@ public final class Q00227_TestOfTheReformer extends Quest qs.setMemoState(1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, BOOK_OF_REFORM, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 60); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30118-04b.htm"; - } - else - { - htmltext = "30118-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java index d5697c9b7f..919725fd33 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java @@ -68,7 +68,6 @@ public final class Q00228_TestOfMagus extends Quest private static final int SERPENT_CHARM = 2863; // Reward private static final int MARK_OF_MAGUS = 2840; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int HARPY = 20145; private static final int MARSH_STAKATO = 20157; @@ -117,16 +116,6 @@ public final class Q00228_TestOfMagus extends Quest qs.startQuest(); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, RUKALS_LETTER, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 122); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30629-04a.htm"; - } - else - { - htmltext = "30629-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java index 1c6ce3aac0..f5525b4f97 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java @@ -81,7 +81,6 @@ public final class Q00229_TestOfWitchcraft extends Quest private static final int BRIMSTONE_2ND = 3335; // Reward private static final int MARK_OF_WITCHCRAFT = 3307; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int DIRE_WYRM = 20557; private static final int ENCHANTED_STONE_GOLEM = 20565; @@ -133,23 +132,6 @@ public final class Q00229_TestOfWitchcraft extends Quest qs.startQuest(); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, ORIMS_DIAGRAM, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - if (player.getClassId() == ClassId.WIZARD) - { - giveItems(player, DIMENSIONAL_DIAMOND, 122); - } - else - { - giveItems(player, DIMENSIONAL_DIAMOND, 104); - } - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30630-08a.htm"; - } - else - { - htmltext = "30630-08.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java index aab7036fa5..a94ce9a3a5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java @@ -105,7 +105,6 @@ public final class Q00230_TestOfTheSummoner extends Quest private static final int CRYSTAL_OF_VICTORY_6TH = 3389; // Reward private static final int MARK_OF_SUMMONER = 3336; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int NOBLE_ANT = 20089; private static final int NOBLE_ANT_LEADER = 20090; @@ -209,16 +208,6 @@ public final class Q00230_TestOfTheSummoner extends Quest qs.startQuest(); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, GALATEAS_LETTER, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 122); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30634-08a.htm"; - } - else - { - htmltext = "30634-08.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java index 07370e8ed9..4c12640f7c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java @@ -60,7 +60,6 @@ public final class Q00231_TestOfTheMaestro extends Quest private static final int BROKEN_TELEPORT_DEVICE = 2916; // Reward private static final int MARK_OF_MAESTRO = 2867; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int KING_BUGBEAR = 20150; private static final int GIANT_MIST_LEECH = 20225; @@ -99,16 +98,6 @@ public final class Q00231_TestOfTheMaestro extends Quest qs.startQuest(); qs.setMemoState(1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 23); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30531-04a.htm"; - } - else - { - htmltext = "30531-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java index 7ed6bf5219..56db2e6fb4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java @@ -77,7 +77,6 @@ public final class Q00232_TestOfTheLord extends Quest private static final int IMMORTAL_FLAME = 3416; // Reward private static final int MARK_OF_LORD = 3390; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int MARSH_SPIDER = 20233; private static final int BREKA_ORC_SHAMAN = 20269; @@ -123,16 +122,6 @@ public final class Q00232_TestOfTheLord extends Quest { qs.startQuest(); giveItems(player, ORDEAL_NECKLACE, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 92); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30565-05b.htm"; - } - else - { - htmltext = "30565-05.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java index 16daf2d347..9ee4861d07 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java @@ -79,7 +79,6 @@ public final class Q00233_TestOfTheWarSpirit extends Quest private static final int KIRUNAS_REMAINS2 = 2914; // Reward private static final int MARK_OF_WARSPIRIT = 2879; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int NOBLE_ANT = 20089; private static final int NOBLE_ANT_LEADER = 20090; @@ -122,16 +121,6 @@ public final class Q00233_TestOfTheWarSpirit extends Quest if (qs.isCreated()) { qs.startQuest(); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 92); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30510-05e.htm"; - } - else - { - htmltext = "30510-05.htm"; - } } break; } 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 6cf7d9678b..44d7034ee8 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 @@ -1073,16 +1073,22 @@ - + - - + + + + + + + + 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 39e6e7e2a2..382b58d97e 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 @@ -273,6 +273,10 @@ + + + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00100-00199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00100-00199.xml index e79a381167..c766955e4a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00100-00199.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/00100-00199.xml @@ -2676,7 +2676,6 @@ - icon.skill0163 1 P 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 cce46193cc..907a9d248a 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 @@ -680,7 +680,7 @@ - + 2908 3030 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01000-01099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01000-01099.xml index 331a5d51f3..386e5c515b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01000-01099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01000-01099.xml @@ -705,7 +705,26 @@ SINGLE - power + + 50 + 58 + 67 + 83 + 95 + 107 + 121 + 135 + 151 + 176 + 185 + 195 + 224 + 234 + 245 + 278 + 289 + 301 + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01100-01199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01100-01199.xml index 8649b4b266..263a66050f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01100-01199.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01100-01199.xml @@ -649,27 +649,6 @@ 14127 14128 - 3031 - - 0 - 0 - 0 - 0 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 2 - 2 - 2 - 2 - 2 - 2 - @@ -1308,27 +1287,6 @@ 14495 14496 - 3031 - - 0 - 0 - 0 - 0 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 2 - 2 - 2 - 2 - 2 - 2 - @@ -1440,25 +1398,6 @@ 15198 15199 - 3031 - - 0 - 0 - 1 - 1 - 1 - 2 - 2 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - @@ -1835,6 +1774,8 @@ 4000 icon.skill1148 1 + 1 + 2508 44 48 @@ -2361,7 +2302,7 @@ 74 76 77 - 78 + 78 36 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01200-01299.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01200-01299.xml index e05d029a4d..2f8452a3cf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01200-01299.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01200-01299.xml @@ -2383,27 +2383,6 @@ 14311 14312 - 3031 - - 0 - 0 - 0 - 0 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 2 - 2 - 2 - 2 - 2 - 2 - @@ -7095,23 +7074,6 @@ 14219 14220 - 3031 - - 2 - 2 - 2 - 2 - 2 - 2 - 4 - 4 - 4 - 4 - 6 - 6 - 6 - 6 - @@ -7212,23 +7174,6 @@ 14403 14404 - 3031 - - 2 - 2 - 2 - 2 - 2 - 2 - 4 - 4 - 4 - 4 - 6 - 6 - 6 - 6 - @@ -7329,23 +7274,6 @@ 14587 14588 - 3031 - - 2 - 2 - 2 - 2 - 2 - 2 - 4 - 4 - 4 - 4 - 6 - 6 - 6 - 6 - 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 b8eae1e14f..d17252504f 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 @@ -1394,8 +1394,6 @@ 14080 - 3031 - 2 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01400-01499.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01400-01499.xml index b0969bc808..a74828f1fa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01400-01499.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01400-01499.xml @@ -334,8 +334,6 @@ 14836 - 3031 - 11 @@ -360,8 +358,6 @@ 14837 - 3031 - 11 @@ -388,8 +384,6 @@ 14838 - 3031 - 11 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 b5b4c26efb..2fd3c7454a 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 @@ -71,7 +71,7 @@ - 2 + 1 900 CHANGEBODY DARK_ASSASSIN_SUIT @@ -141,7 +141,7 @@ - 3 + 1 900 CHANGEBODY WHITE_ASSASSIN_SUIT diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03000-03099.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03000-03099.xml index 9e893c1c53..0a9b08bd6a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03000-03099.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03000-03099.xml @@ -37,8 +37,8 @@ 5 0 BLEED - NONE - NONE + TARGET + SINGLE 44 diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03600-03699.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03600-03699.xml index 1f41c50b91..5ad9ff1d01 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03600-03699.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/03600-03699.xml @@ -527,18 +527,22 @@ - + icon.armor_t1001_ul_i00 1 P 5 - - 5 + + 25 + DIFF + + + 3 PER - - 5 + + 3 PER @@ -550,12 +554,16 @@ P 5 - - 5 + + 10 + DIFF + + + 2 PER - - 5 + + 3 PER @@ -567,12 +575,16 @@ P 5 - - 5 + + 20 + DIFF + + + 2 PER - 5 + 3 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 a0058132c7..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 @@ -981,18 +981,18 @@ - -16 - -24 - -32 - -41 - -50 - -58 - -63 - -63 - -66 - -66 - -68 - -68 + 16 + 24 + 32 + 41 + 50 + 58 + 63 + 63 + 66 + 66 + 68 + 68 3 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 b49c9a0936..89475465ac 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 @@ -36,9 +36,41 @@ A1 - - icon.skill0000 + icon.etc_box_of_adventure_5_i00 + 2 + 1 + 90136 + 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/55200-55299.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/55200-55299.xml index da90b0b6d1..84d6338e83 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 @@ -607,6 +607,8 @@ 1 1200 BERSERKER + 1 + 70107 true 4000 2 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 2e56849f8a..f73ab375e5 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 @@ -83,7 +83,7 @@ -2 -2 1 - SELF + TARGET SINGLE diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java index e1400e4a66..b063673f7f 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java @@ -21,10 +21,8 @@ import com.l2jmobius.gameserver.enums.CategoryType; 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.variables.PlayerVariables; import com.l2jmobius.gameserver.network.serverpackets.RadarControl; import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.util.Util; @@ -41,17 +39,19 @@ public final class Q00211_TrialOfTheChallenger extends Quest private static final int MARTIAN = 30645; private static final int RALDO = 30646; private static final int CHEST_OF_SHYSLASSYS = 30647; + // Monsters + private static final int SHYSLASSYS = 27110; + private static final int CAVEBASILISK = 27111; + private static final int GORR = 27112; + private static final int BARAHAM = 27113; + private static final int QUEEN_OF_SUCCUBUS = 27114; // Items private static final int LETTER_OF_KASH = 2628; private static final int WATCHERS_EYE1 = 2629; private static final int WATCHERS_EYE2 = 2630; private static final int SCROLL_OF_SHYSLASSYS = 2631; private static final int BROKEN_KEY = 2632; - // Monsters - private static final int SHYSLASSYS = 27110; - private static final int GORR = 27112; - private static final int BARAHAM = 27113; - private static final int QUEEN_OF_SUCCUBUS = 27114; + // Rewards private static final int ELVEN_NECKLACE_BEADS = 1904; private static final int WHITE_TUNIC_PATTERN = 1936; @@ -62,7 +62,6 @@ public final class Q00211_TrialOfTheChallenger extends Quest private static final int BRIGAMDINE_GAUNTLET_PATTERN = 2927; private static final int TOME_OF_BLOOD_PAGE = 2030; private static final int MARK_OF_CHALLENGER = 2627; - private static final ItemHolder DIMENSIONAL_DIAMONDS = new ItemHolder(7562, 61); // Misc private static final int MIN_LVL = 35; @@ -71,7 +70,7 @@ public final class Q00211_TrialOfTheChallenger extends Quest super(211); addStartNpc(KASH); addTalkId(FILAUR, KASH, MARTIAN, RALDO, CHEST_OF_SHYSLASSYS); - addKillId(SHYSLASSYS, GORR, BARAHAM, QUEEN_OF_SUCCUBUS); + addKillId(SHYSLASSYS, CAVEBASILISK, GORR, BARAHAM, QUEEN_OF_SUCCUBUS); registerQuestItems(LETTER_OF_KASH, WATCHERS_EYE1, WATCHERS_EYE2, SCROLL_OF_SHYSLASSYS, BROKEN_KEY); } @@ -105,21 +104,8 @@ public final class Q00211_TrialOfTheChallenger extends Quest } case "30644-06.htm": { - if (qs.isCreated()) - { - final PlayerVariables vars = player.getVariables(); - if (vars.getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMONDS); - vars.set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = event; - } - else - { - htmltext = "30644-05.htm"; - } - qs.startQuest(); - } + qs.startQuest(); + htmltext = event; break; } case "30647-02.html": @@ -333,15 +319,6 @@ public final class Q00211_TrialOfTheChallenger extends Quest addExpAndSp(talker, 1067606, 69242); giveAdena(talker, 194556, true); giveItems(talker, MARK_OF_CHALLENGER, 1); - - // redundant retail check - already rewarded at beginning of quest - final PlayerVariables vars = talker.getVariables(); - if (vars.getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(talker, DIMENSIONAL_DIAMONDS); - vars.set("2ND_CLASS_DIAMOND_REWARD", 1); - } - talker.sendPacket(new SocialAction(talker.getObjectId(), 3)); qs.exitQuest(false, true); htmltext = "30646-07.html"; diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java index 23d201265a..c25a388821 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java @@ -20,12 +20,10 @@ import com.l2jmobius.gameserver.enums.CategoryType; 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.base.ClassId; import com.l2jmobius.gameserver.model.holders.ItemHolder; import com.l2jmobius.gameserver.model.items.L2Weapon; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; -import com.l2jmobius.gameserver.model.variables.PlayerVariables; import com.l2jmobius.gameserver.network.serverpackets.SocialAction; import com.l2jmobius.gameserver.util.Util; @@ -64,7 +62,7 @@ public final class Q00212_TrialOfDuty extends Quest private static final int SKELETON_RAIDER = 20191; private static final int STRAIN = 20200; private static final int GHOUL = 20201; - private static final int BREKA_ORC_OVERLORD = 20270; + private static final int BREKA_ORC_PREFECT = 20270; private static final int LETO_LIZARDMAN = 20577; private static final int LETO_LIZARDMAN_ARCHER = 20578; private static final int LETO_LIZARDMAN_SOLDIER = 20579; @@ -74,7 +72,6 @@ public final class Q00212_TrialOfDuty extends Quest private static final int SPIRIT_OF_SIR_HEROD = 27119; // Rewards private static final int MARK_OF_DUTY = 2633; - private static final int DIMENSIONAL_DIAMOND = 7562; // Misc private static final int MIN_LEVEL = 35; @@ -83,7 +80,7 @@ public final class Q00212_TrialOfDuty extends Quest super(212); addStartNpc(HANNAVALT); addTalkId(HANNAVALT, DUSTIN, SIR_COLLIN_WINDAWOOD, SIR_ARON_TANFORD, SIR_KIEL_NIGHTHAWK, ISAEL_SILVERSHADOW, SPIRIT_OF_SIR_TALIANUS); - addKillId(HANGMAN_TREE, SKELETON_MARAUDER, SKELETON_RAIDER, STRAIN, GHOUL, BREKA_ORC_OVERLORD, LETO_LIZARDMAN, LETO_LIZARDMAN_ARCHER, LETO_LIZARDMAN_SOLDIER, LETO_LIZARDMAN_WARRIOR, LETO_LIZARDMAN_SHAMAN, LETO_LIZARDMAN_OVERLORD, SPIRIT_OF_SIR_HEROD); + addKillId(HANGMAN_TREE, SKELETON_MARAUDER, SKELETON_RAIDER, STRAIN, GHOUL, BREKA_ORC_PREFECT, LETO_LIZARDMAN, LETO_LIZARDMAN_ARCHER, LETO_LIZARDMAN_SOLDIER, LETO_LIZARDMAN_WARRIOR, LETO_LIZARDMAN_SHAMAN, LETO_LIZARDMAN_OVERLORD, SPIRIT_OF_SIR_HEROD); registerQuestItems(LETTER_OF_DUSTIN, KNIGHTS_TEAR, MIRROR_OF_ORPIC, TEAR_OF_CONFESSION, REPORT_PIECE.getId(), TALIANUSS_REPORT, TEAR_OF_LOYALTY, MILITAS_ARTICLE.getId(), SAINTS_ASHES_URN, ATHEBALDTS_SKULL, ATHEBALDTS_RIBS, ATHEBALDTS_SHIN, LETTER_OF_WINDAWOOD, OLD_KNIGHTS_SWORD); } @@ -107,15 +104,6 @@ public final class Q00212_TrialOfDuty extends Quest qs.startQuest(); qs.setMemoState(1); qs.set("flag", 0); - - if (rewardDimensionalDiamonds(player)) - { - html = "30109-04a.htm"; - } - else - { - html = "30109-04.htm"; - } } break; } @@ -236,7 +224,7 @@ public final class Q00212_TrialOfDuty extends Quest } break; } - case BREKA_ORC_OVERLORD: + case BREKA_ORC_PREFECT: { if (qs.isMemoState(11)) { @@ -307,7 +295,6 @@ public final class Q00212_TrialOfDuty extends Quest giveItems(talker, MARK_OF_DUTY, 1); qs.exitQuest(false, true); talker.sendPacket(new SocialAction(talker.getObjectId(), 3)); - rewardDimensionalDiamonds(talker); } break; } @@ -563,25 +550,4 @@ public final class Q00212_TrialOfDuty extends Quest } return html; } - - private static boolean rewardDimensionalDiamonds(L2PcInstance player) - { - final PlayerVariables vars = player.getVariables(); - - if (vars.getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - if (player.getClassId() == ClassId.KNIGHT) - { - rewardItems(player, DIMENSIONAL_DIAMOND, 45); - } - else - { - rewardItems(player, DIMENSIONAL_DIAMOND, 61); - } - - vars.set("2ND_CLASS_DIAMOND_REWARD", 1); - return true; - } - return false; - } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java index d0cb4d8ac5..f1c5f7bf08 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java @@ -66,7 +66,6 @@ public final class Q00213_TrialOfTheSeeker extends Quest private static final int TERRYS_REPORT = 2672; // Reward private static final int MARK_OF_SEEKER = 2673; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monsters private static final int ANT_CAPTAIN = 20080; private static final int ANT_WARRIOR_CAPTAIN = 20088; @@ -113,16 +112,6 @@ public final class Q00213_TrialOfTheSeeker extends Quest giveItems(player, DUFNERS_LETTER, 1); } playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 128); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30106-05a.htm"; - } - else - { - htmltext = "30106-05.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java index afe0c4ca4c..3998cbd93a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java @@ -94,7 +94,6 @@ public final class Q00214_TrialOfTheScholar extends Quest private static final int SYMBOL_OF_CRONOS = 2720; // Reward private static final int MARK_OF_SCHOLAR = 2674; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monsters private static final int MONSTER_EYE_DESTREOYER = 20068; private static final int MEDUSA = 20158; @@ -141,16 +140,6 @@ public final class Q00214_TrialOfTheScholar extends Quest giveItems(player, MIRIENS_1ST_SIGIL, 1); } playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 168); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30461-04a.htm"; - } - else - { - htmltext = "30461-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java index 38d7f34453..8e837708da 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java @@ -59,7 +59,6 @@ public final class Q00215_TrialOfThePilgrim extends Quest private static final int TAG_OF_RUMOR = 2733; // Reward private static final int MARK_OF_PILGRIM = 2721; - private static final int DIMENSIONAL_DIAMOND = 7562; // Quest Monster private static final int LAVA_SALAMANDER = 27116; private static final int NAHIR = 27117; @@ -96,16 +95,6 @@ public final class Q00215_TrialOfThePilgrim extends Quest qs.setMemoState(1); giveItems(player, VOUCHER_OF_TRIAL, 1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 49); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30648-04a.htm"; - } - else - { - htmltext = "30648-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java index ff68c34be8..42efc705da 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00216_TrialOfTheGuildsman/Q00216_TrialOfTheGuildsman.java @@ -62,7 +62,6 @@ public final class Q00216_TrialOfTheGuildsman extends Quest private static final int JOURNEYMAN_RING = 3139; // Reward private static final int MARK_OF_GUILDSMAN = 3119; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monsters private static final int ANT = 20079; private static final int ANT_CAPTAIN = 20080; @@ -116,16 +115,6 @@ public final class Q00216_TrialOfTheGuildsman extends Quest giveItems(player, VALKONS_RECOMMENDATION, 1); } playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 85); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30103-06d.htm"; - } - else - { - htmltext = "30103-06.htm"; - } } else { diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java index b21b3310e1..f66c7c68bd 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java @@ -73,7 +73,6 @@ public final class Q00217_TestimonyOfTrust extends Quest private static final int HEART_OF_PORTA = 2761; // Reward private static final int MARK_OF_TRUST = 2734; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int DRYAD = 20013; private static final int DRYAD_ELDER = 20019; @@ -127,16 +126,6 @@ public final class Q00217_TestimonyOfTrust extends Quest giveItems(player, LETTER_TO_ELF, 1); giveItems(player, LETTER_TO_DARKELF, 1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 96); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30191-04a.htm"; - } - else - { - htmltext = "30191-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java index 922cfe069f..50e512a79b 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java @@ -75,7 +75,6 @@ public final class Q00218_TestimonyOfLife extends Quest private static final int TALINS_PERIDOT = 3171; // Reward private static final int MARK_OF_LIFE = 3140; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int ANT_RECRUIT = 20082; private static final int ANT_PATROL = 20084; @@ -125,16 +124,7 @@ public final class Q00218_TestimonyOfLife extends Quest giveItems(player, CARDIENS_LETTER, 1); } playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 102); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30460-04a.htm"; - } - else - { - htmltext = "30460-04.htm"; - } + htmltext = "30460-04.htm"; } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java index 66e25a9952..7a89655864 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java @@ -76,7 +76,6 @@ public final class Q00219_TestimonyOfFate extends Quest private static final int ARKENIAS_LETTER = 3202; // Reward private static final int MARK_OF_FATE = 3172; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int HANGMAN_TREE = 20144; private static final int MARSH_STAKATO = 20157; @@ -125,16 +124,6 @@ public final class Q00219_TestimonyOfFate extends Quest qs.startQuest(); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, KAIRAS_LETTER, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 98); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30476-05a.htm"; - } - else - { - htmltext = "30476-05.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java index b8de47e6ea..0633a48772 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00220_TestimonyOfGlory/Q00220_TestimonyOfGlory.java @@ -84,7 +84,6 @@ public final class Q00220_TestimonyOfGlory extends Quest private static final int RITUAL_BOX = 3237; // Reward private static final int MARK_OF_GLORY = 3203; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int TYRANT = 20192; private static final int TYRANT_KINGPIN = 20193; @@ -139,16 +138,6 @@ public final class Q00220_TestimonyOfGlory extends Quest qs.startQuest(); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, VOKIANS_ORDER, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 109); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30514-05a.htm"; - } - else - { - htmltext = "30514-05.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java index 52f8382eb9..4f49e360c7 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java @@ -98,7 +98,6 @@ public final class Q00221_TestimonyOfProsperity extends Quest private static final int CRYSTAL_BROOCH = 3428; // Reward private static final int MARK_OF_PROSPERITY = 3238; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int MANDRAGORA_SPROUT1 = 20154; private static final int MANDRAGORA_SAPLING = 20155; @@ -145,16 +144,6 @@ public final class Q00221_TestimonyOfProsperity extends Quest giveItems(player, RING_OF_TESTIMONY_1ST, 1); } playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 50); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30104-04e.htm"; - } - else - { - htmltext = "30104-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java index 266bb23240..344c85fcb6 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java @@ -58,7 +58,6 @@ public final class Q00222_TestOfTheDuelist extends Quest private static final int LAKINS_MACE = 2783; // Reward private static final int MARK_OF_DUELIST = 2762; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int PUNCHER = 20085; private static final int NOBLE_ANT_LEADER = 20090; @@ -111,23 +110,6 @@ public final class Q00222_TestOfTheDuelist extends Quest giveItems(player, ORDER_OREN, 1); giveItems(player, ORDER_ADEN, 1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - if (player.getClassId() == ClassId.PALUS_KNIGHT) - { - giveItems(player, DIMENSIONAL_DIAMOND, 104); - } - else - { - giveItems(player, DIMENSIONAL_DIAMOND, 72); - } - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30623-07a.htm"; - } - else - { - htmltext = "30623-07.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java index 746b5c3cd2..9fea4a5104 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00223_TestOfTheChampion/Q00223_TestOfTheChampion.java @@ -55,7 +55,6 @@ public final class Q00223_TestOfTheChampion extends Quest private static final int LETO_LIZARDMAN_FANG = 3292; // Reward private static final int MARK_OF_CHAMPION = 3276; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int HARPY = 20145; private static final int MEDUSA = 20158; @@ -103,23 +102,6 @@ public final class Q00223_TestOfTheChampion extends Quest qs.startQuest(); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, ASCALONS_1ST_LETTER, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - if (player.getClassId() == ClassId.WARRIOR) - { - giveItems(player, DIMENSIONAL_DIAMOND, 72); - } - else - { - giveItems(player, DIMENSIONAL_DIAMOND, 64); - } - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30624-06a.htm"; - } - else - { - htmltext = "30624-06.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java index 5e05f048ff..633dfcd735 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00224_TestOfSagittarius/Q00224_TestOfSagittarius.java @@ -55,7 +55,6 @@ public final class Q00224_TestOfSagittarius extends Quest private static final int BLOOD_OF_LIZARDMAN = 3306; // Reward private static final int MARK_OF_SAGITTARIUS = 3293; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int ANT = 20079; private static final int ANT_CAPTAIN = 20080; @@ -113,16 +112,6 @@ public final class Q00224_TestOfSagittarius extends Quest qs.setMemoState(1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, BERNARDS_INTRODUCTION, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 96); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30702-04a.htm"; - } - else - { - htmltext = "30702-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java index 5774af8c35..5057010c45 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java @@ -68,7 +68,6 @@ public final class Q00225_TestOfTheSearcher extends Quest private static final int ALEXS_RECOMMEND = 2808; // Reward private static final int MARK_OF_SEARCHER = 2809; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int HANGMAN_TREE = 20144; private static final int ROAD_SCAVENGER = 20551; @@ -110,23 +109,6 @@ public final class Q00225_TestOfTheSearcher extends Quest qs.setMemoState(1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, LUTHERS_LETTER, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - if (player.getClassId() == ClassId.SCAVENGER) - { - giveItems(player, DIMENSIONAL_DIAMOND, 82); - } - else - { - giveItems(player, DIMENSIONAL_DIAMOND, 96); - } - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30690-05a.htm"; - } - else - { - htmltext = "30690-05.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java index f8339b6b60..42028af2d6 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00226_TestOfTheHealer/Q00226_TestOfTheHealer.java @@ -20,7 +20,6 @@ import com.l2jmobius.gameserver.enums.CategoryType; 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.base.ClassId; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.network.serverpackets.SocialAction; @@ -60,7 +59,6 @@ public final class Q00226_TestOfTheHealer extends Quest private static final int SECRET_LETTER4 = 2819; // Reward private static final int MARK_OF_HEALER = 2820; - private static final int DIMENSIONAL_DIAMOND = 7562; // Quest Monster private static final int LERO_LIZARDMAN_AGENT = 27122; private static final int LERO_LIZARDMAN_LEADER = 27123; @@ -101,31 +99,6 @@ public final class Q00226_TestOfTheHealer extends Quest qs.setMemoState(1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, REPORT_OF_PERRIN, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - if (player.getClassId() == ClassId.CLERIC) - { - giveItems(player, DIMENSIONAL_DIAMOND, 60); - } - else if (player.getClassId() == ClassId.KNIGHT) - { - giveItems(player, DIMENSIONAL_DIAMOND, 104); - } - else if (player.getClassId() == ClassId.ORACLE) - { - giveItems(player, DIMENSIONAL_DIAMOND, 45); - } - else - { - giveItems(player, DIMENSIONAL_DIAMOND, 72); - } - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30473-04a.htm"; - } - else - { - htmltext = "30473-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java index 9a8611284d..d1b18b95e8 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00227_TestOfTheReformer/Q00227_TestOfTheReformer.java @@ -72,7 +72,6 @@ public final class Q00227_TestOfTheReformer extends Quest private static final int LETTER_GREETINGS2 = 5568; // Rewards private static final int MARK_OF_REFORMER = 2821; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monsters private static final int MISERY_SKELETON = 20022; private static final int SKELETON_ARCHER = 20100; @@ -147,16 +146,6 @@ public final class Q00227_TestOfTheReformer extends Quest qs.setMemoState(1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, BOOK_OF_REFORM, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 60); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30118-04b.htm"; - } - else - { - htmltext = "30118-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java index d5697c9b7f..919725fd33 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00228_TestOfMagus/Q00228_TestOfMagus.java @@ -68,7 +68,6 @@ public final class Q00228_TestOfMagus extends Quest private static final int SERPENT_CHARM = 2863; // Reward private static final int MARK_OF_MAGUS = 2840; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int HARPY = 20145; private static final int MARSH_STAKATO = 20157; @@ -117,16 +116,6 @@ public final class Q00228_TestOfMagus extends Quest qs.startQuest(); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, RUKALS_LETTER, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 122); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30629-04a.htm"; - } - else - { - htmltext = "30629-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java index 1c6ce3aac0..f5525b4f97 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java @@ -81,7 +81,6 @@ public final class Q00229_TestOfWitchcraft extends Quest private static final int BRIMSTONE_2ND = 3335; // Reward private static final int MARK_OF_WITCHCRAFT = 3307; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int DIRE_WYRM = 20557; private static final int ENCHANTED_STONE_GOLEM = 20565; @@ -133,23 +132,6 @@ public final class Q00229_TestOfWitchcraft extends Quest qs.startQuest(); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, ORIMS_DIAGRAM, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - if (player.getClassId() == ClassId.WIZARD) - { - giveItems(player, DIMENSIONAL_DIAMOND, 122); - } - else - { - giveItems(player, DIMENSIONAL_DIAMOND, 104); - } - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30630-08a.htm"; - } - else - { - htmltext = "30630-08.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java index aab7036fa5..a94ce9a3a5 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00230_TestOfTheSummoner/Q00230_TestOfTheSummoner.java @@ -105,7 +105,6 @@ public final class Q00230_TestOfTheSummoner extends Quest private static final int CRYSTAL_OF_VICTORY_6TH = 3389; // Reward private static final int MARK_OF_SUMMONER = 3336; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int NOBLE_ANT = 20089; private static final int NOBLE_ANT_LEADER = 20090; @@ -209,16 +208,6 @@ public final class Q00230_TestOfTheSummoner extends Quest qs.startQuest(); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); giveItems(player, GALATEAS_LETTER, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 122); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30634-08a.htm"; - } - else - { - htmltext = "30634-08.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java index 07370e8ed9..4c12640f7c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java @@ -60,7 +60,6 @@ public final class Q00231_TestOfTheMaestro extends Quest private static final int BROKEN_TELEPORT_DEVICE = 2916; // Reward private static final int MARK_OF_MAESTRO = 2867; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int KING_BUGBEAR = 20150; private static final int GIANT_MIST_LEECH = 20225; @@ -99,16 +98,6 @@ public final class Q00231_TestOfTheMaestro extends Quest qs.startQuest(); qs.setMemoState(1); playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 23); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30531-04a.htm"; - } - else - { - htmltext = "30531-04.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java index 7ed6bf5219..56db2e6fb4 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java @@ -77,7 +77,6 @@ public final class Q00232_TestOfTheLord extends Quest private static final int IMMORTAL_FLAME = 3416; // Reward private static final int MARK_OF_LORD = 3390; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int MARSH_SPIDER = 20233; private static final int BREKA_ORC_SHAMAN = 20269; @@ -123,16 +122,6 @@ public final class Q00232_TestOfTheLord extends Quest { qs.startQuest(); giveItems(player, ORDEAL_NECKLACE, 1); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 92); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30565-05b.htm"; - } - else - { - htmltext = "30565-05.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java index 16daf2d347..9ee4861d07 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java @@ -79,7 +79,6 @@ public final class Q00233_TestOfTheWarSpirit extends Quest private static final int KIRUNAS_REMAINS2 = 2914; // Reward private static final int MARK_OF_WARSPIRIT = 2879; - private static final int DIMENSIONAL_DIAMOND = 7562; // Monster private static final int NOBLE_ANT = 20089; private static final int NOBLE_ANT_LEADER = 20090; @@ -122,16 +121,6 @@ public final class Q00233_TestOfTheWarSpirit extends Quest if (qs.isCreated()) { qs.startQuest(); - if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0) - { - giveItems(player, DIMENSIONAL_DIAMOND, 92); - player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1); - htmltext = "30510-05e.htm"; - } - else - { - htmltext = "30510-05.htm"; - } } break; } diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/items/49400-49499.xml index 6cf7d9678b..44d7034ee8 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/items/49400-49499.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/items/49400-49499.xml @@ -1073,16 +1073,22 @@ - + - - + + + + + + + + diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/items/90100-90199.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/items/90100-90199.xml index 1759b620c0..a7d3e72738 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/items/90100-90199.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/items/90100-90199.xml @@ -273,6 +273,10 @@ + + + + diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/00100-00199.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/00100-00199.xml index e79a381167..c766955e4a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/00100-00199.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/00100-00199.xml @@ -2676,7 +2676,6 @@ - icon.skill0163 1 P diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/00300-00399.xml index cce46193cc..907a9d248a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/00300-00399.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/00300-00399.xml @@ -680,7 +680,7 @@ - + 2908 3030 diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01000-01099.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01000-01099.xml index 331a5d51f3..386e5c515b 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01000-01099.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01000-01099.xml @@ -705,7 +705,26 @@ SINGLE - power + + 50 + 58 + 67 + 83 + 95 + 107 + 121 + 135 + 151 + 176 + 185 + 195 + 224 + 234 + 245 + 278 + 289 + 301 + diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01100-01199.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01100-01199.xml index 8649b4b266..263a66050f 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01100-01199.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01100-01199.xml @@ -649,27 +649,6 @@ 14127 14128 - 3031 - - 0 - 0 - 0 - 0 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 2 - 2 - 2 - 2 - 2 - 2 - @@ -1308,27 +1287,6 @@ 14495 14496 - 3031 - - 0 - 0 - 0 - 0 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 2 - 2 - 2 - 2 - 2 - 2 - @@ -1440,25 +1398,6 @@ 15198 15199 - 3031 - - 0 - 0 - 1 - 1 - 1 - 2 - 2 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - @@ -1835,6 +1774,8 @@ 4000 icon.skill1148 1 + 1 + 2508 44 48 @@ -2361,7 +2302,7 @@ 74 76 77 - 78 + 78 36 diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01200-01299.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01200-01299.xml index e05d029a4d..2f8452a3cf 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01200-01299.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01200-01299.xml @@ -2383,27 +2383,6 @@ 14311 14312 - 3031 - - 0 - 0 - 0 - 0 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 2 - 2 - 2 - 2 - 2 - 2 - @@ -7095,23 +7074,6 @@ 14219 14220 - 3031 - - 2 - 2 - 2 - 2 - 2 - 2 - 4 - 4 - 4 - 4 - 6 - 6 - 6 - 6 - @@ -7212,23 +7174,6 @@ 14403 14404 - 3031 - - 2 - 2 - 2 - 2 - 2 - 2 - 4 - 4 - 4 - 4 - 6 - 6 - 6 - 6 - @@ -7329,23 +7274,6 @@ 14587 14588 - 3031 - - 2 - 2 - 2 - 2 - 2 - 2 - 4 - 4 - 4 - 4 - 6 - 6 - 6 - 6 - diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01300-01399.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01300-01399.xml index b8eae1e14f..d17252504f 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01300-01399.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01300-01399.xml @@ -1394,8 +1394,6 @@ 14080 - 3031 - 2 diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01400-01499.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01400-01499.xml index b0969bc808..a74828f1fa 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01400-01499.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01400-01499.xml @@ -334,8 +334,6 @@ 14836 - 3031 - 11 @@ -360,8 +358,6 @@ 14837 - 3031 - 11 @@ -388,8 +384,6 @@ 14838 - 3031 - 11 diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01800-01899.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01800-01899.xml index 915de0ee36..412a642dec 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01800-01899.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/01800-01899.xml @@ -71,7 +71,7 @@ - 2 + 1 900 CHANGEBODY DARK_ASSASSIN_SUIT @@ -141,7 +141,7 @@ - 3 + 1 900 CHANGEBODY WHITE_ASSASSIN_SUIT diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/03000-03099.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/03000-03099.xml index 9e893c1c53..0a9b08bd6a 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/03000-03099.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/03000-03099.xml @@ -37,8 +37,8 @@ 5 0 BLEED - NONE - NONE + TARGET + SINGLE 44 diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/03600-03699.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/03600-03699.xml index dc666390d9..f58e2e49b2 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/03600-03699.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/03600-03699.xml @@ -527,18 +527,22 @@ - + icon.armor_t1001_ul_i00 1 P 5 - - 5 + + 25 + DIFF + + + 3 PER - - 5 + + 3 PER @@ -550,12 +554,16 @@ P 5 - - 5 + + 10 + DIFF + + + 2 PER - - 5 + + 3 PER @@ -567,12 +575,16 @@ P 5 - - 5 + + 20 + DIFF + + + 2 PER - 5 + 3 PER diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/04000-04099.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/04000-04099.xml index 5619571051..2831dcc377 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/04000-04099.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/04000-04099.xml @@ -981,18 +981,18 @@ - -16 - -24 - -32 - -41 - -50 - -58 - -63 - -63 - -66 - -66 - -68 - -68 + 16 + 24 + 32 + 41 + 50 + 58 + 63 + 63 + 66 + 66 + 68 + 68 3 diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/39200-39299.xml index f8ae90eeaf..458fe949e1 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/39200-39299.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/39200-39299.xml @@ -36,9 +36,41 @@ A1 - - icon.skill0000 + icon.etc_box_of_adventure_5_i00 + 2 + 1 + 90136 + 1 A1 + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + SELF + SINGLE + + + 20 + 10 + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/55200-55299.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/55200-55299.xml index da90b0b6d1..84d6338e83 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/55200-55299.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/55200-55299.xml @@ -607,6 +607,8 @@ 1 1200 BERSERKER + 1 + 70107 true 4000 2 diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/55300-55399.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/55300-55399.xml index 6cbf5cd319..92690fdab2 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/55300-55399.xml +++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/stats/skills/55300-55399.xml @@ -83,7 +83,7 @@ -2 -2 1 - SELF + TARGET SINGLE