Skip to content

Improved "Take Clue for X" hotkeys #812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dscarpac merged 1 commit into from
Aug 15, 2024
Merged

Improved "Take Clue for X" hotkeys #812

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions src/core/GameKeyHandler.ttslua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,19 +448,19 @@ function switchSeat(playerColor, direction)
end

function takeClueFromLocationWhite(_, hoveredObject)
takeClueFromLocation("White", hoveredObject)
takeClueFromLocation(playermatApi.getPlayerColor("White"), hoveredObject)
end

function takeClueFromLocationOrange(_, hoveredObject)
takeClueFromLocation("Orange", hoveredObject)
takeClueFromLocation(playermatApi.getPlayerColor("Orange"), hoveredObject)
end

function takeClueFromLocationGreen(_, hoveredObject)
takeClueFromLocation("Green", hoveredObject)
takeClueFromLocation(playermatApi.getPlayerColor("Green"), hoveredObject)
end

function takeClueFromLocationRed(_, hoveredObject)
takeClueFromLocation("Red", hoveredObject)
takeClueFromLocation(playermatApi.getPlayerColor("Red"), hoveredObject)
end

-- takes a clue from a location, player needs to hover the clue directly or the location
Expand Down Expand Up @@ -506,15 +506,10 @@ function takeClueFromLocation(playerColor, hoveredObject)
return
end

-- determine the matColor and position
local clickableClues = GlobalApi.getOptionPanelState()["useClueClickers"]

-- handling for calling this for a specific mat via hotkey
local matColor, pos
if Player[playerColor] and Player[playerColor].seated then
matColor = playermatApi.getMatColor(playerColor)
else
matColor = playerColor
end
local matColor = playermatApi.getMatColor(playerColor)
local pos

if clickableClues then
pos = { x = 0.49, y = 2.66, z = 0.00 }
Expand Down