1.0.0f

functions/button_callbacks.lua

@@ -1169,7 +1169,7 @@ G.FUNCS.apply_window_changes = function(_initial)
     vsync = G.SETTINGS.WINDOW.vsync,
     resizable = true,
     display = G.SETTINGS.WINDOW.selected_display,
-    highdpi = true
+    highdpi = (love.system.getOS() == 'OS X')
     })
   G.SETTINGS.QUEUED_CHANGE = {}
   if _initial ~= true then
@@ -1215,7 +1215,7 @@ G.FUNCS.RUN_SETUP_check_back = function(e)
 end
 
 G.FUNCS.RUN_SETUP_check_back_name = function(e)
-  if G.GAME.viewed_back.name ~= e.config.id then 
+  if e.config.object and G.GAME.viewed_back.name ~= e.config.id then 
     --removes the UI from the previously selected back and adds the new one
 
     e.config.object:remove() 
@@ -2085,8 +2085,8 @@ end
   end
 
   G.FUNCS.can_skip_booster = function(e)
-    if G.pack_cards and G.pack_cards.cards[1] and 
-    (G.STATE == G.STATES.PLANET_PACK or G.STATE == G.STATES.STANDARD_PACK or G.STATE == G.STATES.BUFFOON_PACK or (G.hand and G.hand.cards[1])) then 
+    if G.pack_cards and (G.pack_cards.cards[1]) and 
+    (G.STATE == G.STATES.PLANET_PACK or G.STATE == G.STATES.STANDARD_PACK or G.STATE == G.STATES.BUFFOON_PACK or (G.hand and (G.hand.cards[1] or (G.hand.config.card_limit <= 0)))) then 
         e.config.colour = G.C.GREY
         e.config.button = 'skip_booster'
     else
@@ -2458,11 +2458,6 @@ end
           G.SHOP_SIGN = nil
           G.STATE_COMPLETE = false
           G.STATE = G.STATES.BLIND_SELECT
-          if G.GAME.round_resets.blind_states.Boss == 'Defeated' then 
-            G.GAME.round_resets.blind_ante = G.GAME.round_resets.ante
-            G.GAME.round_resets.blind_tags.Small = get_next_tag_key()
-            G.GAME.round_resets.blind_tags.Big = get_next_tag_key()
-          end
           G.CONTROLLER.locks.toggle_shop = nil
           return true
         end
@@ -2906,6 +2901,12 @@ G.FUNCS.cash_out = function(e)
         G.VIBRATION = G.VIBRATION + 1
       end
       ease_chips(0)
+      if G.GAME.round_resets.blind_states.Boss == 'Defeated' then 
+        G.GAME.round_resets.blind_ante = G.GAME.round_resets.ante
+        G.GAME.round_resets.blind_tags.Small = get_next_tag_key()
+        G.GAME.round_resets.blind_tags.Big = get_next_tag_key()
+      end
+      reset_blinds()
       delay(0.6)
 end