Merge branch 'main' of https://git.emik.dev/emik/Jane

src/slugcat.lua

@@ -418,7 +418,13 @@ SMODS.Joker {
                 c[i].jane_spearmaster = true
                 c[i]:use_consumeable()
                 SMODS.calculate_context {using_consumeable = true, consumeable = c[i], area = c[i].from_area}
+                local normal = c[i].area ~= G.pack_cards
                 c[i]:start_dissolve()
+
+                if not normal then
+                    G.GAME.pack_choices = G.GAME.pack_choices - 1
+                    local _ = G.GAME.pack_choices <= 0 and G.FUNCS.end_consumeable()
+                end
             end
         end
     end,