Fix Amber Acorn triggering multiple times, mark Artemis X
This commit is contained in:
parent
ed250737ab
commit
57d559cd5b
2 changed files with 16 additions and 6 deletions
|
|
@ -3,7 +3,7 @@
|
|||
"id": "Roland",
|
||||
"name": "Roland",
|
||||
"prefix": "Roland",
|
||||
"version": "2.8.7",
|
||||
"version": "2.8.8",
|
||||
"badge_colour": "8BE9FD",
|
||||
"display_name": "Roland",
|
||||
"main_file": "src/main.lua",
|
||||
|
|
|
|||
|
|
@ -655,15 +655,22 @@ joker {
|
|||
return {card = card, xmult = card.ability.extra.xmult}
|
||||
end
|
||||
|
||||
if card.debuff or context.blueprint or not context.press_play then
|
||||
if card.debuff or
|
||||
context.blueprint or
|
||||
not context.press_play or
|
||||
card.ability.extra.context == context then
|
||||
return
|
||||
end
|
||||
|
||||
local keys = f(card.area.cards):where(f().nq(card)):keys():table()
|
||||
local k = pseudorandom_element(keys, pseudoseed "Roland_amber") or card.rank
|
||||
card.ability.extra.context = context
|
||||
local cards = card.area.cards
|
||||
local keys = f(cards):where(f().nq(card)):keys():table()
|
||||
local key = pseudorandom_element(keys, pseudoseed "Roland_amber") or card.rank
|
||||
local next = card.rank < key and 1 or -1
|
||||
|
||||
card.area.cards[k], card.area.cards[card.rank] =
|
||||
card.area.cards[card.rank], card.area.cards[k]
|
||||
for i = card.rank, key - next, next do
|
||||
cards[i], cards[i + next] = cards[i + next], cards[i]
|
||||
end
|
||||
end,
|
||||
}
|
||||
|
||||
|
|
@ -859,6 +866,9 @@ joker {
|
|||
sequence = {"c_earth", "c_mars", "c_earth"},
|
||||
}},
|
||||
attributes = {"economy", "scaling", "planet", "space", "bakery_double_sided"},
|
||||
eternal_compat = true,
|
||||
blueprint_compat = false,
|
||||
perishable_compat = false,
|
||||
calc_dollar_bonus = function(_, card)
|
||||
return card.ability.extra.dollars
|
||||
end,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue