Skip to content

Fixed the incorrect triggering of Psychic and Mouth #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LetsTussleBoiz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed the incorrect triggering of Psychic and Mouth #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions bossjokers.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,14 +571,13 @@ local jokers = {
soul_pos=nil,

calculate = function(self,context)
if context.cardarea == G.jokers and not context.before and not context.after then
if #G.play.cards <= self.ability.extra.size then
return {
message = localize{type='variable',key='a_xmult',vars={self.ability.extra.xmult}},
Xmult_mod = self.ability.extra.xmult
}
end
if context.joker_main and #context.scoring_hand < 5 then
return {
message = localize{type='variable',key='a_xmult',vars={self.ability.extra.xmult}},
Xmult_mod = self.ability.extra.xmult
}
end

if context.setting_blind and not self.getting_sliced then
if G.GAME.blind and ((not G.GAME.blind.disabled) and (G.GAME.blind.name == 'The Psychic')) then
card_eval_status_text(context.blueprint_card or self, 'extra', nil, nil, nil, {message = localize('ph_boss_disabled')})
Expand Down Expand Up @@ -649,14 +648,15 @@ local jokers = {
soul_pos=nil,

calculate = function(self,context)
if context.cardarea == G.jokers and not context.before and not context.after then
if context.joker_main then
if G.GAME.hands[context.scoring_name] and G.GAME.hands[context.scoring_name].played_this_round == 1 then
return {
message = localize{type='variable',key='a_xmult',vars={self.ability.extra.Xmult}},
Xmult_mod = self.ability.extra.Xmult,
}
end
end

if context.setting_blind and not self.getting_sliced then
if G.GAME.blind and ((not G.GAME.blind.disabled) and (G.GAME.blind.name == 'The Mouth')) then
card_eval_status_text(context.blueprint_card or self, 'extra', nil, nil, nil, {message = localize('ph_boss_disabled')})
Expand Down