From e5f0b3c33e9f845e7c8014d1c72774a87c9664c3 Mon Sep 17 00:00:00 2001 From: Wofsauge Date: Sat, 19 Mar 2022 02:50:55 +0100 Subject: [PATCH] Added Config option to toggle Transformation progress --- eid_api.lua | 3 +++ eid_config.lua | 4 ++++ main.lua | 3 ++- mod_config_menu.lua | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/eid_api.lua b/eid_api.lua index 3d0ff177..6e8dfee1 100644 --- a/eid_api.lua +++ b/eid_api.lua @@ -1435,6 +1435,9 @@ function EID:evaluateTransformationProgress(transformation) EID.TransformationProgress[i] = {} EID.TransformationProgress[i][transformation] = 0 local transformData = EID.TransformationData[transformation] + + if not EID.TransformationLookup[transformation] then return end + if transformData and transformData.VanillaForm and player:HasPlayerForm(transformData.VanillaForm) then EID.TransformationProgress[i][transformation] = transformData.NumNeeded or 3 else diff --git a/eid_config.lua b/eid_config.lua index 86ab6df6..8cbbbcb5 100644 --- a/eid_config.lua +++ b/eid_config.lua @@ -177,6 +177,9 @@ EID.UserConfig = { -- Toggle display of transformation icons -- Default = true ["TransformationIcons"] = true, + -- Toggle display of transformation progress + -- Default = true + ["TransformationProgress"] = true, -- Set the color of the Transformation description text -- Color names are defined in "eid_data.lua" (line 300) -- Default = "ColorEIDTransform" @@ -442,6 +445,7 @@ EID.DefaultConfig = { ["ShowObjectID"] = false, ["TransformationText"] = true, ["TransformationIcons"] = true, + ["TransformationProgress"] = true, ["TransformationColor"] = "ColorEIDTransform", ["DisplayCardInfo"] = true, ["DisplayCardInfoShop"] = false, diff --git a/main.lua b/main.lua index 7b558768..4b55e600 100644 --- a/main.lua +++ b/main.lua @@ -663,11 +663,12 @@ function EID:printDescription(desc, cachedID) if EID.Config["TransformationText"] then local transformationName = EID:getTransformationName(transform) if true then + if EID.Config["TransformationProgress"] then -- TODO: call evaluate only when ItemQueue of player changes to save performance EID:evaluateTransformationProgress(transform) local numCollected = EID.TransformationProgress[EID:getPlayerID(EID.player)][transform] local numMax = EID.TransformationData[transform] and EID.TransformationData[transform].NumNeeded or 3 - transformationName = transformationName.." ("..numCollected.."/"..numMax..")" + transformationName = transformationName.."("..numCollected.."/"..numMax..")" end local iconWidth = transformSprite[3] or -1 local iconHeight = transformSprite[4] or -1 diff --git a/mod_config_menu.lua b/mod_config_menu.lua index 8ccabded..ad77be3e 100644 --- a/mod_config_menu.lua +++ b/mod_config_menu.lua @@ -525,6 +525,7 @@ if MCMLoaded then EID:AddBooleanSetting("Visuals", "ShowItemIcon", "Display Item Icon") EID:AddBooleanSetting("Visuals", "TransformationText", "Display Transformation Name") EID:AddBooleanSetting("Visuals", "TransformationIcons", "Display Transformation Icon") + EID:AddBooleanSetting("Visuals", "TransformationProgress", "Display Transformation Progress") EID:AddBooleanSetting("Visuals", "ShowQuality", "Display Quality Info", {repOnly = true}) EID:AddBooleanSetting("Visuals", "ShowObjectID", "Display Object ID")