From a609d037ebef487a8fc1feb2cbac9ef54a137bc0 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 30 Nov 2018 20:06:18 +0000 Subject: [PATCH] Updated required items for quest Little Wing (420). Contributed by champzix1. --- .../Q00420_LittleWing/Q00420_LittleWing.java | 28 +++++++++---------- .../Q00420_LittleWing/Q00420_LittleWing.java | 28 +++++++++---------- .../Q00420_LittleWing/Q00420_LittleWing.java | 28 +++++++++---------- 3 files changed, 39 insertions(+), 45 deletions(-) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java index 71c0bfde64..b8f69a1b60 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java @@ -48,10 +48,9 @@ public final class Q00420_LittleWing extends Quest private static final int SHAMHAI = 30752; private static final int COOPER = 30829; // Items - private static final int COAL = 1870; - private static final int CHARCOAL = 1871; - private static final int SILVER_NUGGET = 1873; - private static final int STONE_OF_PURITY = 1875; + private static final int ACCESSORY_GEM = 36556; + private static final int ARMOR_FRAGMENT = 36551; + private static final int COKES = 36561; private static final int GEMSTONE_D = 2130; private static final int GEMSTONE_C = 2131; private static final int FAIRY_DUST = 3499; @@ -209,13 +208,13 @@ public final class Q00420_LittleWing extends Quest { if (qs.isCond(2)) { - if ((qs.getInt("fairy_stone") == 1) && (getQuestItemsCount(player, COAL) >= 10) && (getQuestItemsCount(player, CHARCOAL) >= 10) && (getQuestItemsCount(player, GEMSTONE_D) >= 1) && (getQuestItemsCount(player, SILVER_NUGGET) >= 3) && (getQuestItemsCount(player, TOAD_SKIN) >= 10)) + if ((qs.getInt("fairy_stone") == 1) && (getQuestItemsCount(player, ACCESSORY_GEM) >= 4) && (getQuestItemsCount(player, ARMOR_FRAGMENT) >= 2) && (getQuestItemsCount(player, GEMSTONE_D) >= 1) && (getQuestItemsCount(player, COKES) >= 1) && (getQuestItemsCount(player, TOAD_SKIN) >= 10)) { takeItems(player, FAIRY_STONE_LIST, -1); - takeItems(player, COAL, 10); - takeItems(player, CHARCOAL, 10); + takeItems(player, ACCESSORY_GEM, 4); + takeItems(player, ARMOR_FRAGMENT, 2); takeItems(player, GEMSTONE_D, 1); - takeItems(player, SILVER_NUGGET, 3); + takeItems(player, COKES, 1); takeItems(player, TOAD_SKIN, -1); giveItems(player, FAIRY_STONE, 1); } @@ -228,14 +227,13 @@ public final class Q00420_LittleWing extends Quest { if (qs.isCond(2)) { - if ((qs.getInt("fairy_stone") == 2) && (getQuestItemsCount(player, COAL) >= 10) && (getQuestItemsCount(player, CHARCOAL) >= 10) && (getQuestItemsCount(player, GEMSTONE_C) >= 1) && (getQuestItemsCount(player, STONE_OF_PURITY) >= 1) && (getQuestItemsCount(player, SILVER_NUGGET) >= 5) && (getQuestItemsCount(player, TOAD_SKIN) >= 20)) + if ((qs.getInt("fairy_stone") == 2) && (getQuestItemsCount(player, ACCESSORY_GEM) >= 5) && (getQuestItemsCount(player, ARMOR_FRAGMENT) >= 2) && (getQuestItemsCount(player, GEMSTONE_C) >= 1) && (getQuestItemsCount(player, COKES) >= 1) && (getQuestItemsCount(player, TOAD_SKIN) >= 20)) { takeItems(player, DELUXE_STONE_LIST, -1); - takeItems(player, COAL, 10); - takeItems(player, CHARCOAL, 10); + takeItems(player, ACCESSORY_GEM, 5); + takeItems(player, ARMOR_FRAGMENT, 2); takeItems(player, GEMSTONE_C, 1); - takeItems(player, STONE_OF_PURITY, 1); - takeItems(player, SILVER_NUGGET, 5); + takeItems(player, COKES, 1); takeItems(player, TOAD_SKIN, -1); giveItems(player, DELUXE_FAIRY_STONE, 1); } @@ -501,11 +499,11 @@ public final class Q00420_LittleWing extends Quest { case 2: { - if ((qs.getInt("fairy_stone") == 1) && (getQuestItemsCount(talker, COAL) >= 10) && (getQuestItemsCount(talker, CHARCOAL) >= 10) && (getQuestItemsCount(talker, GEMSTONE_D) >= 1) && (getQuestItemsCount(talker, SILVER_NUGGET) >= 3) && (getQuestItemsCount(talker, TOAD_SKIN) >= 10)) + if ((qs.getInt("fairy_stone") == 1) && (getQuestItemsCount(talker, ACCESSORY_GEM) >= 4) && (getQuestItemsCount(talker, ARMOR_FRAGMENT) >= 2) && (getQuestItemsCount(talker, GEMSTONE_D) >= 1) && (getQuestItemsCount(talker, COKES) >= 1) && (getQuestItemsCount(talker, TOAD_SKIN) >= 10)) { htmltext = "30608-02.html"; } - else if ((qs.getInt("fairy_stone") == 2) && (getQuestItemsCount(talker, COAL) >= 10) && (getQuestItemsCount(talker, CHARCOAL) >= 10) && (getQuestItemsCount(talker, GEMSTONE_C) >= 1) && (getQuestItemsCount(talker, STONE_OF_PURITY) >= 1) && (getQuestItemsCount(talker, SILVER_NUGGET) >= 5) && (getQuestItemsCount(talker, TOAD_SKIN) >= 20)) + else if ((qs.getInt("fairy_stone") == 2) && (getQuestItemsCount(talker, ACCESSORY_GEM) >= 5) && (getQuestItemsCount(talker, ARMOR_FRAGMENT) >= 2) && (getQuestItemsCount(talker, GEMSTONE_C) >= 1) && (getQuestItemsCount(talker, COKES) >= 1) && (getQuestItemsCount(talker, TOAD_SKIN) >= 20)) { htmltext = "30608-04.html"; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java index 71c0bfde64..b8f69a1b60 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java @@ -48,10 +48,9 @@ public final class Q00420_LittleWing extends Quest private static final int SHAMHAI = 30752; private static final int COOPER = 30829; // Items - private static final int COAL = 1870; - private static final int CHARCOAL = 1871; - private static final int SILVER_NUGGET = 1873; - private static final int STONE_OF_PURITY = 1875; + private static final int ACCESSORY_GEM = 36556; + private static final int ARMOR_FRAGMENT = 36551; + private static final int COKES = 36561; private static final int GEMSTONE_D = 2130; private static final int GEMSTONE_C = 2131; private static final int FAIRY_DUST = 3499; @@ -209,13 +208,13 @@ public final class Q00420_LittleWing extends Quest { if (qs.isCond(2)) { - if ((qs.getInt("fairy_stone") == 1) && (getQuestItemsCount(player, COAL) >= 10) && (getQuestItemsCount(player, CHARCOAL) >= 10) && (getQuestItemsCount(player, GEMSTONE_D) >= 1) && (getQuestItemsCount(player, SILVER_NUGGET) >= 3) && (getQuestItemsCount(player, TOAD_SKIN) >= 10)) + if ((qs.getInt("fairy_stone") == 1) && (getQuestItemsCount(player, ACCESSORY_GEM) >= 4) && (getQuestItemsCount(player, ARMOR_FRAGMENT) >= 2) && (getQuestItemsCount(player, GEMSTONE_D) >= 1) && (getQuestItemsCount(player, COKES) >= 1) && (getQuestItemsCount(player, TOAD_SKIN) >= 10)) { takeItems(player, FAIRY_STONE_LIST, -1); - takeItems(player, COAL, 10); - takeItems(player, CHARCOAL, 10); + takeItems(player, ACCESSORY_GEM, 4); + takeItems(player, ARMOR_FRAGMENT, 2); takeItems(player, GEMSTONE_D, 1); - takeItems(player, SILVER_NUGGET, 3); + takeItems(player, COKES, 1); takeItems(player, TOAD_SKIN, -1); giveItems(player, FAIRY_STONE, 1); } @@ -228,14 +227,13 @@ public final class Q00420_LittleWing extends Quest { if (qs.isCond(2)) { - if ((qs.getInt("fairy_stone") == 2) && (getQuestItemsCount(player, COAL) >= 10) && (getQuestItemsCount(player, CHARCOAL) >= 10) && (getQuestItemsCount(player, GEMSTONE_C) >= 1) && (getQuestItemsCount(player, STONE_OF_PURITY) >= 1) && (getQuestItemsCount(player, SILVER_NUGGET) >= 5) && (getQuestItemsCount(player, TOAD_SKIN) >= 20)) + if ((qs.getInt("fairy_stone") == 2) && (getQuestItemsCount(player, ACCESSORY_GEM) >= 5) && (getQuestItemsCount(player, ARMOR_FRAGMENT) >= 2) && (getQuestItemsCount(player, GEMSTONE_C) >= 1) && (getQuestItemsCount(player, COKES) >= 1) && (getQuestItemsCount(player, TOAD_SKIN) >= 20)) { takeItems(player, DELUXE_STONE_LIST, -1); - takeItems(player, COAL, 10); - takeItems(player, CHARCOAL, 10); + takeItems(player, ACCESSORY_GEM, 5); + takeItems(player, ARMOR_FRAGMENT, 2); takeItems(player, GEMSTONE_C, 1); - takeItems(player, STONE_OF_PURITY, 1); - takeItems(player, SILVER_NUGGET, 5); + takeItems(player, COKES, 1); takeItems(player, TOAD_SKIN, -1); giveItems(player, DELUXE_FAIRY_STONE, 1); } @@ -501,11 +499,11 @@ public final class Q00420_LittleWing extends Quest { case 2: { - if ((qs.getInt("fairy_stone") == 1) && (getQuestItemsCount(talker, COAL) >= 10) && (getQuestItemsCount(talker, CHARCOAL) >= 10) && (getQuestItemsCount(talker, GEMSTONE_D) >= 1) && (getQuestItemsCount(talker, SILVER_NUGGET) >= 3) && (getQuestItemsCount(talker, TOAD_SKIN) >= 10)) + if ((qs.getInt("fairy_stone") == 1) && (getQuestItemsCount(talker, ACCESSORY_GEM) >= 4) && (getQuestItemsCount(talker, ARMOR_FRAGMENT) >= 2) && (getQuestItemsCount(talker, GEMSTONE_D) >= 1) && (getQuestItemsCount(talker, COKES) >= 1) && (getQuestItemsCount(talker, TOAD_SKIN) >= 10)) { htmltext = "30608-02.html"; } - else if ((qs.getInt("fairy_stone") == 2) && (getQuestItemsCount(talker, COAL) >= 10) && (getQuestItemsCount(talker, CHARCOAL) >= 10) && (getQuestItemsCount(talker, GEMSTONE_C) >= 1) && (getQuestItemsCount(talker, STONE_OF_PURITY) >= 1) && (getQuestItemsCount(talker, SILVER_NUGGET) >= 5) && (getQuestItemsCount(talker, TOAD_SKIN) >= 20)) + else if ((qs.getInt("fairy_stone") == 2) && (getQuestItemsCount(talker, ACCESSORY_GEM) >= 5) && (getQuestItemsCount(talker, ARMOR_FRAGMENT) >= 2) && (getQuestItemsCount(talker, GEMSTONE_C) >= 1) && (getQuestItemsCount(talker, COKES) >= 1) && (getQuestItemsCount(talker, TOAD_SKIN) >= 20)) { htmltext = "30608-04.html"; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java index 71c0bfde64..b8f69a1b60 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java @@ -48,10 +48,9 @@ public final class Q00420_LittleWing extends Quest private static final int SHAMHAI = 30752; private static final int COOPER = 30829; // Items - private static final int COAL = 1870; - private static final int CHARCOAL = 1871; - private static final int SILVER_NUGGET = 1873; - private static final int STONE_OF_PURITY = 1875; + private static final int ACCESSORY_GEM = 36556; + private static final int ARMOR_FRAGMENT = 36551; + private static final int COKES = 36561; private static final int GEMSTONE_D = 2130; private static final int GEMSTONE_C = 2131; private static final int FAIRY_DUST = 3499; @@ -209,13 +208,13 @@ public final class Q00420_LittleWing extends Quest { if (qs.isCond(2)) { - if ((qs.getInt("fairy_stone") == 1) && (getQuestItemsCount(player, COAL) >= 10) && (getQuestItemsCount(player, CHARCOAL) >= 10) && (getQuestItemsCount(player, GEMSTONE_D) >= 1) && (getQuestItemsCount(player, SILVER_NUGGET) >= 3) && (getQuestItemsCount(player, TOAD_SKIN) >= 10)) + if ((qs.getInt("fairy_stone") == 1) && (getQuestItemsCount(player, ACCESSORY_GEM) >= 4) && (getQuestItemsCount(player, ARMOR_FRAGMENT) >= 2) && (getQuestItemsCount(player, GEMSTONE_D) >= 1) && (getQuestItemsCount(player, COKES) >= 1) && (getQuestItemsCount(player, TOAD_SKIN) >= 10)) { takeItems(player, FAIRY_STONE_LIST, -1); - takeItems(player, COAL, 10); - takeItems(player, CHARCOAL, 10); + takeItems(player, ACCESSORY_GEM, 4); + takeItems(player, ARMOR_FRAGMENT, 2); takeItems(player, GEMSTONE_D, 1); - takeItems(player, SILVER_NUGGET, 3); + takeItems(player, COKES, 1); takeItems(player, TOAD_SKIN, -1); giveItems(player, FAIRY_STONE, 1); } @@ -228,14 +227,13 @@ public final class Q00420_LittleWing extends Quest { if (qs.isCond(2)) { - if ((qs.getInt("fairy_stone") == 2) && (getQuestItemsCount(player, COAL) >= 10) && (getQuestItemsCount(player, CHARCOAL) >= 10) && (getQuestItemsCount(player, GEMSTONE_C) >= 1) && (getQuestItemsCount(player, STONE_OF_PURITY) >= 1) && (getQuestItemsCount(player, SILVER_NUGGET) >= 5) && (getQuestItemsCount(player, TOAD_SKIN) >= 20)) + if ((qs.getInt("fairy_stone") == 2) && (getQuestItemsCount(player, ACCESSORY_GEM) >= 5) && (getQuestItemsCount(player, ARMOR_FRAGMENT) >= 2) && (getQuestItemsCount(player, GEMSTONE_C) >= 1) && (getQuestItemsCount(player, COKES) >= 1) && (getQuestItemsCount(player, TOAD_SKIN) >= 20)) { takeItems(player, DELUXE_STONE_LIST, -1); - takeItems(player, COAL, 10); - takeItems(player, CHARCOAL, 10); + takeItems(player, ACCESSORY_GEM, 5); + takeItems(player, ARMOR_FRAGMENT, 2); takeItems(player, GEMSTONE_C, 1); - takeItems(player, STONE_OF_PURITY, 1); - takeItems(player, SILVER_NUGGET, 5); + takeItems(player, COKES, 1); takeItems(player, TOAD_SKIN, -1); giveItems(player, DELUXE_FAIRY_STONE, 1); } @@ -501,11 +499,11 @@ public final class Q00420_LittleWing extends Quest { case 2: { - if ((qs.getInt("fairy_stone") == 1) && (getQuestItemsCount(talker, COAL) >= 10) && (getQuestItemsCount(talker, CHARCOAL) >= 10) && (getQuestItemsCount(talker, GEMSTONE_D) >= 1) && (getQuestItemsCount(talker, SILVER_NUGGET) >= 3) && (getQuestItemsCount(talker, TOAD_SKIN) >= 10)) + if ((qs.getInt("fairy_stone") == 1) && (getQuestItemsCount(talker, ACCESSORY_GEM) >= 4) && (getQuestItemsCount(talker, ARMOR_FRAGMENT) >= 2) && (getQuestItemsCount(talker, GEMSTONE_D) >= 1) && (getQuestItemsCount(talker, COKES) >= 1) && (getQuestItemsCount(talker, TOAD_SKIN) >= 10)) { htmltext = "30608-02.html"; } - else if ((qs.getInt("fairy_stone") == 2) && (getQuestItemsCount(talker, COAL) >= 10) && (getQuestItemsCount(talker, CHARCOAL) >= 10) && (getQuestItemsCount(talker, GEMSTONE_C) >= 1) && (getQuestItemsCount(talker, STONE_OF_PURITY) >= 1) && (getQuestItemsCount(talker, SILVER_NUGGET) >= 5) && (getQuestItemsCount(talker, TOAD_SKIN) >= 20)) + else if ((qs.getInt("fairy_stone") == 2) && (getQuestItemsCount(talker, ACCESSORY_GEM) >= 5) && (getQuestItemsCount(talker, ARMOR_FRAGMENT) >= 2) && (getQuestItemsCount(talker, GEMSTONE_C) >= 1) && (getQuestItemsCount(talker, COKES) >= 1) && (getQuestItemsCount(talker, TOAD_SKIN) >= 20)) { htmltext = "30608-04.html"; }