diff --git a/features/eid_conditionals_funcs.lua b/features/eid_conditionals_funcs.lua index f9a60f5b..7d1f2461 100644 --- a/features/eid_conditionals_funcs.lua +++ b/features/eid_conditionals_funcs.lua @@ -333,7 +333,7 @@ function EID:IsGreedMode() end function EID:IsGreedModePlusTarot() - return game:IsGreedMode() and EID:ConditionalItemCheck(451, true) + return EID:IsGreedMode() and EID:ConditionalItemCheck(451, true) end function EID:PlayersHaveRestock() diff --git a/features/eid_data.lua b/features/eid_data.lua index 5dde6cd0..4983710d 100644 --- a/features/eid_data.lua +++ b/features/eid_data.lua @@ -1,3 +1,5 @@ +local game = Game() + EID.ButtonToIconMap = { [ButtonAction.ACTION_SHOOTUP] = "{{ButtonY}}", [ButtonAction.ACTION_SHOOTDOWN] = "{{ButtonA}}", @@ -675,7 +677,7 @@ EID.InlineIcons["Tearsize"] = EID.isRepentance and EID.InlineIcons["TearsizeREP" -- Function for handling colors that fade between multiple different colors (rainbow, gold, tarot cloth purple) local function SwagColors(colors, maxAnimTime) maxAnimTime = maxAnimTime or 80 - local animTime = Game():GetFrameCount() % maxAnimTime + local animTime = game:GetFrameCount() % maxAnimTime local colorFractions = (maxAnimTime - 1) / #colors local subAnm = math.floor(animTime / (colorFractions + 1)) + 1 local primaryColorIndex = subAnm % (#colors + 1) @@ -785,7 +787,7 @@ EID.InlineColors = { -- Text will blink frequently ["ColorBlink"] = function(color) local maxAnimTime = 40 - local animTime = Game():GetFrameCount() % maxAnimTime + local animTime = game:GetFrameCount() % maxAnimTime color = EID:copyKColor(color) or EID:getTextColor() if animTime < maxAnimTime / 2 then color.Alpha = 1 * color.Alpha @@ -797,7 +799,7 @@ EID.InlineColors = { -- Text will fade in and out ["ColorFade"] = function(color) local maxAnimTime = 30 - local animTime = Game():GetFrameCount() % (maxAnimTime + 10) + local animTime = game:GetFrameCount() % (maxAnimTime + 10) color = EID:copyKColor(color) or EID:getTextColor() if animTime < maxAnimTime / 2 then color.Alpha = animTime / (maxAnimTime / 2) * color.Alpha diff --git a/features/eid_debugging.lua b/features/eid_debugging.lua index d53f7718..ed6d88da 100644 --- a/features/eid_debugging.lua +++ b/features/eid_debugging.lua @@ -1,3 +1,4 @@ +local game = Game() local showDebugChars = false @@ -198,7 +199,7 @@ EID:removeIgnoredEntity(5,100,10) -- un-Ignore "Halo of flies" collectible entit EID:addColor("ColorTwitterBlue", KColor(0, 0.671875, 0.9296875, 1), nil) EID:addColor("ColorBlackBlink", nil, function(color) local maxAnimTime = 30 - local animTime = Game():GetFrameCount() % maxAnimTime + local animTime = game:GetFrameCount() % maxAnimTime color = EID:copyKColor(color) or EID:getTextColor() if animTime < maxAnimTime / 2 then color = KColor(0, 0, 0, 1 * color.Alpha) diff --git a/features/eid_grid_descriptions.lua b/features/eid_grid_descriptions.lua index dee6a6e5..05841b3d 100644 --- a/features/eid_grid_descriptions.lua +++ b/features/eid_grid_descriptions.lua @@ -1,3 +1,5 @@ +local game = Game() + --------------- Grid entity description modifiers --------------- -- Table containing grid entity description handlers @@ -90,7 +92,7 @@ end -- Handle Sacrifice room payout ---------------------------------------------------- local function SacrificeRoomCondition(_) - return Game():GetRoom():GetType() == RoomType.ROOM_SACRIFICE and EID.Config["DisplaySacrificeInfo"] + return game:GetRoom():GetType() == RoomType.ROOM_SACRIFICE and EID.Config["DisplaySacrificeInfo"] end local function SacrificeRoomCallback(descObj) @@ -103,7 +105,7 @@ local function SacrificeRoomCallback(descObj) local curCounter = descObj.ObjSubType or 1 if curCounter <= 2 then --Remove B1 Bomb drop info when not on B1 - if Game():GetLevel():GetAbsoluteStage() > 1 then + if game:GetLevel():GetAbsoluteStage() > 1 then local splitPoint = string.find(descObj.Description, '#', 1) descObj.Description = descObj.Description:sub(1,splitPoint-1) end diff --git a/features/eid_holdmapdesc.lua b/features/eid_holdmapdesc.lua index e9507045..1ad0e4b3 100644 --- a/features/eid_holdmapdesc.lua +++ b/features/eid_holdmapdesc.lua @@ -173,14 +173,14 @@ EID.ItemReminderDescriptionModifier = { local inAscent = EID.isRepentance and (level:IsAscent() or level:IsPreAscent()) local final = not level:IsNextStageAvailable() - if EID:IsGreedMode() then + if game:IsGreedMode() then skip = 1 if stageNum == 5 then skip = 0 -- Depths 2 -> Womb 1 elseif stageNum == 7 or stageNum == 10 then skip = 2 elseif stageNum == 0 then count = 1 end -- Womb 1 -> Sheol, Sheol -> Chest else if final or stageNum == 12 then count = 1 -- Dark Room/Chest/The Void/Home/Corpse 2 doesn't display any more - elseif EID:IsGreedMode() then count = 2 -- prevent Greed Mode Sheol from behaving weird + elseif game:IsGreedMode() then count = 2 -- prevent Greed Mode Sheol from behaving weird elseif stageNum == 8 then count = 3; skip = 1 -- Womb 2 displays Sheol and Cathe elseif stageNum == 9 then count = 3 -- ??? displays Sheol and Cathe elseif stageNum == 10 then skip = 1 end -- Sheol/Cathe skip one to display Dark Room/Chest