Skip to content

Feature/pitfall#460

Merged
chsami merged 12 commits into
chsami:developmentfrom
NewGenEng:feature/pitfall
Jun 5, 2026
Merged

Feature/pitfall#460
chsami merged 12 commits into
chsami:developmentfrom
NewGenEng:feature/pitfall

Conversation

@TannerIsBender
Copy link
Copy Markdown
Contributor

No description provided.

chsami and others added 11 commits May 10, 2026 18:24
fix(auto-smelting): rewrite bail-on-transient-state checks (chsami#433)
feat(FarmTreeRun): compost type selection, leprechaun support, and bu…
* Feat/butterfly catcher plugin (chsami#448)

* fix(combat-hotkeys): move prayer toggles off key event thread

Prayer hotkeys were calling Rs2Prayer.toggle() directly on the key
listener thread, causing focus loss and input lag on every press.
Replaced runOnSeperateThread (silently drops calls when the shared
ClientThread future is busy) with a plugin-owned ExecutorService.
Also added a debug overlay panel toggled via config. Bump to v1.1.2.

* feat(butterfly-catcher): add Butterfly Catcher plugin v1.0.0

Automates butterfly and moth catching for Hunter XP.
Supports Ruby Harvest through Moonlight Moth (Varlamore).
Barehanded and butterfly net modes with level/equipment checks on startup.

---------

Co-authored-by: chsami <aintaro@proton.me>

* fix(combat-hotkeys): move prayer toggles off key event thread (chsami#447)

Prayer hotkeys were calling Rs2Prayer.toggle() directly on the key
listener thread, causing focus loss and input lag on every press.
Replaced runOnSeperateThread (silently drops calls when the shared
ClientThread future is busy) with a plugin-owned ExecutorService.
Also added a debug overlay panel toggled via config. Bump to v1.1.2.

Co-authored-by: chsami <aintaro@proton.me>

* feat(birdhouse): disable teleports on Fossil Island, force southern rowboat, chain seaweed plugin (chsami#446)

- Set Rs2Walker.disableTeleports=true once on Fossil Island so the
  digsite pendant is only consumed once (for the initial teleport)
- Walk to southern rowboat before banking to avoid the longer northern route
- Wire up "Start Giant Seaweed after run" config to launch
  GiantSeaweedFarmerPlugin on birdhouse run completion
- Fix withdrawSeeds false warning: use real stack quantity instead of
  Rs2Inventory.count() slot count, and fail fast if <40 seeds
- Add debug section with override start state for testing
- Bump version to 1.1.2

Co-authored-by: runsonmypc <runsonmypc@users.noreply.github.com>

* fix(GiantSeaweedFarmer): broken state detection, stale state, unclean shutdown (chsami#445)

* fix(GiantSeaweedFarmer): replace broken varbit state detection with action+name approach

getSeaweedPatchState() read the varbit from the impostor composition
instead of the base object, returning garbage values that always mapped
to "Weeds" regardless of actual patch state. This caused infinite loops
after harvesting.

Replace with getPatchState() that checks the impostor's actions and name:
Pick→Harvestable, Rake→Weeds, Clear→Dead, Cure→Diseased,
"Seaweed patch" (no Rake)→Empty, "Seaweed"→Growing.

Also fixes: Harvestable case sleepUntil waited for "Empty" (varbit 3)
but post-harvest patches go to Weeds first, causing 20s timeouts every
cycle. Now waits for not-Harvestable which resolves immediately.

* fix(GiantSeaweedFarmer): reset all state on plugin restart

BankSuccess, GSF_Running, and other fields were not reset in run(),
so restarting the plugin reused stale state from the previous run
(e.g. BankSuccess=true skipped banking entirely).

* fix(GiantSeaweedFarmer): clean shutdown via Microbot.stopPlugin

shutdownSequence() now calls Microbot.stopPlugin() which toggles the
plugin off in the client UI, stops both the farmer and spore scripts,
and removes the overlay — instead of just cancelling the script future
while leaving everything else running.

Also: reset BankSuccess in shutdown(), remove dead safetyCheck() method,
remove redundant GSF_Running assignment in plugin startUp().

* fix(GiantSeaweedFarmer): fix typo and wrong description in override config

---------

Co-authored-by: runsonmypc <runsonmypc@users.noreply.github.com>

* fix(FarmTreeRun): remove isAnimating, shared leprechaun helper, withdrawal bugfix (chsami#444)

* fix(FarmTreeRun): remove isAnimating checks, delete planning docs, bump version

- Remove all Rs2Player.isAnimating() checks from the script — they
  cause stalls and are unreliable for gating plugin logic.
- Replace animation waits in handleRakeAction/handleClearAction with
  waitForXpDrop(Skill.FARMING) which is the actual completion signal.
- Replace animation wait in bank() with sleepUntil(Rs2Bank::isOpen).
- Delete docs/superpowers/ planning artifacts accidentally committed.
- Bump plugin version to 1.2.0.

* feat(FarmTreeRun): category toggles, proper shutdown, rake fix

- Add "Run trees", "Run fruit trees", "Run hardwood trees" toggles in
  the sapling selection section to skip entire tree categories at once.
- Plugin properly disables itself via Microbot.stopPlugin() on shutdown.
- Increase rake XP drop wait to 10s and drop weeds immediately after
  raking instead of in the general drop loop.

* feat(FarmTreeRun): shared Rs2Leprechaun helper, fix duplicate-item withdrawal bug

Extract leprechaun compost withdrawal into shared Rs2Leprechaun utility
(included in every plugin JAR alongside PluginConstants). Merge duplicate
itemId entries before bank withdrawal so overlapping protection payments
(e.g. Willow + Banana both needing baskets of apples) sum correctly.

---------

Co-authored-by: runsonmypc <runsonmypc@users.noreply.github.com>

---------

Co-authored-by: stonksCode <99895926+stonksCode@users.noreply.github.com>
Co-authored-by: runsonmypc <45095641+runsonmypc@users.noreply.github.com>
Co-authored-by: runsonmypc <runsonmypc@users.noreply.github.com>
@chsami chsami changed the base branch from main to development June 2, 2026 03:40
@chsami
Copy link
Copy Markdown
Owner

chsami commented Jun 2, 2026

please resolve your conflicts

@TannerIsBender
Copy link
Copy Markdown
Contributor Author

please resolve your conflicts

done m8

@chsami chsami merged commit cb5c090 into chsami:development Jun 5, 2026
1 check passed
chsami added a commit that referenced this pull request Jun 5, 2026
* fix/geflipper: adapt to FlippingCopilot suggestion type enum change (#467)

- Replace String-based type checks with reflection helpers
- Collapse modify_buy/modify_sell into single isModify path
- Add null guards for highlightOverlays and widget actions/text
- Bump version to 1.2.4

Co-authored-by: afss0 <125560943@users.noreply.github.com>

* fix(BlueDragons): banking, spam loop, combat loop, loot config (#466)

* fix(BlueDragons): banking deposits all, spam loop, safe spot, loot config

- Banking uses depositAllExcept to keep dusty key, runes, rune pouch
- Skip banking on startup when inventory already has food and no loot
- Cancel existing scheduler before starting new one (orphaned futures)
- Increase polling interval from 100ms to 600ms (game tick rate)
- Enforce safe spot before loot check in fighting handler
- Passive loot detection via Rs2GroundItem.exists() instead of looting
- Loot list respects config toggles (dragonhide, ensouled head)
- Replace isAnimating(5000) with Rs2Combat.inCombat() for attack check
- Add loot untradables config option
- Remove broken logOnceToChat dedup, use direct Microbot.log()
- Version bump 1.1.3 → 1.2.0

* fix(BlueDragons): simplify combat loop, safe spot lure, loot config fixes

- Collapse FIGHTING/LOOTING/ESCAPE into single non-blocking COMBAT state
- One action per tick (AIO Fighter pattern): eat → loot → safe spot → attack
- 2.4s grace period after clicks to prevent botlike rapid-fire bouncing
- Wait-for-loot option: detect dragon death animation, wait for drops
- Eat-for-loot option: eat food to free inventory space for loot
- Filter dead dragons from attack targets (no spam-clicking death animation)
- Only attack from safe spot; natural lure pattern emerges from tick logic
- Value-based loot respects dragonhide toggle via ignored names
- Change lootDragonhide default to false
- Skip banking on startup/combat when inventory is full of food (no loot)

---------

Co-authored-by: runsonmypc <runsonmypc@users.noreply.github.com>

* Feature/pitfall (#460)

* Start to Pitfall

* Shitty working start

* MVP

* Pitfall

* More improvements

* Functional

---------

Co-authored-by: chsami <aintaro@proton.me>
Co-authored-by: stonksCode <99895926+stonksCode@users.noreply.github.com>
Co-authored-by: runsonmypc <45095641+runsonmypc@users.noreply.github.com>
Co-authored-by: runsonmypc <runsonmypc@users.noreply.github.com>
Co-authored-by: Bender <admin@newgeneng.com>

---------

Co-authored-by: afss0 <125560943+afss0@users.noreply.github.com>
Co-authored-by: afss0 <125560943@users.noreply.github.com>
Co-authored-by: runsonmypc <45095641+runsonmypc@users.noreply.github.com>
Co-authored-by: runsonmypc <runsonmypc@users.noreply.github.com>
Co-authored-by: Tanner <10541121+TannerIsBender@users.noreply.github.com>
Co-authored-by: stonksCode <99895926+stonksCode@users.noreply.github.com>
Co-authored-by: Bender <admin@newgeneng.com>
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.

3 participants