From 3f0c7218aab47f7e699139a9bd80491f879b3dd0 Mon Sep 17 00:00:00 2001 From: wofsauge Date: Sat, 26 Sep 2020 20:55:00 +0200 Subject: [PATCH] Added support for custom Transformation icons --- eid_data.lua | 21 ++++++++++++ eid_debugging.lua | 2 +- main.lua | 35 +++++++++++-------- resources/gfx/EID_Icons.png | Bin 29775 -> 28353 bytes resources/gfx/icons.anm2 | 66 ++++++++++++++++++++++++++++-------- 5 files changed, 94 insertions(+), 30 deletions(-) diff --git a/eid_data.lua b/eid_data.lua index a0354931..d7cbcab9 100644 --- a/eid_data.lua +++ b/eid_data.lua @@ -83,3 +83,24 @@ EID.InlineIcons = { ["RoomLBottomLeft"] = {"roomshape", 10, 10, 10}, ["RoomLBottomRight"] = {"roomshape", 11, 10, 10} } + +-- List of TransformationIcons based on their Name +--Format: [Ingame Name] = {Animationname, Width, Height, LeftOffset [Default: 0], TopOffset [Default: -3], IconSpriteObj (Optional)} +EID.TransformationIcons = { + ["Custom"] = {"TransformationCustom",11,16}, + ["Guppy"] = {"Transformation1",12,16}, + ["Fun Guy"] = {"Transformation2",13,16}, + ["Lord of the Flies"] = {"Transformation3",14,16}, + ["Conjoined"] = {"Transformation4",18,16}, + ["Spun"] = {"Transformation5",8,16}, + ["Mom"] = {"Transformation6",7,16}, + ["Oh crap"] = {"Transformation7",15,16}, + ["Bob"] ={"Transformation8",14,16}, + ["Leviathan"] = {"Transformation9",13,16}, + ["Seraphim"] = {"Transformation10",21,16}, + ["Super Bum"] = {"Transformation11",15,16}, + ["Bookworm"] = {"Transformation12",11,16}, + ["Spider Baby"] = {"Transformation13",13,16,0}, + ["Adult"] = {"Transformation14",0,16}, + ["Stompy"] = {"Transformation15",0,16}, +} \ No newline at end of file diff --git a/eid_debugging.lua b/eid_debugging.lua index f37eb5f9..9bc3190a 100644 --- a/eid_debugging.lua +++ b/eid_debugging.lua @@ -21,7 +21,7 @@ local charsToDebug = { } -- Legacy Overriding descriptions -__eidItemDescriptions[1] = "\1 Overriden" -- 5.100.1 = Sad Onion +__eidItemDescriptions[1] = "\1 Overriden description" -- 5.100.1 = Sad Onion __eidTrinketDescriptions[1] = "\2 Overriden " -- 5.350.1 = swallowed penny __eidCardDescriptions[1] = "Overriden Card description" -- 5.300.1 = the fool __eidPillDescriptions[1] = "Test" -- Doesnt seem to work diff --git a/main.lua b/main.lua index 54dfc976..6d8412af 100644 --- a/main.lua +++ b/main.lua @@ -127,25 +127,32 @@ function printDescription(desc) --Display Transformation if not (desc[2] == "0" or desc[2] == "" or desc[2] == nil) then + local transformationName = EID:getTransformationName(desc[2]) + local transformSprite = EID.TransformationIcons[transformationName] + if transformSprite == nil then + transformSprite = EID.TransformationIcons["Custom"] + end + local iconOffsetX = transformSprite[4] or 0 + local iconOffsetY = transformSprite[5] or -3 + if EIDConfig["TransformationIcons"] then + local iconSprite = transformSprite[6] or IconSprite + iconSprite:Play(transformSprite[1]) + iconSprite.Scale = Vector(EIDConfig["Scale"], EIDConfig["Scale"]) + iconSprite:Render( + Vector(EIDConfig["XPosition"] + iconOffsetX * EIDConfig["Scale"], padding + iconOffsetY * EIDConfig["Scale"]), + Vector(0, 0), + Vector(0, 0) + ) + end if EIDConfig["TransformationText"] then EID:renderString( - EID:getTransformationName(desc[2]), - Vector(EIDConfig["XPosition"] + 16 * EIDConfig["Scale"], padding - 1), + transformationName, + Vector(EIDConfig["XPosition"] + (transformSprite[2]+iconOffsetX +3) * EIDConfig["Scale"], padding - 1), Vector(EIDConfig["Scale"], EIDConfig["Scale"]), EID:getTransformationColor(), false ) end - if EIDConfig["TransformationIcons"] and EID:isVanillaTransformationID(desc[2]) then - IconSprite:Play("Transformation" .. desc[2]) - IconSprite.Scale = Vector(EIDConfig["Scale"], EIDConfig["Scale"]) - IconSprite:Update() - IconSprite:Render( - Vector(EIDConfig["XPosition"] + 5 * EIDConfig["Scale"], padding + 5 * EIDConfig["Scale"]), - Vector(0, 0), - Vector(0, 0) - ) - end if (EIDConfig["TransformationIcons"] or EIDConfig["TransformationText"]) then padding = padding + lineHeight * EIDConfig["Scale"] end @@ -201,7 +208,7 @@ function printBulletPoints(description, padding) local textColor = EID:getTextColor() for i, lineToPrint in ipairs(formatedLines) do -- render bulletpoint - local posX = EIDConfig["XPosition"] + local posX = EIDConfig["XPosition"] if i == 1 then local bpIcon = EID:handleBulletpointIcon(lineToPrint) if EID:getIcon(bpIcon) ~= nil then @@ -212,7 +219,7 @@ function printBulletPoints(description, padding) end EID:renderString( lineToPrint, - Vector(posX + 12, padding), + Vector(posX + 12 * EIDConfig["Scale"], padding), Vector(EIDConfig["Scale"], EIDConfig["Scale"]), textColor, false diff --git a/resources/gfx/EID_Icons.png b/resources/gfx/EID_Icons.png index bc5f157465e912e1531fe8594e1773b956126477..cd4ce9b97e9ca99838be8cc8f588bb26041f4307 100644 GIT binary patch delta 4283 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 delta 5716 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 - + - + @@ -41,7 +41,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -377,5 +377,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +