diff --git a/manifest.json b/manifest.json index 82f0736..adabff9 100644 --- a/manifest.json +++ b/manifest.json @@ -17,5 +17,5 @@ "conflicts": [ "Jen" ], - "version": "1.3.0" + "version": "1.3.1" } \ No newline at end of file diff --git a/src/back.lua b/src/back.lua index 3bc62fe..ab66ea6 100644 --- a/src/back.lua +++ b/src/back.lua @@ -333,6 +333,7 @@ back { end, alt_apply = function(_) G.GAME.alt_obsidian = true + G.GAME.obsidian = true redeem_omen_globe() end, apply = function(_) @@ -341,6 +342,37 @@ back { end, } +local orig_get_current_pool = get_current_pool + +function get_current_pool(_type, ...) + local pool, pool_key = orig_get_current_pool(_type, ...) + + if not G.GAME.alt_obsidian or not ({ + Code = true, + Chess = true, + Tarot = true, + Planet = true, + Alphabet = true, + Spectral = true, + jane_tokens = true, + })[_type] then + return pool, pool_key + end + + for k, _ in pairs(pool) do + pool[k] = "UNAVAILABLE" + end + + for k, v in pairs(G.P_CENTERS) do + if type(v) == "table" and (v.name == "Black Hole" or v.name == "The Soul") or v.hidden then + pool[#pool + 1] = k + end + end + + print(pool_key) + return pool, pool_key +end + local function apply_orrery() Jane.q(function() local orrery = {} diff --git a/src/main.lua b/src/main.lua index 10e0d1d..d18519a 100644 --- a/src/main.lua +++ b/src/main.lua @@ -158,13 +158,8 @@ function Jane.get_small_chipmult_sum(chips, mult) end function Jane.hidden(card) - local hidden = (type(card) == "table" and (card.name == "Black Hole" or card.name == "The Soul") or card.hidden) - - if G.GAME.alt_obsidian then - return not hidden - end - - return G.GAME and not G.GAME.obsidian and hidden + return G.GAME and not G.GAME.obsidian and + (type(card) == "table" and (card.name == "Black Hole" or card.name == "The Soul") or card.hidden) end function Jane.is_end_of_ante(context, card)