Merge remote-tracking branch 'upstream/master'

This commit is contained in:
kittenchilly committed 2022-01-07 17:54:48 -06:00
commit e6d74a1693
5 files changed
+43 -2

No files matched your search

+1 -1
View File
@@ -328,7 +328,7 @@ EID.descriptions["en_us"].collectibles={
{"313", "Holy Mantle", "Ignore the first hit in every room"},
{"314", "Thunder Thighs", "↑ +1 Health up#↓ -0.4 Speed down#Destroy rocks when walking over them"},
{"315", "Strange Attractor", "Magnetic tears#Affects enemies, pickups and trinkets"},
{"316", "Cursed Eye", "Charged wave of tears#!!! When hit while partially charged, teleports you to a random room"},
{"316", "Cursed Eye", "Charged wave of tears#!!! When hit while partially charged, teleports you to a random room#Does not teleport if you have {{Collectible260}}Black Candle"},
{"317", "Mysterious Liquid", "Tears leave creep#Creep deals 30 damage per second"},
{"318", "Gemini", "Close combat familiar#Deals 6 contact damage per second"},
{"319", "Cain's Other Eye", "Bounces around the room#Shoots towards Isaac#His damage equals your damage"},
+14
View File
@@ -270,6 +270,20 @@ EID.InlineIcons = {
["Crafting28"] = {"Crafting", 28, 14, 16, -2, -3},
["Crafting29"] = {"Crafting", 29, 14, 16, -2, -3},
["Crafting30"] = {"Crafting", 30, 14, 16, -2, -3},
-- Stats
["Damage"] = {"Stats", 0, 16, 16, 0, 8},
["Speed"] = {"Stats", 1, 16, 16, 0, 8},
["Tears"] = {"Stats", 2, 16, 16, 0, 8},
["Range"] = {"Stats", 3, 16, 16, 0, 8},
["Shotspeed"] = {"Stats", 4, 16, 16, 0, 8},
["Luck"] = {"Stats", 5, 16, 16, 0, 8},
["AngelChance"] = {"Stats", 6, 16, 16, 0, 8},
["DevilChance"] = {"Stats", 7, 16, 16, 0, 8},
["AngelDevilChance"] = {"Stats", 8, 16, 16, 0, 8},
["PlanetariumChance"] = {"Stats", 9, 16, 16, 0, 8},
["Crone"] = {"Stats", 10, 16, 16, 0, 8},
}
-- Table that holds Colors used for markup objects. Example: "{{ColorRed}}"
+4
View File
@@ -167,6 +167,10 @@ questionMarkSprite:ReplaceSpritesheet(1,"gfx/items/collectibles/questionmark.png
questionMarkSprite:LoadGraphics()
function EID:IsAltChoice(pickup)
-- do not run this while Curse of the Blind is active, since this function is really just a "is collectible pedestal a red question mark" check
if game:GetLevel():GetCurses() & LevelCurse.CURSE_OF_BLIND == LevelCurse.CURSE_OF_BLIND then
return false
end
if pickup:GetData() == nil then
return false
end
+24 -1
View File
@@ -1,5 +1,5 @@
<AnimatedActor>
<Info CreatedBy="Unknown" CreatedOn="11/18/2021 8:31:30 PM" Version="72" Fps="30"/>
<Info CreatedBy="Unknown" CreatedOn="07.01.2022 23:45:43" Version="74" Fps="30"/>
<Content>
<Spritesheets>
<Spritesheet Path="eid_inline_icons.png" Id="0"/>
@@ -368,5 +368,28 @@
<NullAnimations/>
<Triggers/>
</Animation>
<Animation Name="Stats" FrameNum="11" 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">
<Frame XPosition="0" YPosition="0" XPivot="8" YPivot="8" XCrop="0" YCrop="208" Width="16" Height="16" 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"/>
<Frame XPosition="0" YPosition="0" XPivot="8" YPivot="8" XCrop="16" YCrop="208" Width="16" Height="16" 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"/>
<Frame XPosition="0" YPosition="0" XPivot="8" YPivot="8" XCrop="32" YCrop="208" Width="16" Height="16" 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"/>
<Frame XPosition="0" YPosition="0" XPivot="8" YPivot="8" XCrop="48" YCrop="208" Width="16" Height="16" 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"/>
<Frame XPosition="0" YPosition="0" XPivot="8" YPivot="8" XCrop="64" YCrop="208" Width="16" Height="16" 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"/>
<Frame XPosition="0" YPosition="0" XPivot="8" YPivot="8" XCrop="80" YCrop="208" Width="16" Height="16" 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"/>
<Frame XPosition="0" YPosition="0" XPivot="8" YPivot="8" XCrop="96" YCrop="208" Width="16" Height="16" 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"/>
<Frame XPosition="0" YPosition="0" XPivot="8" YPivot="8" XCrop="112" YCrop="208" Width="16" Height="16" 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"/>
<Frame XPosition="0" YPosition="0" XPivot="8" YPivot="8" XCrop="112" YCrop="224" Width="16" Height="16" 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"/>
<Frame XPosition="0" YPosition="0" XPivot="8" YPivot="8" XCrop="0" YCrop="224" Width="16" Height="16" 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"/>
<Frame XPosition="0" YPosition="0" XPivot="8" YPivot="8" XCrop="16" YCrop="224" Width="16" Height="16" 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"/>
</LayerAnimation>
<LayerAnimation LayerId="1" Visible="true"/>
</LayerAnimations>
<NullAnimations/>
<Triggers/>
</Animation>
</Animations>
</AnimatedActor>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 29 KiB