Skip to content

Commit 846020c

Browse files
JevonnissocoolmanJevonnissocoolman
authored
Fix Unlock condition for The Swarm, The Clash, etc
1 parent 4a1aa04 commit 846020c

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

‎items/misc_joker.lua‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4361,7 +4361,7 @@ local duos = {
43614361
calculate = function(self, card, context)
43624362
if context.joker_main and (to_big(card.ability.x_mult) > to_big(1)) then
43634363
if
4364-
context.poker_hands ~= nil and next(context.poker_hands["Two Pair"])
4364+
context.poker_hands ~= nil and next(context.poker_hands[card.ability.type])
43654365
or context.poker_hands ~= nil and next(context.poker_hands["Full House"])
43664366
then
43674367
return {
@@ -4407,7 +4407,7 @@ local home = {
44074407
blueprint_compat = true,
44084408
calculate = function(self, card, context)
44094409
if context.joker_main and (to_big(card.ability.x_mult) > to_big(1)) then
4410-
if context.poker_hands ~= nil and next(context.poker_hands["Full House"]) then
4410+
if context.poker_hands ~= nil and next(context.poker_hands[card.ability.type]) then
44114411
return {
44124412
message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.x_mult } }),
44134413
colour = G.C.RED,
@@ -4451,7 +4451,7 @@ local nuts = {
44514451
blueprint_compat = true,
44524452
calculate = function(self, card, context)
44534453
if context.joker_main and (to_big(card.ability.x_mult) > to_big(1)) then
4454-
if context.poker_hands ~= nil and next(context.poker_hands["Straight Flush"]) then
4454+
if context.poker_hands ~= nil and next(context.poker_hands[card.ability.type]) then
44554455
return {
44564456
message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.x_mult } }),
44574457
colour = G.C.RED,
@@ -4495,7 +4495,7 @@ local quintet = {
44954495
blueprint_compat = true,
44964496
calculate = function(self, card, context)
44974497
if context.joker_main and (to_big(card.ability.x_mult) > to_big(1)) then
4498-
if context.poker_hands ~= nil and next(context.poker_hands["Five of a Kind"]) then
4498+
if context.poker_hands ~= nil and next(context.poker_hands[card.ability.type]) then
44994499
return {
45004500
message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.x_mult } }),
45014501
colour = G.C.RED,
@@ -4511,7 +4511,7 @@ local quintet = {
45114511
return false
45124512
end,
45134513
check_for_unlock = function(self, args)
4514-
if args.type == "cry_win_with_hand" and args.hand == "Five of a Kind" then
4514+
if args.type == "win" and G.GAME.last_hand_played == "Five of a Kind" then
45154515
return true
45164516
end
45174517
end,
@@ -4549,7 +4549,7 @@ local unity = {
45494549
blueprint_compat = true,
45504550
calculate = function(self, card, context)
45514551
if context.joker_main and (to_big(card.ability.x_mult) > to_big(1)) then
4552-
if context.poker_hands ~= nil and next(context.poker_hands["Flush House"]) then
4552+
if context.poker_hands ~= nil and next(context.poker_hands[card.ability.type]) then
45534553
return {
45544554
message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.x_mult } }),
45554555
colour = G.C.RED,
@@ -4565,7 +4565,7 @@ local unity = {
45654565
return false
45664566
end,
45674567
check_for_unlock = function(self, args)
4568-
if args.type == "cry_win_with_hand" and args.hand == "Flush House" then
4568+
if args.type == "win" and G.GAME.last_hand_played == "Flush House" then
45694569
return true
45704570
end
45714571
end,
@@ -4603,7 +4603,7 @@ local swarm = {
46034603
blueprint_compat = true,
46044604
calculate = function(self, card, context)
46054605
if context.joker_main and (to_big(card.ability.x_mult) > to_big(1)) then
4606-
if context.poker_hands ~= nil and next(context.poker_hands["Flush Five"]) then
4606+
if context.poker_hands ~= nil and next(context.poker_hands[card.ability.type]) then
46074607
return {
46084608
message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.x_mult } }),
46094609
colour = G.C.RED,
@@ -4619,7 +4619,7 @@ local swarm = {
46194619
return false
46204620
end,
46214621
check_for_unlock = function(self, args)
4622-
if args.type == "cry_win_with_hand" and args.hand == "Flush Five" then
4622+
if args.type == "win" and G.GAME.last_hand_played == "Flush Five" then
46234623
return true
46244624
end
46254625
end,
@@ -4659,7 +4659,7 @@ local stronghold = {
46594659
blueprint_compat = true,
46604660
calculate = function(self, card, context)
46614661
if context.joker_main and (to_big(card.ability.x_mult) > to_big(1)) then
4662-
if context.poker_hands ~= nil and next(context.poker_hands["cry_Bulwark"]) then
4662+
if context.poker_hands ~= nil and next(context.poker_hands[card.ability.type]) then
46634663
return {
46644664
message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.x_mult } }),
46654665
colour = G.C.RED,
@@ -4675,7 +4675,7 @@ local stronghold = {
46754675
return false
46764676
end,
46774677
check_for_unlock = function(self, args)
4678-
if args.type == "cry_win_with_hand" and args.hand == "cry_Bulwark" then
4678+
if args.type == "win" and G.GAME.last_hand_played == "cry_Bulwark" then
46794679
return true
46804680
end
46814681
end,
@@ -4704,7 +4704,7 @@ local wtf = {
47044704
blueprint_compat = true,
47054705
calculate = function(self, card, context)
47064706
if context.joker_main and (to_big(card.ability.x_mult) > to_big(1)) then
4707-
if context.poker_hands ~= nil and next(context.poker_hands["cry_Clusterfuck"]) then
4707+
if context.poker_hands ~= nil and next(context.poker_hands[card.ability.type]) then
47084708
return {
47094709
message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.x_mult } }),
47104710
colour = G.C.RED,
@@ -4720,7 +4720,7 @@ local wtf = {
47204720
return false
47214721
end,
47224722
check_for_unlock = function(self, args)
4723-
if args.type == "cry_win_with_hand" and args.hand == "cry_Clusterfuck" then
4723+
if args.type == "win" and G.GAME.last_hand_played == "cry_Clusterfuck" then
47244724
return true
47254725
end
47264726
end,
@@ -4749,7 +4749,7 @@ local clash = {
47494749
blueprint_compat = true,
47504750
calculate = function(self, card, context)
47514751
if context.joker_main and (to_big(card.ability.x_mult) > to_big(1)) then
4752-
if context.poker_hands ~= nil and next(context.poker_hands["cry_UltPair"]) then
4752+
if context.poker_hands ~= nil and next(context.poker_hands[card.ability.type]) then
47534753
return {
47544754
message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.x_mult } }),
47554755
colour = G.C.RED,
@@ -4765,7 +4765,7 @@ local clash = {
47654765
return false
47664766
end,
47674767
check_for_unlock = function(self, args)
4768-
if args.type == "cry_win_with_hand" and args.hand == "cry_UltPair" then
4768+
if args.type == "win" and G.GAME.last_hand_played == "cry_UltPair" then
47694769
return true
47704770
end
47714771
end,
@@ -4792,7 +4792,7 @@ local filler = {
47924792
cost = 1,
47934793
blueprint_compat = true,
47944794
calculate = function(self, card, context)
4795-
if context.joker_main and context.poker_hands and next(context.poker_hands["High Card"]) then
4795+
if context.joker_main and context.poker_hands and next(context.poker_hands[card.ability.type]) then
47964796
return {
47974797
message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.x_mult } }),
47984798
colour = G.C.RED,

0 commit comments

Comments
 (0)