Skip to content

Commit

Permalink
Merge Dev to Master (#86)
Browse files Browse the repository at this point in the history
* code refactor

* added update notes to update notification

* more refactoring

* seperate combined mods and combine same mods if seperate

* made advanced search gui more compact

* added pseudo mods

* added more options

* fixed some advanced search problems

* added ForceMaxLinks option

* added item level min to advanced search
  • Loading branch information
Eruyome authored Oct 30, 2016
1 parent f1713e7 commit 8ec733f
Show file tree
Hide file tree
Showing 7 changed files with 975 additions and 562 deletions.
31 changes: 24 additions & 7 deletions POE-ItemInfo.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -6439,7 +6439,7 @@ ParseItemData(ItemDataText, ByRef RarityLevel="")
Item.IsMap := (Item.BaseType == "Map")
Item.IsJewel := (Item.BaseType == "Jewel")
Item.IsMirrored := (ItemIsMirrored(ItemDataText) and Not Item.IsCurrency)
Item.IsEssence := Item.IsCurrency and (RegExMatch(Item.Name, "i)Essence of ") or RegExMatch(Item.Name, "i)Remnant of"))
Item.IsEssence := Item.IsCurrency and RegExMatch(Item.Name, "i)Essence of |Remnant of Corruption")
Item.Note := Globals.Get("ItemNote")

TempStr := ItemData.PartsLast
Expand Down Expand Up @@ -6799,7 +6799,7 @@ ExtractRareItemTypeName(ItemName)
}

; Show tooltip, with fixed width font
ShowToolTip(String)
ShowToolTip(String, Centered = false)
{
Global X, Y, ToolTipTimeout, Opts

Expand All @@ -6808,9 +6808,26 @@ ShowToolTip(String)

If (Not Opts.DisplayToolTipAtFixedCoords)
{
ToolTip, %String%, X - 135, Y + 35
Fonts.SetFixedFont()
ToolTip, %String%, X - 135, Y + 35
If (Centered)
{
ScreenOffsetY := A_ScreenHeight / 2
ScreenOffsetX := A_ScreenWidth / 2

XCoord := 0 + ScreenOffsetX
YCoord := 0 + ScreenOffsetY

ToolTip, %String%, XCoord, YCoord
Fonts.SetFixedFont()
ToolTip, %String%, XCoord, YCoord
}
Else
{
XCoord := (X - 135 >= 0) ? X - 135 : 0
YCoord := (Y + 35 >= 0) ? Y + 35 : 0
ToolTip, %String%, XCoord, YCoord
Fonts.SetFixedFont()
ToolTip, %String%, XCoord, YCoord
}
}
Else
{
Expand All @@ -6828,8 +6845,8 @@ ShowToolTip(String)
YCoord := 0 + ScreenOffsetY

ToolTip, %String%, XCoord, YCoord
Fonts.SetFixedFont()
ToolTip, %String%, XCoord, YCoord
Fonts.SetFixedFont()
ToolTip, %String%, XCoord, YCoord
}
;Fonts.SetFixedFont()

Expand Down
7 changes: 7 additions & 0 deletions TradeUpdates.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
The following is a list of what has been updated, starting with 1.1.0

1.1.5.1
==================================================================================================
Added more options.
Added pseudo mod suggestions to advanced search.
Added update notes to update notification window.


1.1.5
==================================================================================================
Added first version of advanced search for normal/magic/rare items.
Expand Down
3 changes: 3 additions & 0 deletions trade_config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ OpenWithDefaultWin10Fix =0
ShowAccountName =1
; Show also sellers account name in the results window, 1 = show; 0 = hide
BrowserPath =
OpenUrlsOnEmptyItem =

[Debug]
Debug =0
Expand Down Expand Up @@ -52,6 +53,7 @@ GemQualityRange =0
; Use this to set a range to quality Gem searches; for example a range of 1 searches 14% - 16% when you have a 15% Quality Gem.
; Setting it to 0 (default) uses your Gems quality as min_quality without max_quality in your search.
OnlineOnly =1
BuyoutOnly =1
; 1 = search online only; 0 = search offline, too.
Corrupted =Either
; yes, no, either; This setting gets ignored when you use the search on corrupted items.
Expand All @@ -66,6 +68,7 @@ RemoveMultipleListingsFromSameAccount =1
PrefillMinValue =1
PrefillMaxValue =1
CurrencySearchHave =Chaos Orb
ForceMaxLinks =1

[Cache]
Expire =3
Expand Down
Loading

0 comments on commit 8ec733f

Please sign in to comment.