diff --git a/CHANGELOG.md b/CHANGELOG.md index a294d124..70146979 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 1.4.82 - 2018/03/03 + * Fixed a few odd UI glitches when using Summon Phantasm on Kill with an active skill that has multiple parts + * A side effect is that the sidebar stat box now expands upwards to fill any empty space below the main skill selector + ### 1.4.81 - 2018/03/02 * Added the 3 new skill gems introduced in 3.2 * Summoned Phantasms are not fully supported, as their projectile spell cannot be added yet diff --git a/Classes/CalcsTab.lua b/Classes/CalcsTab.lua index 210e6848..7526cc08 100644 --- a/Classes/CalcsTab.lua +++ b/Classes/CalcsTab.lua @@ -60,7 +60,7 @@ local CalcsTabClass = common.NewClass("CalcsTab", "UndoHandler", "ControlHost", self.build.buildFlag = true end) }, }, - { label = "Skill Part", flag = "multiPart", { controlName = "mainSkillPart", + { label = "Skill Part", playerFlag = "multiPart", { controlName = "mainSkillPart", control = common.New("DropDownControl", nil, 0, 0, 130, 16, nil, function(index, value) local mainSocketGroup = self.build.skillsTab.socketGroupList[self.input.skill_number] local srcGem = mainSocketGroup.displaySkillListCalcs[mainSocketGroup.mainActiveSkillCalcs].activeGem.srcGem @@ -354,6 +354,9 @@ function CalcsTabClass:CheckFlag(obj) end end end + if obj.playerFlag and not self.calcsEnv.player.mainSkill.skillFlags[obj.playerFlag] then + return + end if obj.notFlag and skillFlags[obj.notFlag] then return end diff --git a/Modules/Build.lua b/Modules/Build.lua index 0e7411ca..0c67ee6d 100644 --- a/Modules/Build.lua +++ b/Modules/Build.lua @@ -428,14 +428,14 @@ function buildMode:Init(dbFileName, buildName, buildXML, targetVersion) self.modFlag = true self.buildFlag = true end) - self.controls.mainSkillPart = common.New("DropDownControl", {"TOPLEFT",self.controls.mainSocketGroup,"BOTTOMLEFT"}, 0, 20, 150, 18, nil, function(index, value) + self.controls.mainSkillPart = common.New("DropDownControl", {"TOPLEFT",self.controls.mainSkill,"BOTTOMLEFT",true}, 0, 2, 150, 18, nil, function(index, value) local mainSocketGroup = self.skillsTab.socketGroupList[self.mainSocketGroup] local srcGem = mainSocketGroup.displaySkillList[mainSocketGroup.mainActiveSkill].activeGem.srcGem srcGem.skillPart = index self.modFlag = true self.buildFlag = true end) - self.controls.mainSkillMinion = common.New("DropDownControl", {"TOPLEFT",self.controls.mainSocketGroup,"BOTTOMLEFT"}, 0, 20, 178, 18, nil, function(index, value) + self.controls.mainSkillMinion = common.New("DropDownControl", {"TOPLEFT",self.controls.mainSkillPart,"BOTTOMLEFT",true}, 0, 2, 178, 18, nil, function(index, value) local mainSocketGroup = self.skillsTab.socketGroupList[self.mainSocketGroup] local srcGem = mainSocketGroup.displaySkillList[mainSocketGroup.mainActiveSkill].activeGem.srcGem if value.itemSetId then @@ -467,14 +467,15 @@ function buildMode:Init(dbFileName, buildName, buildXML, targetVersion) self.controls.mainSkillMinionLibrary = common.New("ButtonControl", {"LEFT",self.controls.mainSkillMinion,"RIGHT"}, 2, 0, 120, 18, "Manage Spectres...", function() self:OpenSpectreLibrary() end) - self.controls.mainSkillMinionSkill = common.New("DropDownControl", {"TOPLEFT",self.controls.mainSkillMinion,"BOTTOMLEFT"}, 0, 2, 200, 16, nil, function(index, value) + self.controls.mainSkillMinionSkill = common.New("DropDownControl", {"TOPLEFT",self.controls.mainSkillMinion,"BOTTOMLEFT",true}, 0, 2, 200, 16, nil, function(index, value) local mainSocketGroup = self.skillsTab.socketGroupList[self.mainSocketGroup] local srcGem = mainSocketGroup.displaySkillList[mainSocketGroup.mainActiveSkill].activeGem.srcGem srcGem.skillMinionSkill = index self.modFlag = true self.buildFlag = true end) - self.controls.statBox = common.New("TextListControl", {"TOPLEFT",self.controls.mainSocketGroup,"BOTTOMLEFT"}, 0, 62, 300, 0, {{x=170,align="RIGHT_X"},{x=174,align="LEFT"}}) + self.controls.statBoxAnchor = common.New("Control", {"TOPLEFT",self.controls.mainSkillMinionSkill,"BOTTOMLEFT",true}, 0, 2, 0, 0) + self.controls.statBox = common.New("TextListControl", {"TOPLEFT",self.controls.statBoxAnchor,"BOTTOMLEFT"}, 0, 2, 300, 0, {{x=170,align="RIGHT_X"},{x=174,align="LEFT"}}) self.controls.statBox.height = function(control) local x, y = control:GetPos() return main.screenH - main.mainBarHeight - 4 - y @@ -959,7 +960,8 @@ function buildMode:RefreshSkillSelectControls(controls, mainGroup, suffix) t_insert(controls.mainSkillPart.list, { val = i, label = part.name }) end controls.mainSkillPart.selIndex = activeGem.srcGem["skillPart"..suffix] or 1 - elseif not activeSkill.skillFlags.disable and (activeGem.grantedEffect.minionList or activeSkill.minionList[1]) then + end + if not activeSkill.skillFlags.disable and (activeGem.grantedEffect.minionList or activeSkill.minionList[1]) then wipeTable(controls.mainSkillMinion.list) if activeGem.grantedEffect.minionHasItemSet then for _, itemSetId in ipairs(self.itemsTab.itemSetOrderList) do diff --git a/changelog.txt b/changelog.txt index 8003f36a..c1e82d65 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +VERSION[1.4.82][2018/03/03] + * Fixed a few odd UI glitches when using Summon Phantasm on Kill with an active skill that has multiple parts + * A side effect is that the sidebar stat box now expands upwards to fill any empty space below the main skill selector VERSION[1.4.81][2018/03/02] * Added the 3 new skill gems introduced in 3.2 * Summoned Phantasms are not fully supported, as their projectile spell cannot be added yet diff --git a/manifest.xml b/manifest.xml index c7f5288c..887e8be4 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,18 +1,18 @@ - + - + - + @@ -52,7 +52,7 @@ - +