adam/SCED
1
0
Fork 0
Code Actions Releases 8 Activity

Merge pull request #146 from argonui/investigator-unexhaust-fix

Browse Source 
Playmat - Upkeep: Dont unexhaust investigators
This commit is contained in:
Chr1Z 2023-01-04 10:04:53 +01:00 committed by GitHub
commit 9cc66d1e16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/playermat/Playmat.ttslua
View File

@ -237,9 +237,9 @@ function doUpkeep(_, color, alt_click)
local obj = v.hit_object local obj = v.hit_object
if obj.getDescription() == "Action Token" and obj.is_face_down then if obj.getDescription() == "Action Token" and obj.is_face_down then
obj.flip() obj.flip()
elseif obj.tag == "Card" and not obj.is_face_down then elseif obj.tag == "Card" and not obj.is_face_down and not inArea(self.positionToLocal(obj.getPosition()), INVESTIGATOR_AREA) then
local cardMetadata = JSON.decode(obj.getGMNotes()) or {} local cardMetadata = JSON.decode(obj.getGMNotes()) or {}
if not doNotReady(obj) and cardMetadata.type ~= "Investigator" then if not doNotReady(obj) then
obj.setRotation(PLAY_ZONE_ROTATION) obj.setRotation(PLAY_ZONE_ROTATION)
end end
if cardMetadata.id == "08031" then if cardMetadata.id == "08031" then
@ -480,11 +480,13 @@ end
function onCollisionEnter(collision_info) function onCollisionEnter(collision_info)
if not COLLISION_ENABLED then return end if not COLLISION_ENABLED then return end
local object = collision_info.collision_object local object = collision_info.collision_object
-- only continue for cards -- only continue for cards
if object.name ~= "Card" and object.name ~= "CardCustom" then return end if object.name ~= "Card" and object.name ~= "CardCustom" then return end
maybeUpdateActiveInvestigator(object)
maybeUpdateActiveInvestigator(object)
syncCustomizableMetadata(object) syncCustomizableMetadata(object)
if isInDeckZone(object) then if isInDeckZone(object) then
tokenManager.resetTokensSpawned(object) tokenManager.resetTokensSpawned(object)
elseif shouldSpawnTokens(object) then elseif shouldSpawnTokens(object) then
@ -542,19 +544,32 @@ function isInDeckZone(checkObject)
end end
--------------------------------------------------------- ---------------------------------------------------------
-- investigator ID grabbing and stat tracker -- investigator ID grabbing and skill tracker
--------------------------------------------------------- ---------------------------------------------------------
function maybeUpdateActiveInvestigator(card) function maybeUpdateActiveInvestigator(card)
if not inArea(self.positionToLocal(card.getPosition()), INVESTIGATOR_AREA) then return end
local notes = JSON.decode(card.getGMNotes()) local notes = JSON.decode(card.getGMNotes())
if notes ~= nil and notes.type == "Investigator" and notes.id ~= activeInvestigatorId then local class
if notes ~= nil and notes.type == "Investigator" and notes.id ~= nil then
if notes.id == activeInvestigatorId then return end
class = notes.class
activeInvestigatorId = notes.id activeInvestigatorId = notes.id
STAT_TRACKER.call("updateStats", {notes.willpowerIcons, notes.intellectIcons, notes.combatIcons, notes.agilityIcons}) STAT_TRACKER.call("updateStats", {notes.willpowerIcons, notes.intellectIcons, notes.combatIcons, notes.agilityIcons})
elseif activeInvestigatorId ~= "00000" then
class = "Neutral"
activeInvestigatorId = "00000"
STAT_TRACKER.call("updateStats", {1, 1, 1, 1})
else
return
end
-- change state of action tokens -- change state of action tokens
local search = searchArea(self.positionToWorld({-1.1, 0.05, -0.27}), {4, 1, 1}) local search = searchArea(self.positionToWorld({-1.1, 0.05, -0.27}), {4, 1, 1})
local small_token = nil local smallToken = nil
local state_table = { local STATE_TABLE = {
["Guardian"] = 1, ["Guardian"] = 1,
["Seeker"] = 2, ["Seeker"] = 2,
["Rogue"] = 3, ["Rogue"] = 3,
@ -567,33 +582,25 @@ function maybeUpdateActiveInvestigator(card)
local obj = obj.hit_object local obj = obj.hit_object
if obj.getDescription() == "Action Token" and obj.getStateId() > 0 then if obj.getDescription() == "Action Token" and obj.getStateId() > 0 then
if obj.getScale().x < 0.4 then if obj.getScale().x < 0.4 then
small_token = obj smallToken = obj
else else
setObjectState(obj, state_table[notes.class]) setObjectState(obj, STATE_TABLE[class])
end end
end end
end end
-- update the small token with special action for certain investigators -- update the small token with special action for certain investigators
-- Ursula Downs: Investigate action local SPECIAL_ACTIONS = {
if activeInvestigatorId == "04002" then ["04002"] = 8, -- Ursula Downs
setObjectState(small_token, 8) ["01002"] = 9, -- Daisy Walker
-- Daisy Walker (only for normal front, not parallel): Tome action ["01502"] = 9, -- Daisy Walker
elseif activeInvestigatorId == "01002" or activeInvestigatorId == "01502" or activeInvestigatorId == "01002-pb" then ["01002-pb"] = 9, -- Daisy Walker
setObjectState(small_token, 9) ["06003"] = 10, -- Tony Morgan
-- Tony Morgan: Engage/Fight action ["04003"] = 11, -- Finn Edwards
elseif activeInvestigatorId == "06003" then ["08016"] = 14 -- Bob Jenkins
setObjectState(small_token, 10) }
-- Finn Edwards: Evade action
elseif activeInvestigatorId == "04003" then setObjectState(smallToken, SPECIAL_ACTIONS[activeInvestigatorId] or STATE_TABLE[class])
setObjectState(small_token, 11)
-- Bob Jenkins: Play Item action
elseif activeInvestigatorId == "08016" then
setObjectState(small_token, 14)
else
setObjectState(small_token, state_table[notes.class])
end
end
end end
function setObjectState(obj, stateId) function setObjectState(obj, stateId)