From 5390e3a42ac3e770f679e8ee0b11b21a5d707204 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 14 Jan 2019 02:10:03 +0000 Subject: [PATCH] Changed Ertheia class transfer quests to match description. Contributed by champzix1. --- .../Q10751_WindsOfFateEncounters.java | 6 +++--- .../Q10752_WindsOfFateAPromise.java | 8 ++++---- .../Q10753_WindsOfFateChoices.java | 9 +++++---- .../Q10751_WindsOfFateEncounters.java | 6 +++--- .../Q10752_WindsOfFateAPromise.java | 8 ++++---- .../Q10753_WindsOfFateChoices.java | 9 +++++---- .../Q10751_WindsOfFateEncounters.java | 6 +++--- .../Q10752_WindsOfFateAPromise.java | 8 ++++---- .../Q10753_WindsOfFateChoices.java | 9 +++++---- 9 files changed, 36 insertions(+), 33 deletions(-) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index cf6c845fc3..0a2b743531 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -219,7 +219,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest player.broadcastUserInfo(); player.sendSkillList(); player.sendPacket(new SocialAction(player.getObjectId(), 23)); - giveAdena(player, 11000, true); + giveAdena(player, 461880, true); giveItems(player, MAJOR_HEALING_POTION, 50); giveItems(player, SOULSHOT, 3000); giveItems(player, SPIRITSHOT, 3000); @@ -242,7 +242,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest player.broadcastUserInfo(); player.sendSkillList(); player.sendPacket(new SocialAction(player.getObjectId(), 23)); - giveAdena(player, 11000, true); + giveAdena(player, 461880, true); giveItems(player, MAJOR_HEALING_POTION, 50); giveItems(player, SOULSHOT, 3000); giveItems(player, SPIRITSHOT, 3000); @@ -565,7 +565,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState st = getQuestState(player, false); - if ((st == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) + if ((st == null) && (player.getRace() == Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) { showOnScreenMsg(player, NpcStringId.QUEEN_NAVARI_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000); player.sendPacket(new TutorialShowQuestionMark(getId(), 1)); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java index 94ddd69c10..bd4e453411 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java @@ -221,12 +221,12 @@ public final class Q10752_WindsOfFateAPromise extends Quest player.broadcastUserInfo(); player.sendSkillList(); player.sendPacket(new SocialAction(player.getObjectId(), 24)); - giveAdena(player, 5_000_000, false); + giveAdena(player, 1599120, false); giveItems(player, SOULSHOT, 8000); giveItems(player, SPIRITSHOT, 8000); giveItems(player, BLESSED_SCROLL_OF_RESURRECTION, 3); giveItems(player, PAULINAS_EQUIPMENT_SET, 1); - addExpAndSp(player, 2_050_000, 0); + addExpAndSp(player, 42000000, 0); qs.exitQuest(false, true); } break; @@ -244,12 +244,12 @@ public final class Q10752_WindsOfFateAPromise extends Quest player.broadcastUserInfo(); player.sendSkillList(); player.sendPacket(new SocialAction(player.getObjectId(), 24)); - giveAdena(player, 5000000, false); + giveAdena(player, 1599120, false); giveItems(player, SOULSHOT, 8000); giveItems(player, SPIRITSHOT, 8000); giveItems(player, BLESSED_SCROLL_OF_RESURRECTION, 3); giveItems(player, PAULINAS_EQUIPMENT_SET, 1); - addExpAndSp(player, 2050000, 0); + addExpAndSp(player, 42000000, 0); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index ca7c518f89..22f09a02aa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -99,7 +99,6 @@ public final class Q10753_WindsOfFateChoices extends Quest private static final int SAYHAS_BOX_W = 40268; private static final int SAYHAS_BOX_M = 40269; private static final int CHAOS_POMANDER = 37374; - private static final int MENTEE_CARTIFICATE = 33800; // Location private static final Location TELEPORT_LOC = new Location(-81948, 249635, -3371); private static final Location[] BOX_SPAWNS = @@ -367,7 +366,8 @@ public final class Q10753_WindsOfFateChoices extends Quest giveStoryQuestReward(npc, player); giveItems(player, SAYHAS_BOX_W, 1); giveItems(player, CHAOS_POMANDER, 2); - giveItems(player, MENTEE_CARTIFICATE, 1); + addExpAndSp(player, 0, 500000); + giveAdena(player, 2030400, false); qs.exitQuest(false, true); } htmltext = event; @@ -390,7 +390,8 @@ public final class Q10753_WindsOfFateChoices extends Quest giveStoryQuestReward(npc, player); giveItems(player, SAYHAS_BOX_M, 1); giveItems(player, CHAOS_POMANDER, 2); - giveItems(player, MENTEE_CARTIFICATE, 1); + addExpAndSp(player, 0, 500000); + giveAdena(player, 2030400, false); qs.exitQuest(false, true); } htmltext = event; @@ -836,7 +837,7 @@ public final class Q10753_WindsOfFateChoices extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState qs = getQuestState(player, false); - if ((qs == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) + if ((qs == null) && (player.getRace() == Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) { if (player.isMageClass()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index cf6c845fc3..0a2b743531 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -219,7 +219,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest player.broadcastUserInfo(); player.sendSkillList(); player.sendPacket(new SocialAction(player.getObjectId(), 23)); - giveAdena(player, 11000, true); + giveAdena(player, 461880, true); giveItems(player, MAJOR_HEALING_POTION, 50); giveItems(player, SOULSHOT, 3000); giveItems(player, SPIRITSHOT, 3000); @@ -242,7 +242,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest player.broadcastUserInfo(); player.sendSkillList(); player.sendPacket(new SocialAction(player.getObjectId(), 23)); - giveAdena(player, 11000, true); + giveAdena(player, 461880, true); giveItems(player, MAJOR_HEALING_POTION, 50); giveItems(player, SOULSHOT, 3000); giveItems(player, SPIRITSHOT, 3000); @@ -565,7 +565,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState st = getQuestState(player, false); - if ((st == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) + if ((st == null) && (player.getRace() == Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) { showOnScreenMsg(player, NpcStringId.QUEEN_NAVARI_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000); player.sendPacket(new TutorialShowQuestionMark(getId(), 1)); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java index 94ddd69c10..bd4e453411 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java @@ -221,12 +221,12 @@ public final class Q10752_WindsOfFateAPromise extends Quest player.broadcastUserInfo(); player.sendSkillList(); player.sendPacket(new SocialAction(player.getObjectId(), 24)); - giveAdena(player, 5_000_000, false); + giveAdena(player, 1599120, false); giveItems(player, SOULSHOT, 8000); giveItems(player, SPIRITSHOT, 8000); giveItems(player, BLESSED_SCROLL_OF_RESURRECTION, 3); giveItems(player, PAULINAS_EQUIPMENT_SET, 1); - addExpAndSp(player, 2_050_000, 0); + addExpAndSp(player, 42000000, 0); qs.exitQuest(false, true); } break; @@ -244,12 +244,12 @@ public final class Q10752_WindsOfFateAPromise extends Quest player.broadcastUserInfo(); player.sendSkillList(); player.sendPacket(new SocialAction(player.getObjectId(), 24)); - giveAdena(player, 5000000, false); + giveAdena(player, 1599120, false); giveItems(player, SOULSHOT, 8000); giveItems(player, SPIRITSHOT, 8000); giveItems(player, BLESSED_SCROLL_OF_RESURRECTION, 3); giveItems(player, PAULINAS_EQUIPMENT_SET, 1); - addExpAndSp(player, 2050000, 0); + addExpAndSp(player, 42000000, 0); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index ca7c518f89..22f09a02aa 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -99,7 +99,6 @@ public final class Q10753_WindsOfFateChoices extends Quest private static final int SAYHAS_BOX_W = 40268; private static final int SAYHAS_BOX_M = 40269; private static final int CHAOS_POMANDER = 37374; - private static final int MENTEE_CARTIFICATE = 33800; // Location private static final Location TELEPORT_LOC = new Location(-81948, 249635, -3371); private static final Location[] BOX_SPAWNS = @@ -367,7 +366,8 @@ public final class Q10753_WindsOfFateChoices extends Quest giveStoryQuestReward(npc, player); giveItems(player, SAYHAS_BOX_W, 1); giveItems(player, CHAOS_POMANDER, 2); - giveItems(player, MENTEE_CARTIFICATE, 1); + addExpAndSp(player, 0, 500000); + giveAdena(player, 2030400, false); qs.exitQuest(false, true); } htmltext = event; @@ -390,7 +390,8 @@ public final class Q10753_WindsOfFateChoices extends Quest giveStoryQuestReward(npc, player); giveItems(player, SAYHAS_BOX_M, 1); giveItems(player, CHAOS_POMANDER, 2); - giveItems(player, MENTEE_CARTIFICATE, 1); + addExpAndSp(player, 0, 500000); + giveAdena(player, 2030400, false); qs.exitQuest(false, true); } htmltext = event; @@ -836,7 +837,7 @@ public final class Q10753_WindsOfFateChoices extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState qs = getQuestState(player, false); - if ((qs == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) + if ((qs == null) && (player.getRace() == Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) { if (player.isMageClass()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index cf6c845fc3..0a2b743531 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -219,7 +219,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest player.broadcastUserInfo(); player.sendSkillList(); player.sendPacket(new SocialAction(player.getObjectId(), 23)); - giveAdena(player, 11000, true); + giveAdena(player, 461880, true); giveItems(player, MAJOR_HEALING_POTION, 50); giveItems(player, SOULSHOT, 3000); giveItems(player, SPIRITSHOT, 3000); @@ -242,7 +242,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest player.broadcastUserInfo(); player.sendSkillList(); player.sendPacket(new SocialAction(player.getObjectId(), 23)); - giveAdena(player, 11000, true); + giveAdena(player, 461880, true); giveItems(player, MAJOR_HEALING_POTION, 50); giveItems(player, SOULSHOT, 3000); giveItems(player, SPIRITSHOT, 3000); @@ -565,7 +565,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState st = getQuestState(player, false); - if ((st == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) + if ((st == null) && (player.getRace() == Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) { showOnScreenMsg(player, NpcStringId.QUEEN_NAVARI_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000); player.sendPacket(new TutorialShowQuestionMark(getId(), 1)); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java index 94ddd69c10..bd4e453411 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java @@ -221,12 +221,12 @@ public final class Q10752_WindsOfFateAPromise extends Quest player.broadcastUserInfo(); player.sendSkillList(); player.sendPacket(new SocialAction(player.getObjectId(), 24)); - giveAdena(player, 5_000_000, false); + giveAdena(player, 1599120, false); giveItems(player, SOULSHOT, 8000); giveItems(player, SPIRITSHOT, 8000); giveItems(player, BLESSED_SCROLL_OF_RESURRECTION, 3); giveItems(player, PAULINAS_EQUIPMENT_SET, 1); - addExpAndSp(player, 2_050_000, 0); + addExpAndSp(player, 42000000, 0); qs.exitQuest(false, true); } break; @@ -244,12 +244,12 @@ public final class Q10752_WindsOfFateAPromise extends Quest player.broadcastUserInfo(); player.sendSkillList(); player.sendPacket(new SocialAction(player.getObjectId(), 24)); - giveAdena(player, 5000000, false); + giveAdena(player, 1599120, false); giveItems(player, SOULSHOT, 8000); giveItems(player, SPIRITSHOT, 8000); giveItems(player, BLESSED_SCROLL_OF_RESURRECTION, 3); giveItems(player, PAULINAS_EQUIPMENT_SET, 1); - addExpAndSp(player, 2050000, 0); + addExpAndSp(player, 42000000, 0); qs.exitQuest(false, true); } break; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index ca7c518f89..22f09a02aa 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -99,7 +99,6 @@ public final class Q10753_WindsOfFateChoices extends Quest private static final int SAYHAS_BOX_W = 40268; private static final int SAYHAS_BOX_M = 40269; private static final int CHAOS_POMANDER = 37374; - private static final int MENTEE_CARTIFICATE = 33800; // Location private static final Location TELEPORT_LOC = new Location(-81948, 249635, -3371); private static final Location[] BOX_SPAWNS = @@ -367,7 +366,8 @@ public final class Q10753_WindsOfFateChoices extends Quest giveStoryQuestReward(npc, player); giveItems(player, SAYHAS_BOX_W, 1); giveItems(player, CHAOS_POMANDER, 2); - giveItems(player, MENTEE_CARTIFICATE, 1); + addExpAndSp(player, 0, 500000); + giveAdena(player, 2030400, false); qs.exitQuest(false, true); } htmltext = event; @@ -390,7 +390,8 @@ public final class Q10753_WindsOfFateChoices extends Quest giveStoryQuestReward(npc, player); giveItems(player, SAYHAS_BOX_M, 1); giveItems(player, CHAOS_POMANDER, 2); - giveItems(player, MENTEE_CARTIFICATE, 1); + addExpAndSp(player, 0, 500000); + giveAdena(player, 2030400, false); qs.exitQuest(false, true); } htmltext = event; @@ -836,7 +837,7 @@ public final class Q10753_WindsOfFateChoices extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState qs = getQuestState(player, false); - if ((qs == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) + if ((qs == null) && (player.getRace() == Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) { if (player.isMageClass()) {