diff --git a/src/playermat/Playermat.ttslua b/src/playermat/Playermat.ttslua index bacf1c1f..f66f7d45 100644 --- a/src/playermat/Playermat.ttslua +++ b/src/playermat/Playermat.ttslua @@ -400,21 +400,18 @@ function doUpkeep(_, clickedByColor, isRightClick) local pos = returnGlobalDiscardPosition() deckLib.placeOrMergeIntoDeck(cardsToDiscard, pos, self.getRotation()) - -- add some time if there are any cards to discard - local k = 0 - if #cardsToDiscard > 0 then - k = 1 + (#cardsToDiscard * 0.1) - end - -- draw up to 5 cards - Wait.time( - function() - local cardsToDraw = 5 - #handCards + #cardsToDiscard - if cardsToDraw > 0 then - printToColor("Drawing " .. cardsToDraw .. " cards (Patrice)", messageColor) - drawCardsWithReshuffle(cardsToDraw) - end - end, k) + local cardsToDraw = 5 - #handCards + #cardsToDiscard + if cardsToDraw > 0 then + printToColor("Drawing " .. cardsToDraw .. " cards (Patrice)", messageColor) + + -- add some time if there are any cards to discard + local k = 0 + if #cardsToDiscard > 0 then + k = 1 + (#cardsToDiscard * 0.1) + end + Wait.time(function() drawCardsWithReshuffle(cardsToDraw) end, k) + end end elseif forcedLearning then printToColor("Drawing 2 cards, discard 1 (Forced Learning)", messageColor)