Added "Ready Cards" button to Play Area

This commit is contained in:
Chr1Z93 2024-08-15 13:11:26 +02:00
parent 1a3d8e1aca
commit 30d83a23bb
8 changed files with 116 additions and 23 deletions

View File

@ -959,6 +959,13 @@
"ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/998015670465071049/FFAE162920D67CF38045EFBD3B85AD0F916147B2/", "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/998015670465071049/FFAE162920D67CF38045EFBD3B85AD0F916147B2/",
"WidthScale": 0 "WidthScale": 0
}, },
"CustomUIAssets": [
{
"Name": "font_teutonic-arkham",
"Type": 1,
"URL": "https://steamusercontent-a.akamaihd.net/ugc/2027213118467703445/89328E273B4C5180BF491516CE998DE3C604E162/"
}
],
"Description": "", "Description": "",
"DragSelectable": true, "DragSelectable": true,
"GMNotes": "", "GMNotes": "",
@ -995,5 +1002,5 @@
"scaleZ": 10 "scaleZ": 10
}, },
"Value": 0, "Value": 0,
"XmlUI": "" "XmlUI": "\u003cInclude src=\"PlayArea.xml\"/\u003e"
} }

View File

@ -61,7 +61,7 @@ function updateVal(number)
if number then if number then
broadcastDoom(val) broadcastDoom(val)
else else
broadcastToAll("0 doom on the agenda", "White") broadcastToAll("0 doom on the agenda")
end end
end end
@ -72,9 +72,9 @@ function broadcastDoom(val)
local doomThreshold = getDoomThreshold() local doomThreshold = getDoomThreshold()
if doomThreshold then if doomThreshold then
broadcastToAll(val .. " doom on the agenda (" .. doomInPlay .. "/" .. doomThreshold .. " in play)", "White") broadcastToAll(val .. " doom on the agenda (" .. doomInPlay .. "/" .. doomThreshold .. " in play)")
else else
broadcastToAll(val .. " doom on the agenda (" .. doomInPlay .. " in play)", "White") broadcastToAll(val .. " doom on the agenda (" .. doomInPlay .. " in play)")
end end
end end

View File

@ -54,6 +54,9 @@ function triggerUpkeepMultihanded(playerColor)
playermatApi.doUpkeepFromHotkey(matColor, playerColor) playermatApi.doUpkeepFromHotkey(matColor, playerColor)
end end
end end
-- also trigger the PlayArea's "Ready Cards" function
playAreaApi.readyCards()
end end
-- adds 1 doom to the agenda -- adds 1 doom to the agenda

View File

@ -21,7 +21,8 @@ local CONNECTION_LINE_Y = 1.529
-- used for recreating the link to a custom data helper after image change -- used for recreating the link to a custom data helper after image change
customDataHelper = nil customDataHelper = nil
local DEFAULT_URL = "https://steamusercontent-a.akamaihd.net/ugc/998015670465071049/FFAE162920D67CF38045EFBD3B85AD0F916147B2/" local DEFAULT_URL =
"https://steamusercontent-a.akamaihd.net/ugc/998015670465071049/FFAE162920D67CF38045EFBD3B85AD0F916147B2/"
local SHIFT_OFFSETS = { local SHIFT_OFFSETS = {
left = { x = 0.00, y = 0, z = 7.67 }, left = { x = 0.00, y = 0, z = 7.67 },
@ -69,7 +70,7 @@ function onLoad(savedData)
end end
-- this needs to be here since the playarea will be reloaded when the image changes -- this needs to be here since the playarea will be reloaded when the image changes
self.interactable = false self.interactable = false
Wait.time(function() collisionEnabled = true end, 0.1) Wait.time(function() collisionEnabled = true end, 0.1)
end end
@ -308,7 +309,7 @@ function buildConnection(cardId, iconCardList, locData)
-- If the reciprocal exists, convert it to BiDi, otherwise add as a one-way -- If the reciprocal exists, convert it to BiDi, otherwise add as a one-way
if locationConnections[connectedGuid] ~= nil if locationConnections[connectedGuid] ~= nil
and (locationConnections[connectedGuid][cardId] == ONE_WAY and (locationConnections[connectedGuid][cardId] == ONE_WAY
or locationConnections[connectedGuid][cardId] == BIDIRECTIONAL) then or locationConnections[connectedGuid][cardId] == BIDIRECTIONAL) then
locationConnections[connectedGuid][cardId] = BIDIRECTIONAL locationConnections[connectedGuid][cardId] = BIDIRECTIONAL
locationConnections[cardId][connectedGuid] = nil locationConnections[cardId][connectedGuid] = nil
else else
@ -426,7 +427,8 @@ function addOneWayVector(origin, target, vectorOwner, lines)
-- Calculate distance to be closer for horizontal positions than vertical, since cards are taller than wide -- Calculate distance to be closer for horizontal positions than vertical, since cards are taller than wide
local heading = Vector(originPos):sub(targetPos):heading("y") local heading = Vector(originPos):sub(targetPos):heading("y")
local distanceFromCard = DIRECTIONAL_ARROW_DISTANCE * 0.7 + DIRECTIONAL_ARROW_DISTANCE * 0.3 * math.abs(math.sin(math.rad(heading))) local distanceFromCard = DIRECTIONAL_ARROW_DISTANCE * 0.7 +
DIRECTIONAL_ARROW_DISTANCE * 0.3 * math.abs(math.sin(math.rad(heading)))
-- Calculate the three possible arrow positions. These are offset by half the arrow length to -- Calculate the three possible arrow positions. These are offset by half the arrow length to
-- make them visually balanced by keeping the arrows centered, not tracking the point -- make them visually balanced by keeping the arrows centered, not tracking the point
@ -449,8 +451,10 @@ end
--- positioning and scaling, as well as highlighting connections during a drag operation --- positioning and scaling, as well as highlighting connections during a drag operation
---@param lines table List of vector line elements. Mutable, will be updated to add this arrow ---@param lines table List of vector line elements. Mutable, will be updated to add this arrow
function addArrowLines(arrowheadPos, originPos, vectorOwner, lines) function addArrowLines(arrowheadPos, originPos, vectorOwner, lines)
local arrowArm1 = Vector(arrowheadPos):moveTowards(originPos, ARROW_ARM_LENGTH):sub(arrowheadPos):rotateOver("y", -1 * ARROW_ANGLE):add(arrowheadPos) local arrowArm1 = Vector(arrowheadPos):moveTowards(originPos, ARROW_ARM_LENGTH):sub(arrowheadPos):rotateOver("y",
local arrowArm2 = Vector(arrowheadPos):moveTowards(originPos, ARROW_ARM_LENGTH):sub(arrowheadPos):rotateOver("y", ARROW_ANGLE):add(arrowheadPos) -1 * ARROW_ANGLE):add(arrowheadPos)
local arrowArm2 = Vector(arrowheadPos):moveTowards(originPos, ARROW_ARM_LENGTH):sub(arrowheadPos):rotateOver("y",
ARROW_ANGLE):add(arrowheadPos)
local head = vectorOwner.positionToLocal(arrowheadPos) local head = vectorOwner.positionToLocal(arrowheadPos)
local arm1 = vectorOwner.positionToLocal(arrowArm1) local arm1 = vectorOwner.positionToLocal(arrowArm1)
@ -512,6 +516,55 @@ function highlightMissingData(state)
end end
end end
-- Readies all cards in the main playarea (both player cards, treacheries and enemies)
function readyCards(player, clickType)
local playerColor = player.color
-- when right-clicked
if clickType == "-2" then
printToColor("This will ready (rotate 90° closer to 0°) all cards in the main play area." ..
" Make sure to handle enemy engagement manually. To exclude a card from this (e.g. Handcuffs)," ..
" right-click it, select 'Tags' and add the tag 'DoNotReady' to it.", playerColor)
return
end
local zone = guidReferenceApi.getObjectByOwnerAndType("Mythos", "PlayAreaZone")
if not zone then
broadcastToColor("Scripting zone couldn't be found.", playerColor, "Red")
return
end
broadcastToAll("Readied cards in Play Area")
local rot = self.getRotation()
for _, obj in ipairs(zone.getObjects()) do
if obj.type == "Card" and obj.locked == false and not (obj.getVar("do_not_ready") or obj.hasTag("DoNotReady")) then
local cardRotation = obj.getRotation()
local roundedRotY = round(cardRotation.y, 0)
local yRotDiff = roundedRotY - rot.y
if yRotDiff < 0 then
yRotDiff = yRotDiff + 360
end
-- rotate cards to the next multiple of 90° towards 0°
local cardRotY = rot.y
if yRotDiff > 90 and yRotDiff <= 180 then
cardRotY = rot.y + 90
elseif yRotDiff > 180 and yRotDiff < 270 then
cardRotY = rot.y + 270
end
-- highlighting for readied cards
if cardRotY == rot.y and roundedRotY ~= rot.y then
obj.highlightOn({ r = 0.8, g = 1, b = 0.05 }, 2)
end
obj.setRotation(cardRotation:setAt("y", cardRotY))
end
end
end
--------------------------------------------------------- ---------------------------------------------------------
-- functions for outside calls -- functions for outside calls
--------------------------------------------------------- ---------------------------------------------------------

View File

@ -105,7 +105,12 @@ do
-- Updates the surface of the play area -- Updates the surface of the play area
PlayAreaApi.updateSurface = function(url) PlayAreaApi.updateSurface = function(url)
return getPlayArea().call("updateSurface", url) getPlayArea().call("updateSurface", url)
end
-- Readies cards in the PlayArea
PlayAreaApi.readyCards = function()
getPlayArea().call("readyCards")
end end
-- Returns a deep copy of the currently tracked locations -- Returns a deep copy of the currently tracked locations

View File

@ -350,23 +350,22 @@ function doUpkeep(_, clickedByColor, isRightClick)
elseif obj.type == "Card" and not inArea(self.positionToLocal(obj.getPosition()), INVESTIGATOR_AREA) then elseif obj.type == "Card" 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 (obj.getVar("do_not_ready") or obj.hasTag("DoNotReady")) then if not (obj.getVar("do_not_ready") or obj.hasTag("DoNotReady")) then
local cardRotation = round(obj.getRotation().y, 0) - rot.y local cardRotation = obj.getRotation()
local yRotDiff = 0 local yRotDiff = round(cardRotation.y, 0) - rot.y
if cardRotation < 0 then if yRotDiff < 0 then
cardRotation = cardRotation + 360 yRotDiff = yRotDiff + 360
end end
-- rotate cards to the next multiple of 90° towards 0° -- rotate cards to the next multiple of 90° towards 0°
if cardRotation > 90 and cardRotation <= 180 then local cardRotY = rot.y
yRotDiff = 90 if yRotDiff > 90 and yRotDiff <= 180 then
elseif cardRotation < 270 and cardRotation > 180 then cardRotY = rot.y + 90
yRotDiff = 270 elseif yRotDiff > 180 and yRotDiff < 270 then
cardRotY = rot.y + 270
end end
-- set correct rotation for face-down cards obj.setRotation(cardRotation:setAt("y", cardRotY))
rot.z = obj.is_face_down and 180 or 0
obj.setRotation({ rot.x, rot.y + yRotDiff, rot.z })
end end
-- detect Forced Learning to handle card drawing accordingly -- detect Forced Learning to handle card drawing accordingly

View File

@ -1,4 +1,4 @@
<Panel position="160 70 -13" <Panel position="160 70 -11"
rotation="0 0 180" rotation="0 0 180"
height="74" height="74"
width="315"> width="315">
@ -7,5 +7,6 @@
textColors="#ffffff|#88e3cf|#4f8478" textColors="#ffffff|#88e3cf|#4f8478"
font="font_teutonic-arkham" font="font_teutonic-arkham"
fontSize="62" fontSize="62"
textAlignment="MiddleCenter"
onClick="reshuffleEncounterDeck">Reshuffle ➡</Button> onClick="reshuffleEncounterDeck">Reshuffle ➡</Button>
</Panel> </Panel>

25
xml/PlayArea.xml Normal file
View File

@ -0,0 +1,25 @@
<Panel position="169 182 -11"
rotation="0 0 180"
height="280"
width="660">
<Button scale="0.045 0.045 1"
color="#ffffff05"
textColors="#ffffff|#88e3cf|#4f8478"
font="font_teutonic-arkham"
fontSize="125"
textAlignment="MiddleCenter"
onClick="readyCards">Ready Cards in Play Area ↺</Button>
</Panel>
<Panel position="-169 182 -11"
rotation="0 0 180"
height="280"
width="660">
<Button scale="0.045 0.045 1"
color="#ffffff05"
textColors="#ffffff|#88e3cf|#4f8478"
font="font_teutonic-arkham"
fontSize="125"
textAlignment="MiddleCenter"
onClick="readyCards">Ready Cards in Play Area ↺</Button>
</Panel>