diff --git a/Data/Gems/act_dex.lua b/Data/Gems/act_dex.lua index afc49dad..f4d73b62 100644 --- a/Data/Gems/act_dex.lua +++ b/Data/Gems/act_dex.lua @@ -1,6 +1,6 @@ -- Path of Building -- --- Active Strength skills +-- Active Dexterity gems -- Skill gem data (c) Grinding Gear Games -- local gems, mod, flag, skill = ... diff --git a/Data/Gems/act_int.lua b/Data/Gems/act_int.lua index d02bb690..731efc21 100644 --- a/Data/Gems/act_int.lua +++ b/Data/Gems/act_int.lua @@ -1,6 +1,6 @@ -- Path of Building -- --- Active Strength skills +-- Active Intelligence gems -- Skill gem data (c) Grinding Gear Games -- local gems, mod, flag, skill = ... diff --git a/Data/Gems/act_str.lua b/Data/Gems/act_str.lua index de862f11..2ec8cc26 100644 --- a/Data/Gems/act_str.lua +++ b/Data/Gems/act_str.lua @@ -1,6 +1,6 @@ -- Path of Building -- --- Active Strength skills +-- Active Strength gems -- Skill gem data (c) Grinding Gear Games -- local gems, mod, flag, skill = ... diff --git a/Data/Gems/other.lua b/Data/Gems/other.lua index 11558486..abfc46ec 100644 --- a/Data/Gems/other.lua +++ b/Data/Gems/other.lua @@ -1,6 +1,6 @@ -- Path of Building -- --- Active Strength skills +-- Other active skills -- Skill gem data (c) Grinding Gear Games -- local gems, mod, flag, skill = ... diff --git a/Data/Gems/sup_dex.lua b/Data/Gems/sup_dex.lua index fcfa81e9..b47d3d83 100644 --- a/Data/Gems/sup_dex.lua +++ b/Data/Gems/sup_dex.lua @@ -1,6 +1,6 @@ -- Path of Building -- --- Active Strength skills +-- Dexterity support gems -- Skill gem data (c) Grinding Gear Games -- local gems, mod, flag, skill = ... diff --git a/Data/Gems/sup_int.lua b/Data/Gems/sup_int.lua index c4e829db..5284ed88 100644 --- a/Data/Gems/sup_int.lua +++ b/Data/Gems/sup_int.lua @@ -1,6 +1,6 @@ -- Path of Building -- --- Active Strength skills +-- Intelligence support gems -- Skill gem data (c) Grinding Gear Games -- local gems, mod, flag, skill = ... diff --git a/Data/Gems/sup_str.lua b/Data/Gems/sup_str.lua index a1d2e0b7..2f1da166 100644 --- a/Data/Gems/sup_str.lua +++ b/Data/Gems/sup_str.lua @@ -1,6 +1,6 @@ -- Path of Building -- --- Active Strength skills +-- Strength support gems -- Skill gem data (c) Grinding Gear Games -- local gems, mod, flag, skill = ... diff --git a/Launch.lua b/Launch.lua index 5a1dcb45..0d6b2983 100644 --- a/Launch.lua +++ b/Launch.lua @@ -19,12 +19,12 @@ function launch:OnInit() self.versionPlatform = "?" self.lastUpdateCheck = GetTime() ConPrintf("Loading main script...") - local mainFile = io.open("Modules/Main.lua") - if mainFile then - mainFile:close() + local changeLogFile = io.open("changelog.txt") + if changeLogFile then + changeLogFile:close() else - -- Main module isn't present, this must be a fresh installation - -- Perform an immediate update to download the remaining files + -- Changelog isn't present, this must be a fresh installation + -- Perform an immediate update to download the latest version ConClear() ConPrintf("Please wait while we complete installation...\n") local updateMode = LoadModule("UpdateCheck") diff --git a/LaunchInstall.lua b/LaunchInstall.lua index a03ffd60..9c8679c2 100644 --- a/LaunchInstall.lua +++ b/LaunchInstall.lua @@ -10,6 +10,9 @@ local basicFiles = { "Launch.lua", "UpdateCheck.lua", "UpdateApply.lua" } local xml = require("xml") local curl = require("lcurl") +ConClear() +ConPrintf("Preparing to finalise installation...\n") + local localBranch, localSource local localManXML = xml.LoadXMLFile("manifest.xml") if localManXML and localManXML[1].elem == "PoBVersion" then diff --git a/Modules/Build.lua b/Modules/Build.lua index eb06cfe1..a37716b7 100644 --- a/Modules/Build.lua +++ b/Modules/Build.lua @@ -344,6 +344,8 @@ function buildMode:OnFrame(inputEvents) self.viewMode = "ITEMS" elseif event.key == "4" then self.viewMode = "CALCS" + elseif event.key == "5" then + self.viewMode = "CONFIG" end end end @@ -540,7 +542,7 @@ function buildMode:AddStatComparesToTooltip(baseOutput, compareOutput, header) main:AddTooltipLine(14, header) end local line = string.format("%s%+"..statData.fmt.." %s", diff > 0 and data.colorCodes.POSITIVE or data.colorCodes.NEGATIVE, diff * (statData.pc and 100 or 1), statData.label) - if statData.compPercent then + if statData.compPercent and (baseOutput[statData.mod] or 0) ~= 0 and (compareOutput[statData.mod] or 0) ~= 0 then line = line .. string.format(" (%+.1f%%)", (compareOutput[statData.mod] or 0) / (baseOutput[statData.mod] or 0) * 100 - 100) end main:AddTooltipLine(14, line) diff --git a/manifest.xml b/manifest.xml index 9826216f..083c7577 100644 --- a/manifest.xml +++ b/manifest.xml @@ -4,7 +4,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -53,13 +53,13 @@ - - - - - - - + + + + + + +