diff --git a/config.lua b/config.lua index 55e92ba..c4d3aa9 100644 --- a/config.lua +++ b/config.lua @@ -1,7 +1,7 @@ return { equinox_assist = false, - faster_planets = true, - harsh_ante_scaling = true, + faster_planets = false, + harsh_ante_scaling = false, illusion_seal = true, import_funky = false, no_wild_debuff = true, diff --git a/manifest.json b/manifest.json index b729eb8..5f2ef21 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "author": [ "Emik" ], - "version": "2.5.9", + "version": "2.5.10", "badge_colour": "8BE9FD", "main_file": "src/main.lua", "badge_text_colour": "44475A", diff --git a/src/tweaks.lua b/src/tweaks.lua index 61a66b3..0061d95 100644 --- a/src/tweaks.lua +++ b/src/tweaks.lua @@ -17,7 +17,6 @@ function Card:use_consumeable(area, copier, ...) if SMODS.Mods.Roland.config.faster_planets and self.ability.consumeable.hand_type then set_consumeable_usage(self) level_up_hand(copier or self, self.ability.consumeable.hand_type, true) - self:remove() return end @@ -52,6 +51,25 @@ function Card:use_consumeable(area, copier, ...) } end +local orig_use_card = G.FUNCS.use_card + +function G.FUNCS.use_card(e, ...) + if not SMODS.Mods.Roland.config.faster_planets or + not (((e.config.ref_table or {}).ability or {}).consumeable or {}).hand_type then + return orig_use_card(e, ...) + end + + e.config.ref_table:use_consumeable(e.config.ref_table.area) + + SMODS.calculate_context { + using_consumeable = true, + consumeable = e.config.ref_table, + area = e.config.ref_table.from_area, + } + + e.config.ref_table:remove() +end + local orig_create_card_for_shop = create_card_for_shop function create_card_for_shop(...)