Use better organization
This commit is contained in:
parent
1e4920143b
commit
817f1bc59a
3 changed files with 10 additions and 8 deletions
|
|
@ -18,5 +18,5 @@
|
||||||
"conflicts": [
|
"conflicts": [
|
||||||
"Jen"
|
"Jen"
|
||||||
],
|
],
|
||||||
"version": "1.11.23"
|
"version": "1.11.24"
|
||||||
}
|
}
|
||||||
|
|
@ -279,7 +279,7 @@ SMODS.Joker {
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
function Jane.update_honey()
|
function Jane.check_honey()
|
||||||
if not G.GAME then
|
if not G.GAME then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
@ -351,6 +351,7 @@ SMODS.Joker {
|
||||||
blueprint_compat = false,
|
blueprint_compat = false,
|
||||||
cost = 8,
|
cost = 8,
|
||||||
rarity = 3,
|
rarity = 3,
|
||||||
|
add_to_deck = Jane.check_honey,
|
||||||
loc_vars = function(_, _, card)
|
loc_vars = function(_, _, card)
|
||||||
local level = tonumber(card.ability.extra.level) or 1
|
local level = tonumber(card.ability.extra.level) or 1
|
||||||
|
|
||||||
|
|
@ -394,8 +395,7 @@ SMODS.Joker {
|
||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
draw = function(_, card)
|
draw = function(_, card)
|
||||||
if not Jane.update_honey() and
|
if card.added_to_deck and
|
||||||
card.added_to_deck and
|
|
||||||
card.children.center and
|
card.children.center and
|
||||||
card.children.floating_sprite then
|
card.children.floating_sprite then
|
||||||
local extra = card.ability.extra or {}
|
local extra = card.ability.extra or {}
|
||||||
|
|
|
||||||
|
|
@ -630,13 +630,15 @@ SMODS.Joker {
|
||||||
local rgb = G.C.jane_RGB
|
local rgb = G.C.jane_RGB
|
||||||
rgb[1], rgb[2], rgb[3] = Jane.hsv(1 - (G.TIMERS.REAL / 3 % 1), math.sin(G.TIMERS.REAL) / 10 + 0.6, 1)
|
rgb[1], rgb[2], rgb[3] = Jane.hsv(1 - (G.TIMERS.REAL / 3 % 1), math.sin(G.TIMERS.REAL) / 10 + 0.6, 1)
|
||||||
|
|
||||||
if card.edition and card.edition.Roland_frozen then
|
local _ = card and
|
||||||
card:set_edition("e_base")
|
card.children.floating_sprite and
|
||||||
elseif card.config.center.key == "j_jane_saint" and card.children.floating_sprite then
|
|
||||||
card.children.floating_sprite:set_sprite_pos({x = card.ability.extra.is_attuned and 2 or 1, y = 0})
|
card.children.floating_sprite:set_sprite_pos({x = card.ability.extra.is_attuned and 2 or 1, y = 0})
|
||||||
end
|
|
||||||
end,
|
end,
|
||||||
calculate = function(self, card, context)
|
calculate = function(self, card, context)
|
||||||
|
if card.edition and card.edition.Roland_frozen then
|
||||||
|
card:set_edition("e_base", true)
|
||||||
|
end
|
||||||
|
|
||||||
local extra = card.ability.extra
|
local extra = card.ability.extra
|
||||||
extra.is_attuned = extra.is_attuned and extra.karma >= 0
|
extra.is_attuned = extra.is_attuned and extra.karma >= 0
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue