From fc95bbde567baf5f84fd77a2176daa0cc84d71a0 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Tue, 29 Oct 2024 10:39:23 +0100 Subject: [PATCH 1/4] Fixed card drawing with reshuffle --- src/core/Global.ttslua | 6 +- src/playermat/Playermat.ttslua | 157 +++++++++++++++++++-------------- 2 files changed, 98 insertions(+), 65 deletions(-) diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index 2a768e33..9e69ac45 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -225,7 +225,11 @@ function onObjectEnterZone(zone, object) elseif zone.type == "Hand" and object.type == "Card" then -- make sure the card is face-up if object.is_face_down then - object.flip() + if object.held_by_color then + object.held_flip_index = 0 + else + object.flip() + end end -- maybe reset data about sealed tokens (if that function exists) diff --git a/src/playermat/Playermat.ttslua b/src/playermat/Playermat.ttslua index 713c2bee..21d0da02 100644 --- a/src/playermat/Playermat.ttslua +++ b/src/playermat/Playermat.ttslua @@ -54,22 +54,22 @@ local SEARCH_AROUND_SELF_Z_BUFFER = 1.75 -- defined areas for object searching local MAIN_PLAY_AREA = { - upperLeft = { x = 1.98, z = 0.736 }, + upperLeft = { x = 1.98, z = 0.736 }, lowerRight = { x = -0.79, z = -0.39 } } local INVESTIGATOR_AREA = { - upperLeft = { x = -1.084, z = 0.06517 }, + upperLeft = { x = -1.084, z = 0.06517 }, lowerRight = { x = -1.258, z = -0.0805 } } local THREAT_AREA = { - upperLeft = { x = 1.53, z = -0.34 }, + upperLeft = { x = 1.53, z = -0.34 }, lowerRight = { x = -1.13, z = -0.92 } } local DECK_DISCARD_AREA = { - upperLeft = { x = -1.62, z = 0.855 }, + upperLeft = { x = -1.62, z = 0.855 }, lowerRight = { x = -2.02, z = -0.245 }, - center = { x = -1.82, y = 0.5, z = 0.305 }, - size = { x = 0.4, y = 3, z = 1.1 } + center = { x = -1.82, y = 0.5, z = 0.305 }, + size = Vector(0.4, 3, 1.1) } -- local positions @@ -252,13 +252,7 @@ end -- searches the area around the draw deck and discard pile function searchDeckAndDiscardArea(filter) local pos = self.positionToWorld(DECK_DISCARD_AREA.center) - local scale = self.getScale() - local size = { - x = DECK_DISCARD_AREA.size.x * scale.x, - y = DECK_DISCARD_AREA.size.y, - z = DECK_DISCARD_AREA.size.z * scale.z - } - return searchArea(pos, size, filter) + return searchArea(pos, DECK_DISCARD_AREA.size * self.getScale(), filter) end -- rounds a number to the specified amount of decimal places @@ -518,58 +512,73 @@ end -- draws the specified amount of cards (and shuffles the discard if necessary) ---@param numCards number Number of cards to draw function drawCardsWithReshuffle(numCards) - local deckAreaObjects = getDeckAreaObjects() + function drawCardsCoroutine() + local deckAreaObjects = getDeckAreaObjects() - -- Norman Withers handling - local harbinger - if deckAreaObjects.topCard then - harbinger = isHarbinger(deckAreaObjects.topCard.getGMNotes()) - elseif deckAreaObjects.draw and not deckAreaObjects.draw.is_face_down then - local cards = deckAreaObjects.draw.getObjects() - harbinger = isHarbinger(cards[#cards].gm_notes) - end - - if harbinger then - printToColor("The Harbinger is on top of your deck, not drawing cards", messageColor) - return - end - - local topCardDetected = false - if deckAreaObjects.topCard ~= nil then - deckAreaObjects.topCard.deal(1, playerColor) - topCardDetected = true - numCards = numCards - 1 - if numCards == 0 then - flipTopCardFromDeck() - return + -- Norman Withers handling + local harbinger + if deckAreaObjects.topCard then + harbinger = isHarbinger(deckAreaObjects.topCard.getGMNotes()) + elseif deckAreaObjects.draw and not deckAreaObjects.draw.is_face_down then + local cards = deckAreaObjects.draw.getObjects() + harbinger = isHarbinger(cards[#cards].gm_notes) end - end - local deckSize = 1 - if deckAreaObjects.draw == nil then - deckSize = 0 - elseif deckAreaObjects.draw.type == "Deck" then - deckSize = #deckAreaObjects.draw.getObjects() - end - - if deckSize >= numCards then - drawCards(numCards) - if topCardDetected then - flipTopCardFromDeck() + if harbinger then + printToColor("The Harbinger is on top of your deck, not drawing cards", messageColor) + return 1 end - else - drawCards(deckSize) + + -- draw the top card if possible + local topCardDetected = false + if deckAreaObjects.topCard ~= nil then + deckAreaObjects.topCard.deal(1, playerColor) + topCardDetected = true + numCards = numCards - 1 + if numCards == 0 then + flipTopCardFromDeck() + return 1 + end + end + + -- determine deck size + local deckSize = 1 + if deckAreaObjects.draw == nil then + deckSize = 0 + elseif deckAreaObjects.draw.type == "Deck" then + deckSize = #deckAreaObjects.draw.getObjects() + end + + -- draw additional cards from existing deck + if deckSize >= numCards then + drawCards(deckAreaObjects.draw, numCards) + if topCardDetected then + flipTopCardFromDeck() + end + return 1 + end + + -- draw the full deck, form a new deck and draw the remaining cards + drawCards(deckAreaObjects.draw, deckSize) if deckAreaObjects.discard ~= nil then + coWaitFrames(30) shuffleDiscardIntoDeck() - Wait.time(function() - drawCards(numCards - deckSize) - if topCardDetected then - flipTopCardFromDeck() - end - end, 1) + if deckAreaObjects.discard.type == "Card" then + coWaitSeconds(1 * 0.1 + 0.25) + else + coWaitSeconds(#deckAreaObjects.discard.getObjects() * 0.1 + 0.25) + end + local shuffledObjects = getDeckAreaObjects() + drawCards(shuffledObjects.draw, numCards - deckSize) + if topCardDetected then + flipTopCardFromDeck() + end + printToColor("Take 1 horror (drawing card from empty deck)", messageColor) end - printToColor("Take 1 horror (drawing card from empty deck)", messageColor) + return 1 end + + startLuaCoroutine(self, "drawCardsCoroutine") end function isHarbinger(notes) @@ -595,11 +604,11 @@ function getDeckAreaObjects() end -- draws the specified number of cards (reshuffling of discard pile is handled separately) +---@param cardOrDeck tts__Object Card/Deck to draw from ---@param numCards number Number of cards to draw -function drawCards(numCards) - local deckAreaObjects = getDeckAreaObjects() - if deckAreaObjects.draw then - deckAreaObjects.draw.deal(numCards, playerColor) +function drawCards(cardOrDeck, numCards) + if cardOrDeck ~= nil then + cardOrDeck.deal(numCards, playerColor) end end @@ -639,7 +648,11 @@ function shuffleDiscardIntoDeck(player, _, elementId) table.insert(objectsToShuffle, deckAreaObjects.topCard) -- this will be executed after the deck merging + shuffling - Wait.time(flipTopCardFromDeck, 1) + if deckAreaObjects.discard.type == "Card" then + Wait.time(flipTopCardFromDeck, 1 * 0.1 + 0.5) + else + Wait.time(flipTopCardFromDeck, #deckAreaObjects.discard.getObjects() * 0.1 + 0.5) + end end table.insert(objectsToShuffle, deckAreaObjects.discard) @@ -651,8 +664,9 @@ end function flipTopCardFromDeck() Wait.time(function() local deckAreaObjects = getDeckAreaObjects() - if deckAreaObjects.topCard then - elseif deckAreaObjects.draw then + if deckAreaObjects.topCard ~= nil then return end + + if deckAreaObjects.draw ~= nil then if deckAreaObjects.draw.type == "Card" then deckAreaObjects.draw.flip() else @@ -1711,3 +1725,18 @@ end function getActiveInvestigatorData() return activeInvestigatorData end function setActiveInvestigatorData(newData) activeInvestigatorData = newData end + +-- pauses the current coroutine for 'frameCount' frames +function coWaitFrames(frameCount) + for k = 1, frameCount do + coroutine.yield(0) + end +end + +-- pauses the current coroutine for 'seconds' seconds +function coWaitSeconds(seconds) + local startTime = os.clock() + while os.clock() - startTime < seconds do + coroutine.yield(0) + end +end From b12a01f235c6a936a354ab2c7be3905cfcd76049 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Thu, 31 Oct 2024 02:33:30 +0100 Subject: [PATCH 2/4] improved delay --- src/playermat/Playermat.ttslua | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/playermat/Playermat.ttslua b/src/playermat/Playermat.ttslua index 21d0da02..3f328f5a 100644 --- a/src/playermat/Playermat.ttslua +++ b/src/playermat/Playermat.ttslua @@ -563,11 +563,8 @@ function drawCardsWithReshuffle(numCards) if deckAreaObjects.discard ~= nil then coWaitFrames(30) shuffleDiscardIntoDeck() - if deckAreaObjects.discard.type == "Card" then - coWaitSeconds(1 * 0.1 + 0.25) - else - coWaitSeconds(#deckAreaObjects.discard.getObjects() * 0.1 + 0.25) - end + coWaitSeconds(1 * 0.35) + local shuffledObjects = getDeckAreaObjects() drawCards(shuffledObjects.draw, numCards - deckSize) if topCardDetected then @@ -648,11 +645,7 @@ function shuffleDiscardIntoDeck(player, _, elementId) table.insert(objectsToShuffle, deckAreaObjects.topCard) -- this will be executed after the deck merging + shuffling - if deckAreaObjects.discard.type == "Card" then - Wait.time(flipTopCardFromDeck, 1 * 0.1 + 0.5) - else - Wait.time(flipTopCardFromDeck, #deckAreaObjects.discard.getObjects() * 0.1 + 0.5) - end + Wait.time(flipTopCardFromDeck, 0.3) end table.insert(objectsToShuffle, deckAreaObjects.discard) From b63ebe057ef933fa3eb0aa11450438ad081f7edd Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Thu, 31 Oct 2024 22:30:54 +0100 Subject: [PATCH 3/4] Set default state --- objects/OtherDoominPlay.652ff3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/OtherDoominPlay.652ff3.json b/objects/OtherDoominPlay.652ff3.json index 3b25fa55..d463fffc 100644 --- a/objects/OtherDoominPlay.652ff3.json +++ b/objects/OtherDoominPlay.652ff3.json @@ -34,7 +34,7 @@ "LayoutGroupSortIndex": 0, "Locked": true, "LuaScript": "require(\"core/DoomInPlayCounter\")", - "LuaScriptState": "", + "LuaScriptState": "false", "MeasureMovement": false, "Name": "Custom_Token", "Nickname": "Other Doom in Play", From 5eaf794f0611aab8cebceebf823c539c8d61fba1 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Fri, 1 Nov 2024 00:37:26 +0100 Subject: [PATCH 4/4] change object flipping --- src/core/Global.ttslua | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index d4706cad..b724fd3e 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -225,11 +225,7 @@ function onObjectEnterZone(zone, object) elseif zone.type == "Hand" and object.type == "Card" then -- make sure the card is face-up if object.is_face_down then - if object.held_by_color then - object.held_flip_index = 0 - else - object.flip() - end + object.flip() end -- maybe reset data about sealed tokens (if that function exists)