From 6ec79381131be0ab9981b1280b0b88f2208035a1 Mon Sep 17 00:00:00 2001 From: Wofsauge Date: Sun, 25 Oct 2020 21:37:38 +0100 Subject: [PATCH] Added support to display multiple transformations --- descriptions/ab+/bul.lua | 10 ++-- descriptions/ab+/en_us.lua | 12 ++--- descriptions/ab+/en_us_detailed.lua | 10 ++-- descriptions/ab+/fr.lua | 10 ++-- descriptions/ab+/pl.lua | 6 +-- descriptions/ab+/pt.lua | 10 ++-- descriptions/ab+/ru.lua | 10 ++-- descriptions/ab+/spa.lua | 10 ++-- eid_api.lua | 17 ++++--- eid_data.lua | 44 ++++++++--------- eid_debugging.lua | 4 +- main.lua | 77 +++++++++++++++-------------- 12 files changed, 112 insertions(+), 108 deletions(-) diff --git a/descriptions/ab+/bul.lua b/descriptions/ab+/bul.lua index e7d79dbd..d154e114 100644 --- a/descriptions/ab+/bul.lua +++ b/descriptions/ab+/bul.lua @@ -27,7 +27,7 @@ EID.descriptions["bul"].collectibles={ {"9", "3", "", " "}, {"10", "3", " ", "\1 2 "}, {"11", "2", "1UP!", "\1 # "}, -{"12", "2", " ", "\1 1 #\1 0.3 #\1 50% #\1 5.25 #\1 0.3 #\1 0.5 # !# ' '"}, +{"12", "2,15", " ", "\1 1 #\1 0.3 #\1 50% #\1 5.25 #\1 0.3 #\1 0.5 # !# ' '"}, {"13", "5", "", " #\2 0.1 # , "}, {"14", "5", "", "\1 0.6 #\1 5.25 #\1 0.5 "}, {"15", "0", "<3", "\1 1 # "}, @@ -48,7 +48,7 @@ EID.descriptions["bul"].collectibles={ {"30", "6", " ", "\1 5.25 #\1 0.5 "}, {"31", "6", " ", "\1 5.25 #\1 0.5 "}, {"32", "0", "", "\1 0.7 "}, -{"33", "10", "", " # # !"}, +{"33", "10,12", "", " # # !"}, {"34", "12", " ", "\1 2 #+12.5% #+50% , (Blood of the Martyr)"}, {"35", "12", "", " 40 "}, {"36", "7", "", " # "}, @@ -318,7 +318,7 @@ EID.descriptions["bul"].collectibles={ {"299", "0", "", " # "}, {"300", "0", "", "\1 0.25 # "}, {"301", "0", "", "+3 # -"}, -{"302", "14", "", " , "}, +{"302", "15", "", " , "}, {"303", "0", "", " #100% +10"}, {"304", "0", "", "+6 / / # !# "}, {"305", "0", "", " "}, @@ -777,7 +777,7 @@ EID.descriptions["bul"].pills={ {"6", "0", " ", " \2 "}, {"7", "0", "+ ", " \1 "}, {"8", "0", " ", " "}, -{"9", "0", "", " 3 "}, +{"9", "14", "", " 3 "}, {"10", "0", " ", " 1 "}, {"11", "0", " ", " \2 2 "}, {"12", "0", "+ ", " \1 2.5 "}, @@ -800,7 +800,7 @@ EID.descriptions["bul"].pills={ {"29", "0", "", " "}, {"30", "0", "", " 2 "}, {"31", "0", "???", " (Maze) "}, -{"32", "0", " ", " # # ''"}, +{"32", "15", " ", " # # ''"}, {"33", "0", " ", " # "}, {"34", "0", "!", " 1 "}, {"35", "0", "?", " 1 "}, diff --git a/descriptions/ab+/en_us.lua b/descriptions/ab+/en_us.lua index 4930ce12..6c21ac9e 100644 --- a/descriptions/ab+/en_us.lua +++ b/descriptions/ab+/en_us.lua @@ -26,7 +26,7 @@ EID.descriptions["en_us"].collectibles={{"1", "0", "", "↑ +0.7 Tears up"}, {"9", "3", "", "All fly enemies are friendly"}, {"10", "3", "", "+2 fly orbitals#Blocks enemy projectiles"}, {"11", "2", "", "↑ +1 life#Respawn with full health"}, -{"12", "2", "", "↑ +1 Health up#↑ +0.3 Damage up#↑ +50% Damage Multiplier#↑ +5.25 Range up#↑ +0.3 Speed up#↑ +0.5 Tear Height#Full health!"}, +{"12", "2,15", "", "↑ +1 Health up#↑ +0.3 Damage up#↑ +50% Damage Multiplier#↑ +5.25 Range up#↑ +0.3 Speed up#↑ +0.5 Tear Height#Full health!"}, {"13", "5", "", "Poison touch#↓ -0.1 Speed down#Enemies can drop black hearts if poisoned"}, {"14", "5", "", "↑ +0.6 Speed up#↑ +5.25 Range up#↑ +0.5 Shot Height"}, {"15", "0", "", "↑ +1 Health up#Full health"}, @@ -47,7 +47,7 @@ EID.descriptions["en_us"].collectibles={{"1", "0", "", "↑ +0.7 Tears up"}, {"30", "6", "", "↑ +5.25 Range up#↑ +0.5 Tear Height"}, {"31", "6", "", "↑ +5.25 Range up#↑ +0.5 Tear Height"}, {"32", "0", "", "↑ +0.7 Tears up"}, -{"33", "10", "", "Flight for current room#Kills Mom Foot and Moms heart instantly#! Kills YOU when used on Satan"}, +{"33", "10,12", "", "Flight for current room#Kills Mom Foot and Moms heart instantly#! Kills YOU when used on Satan"}, {"34", "12", "", "↑ +2 Damage up#↑ +12.5% devil deal chance#↑ +50% Damage Multiplier if you have Blood of the Martyr"}, {"35", "12", "", "Deal 40 damage to everything in the room"}, {"36", "7", "", "Spawns one poop#Can be placed next to a pit and destroyed to make a bridge"}, @@ -316,7 +316,7 @@ EID.descriptions["en_us"].collectibles={{"1", "0", "", "↑ +0.7 Tears up"}, {"299", "0", "", "Get faster in hostile rooms!#Invincibility when fast enough"}, {"300", "0", "", "↑ +0.25 Speed up#Touching enemies hurts them"}, {"301", "0", "", "+3 Soul hearts#Halves taken damage in room when you already got hit"}, -{"302", "0", "", "Destroy rocks when walking over them"}, +{"302", "15", "", "Destroy rocks when walking over them"}, {"303", "0", "", "Chance to get invincibility when hit#Converts negative pills into positive ones"}, {"304", "0", "", "+6 Coins / Keys / Bombs#Balances your stats!#! Every stats up afterwards will affect other stats too"}, {"305", "0", "", "Poison tears"}, @@ -774,7 +774,7 @@ EID.descriptions["en_us"].pills={ {"6", "0", "", "↓ Health down"}, {"7", "0", "", "↑ Health up"}, {"8", "0", "", "No effect"}, -{"9", "0", "", "Eating 3 will give you Adult transformation"}, +{"9", "14", "", "Eating 3 will give you Adult transformation (+1 Red Heart)"}, {"10", "0", "", "Adds 1 fly orbital"}, {"11", "0", "", "↓ -2 Range down"}, {"12", "0", "", "↑ +2.5 Range up"}, @@ -797,7 +797,7 @@ EID.descriptions["en_us"].pills={ {"29", "0", "", "Take full heart damage for current room"}, {"30", "0", "", "Spawn poop while walking for 2 seconds"}, {"31", "0", "", "Curse of the maze effect for current floor"}, -{"32", "0", "", "You grow bigger#Doesn't affect your hitbox"}, +{"32", "15", "", "You grow bigger#Doesn't affect your hitbox"}, {"33", "0", "", "You get smaller#Your hitbox gets smaller"}, {"34", "0", "", "Spawn 1 blue spider per poop in room"}, {"35", "0", "", "Spawn 1 blue spider per enemy in room#Spawns 1-3 blue spiders when no enemy is in the room"}, @@ -853,7 +853,7 @@ EID.descriptions["en_us"].transformations = { "Conjoined", -- 4 "Spun", -- 5 "Mom", -- 6 -"Oh crap", -- 7 +"Oh Crap", -- 7 "Bob", -- 8 "Leviathan", -- 9 "Seraphim", -- 10 diff --git a/descriptions/ab+/en_us_detailed.lua b/descriptions/ab+/en_us_detailed.lua index 94bfe7b8..64359d0b 100644 --- a/descriptions/ab+/en_us_detailed.lua +++ b/descriptions/ab+/en_us_detailed.lua @@ -24,7 +24,7 @@ EID.descriptions["en_us_detailed"].collectibles={ {"9", "3", "", "Transforms roughly 1/3rd of flies into Black Flies. #Removes contact damage from roughly 1/3rd of flies. #Roughly 1/3rd of flies retain their form and deal contact damage."}, {"10", "3", "", "Two 'Pretty Fly' orbitals which block shots. #Kills some fly enemies on contact."}, {"11", "2", "", "Gain an extra life. #Respawn with full heart containers. #Respawn with 1/2 soul heart if you have 0 containers. #Revival items activate in this order: #Guppy's Collar, Broken Ankh, 1up!, Lazarus' Rags, Dead Cat, Ankh, Judas' Shadow, Missing Poster."}, -{"12", "2", "", "+1 Health up.#+0.3 Damage up.#+5.25 Range up.#+0.3 Speed up.#+0.5 Tear height.#Full health.#Size increase.#1.5x Damage multiplier.#Damage multiplier does not stack with: #Cricket's Head, #Book of Belial plus Blood of the Martyr, #Other Magic Mushroom."}, +{"12", "2,15", "", "+1 Health up.#+0.3 Damage up.#+5.25 Range up.#+0.3 Speed up.#+0.5 Tear height.#Full health.#Size increase.#1.5x Damage multiplier.#Damage multiplier does not stack with: #Cricket's Head, #Book of Belial plus Blood of the Martyr, #Other Magic Mushroom."}, {"13", "5", "", "Poisons enemies on contact.#Poison deals 1x tear damage 2-3 times.#Enemies poisoned this way have a 20% chance to drop black hearts.#-0.1 Speed Down"}, {"14", "5", "", "+0.6 Speed up.#+5.25 Range up.#+0.5 Shot height."}, {"15", "0", "", "+1 Health up.#Full health."}, @@ -45,7 +45,7 @@ EID.descriptions["en_us_detailed"].collectibles={ {"30", "6", "", "+5.25 Range up.#+0.5 Tear height."}, {"31", "6", "", "+5.25 Range up.#+0.5 Tear height."}, {"32", "0", "", "+0.7 Tears up."}, -{"33", "10", "", "Grants flight until you leave the current room.#Kills Mom, Mom's Heart and It Lives instantly.#Instantly kills you when used on Satan."}, +{"33", "10,12", "", "Grants flight until you leave the current room.#Kills Mom, Mom's Heart and It Lives instantly.#Instantly kills you when used on Satan."}, {"34", "12", "", "+2 Damage up for the rest of the room on use.#+12.5% Devil deal chance if you kill the boss while holding it.#1.5x Damage multiplier if you also have Blood of the Martyr.#No damage multiplier if you have: #Magic Mushroom, #Cricket's Head."}, {"35", "12", "", "Deals 40 damage to every enemy in the room."}, {"36", "7", "", "Creates a poop when used on a tile with no other solid obstacles.#When activated, deflects nearby enemy bullets away from your character.#When placed next to a pit, can be exploded like a rock to make a bridge."}, @@ -314,7 +314,7 @@ EID.descriptions["en_us_detailed"].collectibles={ {"299", "0", "", "-0.3 Speed down. #While in hostile rooms, the player gains 0.065 speed per tick. #When the player reaches 2.0 speed they gain the My Little Unicorn effect for 5 seconds, becoming invulnerable and dealing contact damage."}, {"300", "0", "", "+0.25 Speed up.#Causes enemies to take 18 points of damage on contact. #Does not prevent the player from taking contact damage."}, {"301", "0", "", "Grants 3 soul hearts. #Upon taking damage, grants The Wafer effect (reducing all damage to one half heart) for the rest of the room."}, -{"302", "0", "", "The player breaks obstacles by walking into them. #Increases the player's size. #The player can walk over red poops without taking damage, though they will hurt the player if it respawns while they're on it."}, +{"302", "15", "", "The player breaks obstacles by walking into them. #Increases the player's size. #The player can walk over red poops without taking damage, though they will hurt the player if it respawns while they're on it."}, {"303", "0", "", "Luck dependant chance to gain the Book of Shadows effect, becoming invulnerable for 7 seconds. #Caps at 100% chance to activate at ten or higher luck. #All stats down pills become stat up pills, Bad Trip becomes Balls of Steel, and Amnesia becomes I Can See Forever. #Does not identify pills."}, {"304", "0", "", "Grants 6 coins, bombs and keys. #Causes your primary attributes (damage, range, tears and speed) to balance, but does not effect luck, tear height or shot speed.. #The balancing is based on Isaac's stats. #The balancing happens each time you pick up a stat increase/decrease for the rest of the game."}, {"305", "0", "", "The player's tears inflict poison which deals 2x the player's tear damage."}, @@ -771,7 +771,7 @@ EID.descriptions["en_us_detailed"].pills={ {"6", "0", "", "Removes one red heart container. #If the player has one or fewer red heart containers, it will act as a Health Up instead."}, {"7", "0", "", "Grants one empty red heart container."}, {"8", "0", "", "Changes the appearance of the player's face."}, -{"9", "0", "", "Does nothing on use."}, +{"9", "14", "", "Does nothing on use."}, {"10", "0", "", "Adds fly orbital, blocking projectiles and damaging fly-type enemies on contact."}, {"11", "0", "", "Reduces the player's range by 2."}, {"12", "0", "", "Increases the player's range by 2.5."}, @@ -794,7 +794,7 @@ EID.descriptions["en_us_detailed"].pills={ {"29", "0", "", "Makes the player take a full heart of damage from all sources for the current room. #This effect is negated if the player has The Wafer item, but overrides the Percs! pill."}, {"30", "0", "", "Spawns poop wherever the player moves for a short time."}, {"31", "0", "", "Gives the Curse of the Maze effect for the remainder of the floor. #Cannot be negated by Black Candle."}, -{"32", "0", "", "Increases the player's size and decreases the pitch of their voice. #Does not increase the size of the players's hitbox."}, +{"32", "15", "", "Increases the player's size and decreases the pitch of their voice. #Does not increase the size of the players's hitbox."}, {"33", "0", "", "Decreases the player's size and increases the pitch of his voice. #This effect decreases the player's hitbox."}, {"34", "0", "", "Destroys all poop in the room and spawns one blue spider under the player, as well as one on top of each destroyed poop."}, {"35", "0", "", "Spawns one blue spider for each enemy in the room. #If there are no enemies in the room, instead spawns 1-3 blue spiders."}, diff --git a/descriptions/ab+/fr.lua b/descriptions/ab+/fr.lua index 5ac19c8a..ad5572f2 100644 --- a/descriptions/ab+/fr.lua +++ b/descriptions/ab+/fr.lua @@ -31,7 +31,7 @@ EID.descriptions["fr"].collectibles={ {"9", "3", "", "Toutes les mouches ennemies sont vos amies"}, {"10", "3", "", "+2 mouches orbitales"}, {"11", "2", "", "↑ +1 Vie#Réapparaissez avec tous vos coeurs"}, -{"12", "2", "", "↑ +1 Coeur Max#↑ +0.3 Dégât(s)#↑ +50% Multiplicateur de Dégât(s)#↑ +5.25 Portée#↑ +0.3 Vitesse#↑ +0.5 Hauteur des larmes#Soin complet!"}, +{"12", "2,15", "", "↑ +1 Coeur Max#↑ +0.3 Dégât(s)#↑ +50% Multiplicateur de Dégât(s)#↑ +5.25 Portée#↑ +0.3 Vitesse#↑ +0.5 Hauteur des larmes#Soin complet!"}, {"13", "5", "", "Toucher empoisonné#↓ -0.1 Vitesse#Les ennemis empoisonnés peuvent laisser un coeur noir"}, {"14", "5", "", "↑ +0.6 Vitesse#↑ +5.25 Portée#↑ +0.5 Hauteur des larmes"}, {"15", "0", "", "↑ +1 Coeur Max#Soin complet"}, @@ -52,7 +52,7 @@ EID.descriptions["fr"].collectibles={ {"30", "6", "", "↑ +5.25 Portée#↑ +0.5 Hauteur des larmes"}, {"31", "6", "", "↑ +5.25 Portée#↑ +0.5 Hauteur des larmes"}, {"32", "0", "", "↑ +0.7 Cadence de tir"}, -{"33", "10", "", "Vol pour la salle actuelle#Tue le pied de Maman et le coeur de Maman instantanément#! Vous tue si utilisée sur Satan"}, +{"33", "10,12", "", "Vol pour la salle actuelle#Tue le pied de Maman et le coeur de Maman instantanément#! Vous tue si utilisée sur Satan"}, {"34", "12", "", "↑ +2 Dégât(s)#↑ +12.5% chances de devil deal#↑ +50% Multiplicateur de Dégât(s) si vous avez Blood of the Martyr"}, {"35", "12", "", "Inflige 40 Dégât(s) à tous les ennemis de la salle"}, {"36", "7", "", "Lâche un caca sur le sol#Peut-être placé face à un précipice et explosé pour créer un pont"}, @@ -321,7 +321,7 @@ EID.descriptions["fr"].collectibles={ {"299", "0", "", "Vous êtes plus rapides dans les salles hostiles!#Une fois que vous êtes assez rapide, invincibilité"}, {"300", "0", "", "↑ +0.25 Vitesse#Toucher un ennemi lui inflige des dégâts"}, {"301", "0", "", "+3 Coeurs bleus#Une fois touché, les dégâts suivants ne peuvent excéder un demi coeur"}, -{"302", "0", "", "Détruis les rochers!"}, +{"302", "15", "", "Détruis les rochers!"}, {"303", "0", "", "Chance de devenir invincible en vous faisant toucher"}, {"304", "0", "", "+6 Pièces / Clefs / Bombes#Équilibre vos stats!#! Chaque augmentation de stat va aussi affecter les autres stats"}, {"305", "0", "", "Larmes empoisonnées"}, @@ -780,7 +780,7 @@ EID.descriptions["fr"].pills={ {"6", "0", "", "↓ -1 Coeur Max"}, {"7", "0", "", "↑ +1 Coeur Max"}, {"8", "0", "", "Aucun effet"}, -{"9", "0", "", "En manger 3 vous donnera un coeur max supplémentaire"}, +{"9", "14", "", "En manger 3 vous donnera un coeur max supplémentaire"}, {"10", "0", "", "Ajoute une mouche orbitale pouvant bloquer les projectiles"}, {"11", "0", "", "↓ -2 Portée"}, {"12", "0", "", "↑ +2.5 Portée"}, @@ -803,7 +803,7 @@ EID.descriptions["fr"].pills={ {"29", "0", "", "Perdez un coeur rouge"}, {"30", "0", "", "Fait apparaître des cacas sur votre passage pendant 2 secondes"}, {"31", "0", "", "Effet 'Curse of the Maze' pour la salle (franchir une porte peut vous téléporter dans une autre salle)"}, -{"32", "0", "", "Isaac grandit#N'affecte pas sa hitbox"}, +{"32", "15", "", "Isaac grandit#N'affecte pas sa hitbox"}, {"33", "0", "", "Isaac rapetissit#Diminue sa hitbox"}, {"34", "0", "", "Fait appraître une araignée bleue pour chaque caca dans la salle"}, {"35", "0", "", "Fait apparaître une araignée bleue pour chaque ennemi dans la salle#Fait apparaître 1-3 araignées quand aucun ennemi n'est dans la salle"}, diff --git a/descriptions/ab+/pl.lua b/descriptions/ab+/pl.lua index b83a3130..ec8d62e7 100644 --- a/descriptions/ab+/pl.lua +++ b/descriptions/ab+/pl.lua @@ -33,7 +33,7 @@ EID.descriptions["pl"].collectibles={{"1","0","\1 +0.7 Szybkostrzelno {"9","3","Napotkane wrogie muchy staj si\165 przyjazne"}, {"10","3","+2 Muchy orbitujce"}, {"11","2","\1 +1 ycie#Odradzasz si\165 z penym zdrowiem"}, -{"12","2","\1 +1 Serce#\1 +0.3 Obrae\222#\1 Mnoy obraenia +50%#\1 +5.25 Zasi\165gu#\1 +0.3 Szybkoci#\1 +0.5 Wysokoci lotu ez#Odnawia twoje serca do pena!"}, +{"12","2,15","\1 +1 Serce#\1 +0.3 Obrae\222#\1 Mnoy obraenia +50%#\1 +5.25 Zasi\165gu#\1 +0.3 Szybkoci#\1 +0.5 Wysokoci lotu ez#Odnawia twoje serca do pena!"}, {"13","5","Trujcy dotyk#\2 -0.1 Szybkoci#Wrogowie mog upuci czarne serca jeli zostan zatruci"}, {"14","5","\1 +0.6 Szybkoci#\1 +5.25 Zasi\165gu#\1 +0.5 Wysokoci lotu ez"}, {"15","0","\1 +1 Serce#Leczy twoje serca do pena"}, @@ -54,7 +54,7 @@ EID.descriptions["pl"].collectibles={{"1","0","\1 +0.7 Szybkostrzelno {"30","6","\1 +5.25 Zasi\165gu#\1 +0.5 do Wysokoci lotu ez"}, {"31","6","\1 +5.25 Zasi\165gu#\1 +0.5 do Wysokoci lotu ez"}, {"32","0","\1 +0.7 Szybkostrzelnoci"}, -{"33","10","Otrzymujesz Latanie na aktualny pokj#Natychmiast zabija Mam\165 i Serce matki#\3 Zabija CIEBIE kiedy uyjesz go podczas walki z Szatanem"}, +{"33","10,12","Otrzymujesz Latanie na aktualny pokj#Natychmiast zabija Mam\165 i Serce matki#\3 Zabija CIEBIE kiedy uyjesz go podczas walki z Szatanem"}, {"34","12","\1 +2 Obrae\222#\1 +12.5% szans na Devil Deal Room#\1 Mnoy obraenia +50% jeli posiadasz Blood of the Martyr"}, {"35","12","Zadaje 40 obrae\222 wszystkim w pokoju"}, {"36","7","Upuszcza kup\165 na podog\165#Moe zosta pooony obok dou i zniszczony eby zrobi most"}, @@ -323,7 +323,7 @@ EID.descriptions["pl"].collectibles={{"1","0","\1 +0.7 Szybkostrzelno {"299","0","Jeste szybszy w pokoju z przeciwnikami!#Daje nietykalno gdy jeste wystarczajco szybki"}, {"300","0","\1 +0.25 Szybko#Dotykanie przeciwnikw ich rani"}, {"301","0","+3 Serca Dusz#Po otrzymaniu obrae\222, kade nastpne w tym samym pokoju zabior tylko p serca"}, -{"302","0","Niszcz skay!"}, +{"302","15","Niszcz skay!"}, {"303","0","Szansa na bycie niemiertelnym gdy otrzymasz obraenia"}, {"304","0","+6 Monet / Kluczy / Bomb#Balansuje twoje statystyki!#\3 Kade nastpne podniesienie statystyk wpynie rwnie na inne"}, {"305","0","Trujce zy"}, diff --git a/descriptions/ab+/pt.lua b/descriptions/ab+/pt.lua index f927730d..9282dd59 100644 --- a/descriptions/ab+/pt.lua +++ b/descriptions/ab+/pt.lua @@ -30,7 +30,7 @@ EID.descriptions["pt"].collectibles={ {"9", "3", "", "Todos os inimigos mosca são amigáveis"}, {"10", "3", "", "+2 mosca orbitais"}, {"11", "2", "", "↑ +1 vida#Reaparecer com saúde total"}, -{"12", "2", "", "↑ +1 Saúde Up#↑ +0.3 Dano Up#↑ +50% Multiplicador de Dano#↑ +5.25 Alcance Up#↑ +0.3 Velocidade Up#↑ +0.5 Altura da Lágrima#Saúde Máxima!"}, +{"12", "2,15", "", "↑ +1 Saúde Up#↑ +0.3 Dano Up#↑ +50% Multiplicador de Dano#↑ +5.25 Alcance Up#↑ +0.3 Velocidade Up#↑ +0.5 Altura da Lágrima#Saúde Máxima!"}, {"13", "5", "", "Toque venenoso#↓ -0.1 Velocidade Down#Inimigos podem derrubar corações negros se envenenados"}, {"14", "5", "", "↑ +0.6 Velocidade Up#↑ +5.25 Alcance Up#↑ +0.5 Altura do tiro"}, {"15", "0", "", "↑ +1 Saúde Up#Saúde Máxima"}, @@ -51,7 +51,7 @@ EID.descriptions["pt"].collectibles={ {"30", "6", "", "↑ +5.25 Alcance Up#↑ +0.5 Altura da Lágrima"}, {"31", "6", "", "↑ +5.25 Alcance Up#↑ +0.5 Altura da Lágrima"}, {"32", "0", "", "↑ +0.7 lágrimas Up"}, -{"33", "10", "", "Voo para o quarto atual#Mata o pé da mãe e o coração da mãe instantaneamente#! Mata VOCÊ quando usado em Satanás"}, +{"33", "10,12", "", "Voo para o quarto atual#Mata o pé da mãe e o coração da mãe instantaneamente#! Mata VOCÊ quando usado em Satanás"}, {"34", "12", "", "↑ +2 Dano Up#↑ +12.5% chance de acordo com o diabo#↑ +50% Multiplicador de Dano se você tiver Blood of the Martyr"}, {"35", "12", "", "Cause 40 de dano a tudo na sala"}, {"36", "7", "", "Solte um cocô no chão#Pode ser colocado próximo a um poço e destruído para fazer uma ponte"}, @@ -320,7 +320,7 @@ EID.descriptions["pt"].collectibles={ {"299", "0", "", "ganha velocidade enquanto está em uma sala com inimigos até obter o efeito My Little Unicorn por alguns segundos"}, {"300", "0", "", "↑ +0.25 Velocidade up#Tocar nos inimigos os machuca"}, {"301", "0", "", "+3 Corações de alma#Metade do dano recebido no quarto quando você já foi atingido"}, -{"302", "0", "", "Quebrar pedras!"}, +{"302", "15", "", "Quebrar pedras!"}, {"303", "0", "", "Chance de obter invencibilidade ao ser atingido"}, {"304", "0", "", "+6 Moedas / Chaves / Bombas#Equilibra suas estatísticas!#! Todas as estatísticas posteriores também afetarão outras estatísticas"}, {"305", "0", "", "Lágrimas de veneno"}, @@ -779,7 +779,7 @@ EID.descriptions["pt"].pills={ {"6", "0", "", "↓ Saúde down"}, {"7", "0", "", "↑ Saúde Up"}, {"8", "0", "", "Sem efeito"}, -{"9", "0", "", "Consumir 3 pílulas de puberty garantirá a transformação de um adulto."}, +{"9", "14", "", "Consumir 3 pílulas de puberty garantirá a transformação de um adulto."}, {"10", "0", "", "Concede 1 mosca orbital de que circula o jogador"}, {"11", "0", "", "↓ -2 Alcance down"}, {"12", "0", "", "↑ +2.5 Alcance up"}, @@ -802,7 +802,7 @@ EID.descriptions["pt"].pills={ {"29", "0", "", "Tome danos coração cheio para o quarto atual"}, {"30", "0", "", "spawna cocô enquanto caminha por 2 segundos"}, {"31", "0", "", "Maldição do efeito labirinto para piso atual"}, -{"32", "0", "", "Você cresce#Não afeta seu hitbox"}, +{"32", "15", "", "Você cresce#Não afeta seu hitbox"}, {"33", "0", "", "Você fica menor#Seu hitbox fica menor"}, {"34", "0", "", "Gera 1 aranha azul por cocô no quarto"}, {"35", "0", "", "Gera 1 aranha azul por inimigo na sala#spawna 1-3 aranhas azuis quando nenhum inimigo está na sala"}, diff --git a/descriptions/ab+/ru.lua b/descriptions/ab+/ru.lua index fd55ae8e..1691e557 100644 --- a/descriptions/ab+/ru.lua +++ b/descriptions/ab+/ru.lua @@ -15,7 +15,7 @@ EID.descriptions["ru"].collectibles={ {"9", "3", "Скатол", "Все вражеские мужи становятся нейтральными"}, {"10", "3", "Нимб из Мух", "\1 2 орбитальные мухи"}, {"11", "2", "1UP!", "\1 1 дополнительная жизнь#Возрождение с полным здоровьем"}, -{"12", "2", "Волшебный Гриб", "\1 1 к здоровью#\1 0.3 к урону#\1 50% множитель урона#\1 5.25 дальность стрельбы#\1 0.3 к скорости#\1 0.5 высота слезы#Восстанавливает здоровье!#Этот предмет необходим для трансформации 'Топтун'"}, +{"12", "2,15", "Волшебный Гриб", "\1 1 к здоровью#\1 0.3 к урону#\1 50% множитель урона#\1 5.25 дальность стрельбы#\1 0.3 к скорости#\1 0.5 высота слезы#Восстанавливает здоровье!#Этот предмет необходим для трансформации 'Топтун'"}, {"13", "5", "Вирус", "Ядовитое касание#\2 0.1 к скорости#С некоторым шансом враги оставят Черное Сердце, если они умерли от отравления"}, {"14", "5", "Стероидная Ярость", "\1 0.6 к скорости#\1 5.25 дальность стрельбы#\1 0.5 высота слезы"}, {"15", "0", "<3", "\1 1 к здоровью#Восстанавливает здоровье"}, @@ -36,7 +36,7 @@ EID.descriptions["ru"].collectibles={ {"30", "6", "Мамины Туфли", "\1 5.25 дальность стрельбы#\1 0.5 высота слезы"}, {"31", "6", "Мамина Помада", "\1 5.25 дальность стрельбы#\1 0.5 высота слезы"}, {"32", "0", "Вешалка Из Проволоки", "\1 0.7 к скорострельности"}, -{"33", "10", "Библия", "Полет в пределах комнаты#Моментально убивает Маму и Сердце Мамы#Убивает ВАС при использовании на Сатане!"}, +{"33", "10,12", "Библия", "Полет в пределах комнаты#Моментально убивает Маму и Сердце Мамы#Убивает ВАС при использовании на Сатане!"}, {"34", "12", "Книга Белиала", "\1 2 к урону#+12.5% шанс сделки с дьяволом#+50% к урону, если есть Кровь Мученика (Blood of the Martyr)"}, {"35", "12", "Некрономикон", "Наносит 40 урона всем в комнате"}, {"36", "7", "Какашка", "Оставляет какашку на полу#Ее можно взорвать, как обычный камень, чтобы проложить мост"}, @@ -305,7 +305,7 @@ EID.descriptions["ru"].collectibles={ {"299", "0", "Телец", "Вы становитесь быстрее в комнате с врагами#При полном ускорении вы становитесь неуязвимым"}, {"300", "0", "Овен", "\1 0.25 к скорости#Столкновение с врагами наносит им урон"}, {"301", "0", "Рак", "+3 Сердца Души#При получении урона любой следующий урон в пределах комнаты отнимет пол-сердца"}, -{"302", "14", "Лев", "Позволяет ломать камни, растаптывая их"}, +{"302", "15", "Лев", "Позволяет ломать камни, растаптывая их"}, {"303", "0", "Дева", "Шанс временной неуязвимости после получения урона#100% шанс с удачей +10"}, {"304", "0", "Весы", "+6 Монет / Ключей / Бомб#Балансирует ваши параметры!#Все последующие улучшения будут распределяться между всеми вашими параметрами"}, {"305", "0", "Скорпион", "Ядовитые слезы"}, @@ -761,7 +761,7 @@ EID.descriptions["ru"].pills={ {"6", "0", "– Здоровье", " \2 к здоровью"}, {"7", "0", "+ Здоровье", " \1 к здоровью"}, {"8", "0", "Я Нашел Пилюли", " Без эффекта"}, -{"9", "0", "Зрелость", " 3 такие пилюли превратят вас во Взрослого"}, +{"9", "14", "Зрелость", " 3 такие пилюли превратят вас во Взрослого"}, {"10", "0", "Милая Мушка", " Дает 1 орбитальную муху"}, {"11", "0", "– Дальность", " \2 2 дальность стрельбы"}, {"12", "0", "+ Дальность", " \1 2.5 дальность стрельбы"}, @@ -784,7 +784,7 @@ EID.descriptions["ru"].pills={ {"29", "0", "Зависимый", " Любой урон в комнате отнимает целое сердце"}, {"30", "0", "Расслабься", " Под вами в течение 2 секунд появляются кучки"}, {"31", "0", "???", " Эффект Проклятия Путаницы (Maze) на весь этаж"}, -{"32", "0", "Она сделает тебя крупнее", " Вы становитесь больше#Не влияет на ваш хитбокс#Необходима для трансформации 'Топтун'"}, +{"32", "15", "Она сделает тебя крупнее", " Вы становитесь больше#Не влияет на ваш хитбокс#Необходима для трансформации 'Топтун'"}, {"33", "0", "Она сделает тебя меньше", " Вы становитесь меньше#Ваш хитбокс становится меньше"}, {"34", "0", "Зараженный!", " Призывает 1 союзного паука на каждую кучку в комнате"}, {"35", "0", "Зараженный?", " Призывает 1 союзного паука на каждого врага в комнате"}, diff --git a/descriptions/ab+/spa.lua b/descriptions/ab+/spa.lua index 81240198..18b441e8 100644 --- a/descriptions/ab+/spa.lua +++ b/descriptions/ab+/spa.lua @@ -30,7 +30,7 @@ EID.descriptions["spa"].collectibles={ {"9", "3", "", "Todas las moscas enemigas son aliadas"}, {"10", "3", "", "+2 moscas orbitales"}, {"11", "2", "", "↑ +1 de vida#Reaparece con la vida al completo"}, -{"12", "2", "", "↑ +1 de vida#↑ +0,3 de daño#↑ +50% de multiplicador de daño#↑ +5,25 de rango#↑ +0,3 de velocidad#↑ +0,5 de tamaño de lágrima#¡Vida al completo!"}, +{"12", "2,15", "", "↑ +1 de vida#↑ +0,3 de daño#↑ +50% de multiplicador de daño#↑ +5,25 de rango#↑ +0,3 de velocidad#↑ +0,5 de tamaño de lágrima#¡Vida al completo!"}, {"13", "5", "", "Toque venenoso#↓ -0,1 de velocidad#Los enemigos pueden soltar corazones negros al morir si están envenenados"}, {"14", "5", "", "↑ +0,6 de velocidad#↑ +5,25 de rango#↑ +0,5 de tamaño de lágrima"}, {"15", "0", "", "↑ +1 de vida#Vida al completo"}, @@ -51,7 +51,7 @@ EID.descriptions["spa"].collectibles={ {"30", "6", "", "↑ +5,25 de rango#↑ +0,5 de tamaño de lágrima"}, {"31", "6", "", "↑ +5,25 de rango#↑ +0,5 de tamaño de lágrima"}, {"32", "0", "", "↑ +0,7 de lágrimas"}, -{"33", "10", "", "Vuela en la habitación actual#Mata el Pie de Mamá y el Corazón de Mamá al instante#! Te mata al usarlo contra Satán"}, +{"33", "10,12", "", "Vuela en la habitación actual#Mata el Pie de Mamá y el Corazón de Mamá al instante#! Te mata al usarlo contra Satán"}, {"34", "12", "", "↑ +2 de daño#↑ +12.5% de probabilidad de Pacto con el Diablo#↑ +50% de multiplicador de daño si tienes Blood of the Martyr (Sangre del mártir)"}, {"35", "12", "", "Inflige 40 de daño a todo en la habitación"}, {"36", "7", "", "Genera una caca en el suelo#Se puede poner al lado de una fosa y destruirla para hacer un puente"}, @@ -320,7 +320,7 @@ EID.descriptions["spa"].collectibles={ {"299", "0", "", "¡Te hace más rápido en las habitaciones hostiles!#Invencibilidad al alcanzar la velocidad suficiente"}, {"300", "0", "", "↑ +0,25 de velocidad#Tocar a los enemigos les daña"}, {"301", "0", "", "+3 corazones de alma#Reduce a la mitad el daño que recibas en la habitación tras ser golpeado una vez"}, -{"302", "0", "", "¡Rompe las rocas!"}, +{"302", "15", "", "¡Rompe las rocas!"}, {"303", "0", "", "Posibilidad de ser invencible cuando te tocan"}, {"304", "0", "", "+6 monedas / llaves / bombas#¡Equilibra tus estadísticas!#! Cada estadística afectará también a otras estadísticas"}, {"305", "0", "", "Lágrimas venenosas"}, @@ -779,7 +779,7 @@ EID.descriptions["spa"].pills={ {"6", "0", "", "↓ 1 menos de vida"}, {"7", "0", "", "↑ 1 más de vida"}, {"8", "0", "", "Sin efecto"}, -{"9", "0", "", "Al comer 3 te transformas en Adulto "}, +{"9", "14", "", "Al comer 3 te transformas en Adulto "}, {"10", "0", "", "Añade 1 mosca orbital"}, {"11", "0", "", "↓ -2 de rango"}, {"12", "0", "", "↑ +2.5 de rango"}, @@ -802,7 +802,7 @@ EID.descriptions["spa"].pills={ {"29", "0", "", "Recibe un corazón de daño en la habitación actual"}, {"30", "0", "", "Genera una caca al andar durante 2 segundos"}, {"31", "0", "", "Maldición del Laberinto (Curse of the maze) en la planta actual"}, -{"32", "0", "", "Creces#No afecta a la hitbox"}, +{"32", "15", "", "Creces#No afecta a la hitbox"}, {"33", "0", "", "Te haces pequeño#La hitbox se hace más pequeña"}, {"34", "0", "", "Genera 1 mosca azul por cada caca de la habitación"}, {"35", "0", "", "Genera 1 araña azul por cada enemigo de la habitación#Genera entre 1 y 3 arañas cuando no hay enemigos"}, diff --git a/eid_api.lua b/eid_api.lua index 92797b52..b1c8aa8f 100644 --- a/eid_api.lua +++ b/eid_api.lua @@ -107,7 +107,7 @@ function EID:getLegacyModDescription(objTable, id) return __eidCardDescriptions[id] elseif objTable == "pills" then return __eidPillDescriptions[id] - elseif objTable == "transformation" then + elseif objTable == "transformations" then return __eidItemTransformations[id] elseif objTable == "custom" then return __eidEntityDescriptions[id] and __eidEntityDescriptions[id][2] @@ -146,9 +146,10 @@ end function EID:getTransformationName(id) local str = "Custom" if tonumber(id) == nil then + print("FAIL") return id end - return EID:getDescriptionObj("transformations", tonumber(id) + 1) or str + return EID:getObjectName(tonumber(id) + 1, "transformations") or str end -- tries to get the ingame name of an item based on its ID @@ -182,6 +183,8 @@ function EID:getObjectName(objID, objType) end end return EID.itemConfig:GetPillEffect(objID).Name + elseif objType == "transformations" then + return tableEntry elseif objType == "sacrifice" then return EID:getDescriptionTable("sacrificeHeader") elseif objType == "dice" then @@ -226,12 +229,12 @@ end -- Returns the inlineIcon object of a given Iconstring -- can be used to validate an iconstring function EID:getIcon(str) - if str == nil then return nil end + if str == nil then print("F") return EID.InlineIcons["ERROR"] end local strTrimmed = string.gsub(str, "{{(.-)}}", function(a) return a end) - if #strTrimmed < #str then - return EID.InlineIcons[strTrimmed] or nil + if #strTrimmed <= #str then + return EID.InlineIcons[strTrimmed] or EID.InlineIcons["ERROR"] else - return nil + return EID.InlineIcons["ERROR"] end end @@ -246,7 +249,7 @@ function EID:filterMarkup(text, textPosX, textPosY) local spriteTable = {} for word in string.gmatch(text, "{{.-}}") do local textposition = string.find(text, word) - local lookup = EID:getIcon(word) or EID.InlineIcons["ERROR"] + local lookup = EID:getIcon(word) local preceedingTextWidth = EID:getStrWidth(string.sub(text, 0, textposition - 1))*EIDConfig["Scale"] table.insert(spriteTable,{lookup, preceedingTextWidth}) text = string.gsub(text, word, EID:generatePlaceholderString(lookup[3]), 1) diff --git a/eid_data.lua b/eid_data.lua index d880c95e..c802757e 100644 --- a/eid_data.lua +++ b/eid_data.lua @@ -64,7 +64,7 @@ EID.InlineIcons = { ["Collectible"] = {"Collectible", 0, 7, 7}, ["Trinket"] = {"Trinket", 0, 7, 7}, ["Slotmachine"] = {"Slotmachine", 0, 7, 7}, - --Room Icons + -- Room Icons ["Shop"] = {"roomicons", 0, 7, 9}, ["SecretRoom"] = {"roomicons", 1, 7, 9}, ["SuperSecretRoom"] = {"roomicons", 2, 7, 9}, @@ -84,7 +84,7 @@ EID.InlineIcons = { ["ChestRoom"] = {"roomicons", 16, 8, 9}, ["IsaacsRoom"] = {"roomicons", 17, 8, 9}, ["BarrenRoom"] = {"roomicons", 18, 8, 9}, - --Roomshape Icons + -- Roomshape Icons ["Room"] = {"roomshape", 0, 9, 9}, ["RoomSmallHorizontal"] = {"roomshape", 1, 9, 9}, ["RoomSmallVertical"] = {"roomshape", 2, 7, 6}, @@ -96,26 +96,22 @@ EID.InlineIcons = { ["RoomL"] = {"roomshape", 8, 10, 10}, ["RoomLTopLeft"] = {"roomshape", 9, 10, 10}, ["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 [Default: EID.IconSprite]} -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}, + ["RoomLBottomRight"] = {"roomshape", 11, 10, 10}, + -- Transformation Icons + ["CustomTransformation"] = {"TransformationCustom",0,11,14, 1, -1, EID.IconSprite}, + ["Guppy"] = {"Transformation1",0,10,13, 1, -1, EID.IconSprite}, + ["FunGuy"] = {"Transformation2",0,12,13, 0, -1, EID.IconSprite}, + ["LordoftheFlies"] = {"Transformation3",0,12,14, 0, -1, EID.IconSprite}, + ["Conjoined"] = {"Transformation4",0,16,15, -2, -1, EID.IconSprite}, + ["Spun"] = {"Transformation5",0,6,15, 4, -1, EID.IconSprite}, + ["Mom"] = {"Transformation6",0,6,16, 5, -1, EID.IconSprite}, + ["OhCrap"] = {"Transformation7",0,13,14, -1, -1, EID.IconSprite}, + ["Bob"] ={"Transformation8",0,12,13, 0, -1, EID.IconSprite}, + ["Leviathan"] = {"Transformation9",0,12,15, 0, -1, EID.IconSprite}, + ["Seraphim"] = {"Transformation10",0,19,14, -6, -1, EID.IconSprite}, + ["SuperBum"] = {"Transformation11",0,14,15, -1, -1, EID.IconSprite}, + ["Bookworm"] = {"Transformation12",0,10,14, 2, -1, EID.IconSprite}, + ["SpiderBaby"] = {"Transformation13",0,12,16, 1, -1, EID.IconSprite}, + --["Adult"] = {"Transformation14",0,0,13, -1, -1, EID.IconSprite}, + --["Stompy"] = {"Transformation15",0,0,13, -1, -1, EID.IconSprite}, } \ No newline at end of file diff --git a/eid_debugging.lua b/eid_debugging.lua index c90a6625..e340f457 100644 --- a/eid_debugging.lua +++ b/eid_debugging.lua @@ -17,7 +17,8 @@ local charsToDebug = { "Markup hearts: |{{Heart}}|{{HalfHeart}}|{{EthernalHeart}}|{{EmptyHeart}}|{{BlendedHeart}}|{{BoneHeart}}|{{HalfBoneHeart}}|{{EmptyBoneHeart}}|{{SoulHeart}}|{{HalfSoulHeart}}|{{BlackHeart}}|{{HalfBlackHeart}}|{{GoldenHeart}}|{{CoinHeart}}|{{HalfCoinHeart}}|{{EmptyCoinHeart}}|", "Markup pickups: |{{Key}}|{{GoldenKey}}|{{Bomb}}|{{GoldenBomb}}|{{Coin}}|{{Card}}|{{RedCard}}|{{Collectible}}|{{Pill}}|{{Trinket}}|{{Battery}}|{{Rune}}|{{Slotmachine}}|", "Markup roomtypes: |{{DevilRoom}}|{{AngelRoom}}|{{ChallengeRoom}}|{{IsaacsRoom}}|{{TreasureRoom}}|{{ArcadeRoom}}|{{BossRushRoom}}|{{Shop}}|{{SuperSecretRoom}}|{{BarrenRoom}}|{{MiniBoss}}|{{DiceRoom}}|{{GreedTreasureRoom}}|{{SecretRoom}}|{{Library}}|{{ChestRoom}}|{{BossRoom}}|{{CursedRoom}}|{{SacrificeRoom}}|", - "Markup roomshapes: |{{Room}}|{{RoomLongHorizontal}}|{{RoomLongThinHorizontal}}|{{RoomSmallHorizontal}}|{{RoomLBottomRight}}|{{RoomSmallVertical}}|{{RoomLBottomLeft}}|{{RoomLTopLeft}}|{{RoomL}}|{{RoomLongVertical}}|{{RoomXL}}|{{RoomLongThinVertical}}|" + "Markup roomshapes: |{{Room}}|{{RoomLongHorizontal}}|{{RoomLongThinHorizontal}}|{{RoomSmallHorizontal}}|{{RoomLBottomRight}}|{{RoomSmallVertical}}|{{RoomLBottomLeft}}|{{RoomLTopLeft}}|{{RoomL}}|{{RoomLongVertical}}|{{RoomXL}}|{{RoomLongThinVertical}}|", + "Markup transformations: |{{CustomTransformation}}|{{Guppy}}|{{FunGuy}}|{{LordoftheFlies}}|{{Conjoined}}|{{Spun}}|{{Mom}}|{{OhCrap}}|{{Bob}}|{{Leviathan}}|{{Seraphim}}|{{SuperBum}}|{{Bookworm}}|{{SpiderBaby}}|{{Adult}}|{{Stompy}}|", } -- Legacy Overriding descriptions @@ -37,7 +38,6 @@ EID.InlineIcons["Test"] = {"hearts", 0, 9, 9, -1, 0, dummySprite} __eidItemDescriptions[2] = "{{Bomb}} Emote {{Key}} Test {{Test}} description {{InvalidMarkupThing}} cool" -- 5.100.2 = Inner Eye -- test adding custom transformation icon -EID.TransformationIcons["Test"] = {"hearts", 9, 9, -1, 0, dummySprite} __eidItemTransformations[2] = "Test" local function onDebugRender(t) diff --git a/main.lua b/main.lua index 7a4c3b2a..f9f98a39 100644 --- a/main.lua +++ b/main.lua @@ -8,8 +8,8 @@ local lastDescriptionEntity = nil local hideDescToggle = false EID.sacrificeCounter = 1 -local IconSprite = Sprite() -IconSprite:Load("gfx/icons.anm2", true) +EID.IconSprite = Sprite() +EID.IconSprite:Load("gfx/icons.anm2", true) EID.InlineIconSprite = Sprite() EID.InlineIconSprite:Load("gfx/eid_inline_icons.anm2", true) @@ -94,18 +94,18 @@ function printDescription(desc) if EIDConfig["Scale"] < 1 then offsetY = -1 end - IconSprite:Play(EID.ItemTypeAnm2Names[itemType]) - IconSprite.Scale = Vector(EIDConfig["Scale"], EIDConfig["Scale"]) - IconSprite:Update() - IconSprite:Render( + EID.IconSprite:Play(EID.ItemTypeAnm2Names[itemType]) + EID.IconSprite.Scale = Vector(EIDConfig["Scale"], EIDConfig["Scale"]) + EID.IconSprite:Update() + EID.IconSprite:Render( Vector(EIDConfig["XPosition"], padding + offsetY), Vector(0, 0), Vector(0, 0) ) if itemType == 3 then -- Display Charge - IconSprite:Play(EID.itemConfig:GetCollectible(desc.ID).MaxCharges) - IconSprite:Update() - IconSprite:Render( + EID.IconSprite:Play(EID.itemConfig:GetCollectible(desc.ID).MaxCharges) + EID.IconSprite:Update() + EID.IconSprite:Render( Vector(EIDConfig["XPosition"], padding + offsetY), Vector(0, 0), Vector(0, 0) @@ -137,33 +137,38 @@ function printDescription(desc) --Display Transformation if not (desc.Transformation == "0" or desc.Transformation == "" or desc.Transformation == nil) then - local transformationName = EID:getTransformationName(desc.Transformation) - 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( - transformationName, - Vector(EIDConfig["XPosition"] + (transformSprite[2]+iconOffsetX +3), padding - 1), - Vector(EIDConfig["Scale"], EIDConfig["Scale"]), - EID:getTransformationColor() - ) - end - if (EIDConfig["TransformationIcons"] or EIDConfig["TransformationText"]) then - padding = padding + lineHeight * EIDConfig["Scale"] + for transform in string.gmatch(desc.Transformation, "([^,]+)") do + local transformationName = EID:getTransformationName(transform) + local transformLineHeight = lineHeight + local defaultName = EID.descriptions["en_us"].transformations[tonumber(transform+1)] + local transformSprite = EID:getIcon(defaultName:gsub(" ", "")) + if transformSprite[1] == "ERROR" then + transformSprite = EID:getIcon("CustomTransformation") + end + local iconOffsetX = transformSprite[5] or -1 + local iconOffsetY = transformSprite[6] or -1 + if EIDConfig["TransformationIcons"] then + transformLineHeight = math.max(lineHeight, transformSprite[4]) + local iconSprite = transformSprite[7] or EID.InlineIconSprite + 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( + transformationName, + Vector(EIDConfig["XPosition"] + 17, padding - 1), + Vector(EIDConfig["Scale"], EIDConfig["Scale"]), + EID:getTransformationColor() + ) + end + if (EIDConfig["TransformationIcons"] or EIDConfig["TransformationText"]) then + padding = padding + transformLineHeight * EIDConfig["Scale"] + end end end printBulletPoints(desc.Description, padding)