Skip to content

Commit 05e62f7

Browse files
Merge pull request #543 from MathIsFun0/Experimental-Fixes
Final fixes before release
2 parents 5e5bd7e + 4be2d9f commit 05e62f7

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

items/code.lua

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,6 +1150,7 @@ local seed = {
11501150
+ #G.hand.highlighted
11511151
+ #G.consumeables.highlighted
11521152
+ (G.pack_cards and #G.pack_cards.highlighted or 0)
1153+
--+ (G.shop_cards and #G.shop_cards.highlighted or 0) TODO: this so you can use seed when it's in shop
11531154
== 2
11541155
end,
11551156
loc_vars = function(self, info_queue, card)
@@ -2147,9 +2148,15 @@ local multiply = {
21472148
},
21482149
cost = 4,
21492150
can_use = function(self, card)
2150-
return #G.jokers.highlighted == 1
2151-
and not Card.no(G.jokers.highlighted[1], "immune_to_chemach", true)
2152-
and not Card.no(G.jokers.highlighted[1], "immutable", true)
2151+
if not G.GAME.modifiers.cry_beta then
2152+
return #G.jokers.highlighted == 1 and not Card.no(G.jokers.highlighted[1], "immutable", true)
2153+
else
2154+
return #G.jokers.highlighted == 2
2155+
and not (
2156+
Card.no(G.jokers.highlighted[1], "immutable", true)
2157+
or Card.no(G.jokers.highlighted[2], "immutable", true)
2158+
)
2159+
end
21532160
end,
21542161
use = function(self, card, area, copier)
21552162
if not G.jokers.highlighted[1].config.cry_multiply then

lib/calculate.lua

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,10 @@ function Card:calculate_joker(context)
597597
if active_side.ability.cry_rigged then
598598
G.GAME.probabilities.normal = ggpn
599599
end
600-
if next(find_joker("cry-Scalae")) or next(find_joker("cry-Double Scale")) then
600+
if
601+
(next(find_joker("cry-Scalae")) or next(find_joker("cry-Double Scale")))
602+
or (active_side.ability.name == "cry-Exponentia" or "cry-Compound Interest")
603+
then
601604
active_side:cry_double_scale_calc(orig_ability, in_context_scaling)
602605
end
603606
return ret, trig

0 commit comments

Comments
 (0)