Bugfix: More related bugs for town and ui overhaul (#610 )

* fix id logic, fix count reset, up to version 0.7.0, trim excess * attempt to fix loop at cain, etc. when return_to_play() is called * spell check, simplify * center mouse after opening NPC menu * fix messenger item count bug
Bugfixes: Town overhaul stuff (#609 )
2022-03-06 15:14:56 -05:00 · 2022-03-06 09:26:14 -05:00 · 2022-03-05 17:47:50 -05:00 · 2022-02-27 23:12:32 +00:00 · 2022-02-27 16:39:08 -05:00 · 2022-02-26 14:59:49 -07:00
270 changed files with 4574 additions and 3507 deletions
@@ -4,9 +4,9 @@ Pixelbot for Diablo 2 Resurrected. This project is for informational and educati

 [**Download here**](https://github.com/aeon0/botty/releases) and got to have a [**Discord**](https://discord.gg/Jf3J8cuXWg) nowadays I guess :man_shrugging:

-## Getting started & Prequists
- D2r needs to be in English Language,
- Botty currently works with 720p D2r window (will be adjusted automatically on auto settings)
+## Getting started & Prerequisites
+- D2R needs to be in English Language,
+- Botty currently works with 720p D2R window (will be adjusted automatically on auto settings)

 ### 1) Graphics and Gameplay Settings

@@ -15,11 +15,11 @@ All settings will automatically be set when you execute `main.exe` and press the

 ### 2) Supported builds

-Check the documentation for **param.ini** further down. Different Sorc builds, Hammardin, Barb, Trapsin are already implemented to different extents. It is quite straightforward to implement new classes. Give it a go if you like!
+Check the documentation for **params.ini** further down. Different Sorc builds, Hammerdin, Barb, Trapsin are already implemented to different extents. It is quite straightforward to implement new classes. Give it a go if you like!

 ### 3) Start Location

-Open up D2R and wait till you are at the hero selection screen. Make sure the char you running with is selected and will be in any of Act 3, 4 or 5 in the respective difficulty you set in the **param.ini** once the bot starts the game.
+Open up D2R and wait till you are at the hero selection screen. Make sure the char you running with is selected and will be in any of Act 3, 4 or 5 in the respective difficulty you set in the **params.ini** once the bot starts the game.

 ### 4) Start Botty

@@ -34,12 +34,12 @@ To check if you graphic settings are good and if the bot would pick up items the

 Check out the [development.md](development.md) docu for infos on how to build from source and details of the project structure and code.

-## param.ini
+## params.ini

-All botty configuration files are located in the __config__ folder. To ease the switch to new botty versions, you can also overwrite any of the .ini fields in a **custom.ini** file. When a new version of botty is released you just copy the file to the new version without having to port all your **param.ini** changes to the new version. Example:
+All botty configuration files are located in the __config__ folder. To ease the switch to new botty versions, you can also overwrite any of the .ini fields in a **custom.ini** file. When a new version of botty is released you just copy the file to the new version without having to port all your **params.ini** changes to the new version. Example:

 ```ini
-; custom.ini - overwrites 3 params in the param.ini
+; custom.ini - overwrites 3 params in the params.ini
 [general]
 name=MyCustomName

@@ -50,21 +50,21 @@ run_shenk=0

 | [general]                | Descriptions              |
 | --------------------     | --------------------------|
-| name                     | Name used in terminal and discord messages |
-| custom_message_hook      | Add your own message hook here to get messages about drops and botty status updates, discord webhook is default  |
-| logger_lvl               | Can be any of [info, debug] and determines how much output you see on the command line |
-| max_game_length_s        | Botty will attempt to stop whatever its doing and try to restart a new game. Note if this fails, botty will attempt to shut down D2R and Bnet     |
-| max_consecutive_fails    | Botty will stop making games if the number of consecutive fails reaches this max value     |
-| randomize_runs           | 0: the order will be as seen in the params.ini. 1: the order will be random |
-| difficulty               | Set to `normal` `nightmare` or `hell` for game difficulty |
-| message_api_type         | Which api to use to send botty messages.  Supports "generic_api" (basic discord), or "discord" (discord embeds with images).
-| discord_status_count     | Number of games between discord status messges being sent. Leave empty for no status reports.
+| name                     | Name used in terminal and discord messages. |
+| custom_message_hook      | Add your own message hook here to get messages about drops and botty status updates, discord webhook is default. |
+| logger_lvl               | Can be any of [info, debug] and determines how much output you see on the command line. |
+| max_game_length_s        | Max game length in seconds. Botty will attempt to stop whatever it's doing and try to restart a new game at specified interval. If this fails, botty will attempt to shut down D2R and Bnet. |
+| max_consecutive_fails    | Botty will stop making games if the number of consecutive fails reaches this max value. |
+| randomize_runs           | Randomize the order of `[routes]` specified in `params.ini`. |
+| difficulty               | Set to `normal` `nightmare` or `hell` for game difficulty. |
+| message_api_type         | Which api to use to send botty messages.  Supports "generic_api" (basic discord), or "discord" (discord embeds with images). |
+| discord_status_count     | Number of games between discord status messages being sent. Leave empty for no status reports.
 | discord_status_condensed | Toggles condensed view of Discord status messages. 0 Full text, 1 Condensed text.
-| info_screenshots         | If 1, the bot takes a screenshot with timestamp on every stuck / chicken / timeout / inventory full event. This is 1 by Default, so remember to clean up the folder every once in a while |
-| loot_screenshots         | If 1, the bot takes a screenshot with timestamp everytime he presses show_items button and saves it to loot_screenshots folder. Remember to clear them once in a while... |
-| saved_games_folder       | Optional folder path of Diablo 2 : Ressurrected saved games that will be used to overwrite when running the "auto settings" |
-| d2r_path                 | Optional path to find the d2r.exe, if not set will be default to "C:\Program Files (x86)\Diablo II Resurrected\D2R.exe" when attempting to restart |
-| restart_d2r_when_stuck   | Set to `1` and botty will attempt to restart d2r in the case that botty is unable to recover its state (e.g: game crash) |
+| info_screenshots         | If `1`, the bot takes a screenshot with timestamp on every stuck / chicken / timeout / inventory full event. This is 1 by Default, so remember to clean up the folder every once in a while. |
+| loot_screenshots         | If `1`, the bot takes a screenshot with timestamp everytime he presses `show_items` button and saves it to `loot_screenshots` folder. Remember to clear them once in a while... |
+| saved_games_folder       | [Optional] Defaults to `~\Saved Games\Diablo II Resurrected`. Used to store configuration settings for `f9` / auto settings. |
+| d2r_path                 | [Optional] Path to `d2r.exe`. If not set, it will default to `C:\Program Files (x86)\Diablo II Resurrected\D2R.exe` when attempting to restart. |
+| restart_d2r_when_stuck   | Set to `1` and botty will attempt to restart d2r in the case that botty is unable to recover its state (e.g: game crash). |

 | [routes]     | Descriptions                                                             |
 | ------------ | ------------------------------------------------------------------------ |
@@ -94,7 +94,7 @@ run_shenk=0
 | potion4            | Hotkey to take potion in slot 4 |
 | cta_available      | 0: no cta available, 1: cta is available and should be used during prebuff |
 | weapon_switch      | Hotkey for "weapon switch" (only needed if cta_available=1) |
-| battle_order       | Hotkey for battle order from cta (only needed if cta_available=1) |
+| battle_order       | Hotkey for battle orders from cta (only needed if cta_available=1) |
 | battle_command     | Hotkey for battle command from cta (only needed if cta_available=1) |
 | stash_gold         | Bool value to stash gold each time when stashing items |
 | gold_trav_only     | Hacky config that will restrict gold pickup to trav only. misc_gold must be set to 1 for this to have any effect |
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
mgleed	d2a3670a6a	Bugfix: More related bugs for town and ui overhaul (#610 ) * fix id logic, fix count reset, up to version 0.7.0, trim excess * attempt to fix loop at cain, etc. when return_to_play() is called * spell check, simplify * center mouse after opening NPC menu * fix messenger item count bug	2022-03-06 15:14:56 -05:00
mgleed	bf421a67a9	Bugfixes: Town overhaul stuff (#609 ) * fix id logic, fix count reset, up to version 0.7.0, trim excess * attempt to fix loop at cain, etc. when return_to_play() is called * spell check, simplify	2022-03-06 09:26:14 -05:00
mgleed	f51de30fbd	Major feature: Town routine overhaul, id tome, scrolls/keys, simplify gambling (#588 ) * init, wip * migration from original ocr complete, now troubleshooting phase * first * starts now * catching more * pause here, fix keep_item for ItemText class * getting close * adjust consumable quantity to refill per Legit * fix import, refactor tp scroll tracking * fixed property checking * merge master, fix discord embed * move tp charge setter * properly track id scrolls after use * fix accidental stashing * fix sell_junk and chest_label bugs * working on drognan instead of lysander * a2 pathing, drognan support * fix town-start to wp pathing, change key counting * better drognan pathing * comment out pather stuff * restore old asset * proper tp tracking * revert key pickup to decrease need by 1 * fixing gambling, WIP * working on gambling * add comments to transfer_items * add comments to transfer_items * gambling semi-working, not stashing right * simplify gambling process * incorporate OCR gold reading to gamble, WIP * gambling is painful * simplified gambling - ~done * finally finished gambling! * fix diablo inventory check * do not fail purchasing routine if item template is not seen * fix condition * deprioritize keys, scrolls during pickit; stop clicking Misc tab at repair * cleanup * init * add support for grayscale + color_filtered * cleanup logic * only generate grayscale templates if use_grayscale=True * simplify template_gray logic * fix false detection of out of gold * gambling with OCR was too buggy--replace with max gamble item count * cleanup	2022-03-05 17:47:50 -05:00
Vladimir Makaev	32d7dc2e2a	Documentation: Improve readme documentation in general section Improve the README.md [general] documentation	2022-02-27 23:12:32 +00:00
Vladimir Makaev	37d41ed008	Enhancement/bugfix: Add override_capabilities param to workaround problems with autodetection (#600 )	2022-02-27 16:39:08 -05:00
Kellen Stuart	5e55872668	Make improvements	2022-02-26 14:59:49 -07:00
Ezro	a299051ecd	Bugfix: Fix shopper scripts (#592 ) * Fix anya shopper * Fix drognan.py	2022-02-26 13:22:31 -05:00
Ezro	7056a58958	Enhancement/bugfix: Create find_and_set_window_position in screen.py to be used during testing (#591 )	2022-02-26 12:23:26 -05:00
Ezro	006fb6516f	Bugfix: Prevent psutil search for a negative process_id (#593 )	2022-02-26 12:23:02 -05:00
mgleed	04b3367935	Bugfix: Restore for loop in gamble (#586 )	2022-02-26 10:36:28 -05:00
mgleed	32f67d56df	Bugfix: Missing import for i_char (#590 )	2022-02-26 10:35:00 -05:00
RB-Development aeon0 mgleed	49669e9919	Bugfix: Gambling won't start * 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 * bugfix * remove redundant for loop, use set_gold_full * fix merge * simplify Co-authored-by: aeon0 <[email protected]> Co-authored-by: mgleed <[email protected]>	2022-02-23 20:59:12 -05:00
mgleed	ad2cb6a365	Bugfix: Jamella, Halbu, Fara positions (#581 ) * Temporary bugfix: Jamella and Halbu roi's poses npc_manager.py needs roi updates for jamella and halbu as they were statically calculated based on pose positions from a4_vendor, but Skizot updated Jamella pathing and thus these no longer work. Gonna delete the roi's and pose positions until this can be done--it'll just search by original algorithm for NPc detection in the meantime. * noticed the same behavior with Fara :(	2022-02-23 20:25:38 -05:00
mgleed	98f69211c1	Bugfix: Properly dismiss NPC dialogue (#584 ) * Bugfix: Properly dismiss NPC dialogue Thought this was fixed in #582 but it seemed to work only in some scenarios. This change is more robust. * Remove debug line	2022-02-23 20:22:22 -05:00
mgleed	8515b6da92	Refactor: Rearrange inventory functions, code cleanup (#577 ) * init * cleanup, fix messanger typo * cleanup * rename player. to personal. * saved * merge artifact	2022-02-23 20:20:54 -05:00
mgleed	47993f141c	Bugfix/enhancement: Function to show all ScreenObjects (#582 ) * init * cleanup * cleanup * bugfix. ran 8 hours without error after this	2022-02-23 10:03:11 -05:00
mgleed	9726690c07	Bugfix: Save/exit error (#579 ) Fix bug where save/exit routine would pass an empty template match	2022-02-22 23:01:45 -05:00
mgleed	f37c916e72	Bugfix: Suppress warning if no discord webhook set (#571 ) * suppress warnings for no discord webhook * rearrange * Update discord_embeds.py * Update generic_api.py * Update generic_api.py	2022-02-21 23:56:55 -05:00
mgleed	994646d811	Bugfix: Made corpse pickup more robust (#575 )	2022-02-21 21:09:57 -05:00
mgleed	c8eb88f672	Feature: OCR for item drops and item description boxes (#570 ) * initial * bugfixes. now stable & testing * narrow ROI to search for 'CLICK TO' tooltip	2022-02-21 19:54:29 -05:00
Legit	8fa729ddab	Bugfix: Missing template finder for blizz sorc nihlathak (#574 ) added missing template finder after ui merge.	2022-02-21 18:25:32 -05:00
Ezro	59d0795153	Bugfix: Fix bug with screen offset detection in fullscreen (#573 )	2022-02-21 01:18:04 -05:00
Legit	69d546f5ee	Enhancement: Update default params (#554 ) * Params Default Update Updated some settings as new defaults including changing generic_api to discord.	2022-02-20 23:43:27 -05:00
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
mgleed	cd979b3e4a	Bugfix: check capabilities after corpse pickup (#567 )	2022-02-19 21:54:45 -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	59c8a898b7	corrected spelling mistakes (#566 )	2022-02-18 12:03:34 -05:00
mischavandenburg	637920fc4e	Feature: Added 46 uniqe / set items to pickit (#552 ) by @mischavandenburg	2022-02-17 15:03:00 -05:00
Vladimir Makaev	3985817b19	Merge pull request #556 from aeon0/mgleed-patch-1 Bump to 0.6.7	2022-02-17 11:14:26 +00:00
mgleed	51c7216068	Revert "Speed up save_and_exit (#555 )" (#560 )	2022-02-16 22:55:30 -05:00
Ezro	196f99e5e6	Speed up save_and_exit (#555 ) * Replace search and mouse click with keyboard sends * Hardcode x,y and 'double click' * Remove hardcode x, y since it's not guaranteed to be accurate	2022-02-16 20:28:11 -05:00
mgleed	92300818c3	Bump to 0.6.7	2022-02-16 00:20:05 -05:00