diff --git a/descriptions/rep+/en_us.lua b/descriptions/rep+/en_us.lua index d60ea2e6..925e0665 100644 --- a/descriptions/rep+/en_us.lua +++ b/descriptions/rep+/en_us.lua @@ -129,6 +129,9 @@ local abyssSynergies = { EID.descriptions[languageCode].abyssSynergies = {} EID:updateDescriptionsViaTable(abyssSynergies, EID.descriptions[languageCode].abyssSynergies) +---------- Transformations ---------- +EID.descriptions[languageCode].transformations[17] = "Necromancer" -- Add Necromancer transformation + -- If Debug enabled, add overwrite tables to the languagepack in order for the language completion script to be able to compare them if EID.enableDebug then diff --git a/descriptions/rep+/transformations.lua b/descriptions/rep+/transformations.lua index b783278e..d98eb6fe 100644 --- a/descriptions/rep+/transformations.lua +++ b/descriptions/rep+/transformations.lua @@ -13,7 +13,8 @@ "Bookworm", -- 12 "Spider Baby", -- 13 "Adult", -- 14 -"Stompy" -- 15 +"Stompy", -- 15 +"Necromancer", -- 16 ]]-- -- Repentance transformations @@ -21,5 +22,8 @@ local transformations = { -- Collectibles ["5.100.519"] = "4", -- Lil Delirium: Conjoined + ["5.100.35"] = "12,16", -- The Necronomicon: Necromancer + ["5.100.262"] = "16", -- Missing Page 2: Necromancer + ["5.350.48"] = "16", -- A Missing Page: Necromancer } EID:updateDescriptionsViaTable(transformations, EID.EntityTransformations) diff --git a/features/eid_api.lua b/features/eid_api.lua index 242b634e..4bbf6dec 100644 --- a/features/eid_api.lua +++ b/features/eid_api.lua @@ -2458,8 +2458,10 @@ function EID:evaluateTransformationProgress(transformation) local eType, eVariant, eSubType = entityString:match("([^.]+).([^.]+).([^.]+)") if tonumber(eType) == EntityType.ENTITY_PICKUP then if tonumber(eVariant) == PickupVariant.PICKUP_COLLECTIBLE then - local currentCount = EID.TransformationProgress[id][transformation] - if activesTable[tostring(eSubType)] then + -- Rep+ Exclusive: Only count a Transformation progress for Necromancer, if you own the Necronomicon + local isNecromancer = EID.isRepentancePlus and transformation == tostring(EID.TRANSFORMATION.NECROMANCER) + + if not isNecromancer and activesTable[tostring(eSubType)] then EID.TransformationProgress[id][transformation] = EID.TransformationProgress[id][transformation] + activesTable[tostring(eSubType)] else local collCount = player:GetCollectibleNum(eSubType, true) @@ -2474,8 +2476,8 @@ function EID:evaluateTransformationProgress(transformation) end end -- In AB+, only one copy of a given collectible is counted for trans - if not EID.isRepentance and EID.TransformationProgress[id][transformation] > currentCount + 1 then - EID.TransformationProgress[id][transformation] = currentCount + 1 + if not EID.isRepentance and EID.TransformationProgress[id][transformation] > EID.TransformationProgress[id][transformation] + 1 then + EID.TransformationProgress[id][transformation] = EID.TransformationProgress[id][transformation] + 1 end elseif tonumber(eVariant) == PickupVariant.PICKUP_TRINKET and player:HasTrinket(eSubType) then EID.TransformationProgress[id][transformation] = EID.TransformationProgress[id][transformation] + player:GetTrinketMultiplier(eSubType) diff --git a/features/eid_data.lua b/features/eid_data.lua index 4983710d..66f4f79d 100644 --- a/features/eid_data.lua +++ b/features/eid_data.lua @@ -52,7 +52,8 @@ EID.TRANSFORMATION = { ["ADULT"] = 14, ["SPIDERBABY"] = 13, ["SUPERBUM"] = 11, - ["STOMPY"] = 15 + ["STOMPY"] = 15, + ["NECROMANCER"] = 16 -- added in Rep+ } -- List of item Types @@ -351,8 +352,9 @@ EID.InlineIcons = { ["SuperBum"] = {"Transformation11", 0, 16, 16, 0, -1, EID.IconSprite}, ["Bookworm"] = {"Transformation12", 0, 16, 16, 0, -1, EID.IconSprite}, ["SpiderBaby"] = {"Transformation13", 0, 16, 16, 0, -1, EID.IconSprite}, - ["Adult"] = {"Transformation14",0,16, 16, 0, -1, EID.IconSprite}, - ["Stompy"] = {"Transformation15",0,16, 16, 0, -1, EID.IconSprite}, + ["Adult"] = {"Transformation14", 0, 16, 16, 0, -1, EID.IconSprite}, + ["Stompy"] = {"Transformation15", 0, 16, 16, 0, -1, EID.IconSprite}, + ["Necromancer"] = {"Transformation16", 0, 16, 16, 0, -1, EID.IconSprite}, -- Quality ["Quality0"] = {"Quality", 0, 10, 10, 0, 0}, diff --git a/resources/gfx/eid_transform_icons.anm2 b/resources/gfx/eid_transform_icons.anm2 index 3e312250..20442619 100644 --- a/resources/gfx/eid_transform_icons.anm2 +++ b/resources/gfx/eid_transform_icons.anm2 @@ -1,5 +1,5 @@ - + @@ -194,6 +194,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -251,30 +287,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/gfx/eid_transform_icons.png b/resources/gfx/eid_transform_icons.png index 4345080f..12e9973c 100644 Binary files a/resources/gfx/eid_transform_icons.png and b/resources/gfx/eid_transform_icons.png differ