diff --git a/descriptions/rep/cs_cz.lua b/descriptions/rep/cs_cz.lua index d0074b1d..ccb8994f 100644 --- a/descriptions/rep/cs_cz.lua +++ b/descriptions/rep/cs_cz.lua @@ -1603,20 +1603,11 @@ EID.descriptions[languageCode].BookOfVirtuesWispTexts = { -- values inside {} brackets will be replaced with text parts below -- Wisp texts are affected by the PluralizeFunction (ab+ file) -- The placeholder therefore can be used in all parts that make up the wisp descriptions - StatDescription = "{{Heart}} {health} {{Damage}} {damage}", -- {health} will be replaced with the health text, {damage} with the damage text or the "CantShoot" text - Health = "{1} zdraví", -- {1} will be replaced with the health - Damage = "{1} dps", -- {1} will be replaced with the calculated damage - CantShoot = "Nemůže střílet!", + StatDescription = "{ringIcon}{{Wisp}} {amount}|{{Heart}} {health}|{{Damage}} {damage}", -- {ringIcon} will be replaced with an icon representing the wisp movement, {amount} with the number of wisps, {health} with the HP, {damage} with the damage or the "CantShoot" text Shotspeed = "{1}% Rychlost střely", -- {1} will be replaced with the shot speed changes in % Chance = " ({1}% Šance)", -- {1} will be replaced with the chance SingleRoom = "Bludička pro jednu místnost", NoWisps = "Žádné bludičky", - Ring = { - [-1] = "{amount} nehybná bludička/y{pluralize}", - [0] = "{amount} bludička/y ve vnitřním kruhu{pluralize} {{InnerWisp}}", - [1] = "{amount} bludička/y v prostředním kruhu{pluralize} {{MiddleWisp}}", - [2] = "{amount} bludička/y ve vnějším kruhu{pluralize} {{OuterWisp}}", - }, } ---------- Abyss Locust description parts ---------- diff --git a/descriptions/rep/de.lua b/descriptions/rep/de.lua index fc54e96d..98cfe315 100644 --- a/descriptions/rep/de.lua +++ b/descriptions/rep/de.lua @@ -523,21 +523,11 @@ EID.descriptions[languageCode].BookOfVirtuesWispTexts = { -- values inside {} brackets will be replaced with text parts below -- Wisp texts are affected by the PluralizeFunction (ab+ file) -- The placeholder therefore can be used in all parts that make up the wisp descriptions - StatDescription = "{{Heart}} {health} {{Damage}} {damage}", -- {health} will be replaced with the health text, {damage} with the damage text or the "CantShoot" text - Health = "{1} Leben", -- {1} will be replaced with the health - Damage = "{1} DPS", -- {1} will be replaced with the calculated damage - Damage2 = "dmg", -- prepend text for damage multiplier based on proc chance - CantShoot = "Schießt nicht!", + StatDescription = "{ringIcon}{{Wisp}} {amount}|{{Heart}} {health}|{{Damage}} {damage}", -- {ringIcon} will be replaced with an icon representing the wisp movement, {amount} with the number of wisps, {health} with the HP, {damage} with the damage or the "CantShoot" text Shotspeed = "{1}% Schussgeschwindigkeit", -- {1} will be replaced with the shot speed changes in % Chance = " ({1}% Chance)", -- {1} will be replaced with the chance SingleRoom = "Einzelraum-Wisp{plural_s}", NoWisps = "Kein Wisp", - Ring = { - [-1] = "{amount} stationäre{singular_r} Wisp{plural_s}", - [0] = "{amount} innere{singular_r} Ring-Wisp{plural_s} {{InnerWisp}}", - [1] = "{amount} mittlere{singular_r} Ring-Wisp{plural_s} {{MiddleWisp}}", - [2] = "{amount} äußere{singular_r} Ring-Wisp{plural_s} {{OuterWisp}}", - }, } -- Old table that now is used to store additional information and effects for Book of Virtues Wisps diff --git a/descriptions/rep/en_us.lua b/descriptions/rep/en_us.lua index ef3e75fb..f56e3ae6 100644 --- a/descriptions/rep/en_us.lua +++ b/descriptions/rep/en_us.lua @@ -483,20 +483,11 @@ EID.descriptions[languageCode].BookOfVirtuesWispTexts = { -- values inside {} brackets will be replaced with text parts below -- Wisp texts are affected by the PluralizeFunction (ab+ file) -- The placeholder therefore can be used in all parts that make up the wisp descriptions - StatDescription = "{{Heart}} {health} {{Damage}} {damage}", -- {health} will be replaced with the health text, {damage} with the damage text or the "CantShoot" text - Health = "{1} health", -- {1} will be replaced with the health - Damage = "{1} dps", -- {1} will be replaced with the calculated damage - CantShoot = "Can't shoot!", + StatDescription = "{ringIcon}{{Wisp}} {amount}|{{Heart}} {health}|{{Damage}} {damage}", -- {ringIcon} will be replaced with an icon representing the wisp movement, {amount} with the number of wisps, {health} with the HP, {damage} with the damage or the "CantShoot" text Shotspeed = "{1}% Shot speed", -- {1} will be replaced with the shot speed changes in % Chance = " ({1}% Chance)", -- {1} will be replaced with the chance SingleRoom = "Single room wisp", NoWisps = "No Wisps", - Ring = { - [-1] = "{amount} stationary wisp{pluralize}", - [0] = "{amount} inner ring wisp{pluralize} {{InnerWisp}}", - [1] = "{amount} middle ring wisp{pluralize} {{MiddleWisp}}", - [2] = "{amount} outer ring wisp{pluralize} {{OuterWisp}}", - }, } -- Old table that now is used to store additional information and effects for Book of Virtues Wisps diff --git a/descriptions/rep/it.lua b/descriptions/rep/it.lua index c53ccd5b..abd6cfd4 100644 --- a/descriptions/rep/it.lua +++ b/descriptions/rep/it.lua @@ -487,20 +487,11 @@ EID.descriptions[languageCode].BookOfVirtuesWispTexts = { -- values inside {} brackets will be replaced with text parts below -- Wisp texts are affected by the PluralizeFunction (ab+ file) -- The placeholder therefore can be used in all parts that make up the wisp descriptions - StatDescription = "{{Heart}} {health} {{Damage}} {damage}", -- {health} will be replaced with the health text, {damage} with the damage text or the "CantShoot" text - Health = "{1} Salute", -- {1} will be replaced with the health - Damage = "{1} DPS", -- {1} will be replaced with the calculated damage - CantShoot = "Non spara!", + StatDescription = "{ringIcon}{{Wisp}} {amount}|{{Heart}} {health}|{{Damage}} {damage}", -- {ringIcon} will be replaced with an icon representing the wisp movement, {amount} with the number of wisps, {health} with the HP, {damage} with the damage or the "CantShoot" text Shotspeed = "{1}% Velocità Colpi", -- {1} will be replaced with the shot speed changes in % Chance = " ({1}% di chance)", -- {1} will be replaced with the chance SingleRoom = "Fiammella per una singola stanza", NoWisps = "Niente fiammelle", - Ring = { - [-1] = "{amount} fiammella/e stazionaria/e", - [0] = "{amount} Fiammella/e dell'anello interno {{InnerWisp}}", - [1] = "{amount} Fiammella/e dell'anello mediano {{MiddleWisp}}", - [2] = "{amount} Fiammella/e dell'anello esterno {{OuterWisp}}", - }, } -- Old table that now is used to store additional information and effects for Book of Virtues Wisps diff --git a/descriptions/rep/ja_jp.lua b/descriptions/rep/ja_jp.lua index 3371f2b2..35b1409a 100644 --- a/descriptions/rep/ja_jp.lua +++ b/descriptions/rep/ja_jp.lua @@ -491,20 +491,11 @@ EID.descriptions[languageCode].BookOfVirtuesWispTexts = { -- values inside {} brackets will be replaced with text parts below -- Wisp texts are affected by the PluralizeFunction (ab+ file) -- The placeholder therefore can be used in all parts that make up the wisp descriptions - StatDescription = "{{Heart}} {health} {{Damage}} {damage}", -- {health} will be replaced with the health text, {damage} with the damage text or the "CantShoot" text - Health = "体力：{1}", -- {1} will be replaced with the health - Damage = "DPS：{1}", -- {1} will be replaced with the calculated damage - CantShoot = "涙攻撃なし", + StatDescription = "{ringIcon}{{Wisp}} {amount}|{{Heart}} {health}|{{Damage}} {damage}", -- {ringIcon} will be replaced with an icon representing the wisp movement, {amount} with the number of wisps, {health} with the HP, {damage} with the damage or the "CantShoot" text Shotspeed = "弾速：{1}%", -- {1} will be replaced with the shot speed changes in % Chance = "（確率{1}%）", -- {1} will be replaced with the chance SingleRoom = "その部屋でのみ有効", NoWisps = "ウィスプなし", - Ring = { - [-1] = "固定のウィスプ x{amount}", - [0] = "内側{{InnerWisp}}のウィスプ x{amount}", - [1] = "中心{{MiddleWisp}}のウィスプ x{amount}", - [2] = "外側{{OuterWisp}}のウィスプ x{amount}", - }, } -- Old table that now is used to store additional information and effects for Book of Virtues Wisps diff --git a/descriptions/rep/ko_kr.lua b/descriptions/rep/ko_kr.lua index bbcb8985..b6ffc2ca 100644 --- a/descriptions/rep/ko_kr.lua +++ b/descriptions/rep/ko_kr.lua @@ -576,20 +576,11 @@ EID.descriptions[languageCode].BookOfVirtuesWispTexts = { -- values inside {} brackets will be replaced with text parts below -- Wisp texts are affected by the PluralizeFunction (ab+ file) -- The placeholder therefore can be used in all parts that make up the wisp descriptions - StatDescription = "{{Heart}} {health} / {{DamageSmall}} {damage}", -- {health} will be replaced with the health text, {damage} with the damage text or the "CantShoot" text - Health = "{1}", -- {1} will be replaced with the health - Damage = "{1} DPS", -- {1} will be replaced with the calculated damage - CantShoot = "공격불가", + StatDescription = "{ringIcon}{{Wisp}} {amount}|{{Heart}} {health}|{{Damage}} {damage}", -- {ringIcon} will be replaced with an icon representing the wisp movement, {amount} with the number of wisps, {health} with the HP, {damage} with the damage or the "CantShoot" text Shotspeed = "탄속 {1}%", -- {1} will be replaced with the shot speed changes in % Chance = " (확률 {1}%)", -- {1} will be replaced with the chance SingleRoom = "방을 나가면 사라집니다.", NoWisps = "위습 없음", - Ring = { - [-1] = "고정 x{amount}", - [0] = "{{InnerWisp}} {{ColorLime}}내부 x{amount}{{CR}}", - [1] = "{{MiddleWisp}} {{ColorYellow}}중앙 x{amount}{{CR}}", - [2] = "{{OuterWisp}} {{ColorOrange}}외부 x{amount}{{CR}}", - }, } -- Book of Virtues wisp types diff --git a/descriptions/rep/spa.lua b/descriptions/rep/spa.lua index 444f910b..5dae7f8d 100644 --- a/descriptions/rep/spa.lua +++ b/descriptions/rep/spa.lua @@ -483,21 +483,13 @@ EID.descriptions[languageCode].BookOfVirtuesWispTexts = { -- values inside {} brackets will be replaced with text parts below -- Wisp texts are affected by the PluralizeFunction (ab+ file) -- The placeholder therefore can be used in all parts that make up the wisp descriptions - StatDescription = "{{Heart}} {health} {{Damage}} {damage}", -- {health} will be replaced with the health text, {damage} with the damage text or the "CantShoot" text - Health = "{1} salud", -- {1} will be replaced with the health - Damage = "{1} dps", -- {1} will be replaced with the calculated damage - CantShoot = "No puede disparar lágrimas", + StatDescription = "{ringIcon}{{Wisp}} {amount}|{{Heart}} {health}|{{Damage}} {damage}", -- {ringIcon} will be replaced with an icon representing the wisp movement, {amount} with the number of wisps, {health} with the HP, {damage} with the damage or the "CantShoot" text Shotspeed = "{1}% vel. de lágrimas", -- {1} will be replaced with the shot speed changes in % Chance = " ({1}% de probabilidad)", -- {1} will be replaced with the chance SingleRoom = "Fuego de una sola habitación", NoWisps = "No hay fuego", - Ring = { - [-1] = "{amount} Fuego{plural_s} estacionario{plural_s}", - [0] = "{amount} Fuego orbital{plural_es} interior {{InnerWisp}}", - [1] = "{amount} Fuego orbital{plural_es} central {{MiddleWisp}}", - [2] = "{amount} Fuego orbital{plural_es} exterior {{OuterWisp}}", - }, } + -- Book of Virtues wisp types EID.descriptions[languageCode].bookOfVirtuesWisps = { [35] = "{{Collectible35}} Activa el efecto del Necronomicón al destruirse", -- The Necronomicon diff --git a/descriptions/rep/zh_cn.lua b/descriptions/rep/zh_cn.lua index 5da4d438..ef23709d 100644 --- a/descriptions/rep/zh_cn.lua +++ b/descriptions/rep/zh_cn.lua @@ -483,20 +483,11 @@ EID.descriptions[languageCode].BookOfVirtuesWispTexts = { -- values inside {} brackets will be replaced with text parts below -- Wisp texts are affected by the PluralizeFunction (ab+ file) -- The placeholder therefore can be used in all parts that make up the wisp descriptions - StatDescription = "{{Heart}} {health} {{Damage}} {damage}", -- {health} will be replaced with the health text, {damage} with the damage text or the "CantShoot" text - Health = "{1}血量", -- {1} will be replaced with the health - Damage = "{1}dps", -- {1} will be replaced with the calculated damage - CantShoot = "无法发射泪弹！", + StatDescription = "{ringIcon}{{Wisp}} {amount}|{{Heart}} {health}|{{Damage}} {damage}", -- {ringIcon} will be replaced with an icon representing the wisp movement, {amount} with the number of wisps, {health} with the HP, {damage} with the damage or the "CantShoot" text Shotspeed = "{1}%弹速", -- {1} will be replaced with the shot speed changes in % Chance = " ({1}%几率)", -- {1} will be replaced with the chance SingleRoom = "单房间魂火", NoWisps = "无魂火", - Ring = { - [-1] = "{amount}个固定位置魂火", - [0] = "{amount}个内环魂火{{InnerWisp}}", - [1] = "{amount}个中环魂火{{MiddleWisp}}", - [2] = "{amount}个外环魂火{{OuterWisp}}", - }, } -- Book of Virtues wisp types diff --git a/features/eid_data.lua b/features/eid_data.lua index 0c217db7..5bb3cad0 100644 --- a/features/eid_data.lua +++ b/features/eid_data.lua @@ -630,9 +630,11 @@ EID.InlineIcons = { ["ItemPoolRottenBeggar"] = {"ItemPools", 30, 11, 11, 0, 0}, -- Wisps - ["InnerWisp"] = {"Wisps", 0, 10, 9, 0, 2}, - ["MiddleWisp"] = {"Wisps", 1, 10, 9, 0, 2}, - ["OuterWisp"] = {"Wisps", 2, 10, 9, 0, 2}, + ["InnerWisp"] = {"Wisps", 0, 10, 10, 0, -3}, + ["MiddleWisp"] = {"Wisps", 1, 10, 10, 0, -3}, + ["OuterWisp"] = {"Wisps", 2, 10, 10, 0, -3}, + ["StationaryWisp"] = {"Wisps", 3, 10, 10, 0, -3}, + ["Wisp"] = {"Wisps", 4, 10, 10, 0, -3}, -- Dice Faces ["DiceFace1"] = {"DiceFaces", 0, 14, 14, 0, -1}, diff --git a/features/eid_modifiers.lua b/features/eid_modifiers.lua index 47dc9c34..7b910360 100644 --- a/features/eid_modifiers.lua +++ b/features/eid_modifiers.lua @@ -1078,6 +1078,12 @@ if EID.isRepentance then --------------------------------------- ---- Book of Virtues Wisp Handling----- --------------------------------------- + local ringIconLookup = { + [-1] = "{{StationaryWisp}}", + [0] = "{{InnerWisp}}", + [1] = "{{MiddleWisp}}", + [2] = "{{OuterWisp}}" + } local function BookOfVirtuesWispDescriptionBuilder(descObj, itemID) local textColor = "{{ColorPastelBlue}}" @@ -1118,33 +1124,25 @@ if EID.isRepentance then descriptionText = "#{{VirtuesCollectible"..itemID.."}} " .. textColor .. noWispsText else -- base damage via damage, stage damage and firedelay - local damageText = "" + -- Display "-" text if it cant shoot + local damageText = "-" if canShoot then - damageText = EID:getDescriptionEntry("BookOfVirtuesWispTexts", "Damage") local dmg = (damage + (stageDamage * (game:GetLevel():GetAbsoluteStage() - 1))) * (30 / fireDelay) - local dmgTxt = string.format("%.2f", dmg):gsub("%.?0+$", "") -- formated and without trailing zeros - damageText = EID:ReplaceVariableStr(damageText, dmgTxt) - else - -- Display "Cant Shoot" text instead of damage values - damageText = EID:getDescriptionEntry("BookOfVirtuesWispTexts", "CantShoot") + damageText = string.format("%.2f", dmg):gsub("%.?0+$", "") -- formated and without trailing zeros end -- HP Text local hpText = EID:getDescriptionEntry("BookOfVirtuesWispTexts", "Health") hpText = EID:ReplaceVariableStr(hpText, hp) - -- layer - local ringTable = EID:getDescriptionEntry("BookOfVirtuesWispTexts", "Ring") - local ringText = ringTable[layer] or ringTable[1] - -- overview / headline - descriptionText = "#{{VirtuesCollectible"..itemID.."}} " .. textColor .. ringText - descriptionText = EID:ReplaceVariableStr(descriptionText, "amount", amount ~= 0 and amount or "") - -- HP and damage text local statText = EID:getDescriptionEntry("BookOfVirtuesWispTexts", "StatDescription") - statText = EID:ReplaceVariableStr(statText, "health", textColor .. hpText) -- TODO: Fix issue where color definition before icon definition causes 1 extra space + statText = EID:ReplaceVariableStr(statText, "ringIcon", textColor .. ringIconLookup[layer] or ringIconLookup[1]) + statText = EID:ReplaceVariableStr(statText, "amount", amount ~= 0 and amount or "") -- TODO: Fix issue where color definition before icon definition causes 1 extra space + statText = EID:ReplaceVariableStr(statText, "health", hp) statText = EID:ReplaceVariableStr(statText, "damage", damageText) - descriptionText = descriptionText .. "#" .. statText + -- overview / headline + descriptionText = "#{{VirtuesCollectible"..itemID.."}} " .. textColor .. statText -- Single room warning if EID.WispData.SingleRoom[itemID] then diff --git a/resources/gfx/eid_inline_icons.anm2 b/resources/gfx/eid_inline_icons.anm2 index 555148d5..724bbd93 100644 --- a/resources/gfx/eid_inline_icons.anm2 +++ b/resources/gfx/eid_inline_icons.anm2 @@ -1,5 +1,5 @@ - + @@ -723,9 +723,11 @@ - - - + + + + + diff --git a/resources/gfx/eid_inline_icons.png b/resources/gfx/eid_inline_icons.png index 8bc11972..d87bd5fa 100644 Binary files a/resources/gfx/eid_inline_icons.png and b/resources/gfx/eid_inline_icons.png differ