Skip to content

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesthejellyfish authored Mar 8, 2024
1 parent 3bcd3cb commit d25ced6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 26 deletions.
24 changes: 0 additions & 24 deletions JellyJokers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -745,30 +745,6 @@ function Card.remove_from_deck(self, from_debuff)
remove_from_deckref(self, from_debuff)
end

local openref = Card.open
function Card.open(self)
if self.ability.set == "Booster" then
self.config.center.config.choose = self.config.center.config.choose or 1
self.config.center.config.choose = math.min(self.config.center.config.choose + G.GAME.extra_gacha_pulls,
self.ability.extra)
end
openref(self)
end

-- Yield My Flesh
local evaluate_playref = G.FUNCS.evaluate_play
function G.FUNCS.evaluate_play(self, e)
evaluate_playref(self, e)

for i = 1, #G.jokers.cards do
local effects = eval_card(G.jokers.cards[i],
{ card = G.consumeables, after = true, scored_chips = hand_chips * mult })
if effects.jokers then
card_eval_status_text(G.jokers.cards[i], 'jokers', nil, 0.3, nil, effects.jokers)
end
end
end

local get_id_ref = Card.get_id
function Card.get_id(self)
if next(find_joker("Double Vision")) then return 2 end
Expand Down
4 changes: 2 additions & 2 deletions JellyTarots.lua
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,9 @@ function SMODS.INIT.JellyTarots()
m_coal = {max = 500, order = 16, name = "Coal Card", set = "Enhanced", pos = {x=6,y=5}, effect = "Coal Card", label = "Coal Card", config = {extra = {sub_chips = 10, sub_mult = 2, current = 1, rounds = 4}}},
}

SMODS.Sprite:new("Tarot", SMODS.findModByID("JellyJokers").path, "Tarots_JellyMod.png", 71, 95, "asset_atli")
SMODS.Sprite:new("Tarot", SMODS.findModByID("JellyTarots").path, "Tarots_JellyMod.png", 71, 95, "asset_atli")
:register()
SMODS.Sprite:new("centers", SMODS.findModByID("JellyJokers").path, "Enhancers_JellyMod.png", 71, 95, "asset_atli")
SMODS.Sprite:new("centers", SMODS.findModByID("JellyTarots").path, "Enhancers_JellyMod.png", 71, 95, "asset_atli")
:register()
addTarotsToPools(tarots)
addEnhancementsToPools(enhancements)
Expand Down

0 comments on commit d25ced6

Please sign in to comment.