Merge branch 'main' into taboo

This commit is contained in:
Chr1Z 2023-09-05 12:49:44 +02:00 committed by GitHub
commit e151beeccc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 171 additions and 80 deletions

View File

@ -1545,7 +1545,19 @@
"ThreeAces1Taboo.baa553",
"Hallow3Taboo.175810",
"EonChart4Taboo.41c449",
"SleightofHandTaboo.0d84b2"
"SleightofHandTaboo.0d84b2",
"LongShot.dc8c4d",
"ChemistrySet.da9727",
"PushedtotheLimit.e0f396",
"UncannyGrowth.6543e6",
"Microscope.48be49",
"Well-Funded.96fbfa",
"DrCharlesWestIII.72efed",
"RavenousMyconid.0aa967",
"StallforTime.7b6ed1",
"WrongPlaceRightTime.d5944e",
"SparrowMask.975d79",
"Pitchfork.45a724"
],
"ContainedObjects_path": "AllPlayerCards.15bb07",
"Description": "",

View File

@ -13,7 +13,7 @@
},
"CustomDeck": {
"1": {
"BackIsHidden": false,
"BackIsHidden": true,
"BackURL": "https://i.imgur.com/EcbhVuh.jpg/",
"FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021607169641060708/B263E98D28E301D8EF45EB001FEBCE98DA25354B/",
"NumHeight": 2,
@ -24,7 +24,7 @@
},
"Description": "",
"DragSelectable": true,
"GMNotes_path": "LeakedItems.42cd6e/ChemistrySet.da9727.gmnotes",
"GMNotes_path": "AllPlayerCards.15bb07/ChemistrySet.da9727.gmnotes",
"GUID": "da9727",
"Grid": true,
"GridProjection": false,
@ -47,9 +47,9 @@
],
"Tooltip": true,
"Transform": {
"posX": -44.346,
"posY": 3.23,
"posZ": -101.422,
"posX": 79.306,
"posY": 3.209,
"posZ": 20.574,
"rotX": 0,
"rotY": 270,
"rotZ": 0,

View File

@ -13,7 +13,7 @@
},
"CustomDeck": {
"1": {
"BackIsHidden": false,
"BackIsHidden": true,
"BackURL": "https://i.imgur.com/EcbhVuh.jpg/",
"FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021607169641060708/B263E98D28E301D8EF45EB001FEBCE98DA25354B/",
"NumHeight": 2,
@ -24,7 +24,7 @@
},
"Description": "Knows His Purpose",
"DragSelectable": true,
"GMNotes_path": "LeakedItems.42cd6e/DrCharlesWestIII.72efed.gmnotes",
"GMNotes_path": "AllPlayerCards.15bb07/DrCharlesWestIII.72efed.gmnotes",
"GUID": "72efed",
"Grid": true,
"GridProjection": false,
@ -47,9 +47,9 @@
],
"Tooltip": true,
"Transform": {
"posX": -44.346,
"posY": 3.23,
"posZ": -103.674,
"posX": 79.306,
"posY": 3.209,
"posZ": 18.322,
"rotX": 0,
"rotY": 270,
"rotZ": 0,

View File

@ -13,7 +13,7 @@
},
"CustomDeck": {
"1": {
"BackIsHidden": false,
"BackIsHidden": true,
"BackURL": "https://i.imgur.com/EcbhVuh.jpg/",
"FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021607169641060708/B263E98D28E301D8EF45EB001FEBCE98DA25354B/",
"NumHeight": 2,
@ -24,7 +24,7 @@
},
"Description": "",
"DragSelectable": true,
"GMNotes_path": "LeakedItems.42cd6e/LongShot.dc8c4d.gmnotes",
"GMNotes_path": "AllPlayerCards.15bb07/LongShot.dc8c4d.gmnotes",
"GUID": "dc8c4d",
"Grid": true,
"GridProjection": false,
@ -46,12 +46,12 @@
],
"Tooltip": true,
"Transform": {
"posX": -41.183,
"posY": 3.23,
"posZ": -105.927,
"rotX": 0,
"posX": 79.306,
"posY": 3.22,
"posZ": 27.331,
"rotX": 359,
"rotY": 270,
"rotZ": 0,
"rotZ": 359,
"scaleX": 1,
"scaleY": 1,
"scaleZ": 1

View File

@ -13,7 +13,7 @@
},
"CustomDeck": {
"1": {
"BackIsHidden": false,
"BackIsHidden": true,
"BackURL": "https://i.imgur.com/EcbhVuh.jpg/",
"FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021607169641060708/B263E98D28E301D8EF45EB001FEBCE98DA25354B/",
"NumHeight": 2,
@ -24,7 +24,7 @@
},
"Description": "",
"DragSelectable": true,
"GMNotes_path": "LeakedItems.42cd6e/Microscope.48be49.gmnotes",
"GMNotes_path": "AllPlayerCards.15bb07/Microscope.48be49.gmnotes",
"GUID": "48be49",
"Grid": true,
"GridProjection": false,
@ -47,9 +47,9 @@
],
"Tooltip": true,
"Transform": {
"posX": -44.346,
"posY": 3.23,
"posZ": -105.927,
"posX": 82.468,
"posY": 3.209,
"posZ": 20.574,
"rotX": 0,
"rotY": 270,
"rotZ": 0,

View File

@ -13,7 +13,7 @@
},
"CustomDeck": {
"1": {
"BackIsHidden": false,
"BackIsHidden": true,
"BackURL": "https://i.imgur.com/EcbhVuh.jpg/",
"FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021607169641060708/B263E98D28E301D8EF45EB001FEBCE98DA25354B/",
"NumHeight": 2,
@ -24,7 +24,7 @@
},
"Description": "",
"DragSelectable": true,
"GMNotes_path": "LeakedItems.42cd6e/Pitchfork.45a724.gmnotes",
"GMNotes_path": "AllPlayerCards.15bb07/Pitchfork.45a724.gmnotes",
"GUID": "45a724",
"Grid": true,
"GridProjection": false,
@ -47,9 +47,9 @@
],
"Tooltip": true,
"Transform": {
"posX": -41.183,
"posY": 3.23,
"posZ": -108.179,
"posX": 82.468,
"posY": 3.209,
"posZ": 25.078,
"rotX": 0,
"rotY": 270,
"rotZ": 0,

View File

@ -13,7 +13,7 @@
},
"CustomDeck": {
"1": {
"BackIsHidden": false,
"BackIsHidden": true,
"BackURL": "https://i.imgur.com/EcbhVuh.jpg/",
"FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021607169641060708/B263E98D28E301D8EF45EB001FEBCE98DA25354B/",
"NumHeight": 2,
@ -24,7 +24,7 @@
},
"Description": "",
"DragSelectable": true,
"GMNotes_path": "LeakedItems.42cd6e/PushedtotheLimit.e0f396.gmnotes",
"GMNotes_path": "AllPlayerCards.15bb07/PushedtotheLimit.e0f396.gmnotes",
"GUID": "e0f396",
"Grid": true,
"GridProjection": false,
@ -46,9 +46,9 @@
],
"Tooltip": true,
"Transform": {
"posX": -41.183,
"posY": 3.23,
"posZ": -112.683,
"posX": 82.468,
"posY": 3.209,
"posZ": 27.331,
"rotX": 0,
"rotY": 270,
"rotZ": 0,

View File

@ -13,7 +13,7 @@
},
"CustomDeck": {
"1": {
"BackIsHidden": false,
"BackIsHidden": true,
"BackURL": "https://i.imgur.com/EcbhVuh.jpg/",
"FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021607169641060708/B263E98D28E301D8EF45EB001FEBCE98DA25354B/",
"NumHeight": 2,
@ -24,7 +24,7 @@
},
"Description": "Unidentified",
"DragSelectable": true,
"GMNotes_path": "LeakedItems.42cd6e/RavenousMyconid.0aa967.gmnotes",
"GMNotes_path": "AllPlayerCards.15bb07/RavenousMyconid.0aa967.gmnotes",
"GUID": "0aa967",
"Grid": true,
"GridProjection": false,
@ -47,9 +47,9 @@
],
"Tooltip": true,
"Transform": {
"posX": -44.346,
"posY": 3.23,
"posZ": -108.179,
"posX": 79.306,
"posY": 3.209,
"posZ": 22.826,
"rotX": 0,
"rotY": 270,
"rotZ": 0,

View File

@ -13,7 +13,7 @@
},
"CustomDeck": {
"1": {
"BackIsHidden": false,
"BackIsHidden": true,
"BackURL": "https://i.imgur.com/EcbhVuh.jpg/",
"FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021607169641060708/B263E98D28E301D8EF45EB001FEBCE98DA25354B/",
"NumHeight": 2,
@ -24,7 +24,7 @@
},
"Description": "The Wanderer's Companion",
"DragSelectable": true,
"GMNotes_path": "LeakedItems.42cd6e/SparrowMask.975d79.gmnotes",
"GMNotes_path": "AllPlayerCards.15bb07/SparrowMask.975d79.gmnotes",
"GUID": "975d79",
"Grid": true,
"GridProjection": false,
@ -47,9 +47,9 @@
],
"Tooltip": true,
"Transform": {
"posX": -41.183,
"posY": 3.23,
"posZ": -110.431,
"posX": 82.468,
"posY": 3.209,
"posZ": 18.322,
"rotX": 0,
"rotY": 270,
"rotZ": 0,

View File

@ -13,7 +13,7 @@
},
"CustomDeck": {
"1": {
"BackIsHidden": false,
"BackIsHidden": true,
"BackURL": "https://i.imgur.com/EcbhVuh.jpg/",
"FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021607169641060708/B263E98D28E301D8EF45EB001FEBCE98DA25354B/",
"NumHeight": 2,
@ -24,7 +24,7 @@
},
"Description": "",
"DragSelectable": true,
"GMNotes_path": "LeakedItems.42cd6e/StallforTime.7b6ed1.gmnotes",
"GMNotes_path": "AllPlayerCards.15bb07/StallforTime.7b6ed1.gmnotes",
"GUID": "7b6ed1",
"Grid": true,
"GridProjection": false,
@ -46,9 +46,9 @@
],
"Tooltip": true,
"Transform": {
"posX": -41.183,
"posY": 3.23,
"posZ": -101.422,
"posX": 79.306,
"posY": 3.209,
"posZ": 25.078,
"rotX": 0,
"rotY": 270,
"rotZ": 0,

View File

@ -13,7 +13,7 @@
},
"CustomDeck": {
"1": {
"BackIsHidden": false,
"BackIsHidden": true,
"BackURL": "https://i.imgur.com/EcbhVuh.jpg/",
"FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021607169641060708/B263E98D28E301D8EF45EB001FEBCE98DA25354B/",
"NumHeight": 2,
@ -24,7 +24,7 @@
},
"Description": "",
"DragSelectable": true,
"GMNotes_path": "LeakedItems.42cd6e/UncannyGrowth.6543e6.gmnotes",
"GMNotes_path": "AllPlayerCards.15bb07/UncannyGrowth.6543e6.gmnotes",
"GUID": "6543e6",
"Grid": true,
"GridProjection": false,
@ -46,9 +46,9 @@
],
"Tooltip": true,
"Transform": {
"posX": -44.346,
"posY": 3.23,
"posZ": -110.431,
"posX": 82.468,
"posY": 3.209,
"posZ": 22.826,
"rotX": 0,
"rotY": 270,
"rotZ": 0,

View File

@ -13,7 +13,7 @@
},
"CustomDeck": {
"1": {
"BackIsHidden": false,
"BackIsHidden": true,
"BackURL": "https://i.imgur.com/EcbhVuh.jpg/",
"FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021607169641060708/B263E98D28E301D8EF45EB001FEBCE98DA25354B/",
"NumHeight": 2,
@ -24,7 +24,7 @@
},
"Description": "",
"DragSelectable": true,
"GMNotes_path": "LeakedItems.42cd6e/Well-Funded.96fbfa.gmnotes",
"GMNotes_path": "AllPlayerCards.15bb07/Well-Funded.96fbfa.gmnotes",
"GUID": "96fbfa",
"Grid": true,
"GridProjection": false,
@ -46,9 +46,9 @@
],
"Tooltip": true,
"Transform": {
"posX": -44.346,
"posY": 3.23,
"posZ": -112.683,
"posX": 79.306,
"posY": 3.209,
"posZ": 16.069,
"rotX": 0,
"rotY": 270,
"rotZ": 0,

View File

@ -33,7 +33,7 @@
"IgnoreFoW": false,
"LayoutGroupSortIndex": 0,
"Locked": false,
"LuaScript": "",
"LuaScript": "require(\"playercards/cards/WellConnected\")",
"LuaScriptState": "",
"MeasureMovement": false,
"Name": "Card",

View File

@ -33,7 +33,7 @@
"IgnoreFoW": false,
"LayoutGroupSortIndex": 0,
"Locked": false,
"LuaScript": "",
"LuaScript": "require(\"playercards/cards/WellConnected\")",
"LuaScriptState": "",
"MeasureMovement": false,
"Name": "Card",

View File

@ -13,7 +13,7 @@
},
"CustomDeck": {
"1": {
"BackIsHidden": false,
"BackIsHidden": true,
"BackURL": "https://i.imgur.com/EcbhVuh.jpg/",
"FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021607169641060708/B263E98D28E301D8EF45EB001FEBCE98DA25354B/",
"NumHeight": 2,
@ -24,7 +24,7 @@
},
"Description": "",
"DragSelectable": true,
"GMNotes_path": "LeakedItems.42cd6e/WrongPlaceRightTime.d5944e.gmnotes",
"GMNotes_path": "AllPlayerCards.15bb07/WrongPlaceRightTime.d5944e.gmnotes",
"GUID": "d5944e",
"Grid": true,
"GridProjection": false,
@ -46,9 +46,9 @@
],
"Tooltip": true,
"Transform": {
"posX": -41.183,
"posY": 3.23,
"posZ": -103.674,
"posX": 82.469,
"posY": 3.209,
"posZ": 16.069,
"rotX": 0,
"rotY": 270,
"rotZ": 0,

View File

@ -14,18 +14,6 @@
"r": 1
},
"ContainedObjects_order": [
"Well-Funded.96fbfa",
"UncannyGrowth.6543e6",
"RavenousMyconid.0aa967",
"Microscope.48be49",
"DrCharlesWestIII.72efed",
"ChemistrySet.da9727",
"PushedtotheLimit.e0f396",
"SparrowMask.975d79",
"Pitchfork.45a724",
"LongShot.dc8c4d",
"WrongPlaceRightTime.d5944e",
"StallforTime.7b6ed1",
"AliceLuxley2.94f23b",
"DragonPole3.a20aef",
"FineClothes3.5cb973",

View File

@ -18,8 +18,8 @@
"Type": 3
},
"ImageScalar": 1,
"ImageSecondaryURL": "https://i.imgur.com/s5H1THb.jpg",
"ImageURL": "https://i.imgur.com/s5H1THb.jpg",
"ImageSecondaryURL": "",
"ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021607169641075457/C12E95AE17A6C6043118449CB8012F8509828325/",
"WidthScale": 0
},
"Description": "",

View File

@ -87,6 +87,7 @@ local CYCLE_LIST = {
"The Innsmouth Conspiracy",
"Edge of the Earth",
"The Scarlet Keys",
"The Feast of Hemlock Vale",
"Investigator Packs"
}
@ -279,8 +280,11 @@ function createCycleButtons()
colCount = 0
buttonPos.z = buttonPos.z + CYCLE_BUTTONS_Z_OFFSET * rowCount
if rowCount == 3 then
-- Account for centered button on the final row
-- Account for two centered buttons on the final row
buttonPos.x = buttonPos.x + CYCLE_BUTTONS_X_OFFSET / 2
--[[ Account for centered button on the final row
buttonPos.x = buttonPos.x + CYCLE_BUTTONS_X_OFFSET
]]
end
else
buttonPos.x = buttonPos.x + CYCLE_BUTTONS_X_OFFSET

View File

@ -13,6 +13,7 @@ BONDED_CARD_LIST = {
"06033", -- Augur
"06331", -- Dream Parasite
"06015a", -- Dream-Gate
"10045" -- Uncanny Growth
}
UPGRADE_SHEET_LIST = {
@ -186,6 +187,9 @@ INVESTIGATOR_GROUPS = {
"Amina Zidane",
"Darrell Simmons",
"Charlie Kane"
},
["The Feast of Hemlock Vale"] = {
-- placeholder for future addition of investigators once we have their backs
}
}

View File

@ -0,0 +1,72 @@
-- this script is shared between both the level 0 and the upgraded level 3 version of the card
local playmatApi = require("playermat/PlaymatApi")
local display = false
local count = 0
local modValue = 5 -- level 0 Well Connected
local loopId = nil
local b_display = {
click_function = "toggleCounter",
function_owner = self,
position = {0.88,0.5,-1.33},
font_size = 150,
width = 175,
height = 175
}
function onLoad(saved_data)
local notes = JSON.decode(self.getGMNotes())
if notes.id == "54006" then -- hardcoded card id for upgraded Well Connected (3)
modValue = 4 -- Well Connected (3)
end
if saved_data != '' then
local loaded_data = JSON.decode(saved_data)
display = not loaded_data.saved_display
self.clearButtons()
toggleCounter()
end
self.addContextMenuItem('Toggle Counter', toggleCounter)
end
function onSave()
return JSON.encode({saved_display = display})
end
function toggleCounter()
display = not display
if display then
createUpdateDisplay()
loopId = Wait.time(|| createUpdateDisplay(), 2, -1)
else
if loopId ~= nil then
Wait.stop(loopId)
end
self.clearButtons()
loopId = nil
end
end
function createUpdateDisplay()
count = math.max(math.floor(getPlayerResources() / modValue), 0)
b_display.label = tostring(count)
if loopId == nil then
self.createButton(b_display)
else
self.editButton(b_display)
end
end
function getPlayerResources()
local matColor = playmatApi.getMatColorByPosition(self.getPosition())
return playmatApi.getResourceCount(matColor)
end

View File

@ -361,6 +361,11 @@ function gainResources(amount)
RESOURCE_COUNTER.call("updateVal", count + add)
end
-- returns the resource counter amount
function getResourceCount()
return RESOURCE_COUNTER.getVar("val")
end
-- function for "draw 1 button" (that can be added via option panel)
function doDrawOne(_, color)
-- send messages to player who clicked button if no seated player found

View File

@ -178,6 +178,12 @@ do
end
end
-- Returns the resource counter amount for the requested playermat
PlaymatApi.getResourceCount = function(matColor)
local mat = getObjectFromGUID(MAT_IDS[matColor])
return mat.call("getResourceCount")
end
-- Discard a non-hidden card from the corresponding player's hand
PlaymatApi.doDiscardOne = function(matColor)
for _, mat in ipairs(internal.getMatForColor(matColor)) do