Merge pull request #792 from argonui/jenny-upkeep

Removed additional upkeep resource for parallel Jenny
This commit is contained in:
dscarpac 2024-08-02 11:13:37 -05:00 committed by GitHub
commit 4a9ca355da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -109,11 +109,11 @@ local matColor = self.getMemo()
function onSave() function onSave()
return JSON.encode({ return JSON.encode({
activeInvestigatorClass = activeInvestigatorClass, activeInvestigatorClass = activeInvestigatorClass,
activeInvestigatorId = activeInvestigatorId, activeInvestigatorId = activeInvestigatorId,
isClassTextureEnabled = isClassTextureEnabled, isClassTextureEnabled = isClassTextureEnabled,
isDrawButtonVisible = isDrawButtonVisible, isDrawButtonVisible = isDrawButtonVisible,
playerColor = playerColor, playerColor = playerColor,
slotData = slotData slotData = slotData
}) })
end end
@ -373,8 +373,8 @@ function doUpkeep(_, clickedByColor, isRightClick)
end end
end end
-- gain a resource (or two if playing Jenny Barnes) -- gain a resource (or two if playing non-parallel Jenny Barnes)
if string.match(activeInvestigatorId, "%d%d%d%d%d") == "02003" then if activeInvestigatorId == "02003" or activeInvestigatorId == "02003-pb" then
updateCounter({ type = "ResourceCounter", modifier = 2 }) updateCounter({ type = "ResourceCounter", modifier = 2 })
printToColor("Gaining 2 resources (Jenny)", messageColor) printToColor("Gaining 2 resources (Jenny)", messageColor)
else else
@ -405,7 +405,8 @@ function doUpkeep(_, clickedByColor, isRightClick)
-- draw up to 5 cards -- draw up to 5 cards
local cardsToDraw = 5 - #handCards + #cardsToDiscard local cardsToDraw = 5 - #handCards + #cardsToDiscard
if cardsToDraw > 0 then if cardsToDraw > 0 then
printToColor("Discarding " .. #cardsToDiscard .. " and drawing " .. cardsToDraw .. " card(s). (Patrice)", messageColor) printToColor("Discarding " .. #cardsToDiscard .. " and drawing " .. cardsToDraw .. " card(s). (Patrice)",
messageColor)
-- add some time if there are any cards to discard -- add some time if there are any cards to discard
local k = 0 local k = 0
@ -834,6 +835,8 @@ end
function spawnTokensFor(object) function spawnTokensFor(object)
local extraUses = {} local extraUses = {}
-- add one additional charge for Akachi Onyele
if activeInvestigatorId == "03004" then if activeInvestigatorId == "03004" then
extraUses["Charge"] = 1 extraUses["Charge"] = 1
end end