Bugfix: Shenk offset stacking (#548 )

* Bugfix: Shenk offset stacking * bump to 0.6.6 * move stuff around
Bugfix: Diablo was passed as char to pickit (#551 )
2022-02-15 14:57:30 -05:00 · 2022-02-15 14:10:47 -05:00 · 2022-02-15 07:12:17 -05:00 · 2022-02-14 21:08:02 -05:00 · 2022-02-14 16:25:45 -05:00 · 2022-02-14 16:21:47 -05:00
434 changed files with 2150 additions and 595 deletions
@@ -16,6 +16,7 @@ botty_v*/
 custom.ini
 config/custom.ini
 config/custom.*.ini
+*info_log_parsed.txt
 *info_*.png
 .vscode
 .vs/
@@ -27,3 +28,4 @@ stats/
 .coverage
 htmlcov/
 coverage.xml
+utils/live-view/
@@ -74,7 +74,7 @@ run_shenk=0
 | 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 (just the Boss, not the trashmobs) 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) |

 | [char]             | Descriptions |
 | ------------------ | -------------------------------------------------------------------------------------------------|
@@ -110,7 +110,8 @@ run_shenk=0
 | 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 |
-| cs_clear_trash   | If 1, most Trash mob packs from Chaos Sancturay Entrance to Pentagram and Seals A, B, C are cleared (NOT YET IMPLEMENTED). If 0, the run starts at Pentagram and just kills Sealbosses & Diablo |
+| 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) |
 | 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 |
@@ -123,7 +124,8 @@ run_shenk=0
 | 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_repair    | 0: Will only repair when needed, 1+: Will repair after # of runs set here |
+| 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. |
 | fill_shared_stash_first | Fill stash tabs starting from right to left, filling personal stash last |
@@ -175,6 +177,8 @@ run_shenk=0
 | 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                                                      |

 | [barbarian]    | Descriptions                                                                        |
 | -------------- | ----------------------------------------------------------------------------------- |
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
mgleed	e46edbc6aa	Bugfix: Shenk offset stacking (#548 ) * Bugfix: Shenk offset stacking * bump to 0.6.6 * move stuff around	2022-02-15 14:57:30 -05:00
Vladimir MakaevandVladimir Makayev	e304e227c8	Bugfix: Diablo was passed as char to pickit (#551 ) Co-authored-by: Vladimir Makayev <[email protected]>	2022-02-15 14:10:47 -05:00
jobithu	77149a621f	CS Hammerdin: optional skills now checked for binding before cast (#550 ) * optional skills now checked for binding before cast * forgot 628	2022-02-15 07:12:17 -05:00
John Wu	6a213014b8	Enhancement: Add more chest assets (#547 )	2022-02-14 21:08:02 -05:00
jobithu WiZ aeon0 mgleed	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 <[email protected]> Co-authored-by: aeon0 <[email protected]> Co-authored-by: mgleed <[email protected]>	2022-02-14 16:25:45 -05:00
Vladimir Makaev	94a617f9ae	Bugfix: incorrect path offset for shenk. Optimize tele charges (#545 ) * Fix incorrect path offset for shenk. Enable using charges to optimize the run * Do offset in case can_teleport_natively vs can_teleport_with_charges	2022-02-14 16:21:47 -05:00
mgleed	c85a360152	Bugfix: Messenger has no attribute "send"	2022-02-14 12:58:48 -05:00
mgleed	81a783624e	Bump to v0.6.5 (#536 )	2022-02-13 08:33:39 -05:00
Ezro	d679858d30	Refactor: Track nopickup status in GameStats and only /nopickup once (#534 ) * Track nopick status in GameStats and only /nopick once * Rename var from nopick_active to nopickup_active	2022-02-11 22:39:00 -05:00