Skip to content

Commit d91f4fe

Browse files
Wires77LocalIdentity
Wires77
and
LocalIdentity
authored
Remove or disable UI that doesn't work yet (#157)
* Remove or disable UI that doesn't work yet * Add small explanation why importing is disabled * Change wording on import warning * Update description * Fix spelling issues --------- Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent 7405021 commit d91f4fe

File tree

6 files changed

+31
-23
lines changed

6 files changed

+31
-23
lines changed

‎src/Classes/ImportTab.lua

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,18 @@ local ImportTabClass = newClass("ImportTab", "ControlHost", "Control", function(
2424
self.build = build
2525

2626
self.charImportMode = "GETACCOUNTNAME"
27-
self.charImportStatus = "Idle"
27+
self.charImportStatus = colorCodes.WARNING.."Not yet Enabled by GGG\n^7We are waiting on GGG to create the API to let us import characters from in-game"
2828
self.controls.sectionCharImport = new("SectionControl", {"TOPLEFT",self,"TOPLEFT"}, {10, 18, 650, 250}, "Character Import")
2929
self.controls.charImportStatusLabel = new("LabelControl", {"TOPLEFT",self.controls.sectionCharImport,"TOPLEFT"}, {6, 14, 200, 16}, function()
3030
return "^7Character import status: "..self.charImportStatus
3131
end)
32+
33+
self.controls.characterImportAnchor = new("Control", {"TOPLEFT",self.controls.sectionCharImport,"TOPLEFT"}, {6, 40, 200, 16})
34+
self.controls.characterImportAnchor.shown = false
35+
self.controls.sectionCharImport.height = function() return self.controls.characterImportAnchor.shown and 650 or 60 end
3236

3337
-- Stage: input account name
34-
self.controls.accountNameHeader = new("LabelControl", {"TOPLEFT",self.controls.sectionCharImport,"TOPLEFT"}, {6, 40, 200, 16}, "^7To start importing a character, enter the character's account name:")
38+
self.controls.accountNameHeader = new("LabelControl", {"TOPLEFT",self.controls.characterImportAnchor,"TOPLEFT"}, {0, 0, 200, 16}, "^7To start importing a character, enter the character's account name:")
3539
self.controls.accountNameHeader.shown = function()
3640
return self.charImportMode == "GETACCOUNTNAME"
3741
end
@@ -180,7 +184,7 @@ You can get this from your web browser's cookies while logged into the Path of E
180184
end)
181185

182186
-- Build import/export
183-
self.controls.sectionBuild = new("SectionControl", {"TOPLEFT",self.controls.sectionCharImport,"BOTTOMLEFT"}, {0, 18, 650, 182}, "Build Sharing")
187+
self.controls.sectionBuild = new("SectionControl", {"TOPLEFT",self.controls.sectionCharImport,"BOTTOMLEFT",true}, {0, 18, 650, 182}, "Build Sharing")
184188
self.controls.generateCodeLabel = new("LabelControl", {"TOPLEFT",self.controls.sectionBuild,"TOPLEFT"}, {6, 14, 0, 16}, "^7Generate a code to share this build with other Path of Building users:")
185189
self.controls.generateCode = new("ButtonControl", {"LEFT",self.controls.generateCodeLabel,"RIGHT"}, {4, 0, 80, 20}, "Generate", function()
186190
self.controls.generateCodeOut:SetText(common.base64.encode(Deflate(self.build:SaveDB("code"))):gsub("+","-"):gsub("/","_"))

‎src/Classes/Item.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ function ItemClass:NormaliseQuality()
891891
if self.base and self.base.quality then
892892
if not self.quality then
893893
self.quality = 0
894-
elseif not self.uniqueID and not self.corrupted and not self.mirrored and not (self.base.type == "Charm") and self.quality < self.base.quality then -- charms cannot be modifed by quality currency.
894+
elseif not self.uniqueID and not self.corrupted and not self.mirrored and not (self.base.type == "Charm") and self.quality < self.base.quality then -- charms cannot be modified by quality currency.
895895
self.quality = self.base.quality
896896
end
897897
end

‎src/Classes/ItemsTab.lua

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,10 @@ local ItemsTabClass = newClass("ItemsTab", "UndoHandler", "ControlHost", "Contro
215215

216216
-- Database selector
217217
self.controls.selectDBLabel = new("LabelControl", {"TOPLEFT",self.controls.itemList,"BOTTOMLEFT"}, {0, 14, 0, 16}, "^7Import from:")
218-
self.controls.selectDBLabel.shown = function()
219-
return self.height < 980
220-
end
218+
self.controls.selectDBLabel.shown = false
219+
--function()
220+
-- return self.height < 980
221+
--end
221222
self.controls.selectDB = new("DropDownControl", {"LEFT",self.controls.selectDBLabel,"RIGHT"}, {4, 0, 150, 18}, { "Uniques", "Rare Templates" })
222223

223224
-- Unique database
@@ -234,9 +235,10 @@ local ItemsTabClass = newClass("ItemsTab", "UndoHandler", "ControlHost", "Contro
234235
self.controls.rareDB.y = function()
235236
return self.controls.selectDBLabel:IsShown() and 78 or 396
236237
end
237-
self.controls.rareDB.shown = function()
238-
return not self.controls.selectDBLabel:IsShown() or self.controls.selectDB.selIndex == 2
239-
end
238+
self.controls.rareDB.shown = false
239+
--function()
240+
-- return not self.controls.selectDBLabel:IsShown() or self.controls.selectDB.selIndex == 2
241+
--end
240242
-- Create/import item
241243
self.controls.craftDisplayItem = new("ButtonControl", {"TOPLEFT",main.portraitMode and self.controls.setManage or self.controls.itemList,"TOPRIGHT"}, {20, main.portraitMode and 0 or -20, 120, 20}, "Craft item...", function()
242244
self:CraftItem()
@@ -807,15 +809,15 @@ holding Shift will put it in the second.]])
807809
t_insert(self.controls.uniqueDB.dragTargetList, self.controls.itemList)
808810
t_insert(self.controls.uniqueDB.dragTargetList, self.controls.sharedItemList)
809811
t_insert(self.controls.uniqueDB.dragTargetList, build.controls.mainSkillMinion)
810-
t_insert(self.controls.rareDB.dragTargetList, self.controls.itemList)
811-
t_insert(self.controls.rareDB.dragTargetList, self.controls.sharedItemList)
812-
t_insert(self.controls.rareDB.dragTargetList, build.controls.mainSkillMinion)
812+
--t_insert(self.controls.rareDB.dragTargetList, self.controls.itemList)
813+
--t_insert(self.controls.rareDB.dragTargetList, self.controls.sharedItemList)
814+
--t_insert(self.controls.rareDB.dragTargetList, build.controls.mainSkillMinion)
813815
t_insert(self.controls.sharedItemList.dragTargetList, self.controls.itemList)
814816
t_insert(self.controls.sharedItemList.dragTargetList, build.controls.mainSkillMinion)
815817
for _, slot in pairs(self.slots) do
816818
t_insert(self.controls.itemList.dragTargetList, slot)
817819
t_insert(self.controls.uniqueDB.dragTargetList, slot)
818-
t_insert(self.controls.rareDB.dragTargetList, slot)
820+
--t_insert(self.controls.rareDB.dragTargetList, slot)
819821
t_insert(self.controls.sharedItemList.dragTargetList, slot)
820822
end
821823

@@ -2348,7 +2350,7 @@ function ItemsTabClass:CorruptDisplayItem() -- todo implement vaal orb new outco
23482350
for i = 1, 8 do
23492351
if i == 1 then
23502352
controls.enchant1Label = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {95, 55, 0, 16}, function()
2351-
if enchantNum == 1 then -- update label so reduant 1 doesn't appear in case of 1 enchant.
2353+
if enchantNum == 1 then -- update label so 1 doesn't appear in case of 1 enchant.
23522354
return "^7Enchant:"
23532355
else
23542356
return "^7Enchant #1:"

‎src/Classes/ModStore.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ function ModStoreClass:GetStat(stat, cfg)
238238
local totalMana = self.actor.output["Mana"]
239239
if totalMana == 0 then return 0 else
240240
for _, activeSkill in ipairs(self.actor.activeSkillList) do
241-
-- currently only checks main statset for skill flags. rework if required
241+
-- currently only checks main statSet for skill flags. rework if required
242242
if (activeSkill.skillTypes[SkillType.Aura] and not activeSkill.activeEffect.statSet.skillFlags.disable and activeSkill.buffList and activeSkill.buffList[1] and activeSkill.buffList[1].name == cfg.skillName) then
243243
local manaBase = activeSkill.skillData["ManaReservedBase"] or 0
244244
reservedPercentMana = manaBase / totalMana * 100

‎src/Classes/PassiveTree.lua

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -325,38 +325,38 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
325325

326326
if not other then
327327
ConPrintf("missing node "..otherId)
328-
goto endconnection
328+
goto endConnection
329329
end
330330

331331
if node.type == "OnlyImage" or other.type == "OnlyImage" then
332-
goto endconnection
332+
goto endConnection
333333
end
334334

335335
if node.ascendancyName ~= other.ascendancyName then
336-
goto endconnection
336+
goto endConnection
337337
end
338338

339339
if node.id == otherId then
340-
goto endconnection
340+
goto endConnection
341341
end
342342

343343
t_insert(other.linkedId, node.id)
344344
t_insert(node.linkedId, otherId)
345345

346346
if node.classesStart ~= nil or other.classesStart ~= nil then
347-
goto endconnection
347+
goto endConnection
348348
end
349349

350350
local connectors = self:BuildConnector(node, other, connection)
351351

352352
if not connectors then
353-
goto endconnection
353+
goto endConnection
354354
end
355355
t_insert(self.connectors, connectors[1])
356356
if connectors[2] then
357357
t_insert(self.connectors, connectors[2])
358358
end
359-
:: endconnection ::
359+
:: endConnection ::
360360
end
361361
end
362362

‎src/Classes/TreeTab.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,8 @@ function TreeTabClass:OpenSpecManagePopup()
513513
new("ButtonControl", {"LEFT", importTree, "RIGHT"}, {8, 0, 90, 20}, "Export Tree", function()
514514
self:OpenExportPopup()
515515
end)
516+
importTree.enabled = false
517+
exportTree.enabled = false
516518

517519
main:OpenPopup(370, 290, "Manage Passive Trees", {
518520
new("PassiveSpecListControl", nil, {0, 50, 350, 200}, self),

0 commit comments

Comments
 (0)