diff --git a/lib/utils.lua b/lib/utils.lua index 3c8548c3..b031c96e 100644 --- a/lib/utils.lua +++ b/lib/utils.lua @@ -668,7 +668,7 @@ function Entropy.HigherCardRank(card) elseif rank_suffix == 11 then rank_suffix = 'Jack' elseif rank_suffix == 12 then rank_suffix = 'Queen' elseif rank_suffix == 13 then rank_suffix = 'King' - elseif rank_suffix == 14 then raFnk_suffix = 'Ace' + elseif rank_suffix == 14 then rank_suffix = 'Ace' end return ({ Queen = "King", diff --git a/lovely/uibox_shader.toml b/lovely/uibox_shader.toml index f6d368f4..e2bf4813 100644 --- a/lovely/uibox_shader.toml +++ b/lovely/uibox_shader.toml @@ -4,7 +4,7 @@ dump_lua = true priority = 1 # UI Element Shader Patch by InvalidOS -# v2.0.2 +# v2.0.2a # play lemniscate (when it releases) (it is not released yet) ## hacky method of preventing repeat patches @@ -59,13 +59,11 @@ payload = ''' elseif shader == "vortex" then G.SHADERS['vortex']:send('vortex_amt', G.TIMERS.REAL - (G.vortex_time or 0)) else - local prefix = SMODS.Shaders[shader] and SMODS.Shaders[shader].mod and SMODS.Shaders[shader].mod.prefix - local prefixless_key = prefix and string.sub(shader, #prefix + 2) or shader - - local tile_scale = G.TILESCALE*G.TILESIZE + local key = SMODS.Shaders[shader].original_key + local tile_scale = G.TILESCALE*G.TILESIZE*G.CANV_SCALE -- actually supported - G.SHADERS[shader]:send(prefixless_key, args) + G.SHADERS[shader]:send(key, args) G.SHADERS[shader]:send("uibox_size", {self.VT.w * tile_scale, self.VT.h * tile_scale}) G.SHADERS[shader]:send("uibox_pos", {self.VT.x * tile_scale, self.VT.y * tile_scale}) -- G.SHADERS[shader]:send("screen_scale", G.TILESCALE*G.TILESIZE*G.CANV_SCALE)