272 Commits

Author SHA1 Message Date
mgleed
9b22917660 Refactor: UI overhaul (#558)
Summary of changes:
-Rearranged many UI-related functions across the codebase (particularly in ui_manager.py) into individual components. See src/ui_components/. Functions related to components can be called like if waypoint.use_wp("Arcane Sanctuary"): or loading.wait_for_loading_screen(2.0)
-Removed Screen and TemplateFinder dependencies across the codebase
-Screen functions separated from class
-TemplateFinder made into a singleton
-Added generic ScreenObject UI functions to simply detect UI elements on screen; e.g., detect_screen_object(ScreenObjects.TownPortal), wait_for_screen_object(ScreenObjects.Loading, 2). Also included related functions like select_screen_object_match(template_match) to automatically select the match.
-Consolidated assets. Organized templates folder into components. Adjusted some asset ROI's and alpha channels.
-Changed some template searches to grayscale for speed
-Reworked save/exit routine, should now be more consistent and faster with normal exit, chicken exit, and death exit.
-Got rid of unused and consolidated duplicate game.ini parameters
-spelling fix _last_merc_healh
-NPC manager class removed and replaced with functions
-D2 window detection now runs on its own thread for semi-live window position offsets.
-Character selection reworked. OCR your selected character for fun (not that accurate, lol)
-Simplified game start and difficulty select
-Added a get experience function, but this is not called anywhere yet
-Reworked corpse pickup. pickup_corpse is no longer a necessary argument/parameter throughout the codebase (bot.py, game_controller.py, runs, etc.)
2022-02-20 18:49:04 -05:00
Vladimir Makaev
528400503c Enhancement: Ability to customize window properties to look for when win32 api searching for d2r window (#563) 2022-02-18 12:27:31 -05:00
mischavandenburg
637920fc4e Feature: Added 46 uniqe / set items to pickit (#552)
by @mischavandenburg
2022-02-17 15:03:00 -05:00
jobithu
a9c3e125ab Feature: Diablo optimization & Killing Trash in Chaos Sanctuary (#460)
* C1F & B1S switched to static pathing

* Improved overall robustness

* improved A layout check consistency

* added A layout check consistency & CTA rebuff

* Home now a loop, B now first seal to pop.

* Trash clear at pentagram, B1S, C1F loop added.

* Changed DeSeis attack pattern so MERC can kill

* tweaked diablo spawn timer & vizier attack pattern

* fixed minor pickit error.

* fixed Layout B Check loop & improved C1F

* improved C1F pathing home

* improved B layout check by removing trash kill

* added C2G static path to infector & loop home

* tweaked pathing

* lots of pathing tweaks to increase consistency

* Clarified Logger.Info

* Fixed A1L Tele to Lava Bug

* Fixed A1Y Tele Lava bug

* Fixed B2U missing pentagram on loop back

* fixed logger

* Completely reworked layout checks

* Reworked C seal layout check

* fixed ending up too low at Diablo

* optimized loop home for C

* added all seals

* removed duplicate trash sequence at C

* Fixed B2U looping home, added essence

* Template Check Threshold raised for Layout Checks

* Reverted A layout check back to inital version

* Aggressive Layout Checks implemented.

* Replaced Pentagram Templates to improve [602]

* Fixed loops for new pent layout

* Reverted A layout checks back to initial version

* merged 6.1?

i hope it worked.

* Pressure Test: A2Y 98% layout check success

* Massive improvements on Layout Checks

* Integrated Skizot's A4 merchants

* Fixed an error on A1L.

* fixed a small error on final pickit

* Slight Cleanup

* tweaked A2Y nodes to avoid lava jumps

* Added B2U Seal Logging

* Add templ. to 611 & 610 to fix stuck pather

* WiZ/SwePow suggestions

* Some more tweaking

* Trying to improve B layout checks (not full run)

* Seal B logic pressure test (no full run)

* added timeouts to weak traversenodes (no full run)

* Pacifist Version - just checking layouts no bosses

* Pure Layoutcheck Pressure Test (double checks)

* Pacifist mode: Layout Check

* Update bot.py

* Added Templates to improve Layoutchecks

* Tweaked B2U Templates (Pacifist Version)

* add B2U nodes & calibration to impr. layout check

* added nodes to layout checks

* Added A1L Calibration Node for Layoutcheck

* Full running script

* Fixed Calibrations - Full Run

* fixed mousover keyerror

* yet another mousover

* fixed a pather issue on B1S, full run

* yet another mousover. full run.

* mousover... ful run

* yet another mousover. full run

* fixed C2G looping across pentagram

* Update game.ini

* WiZ testing

* added seal_node to sealdance

* added C1F layoutcheck nodes

* Added Wiz Speedrun

* tweaked wait in sealdance

* A1L-Static path to Pentagrram

* added A2Y hop 622

* A2Y static path home

* B1S static path home

* changed C1F fake template

* added new C1F seals & static home

* Speed or no speed

Using kill_cs_trash config

* fixed a 36b key error

* Random guess actually is random now

It wasnt random at all before so trying out if this is better

* Minor fixes and tweaks

* B2U - Static Path Home

* Redworked C1F - not stable yet

* Seal order B,C,A and DeSeis fix

There was copy/paste bug in DeSeis making it use wrong atk_len and then I also tuned the attacks a bit.

* fixed final B2U issue, should be stable now!

* added B2U 644_646 static path

* added mapping

* A seals fixed hopefully

More testing tomorrow!

* run diablo py

Yours is the diabloC, I didnt have time to compare them before sleep and wanted you to have both in case

* so this should be super stable now!

* Reverted A1L & A2Y Seal Order (but kept WiZ Idea)

* Reverted Seal Order

* Added Rudi TP :)

* all loop home now

* added TP  template to loop

* typo

* stashs & shrine gfx, TP counter

* removed pent_6 (many false positives looping home)

* clean up for aeon

* fixed typos

* New A2Y & C2G home pathing

* Reworked C1F 704 to avoid stuck

* Ready to test!

* fixed pather clicking outside D2R

* Tweaked Seal A

* Loot to Sealdance() & A2Y tweaks

* removed FALSE from TP fail

* Updated Readme.md

* remove env

* clean up code

* account for used tp

* Removed Dia C1F 700s and replaced with 650s

* Moved Seals, Fights & Pickit to Hammerdin file

* #Trapsin now supported for Arcane and CS
#Trapsin now optionally uses defensive spells Cloak of Shadows and Mind Blast
#Trapsin now waits for Shadow Warrior before using CTA

* Update readme

* Working version

* added  trapsin

* added nova sorc

* added nova sorc

* added light & nova sorc

* added clear trash, issue on 1 function

* Added Clearing Trash

* added 1 tele stop between WP & Pentagram

* fixed mistake on i_char

* CS Trash is now available for beta testing

* fixed a minor issue

* percised some debug logging

* Added CS Trash for Necro, Trapsin, Sorc (no blizz)

* added CS trash to Necro, Trapsin, Sorc_Light _Nova

* # moved functions from chars back to diablo.py
# removed CS for all chars execept hammerdin
# added seal_layout to sealboss functions
# added location to cs_kill_trash functions

* removed pickit from hammerdin.py

* trying to fix some attribute errors for pre_move

* forgot to add _char for pather.traverse_nodes

* added & removed some ._char, now it runs :)

* fixed a missing argument & cleaned up

* clear_trash=1 implemented & working

* added more kill_trash options

* added more debug info & generic kill trash spots

* fixed some debugger errors

* hammerdin done

* updated readme for cs_trash

* #merged A1L and A2Y pathing to char.py
# added A2Y static pathing to Pentagram

* fixed some errors ...

* A1L & A2Y work with new pathing logic

* Ok generic Diablo.py should now work

* and hammerdin.py aswell

* full run

* moved C1F static path to hammerdin.py

* fixed an error for pathing

* Improved A LC consistency to >99%

* Colors!

* added 2 A1L LC templates

* moved pickit to hammerdin.py

* 4min runs

* removed timeouts. 88% killrate right now.

* Added Logparser (thanks famE)

* separated log parser columns

* tweaked log parser

* changed positions of de seis kill screenshots

* added clearing trash between Pent & LC

* fixed missing _self

* Added option for cs_town_visits between seals

* Improved B1S loop home & tweaked some messages

* fixed an error not clearing seals & added colors

* removed 632 duplication & not needed LC templates

* added clear trash to A & B LC

* added pickup at 646

* added PENT_2 Template & removed fail shrine checks

* Added C2G Templates currently only 82% good runs

* Added Hybrid Calibration Nodes

* re-added templates for LC

* added 1px to WP->PENT traverse to avoid missing it

* tweaked home from 632 for not missing pent

* added more redemption before 632 calibration

* merged individual seals to one function

* fixed seal template error

* Added LC function. Fixed C2G & Loop to Pent-Stable

* added atk_len for diablo

* fixed typo so log parser stats are right

* added & increased threshold to LC calibration

* fixed new LC threshold oO - should push less often

* reverted B LC back to initial order

* log parser tweaks

* added shrine check to pather.py

* replaced 630640 with 647

* added B1S LC templates & changed shrine check

* swapped LC for B (current had 75%)

* reworked cs_trash up to LC

* log parse counts templates used

* Fixed B Layout checks

* log parser now w. templates. shrine check added

* just changes to debug names & adding a nicer table for botty start :P

* #best match & time_out=0.1,
#return false on nodes
#new shrine ROI

* Force Stashing before running Dia, logger wording

* shrine check less frequent. char.py cleaned up

* reworked trash layout B

* added 603 ROF1 templates

* added info to params.ini to reduce Q&A in discord

* # added stash every run param
# transferred trash choreography to char.py
# reverted some template changes.

* Ready to merge. Not perfect, but much better!

* small fix before merging

* Update nova_sorc.py

* Update basic.py

* added missing templates causing an error @602

* C2G: static path LC 661 & comment screenshots

* various changes--changed some info to debug, changed floats in config, adjusted runs_per_stash logic

* autoformatting made me commit

* nodes for trash between pent & seal. A works B is bad.

* fix bool -> bool(int(

* added calibration nodes for trash pent>seal

* Full run for testing efficacy of new trash nodes

* fixed a pathing issue

* reverted back to old method for trash.

* Ready for merge.

Co-authored-by: WiZ <32465449+SwePow@users.noreply.github.com>
Co-authored-by: aeon0 <aeon4@pm.me>
Co-authored-by: mgleed <aliigleed16@gmail.com>
2022-02-14 16:25:45 -05:00
mgleed
b83dbb8e8d Track item charges with OCR (#516) 2022-02-06 00:12:45 -05:00
mgleed
ab1d496fff Change always_repair to runs_per_repair (#509)
**This is potentially a breaking change for users using `always_repair`**

Co-authored-by: Vladimir Makaev <vmakaev@gmail.com>
2022-02-05 13:24:13 -05:00
Vladimir Makaev
c358282e68 Launch botty from town or main menu; fix character recovery after restart/death (#494)
* Add ability to launch botty from either main menu or town

* Fix game recovery routine is stuck forever on character selection screen

* Move _char_template to class variable to be able to share among instances

* fix character recovery and character select, support offline/online. WIP

Co-authored-by: Vladimir Makayev <vmakaev@fb.com>
Co-authored-by: mgleed <aliigleed16@gmail.com>
2022-02-04 20:27:56 -05:00
Vladimir Makaev
6b1e155197 Support Gem Transmuting (#491)
Co-authored-by: Vladimir Makayev
2022-02-04 17:58:41 -05:00
Vladimir Makaev
47c5e20238 Optimized handling of teleport charges (#476) 2022-02-04 14:59:39 -05:00
RB-Development
36d3c2e913 Gambling by @RB-Development (#445)
This branch will detect if stash is full of gold. Afterwards the gambling functionality (currently only in act 4 implemented) will be called. The bot will gamble for specific items (determined in params.ini) until no gold is left. He will check for properties specified in pickit.ini and sell not matching items.
Supported items are: ring, amulet, circlet, coronet, talon

Leverages recent advanced pickit PR.
2022-02-04 14:12:56 -05:00
egut125
9f8bed6efb New Param for fails, if max is reached, kill botty. Defaults off. 2022-02-03 14:45:45 -05:00
mgleed
0121c7af2e Allow color_filter to range <0, >180 in H; etc. (#492)
* initial

* move image erosion from item_cropper.py to misc.py for planned use elsewhere

Co-authored-by: aeon0 <aeon4@pm.me>
2022-02-03 07:28:55 +01:00
mgleed
99f8c65c2e Nihlathak spelling (#488)
Unified the variety of nihlathak spellings throughout the codebase
2022-02-01 21:34:21 -05:00
RB-Development
551a547ddb Advanced pickit (#383)
* logic for ident, first attr. advanced pickit

* logic advanced vs normal pickit

* logic_empty_ID_Tome

* small adj. to fit PR

* converted yaml to ini. changed some val.

* changed param to auto_ident

* pickit integration

* added set in routine

* reset bot init value

* bugfix

* removed old id logic

* added_nested_filter

* changed pickit

* bugfix replace

* added some more props

* Cleanup

* cleanup

* cleanup

* started unittests

* unittest

* small pickit adjustments

* Added missing fct. after merge

* bugfix due to static method in config.py

* added comments in pickit.ini

* Update pickit.ini

* Update params.ini

* Update ui_manager.py

* Update pickit.ini

Co-authored-by: aeon0
Co-authored-by: mgleed
2022-01-30 19:40:36 -05:00
aeon0
2905ee5d31 Remove configs (#497)
* remove config window always on top

* remove message highlights

* only use win32api for window offset
2022-01-30 13:26:10 +01:00
nlapinski
3321b7bc84 necro fixes (#470)
* trav walking repathing

* trav source paths for walking

* traverse image threshold

* shenk death check

* images to check summon status

* enter durance

* default configs
2022-01-24 16:13:20 +01:00
pokzcodes
667c2a4dc5 Add option to fill shared stash tabs first (useful for HC characters) (#472)
* fixed bug w/ walking hammerdin that would cause vigor to be left on while attacking in trav

* added option to fill shared stash first

* reverted a change not related to this PR
2022-01-21 22:01:27 +01:00
Fise
87b4737901 Drognan shopper fixes (#468)
* Improved navigation in and out of town. New options for tuning it

* Delete a2_town_drognan_fire.png
2022-01-21 21:53:44 +01:00
Legit
376547ebfe Nihlathak cold immune accuracy update (#463)
* Nihlathak cold immune accuracy update

Much higher accuracy

* nihl health bar

* fixed pathing issue bottom left
2022-01-19 07:22:13 +01:00
Vladimir Makaev
b890ff266f Find D2R window using win32api instead of pattern matching (#453) 2022-01-18 20:32:35 +01:00
Legit
070fd9d98e Blizz sorc Nihlathak script (#447)
* Blizz sorc Nihlathak script

* Cold immune assets

* Updated pathing changes that would cause sticking.

* Reduce Timer on pickit if stuck

* Removed white space and lowercased nihl_immune

* increased ingore item timer

3 seconds

* Update src/char/sorceress/blizz_sorc.py

* updated bottom left offset and updated nilh_immune

Co-authored-by: aeon0 <aeon4@pm.me>
2022-01-13 22:40:33 +01:00
jobithu
63476a402d Dia&cs (#444)
* integrated diablo scaffold

still pending pathing & kill logic

* minor changes to cross river of flame - but loop not working

* River of Flame sucessfully skipped - CS Entrance cleared

* Seal B works.

* Everthing is slow :(

* reparied slowness

* revert deleted main code

* Added CS Entrance recognition & changed Pentagram templates

* Merge branch 'diablo' of https://github.com/jobithu/botty into diablo

* Seal B works for both layouts - still clumsy, but it works.

* added Vizier (A). working: A1, B1, B2 - pending: A2,C1,C2,Diaaaa

* C identifcation implemented.

* All seals done, optimization needed for pathing & fighting sequences

* fixed minor error in game.ini

* should now run - badly. all seal spots & paths need optimization

* A1Y works stable

* A1Y stable, WP now has issues

* A2Y seal mouseover added - new bug, could not determine window offset

* Both A seals work great now!

* A2L Seals work consistently. A1Y quite good.

* easteregg

* A2L improvements

* Succesful kill on A2L, B1S, C1G

* Tweaked Diablo Kill Wait Time

* start cleanup

* added functions for each seal layout

* First stable dia kills with fixed map layout

* added Sealdance function

* Fixed Sealdance. A1L is finished. All others work in Progress.

* A2L + B1S Works

* A2L and B1S works

* Script runs well now on A1L, B1S, C1G. Sealdance needs more movement.

* Update diablo.py

* A1L, C2F, B2F working. Kills Dia Hell well.

* added issue log. testing all layouts now.

* Individual runs work, Sealdance needs tweaking

* All seals work, got frustrated, added sorc&she rox

* tweaked sorc vizier & infector fights

* rebuild templates & nodes for A2Y, B1U, C2G

* Forgot to add Seal A to the run oO

* renamed forgotten templates for A2Y

* fixed minor bugs on A1Y. succesfull dia kill

* Optimized A2Y

* Reworked A1Y templates & fight - very stable! Yay!

* A2Y, B2U, C2G work - but i think it should be B1U

* 4/6 seals work (B1S & C1F pending)

* some clean up

* remove unwated code

* 5/6 Seals done - added C1F

* sealdance and error handling

* try to merge stuff somehow

* add additional template coordinates to failed nodes

* fix health manager by adding diablo lcoation

* remove thresholds

* fix template names and error handling for c seals

* C1F added. 5/6 seals done.

* All seals work - let's get it tested!

* B1S fight coregraphy improvements

* New paths for layout check to increase consistency

* fixed A2Y edge lava port (625>626)

* All seals work, lets test with more ppl & finetune

* C1F & B1S switched to static pathing

* Improved overall robustness

* improved A layout check consistency

* added A layout check consistency & CTA rebuff

* Home now a loop, B now first seal to pop.

* Trash clear at pentagram, B1S, C1F loop added.

* Changed DeSeis attack pattern so MERC can kill

* tweaked diablo spawn timer & vizier attack pattern

* fixed minor pickit error.

* fixed Layout B Check loop & improved C1F

* improved C1F pathing home

* improved B layout check by removing trash kill

* added C2G static path to infector & loop home

* tweaked pathing

* lots of pathing tweaks to increase consistency

* Clarified Logger.Info

* Fixed A1L Tele to Lava Bug

* Fixed A1Y Tele Lava bug

* Fixed B2U missing pentagram on loop back

* fixed logger

* Completely reworked layout checks

* Reworked C seal layout check

* fixed ending up too low at Diablo

* optimized loop home for C

* added all seals

* removed duplicate trash sequence at C

* Fixed B2U looping home, added essence

* Template Check Threshold raised for Layout Checks

* Reverted A layout check back to inital version

* Aggressive Layout Checks implemented.

* Replaced Pentagram Templates to improve [602]

* Fixed loops for new pent layout

* Reverted A layout checks back to initial version

* merged 6.1?

i hope it worked.

* Pressure Test: A2Y 98% layout check success

* Massive improvements on Layout Checks

* Integrated Skizot's A4 merchants

* Fixed an error on A1L.

* fixed a small error on final pickit

* Slight Cleanup

* tweaked A2Y nodes to avoid lava jumps

* Added B2U Seal Logging

* Add templ. to 611 & 610 to fix stuck pather

* WiZ/SwePow suggestions

* Some more tweaking

* Trying to improve B layout checks (not full run)

* Seal B logic pressure test (no full run)

* added timeouts to weak traversenodes (no full run)

* Pacifist Version - just checking layouts no bosses

* Pure Layoutcheck Pressure Test (double checks)

* Pacifist mode: Layout Check

* Update bot.py

* Added Templates to improve Layoutchecks

* Tweaked B2U Templates (Pacifist Version)

* add B2U nodes & calibration to impr. layout check

* added nodes to layout checks

* Added A1L Calibration Node for Layoutcheck

* Full running script

* Fixed Calibrations - Full Run

* fixed mousover keyerror

* yet another mousover

* fixed a pather issue on B1S, full run

* yet another mousover. full run.

* mousover... ful run

* yet another mousover. full run

* fixed C2G looping across pentagram

* Update game.ini

* WiZ testing

* added seal_node to sealdance

* added C1F layoutcheck nodes

* Added Wiz Speedrun

* tweaked wait in sealdance

* A1L-Static path to Pentagrram

* added A2Y hop 622

* A2Y static path home

* B1S static path home

* changed C1F fake template

* added new C1F seals & static home

* Speed or no speed

Using kill_cs_trash config

* fixed a 36b key error

* Random guess actually is random now

It wasnt random at all before so trying out if this is better

* Minor fixes and tweaks

* B2U - Static Path Home

* Redworked C1F - not stable yet

* Seal order B,C,A and DeSeis fix

There was copy/paste bug in DeSeis making it use wrong atk_len and then I also tuned the attacks a bit.

* fixed final B2U issue, should be stable now!

* added B2U 644_646 static path

* added mapping

* A seals fixed hopefully

More testing tomorrow!

* run diablo py

Yours is the diabloC, I didnt have time to compare them before sleep and wanted you to have both in case

* so this should be super stable now!

* Reverted A1L & A2Y Seal Order (but kept WiZ Idea)

* Reverted Seal Order

* Added Rudi TP :)

* all loop home now

* added TP  template to loop

* typo

* stashs & shrine gfx, TP counter

* removed pent_6 (many false positives looping home)

* clean up for aeon

* fixed typos

* New A2Y & C2G home pathing

* Reworked C1F 704 to avoid stuck

* Ready to test!

* fixed pather clicking outside D2R

* Tweaked Seal A

* Loot to Sealdance() & A2Y tweaks

* removed FALSE from TP fail

* Updated Readme.md

* remove env

* clean up code

* account for used tp

* Removed Dia C1F 700s and replaced with 650s

Co-authored-by: aeon0 <aeon4@pm.me>
Co-authored-by: WiZ <32465449+SwePow@users.noreply.github.com>
2022-01-13 15:07:55 +01:00
Francesco
bc24fea4e9 No diablo by default (#441)
* My pick up and sorc parameters

* Moved the game logic away from the main within the new GameController class.
Refactored the main to use built-in keyboard add_hotkey and wait functions instead of self-written main loop.

* Revert "My pick up and sorc parameters"

This reverts commit 0920a406

* Changed number of loot columns

* Changes as per the comments:
Handle non-existing backup file.
Removed newline at the beginning of GameController class.
Changed line splitted into multiple lines back to a single line.

* Refactored graphic debugger with similar logic to botty to now have a controller.

* Added a small comment on the graphic debugger class and fixed a now-typo on the presented menu

* Bug Fix: if pressing F11 repeatedly the main loop may crash due to self.bot not yet initialized in the game_controller.

A safe solution would be to try and catch all but that would also be an overkill as it would most likely mask exceptions that we might want to make the program crash.

Checking that self.bot is initialized should work for the time being.

* No need to re-assign the resume key within the game controlelr anymore

* Urgent 1 liner bug fix for always_on_top: name 'config' is not defined

* Bug fix, keyboard dependency on game_recovery.py
For some reason PyCharm seems to flag this import as unused while it is actually used.

* Set diablo to not run by default
2022-01-13 12:37:30 +01:00
jobithu
1fe56c95c6 Merge Diablo (#435)
* integrated diablo scaffold

still pending pathing & kill logic

* minor changes to cross river of flame - but loop not working

* River of Flame sucessfully skipped - CS Entrance cleared

* Seal B works.

* Everthing is slow :(

* reparied slowness

* revert deleted main code

* Added CS Entrance recognition & changed Pentagram templates

* Merge branch 'diablo' of https://github.com/jobithu/botty into diablo

* Seal B works for both layouts - still clumsy, but it works.

* added Vizier (A). working: A1, B1, B2 - pending: A2,C1,C2,Diaaaa

* C identifcation implemented.

* All seals done, optimization needed for pathing & fighting sequences

* fixed minor error in game.ini

* should now run - badly. all seal spots & paths need optimization

* A1Y works stable

* A1Y stable, WP now has issues

* A2Y seal mouseover added - new bug, could not determine window offset

* Both A seals work great now!

* A2L Seals work consistently. A1Y quite good.

* easteregg

* A2L improvements

* Succesful kill on A2L, B1S, C1G

* Tweaked Diablo Kill Wait Time

* start cleanup

* added functions for each seal layout

* First stable dia kills with fixed map layout

* added Sealdance function

* Fixed Sealdance. A1L is finished. All others work in Progress.

* A2L + B1S Works

* A2L and B1S works

* Script runs well now on A1L, B1S, C1G. Sealdance needs more movement.

* Update diablo.py

* A1L, C2F, B2F working. Kills Dia Hell well.

* added issue log. testing all layouts now.

* Individual runs work, Sealdance needs tweaking

* All seals work, got frustrated, added sorc&she rox

* tweaked sorc vizier & infector fights

* rebuild templates & nodes for A2Y, B1U, C2G

* Forgot to add Seal A to the run oO

* renamed forgotten templates for A2Y

* fixed minor bugs on A1Y. succesfull dia kill

* Optimized A2Y

* Reworked A1Y templates & fight - very stable! Yay!

* A2Y, B2U, C2G work - but i think it should be B1U

* 4/6 seals work (B1S & C1F pending)

* some clean up

* remove unwated code

* 5/6 Seals done - added C1F

* sealdance and error handling

* try to merge stuff somehow

* add additional template coordinates to failed nodes

* fix health manager by adding diablo lcoation

* remove thresholds

* fix template names and error handling for c seals

* C1F added. 5/6 seals done.

* All seals work - let's get it tested!

* B1S fight coregraphy improvements

* New paths for layout check to increase consistency

* fixed A2Y edge lava port (625>626)

* All seals work, lets test with more ppl & finetune

* C1F & B1S switched to static pathing

* Improved overall robustness

* improved A layout check consistency

* added A layout check consistency & CTA rebuff

* Home now a loop, B now first seal to pop.

* Trash clear at pentagram, B1S, C1F loop added.

* Changed DeSeis attack pattern so MERC can kill

* tweaked diablo spawn timer & vizier attack pattern

* fixed minor pickit error.

* fixed Layout B Check loop & improved C1F

* improved C1F pathing home

* improved B layout check by removing trash kill

* added C2G static path to infector & loop home

* tweaked pathing

* lots of pathing tweaks to increase consistency

* Clarified Logger.Info

* Fixed A1L Tele to Lava Bug

* Fixed A1Y Tele Lava bug

* Fixed B2U missing pentagram on loop back

* fixed logger

* Completely reworked layout checks

* Reworked C seal layout check

* fixed ending up too low at Diablo

* optimized loop home for C

* added all seals

* removed duplicate trash sequence at C

* Fixed B2U looping home, added essence

* Template Check Threshold raised for Layout Checks

* Reverted A layout check back to inital version

* Aggressive Layout Checks implemented.

* Replaced Pentagram Templates to improve [602]

* Fixed loops for new pent layout

* Reverted A layout checks back to initial version

* merged 6.1?

i hope it worked.

* Pressure Test: A2Y 98% layout check success

* Massive improvements on Layout Checks

* Integrated Skizot's A4 merchants

* Fixed an error on A1L.

* fixed a small error on final pickit

* Slight Cleanup

* tweaked A2Y nodes to avoid lava jumps

* Added B2U Seal Logging

* Add templ. to 611 & 610 to fix stuck pather

* WiZ/SwePow suggestions

* Some more tweaking

* Trying to improve B layout checks (not full run)

* Seal B logic pressure test (no full run)

* added timeouts to weak traversenodes (no full run)

* Pacifist Version - just checking layouts no bosses

* Pure Layoutcheck Pressure Test (double checks)

* Pacifist mode: Layout Check

* Update bot.py

* Added Templates to improve Layoutchecks

* Tweaked B2U Templates (Pacifist Version)

* add B2U nodes & calibration to impr. layout check

* added nodes to layout checks

* Added A1L Calibration Node for Layoutcheck

* Full running script

* Fixed Calibrations - Full Run

* fixed mousover keyerror

* yet another mousover

* fixed a pather issue on B1S, full run

* yet another mousover. full run.

* mousover... ful run

* yet another mousover. full run

* fixed C2G looping across pentagram

* Update game.ini

* WiZ testing

* added seal_node to sealdance

* added C1F layoutcheck nodes

* Added Wiz Speedrun

* tweaked wait in sealdance

* A1L-Static path to Pentagrram

* added A2Y hop 622

* A2Y static path home

* B1S static path home

* changed C1F fake template

* added new C1F seals & static home

* Speed or no speed

Using kill_cs_trash config

* fixed a 36b key error

* Random guess actually is random now

It wasnt random at all before so trying out if this is better

* Minor fixes and tweaks

* B2U - Static Path Home

* Redworked C1F - not stable yet

* Seal order B,C,A and DeSeis fix

There was copy/paste bug in DeSeis making it use wrong atk_len and then I also tuned the attacks a bit.

* fixed final B2U issue, should be stable now!

* added B2U 644_646 static path

* added mapping

* A seals fixed hopefully

More testing tomorrow!

* run diablo py

Yours is the diabloC, I didnt have time to compare them before sleep and wanted you to have both in case

* so this should be super stable now!

* Reverted A1L & A2Y Seal Order (but kept WiZ Idea)

* Reverted Seal Order

* Added Rudi TP :)

* all loop home now

* added TP  template to loop

* typo

* stashs & shrine gfx, TP counter

* removed pent_6 (many false positives looping home)

* clean up for aeon

* fixed typos

* New A2Y & C2G home pathing

* Reworked C1F 704 to avoid stuck

* Ready to test!

* fixed pather clicking outside D2R

* Tweaked Seal A

* Loot to Sealdance() & A2Y tweaks

* removed FALSE from TP fail

* Updated Readme.md

* remove env

* clean up code

* account for used tp

Co-authored-by: aeon0 <aeon4@pm.me>
Co-authored-by: WiZ <32465449+SwePow@users.noreply.github.com>
2022-01-12 23:05:23 +01:00
Francesco
5f1ffd153b D2r restart optional (#417)
* My pick up and sorc parameters

* Moved the game logic away from the main within the new GameController class.
Refactored the main to use built-in keyboard add_hotkey and wait functions instead of self-written main loop.

* Revert "My pick up and sorc parameters"

This reverts commit 0920a406

* Changed number of loot columns

* Changes as per the comments:
Handle non-existing backup file.
Removed newline at the beginning of GameController class.
Changed line splitted into multiple lines back to a single line.

* Refactored graphic debugger with similar logic to botty to now have a controller.

* Added a small comment on the graphic debugger class and fixed a now-typo on the presented menu

* Bug Fix: if pressing F11 repeatedly the main loop may crash due to self.bot not yet initialized in the game_controller.

A safe solution would be to try and catch all but that would also be an overkill as it would most likely mask exceptions that we might want to make the program crash.

Checking that self.bot is initialized should work for the time being.

* No need to re-assign the resume key within the game controlelr anymore

* Urgent 1 liner bug fix for always_on_top: name 'config' is not defined

* Bug fix, keyboard dependency on game_recovery.py
For some reason PyCharm seems to flag this import as unused while it is actually used.

* game_controller.py changes

* config and params.ini changes

* config and params.ini changes

* Added else statement to prevent double logging in case of failed restart

* Removed botty name from logging and api messages as it is redundant information.

Fixed issue with gamerecovery constructor - now it takes template finder as a parameter
2022-01-12 17:53:22 +01:00
aeon0
7f7acf1e2a Bug fix round (#431)
* etheral

* devision by zero

* force move in a2
2022-01-11 19:29:40 +01:00
aeon0
8104b87083 Configure war cry cast frequency (#424) 2022-01-10 23:08:49 +01:00
Legit
f450dc7591 Light Sorc Trav/shenk Update (#404)
* Light Sorc Trav/shenk Update

Requires Frozen orb added in params.

* frozen or for lightning sorc

* removed ;

* added frozen orb

* added move outside of trav for pickit start

* Last minute small trav changes

* Added fail safe for loot check

* update light sorc trav

* remove one chain lighting

* revert back to original start

Co-authored-by: aeon0 <aeon4@pm.me>
2022-01-08 18:53:54 +01:00
Legit
19f45d0270 Add some items and filters (rare matriarchal jav, +3 tornado pels, +3 warcry helmets) (#386)
* Fix for blizz_sorc master

* removed delay

* Update src/char/sorceress/blizz_sorc.py

* Additiona pickit items

* Missing items on pickit

* updated pickit

fixed rare jav missing added couple socketed items.

* Garbage item not needed

* Changed eth_ to grey_

* Dont know how to delete eth assets I added.

* revert blizz

* clean unused item assets

* bring back missing file, fix typos

Co-authored-by: aeon0 <aeon4@pm.me>
2022-01-08 10:20:45 +01:00
aeon0
faed0154aa Char selector after restart (#403)
* Char selector after restart

* at least make it work...

* Scroll the characters if the template was not found.

TODO: Ideally we would like to understand which character is currently selected rather than assuming we'll always be using the top one.

* make it fancy

Co-authored-by: Francesco <francesco.zini1@icloud.com>
2022-01-07 19:38:21 +01:00
egut125
dff178bbc7 Breaking Messenger Module into something more flexible for specif… (#370)
* WIP Breaking Messenger Module into something more flexible for specific apis

* Cleanup and removal of data class

* Working embeds sort of

* Simple embeds set up

* Adding image of stashing items to discord embed

* Discord Embed updates with images

death_manager and game_controller both store path to last death/chicken screenshot
Pass last screenshot path along to game_stats and discord_embeds to place in discord message

* Color adjust

* Updating filenames formobile notifications

* Create loot_screenshots folder if it doesn't exist and api=discord

* Fixing missed messenger.send calls

* UI for discord updates

* Switching to i_api and explicit functions

* Update all messenger calls to new functions

* Param name change

* Simplify discord_basic api

* Switching from interface to generic api class

* One new messenger call from master

* spacing
2022-01-06 18:33:59 +01:00
nlapinski
b01ff94b8a Necro class (#337)
* necro rebase

* merge

* necro readme

* removed import

* a

* necro char

* necro parms

* config fix

* example planner

* clear pindle pack

* pindle pack config cast

Co-authored-by: nlapinski <nlapinski@Users-MacBook-Pro-2.local>
2022-01-05 23:43:14 +01:00
Francesco
c92d32b6de Improved debugger (#361) 2022-01-05 22:15:10 +01:00
skizotenigma
2924836a32 "Basic" classes (#352)
* Start of "Basic" classes

will left attack unless right attack is available.

* Update basic_ranged.py

* Update basic.py
2022-01-05 22:14:14 +01:00
aeon0
e099848ed4 Npc serach optimization (#391)
* NPC search optimization

* fix pywin32 version
2022-01-04 12:24:43 +01:00
Matt Stiehm
fdfdd81b84 Restart game (#374)
* removed 1920_1080 support

* Update ui_manager.py

Fixed bug...

* Update pather.py

fixed scale factor

* Update i_char.py

* Update game.ini

removed tp locations

* Bump version to v0.4.3

* Bump version to v0.4.3

* added working restart module

* tested and looks stable after refactor

* fixed a few things after looking at PR

* switched things back to search after testing and removed 1s delay in save_and_exit search

* fixed tab select bug where the exit game prompt was up, and also fixed max game length bug on WP use

* Update a5.py

Changing back, as not needed.

* adding requested changes

* keyboard went missing from game_recovery

* missed case where restart fails then loops infinitely

* fixed typo. all tested now

* also removed flag resets since we're recreating hm and dm

Co-authored-by: Matt <rogue_drunkerd@hotmail.com>
2022-01-04 10:08:50 +01:00
aeon0
e3093ee50a Clean unused templates (#387) 2022-01-03 20:10:24 +01:00
Fise
992bfa91e8 Feature Request: Allow Classic players to show hammerdin scepters from Drogan (#379)
Co-authored-by: aeon0 <aeon4@pm.me>
2022-01-03 18:40:24 +01:00
Francesco
01e8078067 set D2R window to be always on top (#382)
* My pick up and sorc parameters

* Moved the game logic away from the main within the new GameController class.
Refactored the main to use built-in keyboard add_hotkey and wait functions instead of self-written main loop.

* Revert "My pick up and sorc parameters"

This reverts commit 0920a406

* Changed number of loot columns

* Changes as per the comments:
Handle non-existing backup file.
Removed newline at the beginning of GameController class.
Changed line splitted into multiple lines back to a single line.

* Refactored graphic debugger with similar logic to botty to now have a controller.

* Added a small comment on the graphic debugger class and fixed a now-typo on the presented menu

* Bug Fix: if pressing F11 repeatedly the main loop may crash due to self.bot not yet initialized in the game_controller.

A safe solution would be to try and catch all but that would also be an overkill as it would most likely mask exceptions that we might want to make the program crash.

Checking that self.bot is initialized should work for the time being.

* No need to re-assign the resume key within the game controlelr anymore

* Saving changes before switching repo

* Move the logic to set d2r always on top in the utils package.

* Remvoed unused dependency

* Always on top currently only works in Windows

* Removed one-time used variable

* Moved D2R window always on top to advanced_options.

Now the D2R window is set always on top only when the bot start (F11) and when it pause or F12 is pressed the D2R window (if it still exists) will be restored to its original value
2022-01-03 17:26:07 +01:00
aeon0
777c6da302 Optimize nova sorc for trav (#364) 2022-01-01 15:26:15 +01:00
aeon0
d8942f92b4 A2 Pathing + Arcane run + Static for Sorc + Static Tele robustification + Chest class (#348) 2022-01-01 14:15:13 +01:00
Francesco
268652b4ff Backup and Restore settings (#349)
* My pick up and sorc parameters

* Moved the game logic away from the main within the new GameController class.
Refactored the main to use built-in keyboard add_hotkey and wait functions instead of self-written main loop.

* Revert "My pick up and sorc parameters"

This reverts commit 0920a406

* Changed number of loot columns

* Changes as per the comments:
Handle non-existing backup file.
Removed newline at the beginning of GameController class.
Changed line splitted into multiple lines back to a single line.

* Refactored graphic debugger with similar logic to botty to now have a controller.

* Added a small comment on the graphic debugger class and fixed a now-typo on the presented menu
2021-12-31 09:06:27 +01:00
aeon0
88c9e28d45 Nova Sorc (#350)
* Nova Sorc

* formating
2021-12-30 17:02:03 +01:00
skizotenigma
badcd77ea6 Identify Items at Chain (A5) (#339) 2021-12-30 14:12:43 +01:00
skizotenigma
f1dbce3a69 Repair Each Run (#338)
* Update bot.py

* Update config.py

* Update params.ini

* Update params.ini

removing comments

* Update bot.py

removing comments

* Update config.py

removing comments

* Update README.md
2021-12-28 00:04:41 +01:00
aeon0
bb523b34fe Trapsin updates (#325) 2021-12-24 12:24:10 +01:00
aeon0
43244e85b9 Light sorc overhaul (#323)
* Light sorc overhaul

* also use lightning

* readme update
2021-12-24 10:01:15 +01:00
Legit
ddd92ad303 Cold-sorc-trav-eld-shenk (#300) 2021-12-23 22:03:06 +01:00
aeon0
f60f6539ff If in doubt, just use path a (#318) 2021-12-23 21:53:09 +01:00
Luiz Felipe Aranha
2cc9ee36c7 include mangsong to pickit (#317)
* include mangsong to pickit

* Add files via upload
2021-12-23 21:14:51 +01:00