Fix Frozen regressions
This commit is contained in:
parent
0fd9b9546e
commit
67bd097a4d
2 changed files with 6 additions and 7 deletions
|
|
@ -3,7 +3,7 @@
|
||||||
"id": "Roland",
|
"id": "Roland",
|
||||||
"name": "Roland",
|
"name": "Roland",
|
||||||
"prefix": "Roland",
|
"prefix": "Roland",
|
||||||
"version": "2.8.5",
|
"version": "2.8.6",
|
||||||
"badge_colour": "8BE9FD",
|
"badge_colour": "8BE9FD",
|
||||||
"display_name": "Roland",
|
"display_name": "Roland",
|
||||||
"main_file": "src/main.lua",
|
"main_file": "src/main.lua",
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ local function freeze(card)
|
||||||
|
|
||||||
card.Roland_frozen_ability = card.Roland_frozen_ability or copy(card.ability)
|
card.Roland_frozen_ability = card.Roland_frozen_ability or copy(card.ability)
|
||||||
card.ability = card.Roland_frozen_ability and copy(card.Roland_frozen_ability) or card.ability
|
card.ability = card.Roland_frozen_ability and copy(card.Roland_frozen_ability) or card.ability
|
||||||
card.Roland_frozen = card.Roland_frozen and {probability = SMODS.get_probability_vars(card, 1, 1)}
|
card.Roland_frozen = card.Roland_frozen or {probability = SMODS.get_probability_vars(card, 1, 1)}
|
||||||
local ability, ret = card.ability, card.Roland_frozen_ability
|
local ability, ret = card.ability, card.Roland_frozen_ability
|
||||||
|
|
||||||
if type(ability) ~= "table" then
|
if type(ability) ~= "table" then
|
||||||
|
|
@ -216,11 +216,10 @@ q(function()
|
||||||
return 1
|
return 1
|
||||||
end
|
end
|
||||||
|
|
||||||
card.Roland_frozen.estate = card.Roland_frozen.estate and
|
card.Roland_frozen.estate = card.Roland_frozen.estate or
|
||||||
card.Roland_frozen.estate or
|
f(card.area.cards):swap():any(function(_, k)
|
||||||
(f(card.area.cards):swap():any(function(_, k)
|
|
||||||
return k == card
|
return k == card
|
||||||
end) or 1)
|
end) or 1
|
||||||
|
|
||||||
return card.Roland_frozen.estate
|
return card.Roland_frozen.estate
|
||||||
end
|
end
|
||||||
|
|
@ -237,7 +236,7 @@ q(function()
|
||||||
end
|
end
|
||||||
|
|
||||||
local joker_count = estate_pos(card)
|
local joker_count = estate_pos(card)
|
||||||
local extra = card.ability.extra or {}
|
local extra = card.ability.extra
|
||||||
return {chips = extra.chips * joker_count, mult = extra.mult * joker_count}
|
return {chips = extra.chips * joker_count, mult = extra.mult * joker_count}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue