From ebf79b554c78a5449072aa27d07e673c18c442b6 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Wed, 21 Jun 2023 20:02:20 +0200 Subject: [PATCH 01/20] added language dropdown --- objects/LuaScriptState.luascriptstate | 2 +- src/core/Global.ttslua | 64 ++++++++++++++++++++++++--- xml/OptionPanel.xml | 45 ++++++++++++++++--- 3 files changed, 97 insertions(+), 14 deletions(-) diff --git a/objects/LuaScriptState.luascriptstate b/objects/LuaScriptState.luascriptstate index 25c54f22..8070d96c 100644 --- a/objects/LuaScriptState.luascriptstate +++ b/objects/LuaScriptState.luascriptstate @@ -1 +1 @@ -{"acknowledgedUpgradeVersions":[],"optionPanel":{"playAreaSnapTags":true,"showAttachmentHelper":false,"showChaosBagManager":false,"showCleanUpHelper":false,"showCustomPlaymatImages":false,"showCYOA":false,"showDisplacementTool":false,"showDrawButton":false,"showHandHelper":[],"showSearchAssistant":[],"showTitleSplash":true,"showTokenArranger":false,"useClueClickers":false,"useSnapTags":true}} +{"acknowledgedUpgradeVersions":[],"optionPanel":{"cardLanguage":3,"playAreaSnapTags":true,"showAttachmentHelper":false,"showChaosBagManager":false,"showCleanUpHelper":false,"showCustomPlaymatImages":false,"showCYOA":false,"showDisplacementTool":false,"showDrawButton":false,"showHandHelper":[],"showSearchAssistant":[],"showTitleSplash":true,"showTokenArranger":false,"useClueClickers":false,"useSnapTags":true}} diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index 020abc1a..18002539 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -46,6 +46,27 @@ local SOURCE_REPO = 'https://raw.githubusercontent.com/chr1z93/loadable-objects/ local library, requestObj, modMeta, notificationVisible local acknowledgedUpgradeVersions = {} +-- language selection +local LANGUAGE_CODES = { + "zh_CN", -- 简体中文 + "zh_TW", -- 繁體中文 + "de", -- Deutsch + "en", -- English + "es", -- Español + "fr", -- Français + "it" -- Italiano +} + +local LANGUAGE_NAMES = { + "简体中文", + "繁體中文", + "Deutsch", + "English", + "Español", + "Français", + "Italiano" +} + --------------------------------------------------------- -- data for tokens --------------------------------------------------------- @@ -650,14 +671,29 @@ end --------------------------------------------------------- function onClick_refreshList() - local request = WebRequest.get(SOURCE_REPO .. '/library.json', completed_list_update) + local request = WebRequest.get(SOURCE_REPO .. '/content/library.json', completed_list_update) requestObj = request startLuaCoroutine(Global, 'downloadCoroutine') end -function onClick_select(player, params) - params = JSON.decode(urldecode(params)) - local url = SOURCE_REPO .. '/' .. params.url +-- triggers a re-download in english if localized download failed +function fallbackDownload(params) + onClick_select(_, params, true) +end + +function onClick_select(_, params, forceEnglish) + -- don't decode on fallback run + if type(params) == "string" then + params = JSON.decode(urldecode(params)) + end + + local languageCode = (LANGUAGE_CODES[optionPanel["cardLanguage"] + 1]) + + -- override languageCode to english if localized download failed + if forceEnglish then languageCode = "en" end + + -- bundle URL and start the download + local url = SOURCE_REPO .. "/content/" .. languageCode .. "/" .. params.url local request = WebRequest.get(url, function (request) complete_obj_download(request, params) end ) requestObj = request startLuaCoroutine(Global, 'downloadCoroutine') @@ -741,7 +777,13 @@ end function complete_obj_download(request, params) assert(request.is_done) if request.is_error or request.response_code ~= 200 then - print('error: ' .. request.error) + print('Error: ' .. request.error) + + -- retrigger download if localized version was requested + if (LANGUAGE_CODES[optionPanel["cardLanguage"] + 1]) ~= "en" then + printToAll("Couldn't find content in requested card language. Defaulting to english instead.", "Yellow") + fallbackDownload(params) + end else if pcall(function() local replaced_object @@ -838,15 +880,23 @@ function onClick_toggleOption(_, id) applyOptionPanelChange(id, state) end +-- called by the language selection dropdown +function languageSelected(_, selectedIndex, id) + optionPanel[id] = tonumber(selectedIndex) +end + -- sets the option panel to the correct state (corresponding to 'optionPanel') function updateOptionPanelState() for id, enabled in pairs(optionPanel) do if (type(enabled) == "boolean" and enabled) or (type(enabled) == "string" and enabled) or (type(enabled) == "table" and #enabled ~= 0) then - self.UI.setAttribute(id, "isOn", true) + UI.setAttribute(id, "isOn", true) + -- hard-coded updating of the language selection dropdown + elseif id == "cardLanguage" and type(enabled) == "number" then + UI.setAttribute(id, "value", enabled) else - self.UI.setAttribute(id, "isOn", "False") + UI.setAttribute(id, "isOn", "False") end end end diff --git a/xml/OptionPanel.xml b/xml/OptionPanel.xml index b71b6263..f65a7aa9 100644 --- a/xml/OptionPanel.xml +++ b/xml/OptionPanel.xml @@ -6,6 +6,8 @@ + + @@ -26,7 +28,7 @@ @@ -38,9 +40,16 @@ + color="#333333" + columnSpan="2"/> + + @@ -87,9 +96,9 @@ - + cellPadding="10 5 5 5"> @@ -101,6 +110,30 @@ + + + + + Card language + Downloading a supported campaign or importing a deck will use this language for the cards. + + + + + + + + + + + + + + + + + @@ -171,7 +204,7 @@ - Use clickable clue-counters + Use clickable clue counters Instead of automatically counting clues in the respective area on your playermat, this displays a clickable counter for clues. @@ -185,7 +218,7 @@ - Use clickable resource counters + Use clickable resource tokens This enables spawning of clickable resource tokens for player cards. From a20ab13a058b58fc3f8d7cb0c108b3d41e1ccdcf Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Thu, 22 Jun 2023 10:20:51 +0200 Subject: [PATCH 02/20] =?UTF-8?q?rotate=20cards=20to=20the=20next=20multip?= =?UTF-8?q?le=20of=2090=C2=B0=20towards=200=C2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/playermat/Playmat.ttslua | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/playermat/Playmat.ttslua b/src/playermat/Playmat.ttslua index 4c0efa59..27892e26 100644 --- a/src/playermat/Playmat.ttslua +++ b/src/playermat/Playmat.ttslua @@ -280,9 +280,23 @@ function doUpkeep(_, clickedByColor, isRightClick) elseif obj.tag == "Card" and not inArea(self.positionToLocal(obj.getPosition()), INVESTIGATOR_AREA) then local cardMetadata = JSON.decode(obj.getGMNotes()) or {} if not doNotReady(obj) then + local cardRotation = round(obj.getRotation().y, 0) - rot.y + local yRotDiff = 0 + + if cardRotation < 0 then + cardRotation = cardRotation + 360 + end + + -- rotate cards to the next multiple of 90° towards 0° + if cardRotation > 90 and cardRotation <= 180 then + yRotDiff = 90 + elseif cardRotation < 270 and cardRotation > 180 then + yRotDiff = 270 + end + -- set correct rotation for face-down cards rot.z = obj.is_face_down and 180 or 0 - obj.setRotation(rot) + obj.setRotation({rot.x, rot.y + yRotDiff, rot.z}) end if cardMetadata.id == "08031" then forcedLearning = true @@ -962,3 +976,11 @@ function updatePlayerCards(args) local playerCardData = customDataHelper.getTable("PLAYER_CARD_DATA") tokenManager.addPlayerCardData(playerCardData) end + +-- utility function for rounding +---@param num Number Initial value +---@param numDecimalPlaces Number Amount of decimal places +function round(num, numDecimalPlaces) + local mult = 10^(numDecimalPlaces or 0) + return math.floor(num * mult + 0.5) / mult +end From da868fecc0cccf413f6d5e00525703d120a78b95 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Fri, 23 Jun 2023 00:30:37 +0200 Subject: [PATCH 03/20] added empty entry --- objects/AllPlayerCards.15bb07/LivingInk.42b36d.gmnotes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/objects/AllPlayerCards.15bb07/LivingInk.42b36d.gmnotes b/objects/AllPlayerCards.15bb07/LivingInk.42b36d.gmnotes index 3e61ecf5..4092393b 100644 --- a/objects/AllPlayerCards.15bb07/LivingInk.42b36d.gmnotes +++ b/objects/AllPlayerCards.15bb07/LivingInk.42b36d.gmnotes @@ -13,6 +13,8 @@ } ], "customizations": [ + { + }, { "name": "Shifting Ink", "xp": 1, From 7f46c9fd63d78fb3546ced5b9628c4c0beeecb8a Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Mon, 26 Jun 2023 16:41:13 +0200 Subject: [PATCH 04/20] removed downloading change --- objects/LuaScriptState.luascriptstate | 2 +- src/core/Global.ttslua | 33 ++++++++++++++++++-- xml/OptionPanel.xml | 45 +++++++++++++++++++++++---- 3 files changed, 71 insertions(+), 9 deletions(-) diff --git a/objects/LuaScriptState.luascriptstate b/objects/LuaScriptState.luascriptstate index 25c54f22..8070d96c 100644 --- a/objects/LuaScriptState.luascriptstate +++ b/objects/LuaScriptState.luascriptstate @@ -1 +1 @@ -{"acknowledgedUpgradeVersions":[],"optionPanel":{"playAreaSnapTags":true,"showAttachmentHelper":false,"showChaosBagManager":false,"showCleanUpHelper":false,"showCustomPlaymatImages":false,"showCYOA":false,"showDisplacementTool":false,"showDrawButton":false,"showHandHelper":[],"showSearchAssistant":[],"showTitleSplash":true,"showTokenArranger":false,"useClueClickers":false,"useSnapTags":true}} +{"acknowledgedUpgradeVersions":[],"optionPanel":{"cardLanguage":3,"playAreaSnapTags":true,"showAttachmentHelper":false,"showChaosBagManager":false,"showCleanUpHelper":false,"showCustomPlaymatImages":false,"showCYOA":false,"showDisplacementTool":false,"showDrawButton":false,"showHandHelper":[],"showSearchAssistant":[],"showTitleSplash":true,"showTokenArranger":false,"useClueClickers":false,"useSnapTags":true}} diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index 020abc1a..b01b478f 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -46,6 +46,27 @@ local SOURCE_REPO = 'https://raw.githubusercontent.com/chr1z93/loadable-objects/ local library, requestObj, modMeta, notificationVisible local acknowledgedUpgradeVersions = {} +-- language selection +local LANGUAGE_CODES = { + "zh_CN", -- 简体中文 + "zh_TW", -- 繁體中文 + "de", -- Deutsch + "en", -- English + "es", -- Español + "fr", -- Français + "it" -- Italiano +} + +local LANGUAGE_NAMES = { + "简体中文", + "繁體中文", + "Deutsch", + "English", + "Español", + "Français", + "Italiano" +} + --------------------------------------------------------- -- data for tokens --------------------------------------------------------- @@ -838,15 +859,23 @@ function onClick_toggleOption(_, id) applyOptionPanelChange(id, state) end +-- called by the language selection dropdown +function languageSelected(_, selectedIndex, id) + optionPanel[id] = tonumber(selectedIndex) +end + -- sets the option panel to the correct state (corresponding to 'optionPanel') function updateOptionPanelState() for id, enabled in pairs(optionPanel) do if (type(enabled) == "boolean" and enabled) or (type(enabled) == "string" and enabled) or (type(enabled) == "table" and #enabled ~= 0) then - self.UI.setAttribute(id, "isOn", true) + UI.setAttribute(id, "isOn", true) + -- hard-coded updating of the language selection dropdown + elseif id == "cardLanguage" and type(enabled) == "number" then + UI.setAttribute(id, "value", enabled) else - self.UI.setAttribute(id, "isOn", "False") + UI.setAttribute(id, "isOn", "False") end end end diff --git a/xml/OptionPanel.xml b/xml/OptionPanel.xml index b71b6263..f65a7aa9 100644 --- a/xml/OptionPanel.xml +++ b/xml/OptionPanel.xml @@ -6,6 +6,8 @@ + + @@ -26,7 +28,7 @@ @@ -38,9 +40,16 @@ + color="#333333" + columnSpan="2"/> + + @@ -87,9 +96,9 @@ - + cellPadding="10 5 5 5"> @@ -101,6 +110,30 @@ + + + + + Card language + Downloading a supported campaign or importing a deck will use this language for the cards. + + + + + + + + + + + + + + + + + @@ -171,7 +204,7 @@ - Use clickable clue-counters + Use clickable clue counters Instead of automatically counting clues in the respective area on your playermat, this displays a clickable counter for clues. @@ -185,7 +218,7 @@ - Use clickable resource counters + Use clickable resource tokens This enables spawning of clickable resource tokens for player cards. From 7426c4475e91b1e711b8b85171985066d9e334e4 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Mon, 26 Jun 2023 16:44:14 +0200 Subject: [PATCH 05/20] reverted download function update --- src/core/Global.ttslua | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index 18002539..b01b478f 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -671,29 +671,14 @@ end --------------------------------------------------------- function onClick_refreshList() - local request = WebRequest.get(SOURCE_REPO .. '/content/library.json', completed_list_update) + local request = WebRequest.get(SOURCE_REPO .. '/library.json', completed_list_update) requestObj = request startLuaCoroutine(Global, 'downloadCoroutine') end --- triggers a re-download in english if localized download failed -function fallbackDownload(params) - onClick_select(_, params, true) -end - -function onClick_select(_, params, forceEnglish) - -- don't decode on fallback run - if type(params) == "string" then - params = JSON.decode(urldecode(params)) - end - - local languageCode = (LANGUAGE_CODES[optionPanel["cardLanguage"] + 1]) - - -- override languageCode to english if localized download failed - if forceEnglish then languageCode = "en" end - - -- bundle URL and start the download - local url = SOURCE_REPO .. "/content/" .. languageCode .. "/" .. params.url +function onClick_select(player, params) + params = JSON.decode(urldecode(params)) + local url = SOURCE_REPO .. '/' .. params.url local request = WebRequest.get(url, function (request) complete_obj_download(request, params) end ) requestObj = request startLuaCoroutine(Global, 'downloadCoroutine') @@ -777,13 +762,7 @@ end function complete_obj_download(request, params) assert(request.is_done) if request.is_error or request.response_code ~= 200 then - print('Error: ' .. request.error) - - -- retrigger download if localized version was requested - if (LANGUAGE_CODES[optionPanel["cardLanguage"] + 1]) ~= "en" then - printToAll("Couldn't find content in requested card language. Defaulting to english instead.", "Yellow") - fallbackDownload(params) - end + print('error: ' .. request.error) else if pcall(function() local replaced_object From 2bf95356dc48eda77860b2cb60c79d895d3fae7f Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Tue, 27 Jun 2023 13:32:06 +0200 Subject: [PATCH 06/20] review comments --- objects/LuaScriptState.luascriptstate | 2 +- src/core/Global.ttslua | 53 +++++++++++++-------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/objects/LuaScriptState.luascriptstate b/objects/LuaScriptState.luascriptstate index 8070d96c..63cc8fba 100644 --- a/objects/LuaScriptState.luascriptstate +++ b/objects/LuaScriptState.luascriptstate @@ -1 +1 @@ -{"acknowledgedUpgradeVersions":[],"optionPanel":{"cardLanguage":3,"playAreaSnapTags":true,"showAttachmentHelper":false,"showChaosBagManager":false,"showCleanUpHelper":false,"showCustomPlaymatImages":false,"showCYOA":false,"showDisplacementTool":false,"showDrawButton":false,"showHandHelper":[],"showSearchAssistant":[],"showTitleSplash":true,"showTokenArranger":false,"useClueClickers":false,"useSnapTags":true}} +{"acknowledgedUpgradeVersions":[],"optionPanel":{"cardLanguage":"English","playAreaSnapTags":true,"showAttachmentHelper":false,"showChaosBagManager":false,"showCleanUpHelper":false,"showCustomPlaymatImages":false,"showCYOA":false,"showDisplacementTool":false,"showDrawButton":false,"showHandHelper":[],"showSearchAssistant":[],"showTitleSplash":true,"showTokenArranger":false,"useClueClickers":false,"useSnapTags":true}} diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index b01b478f..a1393669 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -46,25 +46,14 @@ local SOURCE_REPO = 'https://raw.githubusercontent.com/chr1z93/loadable-objects/ local library, requestObj, modMeta, notificationVisible local acknowledgedUpgradeVersions = {} --- language selection -local LANGUAGE_CODES = { - "zh_CN", -- 简体中文 - "zh_TW", -- 繁體中文 - "de", -- Deutsch - "en", -- English - "es", -- Español - "fr", -- Français - "it" -- Italiano -} - -local LANGUAGE_NAMES = { - "简体中文", - "繁體中文", - "Deutsch", - "English", - "Español", - "Français", - "Italiano" +local LANGUAGES = { + { code = "zh_CN", name = "简体中文" }, + { code = "zh_TW", name = "繁體中文" }, + { code = "de", name = "Deutsch" }, + { code = "en", name = "English" }, + { code = "es", name = "Español" }, + { code = "fr", name = "Français" }, + { code = "it", name = "Italiano" } } --------------------------------------------------------- @@ -861,19 +850,29 @@ end -- called by the language selection dropdown function languageSelected(_, selectedIndex, id) - optionPanel[id] = tonumber(selectedIndex) + optionPanel[id] = LANGUAGES[tonumber(selectedIndex) + 1].name +end + +function returnLanguageId(name) + for index, tbl in ipairs(LANGUAGES) do + for key, value in pairs(tbl) do + if key == "name" and value == name then + return index + end + end + end end -- sets the option panel to the correct state (corresponding to 'optionPanel') function updateOptionPanelState() - for id, enabled in pairs(optionPanel) do - if (type(enabled) == "boolean" and enabled) - or (type(enabled) == "string" and enabled) - or (type(enabled) == "table" and #enabled ~= 0) then + for id, optionValue in pairs(optionPanel) do + if id == "cardLanguage" and type(optionValue) == "string" then + local dropdownId = returnLanguageId(optionValue) - 1 + UI.setAttribute(id, "value", dropdownId) + elseif (type(optionValue) == "boolean" and optionValue) + or (type(optionValue) == "string" and optionValue) + or (type(optionValue) == "table" and #optionValue ~= 0) then UI.setAttribute(id, "isOn", true) - -- hard-coded updating of the language selection dropdown - elseif id == "cardLanguage" and type(enabled) == "number" then - UI.setAttribute(id, "value", enabled) else UI.setAttribute(id, "isOn", "False") end From 8bb6afcd2511d6915e940bef3f7a5d3aeda2577f Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Thu, 20 Jul 2023 22:46:36 +0200 Subject: [PATCH 07/20] added bounty and evidence tokens --- .../Resource.4cd3f6.json | 122 +++++++++++++++++- .../Resource.4cd3f6.json | 122 +++++++++++++++++- .../Resource.4cd3f6.json | 122 +++++++++++++++++- .../TokenSource.124381/Resource.910e09.json | 120 ++++++++++++++++- src/core/token/TokenManager.ttslua | 8 +- 5 files changed, 480 insertions(+), 14 deletions(-) diff --git a/objects/Resourcetokens.0168ae/Resource.4cd3f6.json b/objects/Resourcetokens.0168ae/Resource.4cd3f6.json index a5c29f91..0af4b62e 100644 --- a/objects/Resourcetokens.0168ae/Resource.4cd3f6.json +++ b/objects/Resourcetokens.0168ae/Resource.4cd3f6.json @@ -25,7 +25,7 @@ "Description": "", "DragSelectable": true, "GMNotes": "", - "GUID": "4cd3f6", + "GUID": "910e09", "Grid": true, "GridProjection": false, "Hands": false, @@ -100,6 +100,64 @@ "XmlUI": "" }, "3": { + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomToken": { + "MergeDistancePixels": 10, + "Stackable": true, + "StandUp": false, + "Thickness": 0.3 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808233/22B6C4A9FEE0814E6A9BDB2C833C79D66F8100B8/", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "a5ce94", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Memo": "bounty", + "Name": "Custom_Token", + "Nickname": "Bounty", + "Snap": false, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 44, + "posY": 1.5, + "posZ": 8, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.17, + "scaleY": 0.17, + "scaleZ": 0.17 + }, + "Value": 0, + "XmlUI": "" + }, + "4": { "AltLookAngle": { "x": 0, "y": 0, @@ -157,7 +215,65 @@ "Value": 0, "XmlUI": "" }, - "4": { + "5": { + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomToken": { + "MergeDistancePixels": 10, + "Stackable": true, + "StandUp": false, + "Thickness": 0.3 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808359/FA36A27E47F940D14B4C45809BF1A0CD7783C8EB/", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "a5ce94", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Memo": "evidence", + "Name": "Custom_Token", + "Nickname": "Evidence", + "Snap": false, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 44, + "posY": 1.5, + "posZ": 8, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.17, + "scaleY": 0.17, + "scaleZ": 0.17 + }, + "Value": 0, + "XmlUI": "" + }, + "6": { "AltLookAngle": { "x": 0, "y": 0, @@ -215,7 +331,7 @@ "Value": 0, "XmlUI": "" }, - "5": { + "7": { "AltLookAngle": { "x": 0, "y": 0, diff --git a/objects/Resourcetokens.9fadf9/Resource.4cd3f6.json b/objects/Resourcetokens.9fadf9/Resource.4cd3f6.json index a5c29f91..0af4b62e 100644 --- a/objects/Resourcetokens.9fadf9/Resource.4cd3f6.json +++ b/objects/Resourcetokens.9fadf9/Resource.4cd3f6.json @@ -25,7 +25,7 @@ "Description": "", "DragSelectable": true, "GMNotes": "", - "GUID": "4cd3f6", + "GUID": "910e09", "Grid": true, "GridProjection": false, "Hands": false, @@ -100,6 +100,64 @@ "XmlUI": "" }, "3": { + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomToken": { + "MergeDistancePixels": 10, + "Stackable": true, + "StandUp": false, + "Thickness": 0.3 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808233/22B6C4A9FEE0814E6A9BDB2C833C79D66F8100B8/", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "a5ce94", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Memo": "bounty", + "Name": "Custom_Token", + "Nickname": "Bounty", + "Snap": false, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 44, + "posY": 1.5, + "posZ": 8, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.17, + "scaleY": 0.17, + "scaleZ": 0.17 + }, + "Value": 0, + "XmlUI": "" + }, + "4": { "AltLookAngle": { "x": 0, "y": 0, @@ -157,7 +215,65 @@ "Value": 0, "XmlUI": "" }, - "4": { + "5": { + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomToken": { + "MergeDistancePixels": 10, + "Stackable": true, + "StandUp": false, + "Thickness": 0.3 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808359/FA36A27E47F940D14B4C45809BF1A0CD7783C8EB/", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "a5ce94", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Memo": "evidence", + "Name": "Custom_Token", + "Nickname": "Evidence", + "Snap": false, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 44, + "posY": 1.5, + "posZ": 8, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.17, + "scaleY": 0.17, + "scaleZ": 0.17 + }, + "Value": 0, + "XmlUI": "" + }, + "6": { "AltLookAngle": { "x": 0, "y": 0, @@ -215,7 +331,7 @@ "Value": 0, "XmlUI": "" }, - "5": { + "7": { "AltLookAngle": { "x": 0, "y": 0, diff --git a/objects/Resourcetokens.fd617a/Resource.4cd3f6.json b/objects/Resourcetokens.fd617a/Resource.4cd3f6.json index 114d7942..852012b0 100644 --- a/objects/Resourcetokens.fd617a/Resource.4cd3f6.json +++ b/objects/Resourcetokens.fd617a/Resource.4cd3f6.json @@ -25,7 +25,7 @@ "Description": "", "DragSelectable": true, "GMNotes": "", - "GUID": "4cd3f6", + "GUID": "910e09", "Grid": true, "GridProjection": false, "Hands": false, @@ -100,6 +100,64 @@ "XmlUI": "" }, "3": { + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomToken": { + "MergeDistancePixels": 10, + "Stackable": true, + "StandUp": false, + "Thickness": 0.3 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808233/22B6C4A9FEE0814E6A9BDB2C833C79D66F8100B8/", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "a5ce94", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Memo": "bounty", + "Name": "Custom_Token", + "Nickname": "Bounty", + "Snap": false, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 44, + "posY": 1.5, + "posZ": 8, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.17, + "scaleY": 0.17, + "scaleZ": 0.17 + }, + "Value": 0, + "XmlUI": "" + }, + "4": { "AltLookAngle": { "x": 0, "y": 0, @@ -157,7 +215,65 @@ "Value": 0, "XmlUI": "" }, - "4": { + "5": { + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomToken": { + "MergeDistancePixels": 10, + "Stackable": true, + "StandUp": false, + "Thickness": 0.3 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808359/FA36A27E47F940D14B4C45809BF1A0CD7783C8EB/", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "a5ce94", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Memo": "evidence", + "Name": "Custom_Token", + "Nickname": "Evidence", + "Snap": false, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 44, + "posY": 1.5, + "posZ": 8, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.17, + "scaleY": 0.17, + "scaleZ": 0.17 + }, + "Value": 0, + "XmlUI": "" + }, + "6": { "AltLookAngle": { "x": 0, "y": 0, @@ -215,7 +331,7 @@ "Value": 0, "XmlUI": "" }, - "5": { + "7": { "AltLookAngle": { "x": 0, "y": 0, diff --git a/objects/TokenSource.124381/Resource.910e09.json b/objects/TokenSource.124381/Resource.910e09.json index 1ad43c58..e1584e01 100644 --- a/objects/TokenSource.124381/Resource.910e09.json +++ b/objects/TokenSource.124381/Resource.910e09.json @@ -100,6 +100,64 @@ "XmlUI": "" }, "3": { + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomToken": { + "MergeDistancePixels": 10, + "Stackable": true, + "StandUp": false, + "Thickness": 0.3 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808233/22B6C4A9FEE0814E6A9BDB2C833C79D66F8100B8/", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "a5ce94", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Memo": "bounty", + "Name": "Custom_Token", + "Nickname": "Bounty", + "Snap": false, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 44, + "posY": 1.5, + "posZ": 8, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.17, + "scaleY": 0.17, + "scaleZ": 0.17 + }, + "Value": 0, + "XmlUI": "" + }, + "4": { "AltLookAngle": { "x": 0, "y": 0, @@ -157,7 +215,65 @@ "Value": 0, "XmlUI": "" }, - "4": { + "5": { + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomToken": { + "MergeDistancePixels": 10, + "Stackable": true, + "StandUp": false, + "Thickness": 0.3 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808359/FA36A27E47F940D14B4C45809BF1A0CD7783C8EB/", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "a5ce94", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Memo": "evidence", + "Name": "Custom_Token", + "Nickname": "Evidence", + "Snap": false, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 44, + "posY": 1.5, + "posZ": 8, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.17, + "scaleY": 0.17, + "scaleZ": 0.17 + }, + "Value": 0, + "XmlUI": "" + }, + "6": { "AltLookAngle": { "x": 0, "y": 0, @@ -215,7 +331,7 @@ "Value": 0, "XmlUI": "" }, - "5": { + "7": { "AltLookAngle": { "x": 0, "y": 0, diff --git a/src/core/token/TokenManager.ttslua b/src/core/token/TokenManager.ttslua index 0358b65e..0b1b12ec 100644 --- a/src/core/token/TokenManager.ttslua +++ b/src/core/token/TokenManager.ttslua @@ -111,9 +111,11 @@ do local stateTable = { ["resource"] = 1, ["ammo"] = 2, - ["charge"] = 3, - ["secret"] = 4, - ["supply"] = 5 + ["bounty"] = 3, + ["charge"] = 4, + ["evidence"] = 5, + ["secret"] = 6, + ["supply"] = 7 } -- Source for tokens From 6ef13f644af261311a828b615f6a71bf5fef126d Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Thu, 20 Jul 2023 23:03:28 +0200 Subject: [PATCH 08/20] resolving comments --- objects/LuaScriptState.luascriptstate | 2 +- src/core/Global.ttslua | 11 +++++------ xml/OptionPanel.xml | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/objects/LuaScriptState.luascriptstate b/objects/LuaScriptState.luascriptstate index 63cc8fba..3404240e 100644 --- a/objects/LuaScriptState.luascriptstate +++ b/objects/LuaScriptState.luascriptstate @@ -1 +1 @@ -{"acknowledgedUpgradeVersions":[],"optionPanel":{"cardLanguage":"English","playAreaSnapTags":true,"showAttachmentHelper":false,"showChaosBagManager":false,"showCleanUpHelper":false,"showCustomPlaymatImages":false,"showCYOA":false,"showDisplacementTool":false,"showDrawButton":false,"showHandHelper":[],"showSearchAssistant":[],"showTitleSplash":true,"showTokenArranger":false,"useClueClickers":false,"useSnapTags":true}} +{"acknowledgedUpgradeVersions":[],"optionPanel":{"cardLanguage":"en","playAreaSnapTags":true,"showAttachmentHelper":false,"showChaosBagManager":false,"showCleanUpHelper":false,"showCustomPlaymatImages":false,"showCYOA":false,"showDisplacementTool":false,"showDrawButton":false,"showHandHelper":[],"showSearchAssistant":[],"showTitleSplash":true,"showTokenArranger":false,"useClueClickers":false,"useSnapTags":true}} diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua index a1393669..d5178b80 100644 --- a/src/core/Global.ttslua +++ b/src/core/Global.ttslua @@ -850,15 +850,14 @@ end -- called by the language selection dropdown function languageSelected(_, selectedIndex, id) - optionPanel[id] = LANGUAGES[tonumber(selectedIndex) + 1].name + optionPanel[id] = LANGUAGES[tonumber(selectedIndex) + 1].code end -function returnLanguageId(name) +-- returns the ID (position in the table) for a provided language code +function returnLanguageId(code) for index, tbl in ipairs(LANGUAGES) do - for key, value in pairs(tbl) do - if key == "name" and value == name then - return index - end + if tbl.code == code then + return index end end end diff --git a/xml/OptionPanel.xml b/xml/OptionPanel.xml index f65a7aa9..c8f08bde 100644 --- a/xml/OptionPanel.xml +++ b/xml/OptionPanel.xml @@ -115,7 +115,7 @@ Card language - Downloading a supported campaign or importing a deck will use this language for the cards. + Downloading a campaign or importing a deck will use this language (if available). From f1192cbcc3a53eb22cee70021a977473a841d1cd Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Thu, 20 Jul 2023 23:04:09 +0200 Subject: [PATCH 09/20] edited xml text --- xml/OptionPanel.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml/OptionPanel.xml b/xml/OptionPanel.xml index c8f08bde..b1d3cdce 100644 --- a/xml/OptionPanel.xml +++ b/xml/OptionPanel.xml @@ -115,7 +115,7 @@ Card language - Downloading a campaign or importing a deck will use this language (if available). + Downloading a campaign or importing a deck will use this language for cards (if available). From 5bb27c000ce473be019cfd810c3a07a705a9c40a Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Thu, 20 Jul 2023 23:16:15 +0200 Subject: [PATCH 10/20] bugfix for unprovided subtype --- src/core/token/TokenManager.ttslua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/core/token/TokenManager.ttslua b/src/core/token/TokenManager.ttslua index 0b1b12ec..235e8c58 100644 --- a/src/core/token/TokenManager.ttslua +++ b/src/core/token/TokenManager.ttslua @@ -232,6 +232,11 @@ do return end + -- handling for not provided subtype (for example when spawning from custom data helpers) + if subType == nil then + subType = "" + end + -- this is used to load the correct state for additional resource tokens (e.g. "Ammo") local callback = nil local stateID = stateTable[string.lower(subType)] From b1ced805d237c411355c5787b9985758778b20c7 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Fri, 21 Jul 2023 00:32:33 +0200 Subject: [PATCH 11/20] addition of Subject 5U-21 --- objects/AllPlayerCards.15bb07.json | 6 ++ .../Ravenous.558b0a.gmnotes | 7 +++ .../Ravenous.558b0a.json | 62 +++++++++++++++++++ .../RealityAcid.0a1b3a.gmnotes | 8 +++ .../RealityAcid.0a1b3a.json | 61 ++++++++++++++++++ .../RealityAcidReference.858b0a.json | 61 ++++++++++++++++++ .../Regurgitation.0a1b3a.gmnotes | 9 +++ .../Regurgitation.0a1b3a.json | 61 ++++++++++++++++++ .../Subject5U-21.12d3de.json | 61 ++++++++++++++++++ .../Subject5U-21.758b0a.gmnotes | 11 ++++ .../Subject5U-21.758b0a.json | 62 +++++++++++++++++++ src/playercards/PlayerCardPanelData.ttslua | 10 ++- src/playermat/Playmat.ttslua | 3 + 13 files changed, 421 insertions(+), 1 deletion(-) create mode 100644 objects/AllPlayerCards.15bb07/Ravenous.558b0a.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/Ravenous.558b0a.json create mode 100644 objects/AllPlayerCards.15bb07/RealityAcid.0a1b3a.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/RealityAcid.0a1b3a.json create mode 100644 objects/AllPlayerCards.15bb07/RealityAcidReference.858b0a.json create mode 100644 objects/AllPlayerCards.15bb07/Regurgitation.0a1b3a.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/Regurgitation.0a1b3a.json create mode 100644 objects/AllPlayerCards.15bb07/Subject5U-21.12d3de.json create mode 100644 objects/AllPlayerCards.15bb07/Subject5U-21.758b0a.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/Subject5U-21.758b0a.json diff --git a/objects/AllPlayerCards.15bb07.json b/objects/AllPlayerCards.15bb07.json index d20cfffd..1c8cd392 100644 --- a/objects/AllPlayerCards.15bb07.json +++ b/objects/AllPlayerCards.15bb07.json @@ -14,6 +14,12 @@ "r": 0.70588 }, "ContainedObjects_order": [ + "Subject5U-21.758b0a", + "Subject5U-21.12d3de", + "Regurgitation.0a1b3a", + "RealityAcid.0a1b3a", + "RealityAcidReference.858b0a", + "Ravenous.558b0a", "CharlieKane.4deeff", "FinnEdwards.dd40c0", "MontereyJack.46b145", diff --git a/objects/AllPlayerCards.15bb07/Ravenous.558b0a.gmnotes b/objects/AllPlayerCards.15bb07/Ravenous.558b0a.gmnotes new file mode 100644 index 00000000..33ba1160 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/Ravenous.558b0a.gmnotes @@ -0,0 +1,7 @@ +{ + "id": "X5U22", + "type": "Asset", + "class": "Neutral", + "traits": "Talent.", + "cycle": "Standalone" +} diff --git a/objects/AllPlayerCards.15bb07/Ravenous.558b0a.json b/objects/AllPlayerCards.15bb07/Ravenous.558b0a.json new file mode 100644 index 00000000..7f882a8e --- /dev/null +++ b/objects/AllPlayerCards.15bb07/Ravenous.558b0a.json @@ -0,0 +1,62 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "CardID": 783402, + "ColorDiffuse": { + "b": 0.71324, + "g": 0.71324, + "r": 0.71324 + }, + "CustomDeck": { + "7834": { + "BackIsHidden": true, + "BackURL": "http://cloud-3.steamusercontent.com/ugc/2021604000336039200/0CFEA26D2BFD6008EC5DBEBA15FB6FC638FC59EC/", + "FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021604000336039436/D4D5AA94D7D8EF4E264B798C3856708EFF54FBE4/", + "NumHeight": 2, + "NumWidth": 2, + "Type": 0, + "UniqueBack": true + } + }, + "Description": "(Un)-Controlled Hunger", + "DragSelectable": true, + "GMNotes_path": "AllPlayerCards.15bb07/Ravenous.558b0a.gmnotes", + "GUID": "558b0a", + "Grid": true, + "GridProjection": false, + "Hands": true, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Card", + "Nickname": "Ravenous", + "SidewaysCard": false, + "Snap": true, + "Sticky": true, + "Tags": [ + "Asset", + "PlayerCard" + ], + "Tooltip": true, + "Transform": { + "posX": 98.638, + "posY": 1.95, + "posZ": 13.549, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 1.15, + "scaleY": 1, + "scaleZ": 1.15 + }, + "Value": 0, + "XmlUI": "" +} \ No newline at end of file diff --git a/objects/AllPlayerCards.15bb07/RealityAcid.0a1b3a.gmnotes b/objects/AllPlayerCards.15bb07/RealityAcid.0a1b3a.gmnotes new file mode 100644 index 00000000..45ef3202 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/RealityAcid.0a1b3a.gmnotes @@ -0,0 +1,8 @@ +{ + "id": "X5U24", + "type": "Treachery", + "class": "Neutral", + "traits": "Power.", + "weakness": true, + "cycle": "Standalone" +} diff --git a/objects/AllPlayerCards.15bb07/RealityAcid.0a1b3a.json b/objects/AllPlayerCards.15bb07/RealityAcid.0a1b3a.json new file mode 100644 index 00000000..66a6e10d --- /dev/null +++ b/objects/AllPlayerCards.15bb07/RealityAcid.0a1b3a.json @@ -0,0 +1,61 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "CardID": 399001, + "ColorDiffuse": { + "b": 0.71324, + "g": 0.71324, + "r": 0.71324 + }, + "CustomDeck": { + "3990": { + "BackIsHidden": true, + "BackURL": "https://i.imgur.com/EcbhVuh.jpg/", + "FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021604000336039620/B919A18B0959007E62B0D66DA5F9D2413DBB2A45/", + "NumHeight": 2, + "NumWidth": 2, + "Type": 0, + "UniqueBack": false + } + }, + "Description": "", + "DragSelectable": true, + "GMNotes_path": "AllPlayerCards.15bb07/RealityAcid.0a1b3a.gmnotes", + "GUID": "0a1b3a", + "Grid": true, + "GridProjection": false, + "Hands": true, + "HideWhenFaceDown": true, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Card", + "Nickname": "Reality Acid", + "SidewaysCard": false, + "Snap": true, + "Sticky": true, + "Tags": [ + "PlayerCard" + ], + "Tooltip": true, + "Transform": { + "posX": 16.669, + "posY": 3.346, + "posZ": 65.933, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 1, + "scaleY": 1, + "scaleZ": 1 + }, + "Value": 0, + "XmlUI": "" +} \ No newline at end of file diff --git a/objects/AllPlayerCards.15bb07/RealityAcidReference.858b0a.json b/objects/AllPlayerCards.15bb07/RealityAcidReference.858b0a.json new file mode 100644 index 00000000..d7057e97 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/RealityAcidReference.858b0a.json @@ -0,0 +1,61 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "CardID": 783403, + "ColorDiffuse": { + "b": 0.71324, + "g": 0.71324, + "r": 0.71324 + }, + "CustomDeck": { + "7834": { + "BackIsHidden": true, + "BackURL": "http://cloud-3.steamusercontent.com/ugc/2021604000336039200/0CFEA26D2BFD6008EC5DBEBA15FB6FC638FC59EC/", + "FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021604000336039436/D4D5AA94D7D8EF4E264B798C3856708EFF54FBE4/", + "NumHeight": 2, + "NumWidth": 2, + "Type": 0, + "UniqueBack": true + } + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "858b0a", + "Grid": true, + "GridProjection": false, + "Hands": true, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Card", + "Nickname": "Reality Acid Reference", + "SidewaysCard": false, + "Snap": true, + "Sticky": true, + "Tags": [ + "PlayerCard" + ], + "Tooltip": true, + "Transform": { + "posX": 98.638, + "posY": 1.95, + "posZ": 13.549, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 1, + "scaleY": 1, + "scaleZ": 1 + }, + "Value": 0, + "XmlUI": "" +} \ No newline at end of file diff --git a/objects/AllPlayerCards.15bb07/Regurgitation.0a1b3a.gmnotes b/objects/AllPlayerCards.15bb07/Regurgitation.0a1b3a.gmnotes new file mode 100644 index 00000000..b1a32a39 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/Regurgitation.0a1b3a.gmnotes @@ -0,0 +1,9 @@ +{ + "id": "X5U23", + "type": "Event", + "class": "Neutral", + "cost": 0, + "traits": "Power.", + "wildIcons": 1, + "cycle": "Standalone" +} diff --git a/objects/AllPlayerCards.15bb07/Regurgitation.0a1b3a.json b/objects/AllPlayerCards.15bb07/Regurgitation.0a1b3a.json new file mode 100644 index 00000000..b79ff454 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/Regurgitation.0a1b3a.json @@ -0,0 +1,61 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "CardID": 399000, + "ColorDiffuse": { + "b": 0.71324, + "g": 0.71324, + "r": 0.71324 + }, + "CustomDeck": { + "3990": { + "BackIsHidden": true, + "BackURL": "https://i.imgur.com/EcbhVuh.jpg/", + "FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021604000336039620/B919A18B0959007E62B0D66DA5F9D2413DBB2A45/", + "NumHeight": 2, + "NumWidth": 2, + "Type": 0, + "UniqueBack": false + } + }, + "Description": "", + "DragSelectable": true, + "GMNotes_path": "AllPlayerCards.15bb07/Regurgitation.0a1b3a.gmnotes", + "GUID": "0a1b3a", + "Grid": true, + "GridProjection": false, + "Hands": true, + "HideWhenFaceDown": true, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Card", + "Nickname": "Regurgitation", + "SidewaysCard": false, + "Snap": true, + "Sticky": true, + "Tags": [ + "PlayerCard" + ], + "Tooltip": true, + "Transform": { + "posX": 16.669, + "posY": 3.346, + "posZ": 65.933, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 1, + "scaleY": 1, + "scaleZ": 1 + }, + "Value": 0, + "XmlUI": "" +} \ No newline at end of file diff --git a/objects/AllPlayerCards.15bb07/Subject5U-21.12d3de.json b/objects/AllPlayerCards.15bb07/Subject5U-21.12d3de.json new file mode 100644 index 00000000..016568c2 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/Subject5U-21.12d3de.json @@ -0,0 +1,61 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "CardID": 294000, + "ColorDiffuse": { + "b": 0.71324, + "g": 0.71324, + "r": 0.71324 + }, + "CustomDeck": { + "2940": { + "BackIsHidden": true, + "BackURL": "http://cloud-3.steamusercontent.com/ugc/2021604000336170660/EDC91FC4F04DF99FDCE795B6AC2FB303C34D7B89/", + "FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021604000336170840/2F151318C601030825E631117C0BAE1764AE6AEF/", + "NumHeight": 2, + "NumWidth": 2, + "Type": 0, + "UniqueBack": true + } + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "{\n \"id\": \"X5U21-m\",\n \"type\": \"Minicard\"\n}", + "GUID": "12d3de", + "Grid": true, + "GridProjection": false, + "Hands": true, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Card", + "Nickname": "Subject 5U-21", + "SidewaysCard": false, + "Snap": false, + "Sticky": true, + "Tags": [ + "Minicard" + ], + "Tooltip": true, + "Transform": { + "posX": 21.233, + "posY": 2.128, + "posZ": -18.151, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.6, + "scaleY": 1, + "scaleZ": 0.6 + }, + "Value": 0, + "XmlUI": "" +} \ No newline at end of file diff --git a/objects/AllPlayerCards.15bb07/Subject5U-21.758b0a.gmnotes b/objects/AllPlayerCards.15bb07/Subject5U-21.758b0a.gmnotes new file mode 100644 index 00000000..8f03353a --- /dev/null +++ b/objects/AllPlayerCards.15bb07/Subject5U-21.758b0a.gmnotes @@ -0,0 +1,11 @@ +{ + "id": "X5U21", + "type": "Investigator", + "class": "Neutral", + "traits": "Manifold.", + "willpowerIcons": 1, + "intellectIcons": 1, + "combatIcons": 1, + "agilityIcons": 1, + "cycle": "Standalone" +} diff --git a/objects/AllPlayerCards.15bb07/Subject5U-21.758b0a.json b/objects/AllPlayerCards.15bb07/Subject5U-21.758b0a.json new file mode 100644 index 00000000..3e81282c --- /dev/null +++ b/objects/AllPlayerCards.15bb07/Subject5U-21.758b0a.json @@ -0,0 +1,62 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "CardID": 783400, + "ColorDiffuse": { + "b": 0.71324, + "g": 0.71324, + "r": 0.71324 + }, + "CustomDeck": { + "7834": { + "BackIsHidden": true, + "BackURL": "http://cloud-3.steamusercontent.com/ugc/2021604000336039200/0CFEA26D2BFD6008EC5DBEBA15FB6FC638FC59EC/", + "FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021604000336039436/D4D5AA94D7D8EF4E264B798C3856708EFF54FBE4/", + "NumHeight": 2, + "NumWidth": 2, + "Type": 0, + "UniqueBack": true + } + }, + "Description": "The Anomaly", + "DragSelectable": true, + "GMNotes_path": "AllPlayerCards.15bb07/Subject5U-21.758b0a.gmnotes", + "GUID": "758b0a", + "Grid": true, + "GridProjection": false, + "Hands": true, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Card", + "Nickname": "Subject5U-21", + "SidewaysCard": true, + "Snap": true, + "Sticky": true, + "Tags": [ + "Investigator", + "PlayerCard" + ], + "Tooltip": true, + "Transform": { + "posX": 98.638, + "posY": 1.95, + "posZ": 13.549, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 1.15, + "scaleY": 1, + "scaleZ": 1.15 + }, + "Value": 0, + "XmlUI": "" +} \ No newline at end of file diff --git a/src/playercards/PlayerCardPanelData.ttslua b/src/playercards/PlayerCardPanelData.ttslua index 4f179959..7e34ea7b 100644 --- a/src/playercards/PlayerCardPanelData.ttslua +++ b/src/playercards/PlayerCardPanelData.ttslua @@ -108,7 +108,8 @@ INVESTIGATOR_GROUPS = { }, ["Neutral"] = { "Lola Hayes", - "Charlie Kane" + "Charlie Kane", + "Subject 5U-21" }, ["Core"] = { "Roland Banks", @@ -515,6 +516,13 @@ INVESTIGATORS["Charlie Kane"] = { signatures = { "09019", "09020" }, starterDeck = "2634706" } +INVESTIGATORS["Subject 5U-21"] = { + cards = { "X5U21" }, + minicards = { "X5U21-m" }, + signatures = { "X5U22", "X5U23", "X5U23", "X5U23", "X5U24", "X5U24", "X5U24" }, + starterDeck = "2624990" -- Lola's deck id until Suzi is on ArkhamDB +} + --Promo-- INVESTIGATORS["Gloria Goldberg"] = { cards = { "98019" }, diff --git a/src/playermat/Playmat.ttslua b/src/playermat/Playmat.ttslua index 0c67f86a..71b3f707 100644 --- a/src/playermat/Playmat.ttslua +++ b/src/playermat/Playmat.ttslua @@ -330,6 +330,9 @@ function doUpkeep(_, clickedByColor, isRightClick) elseif forcedLearning then printToColor("Drawing 2 cards, discard 1 (Forced Learning)", messageColor) drawCardsWithReshuffle(2) + elseif activeInvestigatorId == "X5U21" then + printToColor("Drawing 2 cards (Subject 5U-21)", messageColor) + drawCardsWithReshuffle(2) else drawCardsWithReshuffle(1) end From 463d0a986b75625854fccd9ccf98f64f51b8a160 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Fri, 21 Jul 2023 00:37:37 +0200 Subject: [PATCH 12/20] fixed reference sheet --- .../RealityAcidReference.858b0a.gmnotes | 5 +++++ .../AllPlayerCards.15bb07/RealityAcidReference.858b0a.json | 2 +- src/playercards/PlayerCardPanelData.ttslua | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 objects/AllPlayerCards.15bb07/RealityAcidReference.858b0a.gmnotes diff --git a/objects/AllPlayerCards.15bb07/RealityAcidReference.858b0a.gmnotes b/objects/AllPlayerCards.15bb07/RealityAcidReference.858b0a.gmnotes new file mode 100644 index 00000000..bba3df4a --- /dev/null +++ b/objects/AllPlayerCards.15bb07/RealityAcidReference.858b0a.gmnotes @@ -0,0 +1,5 @@ +{ + "id": "X5U25", + "type": "Story", + "cycle": "Standalone" +} diff --git a/objects/AllPlayerCards.15bb07/RealityAcidReference.858b0a.json b/objects/AllPlayerCards.15bb07/RealityAcidReference.858b0a.json index d7057e97..9f656802 100644 --- a/objects/AllPlayerCards.15bb07/RealityAcidReference.858b0a.json +++ b/objects/AllPlayerCards.15bb07/RealityAcidReference.858b0a.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes": "", + "GMNotes_path": "AllPlayerCards.15bb07/RealityAcidReference.858b0a.gmnotes", "GUID": "858b0a", "Grid": true, "GridProjection": false, diff --git a/src/playercards/PlayerCardPanelData.ttslua b/src/playercards/PlayerCardPanelData.ttslua index 7e34ea7b..9211d887 100644 --- a/src/playercards/PlayerCardPanelData.ttslua +++ b/src/playercards/PlayerCardPanelData.ttslua @@ -519,7 +519,7 @@ INVESTIGATORS["Charlie Kane"] = { INVESTIGATORS["Subject 5U-21"] = { cards = { "X5U21" }, minicards = { "X5U21-m" }, - signatures = { "X5U22", "X5U23", "X5U23", "X5U23", "X5U24", "X5U24", "X5U24" }, + signatures = { "X5U22", "X5U23", "X5U23", "X5U23", "X5U24", "X5U24", "X5U24", "X5U25" }, starterDeck = "2624990" -- Lola's deck id until Suzi is on ArkhamDB } From a182da05db7d3cce887ce21b437962fabe4e0212 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Fri, 21 Jul 2023 07:57:35 +0200 Subject: [PATCH 13/20] indentation fix --- src/playercards/PlayerCardPanelData.ttslua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/playercards/PlayerCardPanelData.ttslua b/src/playercards/PlayerCardPanelData.ttslua index 9211d887..3fde4912 100644 --- a/src/playercards/PlayerCardPanelData.ttslua +++ b/src/playercards/PlayerCardPanelData.ttslua @@ -109,7 +109,7 @@ INVESTIGATOR_GROUPS = { ["Neutral"] = { "Lola Hayes", "Charlie Kane", - "Subject 5U-21" + "Subject 5U-21" }, ["Core"] = { "Roland Banks", From 703a7654644fd5fc10567ce0418875ddccc947e7 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Fri, 21 Jul 2023 08:36:38 +0200 Subject: [PATCH 14/20] updated order for TDE --- src/accessories/CustomPlaymatImages.ttslua | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/accessories/CustomPlaymatImages.ttslua b/src/accessories/CustomPlaymatImages.ttslua index 95edf33f..10624242 100644 --- a/src/accessories/CustomPlaymatImages.ttslua +++ b/src/accessories/CustomPlaymatImages.ttslua @@ -336,15 +336,16 @@ local DATA = { Name = "VI - Starfall 3", URL = "https://i.ibb.co/W0Cx7bb/Dark-Matter-8-Starfall-Vadim-Sadovski-3.jpg" } }, - ["The Dream Eaters"] = { { + ["The Dream-Eaters"] = { { + Name = "I-A - Beyond the Gates of Sleep 1", - URL = "https://i.ibb.co/HGvnxdX/Dream-Eaters-1-A-Beyond-the-Gates-of-Sleep-Jason-Scheier.jpg" - }, { - Name = "I-A - Beyond the Gates of Sleep 2", URL = "https://i.ibb.co/S6sCy7G/Dream-Eaters-1-A-Beyond-the-Gates-of-Sleep-Phoebe-Herring.jpg" }, { - Name = "I-A - Beyond the Gates of Sleep 3", + Name = "I-A - Beyond the Gates of Sleep 2", URL = "https://i.ibb.co/kBfW9SC/Dream-Eaters-1-A-Beyond-the-Gates-of-Sleep-Regina-Kurnya.jpg" + }, { + Name = "I-A - Beyond the Gates of Sleep 3", + URL = "https://i.ibb.co/HGvnxdX/Dream-Eaters-1-A-Beyond-the-Gates-of-Sleep-Jason-Scheier.jpg" }, { Name = "I-B - Waking Nightmare", URL = "https://i.ibb.co/sWsZCv8/Dream-Eaters-1-B-Waking-Nightmare-Josh-Gould-jpg.jpg" @@ -365,13 +366,13 @@ local DATA = { URL = "https://i.ibb.co/MZ7Qtcc/Dream-Eaters-2-A-Search-for-Kadath-Nele-Diel.jpg" }, { Name = "II-B - Thousand Shapes of Horror 1", - URL = "https://i.ibb.co/VJFQVYd/Dream-Eaters-2-B-Thousand-Shapes-of-Horror-Greg-Bobrowski.jpg" + URL = "https://i.ibb.co/9s7M0PP/Dream-Eaters-2-B-Thousand-Shapes-of-Horror-Nele-Diel-2.jpg" }, { Name = "II-B - Thousand Shapes of Horror 2", URL = "https://i.ibb.co/T4Pqx0H/Dream-Eaters-2-B-Thousand-Shapes-of-Horror-Nele-Diel.jpg" }, { Name = "II-B - Thousand Shapes of Horror 3", - URL = "https://i.ibb.co/9s7M0PP/Dream-Eaters-2-B-Thousand-Shapes-of-Horror-Nele-Diel-2.jpg" + URL = "https://i.ibb.co/VJFQVYd/Dream-Eaters-2-B-Thousand-Shapes-of-Horror-Greg-Bobrowski.jpg" }, { Name = "III-A - Dark Side of the Moon 1", URL = "https://i.ibb.co/B2DfXLZ/Dream-Eaters-3-A-Dark-Side-of-the-Moon-Dabanli.jpg" @@ -722,7 +723,7 @@ local CycleList = { "The Path to Carcosa", "The Forgotten Age", "The Circle Undone", - "The Dream Eaters", + "The Dream-Eaters", "The Innsmouth Conspiracy", "Edge of the Earth", "The Scarlet Keys", From fd5dec1ae82ec990a307c71fd9a6f51fe08ca1f9 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Fri, 21 Jul 2023 08:38:09 +0200 Subject: [PATCH 15/20] removed empty line --- src/accessories/CustomPlaymatImages.ttslua | 1 - 1 file changed, 1 deletion(-) diff --git a/src/accessories/CustomPlaymatImages.ttslua b/src/accessories/CustomPlaymatImages.ttslua index 10624242..d5b0c54a 100644 --- a/src/accessories/CustomPlaymatImages.ttslua +++ b/src/accessories/CustomPlaymatImages.ttslua @@ -337,7 +337,6 @@ local DATA = { URL = "https://i.ibb.co/W0Cx7bb/Dark-Matter-8-Starfall-Vadim-Sadovski-3.jpg" } }, ["The Dream-Eaters"] = { { - Name = "I-A - Beyond the Gates of Sleep 1", URL = "https://i.ibb.co/S6sCy7G/Dream-Eaters-1-A-Beyond-the-Gates-of-Sleep-Phoebe-Herring.jpg" }, { From c6c9267ecc5595fd451641930788da362f916539 Mon Sep 17 00:00:00 2001 From: Buhallin Date: Fri, 21 Jul 2023 03:35:49 -0700 Subject: [PATCH 16/20] Remove Buhallin as a code owner --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 26a381bc..4bbdafce 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,3 +1,3 @@ # Finn considered to be code owner of all files # until Finn gets added as a github user, argonui will serve as code owner -* @argonui @Chr1Z93 @Buhallin @Tikatoy @BootleggerFinn +* @argonui @Chr1Z93 @Tikatoy @BootleggerFinn From 1386bafc3892825d16a81cb6e51dfc1aa94f2a3b Mon Sep 17 00:00:00 2001 From: Argonui Date: Mon, 24 Jul 2023 00:01:43 -0500 Subject: [PATCH 17/20] Fix Decals in config without this there can be errors in reversing --- config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config.json b/config.json index ae634099..086c0edf 100644 --- a/config.json +++ b/config.json @@ -3,6 +3,7 @@ "ComponentTags_path": "ComponentTags.json", "CustomUIAssets_path": "CustomUIAssets.json", "DecalPallet_path": "DecalPallet.json", + "Decals": [], "GameComplexity": "", "GameMode": "Arkham Horror LCG - Super Complete Edition", "GameType": "", From 19661739094796c798cdf750ca18884e79d6606d Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Fri, 28 Jul 2023 00:04:51 +0200 Subject: [PATCH 18/20] addition of parallel pete --- objects/AllPlayerCards.15bb07.json | 5 ++ .../AshcanPeteParallel.5294c3.gmnotes | 11 ++++ .../AshcanPeteParallel.5294c3.json | 62 +++++++++++++++++++ .../AshcanPeteParallelBack.5294c3.gmnotes | 11 ++++ .../AshcanPeteParallelBack.5294c3.json | 62 +++++++++++++++++++ .../AshcanPeteParallelFront.5294c3.gmnotes | 11 ++++ .../AshcanPeteParallelFront.5294c3.json | 62 +++++++++++++++++++ .../HardTimes.876557.gmnotes | 8 +++ .../HardTimes.876557.json | 61 ++++++++++++++++++ .../PetesGuitar.876557.gmnotes | 8 +++ .../PetesGuitar.876557.json | 62 +++++++++++++++++++ 11 files changed, 363 insertions(+) create mode 100644 objects/AllPlayerCards.15bb07/AshcanPeteParallel.5294c3.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/AshcanPeteParallel.5294c3.json create mode 100644 objects/AllPlayerCards.15bb07/AshcanPeteParallelBack.5294c3.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/AshcanPeteParallelBack.5294c3.json create mode 100644 objects/AllPlayerCards.15bb07/AshcanPeteParallelFront.5294c3.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/AshcanPeteParallelFront.5294c3.json create mode 100644 objects/AllPlayerCards.15bb07/HardTimes.876557.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/HardTimes.876557.json create mode 100644 objects/AllPlayerCards.15bb07/PetesGuitar.876557.gmnotes create mode 100644 objects/AllPlayerCards.15bb07/PetesGuitar.876557.json diff --git a/objects/AllPlayerCards.15bb07.json b/objects/AllPlayerCards.15bb07.json index d20cfffd..f11ff549 100644 --- a/objects/AllPlayerCards.15bb07.json +++ b/objects/AllPlayerCards.15bb07.json @@ -19,6 +19,11 @@ "MontereyJack.46b145", "Ifitbleeds.acf2b0", "BeatCop2.7001be", + "HardTimes.876557", + "PetesGuitar.876557", + "AshcanPeteParallelFront.5294c3", + "AshcanPeteParallelBack.5294c3", + "AshcanPeteParallel.5294c3", "TheNecronomicon.5b2e10", "Rolands38Special.4edb91", "StubbornDetective.4ea68b", diff --git a/objects/AllPlayerCards.15bb07/AshcanPeteParallel.5294c3.gmnotes b/objects/AllPlayerCards.15bb07/AshcanPeteParallel.5294c3.gmnotes new file mode 100644 index 00000000..d2c00c53 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/AshcanPeteParallel.5294c3.gmnotes @@ -0,0 +1,11 @@ +{ + "id": "02005-p", + "type": "Investigator", + "class": "Survivor", + "traits": "Drifter.", + "willpowerIcons": 4, + "intellectIcons": 2, + "combatIcons": 3, + "agilityIcons": 3, + "cycle": "The Dunwich Legacy" +} diff --git a/objects/AllPlayerCards.15bb07/AshcanPeteParallel.5294c3.json b/objects/AllPlayerCards.15bb07/AshcanPeteParallel.5294c3.json new file mode 100644 index 00000000..79e25eed --- /dev/null +++ b/objects/AllPlayerCards.15bb07/AshcanPeteParallel.5294c3.json @@ -0,0 +1,62 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "CardID": 479806, + "ColorDiffuse": { + "b": 0.71324, + "g": 0.71324, + "r": 0.71324 + }, + "CustomDeck": { + "4798": { + "BackIsHidden": true, + "BackURL": "http://cloud-3.steamusercontent.com/ugc/2021604542994811899/546E9EC438ED6293D5583ACCF896000268A641D8/", + "FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021604542994812173/E39BFF9281E1A524A9B7306D74DD5E113E583A93/", + "NumHeight": 2, + "NumWidth": 4, + "Type": 0, + "UniqueBack": true + } + }, + "Description": "The Drifter", + "DragSelectable": true, + "GMNotes_path": "AllPlayerCards.15bb07/AshcanPeteParallel.5294c3.gmnotes", + "GUID": "5294c3", + "Grid": true, + "GridProjection": false, + "Hands": true, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Card", + "Nickname": "\"Ashcan\" Pete (Parallel)", + "SidewaysCard": true, + "Snap": true, + "Sticky": true, + "Tags": [ + "Investigator", + "PlayerCard" + ], + "Tooltip": true, + "Transform": { + "posX": 18.448, + "posY": 1.806, + "posZ": -73.087, + "rotX": 0, + "rotY": 180, + "rotZ": 0, + "scaleX": 1.15, + "scaleY": 1, + "scaleZ": 1.15 + }, + "Value": 0, + "XmlUI": "" +} \ No newline at end of file diff --git a/objects/AllPlayerCards.15bb07/AshcanPeteParallelBack.5294c3.gmnotes b/objects/AllPlayerCards.15bb07/AshcanPeteParallelBack.5294c3.gmnotes new file mode 100644 index 00000000..6996e155 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/AshcanPeteParallelBack.5294c3.gmnotes @@ -0,0 +1,11 @@ +{ + "id": "02005-pb", + "type": "Investigator", + "class": "Survivor", + "traits": "Drifter.", + "willpowerIcons": 4, + "intellectIcons": 2, + "combatIcons": 2, + "agilityIcons": 3, + "cycle": "The Dunwich Legacy" +} diff --git a/objects/AllPlayerCards.15bb07/AshcanPeteParallelBack.5294c3.json b/objects/AllPlayerCards.15bb07/AshcanPeteParallelBack.5294c3.json new file mode 100644 index 00000000..f95d6abc --- /dev/null +++ b/objects/AllPlayerCards.15bb07/AshcanPeteParallelBack.5294c3.json @@ -0,0 +1,62 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "CardID": 469806, + "ColorDiffuse": { + "b": 0.71324, + "g": 0.71324, + "r": 0.71324 + }, + "CustomDeck": { + "4698": { + "BackIsHidden": true, + "BackURL": "http://cloud-3.steamusercontent.com/ugc/2021604542994811899/546E9EC438ED6293D5583ACCF896000268A641D8/", + "FaceURL": "http://cloud-3.steamusercontent.com/ugc/1656727981627737050/3CFF9E3825033909543AD1CF843361D9243538EE/", + "NumHeight": 2, + "NumWidth": 4, + "Type": 0, + "UniqueBack": true + } + }, + "Description": "The Drifter", + "DragSelectable": true, + "GMNotes_path": "AllPlayerCards.15bb07/AshcanPeteParallelBack.5294c3.gmnotes", + "GUID": "5294c3", + "Grid": true, + "GridProjection": false, + "Hands": true, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Card", + "Nickname": "\"Ashcan\" Pete (Parallel Back)", + "SidewaysCard": true, + "Snap": true, + "Sticky": true, + "Tags": [ + "Investigator", + "PlayerCard" + ], + "Tooltip": true, + "Transform": { + "posX": 18.448, + "posY": 1.806, + "posZ": -73.087, + "rotX": 0, + "rotY": 180, + "rotZ": 0, + "scaleX": 1.15, + "scaleY": 1, + "scaleZ": 1.15 + }, + "Value": 0, + "XmlUI": "" +} \ No newline at end of file diff --git a/objects/AllPlayerCards.15bb07/AshcanPeteParallelFront.5294c3.gmnotes b/objects/AllPlayerCards.15bb07/AshcanPeteParallelFront.5294c3.gmnotes new file mode 100644 index 00000000..6839fb99 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/AshcanPeteParallelFront.5294c3.gmnotes @@ -0,0 +1,11 @@ +{ + "id": "02005-pf", + "type": "Investigator", + "class": "Survivor", + "traits": "Drifter.", + "willpowerIcons": 4, + "intellectIcons": 2, + "combatIcons": 3, + "agilityIcons": 3, + "cycle": "The Dunwich Legacy" +} diff --git a/objects/AllPlayerCards.15bb07/AshcanPeteParallelFront.5294c3.json b/objects/AllPlayerCards.15bb07/AshcanPeteParallelFront.5294c3.json new file mode 100644 index 00000000..b0968ed2 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/AshcanPeteParallelFront.5294c3.json @@ -0,0 +1,62 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "CardID": 459806, + "ColorDiffuse": { + "b": 0.71324, + "g": 0.71324, + "r": 0.71324 + }, + "CustomDeck": { + "4598": { + "BackIsHidden": true, + "BackURL": "http://cloud-3.steamusercontent.com/ugc/1656727981627737648/F371339538812F68E38AAC0D520C525250DAC5C0/", + "FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021604542994812173/E39BFF9281E1A524A9B7306D74DD5E113E583A93/", + "NumHeight": 2, + "NumWidth": 4, + "Type": 0, + "UniqueBack": true + } + }, + "Description": "The Drifter", + "DragSelectable": true, + "GMNotes_path": "AllPlayerCards.15bb07/AshcanPeteParallelFront.5294c3.gmnotes", + "GUID": "5294c3", + "Grid": true, + "GridProjection": false, + "Hands": true, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Card", + "Nickname": "\"Ashcan\" Pete (Parallel Front)", + "SidewaysCard": true, + "Snap": true, + "Sticky": true, + "Tags": [ + "Investigator", + "PlayerCard" + ], + "Tooltip": true, + "Transform": { + "posX": 18.448, + "posY": 1.806, + "posZ": -73.087, + "rotX": 0, + "rotY": 180, + "rotZ": 0, + "scaleX": 1.15, + "scaleY": 1, + "scaleZ": 1.15 + }, + "Value": 0, + "XmlUI": "" +} \ No newline at end of file diff --git a/objects/AllPlayerCards.15bb07/HardTimes.876557.gmnotes b/objects/AllPlayerCards.15bb07/HardTimes.876557.gmnotes new file mode 100644 index 00000000..cb7e3f39 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/HardTimes.876557.gmnotes @@ -0,0 +1,8 @@ +{ + "id": "91048", + "type": "Treachery", + "class": "Neutral", + "traits": "Hardship.", + "weakness": true, + "cycle": "The Dunwich Legacy" +} diff --git a/objects/AllPlayerCards.15bb07/HardTimes.876557.json b/objects/AllPlayerCards.15bb07/HardTimes.876557.json new file mode 100644 index 00000000..a33a3c42 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/HardTimes.876557.json @@ -0,0 +1,61 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "CardID": 381101, + "ColorDiffuse": { + "b": 0.71324, + "g": 0.71324, + "r": 0.71324 + }, + "CustomDeck": { + "3811": { + "BackIsHidden": true, + "BackURL": "https://i.imgur.com/EcbhVuh.jpg/", + "FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021604542994812442/CC009EA96D868F7ED096DF8877B0416EE12A6D14/", + "NumHeight": 2, + "NumWidth": 2, + "Type": 0, + "UniqueBack": false + } + }, + "Description": "", + "DragSelectable": true, + "GMNotes_path": "AllPlayerCards.15bb07/HardTimes.876557.gmnotes", + "GUID": "876557", + "Grid": true, + "GridProjection": false, + "Hands": true, + "HideWhenFaceDown": true, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Card", + "Nickname": "Hard Times", + "SidewaysCard": false, + "Snap": true, + "Sticky": true, + "Tags": [ + "PlayerCard" + ], + "Tooltip": true, + "Transform": { + "posX": 78.272, + "posY": 1.061, + "posZ": 26.808, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 1, + "scaleY": 1, + "scaleZ": 1 + }, + "Value": 0, + "XmlUI": "" +} \ No newline at end of file diff --git a/objects/AllPlayerCards.15bb07/PetesGuitar.876557.gmnotes b/objects/AllPlayerCards.15bb07/PetesGuitar.876557.gmnotes new file mode 100644 index 00000000..89496037 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/PetesGuitar.876557.gmnotes @@ -0,0 +1,8 @@ +{ + "id": "91047", + "type": "Asset", + "class": "Neutral", + "cost": 2, + "traits": "Item. Instrument.", + "cycle": "The Dunwich Legacy" +} diff --git a/objects/AllPlayerCards.15bb07/PetesGuitar.876557.json b/objects/AllPlayerCards.15bb07/PetesGuitar.876557.json new file mode 100644 index 00000000..ac47dd32 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/PetesGuitar.876557.json @@ -0,0 +1,62 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "CardID": 381100, + "ColorDiffuse": { + "b": 0.71324, + "g": 0.71324, + "r": 0.71324 + }, + "CustomDeck": { + "3811": { + "BackIsHidden": true, + "BackURL": "https://i.imgur.com/EcbhVuh.jpg/", + "FaceURL": "http://cloud-3.steamusercontent.com/ugc/2021604542994812442/CC009EA96D868F7ED096DF8877B0416EE12A6D14/", + "NumHeight": 2, + "NumWidth": 2, + "Type": 0, + "UniqueBack": false + } + }, + "Description": "", + "DragSelectable": true, + "GMNotes_path": "AllPlayerCards.15bb07/PetesGuitar.876557.gmnotes", + "GUID": "876557", + "Grid": true, + "GridProjection": false, + "Hands": true, + "HideWhenFaceDown": true, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Card", + "Nickname": "Pete's Guitar", + "SidewaysCard": false, + "Snap": true, + "Sticky": true, + "Tags": [ + "Asset", + "PlayerCard" + ], + "Tooltip": true, + "Transform": { + "posX": 78.272, + "posY": 1.061, + "posZ": 26.808, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 1, + "scaleY": 1, + "scaleZ": 1 + }, + "Value": 0, + "XmlUI": "" +} \ No newline at end of file From c0cfccdd398286196e25cdd9fa4b1678851101f3 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Fri, 28 Jul 2023 00:07:51 +0200 Subject: [PATCH 19/20] updated playercard panel --- src/playercards/PlayerCardPanelData.ttslua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/playercards/PlayerCardPanelData.ttslua b/src/playercards/PlayerCardPanelData.ttslua index 4f179959..637c893a 100644 --- a/src/playercards/PlayerCardPanelData.ttslua +++ b/src/playercards/PlayerCardPanelData.ttslua @@ -244,9 +244,9 @@ INVESTIGATORS["Jim Culver"] = { starterDeck = "2624965" } INVESTIGATORS["\"Ashcan\" Pete"] = { - cards = { "02005" }, + cards = { "02005", "02005-p", "02005-pf", "02005-pb" }, minicards = { "02005-m" }, - signatures = { "02014", "02015" }, + signatures = { "02014", "02015", "91047", "91048" }, starterDeck = "2624969" } --Carcosa-- From 266dda3f9332bfb54190c0d6278ff65e1c9d6ad5 Mon Sep 17 00:00:00 2001 From: Chr1Z93 Date: Fri, 28 Jul 2023 09:55:26 +0200 Subject: [PATCH 20/20] added space to Suzi's name --- objects/AllPlayerCards.15bb07/Subject5U-21.758b0a.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/AllPlayerCards.15bb07/Subject5U-21.758b0a.json b/objects/AllPlayerCards.15bb07/Subject5U-21.758b0a.json index 3e81282c..0e957282 100644 --- a/objects/AllPlayerCards.15bb07/Subject5U-21.758b0a.json +++ b/objects/AllPlayerCards.15bb07/Subject5U-21.758b0a.json @@ -37,7 +37,7 @@ "LuaScriptState": "", "MeasureMovement": false, "Name": "Card", - "Nickname": "Subject5U-21", + "Nickname": "Subject 5U-21", "SidewaysCard": true, "Snap": true, "Sticky": true,