From 4ff1f9f26dcf4cb989462dbfc74be18a088ee971 Mon Sep 17 00:00:00 2001 From: Mateus Cappellari Vieira Date: Sun, 10 Nov 2024 19:14:47 -0300 Subject: [PATCH 1/3] remove duplicated quantities for ecto-tokens --- .../com/questhelper/helpers/quests/ghostsahoy/GhostsAhoy.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/questhelper/helpers/quests/ghostsahoy/GhostsAhoy.java b/src/main/java/com/questhelper/helpers/quests/ghostsahoy/GhostsAhoy.java index 51fe303e38..78cbcd68e0 100644 --- a/src/main/java/com/questhelper/helpers/quests/ghostsahoy/GhostsAhoy.java +++ b/src/main/java/com/questhelper/helpers/quests/ghostsahoy/GhostsAhoy.java @@ -186,8 +186,8 @@ protected void setupRequirements() { ectoToken2 = new ItemRequirement("Ecto-token, or travel by Charter Ship", ItemID.ECTOTOKEN, 2); charos = new ItemRequirement("Ring of Charos (a)", ItemID.RING_OF_CHAROSA).isNotConsumed(); - ectoTokensCharos = new ItemRequirement("20 Ecto-token, OR 10 Ecto-Tokens and coins to travel by Charter Ship", ItemID.ECTOTOKEN, 20); - ectoTokensNoCharos = new ItemRequirement("31 Ecto-token, OR 25 Ecto-Tokens and coins to travel by Charter Ship", ItemID.ECTOTOKEN, 31);ectoToken4 = new ItemRequirement("Ecto-token, or travel by Charter Ship", ItemID.ECTOTOKEN, 4); + ectoTokensCharos = new ItemRequirement("Ecto-token, OR 10 Ecto-Tokens and coins to travel by Charter Ship", ItemID.ECTOTOKEN, 20); + ectoTokensNoCharos = new ItemRequirement("Ecto-token, OR 25 Ecto-Tokens and coins to travel by Charter Ship", ItemID.ECTOTOKEN, 31);ectoToken4 = new ItemRequirement("Ecto-token, or travel by Charter Ship", ItemID.ECTOTOKEN, 4); ectoToken12 = new ItemRequirement("Ecto-token, or travel by Charter Ship and 10 ecto-tokens", ItemID.ECTOTOKEN, 12); ectoToken27 = new ItemRequirement("Ecto-token, or travel by Charter Ship and 25 ecto-tokens", ItemID.ECTOTOKEN, 27); ectoToken10 = new ItemRequirement("Ecto-token", ItemID.ECTOTOKEN, 10); From 2fcef4d2227e6f82411d78d0cf9f7a90de82cb92 Mon Sep 17 00:00:00 2001 From: Mateus Cappellari Vieira Date: Sun, 24 Nov 2024 01:03:31 -0300 Subject: [PATCH 2/3] fix raw snail item id in InAidOfTheMyreque.java --- .../helpers/quests/inaidofthemyreque/InAidOfTheMyreque.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/questhelper/helpers/quests/inaidofthemyreque/InAidOfTheMyreque.java b/src/main/java/com/questhelper/helpers/quests/inaidofthemyreque/InAidOfTheMyreque.java index cc9e11e41b..3480c44d98 100644 --- a/src/main/java/com/questhelper/helpers/quests/inaidofthemyreque/InAidOfTheMyreque.java +++ b/src/main/java/com/questhelper/helpers/quests/inaidofthemyreque/InAidOfTheMyreque.java @@ -233,8 +233,8 @@ protected void setupRequirements() planks11 = new ItemRequirement("Plank", ItemID.PLANK, 11); nails44 = new ItemRequirement("Any nails", ItemCollections.NAILS, 44); swampPaste = new ItemRequirement("Swamp paste", ItemID.SWAMP_PASTE, 2); - snails10 = new ItemRequirement("Raw snail", ItemID.THIN_SNAIL_MEAT); - snails10.addAlternates(ItemID.FAT_SNAIL_MEAT, ItemID.LEAN_SNAIL_MEAT); + snails10 = new ItemRequirement("Raw snail", ItemID.THIN_SNAIL); + snails10.addAlternates(ItemID.FAT_SNAIL, ItemID.LEAN_SNAIL); mackerel10 = new ItemRequirement("Raw mackerel", ItemID.RAW_MACKEREL, 10); rawMackerelOrSnail10 = new ItemRequirements("10 Raw mackerel or raw snail meat (random for each player)", mackerel10, From 3e66fc2d16166bb208975e74e06fcd54ece8f841 Mon Sep 17 00:00:00 2001 From: Mateus Cappellari Vieira Date: Sun, 24 Nov 2024 01:04:51 -0300 Subject: [PATCH 3/3] fix raw snail item id in FillBurghCrate.java --- .../helpers/quests/inaidofthemyreque/FillBurghCrate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/questhelper/helpers/quests/inaidofthemyreque/FillBurghCrate.java b/src/main/java/com/questhelper/helpers/quests/inaidofthemyreque/FillBurghCrate.java index 7164528240..06cce49e11 100644 --- a/src/main/java/com/questhelper/helpers/quests/inaidofthemyreque/FillBurghCrate.java +++ b/src/main/java/com/questhelper/helpers/quests/inaidofthemyreque/FillBurghCrate.java @@ -46,7 +46,7 @@ public class FillBurghCrate extends DetailedQuestStep tinderbox3 = new ItemRequirement("Tinderbox", ItemID.TINDERBOX, 3); bronzeAxe10 = new ItemRequirement("Bronze axe", ItemID.BRONZE_AXE, 10); rawSnailsOrMackerel = new ItemRequirement("Raw mackerel or raw snail meat (random for each player)", ItemID.RAW_MACKEREL, 10); - rawSnailsOrMackerel.addAlternates(ItemID.THIN_SNAIL_MEAT, ItemID.LEAN_SNAIL_MEAT, ItemID.FAT_SNAIL_MEAT); + rawSnailsOrMackerel.addAlternates(ItemID.THIN_SNAIL, ItemID.LEAN_SNAIL, ItemID.FAT_SNAIL); rawSnailsOrMackerel.setDisplayMatchedItemName(true); } @@ -85,7 +85,7 @@ protected void updateSteps() else { this.setText("Fill the crate with 3 tinderboxes, 10 bronze axes, and 10 raw snails (can be lean, thin or fat)."); - rawSnailsOrMackerel.setDisplayItemId(ItemID.FAT_SNAIL_MEAT); + rawSnailsOrMackerel.setDisplayItemId(ItemID.FAT_SNAIL); this.setRequirements(Arrays.asList(crate, tinderbox3, bronzeAxe10, rawSnailsOrMackerel)); } }