Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: incorrect expected items for raw snails in "In Aid of the Myreque" #1860

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading