Merge branch 'master' of https://github.com/bottytools/botty

update test assets url
Update default.nip (#918 )
2022-06-21 18:58:27 -04:00 · 2022-06-21 18:58:15 -04:00 · 2022-06-21 14:35:07 -04:00 · 2022-06-21 12:31:47 -04:00 · 2022-06-21 12:20:21 -04:00 · 2022-06-21 09:57:46 -04:00
1380 changed files with 115617 additions and 6108 deletions
@@ -29,7 +29,7 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots or even better a short video of the error happening to help explain your problem. Botty often automatically makes screenshots when something goes wrong. Add these also.

 **Logs**
-Add the relevant part of the info.log in this section. Either upload it as a fail or copy-paste the relevant part in here.
+Add the relevant part of the log/log_(time).txt in this section. Either upload it as a fail or copy-paste the relevant part in here.

 **Additional info**
 Add any other information about the problem here.
@@ -5,16 +5,16 @@ jobs:
    runs-on: windows-latest
    steps:
      - uses: actions/checkout@v2
-      - name: Setup Miniconda Python 3.9
+      - name: Setup Miniconda Python 3.10
        uses: actions/setup-python@v2
        with:
-          python-version: 3.9
+          python-version: '3.10'
      # TODO: The below setp only chaches conda packages, need to cache pip seperatly
      - name: Cache conda
        uses: actions/cache@v2
        env:
          # Increase this value to reset cache if environment.yml has not changed
-          CACHE_NUMBER: 0
+          CACHE_NUMBER: 1
        with:
          path: ~/conda_pkgs_dir
          key: conda-${{ env.CACHE_NUMBER }}-${{hashFiles('environment.yml') }}
@@ -22,14 +22,14 @@ jobs:
        uses: actions/cache@v2
        env:
          # Increase this value to reset cache if environment.yml has not changed
-          CACHE_NUMBER: 0
+          CACHE_NUMBER: 1
        with:
          path: ~/pip
          key: pip-${{ env.CACHE_NUMBER }}-${{ hashFiles('environment.yml') }}
      - name: Install Miniconda
        uses: conda-incubator/setup-miniconda@v2
        with:
-          python-version: 3.9
+          python-version: '3.10'
          activate-environment: botty
          channel-priority: strict
          environment-file: environment.yml
@@ -4,7 +4,6 @@ __pycache__/
 playground.py
 *.pyc
 *.pyo
-*.log
 *.spec
 dist/
 build/
@@ -16,16 +15,24 @@ botty_v*/
 custom.ini
 config/custom.ini
 config/custom.*.ini
-*info_log_parsed.txt
-*info_*.png
 .vscode
 .vs/
-info_screenshots/
-loot_screenshots/
-stats/
+test/assets/
 .venv
 *.bak
 .coverage
 htmlcov/
 coverage.xml
 utils/live-view/
+config/nip/*
+!config/nip/.gitkeep
+
+stats/
+info_screenshots/
+item_error_screenshots/
+loot_screenshots/
+pickit_screenshots/
+*info_log_parsed.txt
+*info_*.png
+*.log
+log/
@@ -25,93 +25,123 @@ Open up D2R and wait till you are at the hero selection screen. Make sure the ch

 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. Note: Botty will use the /nopickup command in the first game to avoid pickup up trash while traversing. This command will only allow item pickup when "show items" is active.

+## Development
+
+Check out the [development.md](development.md) docu for infos on how to build from source and details of the project structure and code.
+
+## Support this project 💓
+
+You can support this project by giving feedback, reporting bugs, or creating pull requests.
+Contributions are welcome, and we encourage you to contribute to this project if you would like to help out. Botty is a open source project and almost excessively maintained by contributors (there has been 50+ contributors! <3). In our [**discord**](https://discord.gg/Jf3J8cuXWg) there is a contributor role, and you can ping one of the admins and ask for the role to talk to other contributors! Though you don't need to be in the [**discord**](https://discord.gg/Jf3J8cuXWg) to contribute, we do encourage you to do so.
+
+## BNIP Pickit
+
+Botty NIP (BNIP) is an extended version of Njaguar's Item Parser (NIP).
+BNIP is compatible with NIP (with some minor exceptions as discussed below).
+
+There is a default nip file that comes with botty called "default.nip" inside config folder, you can add your own nip files by putting them inside config/nip with a file extension of .nip. Creating your own nip file also turns off the default.nip.
+
+We suggest you read the NIP guide if you are unfamiliar with NIP https://github.com/blizzhackers/pickits/blob/master/NipGuide.md
+
+### New features in BNIP
+
+Poison damage is no longer calculated, but is now read as it's raw value. Example: Adds 5-10 poison damage over 1 seconds can be picked with `[poisonmindam] == 5 && [poisonmaxdam] == 10`. "313 Poison Damage over 5 seconds" can be picked with `[poisonmindam] == 313` or  `[poisonmaxdam] == 313`.
+
+`[allres]` is a thing now. example: `[type] == amulet && [quality] == unique # [allres] == 30` will pick up Mara's
+
+`[idname]` can now be used for unique / set items. For example, `[idname] == thestoneofjordan` will pick up SoJ. Keep in mind, however, this forces the item to be ID'd so be careful if you want to keep unid items.
+
+`[maxquantity]` is not supported (yet). You can leave those tags in but they'll do nothing.
+
+If you have the discord webhook hooked up to alert you when the bot keeps items, you can suppress these alerts by adding a "@" in front of your expression.
+
+@[type] == ring = no notification
+[type] == ring = notification
+
 ## Graphic Debugger

 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
-
-Check out the [development.md](development.md) docu for infos on how to build from source and details of the project structure and code.
-
 ## 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 **params.ini** changes to the new version. Example:

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

 [routes]
-run_pindle=1
-run_shenk=0
+order=run_pindle, run_eldritch
 ```

 | [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        | 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... |
+| name                     | Name used in terminal and discord messages. |
+| randomize_runs           | Randomize the order of `[routes]` specified in `params.ini`. |
 | saved_games_folder       | [Optional] Defaults to `~\Saved Games\Diablo II Resurrected`. Used to store configuration settings for `f9` / auto settings. |
+| custom_loot_message_hook      | Add your message hook here (such as Discord channel) to get info about loot |
+| custom_message_hook      | Add your message hook here (such as Discord channel) to get info about botty status updates, discord webhook is default. |
+| discord_log_chicken      | Set to `1` to enable messages about bot chickens, `0` to disable. |
+| discord_status_count     | Number of games between discord status messages being sent. Leave empty for no status reports. |
+| message_api_type         | Which api to use to send botty messages.  Supports "generic_api" (basic discord), or "discord" (discord embeds with images). |
+| break_length_m           | Break for `break_length_m` minutes every `max_runtime_before_break_m` minutes |
+| max_runtime_before_break_m | ^ |
 | 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. |
+| max_consecutive_fails    | Botty will stop making games if the number of consecutive fails reaches this max value. |
+| 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. |
 | 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. |
+| pickit_screenshots         | If `1`, the bot takes a screenshot with timestamp on every ground loot snapshot taken during pickit routine, can be useful for debugging. |
+| 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... |

 | [routes]     | Descriptions                                                             |
 | ------------ | ------------------------------------------------------------------------ |
-| run_trav     | Run Trav in each new game. Select "1" to run it "0" to leave it out. Specific trav gear is suggested |
-| run_pindle   | Run Pindle in each new game. Select "1" to run it "0" to leave it out.   |
-| run_eldritch | Run Eldritch in each new game. Select "1" to run it "0" to leave it out. |
-| run_shenk    | Run shenk in each new game. Select "1" to run it "0" to leave it out.    |
-| run_nihlathak | Run Nihlathak in each new game. Select "1" to run it "0" to leave it out. (Teleport required) |
-| run_arcane   | Run Arcane Sanctuary in each new game. Select "1" to run it "0" to leave it out. (Teleport required) |
-| run_diablo   | Run Diablo in each new game. Select "1" to run it "0" to leave it out. (Teleport required) |
+| order        | List of runs botty should do. These will be run in the the order listed unless `randomize_runs` is set to 1. Possible runs: </br> run_trav, run_pindle, run_eldritch, run_eldritch_shenk, run_nihlathak (requires teleport), run_arcane (requires teleport), run_diablo (requires teleport, only hammardin)

 | [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. 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" |
+| 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! |
+| cta_available      | 0: no cta available, 1: cta is available and should be used during prebuff |
+| safer_routines    | Set to 1 to enable optional defensive maneuvers/etc during combat/runs at the cost of increased runtime (ex. hardcore players)
+| num_loot_columns   | Number of columns in inventory used for loot (from left!). Remaining space can be used for charms |
+| force_move         | Hotkey for "force move" |
+| inventory_screen   | Hotkey to open inventory |
 | 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 |
+| show_belt          | Hotkey for "show belt" |
+| show_items         | Hotkey for "show items" |
+| stand_still        | Hotkey for "stand still". Note this can not be the default shift key as it would interfere with the merc healing routine |
+| teleport           | Hotkey for teleport (set blank if your character can't teleport) |
+| town_portal           | Hotkey for town portal |
 | weapon_switch      | Hotkey for "weapon switch" (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 |
-| min_gold_to_pick   | Minimum quantity of gold to pickup (also must set misc_gold=1 in pickit config) |
 | use_merc           | Set to 1 for using merc. Set to 0 for not using merc (will not revive merc when dead), default = 1 |
 | atk_len_arc        | Attack length for hdin/sorc fighting arcane  |
-| atk_len_trav       | Attack length for hdin fighting trav (note this atk length will be applied in 4 different spots each) |
-| 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 |
 | atk_len_nihlathak   | Attack length for hdin or number of attack sequences for sorc when fighting nihlathak |
+| atk_len_pindle     | Attack length for hdin or number of attack sequences for sorc when fighting pindle |
+| atk_len_shenk      | Attack length for hdin or number of attack sequences for sorc when fighting shenk |
+| atk_len_trav       | Attack length for hdin fighting trav (note this atk length will be applied in 4 different spots each) |
 | atk_len_cs_trashmobs   | Attack length for hdin or number of attack sequences when fighting Trash Mobs in Chaos Sanctuary (Diablo) |
-| atk_len_diablo_vizier   | Attack length for hdin or number of attack sequences when fighting Sealboss A "Vizier of Chaos" in Chaos Sanctuary (Diablo) |
 | atk_len_diablo_deseis   | Attack length for hdin or number of attack sequences when fighting Sealboss B "Lord De Seis" in Chaos Sanctuary (Diablo) |
 | atk_len_diablo_infector   | Attack length for hdin or number of attack sequences when fighting Sealboss C "Infector of Souls" in Chaos Sanctuary (Diablo) |
-| atk_len_diablo_infector   | Attack length for hdin or number of attack sequences when fighting Diablo in Chaos Sanctuary |
+| atk_len_diablo_vizier   | Attack length for hdin or number of attack sequences when fighting Sealboss A "Vizier of Chaos" in Chaos Sanctuary (Diablo) |
+| atk_len_diablo   | Attack length for hdin or number of attack sequences when fighting Diablo in Chaos Sanctuary |
+| cs_mob_detect | If 1, it will attempt to use holy freeze from merc / conviction aura / poison to detect nearby mobs to help speed-up CS run.
+| cs_town_visits   | CURRENTLY BROKEN, LEAVE AT 0 FOR NOW |
 | kill_cs_trash   | If 1, most Trash mob packs from Chaos Sancturay Entrance to Pentagram are cleared. If 0, the run starts at Pentagram and just kills Sealbosses & Diablo (default) |
-| cs_town_visits   | If 1, it will go to town, buy pots & stash items between clearing the seals, set 0 to deactivate (default) |
+| belt_hp_columns    | Number of belt columns for healing potions |
+| belt_mp_columns    | Number of belt columns for mana potions |
+| belt_rejuv_columns | Number of belt columns for rejuv potions |
 | 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 |
@@ -120,78 +150,91 @@ run_shenk=0
 | 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. |
-| 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 |
-| runs_per_stash    | 0: Will only stash after intentional item pickup, 1+: Will force stash after # of runs set here (recommend at least 4 in case of accidental pickups) |
-| runs_per_repair    | 0: Will only repair when needed, 1+: Will force repair after # of runs set here |
-| id_items           | Will identify items at cain before stashing them. Cain must be rescued for this to work.|
-| open_chests        | Open up chests in some places. E.g. on dead ends of arcane. Note: currently bad runtime. |
+| enable_no_pickup   | When enabled, will type `/nopickup` into chat at game start, which can help reduce accidental pickups especially for walking characters. |
 | fill_shared_stash_first | Fill stash tabs starting from right to left, filling personal stash last |
 | gamble_items       | List of items to gamble when stash fills with gold. Leave blank to disable. Supported items currently include circlet, ring, coronet, talon, amulet
+| id_items           | Will identify items with tome of ID or at Cain if enabled |
+| open_chests        | Open up chests in some places. E.g. on dead ends of arcane. |
+| pre_buff_every_run | 0: Will only prebuff on first run, 1: Will prebuff after each run/boss |
+| runs_per_repair    | Force repair after `runs_per_repair` of runs. Set to 0 to repair only when needed. |
+| runs_per_stash    | 0: Will only stash after intentional item pickup, 1+: Will force stash after # of runs set here (recommend at least 4 in case of accidental pickups) |
+| sell_junk          | 0: Discard unwanted items by dropping them on ground. 1: Discard items by selling them at vendor. |

 | [transmute]             | Descriptions |
 | ------------------ | -------------------------------------------------------------------------------------------------|
-| transmute_every_x_game               | How often to run transmute routine (currently transmutes flawless gems into perfect gems). Transmute routine depends on stashing routine it will only start after items stashing is done. E.g. so it could take more than X games to perform transmutes if there were no items to stash at the time. Default: 20  |
 | stash_destination | Stash tabs by priority to place the results of the transmute. Default: 3,2,1,0. (It means the result will be first placed in stash 3 untils it's full, then to stash 2, etc. 0 - personal tab)
+| transmute         | Add any or all of `chipped, flawed, standard, flawless` to trasmute gems of these types |
+| transmute_every_x_game               | How often to run transmute routine (currently transmutes flawless gems into perfect gems). Transmute routine depends on stashing routine it will only start after items stashing is done. E.g. so it could take more than X games to perform transmutes if there were no items to stash at the time. Default: 20  |

 ### Builds
 | [sorceress]   | Descriptions                                                                  |
 | ------------- | ----------------------------------------------------------------------------- |
-| teleport      | Required Hotkey for teleport                                                  |
 | 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                                             |
+| static_field | Optional Hotkey for static field                                      |
+| telekinesis | Optional Hotkey for telekinesis                                      |

 | [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)                  |
+| frozen_orb     | Optional Hotkey for frozen orb (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)                   |
+| ice_blast     | Optional Hotkey for ice_blast (must be bound to left skill)                   |

 | [nova_sorc]   | Descriptions                                                                  |
 | ------------- | ----------------------------------------------------------------------------- |
 | nova          | Required Hotkey for Nova (must be bound to right skill)                       |

-| [hammerdin]    | Descriptions                                                                        |
+| [hydra_sorc]  | Descriptions                                                                  |
+| ------------- | ----------------------------------------------------------------------------- |
+| alt_attack     | Required Hotkey for any alternate attacking skill. Fireball,Lightning,Frozen Orb, etc. (must be bound to right skill)                             |
+| hydra         | Required Hotkey for Hydra (must be bound to right skill)                      |
+
+| [paladin]    | Descriptions                                                                        |
 | -------------- | ----------------------------------------------------------------------------------- |
-| teleport       | Optional Hotkey for teleport. If left empty hammerdin will run instead of teleport. |
-| concentration  | Required Hotkey for Concentration                                                   |
+| cleansing      | Optional Hotkey for Cleansing                                                       |
 | holy_shield    | Required Hotkey for Holy Shield                                                     |
-| blessed_hammer | Required Hotkey for Blessed Hammer. (must be bound to left skill!)                  |
 | redemption     | Optional Hotkey for Redemption                                                      |
 | vigor          | Optional Hotkey for Vigor                                                           |
-| cleansing      | Optional Hotkey for Cleansing                                                       |
+
+| [fohdin]    | Descriptions                                                                        |
+| -------------- | ----------------------------------------------------------------------------------- |
+| blessed_hammer | Hotkey for Blessed Hammer. (Optional. Bind to left skill)                  |
+| concentration  | Hotkey for Concentration                                                   |
+| conviction  | Hotkey for Conviction                                                   |
+| foh  | Hotkey for Fist of Heavens (Required)                                                   |
+| holy_bolt  | Hotkey for Holy Bolt (Required)                                                   |
+
+
+| [hammerdin]    | Descriptions                                                                        |
+| -------------- | ----------------------------------------------------------------------------------- |
+| concentration  | Required Hotkey for Concentration                                                   |
+| blessed_hammer | Required Hotkey for Blessed Hammer. (must be bound to left skill!)                  |

 | [trapsin]    | Descriptions                                                                          |
 | -------------- | ----------------------------------------------------------------------------------- |
-| teleport       | Optional Hotkey for teleport. If left empty trapsin will run instead of teleport.   |
-| skill_left     | Optional Hotkey for Left Skill                                                      |
 | burst_of_speed | Optional Hotkey for Burst of Speed                                                  |
-| 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                                                    |
-| cloak_of_shadows| Optional Hotkey for Cloak of Shadows                                                |
-|  mind_blast    | Optional Hotkey for Mind Blast                                                      |
+| fade           | Optional Hotkey for Fade                                                            |
+| lightning_sentry | Required Hotkey for Lightning Sentry                                              |
+| shadow_warrior | Optional Hotkey for Shadow Warrior                                                  |
+| skill_left     | Optional Hotkey for Left Skill                                                      |

 | [barbarian]    | Descriptions                                                                        |
 | -------------- | ----------------------------------------------------------------------------------- |
-| teleport       | Optional Hotkey for teleport. If left empty barb will run instead of teleport.      |
+| cry_frequency  | Time in seconds between each cast of war_cry. Set to 0.0 if max fcr should be used  |
+| find_item      | Optional Hotkey for Find Item                                                       |
 | leap           | Required Hotkey for Leap                                                            |
 | shout          | Required Hotkey for Shout                                                           |
 | war_cry        | Required Hotkey for War Cry                                                         |
-| find_item      | Optional Hotkey for Find Item                                                       |
-| cry_frequency  | Time in seconds between each cast of war_cry. Set to 0.0 if max fcr should be used  |

 | [Necro]        | Descriptions                                                                        |
 | -------------- | ----------------------------------------------------------------------------------- |
-| teleport       | leave this blank for now, teleport/static pathing is currently not supported        |
 | skill_left     | Required Hotkey for attack (bonespear/teeth)                                        |
 | bone_armor     | Required Hotkey for Bone Armor                                                      |
 | clay_golem     | Required Hotkey for Clay Golem                                                      |
@@ -199,19 +242,8 @@ run_shenk=0
 | amp_dmg        | Required Hotkey for Amplify Damage                                                  |
 | corpse_explosion | Required Hotkey Corpse Explosion                                                  |
 | raise_revive   | Required Hotkey revive                                                              |
-| clear_pindle_packs | clears mobs before pindle                                                       |
-
-| [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 |
+| damage_scaling   | Adjusts time spent casting attack skills. Ex: 2 will cast twice as long           |
+| clear_pindle_packs | Clears mobs before pindle                                                       |

 | [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                                |
-
-## Support this project
-
-Support it by contributing in any technical way, giving feedback, bug reports or submitting PRs.
--- a/Show More
+++ b/Show More