Commit Graph
867 Commits
Author SHA1 Message Date
alexandClaude Sonnet 4.6 21e63fc423 fix: detect and log WP failures in approach/go_to_act
Problems:
1. use_wp() fired immediately after open_wp() — WP panel animation
   still playing, WaypointTabs template not yet visible → silent fail
2. vizier.py + diablo.py ignored use_wp() return value → approach()
   returned a truthy Location even when the WP was never used, causing
   battle() to run from the wrong map location
3. go_to_act() also ignored use_wp() return value

Fixes:
- waypoint.use_wp(): retry WaypointTabs detection up to 4x (1.6s total)
  before giving up; log each retry + the target WP and act being switched
- vizier/diablo approach(): check use_wp() return, return False on failure
- town_manager.go_to_act(): check use_wp() return, log + return False

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
2026-06-07 15:35:11 +02:00
alexandClaude Sonnet 4.6 02d113ea0c fix: replace GoldBtnVendor check with LeftPanel in open_trade_menu
GoldBtnVendor (small gold coin template in a tight ROI) was failing even
when the vendor window was fully open. Replace with wait_until_visible(
LeftPanel, timeout=3.0) which checks for the panel close-X in the header
— the same reliable check used by wait_for_left_inventory/left_inventory_ready.

Fixes: A5 (Malah) and A1 (Akara) buy_consumables failing every run.

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
2026-06-07 10:42:27 +02:00
alexandClaude Sonnet 4.6 307b021352 fix: 1282px window coords, NPC detection robustness, TP window re-detect
- screen.py: default monitor_roi width 1280 -> 1282 (actual window size)
- diablo.py: re-detect window position before TP in CS run (2 places)
- npc_manager.py: adjust Akara ROI/poses for 1282px; lower NPC name tag
  threshold 0.5->0.35 for more reliable hover detection; add NPCDialogue
  visibility wait + per-threshold debug logging in press_npc_btn
- a1.py: add wait(0.5, 0.8) after trade button before GoldBtnVendor check;
  guard open_trade_and_repair_menu on NPC menu result; add Logger.info
  throughout open_trade_menu, heal, open_trade_and_repair_menu
- a5.py: same wait + logging pattern for Malah open_trade_menu

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
2026-06-07 10:37:35 +02:00
alexandClaude Sonnet 4.6 3410a82895 feat: log Windows version, mouse mode, and OCR backend at startup
Adds _log_platform_info() called from startup_checks(). On each bot
start the log now shows:
  - Windows 10/11 + build number (Win11 = build >= 22000)
  - Mouse input mode: relative (Win11) or absolute (Win10)
  - OCR backend: tesserocr (primary) or pytesseract fallback or ERROR

Win11 (build 26200) confirmed working: mouse in relative mode,
tesserocr 5.2.0 with hover/ground botty models loading correctly.

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
2026-06-06 22:14:38 +02:00
alexandClaude Sonnet 4.6 35fa4ba442 merge: town_manager.py — combine debug logging + set_panel_check_paused
Resolved 7 conflicts by keeping both local (Logger.info diagnostics in
buy_consumables and repair) and remote (set_panel_check_paused health-check
suppression during vendor/repair panels). All paths now log + pause correctly.

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
2026-06-06 22:07:24 +02:00
alexandClaude Sonnet 4.6 e729dc0c0e fix: 1282px coords, TP window re-detect, town_manager debug logging
- game.ini: adjust ROIs/positions for 1282x720 window (gold_btn_stash,
  left_inventory, panel_header, npc_dialogue, inventory_tabs, skill_bar)
- i_char.py: re-detect window position before casting TP to fix template drift
- town_manager.py: add Logger.info/error throughout buy_consumables and repair
  for easier diagnosis of vendor interaction failures

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
2026-06-06 22:06:00 +02:00
FiskenPoul 7e39119f33 fix: robust cooperative shutdown and stability improvements for Windows 10
- Implementation of centralized cooperative shutdown mechanism (C10) to replace dangerous thread killing.
- Consolidation of all timing signatures through jittered wait() for anti-cheat stealth (C1).
- Enhanced HealthManager reactivity with smart mana potion fallback and premature panel-closing protection.
- Refactored waypoint stealth logic to simulate human-like mis-aim instead of area-breaking misclicks.
- Implementation of stateless 'garbage item' filtering in PickIt to eliminate ghost item loops and OCR artifacts.
- Optimization of inventory management to automatically stash protected items that cannot be sold.
- Suppression of individual game failure notifications on Discord; alerts now trigger on 5+ consecutive fails.
2026-06-06 19:34:06 +02:00
FiskenPoul d69f066da5 fix: robust cooperative shutdown and stability improvements for Windows 10
- Implementation of centralized cooperative shutdown mechanism (C10) to replace dangerous thread killing.
- Consolidation of all timing signatures through jittered wait() for anti-cheat stealth (C1).
- Enhanced HealthManager reactivity with smart mana potion fallback and premature panel-closing protection.
- Refactored waypoint stealth logic to simulate human-like mis-aim instead of area-breaking misclicks.
- Implementation of stateless 'garbage item' filtering in PickIt to eliminate ghost item loops and OCR artifacts.
- Optimization of inventory management to automatically stash protected items that cannot be sold.
- Suppression of individual game failure notifications on Discord; alerts now trigger on 5+ consecutive fails.
2026-06-06 19:32:18 +02:00
alexandClaude Sonnet 4.6 88bd369bd0 merge: resolve params.ini conflict — keep transmute_every_x_game=2000
Alex's value (2000) preserved over FiskenPoul's (200) for transmute cadence.
stash_destination=0,1,2,3 accepted from remote (matches fill_shared_stash_first=0).

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
2026-06-06 18:01:32 +02:00
alexandClaude Sonnet 4.6 dc48a05d61 restore: params.ini to pre-merge (7dcbb52) + common.py/pickit.py fixes
- params.ini: restore Alex's settings (auto_login, webhooks, hotkeys,
  run order, casting_frames, potion thresholds, override_capabilities, etc.)
- common.py: increase wait_for_left_inventory timeout 5s → 10s for stability
- pickit.py: re-detect window position before pickup to fix template drift

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
2026-06-06 18:00:29 +02:00
FiskenPoul 97f4e55643 fix: comprehensive stability, stealth, and logic improvements
- Stability: Replaced unsafe kill_thread() with cooperative_shutdown() in GraphicDebugger.
- Stealth: Integrated jittered wait() and human-like typing variation in win_input.py.
- Robustness: Switched to absolute paths for template loading and log rotation anchoring.
- Bugfix: Resolved AttributeError: 'ScreenObjects' has no attribute 'MercPanelText'.
- Logic: Implemented thread-safe state in DeathManager and re-indexed PickedUpResult enum.
- Pickup: Added failure blacklisting for unreachable items to prevent infinite loops.
- Stash: Fixed gold stashing to correctly respect fill_shared_stash_first=0 (personal first).
- Config: Updated settings validation to allow common D2R variations (Gamma, VSync, etc.).
2026-06-06 11:24:20 +02:00
alex 01a0351530 fix: apply 4 priority reliability fixes from codex analysis
- nihlathak: verify waypoint load with template check, add grayscale fallback for layout detection, guard traverse_nodes_fixed return
- npc_manager: press_npc_btn now returns bool with threshold retry (0.85->0.78) + grayscale fallback
- town/a1,a4,a5: check press_npc_btn return and verify GoldBtnVendor before proceeding
- char/i_char: expand stash waypoint close to A1_TOWN_0, add lower-threshold retry for stash in a1/a5
- char/i_char: add _weapon_switch helper that resets _active_skill cache, fix CTA switch-back validation, fix switch_sucess typo
2026-06-06 01:28:41 +02:00
alex 5ac00d16d0 Add Win10/Win11 auto-detection for mouse input mode
- win_input.py: detect OS build via platform.win32_ver(), use
  MOUSEEVENTF_ABSOLUTE only on Win10 (build < 22000)
- install.bat: detect and display Windows version on install
2026-06-05 22:51:54 +02:00
FiskenPoul 95f520e968 Resolve merge conflicts, keeping local Win10 specific changes 2026-06-05 21:47:11 +02:00
alex 7dcbb5284b fix: improve potion management by filling belt from inventory and adjusting consumable handling 2026-06-05 21:39:15 +02:00
alexandClaude Sonnet 4.6 dc61367a6e fix: guard fill_up_belt_from_inventory against None img from failed open_inventory
personal.open_inventory() returns None when the inventory cannot be opened
(e.g. after a failed vendor interaction leaves the UI in a bad state). The
previous code passed that None straight into common.get_slot_pos_and_img()
which tried to index it, crashing the bot thread with:
  TypeError: 'NoneType' object is not subscriptable

Also wraps the shift-click loop in try/finally so keyboard.release("shift")
is guaranteed even if an exception fires mid-loop (prevents stuck Shift key).

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
2026-06-05 20:47:11 +02:00
alexandClaude Sonnet 4.6 6c8da72bf4 fix: weapon swap verification, health pot selling, town healing, pickup drought alert
- i_char.py: rewrite _pre_buff_cta() to verify each weapon switch via BC
  skill-bar template; detects wrong slot on game start (leftover from
  interrupted buff cycle), retries failed switches once, logs clearly
  when stuck on CTA slot to prevent dying with wrong weapon in combat

- personal.py: protect needed consumables from sell/drop in inspect_items;
  check get_needs() before marking a pot for discard — if the belt needs
  that pot type, skip it so fill_up_belt_from_inventory can restock later

- bot.py: add fill_up_belt_from_inventory + update_pot_needs after
  buy_consumables so inventory pots reach the belt even when out of gold;
  add town-heal loop at start of on_maintenance to drink health/rejuv pots
  until HP >= 95% before the next run (health manager is paused in town)

- game_stats.py: add rolling 10-game pickup health check; warns in log and
  sends Discord alert when zero item pickups occur across 10 games while
  chickens or merc deaths are present

- params.ini: fix show_belt=n -> show_belt=k (belt key was wrong, causing
  1.5s wasted recovery attempt every first game in a session)

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
2026-06-05 16:36:07 +02:00
alex 77f2092572 Refactor bot behavior on TP failure, enhance item processing logic, and improve game stats logging
- Updated bot behavior to end the game when no TP charges are left, instead of attempting to walk back to town.
- Refined item processing logic in `processing_helpers.py` to use identity checks for item comparisons and improved item removal methods.
- Enhanced game stats logging to include failure reasons and send Discord notifications for failed games.
- Improved health management logic to trigger chicken behavior based on health percentage after rapid rejuvination.
- Added error handling for item pickup failures in `pickit.py` to blacklist items that cannot be picked up.
- Introduced walking fallback nodes for Countess, Andariel, Mephisto, and Baal runs in `pather.py`.
- Implemented path data validation in run scripts for Countess, Andariel, Mephisto, and Baal to ensure paths are correctly defined.
- Enhanced item identification and stash processes in `diablo.py` with retry logic for failures.
- Updated town management to handle identification failures gracefully and log appropriate warnings.
- Improved character selection logic to provide clearer logging messages.
- Modified game restart logic to launch the game via PowerShell for better session handling.
- Added documentation for recording paths for the Countess run and created a PowerShell script for scheduled task management.
2026-06-05 14:58:50 +02:00
alex 6d42216fd1 fix: add missing mouse.right-click after _select_skill for CTA buffs 2026-06-04 20:43:20 +02:00
alex d1502a008a fix: guard on_maintenance against _curr_loc=False crash 2026-06-04 20:41:19 +02:00
alex b94147a9c9 fix: CTA use _select_skill with right-click (matches working forks aeon0/redjon) 2026-06-04 20:34:12 +02:00
alex 75a35821e4 fix: CTA pre-buff is just w, 7+RClick, 8+RClick, w (no extra buffs - Concentration is attack rotation) 2026-06-04 20:31:03 +02:00
alex d4ccca8496 fix: CTA buff sequence: w, 7+RClick, 8+RClick, buffs, w (no visual verification) 2026-06-04 20:29:52 +02:00
alex 26f5faf977 fix: CTA buffs move mouse to center before right-click to target self 2026-06-04 20:25:05 +02:00
alex 3f46ccbe23 fix: CTA buffs use left-click to cast on self; simplify swap-back to 2 attempts
- BC and BO cast with left-click (targets self) instead of right-click
- Swap-back loop simplified to 2 attempts with match score logging
- Added full test route order: trav, pindle, eldritch_shenk, nihlathak, arcane, diablo, vizier
2026-06-04 20:21:54 +02:00
alex 08a79b73c1 fix: CTA pre-buff no longer depends on broken BC/BO skill templates
Removed the visual skill check (is_right_skill_selected BC/BO) that always
failed because the BC.png/BO.png templates do not match D2R icons. New flow:
switch weapon, cast BC, cast BO, buff, switch back. Only verifies swap-back
by matching the original skill icon via template matching.
2026-06-04 19:47:24 +02:00
alex 22b7ac5b49 fix: set failure reasons before log_end_game to eliminate 'Unknown'
- game_controller: set reason on max_game_length, chicken, force_stop
- bot.py on_end_game: set default reason when failed=True has no reason yet
- bot.py save_and_exit failure: set reason before stop()
- bot.py restart_or_exit: capture error message as failure reason
2026-06-04 19:39:15 +02:00
alex 3d7163df16 fix: prevent _curr_loc=False crash in town manager retries; add travincal route
- All retry paths (stash, buy_consumables, heal, repair) now use known-good
  location constants instead of corrupted self._curr_loc (False)
- Guard gamble->stash chain against False location
- Guard wait_for_tp against False location
- Add run_trav to route order (travincal then pindle)
2026-06-04 19:30:23 +02:00
alex 4b96155a37 Hammerdin Diablo/Pindle fixes
- Fix merc icon detection: expanded ROI from 40x40 to 60x60 (matchTemplate requires search area > template)
- Add MercPanelText screen object using mercenary_screen.png for reliable merc alive check
- Bot merc check now uses MercPanelText instead of generic LeftPanel
- Diablo: wait for boss to spawn before attacking (up to 15s), use conviction aura
- Diablo/Pindle attack lengths increased (diablo 3->10s, pindle 3->8s)
- Aura key switch delay increased from 50-100ms to 200-300ms for reliable activation
- Add conviction hotkey (F5) to hammerdin config
- Move Pindle CTA pre-buff from town to after entering red portal
- More aggressive healing thresholds (health potion at 98%, rejuv at 85%)
- Max game length increased from 160s to 600s for full Diablo runs
2026-06-02 19:41:42 +02:00
alex 2baf51c717 Fix merc detection and portal clicking
- Crop A5_RED_PORTAL template to remove empty space (center now aligns with portal)
- Fix merc_icon ROI from 10,9,50,50 to 15,14,40,40 (matches 40x40 merc templates)
- Lower MercIcon threshold from 0.9 to 0.85, add MERC_A2_2 variant
- Add merc panel confirmation with 'O' key before resurrect (prevents false resurrect when icon detection fails)
- Override capabilities to can_teleport_natively
2026-06-01 22:20:49 +02:00
alex 2cd683ac7b Add not enough gold screenshot logging and new MISSING_GOLD template
- src/inventory/vendor.py: Log screenshots when NotEnoughGold detected
  during gambling, purchasing, and repairing
- src/ui_manager.py: Update NotEnoughGold to use new MISSING_GOLD template
  from assets/npc/missing_gold/ (full dialog match instead of color-based)
- assets/npc/missing_gold/missing_gold.png: New template for the popup
2026-06-01 11:21:53 +02:00
alex 30bf163ee3 Fix move_d2r_window to position client area, not outer window
- src/utils/misc.py: move_d2r_window now calculates outer window position
  to place client area at target coords (was incorrectly setting outer
  window to target, shifting client area unpredictably)
- src/bot.py: Call move_d2r_window(5,98) at game start to restore original
  working client area position and prevent 13px offset drift
2026-06-01 11:07:53 +02:00
alex cb3d49fa22 Fix window offset drift causing pathing and template matching failures
- src/screen.py: Add force param to find_and_set_window_position/set_window_position
  to bypass early-return guard and skip wait when called programmatically
- src/run/pindle.py: Force window re-detection before each traverse_nodes and
  select_by_template call to handle offset drift between runs
- src/pather.py: Add fallback full-image search with lower threshold (0.55) when
  cropped ROI search fails in find_abs_node_pos
- src/bot.py: Move D2R window to stable position (0,0) at game start via
  move_d2r_window; skip merc resurrect after first failure (no gold)
- src/game_stats.py: Add _merc_resurrect_failed flag (reset each game)
- src/utils/misc.py: Add move_d2r_window() function
- config/params.ini: Updated teleport=b, show_belt=k, override_capabilities,
  restore_settings_from_backup_key=insert, graphic_debugger_key=delete
2026-06-01 11:01:00 +02:00
alex 5244a50ea3 feat: potion transmute system - convert Rejuv to Full Rejuv via cube 2026-06-01 09:54:26 +02:00
alex f59ffd5d1f fix: raise stash page limit to 20 for ROTW support, fix merc_icon ROI, add red resurrect button detection 2026-06-01 09:27:42 +02:00
alex 8eafd91f0a fix: health_manager merc healing by actual HP + clean up stray TODO comment
- health_manager.py: read actual merc health for heal/chicken/rejuv decisions
  instead of timer-only logic; pass merc_health to belt.drink_potion stats
- processing.py: remove stale TODO comment (traceback import is used)
2026-05-31 13:43:26 +02:00
alex a83dc15b62 fix: heal merc via keyboard timer instead of fragile icon detection 2026-05-31 13:30:39 +02:00
alex 7d1f03beb7 chore: commit all changes 2026-05-31 12:51:21 +02:00
alex 7d6314b575 Save all config, data, and tools state 2026-05-30 20:21:15 +02:00
alex b9f3253e24 fix(ci): restore test assets from git history, remove dead download step
- Restore test/assets/ from commit 5127417^ (was moved to bottytools/botty-test-assets which is now 404)
- Remove 'Download test assets' step from CI workflow (assets are now in-repo)
- Make download_test_assets.py a no-op for backward compatibility
- Fix import: from pipes import Template -> from template_finder import Template
- Remove test/assets/ from .gitignore
2026-05-30 10:03:11 +02:00
alex fefcfa013f fix(ci): correct import from template_finder instead of non-existent pipes 2026-05-30 09:54:30 +02:00
alex 43f973ebc2 bump version to 0.8.4 2026-05-30 09:34:41 +02:00
alex 16a4d121c0 feat: log rotation with Discord notifications + failure reason tracking
- Add utils/log_rotation.py: safe_imwrite() auto-rotates screenshot dirs
  when they exceed configured file count or size limits
- Add [log_rotation] config section in params.ini (pickit/info/items
  max_files, max_mb, discord_notify_rotation)
- Replace 40 cv2.imwrite() calls with safe_imwrite() across 13 files
- Add failure reason tracking: bot.py catches run exceptions, stores
  reason in game_stats, Discord message includes the error
- Add Discord notification when log rotation deletes old files
- Prevents disk-full crashes that stopped botty on May 30
2026-05-30 09:32:24 +02:00
alex 8853620786 Archive rotated logs to log/archive/ as zips
- Custom ArchiveRotatingFileHandler zips old log.txt.N files
  into log/archive/log_YYYYMMDD_HHMMSS.zip
- Keeps log/ directory clean — no loose .txt.1 files
2026-05-28 19:12:18 +02:00
alex e4c201bf2d Add rotating session reports and log rotation
- on_exit() now generates a session report (txt + json) in log/runs/
- Log file rotates daily, keeps 7 days (TimedRotatingFileHandler)
- Added log/runs directory creation in main.py
2026-05-28 19:07:42 +02:00
alex 9491169549 Add gold tracking to stats and fix game resolution 2026-05-28 16:52:41 +02:00
alex e3d6605595 Update FG price tracker, game stats, and add d2jsp collection tooling 2026-05-27 01:08:45 +02:00
alex 19f4b8a553 Harden offline FG parser and add d2jsp collection tooling 2026-05-26 13:04:28 +02:00
alex 3888cc9666 Fix status XP/level math, env refs, and potion tier fallback 2026-05-26 11:36:58 +02:00
alex 377b2803e3 Improve run stability, repair flow, and stats tracking 2026-05-26 09:43:53 +02:00