Merge pull request #122 from aRTy42/Update

Update

Author: aRTy42

Run_ItemInfo.ahk

@@ -1,24 +1,35 @@
 ; #####################################################################################################################
 ; # This script checks if the right AHK version is installed and runs the ItemInfo merge script.
 ; #####################################################################################################################
-#Include *i %A_ScriptDir%\resources\Version.txt
 
-FileRead versionFile, %A_ScriptDir%\resources\Version.txt
+versionFilePath := A_ScriptDir "\resources\Version.txt"
+FileRead, versionFile, %versionFilePath%
 error := ErrorLevel
-If (not StrLen(AHKVersionRequired) or error) {
+
+If (not StrLen(versionFile) or error) {
 	If (RegExMatch(A_ScriptDir, "i)\.zip$")) {
 		MsgBox, 16, PoE-ItemInfo - Critical error, % "You are trying to run PoE-ItemInfo from inside a zip-archive, please unzip the whole folder. `n`nClosing script..."
 		ExitApp
 	} Else {
-		MsgBox, 16, PoE-ItemInfo - Critical error, % "Script couldn't read file """ A_ScriptDir "\resources\VersionTrade.txt"". `n`nClosing script..."
+		If (FileExist(versionFilePath)) {
+			MsgBox, 16, PoE-ItemInfo - Critical error, % "Script couldn't find the file """ A_ScriptDir "\resources\VersionTrade.txt"". `n`nClosing script..."
+		} Else {
+			MsgBox, 16, PoE-ItemInfo - Critical error, % "Script couldn't read/access the file """ A_ScriptDir "\resources\VersionTrade.txt"". `n`nClosing script..."
+		}
 		ExitApp
 	}
 }
+Else {
+	RegExMatch(versionFile, "i)ReleaseVersion.*?:=.*?""(.*?)""", relV)
+	ReleaseVersion := relV1
+	RegExMatch(versionFile, "i)AHKVersionRequired.*?:=.*?""(.*?)""", reqV)
+	AHKVersionRequired := reqV1
+}
 
-MsgWrongAHKVersion := "AutoHotkey v" . AHKVersionRequired . " or later is needed to run this script. It is important not to run version 2.x. `n`nYou are using AutoHotkey v" . A_AhkVersion . " (installed at: " . A_AhkPath . ")`n`nPlease go to http://ahkscript.org to download the most recent version."
-If (A_AhkVersion < AHKVersionRequired or A_AhkVersion >= "2.0.00.00")
-{	
-	MsgBox, 16, Wrong AutoHotkey Version, % AHKVersionRequired
+MsgWrongAHKVersion := "AutoHotkey v" . AHKVersionRequired . " or later is needed to run this script. It is important not to run version 2.x. or 1.0. `n`nYou are using AutoHotkey v" . A_AhkVersion . " (installed at: " . A_AhkPath . ")`n`nPlease go to http://ahkscript.org to download the most recent version."
+If (A_AhkVersion < AHKVersionRequired or A_AhkVersion >= "2.0.00.00" or A_AhkVersion < "1.1.00.00")
+{
+	MsgBox, 16, Wrong AutoHotkey Version, % MsgWrongAHKVersion
 	ExitApp
 }
 

data/DivinationCardList.txt

@@ -1,10 +1,10 @@
 ; Data from https://pathofexile.gamepedia.com/Path_of_Exile_Wiki using the API.
 ; Comments can be made with ";", blank lines will be ignored.
 ;
-; This file was auto-generated by scrape_poe_gems.py on 2018-06-19 at 17:18:24
+; This file was auto-generated by scrape_poe_gems.py on 2019-01-08 at 21:43:58
 
 gemQualityList := Object()
-gemQualityList["Unknown Gem"] := "No gem quality data found. Please report it."
+gemQualityList["Unknown Gem"] := "No gem quality information found."
 
 gemQualityList["Abyssal Cry"] := " 20% increased Skill Effect Duration`n (1% per 1% Q)"
 gemQualityList["Added Chaos Damage Support"] := " 10% increased Chaos Damage`n (0.5% per 1% Q)"
@@ -23,6 +23,7 @@ gemQualityList["Arc"] := " 10% chance to Shock enemies`n (0.5% per 1% Q)"
 gemQualityList["Arcane Surge Support"] := " 10% increased Spell Damage`n (0.5% per 1% Q)"
 gemQualityList["Arctic Armour"] := " 20% increased Skill Effect Duration`n (1% per 1% Q)"
 gemQualityList["Arctic Breath"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
+gemQualityList["Armageddon Brand"] := " 10% increased Cast Speed`n (0.5% per 1% Q)"
 gemQualityList["Assassin's Mark"] := " Cursed enemies have a 10% chance to grant a Power Charge when slain`n (0.5% per 1% Q)"
 gemQualityList["Ball Lightning"] := " 20% increased Lightning Damage`n (1% per 1% Q)"
 gemQualityList["Barrage"] := " 10% increased Projectile Damage`n (0.5% per 1% Q)"
@@ -41,6 +42,8 @@ gemQualityList["Blood Rage"] := " 5% increased Attack Speed`n (0.25% per 1% Q)"
 gemQualityList["Bloodlust Support"] := " 10% increased Melee Damage against Bleeding Enemies`n (0.5% per 1% Q)"
 gemQualityList["Bodyswap"] := " 10% increased Cast Speed`n (0.5% per 1% Q)"
 gemQualityList["Bone Offering"] := " 10% increased Skill Effect Duration`n (0.5% per 1% Q)"
+gemQualityList["Bonechill Support"] := " 20% increased Chill Duration on Enemies`n (1% per 1% Q)"
+gemQualityList["Brand Recall"] := " Brands gain 20% increased Attachment Range`n (1% per 1% Q)"
 gemQualityList["Brutality Support"] := " 10% increased Physical Damage`n (0.5% per 1% Q)"
 gemQualityList["Burning Arrow"] := " 60% increased Ignite Duration on enemies`n (3% per 1% Q)"
 gemQualityList["Burning Damage Support"] := " 10% increased Burning Damage`n (0.5% per 1% Q)"
@@ -65,10 +68,11 @@ gemQualityList["Cold to Fire Support"] := " 10% increased Cold Damage`n 10% incr
 gemQualityList["Combustion Support"] := " 10% increased Fire Damage`n (0.5% per 1% Q)"
 gemQualityList["Concentrated Effect Support"] := " 10% increased Area Damage`n (0.5% per 1% Q)"
 gemQualityList["Conductivity"] := " Shocks on Cursed enemies have 20% increased Duration`n (1% per 1% Q)"
+gemQualityList["Consecrated Path"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Contagion"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Controlled Destruction Support"] := " 10% increased Spell Damage`n (0.5% per 1% Q)"
 gemQualityList["Conversion Trap"] := " 20% increased Skill Effect Duration`n (1% per 1% Q)"
-gemQualityList["Convocation"] := " 20% increased Skill Effect Duration`n 10% increased Cast Speed`n (1% / 0.5% per 1% Q)"
+gemQualityList["Convocation"] := " 20% increased Skill Effect Duration`n 20% increased Cooldown Recovery Speed`n (1% per 1% Q)"
 gemQualityList["Cremation"] := " 20% increased Fire Damage`n (1% per 1% Q)"
 gemQualityList["Culling Strike Support"] := " 10% increased Attack Speed`n 10% increased Cast Speed`n (0.5% per 1% Q)"
 gemQualityList["Curse On Hit Support"] := " 10% increased Effect of Supported Curses`n (0.5% per 1% Q)"
@@ -88,6 +92,7 @@ gemQualityList["Discharge"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Discipline"] := " 20% increased Area of Effect`n (1% per 1% Q)"
 gemQualityList["Dominating Blow"] := " Minions deal 10% increased Damage`n (0.5% per 1% Q)"
 gemQualityList["Double Strike"] := " 10% increased Attack Speed`n (0.5% per 1% Q)"
+gemQualityList["Dread Banner"] := " 10% increased effect of Aura`n (0.5% per 1% Q)"
 gemQualityList["Dual Strike"] := " 10% increased Attack Speed`n (0.5% per 1% Q)"
 gemQualityList["Earthquake"] := " 20% increased Physical Damage`n (1% per 1% Q)"
 gemQualityList["Efficacy Support"] := " 10% increased Damage over Time`n (0.5% per 1% Q)"
@@ -114,7 +119,7 @@ gemQualityList["Fire Penetration Support"] := " 10% increased Fire Damage`n (0.5
 gemQualityList["Fire Trap"] := " 20% increased Fire Damage`n (1% per 1% Q)"
 gemQualityList["Fireball"] := " 10% chance to Ignite enemies`n (0.5% per 1% Q)"
 gemQualityList["Firestorm"] := " 20% increased Damage`n (1% per 1% Q)"
-gemQualityList["Flame Dash"] := " 10% increased Cast Speed`n (0.5% per 1% Q)"
+gemQualityList["Flame Dash"] := " 20% increased Cooldown Recovery Speed`n (1% per 1% Q)"
 gemQualityList["Flame Surge"] := " 10% increased Cast Speed`n (0.5% per 1% Q)"
 gemQualityList["Flame Totem"] := " 20% increased totem life`n (1% per 1% Q)"
 gemQualityList["Flameblast"] := " 20% increased Damage`n (1% per 1% Q)"
@@ -141,8 +146,10 @@ gemQualityList["Ground Slam"] := " 30% increased Stun Duration on enemies`n (1.5
 gemQualityList["Haste"] := " 20% increased Area of Effect`n (1% per 1% Q)"
 gemQualityList["Hatred"] := " 20% increased Area of Effect`n (1% per 1% Q)"
 gemQualityList["Heavy Strike"] := " 20% increased Stun Duration on enemies`n (1% per 1% Q)"
+gemQualityList["Herald of Agony"] := " 20% increased Minion Movement Speed`n (1% per 1% Q)"
 gemQualityList["Herald of Ash"] := " 15% increased Fire Damage`n (0.75% per 1% Q)"
 gemQualityList["Herald of Ice"] := " 15% increased Cold Damage`n (0.75% per 1% Q)"
+gemQualityList["Herald of Purity"] := " 20% increased Minion Movement Speed`n (1% per 1% Q)"
 gemQualityList["Herald of Thunder"] := " 15% increased Lightning Damage`n (0.75% per 1% Q)"
 gemQualityList["Hypothermia Support"] := " 30% increased Chill Duration on Enemies`n (1.5% per 1% Q)"
 gemQualityList["Ice Bite Support"] := " 20% increased Damage with Hits against Frozen Enemies`n (1% per 1% Q)"
@@ -168,6 +175,7 @@ gemQualityList["Item Rarity Support"] := " 10% increased Rarity of Items Dropped
 gemQualityList["Kinetic Blast"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Knockback Support"] := " 10% chance to Knock Enemies Back on hit`n (0.5% per 1% Q)"
 gemQualityList["Lacerate"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
+gemQualityList["Lancing Steel"] := " 20% chance to Impale Enemies on Hit`n (1% per 1% Q)"
 gemQualityList["Leap Slam"] := " 10% chance to Knock Enemies Back on hit`n (0.5% per 1% Q)"
 gemQualityList["Less Duration Support"] := " 10% reduced Skill Effect Duration`n (0.5% per 1% Q)"
 gemQualityList["Lesser Multiple Projectiles Support"] := " 10% increased Attack Speed`n 10% increased Cast Speed`n (0.5% per 1% Q)"
@@ -195,12 +203,12 @@ gemQualityList["Mirage Archer Support"] := " 10% increased Attack Damage`n (0.5%
 gemQualityList["Mirror Arrow"] := " 30% increased Arrow Speed`n (1.5% per 1% Q)"
 gemQualityList["Molten Shell"] := " 20% chance to Ignite enemies`n (1% per 1% Q)"
 gemQualityList["Molten Strike"] := " 20% increased Fire Damage`n (1% per 1% Q)"
+gemQualityList["Multiple Totems Support"] := " 20% increased Totem Placement speed`n (1% per 1% Q)"
 gemQualityList["Multiple Traps Support"] := " 20% increased Trap Trigger Area of Effect`n (1% per 1% Q)"
 gemQualityList["Multistrike Support"] := " 10% increased Melee Physical Damage`n (0.5% per 1% Q)"
 gemQualityList["Onslaught Support"] := " 5% increased Attack and Cast Speed`n (0.25% per 1% Q)"
 gemQualityList["Orb of Storms"] := " 20% increased Lightning Damage`n (1% per 1% Q)"
 gemQualityList["Phase Run"] := " 10% increased Movement Speed`n (0.5% per 1% Q)"
-gemQualityList["Physical Projectile Attack Damage Support"] := " 10% increased Physical Damage`n (0.5% per 1% Q)"
 gemQualityList["Physical to Lightning Support"] := " 10% increased Physical Damage`n 10% increased Lightning Damage`n (0.5% per 1% Q)"
 gemQualityList["Pierce Support"] := " 10% increased Projectile Damage`n (0.5% per 1% Q)"
 gemQualityList["Poacher's Mark"] := " Cursed enemies have a 10% chance to grant a Frenzy Charge when slain`n (0.5% per 1% Q)"
@@ -230,15 +238,18 @@ gemQualityList["Righteous Fire"] := " 20% increased Spell Damage`n (1% per 1% Q)
 gemQualityList["Riposte"] := " 20% increased Damage`n (1% per 1% Q)"
 gemQualityList["Ruthless Support"] := " 10% increased Attack Damage`n (0.5% per 1% Q)"
 gemQualityList["Scorching Ray"] := " 10% increased beam length`n (0.5% per 1% Q)"
+gemQualityList["Scourge Arrow"] := " 20% increased Projectile Speed`n (1% per 1% Q)"
 gemQualityList["Searing Bond"] := " 20% increased totem life`n (1% per 1% Q)"
 gemQualityList["Seismic Trap"] := " 20% increased Physical Damage`n (1% per 1% Q)"
+gemQualityList["Shattering Steel"] := " 20% increased Impale Effect`n (1% per 1% Q)"
 gemQualityList["Shield Charge"] := " 20% increased Damage`n (1% per 1% Q)"
 gemQualityList["Shock Nova"] := " 40% increased Shock Duration on enemies`n (2% per 1% Q)"
 gemQualityList["Shockwave Totem"] := " 20% increased totem life`n (1% per 1% Q)"
 gemQualityList["Shrapnel Shot"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Siege Ballista"] := " 20% increased Totem Placement speed`n (1% per 1% Q)"
 gemQualityList["Siphoning Trap"] := " 20% increased Effect of Chill`n (1% per 1% Q)"
 gemQualityList["Slower Projectiles Support"] := " 10% increased Projectile Damage`n (0.5% per 1% Q)"
+gemQualityList["Smite"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Smoke Mine"] := " 20% increased Area of Effect`n (1% per 1% Q)"
 gemQualityList["Spark"] := " 20% increased Projectile Speed`n (1% per 1% Q)"
 gemQualityList["Spectral Shield Throw"] := " 20% increased Projectile Damage`n (1% per 1% Q)"
@@ -248,13 +259,15 @@ gemQualityList["Spell Echo Support"] := " 10% increased Spell Damage`n (0.5% per
 gemQualityList["Spell Totem Support"] := " 20% increased Totem Placement speed`n (1% per 1% Q)"
 gemQualityList["Spirit Offering"] := " 10% increased Skill Effect Duration`n (0.5% per 1% Q)"
 gemQualityList["Split Arrow"] := " 10% increased Attack Speed`n (0.5% per 1% Q)"
-gemQualityList["Static Strike"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
+gemQualityList["Static Strike"] := " 20% chance to Shock enemies`n (1% per 1% Q)"
 gemQualityList["Storm Barrier Support"] := " 20% chance to Gain a Power Charge when hit while Channelling Supported Skills`n (1% per 1% Q)"
+gemQualityList["Storm Brand"] := " 10% increased Cast Speed`n (0.5% per 1% Q)"
 gemQualityList["Storm Burst"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Storm Call"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Stun Support"] := " 30% increased Stun Duration on Enemies`n (1.5% per 1% Q)"
 gemQualityList["Summon Chaos Golem"] := " 20% increased Minion Maximum Life`n 20% increased Minion Damage`n (1% per 1% Q)"
 gemQualityList["Summon Flame Golem"] := " 20% increased Minion Maximum Life`n 20% increased Minion Damage`n (1% per 1% Q)"
+gemQualityList["Summon Holy Relic"] := " Minions have 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Summon Ice Golem"] := " 20% increased Minion Maximum Life`n 20% increased Minion Damage`n (1% per 1% Q)"
 gemQualityList["Summon Lightning Golem"] := " 20% increased Minion Maximum Life`n 20% increased Minion Damage`n (1% per 1% Q)"
 gemQualityList["Summon Phantasm on Kill Support"] := " 10% chance to Summon a Phantasm when Supported Skills,`n  or Non-Phantasm Minions from Supported Skills, deal a Killing Blow`n (0.5% per 1% Q)"
@@ -266,12 +279,14 @@ gemQualityList["Sweep"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Swift Affliction Support"] := " 10% increased Damage over Time`n (0.5% per 1% Q)"
 gemQualityList["Tectonic Slam"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Tempest Shield"] := " 20% increased Lightning Damage`n (1% per 1% Q)"
-gemQualityList["Temporal Chains"] := " Cursed enemies are 10% slower`n (0.5% per 1% Q)"
+gemQualityList["Temporal Chains"] := " Cursed Enemies have 10% less Action Speed`n (0.5% per 1% Q)"
 gemQualityList["Tornado Shot"] := " 20% increased Projectile Damage`n (1% per 1% Q)"
+gemQualityList["Toxic Rain"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Trap and Mine Damage Support"] := " 10% increased Damage`n (0.5% per 1% Q)"
 gemQualityList["Trap Support"] := " 10% increased Trap Throwing Speed`n (0.5% per 1% Q)"
 gemQualityList["Unbound Ailments Support"] := " 10% increased Duration of Ailments on Enemies`n (0.5% per 1% Q)"
 gemQualityList["Unearth"] := " 10% increased Cast Speed`n (0.5% per 1% Q)"
+gemQualityList["Vaal Ancestral Warchief"] := " 20% increased Totem Damage`n (1% per 1% Q)"
 gemQualityList["Vaal Arc"] := " 30% increased Shock Duration on enemies`n (1.5% per 1% Q)"
 gemQualityList["Vaal Blade Vortex"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Vaal Blight"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
@@ -308,6 +323,7 @@ gemQualityList["Vaal Spectral Throw"] := " 10% increased Attack Speed`n (0.5% pe
 gemQualityList["Vaal Storm Call"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Vaal Summon Skeletons"] := " Minions deal 20% increased Damage`n (1% per 1% Q)"
 gemQualityList["Vengeance"] := " 10% chance to Trigger this Skill when Hit`n (0.5% per 1% Q)"
+gemQualityList["Vicious Projectiles Support"] := " 10% increased Physical Damage`n (0.5% per 1% Q)"
 gemQualityList["Vigilant Strike"] := " 20% increased Fortify duration`n (1% per 1% Q)"
 gemQualityList["Vile Toxins Support"] := " 20% increased Damage with Poison`n (1% per 1% Q)"
 gemQualityList["Viper Strike"] := " 10% increased Attack Speed`n (0.5% per 1% Q)"
@@ -317,8 +333,11 @@ gemQualityList["Volatile Dead"] := " 10% increased Area of Effect`n (0.5% per 1%
 gemQualityList["Volley Support"] := " 20% increased Projectile Damage`n (1% per 1% Q)"
 gemQualityList["Vortex"] := " 10% increased Area of Effect`n (0.5% per 1% Q)"
 gemQualityList["Vulnerability"] := " Cursed Enemies have 10% chance to Bleed when Hit by Attacks`n (0.5% per 1% Q)"
+gemQualityList["War Banner"] := " 10% increased effect of Aura`n (0.5% per 1% Q)"
 gemQualityList["Warlord's Mark"] := " Cursed enemies have a 10% chance to grant an Endurance Charge when slain`n (0.5% per 1% Q)"
 gemQualityList["Whirling Blades"] := " 10% increased Attack Speed`n (0.5% per 1% Q)"
 gemQualityList["Wild Strike"] := " 20% increased Elemental Damage`n (1% per 1% Q)"
+gemQualityList["Winter Orb"] := " 10% increased Cast Speed`n (0.5% per 1% Q)"
 gemQualityList["Wither"] := " 20% increased Skill Effect Duration`n (1% per 1% Q)"
+gemQualityList["Withering Touch Support"] := " 10% increased Chaos Damage`n (0.5% per 1% Q)"
 gemQualityList["Wrath"] := " 20% increased Area of Effect`n (1% per 1% Q)"

data/GemQualityList.txt

@@ -1 +1,4 @@
-44|3-6
+1|4-5
+1|5-6
+1|6-7
+1|7-8