Buff Artemis X, fix Amber Acorn crashing when duplicated
This commit is contained in:
parent
40b9757895
commit
8a82494674
2 changed files with 11 additions and 7 deletions
|
|
@ -3,7 +3,7 @@
|
||||||
"id": "Roland",
|
"id": "Roland",
|
||||||
"name": "Roland",
|
"name": "Roland",
|
||||||
"prefix": "Roland",
|
"prefix": "Roland",
|
||||||
"version": "2.8.12",
|
"version": "2.8.13",
|
||||||
"badge_colour": "8BE9FD",
|
"badge_colour": "8BE9FD",
|
||||||
"display_name": "Roland",
|
"display_name": "Roland",
|
||||||
"main_file": "src/main.lua",
|
"main_file": "src/main.lua",
|
||||||
|
|
|
||||||
|
|
@ -668,14 +668,18 @@ joker {
|
||||||
return {card = card, xmult = card.ability.extra.xmult}
|
return {card = card, xmult = card.ability.extra.xmult}
|
||||||
end
|
end
|
||||||
|
|
||||||
if card.debuff or
|
card.Roland_amber_waiting = card.Roland_amber_waiting and not context.after
|
||||||
|
|
||||||
|
local no = card.debuff or
|
||||||
context.blueprint or
|
context.blueprint or
|
||||||
not context.press_play or
|
card.Roland_amber_waiting or
|
||||||
card.ability.extra.context == context then
|
not context.press_play
|
||||||
|
|
||||||
|
if no and not context.forcetrigger then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
card.ability.extra.context = context
|
card.Roland_amber_waiting = false
|
||||||
local cards = card.area.cards
|
local cards = card.area.cards
|
||||||
local keys = f(cards):where(f().nq(card)):keys():table()
|
local keys = f(cards):where(f().nq(card)):keys():table()
|
||||||
|
|
||||||
|
|
@ -877,8 +881,8 @@ joker {
|
||||||
cost = 6,
|
cost = 6,
|
||||||
rarity = 2,
|
rarity = 2,
|
||||||
config = {extra = {
|
config = {extra = {
|
||||||
dollars = 2,
|
dollars = 3,
|
||||||
increase = 3,
|
increase = 4,
|
||||||
progress = 0,
|
progress = 0,
|
||||||
flipped = false,
|
flipped = false,
|
||||||
sequence = {"c_earth", "c_mars", "c_earth"},
|
sequence = {"c_earth", "c_mars", "c_earth"},
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue