Skip to content
This repository has been archived by the owner on Apr 17, 2021. It is now read-only.

Commit

Permalink
Bugfixes: GDI+ FPS drop, CurrencyCalc, MapModWarnings
Browse files Browse the repository at this point in the history
  • Loading branch information
aRTy42 authored Oct 19, 2017
1 parent c37ac29 commit 32ce3c4
Show file tree
Hide file tree
Showing 7 changed files with 215 additions and 151 deletions.
3 changes: 3 additions & 0 deletions lib/Class_GdipTooltip.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ class GdipTooltip

this.window.WriteText(String, options)
this.window.Update({ x: Round(XCoord, 5), y: Round(YCoord, 5)})

ttWindowHwnd := this.window.hwnd
WinSet, ExStyle, +0x20, ahk_id %ttWindowHwnd% ; 0x20 = WS_EX_CLICKTHROUGH
this.isVisible := true
}

Expand Down
5 changes: 4 additions & 1 deletion lib/PoEScripts_HandleUserSettings.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ PoEScripts_ConvertOldFiles(sourceDir, destDir, ByRef overwrittenFiles) {

PoEScripts_ConvertOldConfig(sourceDir, destDir, fileFullName, ByRef overwrittenFiles) {
OldConfigObj := PoEScripts_TrimEndingSpacesInKeys(class_EasyIni(destDir "\" fileFullName))
if (InStr(OldConfigObj.GetTopComments(), "Converted")) {
if (InStr(OldConfigObj.GetTopComments(), "Converted with PoeScripts_ConvertOldConfig")) {
return
}
if (InStr(OldConfigObj.GetTopComments(), "Based on default file")) {
return
}
PoEScripts_BackupUserFileOnDate(destDir, fileFullName)
Expand Down
74 changes: 41 additions & 33 deletions resources/Updates.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
The following is a list of what has been updated, starting with 1.9.3.
Current Script Caretaker: aRTy42
Current Script Caretaker: aRTy (GitHub/PoE Account: aRTy42, Reddit: -aRTy-)

3.0.04
3.0.05-beta
================================
from aRTy42, Eruyome, dein0s, esunder
from Eruyome, aRTy

* Added a fix/workaround for the new and optional GDI+ tooltip causing FPS drops.
* Fixed ItemInfo/TradeMacro currency rate fetching/parsing (and ItemInfos currency stack conversion to chaos equivalent).
* Fixed MapModWarnings not working.

3.0.04-beta
================================
from aRTy, Eruyome, dein0s, esunder

Three big new features:
1) Full rework of ItemInfo affix parsing (aRTy42)
1) Full rework of ItemInfo affix parsing (aRTy)
2) GDI+ display option (Eruyome and esunder)
3) Reworked .ini handling (mostly dein0s)

Expand Down Expand Up @@ -56,7 +64,7 @@ These changes are quite extensive and will likely bring a few bugs that were not

3.0.03
================================
from aRTy42
from aRTy

Improvements for 3.0 mods: All new ailment mods should now be supported. Old Energy Shield mods should now all be fixed.
Flat defense mods on hybrid armour bases are supported, hybrid life mods are not (if you see .5 prefixes, it's likely hybrid life).
Expand All @@ -65,7 +73,7 @@ Updated Divination Cards and Uniques with data from the wiki.

3.0.02
================================
from aRTy42
from aRTy

Updated Divination cards with data from the wiki. Note that a lot of information is still missing.
Updated and corrected Unique data from the wiki.
Expand All @@ -75,13 +83,13 @@ Adopted the new wording for the two map mods concerning "Elemental Ailments" (no

3.0.01
================================
from aRTy42
from aRTy

Imported new unique data from the wiki.

3.0.00
================================
from aRTy42, Eruyome
from aRTy, Eruyome

Reworked AdditionalMacros (by Eruyome). Refer to the ReadMe section at the start of the AdditionalMacros.txt file.
Improved several technical aspects regarding file downloads and updates (by Eruyome).
Expand All @@ -90,7 +98,7 @@ Added most unambiguous new mods and updated existing ones. NOT included: The new

2.6.04
================================
from aRTy42, Eruyome, Nightblade
from aRTy, Eruyome, Nightblade

Map parsing: MapModWarnings can now be customized. Like AdditionalMacros the file is put into the user folder and
can be accessed via the context menu "Edit -> Map Mod Warnings".
Expand All @@ -101,14 +109,14 @@ AdditionalMacros: Added more functions and enabled more functions by default.

2.6.03
================================
from aRTy42
from aRTy

Map mod parsing improved. Includes mod warnings for unpopular or difficult mods.
Map data: Tooltip now includes "Boss Arena: Yes/No". Updated most difficulty and layout ratings with the wiki's map article.

2.6.03-beta
================================
from aRTy42 and Eruyome
from aRTy and Eruyome

New feature: Map affix parsing which includes mod counting, so you no longer have to guesstimate 8-mods. Since this was a big chunk of code and
is probably not completely bug-free yet this is a beta-release. If you want to test it: Please do! (and report any oddities you find).
Expand All @@ -121,22 +129,22 @@ Updated Uniques and Maps with wiki info (with thanks to cirf for updating all th

2.6.01
================================
from aRTy42
from aRTy

Updated Uniques, Divination Cards and Maps with the current wiki info.
Fixed Atlas info: Grotto Map and Dungeon Map now list each other as connected. (with thanks to "paulcdejean" on GitHub)
Fixed a bug that only occured when ItemInfo was used via the TradeMacro: The predicted Q20Dps was off due to a rounding error.

2.6.00
================================
from aRTy42
from aRTy

Updated Uniques, Divination Cards and Maps with the current wiki info.
(Be still attentive when checking uniques since the wiki is not fully updated yet)

2.5.06
================================
from Eruyome, 4GForce, aRTy42
from Eruyome, 4GForce, aRTy

New features: Auto-updater and global user settings. (by Eruyome)
The update notification window now comes with a button "update". This feature allows the script to download the new files
Expand All @@ -160,14 +168,14 @@ Made some adjustments to the handling of Implicits. (by Eruyome)

2.5.05
================================
from aRTy42, Eruyome, 4GForce
from aRTy, Eruyome, 4GForce

Fixed an issue with the file encoding of the config file and adjusted the handling of it. If you had weird characters instead
of the three dots for abbreviating mods, try this release.

2.5.04
================================
from Eruyome, aRTy42, 4GForce
from Eruyome, aRTy, 4GForce

UPDATE YOUR AUTOHOTKEY INSTALLATION
(unless you updated in the last 2-3 months already)
Expand All @@ -188,20 +196,20 @@ Updated Maps, Divination Cards and Uniques with the current wiki info.

2.5.03
================================
from aRTy42, Eruyome
from aRTy, Eruyome
Included an update notifier for the script (by Eruyome).
Updated Maps, Divination Cards and Uniques with the current wiki info.
Included the name change of "Armory Map" to "Armoury Map" (again), because it got partially reverted with v2.5.02.

2.5.02
================================
from aRTy42
from aRTy
Fixed a bug with added elemental damage for bows that got introduced in 2.5.01.
Moved the pause function key binding to the "AdditionalMacros" file so that people can change the key more easily.

2.5.01
================================
from aRTy42
from aRTy
Updated maps and divination cards with wiki info.
Added gem quality info to cast while channeling.
Fixed a bug that sometimes caused item types of rares to be mismatched if their randomly assigned name contained a keyword
Expand All @@ -210,7 +218,7 @@ Corrected the data for the unique "Prismatic Eclipse" that was missing two mods

2.5.00
================================
from aRTy42, Eruyome
from aRTy, Eruyome
Updated Uniques for PoE v2.5.
Uniques now only show those values on the right side that actually have a range to roll. This should simplify comparing your rolls.
The method of pulling the unique data was changed, so a few errors might have slipped in. Please report any errors you find.
Expand All @@ -220,20 +228,20 @@ Fixed a bug that caused item flavour text or usage hints to appear at the bottom

2.4.05
================================
from aRTy42, Eruyome, Arkaf
from aRTy, Eruyome, Arkaf
Changed Direct3DWindowClass to POEWindowClass and the relevant .exe names, so that the script works again.
It should support both standalone and steam version and both 32 and 64 bit.
Currency stacks of 1000+ in the currency tab should now read correctly for the currency conversion function.
(thanks to Arkaf and iulianov who commented on this)

2.4.04
================================
from aRTy42
from aRTy
Minor fix for map matching (Ivory Temple Map and Vaal Temple Map were detected as Temple Map)

2.4.03
================================
from aRTy42 and Eruyome
from aRTy and Eruyome
Updated Maps. Added shaped maps and included information from the wiki where possible.
Corrected the data for the "Cast Speed" affix, which is higher for staves since PoE v2.4
Fixed item type detection for magic items (by Eruyome)
Expand All @@ -242,28 +250,28 @@ Added or changed several functions and data storing methods so that the "PoE-Tra

2.4.02
================================
from aRTy42
from aRTy
Updated Uniques.
Maps have updated Boss descriptions, general notes and ratings for difficulty (1-5) and layout (A-C).

2.4.01
================================
from aRTy42
from aRTy
Compiled new map info from various sources, see the forum thread for details.
Updated Divinations cards with wiki information.
Uniques not updated yet, because there are lots of things to fix and holding back
the map update until everything is done seemed stupid.

2.4.00
================================
from aRTy42
from aRTy
Basic support for the new value range format ("#-#" was changed to "# to #"). The script will continue to display its results as before.
Map and Divination card information was not updated yet. This will follow in a few days once there is enough on the wiki.
Fixed how the "AdditionalMacros" file was included to support shortcuts to the script from the start menu and task bar.

2.3.07
================================
from aRTy42
from aRTy
New feature: Gem quality info. Full 20% quality effect and effect per quality point get displayed.
Completely restructured jewels: Separated both the affix parsing code and the data files.
This change should have no visible impact ingame. Please report bugs if you notice any.
Expand All @@ -274,7 +282,7 @@ Updated Divination Cards with wiki infos

2.3.06
================================
from aRTy42
from aRTy
The new label "Map Drop" introduced in PoE v2.3.2 is now accounted for and thus no longer breaks parsing items.
Added new file "AdditionalMacros.txt" in the main folder. The user macros that used to be at the very end of the ahk-file
are now located here, for easier access. Added detection for the Steam version exe-file. The user macros are disabled
Expand All @@ -298,15 +306,15 @@ Added Shavronne's Gambit to uniques, which was still missing (pointed out by mag

2.3.03
================================
from aRTy42
from aRTy
Uniques: Included more of the new 2.3 uniques. Updated implicits for Sceptres and Wands.
Manually adjusted the display for a few more uniques (notable: Ventor's Gamble and several Jewels)
Updated Divination Cards
Updated Maps

2.3.02
================================
from underbent, vdorie, aRTy42
from underbent, vdorie, aRTy
Improved data thanks to underbent's additions to the data fetch script: https://github.com/underbent/scrape_poe_info
This means divination cards are now updated to today's wiki infos
and uniques with decimal point values (like 0.2% leech) no longer truncate the displayed value to 0
Expand All @@ -319,19 +327,19 @@ Included a fix from underbent so that the warning info of equipped items that yo

2.3.01
================================
from aRTy42
from aRTy
Added "Has Fated Variant" line to info for respective uniques
"Max Sockets" should no longer show up on non armour/weapon items
Fixed Drillneck data that got lost due to an odd wiki entry

2.3
================================
from /u/trecko1234 and /u/netarc: https://www.reddit.com/r/pathofexile/comments/4nd1mj/updated_bahnzos_item_info_script_for_23/
Merged with the latest version from Bahnzo by aRTy42
Merged with the latest version from Bahnzo by aRTy

2.11
================================
from aRTy42
from aRTy
Armour matching with RegEx. MaxLife fix & cleanup

2.1
Expand Down
2 changes: 1 addition & 1 deletion resources/Version.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ReleaseVersion := "3.0.04-beta"
ReleaseVersion := "3.0.05-beta"
AHKVersionRequired := "1.1.26"
4 changes: 3 additions & 1 deletion resources/ahk/AdditionalMacros.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ AM_AssignHotkeys:
for labelIndex, labelName in StrSplit(AM_Config.GetSections("|", "C"), "|") {
if (labelName != "General") {
for labelKeyIndex, labelKeyName in StrSplit(AM_Config[labelName].Hotkeys, ", ") {
Hotkey, % KeyNameToKeyCode(labelKeyName, AM_KeyToSCState), %labelName%_HKey, % AM_Config[labelName].State
if (labelKeyName and labelKeyName != A_Space) {
Hotkey, % KeyNameToKeyCode(labelKeyName, AM_KeyToSCState), %labelName%_HKey, % AM_Config[labelName].State
}
}
}
}
Expand Down
Loading

0 comments on commit 32ce3c4

Please sign in to comment.