diff --git a/manifest.json b/manifest.json index 793ecb7..edea097 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id": "Roland", "name": "Roland", "prefix": "Roland", - "version": "2.9.48", + "version": "2.9.49", "badge_colour": "8BE9FD", "display_name": "Roland", "main_file": "src/main.lua", diff --git a/src/tweaks.lua b/src/tweaks.lua index 54102ed..82d9b94 100644 --- a/src/tweaks.lua +++ b/src/tweaks.lua @@ -61,16 +61,17 @@ function G.FUNCS.use_card(e, ...) return orig_use_card(e, ...) end - local normal = ref.area ~= G.pack_cards or not G.GAME.pack_choices or G.GAME.pack_choices <= 0 + local normal = G.STATE == G.STATES.SHOP or + ref.area ~= G.pack_cards or + not G.GAME.pack_choices or + G.GAME.pack_choices <= 0 + ref.from_area = ref.from_area or ref.area play_sound("tarot1", percent, 0.6) discover_card(ref.config.center) ref:use_consumeable(ref.area) SMODS.calculate_context {area = ref.area, consumeable = ref, using_consumeable = true} - - q(function() - ref:remove() - end) + ref:remove() if normal then return