Skip to content

feat(ebounty.lic): v1.10.0 enhance FORAGE BOUNTY support#2297

Merged
mrhoribu merged 6 commits intomasterfrom
feat/ebounty-v1.10.0
Apr 18, 2026
Merged

feat(ebounty.lic): v1.10.0 enhance FORAGE BOUNTY support#2297
mrhoribu merged 6 commits intomasterfrom
feat/ebounty-v1.10.0

Conversation

@mrhoribu
Copy link
Copy Markdown
Contributor

@mrhoribu mrhoribu commented Apr 16, 2026

Updated version to 1.10.0 and added support for alternative BOUNTY text.

Summary by CodeRabbit

  • New Features

    • Allow supplying alternate BOUNTY text to the forage command: ;ebounty forage bounty "BOUNTY output", which is parsed and applied to the forage run (parse errors are reported).
  • Bug Fixes

    • Fixed forage counting for mushroom/herb name variants by centralizing name matching so totals and loop break conditions are accurate.
  • Documentation

    • Added manual-syntax help for the forage bounty command and improved validation/error messaging (now indicates "no herb bounty" when appropriate).

Updated version to 1.10.0 and added support for alternative BOUNTY text.
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Apr 16, 2026

📝 Walkthrough
🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately reflects the main changes: version bump to 1.10.0 and enhanced FORAGE BOUNTY support with alternative BOUNTY text parsing capability.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch feat/ebounty-v1.10.0

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@scripts/ebounty.lic`:
- Line 3717: Remove the trailing whitespace after the call
"EBounty.go2(return_room)" so the line ends exactly with
EBounty.go2(return_room) (no spaces or tabs at end); this will resolve the
Layout/TrailingWhitespace RuboCop offense.
- Around line 3700-3711: The current unguarded call to Bounty::Parser.parse and
Bounty::Task.new (when Script.current.vars[3] is present) can raise or return
invalid data and abort execution; wrap that parse+construction in a safe branch
that rescues parse/constructor errors (or checks for nil/invalid return) and on
failure emits a controlled EBounty.msg "error" with a clear message including
the raw input or bounty_info.inspect fallback, then exit or fall back to
Bounty.task; make the protective change around the block that sets bounty_info
(the code invoking Script.current.vars[3], Bounty::Parser.parse, and
Bounty::Task.new) so EBounty::Task.forage_bounty is only called with a valid
bounty_info for which bounty_info.herb? is true.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 268b4c7e-bfc5-4aae-b034-1b3e5b607d3a

📥 Commits

Reviewing files that changed from the base of the PR and between a632643 and 8f14f9f.

📒 Files selected for processing (1)
  • scripts/ebounty.lic

Comment thread scripts/ebounty.lic Outdated
Comment thread scripts/ebounty.lic Outdated
Refactor bounty_info assignment for better error handling and clarity.
Refactor forage_bounty to use forage_amount for calculating amounts and improve code clarity.
@mrhoribu
Copy link
Copy Markdown
Contributor Author

@coderabbitai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Apr 16, 2026

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@mrhoribu
Copy link
Copy Markdown
Contributor Author

@coderabbitai remove all previous comments and review again

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Apr 16, 2026

@mrhoribu Sure! I'll resolve all my previous comments and perform a fresh review of the PR.

✅ Actions performed

Full review triggered.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@scripts/ebounty.lic`:
- Around line 2985-2992: The turn-in and return paths still search for the raw
herb name, causing failures for alias names; update Task.forage_turnin and
Task.forage_return to reuse the same normalized herb matcher logic used in
self.forage_amount (the alias mappings for "white mushroom" -> "white hook
mushroom", "trafel mushroom" -> "black trafel mushroom", "withered mushroom" ->
"withered black mushroom", "soft mushroom" -> "soft white mushroom") and then
search the default container with the same regex match (e.g., /#{herb}/) instead
of the raw input so the collected-vs-turn-in checks remain consistent.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 654877ee-fe3d-44ce-ace8-550444fa08c3

📥 Commits

Reviewing files that changed from the base of the PR and between a632643 and 17e48cb.

📒 Files selected for processing (1)
  • scripts/ebounty.lic

Comment thread scripts/ebounty.lic Outdated
@mrhoribu
Copy link
Copy Markdown
Contributor Author

@coderabbitai remove all previous comments and review again

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Apr 16, 2026

@mrhoribu Sure! I'll resolve all my previous comments and perform a fresh review of the PR once more.

✅ Actions performed

Full review triggered.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@scripts/ebounty.lic`:
- Line 3727: The call to EBounty::Task.forage_bounty is incorrectly setting
bounty_bypass based on presence of manual BOUNTY text (Script.current.vars[3]),
causing manual-forage to skip turnin/return; change the logic so bounty_bypass
is only true when an explicit bypass flag is provided (add or use a dedicated
flag var) and not when manual text is present; keep the normal forage path for
manual text and simply override the parsed herb/number/area arguments before
calling EBounty::Task.forage_bounty (update the call site that constructs
bounty_info and the bounty_bypass argument accordingly).
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 661eb458-086e-4dfc-87fb-cebe5485250d

📥 Commits

Reviewing files that changed from the base of the PR and between a632643 and 56700a9.

📒 Files selected for processing (1)
  • scripts/ebounty.lic

Comment thread scripts/ebounty.lic
@mrhoribu mrhoribu merged commit 9a213ed into master Apr 18, 2026
4 checks passed
@mrhoribu mrhoribu deleted the feat/ebounty-v1.10.0 branch April 18, 2026 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant