Skip to content

Cargo Tracker: Exclude Tools From Cargo Hold #227

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.

Sign up for GitHub

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

Open
BBeeaarr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Cargo Tracker: Exclude Tools From Cargo Hold #227

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions src/main/java/com/duckblade/osrs/sailing/features/facilities/CargoHoldTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@ public class CargoHoldTracker
"Woooo wooo wooooo woooo."
);

private static final Set<Integer> SAILING_CARGO_TOOLS = ImmutableSet.of(
ItemID.SAILING_LOG,
ItemID.SAILING_CHARTING_SPYGLASS,
ItemID.HUNDRED_PIRATE_DIVING_HELMET,
ItemID.HUNDRED_PIRATE_DIVING_BACKPACK,
ItemID.SAILING_CHARTING_CROWBAR,
ItemID.SAILING_CHARTING_CURRENT_DUCK
);

private static final Set<Integer> CARGO_INVENTORY_IDS = ImmutableSet.of(
InventoryID.SAILING_BOAT_1_CARGOHOLD,
InventoryID.SAILING_BOAT_2_CARGOHOLD,
Expand Down Expand Up @@ -317,8 +326,8 @@ public void onGameTick(GameTick e)
log.trace("deposited: {}", deposited);

Multisets.removeOccurrences(cargoHoldToUpdate, withdrawn);
deposited.entrySet().forEach(entry -> cargoHoldToUpdate.add(entry.getElement(), entry.getCount()));

Multisets.filter(deposited, id -> !SAILING_CARGO_TOOLS.contains(id))
.forEachEntry(cargoHoldToUpdate::add); // cargo tools do not count towards total
log.debug("updated cargo hold from inventory delta {}", cargoHoldToUpdate);
writeToConfig();
}
Expand Down