Added Blank Makrup and fixed generic Trinket and collectible icon
This commit is contained in:
1 parent
f562d6cd7d
commit
5df8efde7f
3 files changed
+15
-3
No files matched your search
+2
-2
@@ -316,11 +316,11 @@ end
|
||||
function EID:createItemIconObject(str)
|
||||
local collID,numReplace = string.gsub(str, "Collectible", "")
|
||||
local item = nil
|
||||
if numReplace>0 then
|
||||
if numReplace>0 and collID~="" then
|
||||
item = EID.itemConfig:GetCollectible(tonumber(collID))
|
||||
end
|
||||
local trinketID,numReplace2 = string.gsub(str, "Trinket", "")
|
||||
if numReplace2>0 then
|
||||
if numReplace2>0 and trinketID~="" then
|
||||
item = EID.itemConfig:GetTrinket(tonumber(trinketID))
|
||||
end
|
||||
if item == nil then
|
||||
|
||||
@@ -20,6 +20,7 @@ EID.InlineIcons = {
|
||||
["ArrowUp"] = {"ArrowUp", 0, 8, 9},
|
||||
["ArrowDown"] = {"ArrowDown", 0, 8, 9},
|
||||
["Warning"] = {"Warning", 0, 4, 9},
|
||||
["Blank"] = {"Blank", 0, 0, 0},
|
||||
-- Numbers
|
||||
["0"] = {"numbers", 0, 4, 7},
|
||||
["1"] = {"numbers", 1, 4, 7, -2},
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<AnimatedActor>
|
||||
<Info CreatedBy="Unknown" CreatedOn="05.11.2020 22:08:32" Version="51" Fps="30"/>
|
||||
<Info CreatedBy="Unknown" CreatedOn="06.11.2020 20:26:16" Version="52" Fps="30"/>
|
||||
<Content>
|
||||
<Spritesheets>
|
||||
<Spritesheet Path="eid_inline_icons.png" Id="0"/>
|
||||
@@ -247,5 +247,16 @@
|
||||
<NullAnimations/>
|
||||
<Triggers/>
|
||||
</Animation>
|
||||
<Animation Name="Blank" FrameNum="1" Loop="false">
|
||||
<RootAnimation>
|
||||
<Frame XPosition="0" YPosition="0" XScale="100" YScale="100" Delay="1" Visible="true" RedTint="255" GreenTint="255" BlueTint="255" AlphaTint="255" RedOffset="0" GreenOffset="0" BlueOffset="0" Rotation="0" Interpolated="false"/>
|
||||
</RootAnimation>
|
||||
<LayerAnimations>
|
||||
<LayerAnimation LayerId="0" Visible="true"/>
|
||||
<LayerAnimation LayerId="1" Visible="true"/>
|
||||
</LayerAnimations>
|
||||
<NullAnimations/>
|
||||
<Triggers/>
|
||||
</Animation>
|
||||
</Animations>
|
||||
</AnimatedActor>
|
||||
Reference in new issue
Block a user