Skip to content

Fix issues with item interactions when bank menu is open #7

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
eghernqvist wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issues with item interactions when bank menu is open #7

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
16 changes: 9 additions & 7 deletions src/main/java/com/choiceman/menus/ActionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,9 @@ private boolean isLockedGroundItem(int canonicalId) {
* Core gating for non-ground rows.
* - Always allow safe operations (examine/drop/destroy/release).
* - Defer skill/spell rows to {@link Restrictions}.
* - If the row references a tracked item whose base is locked, only allow the safe operations.
* - While bank/deposit UI is open, only allow benign banking operations.
* - If the row references a tracked item whose base is unlocked, allow all operations.
* - If the row references a tracked item whose base is locked, only allow the safe operations,
* plus benign banking operations while the bank/deposit UI is open.
*/
private boolean isEnabled(int id, MenuEntry entry) {
final String option = Text.removeTags(entry.getOption());
Expand All @@ -280,6 +281,10 @@ private boolean isEnabled(int id, MenuEntry entry) {
final String base = itemsRepo.getBaseForId(id);
final boolean baseUsable = base != null && unlocks.isBaseUsable(base);

// Unlocked items behave normally, even while banking
if (baseUsable) return true;

// Locked items: while banking, still allow benign banking ops
if (enabledUiOpen()) {
return option.startsWith("Deposit")
|| option.startsWith("Withdraw")
Expand All @@ -288,10 +293,7 @@ private boolean isEnabled(int id, MenuEntry entry) {
|| option.startsWith("Destroy");
}

if (!baseUsable) {
return equalsAny(option, "examine", "drop", "destroy", "release");
}

return true;
// Locked, not banking: only harmless ops
return equalsAny(option, "examine", "drop", "destroy", "release");
}
}