diff --git a/eid_api.lua b/eid_api.lua index 566da69e..2b908586 100644 --- a/eid_api.lua +++ b/eid_api.lua @@ -102,8 +102,7 @@ function EID:hasDescription(entity) local isAllowed = false if EIDConfig["EnableEntityDescriptions"] then isAllowed = - isAllowed or - (__eidEntityDescriptions[entity.Type .. "." .. entity.Variant .. "." .. entity.SubType] ~= nil) --[[or type(entity:GetData()["EID_Description"]) ~= type(nil)]] + isAllowed or (__eidEntityDescriptions[entity.Type .. "." .. entity.Variant .. "." .. entity.SubType] ~= nil) --[[or type(entity:GetData()["EID_Description"]) ~= type(nil)]] end isAllowed = isAllowed or (entity.Variant == PickupVariant.PICKUP_COLLECTIBLE and EIDConfig["DisplayItemInfo"]) isAllowed = isAllowed or (entity.Variant == PickupVariant.PICKUP_TRINKET and EIDConfig["DisplayTrinketInfo"]) @@ -113,26 +112,66 @@ function EID:hasDescription(entity) end -- Replaces shorthand-representations of a character with the internal reference -function EID:replaceMarkupStrings(text) - text = string.gsub(text, "!!!", "ǃ") -- Turn 3 Exclamations into Warning - text = string.gsub(text, "\1", "↑") -- Legacy Up Arrow - text = string.gsub(text, "\2", "↓") -- Legacy Down Arrow - text = string.gsub(text, "\3", "ǃ") -- Legacy Warning - text = string.gsub(text, "\6", "\2HEART\2") -- Legacy Heart - text = string.gsub(text, "\5", "\2KEY\2") -- Legacy Key - text = string.gsub(text, "\015", "\2COIN\2") -- Legacy Coin - text = string.gsub(text, "\8\189", "\2BOMB\2") -- Legacy BOMB +function EID:replaceShortMarkupStrings(text) + text = string.gsub(text, "!!!", "{{Warning}}") -- Turn 3 Exclamations into Warning + text = string.gsub(text, "↑", "{{ArrowUp}}") -- Up Arrow + text = string.gsub(text, "↓", "{{ArrowDown}}") -- Down Arrow + text = string.gsub(text, "\1", "{{ArrowUp}}") -- Legacy Up Arrow + text = string.gsub(text, "\2", "{{ArrowDown}}") -- Legacy Down Arrow + text = string.gsub(text, "\3", "{{Warning}}") -- Legacy Warning + text = string.gsub(text, "\6", "{{Heart}}") -- Legacy Heart + text = string.gsub(text, "\5", "{{Key}}") -- Legacy Key + text = string.gsub(text, "\015", "{{Coin}}") -- Legacy Coin + text = string.gsub(text, "\8\189", "{{Bomb}}") -- Legacy BOMB return text end --- Returns the icon used for the bulletpoint. It will look at the first character in the given string. -EID.bulletIcons = {"↑", "↓", "!", "ǃ"} -function EID:getBulletpointIcon(text) - for i, v in ipairs(EID.bulletIcons) do - local iconPos = string.find(text, v) - if iconPos == 1 or iconPos == 2 then - return v - end +-- Generates a string with the defined pixel-length using a custom 1px wide character +-- This will only work for this specific custom font +function EID:generatePlaceholderString(length) + local placeholder = "" + for i = 1, length do + placeholder = placeholder .. "¤" + end + return placeholder +end + +-- Returns the inlineIcon object of a given Iconstring +-- can be used to validate an iconstring +function EID:getIcon(str) + return EID.InlineIcons[string.gsub(str, "{{(.-)}}", function(a) return a end)] or nil +end + +-- Returns the width of a given string in Pixels +function EID:getStrWidth(str) + return EID.font:GetStringWidthUTF8(str) +end + +-- Searches true the given string and replaces Iconplaceholders with icons. +-- Returns the string without the placeholders but with an accurate space between lines. +function EID:filterMarkup(text, textPosX, textPosY) + for word in string.gmatch(text, "{{.-}}") do + local textposition = string.find(text, word) + local lookup = EID:getIcon(word) or EID.InlineIcons["ERROR"] + local Xoffset = lookup[5] or 0 + local prefixTextWidth = EID:getStrWidth(string.sub(text, 0, textposition - 1)) + EID.InlineIconSprite:SetFrame(lookup[1], lookup[2]) + EID.InlineIconSprite.Scale = Vector(EIDConfig["Scale"], EIDConfig["Scale"]) + EID.InlineIconSprite:Render( + Vector((textPosX + prefixTextWidth + Xoffset) * EIDConfig["Scale"], textPosY), + Vector(0, 0), + Vector(0, 0) + ) + text = string.gsub(text, word, EID:generatePlaceholderString(lookup[3]), 1) + end + return text +end + +-- Returns the icon used for the bulletpoint. It will look at the first word in the given string. +function EID:handleBulletpointIcon(text) + local firstWord = string.match(text, "([^%s]+)") + if EID:getIcon(firstWord) ~= nil then + return firstWord end return "\007" end @@ -140,16 +179,9 @@ end --needs to be called in a render Callback -- args: string, Vector(int, int), Vector(float,float), KColor obj, bool function EID:renderString(str, position, scale, kcolor, centered) - EID.font:DrawStringScaledUTF8( - str, - position.X, - position.Y, - scale.X, - scale.Y, - kcolor, - EID.font:GetStringWidthUTF8(str), - centered - ) + str = EID:replaceShortMarkupStrings(str) + str = EID:filterMarkup(str, position.X, position.Y) + EID.font:DrawStringScaledUTF8(str, position.X, position.Y, scale.X, scale.Y, kcolor, EID:getStrWidth(str), centered) end -- Get KColor object of "Entity Name" texts diff --git a/eid_data.lua b/eid_data.lua new file mode 100644 index 00000000..a0354931 --- /dev/null +++ b/eid_data.lua @@ -0,0 +1,85 @@ +--Format: [SHORTCUT]= {Animationname, Frame, Width, Height, LeftOffset [Default: -1], TopOffset [Default: 0], SpriteObject [Default: EID.InlineIconSprite]} +EID.InlineIcons = { + ["ERROR"] = {"ERROR", 0, 10, 10}, + ["ArrowUp"] = {"ArrowUp", 0, 8, 9}, + ["ArrowDown"] = {"ArrowDown", 0, 8, 9}, + ["Warning"] = {"Warning", 0, 4, 9}, + -- Numbers + ["0"] = {"numbers", 0, 5, 7}, + ["1"] = {"numbers", 1, 4, 7}, + ["2"] = {"numbers", 2, 5, 7}, + ["3"] = {"numbers", 3, 5, 7}, + ["4"] = {"numbers", 4, 5, 7}, + ["5"] = {"numbers", 5, 5, 7}, + ["6"] = {"numbers", 6, 5, 7}, + ["7"] = {"numbers", 7, 5, 7}, + ["8"] = {"numbers", 8, 5, 7}, + ["9"] = {"numbers", 9, 5, 7}, + ["10"] = {"numbers", 10, 7, 7}, + ["11"] = {"numbers", 11, 7, 7}, + ["12"] = {"numbers", 12, 7, 7}, + -- Hearts + ["Heart"] = {"hearts", 0, 9, 9}, + ["HalfHeart"] = {"hearts", 1, 9, 9}, + ["EthernalHeart"] = {"hearts", 2, 9, 9}, + ["EmptyHeart"] = {"hearts", 3, 9, 9}, + ["BlendedHeart"] = {"hearts", 4, 9, 9}, + ["BoneHeart"] = {"hearts", 5, 9, 9}, + ["HalfBoneHeart"] = {"hearts", 6, 9, 9}, + ["EmptyBoneHeart"] = {"hearts", 7, 9, 9}, + ["SoulHeart"] = {"hearts", 8, 9, 9}, + ["HalfSoulHeart"] = {"hearts", 9, 9, 9}, + ["BlackHeart"] = {"hearts", 10, 9, 9}, + ["HalfBlackHeart"] = {"hearts", 11, 9, 9}, + ["GoldenHeart"] = {"hearts", 12, 9, 9}, + ["CoinHeart"] = {"hearts", 13, 9, 9}, + ["HalfCoinHeart"] = {"hearts", 14, 9, 9}, + ["EmptyCoinHeart"] = {"hearts", 15, 9, 9}, + -- Pickups + ["Key"] = {"pickups", 0, 7, 9}, + ["GoldenKey"] = {"pickups", 1, 7, 9}, + ["Bomb"] = {"pickups", 2, 10, 9}, + ["GoldenBomb"] = {"pickups", 3, 10, 9}, + ["Coin"] = {"pickups", 4, 7, 9}, + ["Rune"] = {"pickups", 5, 8, 9}, + ["Card"] = {"pickups", 6, 11, 11}, + ["RedCard"] = {"pickups", 7, 11, 11}, + ["Pill"] = {"pickups", 8, 9, 9}, + ["Battery"] = {"pickups", 9, 8, 9}, + ["Collectible"] = {"Collectible", 0, 7, 7}, + ["Trinket"] = {"Trinket", 0, 7, 7}, + ["Slotmachine"] = {"Slotmachine", 0, 7, 7}, + --Room Icons + ["Shop"] = {"roomicons", 0, 7, 9}, + ["SecretRoom"] = {"roomicons", 1, 7, 9}, + ["SuperSecretRoom"] = {"roomicons", 2, 7, 9}, + ["Library"] = {"roomicons", 3, 8, 9}, + ["TreasureRoom"] = {"roomicons", 4, 7, 9}, + ["AngelRoom"] = {"roomicons", 5, 7, 9}, + ["DevilRoom"] = {"roomicons", 6, 7, 9}, + ["MiniBoss"] = {"roomicons", 7, 7, 9}, + ["BossRoom"] = {"roomicons", 8, 9, 9}, + ["ChallengeRoom"] = {"roomicons", 9, 7, 9}, + ["BossRushRoom"] = {"roomicons", 10, 7, 9}, + ["CursedRoom"] = {"roomicons", 11, 7, 9}, + ["SacrificeRoom"] = {"roomicons", 12, 7, 9}, + ["ArcadeRoom"] = {"roomicons", 13, 7, 9}, + ["GreedTreasureRoom"] = {"roomicons", 14, 7, 9}, + ["DiceRoom"] = {"roomicons", 15, 8, 9}, + ["ChestRoom"] = {"roomicons", 16, 8, 9}, + ["IsaacsRoom"] = {"roomicons", 17, 8, 9}, + ["BarrenRoom"] = {"roomicons", 18, 8, 9}, + --Roomshape Icons + ["Room"] = {"roomshape", 0, 9, 9}, + ["RoomSmallHorizontal"] = {"roomshape", 1, 9, 9}, + ["RoomSmallVertical"] = {"roomshape", 2, 7, 6}, + ["RoomLongVertical"] = {"roomshape", 3, 7, 9}, + ["RoomLongHorizontal"] = {"roomshape", 4, 11, 9}, + ["RoomLongThinVertical"] = {"roomshape", 5, 5, 9}, + ["RoomLongThinHorizontal"] = {"roomshape", 6, 11, 9}, + ["RoomXL"] = {"roomshape", 7, 11, 11}, + ["RoomL"] = {"roomshape", 8, 10, 10}, + ["RoomLTopLeft"] = {"roomshape", 9, 10, 10}, + ["RoomLBottomLeft"] = {"roomshape", 10, 10, 10}, + ["RoomLBottomRight"] = {"roomshape", 11, 10, 10} +} diff --git a/eid_debugging.lua b/eid_debugging.lua index f6a96cd3..a5bc877b 100644 --- a/eid_debugging.lua +++ b/eid_debugging.lua @@ -1,5 +1,5 @@ local charsToDebug = { - EID:replaceMarkupStrings("!!! EID DEBUG MODE ACTIVATED !!!"), -- Header + "!!! EID DEBUG MODE ACTIVATED !!!", -- Header "ABCDEFGHIJKLMNOPQRSTUVWXYZ", -- Caps letters "abcdefghijklmnopqrstuvwxyz1234567890", -- small letters + numbers "western: Áá Àà Ââ Āā Ää Ãã Åå Ææ Éé Èè Êê Ēē Ëë Íí Ìì Îî Īī Ïï ", -- @@ -9,15 +9,20 @@ local charsToDebug = { "cyrillic 2: Пп Рр Сс Тт Уу Фф Хх Цц Чч Шш Щщ Ъъ Ыы Ьь Ээ Юю Яя", "polish: Ąą Ćć Ęę Łł Ńń Óó Śś Źź Żż", "custom icons: ↑Positive ↓Negative \007bulletpoint !Exclamation ǃWarning !!!shortcut", - EID:replaceMarkupStrings( - "legacy icon Markup: \\1:\1Positive \\2:\2Negative \\3:\3Warning ! \\6:\6 heart \\5:\5 Key \\015:\015 Coin \\8\\189:\8\189 Bomb" - ), - "emotes: ☆★〠♠♣♥♦♤♧♡♢☀☂♨♪♭♯♂♀" + "legacy icon Markup: \\1:\1Positive \\2:\2Negative \\3:\3Warning ! \\6:\6 heart \\5:\5 Key \\015:\015 Coin \\8\\189:\8\189 Bomb", + "emotes: ☆★〠♠♣♥♦♤♧♡♢☀☂♨♪♭♯♂♀", + "Markup main: |{{ArrowUp}}|{{ArrowDown}}|{{Warning}}|{{ERROR}}|", + "Markup numbers: |{{0}}|{{1}}|{{2}}|{{3}}|{{4}}|{{5}}|{{6}}|{{7}}|{{8}}|{{9}}|{{10}}|{{11}}|{{12}}|", + "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}}|" } local function onDebugRender(t) for i, v in ipairs(charsToDebug) do - EID.font:DrawStringUTF8(v, 45, 20 + ((i - 1) * 15), KColor(1, 1, 1, 1, 0, 0, 0), 0, true) + local pos = Vector(EIDConfig["XPosition"] * EIDConfig["Scale"], EIDConfig["YPosition"] - 25 + ((i - 1) * 14)) + EID:renderString(v, pos, Vector(EIDConfig["Scale"], EIDConfig["Scale"]), KColor(1, 1, 1, 1, 0, 0, 0), true) end end EID:AddCallback(ModCallbacks.MC_POST_RENDER, onDebugRender) diff --git a/main.lua b/main.lua index 9f360f83..1110d88b 100644 --- a/main.lua +++ b/main.lua @@ -10,6 +10,9 @@ EID.sacrificeCounter = 1 local IconSprite = Sprite() IconSprite:Load("gfx/icons.anm2", true) +EID.InlineIconSprite = Sprite() +EID.InlineIconSprite:Load("gfx/eid_inline_icons.anm2", true) + local ArrowSprite = Sprite() ArrowSprite:Load("gfx/icons.anm2", true) ArrowSprite:Play("Arrow", false) @@ -20,6 +23,7 @@ CardSprite:Load("gfx/cardfronts.anm2", true) require("eid_config") require("mod_config_menu") require("descriptions.ab+." .. EIDConfig["Language"]) +require("eid_data") require("eid_api") --use some very hacky trickery to get the path to this mod @@ -32,7 +36,7 @@ modPath = string.gsub(modPath, "\\", "/") modPath = string.gsub(modPath, ":/", ":\\") EID.font = Font() -- init font object -EID.font:Load(modPath .. "resources/font/default.fnt") -- load a font into the font object +EID.font:Load(modPath .. "resources/font/eid_default.fnt") -- load a font into the font object EID.font:SetMissingCharacter(2) if not EID.font:IsLoaded() then Isaac.DebugString("EID - ERROR: Could not load font from '" .. modPath .. "resources/font/default.fnt" .. "'") @@ -192,33 +196,43 @@ function printTrinketDescription(desc, typ) end function printBulletPoints(description, padding) - local textboxWidth = tonumber(EIDConfig["TextboxWidth"]) + local textboxWidth = tonumber(EIDConfig["TextboxWidth"]) * 4 + description = EID:replaceShortMarkupStrings(description) for line in string.gmatch(description, "([^#]+)") do - local array = {} + local formatedLines = {} local text = "" + local curLength = 0 for word in string.gmatch(line, "([^ ]+)") do - if string.len(text) + string.len(word) <= textboxWidth then - text = text .. " " .. word + local wordLength = EID:getStrWidth(word) + if EID:getIcon(word) ~= nil then + wordLength = EID:getIcon(word)[3] + end + if curLength + wordLength <= textboxWidth then + text = text .. word .. " " + curLength = curLength + wordLength else - table.insert(array, text) - text = word + table.insert(formatedLines, text) + text = word .. " " + curLength = wordLength end end - table.insert(array, text) + table.insert(formatedLines, text) local textColor = EID:getTextColor() - for i, v in ipairs(array) do + for i, lineToPrint in ipairs(formatedLines) do + -- render bulletpoint local posX = EIDConfig["XPosition"] - local bpIcon = " " -- no bulletpoint if i == 1 then - bpIcon = EID:getBulletpointIcon(v) - if string.find(bpIcon, "\007") == nil then - v = string.sub(v, 3 + #bpIcon) - posX = posX - 2 -- Move a bit to the left, to center icons + local bpIcon = EID:handleBulletpointIcon(lineToPrint) + if EID:getIcon(bpIcon) ~= nil then + lineToPrint = string.gsub(lineToPrint, bpIcon .. " ", "") + posX = posX - 2 end + + EID:renderString(bpIcon, Vector(posX, padding), Vector(EIDConfig["Scale"], EIDConfig["Scale"]), textColor, false) end EID:renderString( - bpIcon .. EID:replaceMarkupStrings(v), - Vector(posX, padding), + lineToPrint, + Vector(posX + 12, padding), Vector(EIDConfig["Scale"], EIDConfig["Scale"]), textColor, false diff --git a/resources/font/PixelMplus10-Regular-edited.ttf b/resources/font/PixelMplus10-Regular-edited.ttf index 70191975..9b4b1275 100644 Binary files a/resources/font/PixelMplus10-Regular-edited.ttf and b/resources/font/PixelMplus10-Regular-edited.ttf differ diff --git a/resources/font/PixelMplus10-Regular.sfd b/resources/font/PixelMplus10-Regular.sfd index c0a0a79e..142080ca 100644 --- a/resources/font/PixelMplus10-Regular.sfd +++ b/resources/font/PixelMplus10-Regular.sfd @@ -22,7 +22,7 @@ OS2Version: 1 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 0 CreationTime: 1370142052 -ModificationTime: 1598891831 +ModificationTime: 1599683486 PfmFamily: 17 TTFWeight: 400 TTFWidth: 5 @@ -1866,11 +1866,11 @@ Flags: W LayerCount: 2 Fore SplineSet -200 100 m 1,0,-1 - 200 200 l 1,1,-1 - 300 200 l 1,2,-1 - 300 100 l 1,3,-1 - 200 100 l 1,0,-1 +200 100 m 5,0,-1 + 200 200 l 5,1,-1 + 300 200 l 5,2,-1 + 300 100 l 5,3,-1 + 200 100 l 5,0,-1 200 400 m 1,4,-1 200 500 l 1,5,-1 300 500 l 1,6,-1 @@ -3966,36 +3966,10 @@ EndChar StartChar: currency Encoding: 164 164 133 -Width: 500 +Width: 100 GlyphClass: 2 Flags: W LayerCount: 2 -Fore -SplineSet -0 100 m 1,0,-1 - 0 200 l 1,1,-1 - 100 200 l 1,2,-1 - 100 100 l 1,3,-1 - 0 100 l 1,0,-1 -0 500 m 1,4,-1 - 0 600 l 1,5,-1 - 100 600 l 1,6,-1 - 100 500 l 1,7,-1 - 300 500 l 1,8,-1 - 300 200 l 1,9,-1 - 400 200 l 1,10,-1 - 400 100 l 1,11,-1 - 300 100 l 1,12,-1 - 300 200 l 1,13,-1 - 100 200 l 1,14,-1 - 100 500 l 1,15,-1 - 0 500 l 1,4,-1 -300 500 m 1,16,-1 - 300 600 l 1,17,-1 - 400 600 l 1,18,-1 - 400 500 l 1,19,-1 - 300 500 l 1,16,-1 -EndSplineSet EndChar StartChar: yen @@ -14465,7 +14439,7 @@ EndChar StartChar: arrowup Encoding: 8593 8593 387 -Width: 1000 +Width: 800 GlyphClass: 2 Flags: W LayerCount: 2 @@ -14473,14 +14447,14 @@ Fore SplineSet 100 400 m 1,0,-1 100 500 l 1,1,-1 - 200 500 l 1,2,-1 - 200 400 l 1,3,-1 + 300 500 l 1,2,-1 + 300 400 l 1,3,-1 100 400 l 1,0,-1 -500 600 m 1,4,-1 - 500 -100 l 1,5,-1 - 400 -100 l 1,6,-1 - 400 600 l 1,7,-1 - 300 600 l 1,8,-1 +500 0 m 1,4,-1 + 500 0 l 1,5,-1 + 400 0 l 1,6,-1 + 400 0 l 1,7,-1 + 300 0 l 1,8,-1 300 500 l 1,9,-1 200 500 l 1,10,-1 200 600 l 1,11,-1 @@ -14496,11 +14470,12 @@ SplineSet 700 500 l 1,21,-1 800 500 l 1,22,-1 800 400 l 1,23,-1 - 700 400 l 1,24,-1 - 700 500 l 1,25,-1 - 600 500 l 1,26,-1 - 600 600 l 1,27,-1 - 500 600 l 1,4,-1 + 600 400 l 1,24,-1 + 600 400 l 1,25,-1 + 600 400 l 1,26,-1 + 600 17 l 0,27,-1 + 600 0 l 1,28,-1 + 500 0 l 1,4,-1 EndSplineSet EndChar @@ -14548,7 +14523,7 @@ EndChar StartChar: arrowdown Encoding: 8595 8595 389 -Width: 1000 +Width: 800 GlyphClass: 2 Flags: W LayerCount: 2 @@ -14557,14 +14532,14 @@ SplineSet 100 200 m 1,0,-1 100 300 l 1,1,-1 200 300 l 1,2,-1 - 200 200 l 1,3,-1 - 300 200 l 1,4,-1 - 300 100 l 1,5,-1 - 400 100 l 1,6,-1 + 200 300 l 1,3,-1 + 300 300 l 1,4,-1 + 300 800 l 1,5,-1 + 400 800 l 1,6,-1 400 800 l 1,7,-1 500 800 l 1,8,-1 - 500 100 l 1,9,-1 - 600 100 l 1,10,-1 + 500 800 l 1,9,-1 + 600 800 l 1,10,-1 600 0 l 1,11,-1 500 0 l 1,12,-1 500 -100 l 1,13,-1 @@ -14576,8 +14551,8 @@ SplineSet 200 200 l 1,19,-1 100 200 l 1,0,-1 600 100 m 1,20,-1 - 600 200 l 1,21,-1 - 700 200 l 1,22,-1 + 600 300 l 1,21,-1 + 700 300 l 1,22,-1 700 100 l 1,23,-1 600 100 l 1,20,-1 700 200 m 1,24,-1 @@ -497173,7 +497148,7 @@ EndChar StartChar: uni01C3 Encoding: 451 451 7272 Width: 500 -Flags: WO +Flags: W LayerCount: 2 Fore SplineSet diff --git a/resources/font/default_0.png b/resources/font/default_0.png deleted file mode 100644 index e9e69860..00000000 Binary files a/resources/font/default_0.png and /dev/null differ diff --git a/resources/font/default_1.png b/resources/font/default_1.png deleted file mode 100644 index ab9e586c..00000000 Binary files a/resources/font/default_1.png and /dev/null differ diff --git a/resources/font/default.fnt b/resources/font/eid_default.fnt similarity index 95% rename from resources/font/default.fnt rename to resources/font/eid_default.fnt index 165ce0df..7e69d123 100644 Binary files a/resources/font/default.fnt and b/resources/font/eid_default.fnt differ diff --git a/resources/font/eid_default_0.png b/resources/font/eid_default_0.png new file mode 100644 index 00000000..6d4c7eb4 Binary files /dev/null and b/resources/font/eid_default_0.png differ diff --git a/resources/font/eid_default_1.png b/resources/font/eid_default_1.png new file mode 100644 index 00000000..b1a4403d Binary files /dev/null and b/resources/font/eid_default_1.png differ diff --git a/resources/gfx/EID_Icons.png b/resources/gfx/EID_Icons.png index 355c2e3a..bc5f1574 100644 Binary files a/resources/gfx/EID_Icons.png and b/resources/gfx/EID_Icons.png differ diff --git a/resources/gfx/eid_inline_icons.anm2 b/resources/gfx/eid_inline_icons.anm2 new file mode 100644 index 00000000..6693704b --- /dev/null +++ b/resources/gfx/eid_inline_icons.anm2 @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/gfx/eid_inline_icons.png b/resources/gfx/eid_inline_icons.png new file mode 100644 index 00000000..09e7976a Binary files /dev/null and b/resources/gfx/eid_inline_icons.png differ