Merge branch 'main' into more-new-cards

This commit is contained in:
Chr1Z93 2023-11-11 17:07:37 +01:00
commit 168d7ff0a1
2 changed files with 6 additions and 2 deletions

View File

@ -145,6 +145,11 @@ function shouldSpawnTokens(card)
or metadata.type == "Enemy"
or metadata.type == "Treachery"
or metadata.weakness
-- hardcoded IDs for "Makeshift Trap" and "Shrine of the Moirai"
-- these cards are events with uses, that attach to encounter cards and thus will enter play in the playarea
-- TODO: probably turn this into a metadata field if we get more cards like that
or metadata.id == "07310"
or metadata.id == "09100"
end
function onCollisionExit(collisionInfo)

View File

@ -505,7 +505,6 @@ end
-- utility function for Norman Withers to flip the top card to the revealed side
function flipTopCardFromDeck()
log("called")
Wait.time(function()
local deckAreaObjects = getDeckAreaObjects()
if deckAreaObjects.topCard then
@ -893,7 +892,7 @@ function clickableClues(showCounter)
local clueCount = 0
-- move clue counters
local modY = showcounter and -0.525 or 0.525
local modY = showCounter and 0.525 or -0.525
ownedObjects.ClickableClueCounter.setPosition(clickerPos + Vector(0, modY, 0))
if showCounter then