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

Merge pull request #712 from argonui/nav-overlay

Browse Source 
Navigation Overlay: Added additional check to see whether playmat is already occupied
This commit is contained in:
dscarpac 2024-06-12 08:25:19 -05:00 committed by GitHub
commit 21cbeb220d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/NavigationOverlayHandler.ttslua
View File

@ -189,7 +189,6 @@ end
-- XML button creation
function createXmlButtonHelper(ui, params)
local color
local guid = self.getGUID()
local xml = findTagWithId(ui, params.id)
@ -338,8 +337,8 @@ function loadCamera(player, camera)
end
end
-- swap to that color if it isn't claimed by someone else
if #getSeatedPlayers() == 1 or not isClaimed then
-- swap to that color if it isn't claimed by someone else and it's currently unoccopied
if #getSeatedPlayers() == 1 or (not isClaimed and isPlaymatAvailable(matColor)) then
local newPlayerColor = playmatApi.getPlayerColor(matColor)
copyVisibility({ startColor = player.color, targetColor = newPlayerColor })
player.changeColor(newPlayerColor)
@ -372,6 +371,17 @@ function loadCamera(player, camera)
Wait.frames(function() player.lookAt(lookHere) end, 2)
end
-- helper function to check if a playmat is available for a color swap
function isPlaymatAvailable(matColor)
local newPlayerColor = playmatApi.getPlayerColor(matColor)
for _, color in ipairs(getSeatedPlayers()) do
if color == newPlayerColor then
return false
end
end
return true
end
---------------------------------------------------------
-- settings related functionality
---------------------------------------------------------