Merge pull request #60 from lord-ruby/dev

better checks for echo

Author: lord-ruby

compat/cryptid/reverse_codes.lua

@@ -1557,11 +1557,13 @@ local echo = {
         if not G.GAME.entr_echo then
             G.GAME.entr_echo = {}
         end
-        G.GAME.entr_echo[cards[1].config.center.key] = G.GAME.entr_echo[cards[1].config.center.key] or {}
-        G.GAME.entr_echo[cards[1].config.center.key][#G.GAME.entr_echo[cards[1].config.center.key]+1] = cards[2].config.center.key
-        
-        G.GAME.entr_echo[cards[2].config.center.key] = G.GAME.entr_echo[cards[2].config.center.key] or {}
-        G.GAME.entr_echo[cards[2].config.center.key][#G.GAME.entr_echo[cards[2].config.center.key]+1] = cards[1].config.center.key
+        if #cards >= 2 then
+            G.GAME.entr_echo[cards[1].config.center.key] = G.GAME.entr_echo[cards[1].config.center.key] or {}
+            G.GAME.entr_echo[cards[1].config.center.key][#G.GAME.entr_echo[cards[1].config.center.key]+1] = cards[2].config.center.key
+
+            G.GAME.entr_echo[cards[2].config.center.key] = G.GAME.entr_echo[cards[2].config.center.key] or {}
+            G.GAME.entr_echo[cards[2].config.center.key][#G.GAME.entr_echo[cards[2].config.center.key]+1] = cards[1].config.center.key
+        end
     end,
     can_use = function(self, card)
         local cards = Cryptid.get_highlighted_cards({G.consumeables, G.shop_jokers, G.shop_vouchers, G.shop_booster, G.pack_cards}, card, 2,2, function(card)

lib/utils.lua

@@ -1903,4 +1903,9 @@ function Entropy.allow_spawning(center)
         if v.config and v.config.center and center and v.config.center.key == center.key then return SMODS.showman(center.key) or nil end
     end
     return true
-end
+end
+
+function Entropy.get_reroll_height()
+    if HotPotato then return 1.04 end
+    return Entropy.CanSwitchAltPath() and 1 or 1.6
+end

lovely/core.toml

@@ -1016,7 +1016,7 @@ payload = '''
                             }}
                           }},              
                         }} or nil),
-                        {n=G.UIT.R, config={align = "cm", minw = 2.8, minh = Entropy.CanSwitchAltPath() and 1 or 1.6, r=0.15,colour = G.C.GREEN, button = 'reroll_shop', func = 'can_reroll', hover = true,shadow = true}, nodes = {
+                        {n=G.UIT.R, config={align = "cm", minw = 2.8, minh = Entropy.get_reroll_height(), r=0.15,colour = G.C.GREEN, button = 'reroll_shop', func = 'can_reroll', hover = true,shadow = true}, nodes = {
                           {n=G.UIT.R, config={align = "cm", padding = 0.07, focus_args = {button = 'x', orientation = 'cr'}, func = 'set_button_pip'}, nodes={
                             {n=G.UIT.R, config={align = "cm", maxw = 1.3}, nodes={
                               {n=G.UIT.T, config={text = localize('k_reroll'), scale = 0.4, colour = G.C.WHITE, shadow = true}},