New release v0.6.0 (#328 )

* Bump version to v0.6.0 * correct version
Retry town portal creation on fail (#327 )
2021-12-24 15:34:36 +01:00 · 2021-12-24 15:23:33 +01:00 · 2021-12-24 12:32:26 +01:00 · 2021-12-24 12:24:10 +01:00 · 2021-12-24 11:34:03 +01:00 · 2021-12-24 10:01:15 +01:00
474 changed files with 2037 additions and 795 deletions
@@ -20,4 +20,5 @@ config/custom.ini
 .vs/
 info_screenshots/
 loot_screenshots/
+stats/
 .venv
@@ -1,41 +1,33 @@
 # <img src="assets/docs/header_green.png" width="370">

-Simple Pixelbot for Diablo 2 Resurrected single player written in python and opencv. Botty does not work for online games and is not intended for this usage!
-[**Download here**](https://github.com/aeon0/botty/releases). Got to have a [**Discord**](https://discord.gg/Jf3J8cuXWg) nowadays I guess :man_shrugging:
+Pixelbot for Diablo 2 Resurrected. This project is for informational and educational purposes only. Feel free to dig around, add stuff, make PRs, or ask questions should you get stuck!

-And please. I urge you to actually read that README! It will make your life a lot easier.
+[**Download here**](https://github.com/aeon0/botty/releases) and got to have a [**Discord**](https://discord.gg/Jf3J8cuXWg) nowadays I guess :man_shrugging:

-[![Watch the video](assets/docs/video_thumbnail.png)](https://streamable.com/67h9ay)
-
-## Getting started
-
-Botty only supports English language! Botty is currently working in 720p and will either switch to windowed mode or to fullscreen depending on your current monitor res when you run the "Auto Settings".</br>
-It is highly recommended to let botty run with /nopickup active. This will reduce the amount of accidently picked up trash by a lot. Espacially when playing builds without teleport.
+## Getting started & Prequists
+- 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

-All settings will automatically be set when you execute `main.exe` and press the hotkey for "Adjust D2R settings" (default f9). Note that D2R should not run during this process, or if it does you will have to restart afterwards. It is not a 100% thing, in rare cases you might still have to fiddle around with your brightness. I suggest using the "Graphic Debugger" to verify your settings.
-**Note**: There have been issues reported with image sharpening being truned on via the graphic card settings itself outside of D2R. Try turning it off when running botty. Also HDR should be truned off.
+All settings will automatically be set when you execute `main.exe` and press the hotkey for "Adjust D2R settings" (default f9). It is not a 100% thing, in rare cases you might still have to fiddle around with your brightness. I suggest using the "Graphic Debugger" to verify your settings.
+**Note**: Make sure that no other external programs adapt your graphics settings (HDR, Geforce Experience, etc.)

 ### 2) Supported builds

-Check the documentation for **param.ini** further down. Currently you can set skills for Sorceress, Hammardin and Trapsin. The later two can also be set up without teleport.
-
-#### Other builds
-
-You can "highjack" any config to also run other builds. Or properly implement a new build and make a PR : )
+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!

 ### 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 A5 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 **param.ini** once the bot starts the game.

 ### 4) Start Botty

-You can either run from python. Follow [development.md](development.md) for that. Or you download the a prebuilt release [here](https://github.com/aeon0/botty/releases). Start `main.exe` in the botty folder. Focus your D2R window window and press the start key (default f11). You can always force stop botty with f12.
+You can either run from python. Follow [development.md](development.md) for that. Or you download the a prebuilt release [here](https://github.com/aeon0/botty/releases) (the .rar file!). Start `main.exe` in the botty folder. Focus your D2R window and press the start key (default f11). You can always force stop botty with f12.

 ## Graphic Debugger

-To check if you graphic settings are good and if the bot would pick up items there is a **Graphic Debugger Mode** built in. Start botty and press F10 (Default key). This will open up a (mostly black) window. Start a game in D2R and go to A5. You should see some templates with blue circles detected and scores printed out to the console. E.g. for 720p you should see scores higher 0.8 for the templates. To check item finding, throw some items of different types on the ground. The debug window should show the item names with black background. If you throw an item on the ground that should be picked up, it will have a red circle. The console will print out the scores for each item that would be picked up. Scores should be well above 0.9 for these items.</br>
+To check if you graphic settings are good and if the bot would pick up items there is a **Graphic Debugger Mode**. Start botty and press F10 (Default key). This will open up a (mostly black) window. Start a game in D2R and go to A5. You should see some templates with blue circles detected and scores printed out to the console. To check item finding, throw some items of different types on the ground. The debug window should show the item names with black background. If you throw an item on the ground that should be picked up, it will have a red circle. The console will print out the scores for each item that would be picked up. Scores should be well above 0.9 for these items.</br>
 <img src="assets/docs/graphic_debugger.png" width="900">

 ## Development
@@ -44,7 +36,7 @@ Check out the [development.md](development.md) docu for infos on how to build fr

 ## param.ini

-To ease the switch to new botty versions, you can also overwrite any of the param.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 **param.ini** changes to the new version. Example:

 ```ini
 ; custom.ini - overwrites 3 params in the param.ini
@@ -56,22 +48,20 @@ run_pindle=1
 run_shenk=0
 ```

-| [general]            | Descriptions              |
-| -------------------- | --------------------------|
-| name                 | Name used in terminal and discord messages |
-| saved_games_folder   | Optional folder path of Diablo 2 : Ressurrected saved games |
-| monitor              | Select on which monitor D2R is running in case multiple are available |
-| 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 |
-| exit_key             | Pressing this key (anywhere), will force botty to shut down |
-| resume_key           | After starting the exe botty will wait for this keypress to atually start botting away |
-| graphic_debugger_key | Pressing this key will start a debug mode to check if the color filtering works with your settings. It also includes the item search and marks items it would pick up with red circles    |
-| logger_lvl           | Can be any of [info, debug] and determines how much output you see on the command line |
-| randomize_runs       | If 0, the order will always be pindle -> eldritch/shenk. If 1 the order will be random |
-| difficulty           | Set to `normal` `nightmare` or `hell` for game difficulty |
-| custom_message_hook  | Add your own message hook here to get messages about drops and in case botty got stuck and can not resume, discord webhook is default  |
-| discord_status_count | Number of games between discord status messges being sent. Leave empty for no status reports.
-| 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... |
+| [general]                | Descriptions              |
+| --------------------     | --------------------------|
+| name                     | Name used in terminal and discord messages |
+| monitor                  | Select on which monitor D2R is running in case multiple are available |
+| 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     |
+| 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 |
+| discord_status_count     | Number of games between discord status messges 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" |

 | [routes]     | Descriptions                                                             |
 | ------------ | ------------------------------------------------------------------------ |
@@ -84,7 +74,23 @@ run_shenk=0
 | [char]             | Descriptions |
 | ------------------ | -------------------------------------------------------------------------------------------------|
 | type               | Build type. Currently only "sorceress" or "hammerdin" is supported |
-| casting_frames     | Depending on your char and fcr you will have a specific casting frame count. Check it here: https://diablo2.diablowiki.net/Breakpoints and fill in the right number. Determines how much delay there is after each teleport for example. |
+| casting_frames     | Depending on your char and fcr you will have a specific casting frame count. Check it here: https://diablo2.diablowiki.net/Breakpoints and fill in the right number. Determines how much delay there is after each teleport for example. If your system has some delay e.g. on vms, you might have to increase this value above the suggest value in the table! |
+| num_loot_columns   | Number of columns in inventory used for loot (from left!). Remaining space can be used for charms |
+| show_items         | Hotkey for "show items" |
+| inventory_screen   | Hotkey to open inventory |
+| force_move         | Hotkey for "force move" |
+| stand_still        | Hotkey for "stand still". Note this can not be the default shift key as it would interfere with the merc healing routine |
+| tp                 | Hotkey for using a town |
+| belt_rows          | Integer value of how many rows the char's belt has |
+| show_belt          | Hotkey for "show belt" |
+| potion1            | Hotkey to take potion in slot 1 |
+| potion2            | Hotkey to take potion in slot 2 |
+| potion3            | Hotkey to take potion in slot 3 |
+| 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_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 |
 | use_merc           | Set to 1 for using merc. Set to 0 for not using merc (will not revive merc when dead), default = 1 |
@@ -92,47 +98,44 @@ run_shenk=0
 | atk_len_pindle     | Attack length for hdin or number of attack sequences for sorc when fighting pindle |
 | atk_len_eldritch   | Attack length for hdin or number of attack sequences for sorc when fighting eldritch |
 | atk_len_shenk      | Attack length for hdin or number of attack sequences for sorc when fighting shenk |
-| num_loot_columns   | Number of columns in inventory used for loot (from left!). Remaining space can be used for charms |
-| take_health_potion | Health percentage when healing potion will be used |
-| take_mana_potion   | Mana percentage when mana potion will be used. Currently belt managment is not very clever and it is safest to only pick up health pots and make sure mana reg is enough for pindle to not need mana pots. |
+| atk_len_nihlatak   | Attack length for hdin or number of attack sequences for sorc when fighting nihlatak |
+| take_health_potion | Health percentage when healing potion will be used. e.g. 0.6 = 60% helath |
+| take_mana_potion   | Mana percentage when mana potion will be used |
+| take_rejuv_potion_health | Health percentag when rejuv potion will be used |
+| take_rejuv_potion_mana   | Mana percentag when rejuv potion will be used |
 | heal_merc          | Merc health percentage when giving healing potion to merc |
+| heal_rejuv_merc    | Merc health percentage when giving rejuv potion to merc |
 | chicken            | Will chicken (leave game) when player health percentage drops below set value, range 0 to 1. Set to 0 to not chicken. |
 | merc_chicken       | Will chicken (leave game) when merc health percentage drops below set value, range 0 to 1. Set to 0 to not chicken. |
-| show_items         | Hotkey for "show |
-| inventory_screen   | Hotkey to open up |
-| stand_still        | Hotkey for "stand still". Note this can not be the default shift key as it would interfere with the merc healing routine. |
-| force_move         | Hotkey for "force move" |
-| tp                 | Hotkey for using a town |
-| belt_rows          | Integer value of how many rows the char's belt has |
-| show_belt          | Hotkey for "show |
-| potion1            | Hotkey to take potion in slot |
-| potion2            | Hotkey to take potion in slot |
-| potion3            | Hotkey to take potion in slot |
-| potion4            | Hotkey to take potion in slot  |
 | belt_rejuv_columns | Number of belt columns for rejuv potions |
 | belt_hp_columns    | Number of belt columns for healing potions |
 | belt_mp_columns    | Number of belt columns for mana potions |
 | pre_buff_every_run | 0: Will only prebuff on first run, 1: Will prebuff after each run/boss |
-| 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_command     | Hotkey for battle command from cta (only needed if cta_available=1) |

+### Builds
 | [sorceress]   | Descriptions                                                                  |
 | ------------- | ----------------------------------------------------------------------------- |
 | teleport      | Required Hotkey for teleport                                                  |
-| skill_left    | Required Hotkey for skill that is used on left mouse btn (e.g. Glacial Spike) |
-| skill_right   | Required Hotkey for skill that is used on right mouse btn (e.g. Blizzard)     |
 | frozen_armor  | Optional Hotkey for frozen armor (or any of the other armors)                 |
 | energy_shield | Optional Hotkey for energy shield                                             |
 | thunder_storm | Optional Hotkey for thunder storm                                             |

+| [light_sorc]  | Descriptions                                                                  |
+| ------------- | ----------------------------------------------------------------------------- |
+| chain_lightning | Optional Hotkey for chain_lightning (must be bound to left skill)           |
+| lightning     | Required Hotkey for lightning (must be bound to right skill)                  |
+
+| [blizz_sorc]  | Descriptions                                                                  |
+| ------------- | ----------------------------------------------------------------------------- |
+| ice_blast     | Optional Hotkey for ice_blast (must be bound to left skill)                   |
+| blizzard      | Required Hotkey for Blizzard (must be bound to right skill)                   |
+
 | [hammerdin]    | Descriptions                                                                        |
 | -------------- | ----------------------------------------------------------------------------------- |
 | teleport       | Optional Hotkey for teleport. If left empty hammerdin will run instead of teleport. |
 | concentration  | Required Hotkey for Concentration                                                   |
-| holy_shield    | Hotkey for Holy Shield                                                              |
-| blessed_hammer | Hotkey for Blessed Hammer                                                           |
+| holy_shield    | Required Hotkey for Holy Shield                                                     |
+| blessed_hammer | Required Hotkey for Blessed Hammer. (Must be set as left skill!)                    |
 | redemption     | Optional Hotkey for redemption                                                      |
 | vigor          | Optional Hotkey for vigor                                                           |

@@ -144,11 +147,27 @@ run_shenk=0
 | fade           | Optional Hotkey for Fade                                                            |
 | shadow_warrior | Optional Hotkey for Shadow Warrior                                                  |
 | lightning_sentry | Required Hotkey for Lightning Sentry                                              |
-| death_sentry   | Required Hotkey for Death Sentry                                              |
+| death_sentry   | Required Hotkey for Death Sentry                                                    |
+
+| [barbarian]    | Descriptions                                                                        |
+| -------------- | ----------------------------------------------------------------------------------- |
+| teleport       | Optional Hotkey for teleport. If left empty barb will run instead of teleport.      |
+| leap           | Required Hotkey for Leap                                                            |
+| shout          | Required Hotkey for Shout                                                           |
+| war_cry        | Required Hotkey for War Cry                                                         |
+| find_item      | Optional Hotkey for Find Item                                                       |
+
+| [dclone]             | Descriptions                                                          |
+| -------------------- | --------------------------------------------------------------------- |
+| region_ips           | Start of the region ip you want to filter for. e.g. EU Server = 37.244.11, 37.244.48 |
+| dclone_hotip         | Hot ip you are looking for. Botty will stay in game and message you if a message_hook is set |

 | [advanced_options]   | Descriptions                                                          |
 | -------------------- | --------------------------------------------------------------------- |
 | pathing_delay_factor | A linear scaling factor, between 1 and 10, applied to pathing delays. |
+| message_headers      | Headers that are sent with each messages                              |
+| message_body_template | Message body of the post message sent                                |
+| message_highligh     | 0: Send messages as is, 1: Uses message highlighting for discord      |

 ## Support this project

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
aeon0	da401dc9bc	New release v0.6.0 (#328 ) * Bump version to v0.6.0 * correct version	2021-12-24 15:34:36 +01:00
aeon0	77d04a0c21	Retry town portal creation on fail (#327 )	2021-12-24 15:23:33 +01:00
aeon0	303082ff99	Random move if staris not found (#326 )	2021-12-24 12:32:26 +01:00
aeon0	bb523b34fe	Trapsin updates (#325 )	2021-12-24 12:24:10 +01:00
aeon0	db7c011ded	Blizz Sorc adjustments (#324 )	2021-12-24 11:34:03 +01:00
aeon0	43244e85b9	Light sorc overhaul (#323 ) * Light sorc overhaul * also use lightning * readme update	2021-12-24 10:01:15 +01:00
Legitandaeon0	96e42049eb	Blizz sorc updates (#321 ) * Update blizz_sorc.py * blizz sorc tuning * Update blizz_sorc.py indent fix * fix indent errors * shenk assets * updated pather for shenk Co-authored-by: aeon0 <[email protected]>	2021-12-23 23:55:34 +01:00
aeon0	d4836a1e4f	Buy potions from vendor (#320 )	2021-12-23 23:01:04 +01:00
aeon0	68bb17428a	Update README.md	2021-12-23 22:10:27 +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
aeon0	269fd2246f	Save stats to new file (#316 )	2021-12-23 14:08:49 +01:00
aeon0	5f44213692	Share belt manager instance accross health manager and bot (#315 )	2021-12-22 21:53:09 +01:00
aeon0	d6a8de3c80	Configurable ordering of runs (#314 )	2021-12-22 21:48:05 +01:00
mgleed	b5805a19aa	Add require/exclude properties to pickit.ini when stashing items. Also more item templates. (#295 )	2021-12-21 20:46:27 +01:00
aeon0	44d9cb40f2	Nihlatak test (#312 ) * nihlatak eye at a robustness? * revert stuff	2021-12-21 19:23:45 +01:00
Luiz Felipe Aranha	616e6b25b9	Update ui_manager.py (#311 ) tome bug workaround	2021-12-21 08:48:12 +01:00
egut125	5993e876e8	Config discord condensed (#310 ) * Added new discord_status_condensed that can be set =1 to get condensed status report * Readme update	2021-12-20 20:28:00 +01:00
stephan-01010011	752bd813ea	Nihlatak run changed to use the correct path if the template 'NI2_A_SAFE_DIST_2' was detected. (#304 ) - Template assets renamed to use an uniform suffix. _save_dist, _noattack - EyeCheckData class enhanced to contain a destination static path definition that is used instead of the template name	2021-12-19 11:55:24 +01:00
egut125	feafdca33d	Correctly Total Failed Runs, Only Set location to shenk when battling, not on run start (#303 )	2021-12-19 08:26:40 +01:00
aeon0	a267c9fbf2	Update README.md	2021-12-18 22:06:48 +01:00
aeon0	d766f4222c	Dont spam screenshots, forgot if condition	2021-12-18 20:51:42 +01:00
aeon0	e1fa484cb8	Eldritch pathing robustness (#302 ) * Robustify eldritch pathing * failed game screenshot * remove log	2021-12-18 13:03:35 +01:00
egut125andaeon0	bfcd2babaa	Adding location_stats dict to hold stats for each run (#297 ) * Adding location_stats dict to hold stats for each run Logs Items,Deaths,Chickens,Merc Deaths, and Fails for each run Discord message prints stats by run in table stats.log lists run table and items by run * clean up Co-authored-by: aeon0 <[email protected]>	2021-12-17 19:57:12 +01:00
yhkinsar	db63ce66b6	adding more uniq items (#299 )	2021-12-17 19:52:15 +01:00
aeon0	29a4eaf9b2	Fix static field param (#296 )	2021-12-15 23:53:43 +01:00
aeon0	b33135f704	Bump version to v0.5.1 (#294 )	2021-12-15 19:03:52 +01:00
aeon0	67e03fc938	Adjust template for nil on A (#293 ) * Adjust template for nil on A * change order	2021-12-15 18:05:53 +01:00
aeon0	3c39cfa5d9	Fix trav gold pick up only after latest changes + clean ups (#292 )	2021-12-15 16:24:55 +01:00
tw1st40	be1f1ce08c	Barbarian support (currently War Cry/singer only) with Horking (#288 ) * Added Barbarian support (currently War Cry/singer only) with Horking (find item) - thanks Outburst. * Changes as requested by aeon for pull request to be merged.	2021-12-15 15:49:09 +01:00
yhkinsar	7b7815a021	Support Greater Potion (#290 )	2021-12-15 15:47:40 +01:00
EthanJian	5b70c24c7b	Add-Mercenary-deaths-counter (#287 ) 1. Add a merc deaths counter in game_stats.py. 2. Trigger: put it in bot.py while Check if merc needs to be revived.	2021-12-15 08:42:24 +01:00
egut125	636745f47b	Add location from the Run procedure (#283 ) * Add location from the Run procedure and all Discord messages can leverage * Removing old area calls * remove logger * Shenk Eld improvements * Cleaning * Cleaning	2021-12-14 23:04:33 +01:00
aeon0	4d083bee83	Use static for sorc at trav (#285 ) * Sorc use static at trav * Sorc use static at trav	2021-12-13 23:03:41 +01:00
aeon0	fe8c6d5de0	Trav for Sorc (#284 )	2021-12-13 20:24:47 +01:00
aeon0	857052c75d	Tele dancing sorc nil (#282 ) * Implement simple "tele-dancing" for sorc nil * increase trav atk len	2021-12-13 19:13:53 +01:00
aeon0	bf7ce99c5f	Implement Nihlatak for Sorc (#281 )	2021-12-13 18:14:03 +01:00
aeon0	b6260327b7	Add area for item pickup	2021-12-13 17:20:47 +01:00
aeon0	8a85f38819	Optional Redemption	2021-12-13 17:17:58 +01:00
aeon0	c2bd99af18	Fix gold stashing bug (#280 )	2021-12-13 17:00:52 +01:00
aeon0	5e43da1f02	Bump version to v0.5.0 (#278 )	2021-12-12 21:22:45 +01:00