diff --git a/config.json b/config.json index e0499e07..06ac5882 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": "", @@ -205,7 +206,26 @@ "ChaosBagManager.023240", "PlaceholderBoxDummy.a93466", "BaldursGateIII.695abd", - "ArkhamSCE340-11182023-Page1.964222" + "ArkhamSCE340-11182023-Page1.964222", + "Tokencache_1.a15273", + "Tokencache_0.0a8592", + "Tokencache_-1.b644d2", + "Tokencache_-2.8af600", + "Tokencache_-3.a7a9cb", + "Tokencache_-4.984eec", + "Tokencache_-5.1df0a5", + "Tokencache_-6.2460df", + "Tokencache_-7.81a1d7", + "Tokencache_-8.298b5f", + "Tokencache_Skull.cc8bbb", + "Tokencache_Cultist.7d6103", + "Tokencache_Tablet.1a1506", + "Tokencache_ElderThing.38609c", + "Tokencache_Auto-fail.e31821", + "Tokencache_ElderSign.0b1aca", + "Tokencache_Bless.8e3aab", + "Tokencache_Curse.16a9a7", + "Tokencache_Frost.b2b7be" ], "PlayArea": 1, "PlayerCounts": [ diff --git a/modsettings/SnapPoints.json b/modsettings/SnapPoints.json index 3cae06b2..0fca0905 100644 --- a/modsettings/SnapPoints.json +++ b/modsettings/SnapPoints.json @@ -321,9 +321,9 @@ }, { "Position": { - "x": 1.598, - "y": 1.583, - "z": -13.746 + "x": -28.643, + "y": 1.481, + "z": -38.649 }, "Rotation": { "x": 0, diff --git a/objects/AllPlayerCards.15bb07.json b/objects/AllPlayerCards.15bb07.json index b3cba98d..ab0f3aed 100644 --- a/objects/AllPlayerCards.15bb07.json +++ b/objects/AllPlayerCards.15bb07.json @@ -47,8 +47,8 @@ "TokenofFaith3.2ea0d1", "Transmogrify.9965dd", "Absolution.aef183", - "Confound.9965de", - "StrongArmed1.294d6", + "Confound3.9965de", + "Strong-Armed1.294d6", "SurvivalTechnique2.2ea0d4", "ScrimshawCharm.c1fb2e", "Vamp3.add233", @@ -1641,8 +1641,9 @@ "BlackmailFile.de456d", "SpeaktotheDead.c763aa", "Accursed.e91c5e", - "ThrowTheBookAtThem.d617ab", - "FoxMask.4144cd" + "ThrowtheBookatThem.d617ab", + "FoxMask.4144cd", + "MouseMask.32ad21" ], "ContainedObjects_path": "AllPlayerCards.15bb07", "Description": "", diff --git a/objects/AllPlayerCards.15bb07/Absolution.aef183.json b/objects/AllPlayerCards.15bb07/Absolution.aef183.json index a0bb2d1b..ea6cc794 100644 --- a/objects/AllPlayerCards.15bb07/Absolution.aef183.json +++ b/objects/AllPlayerCards.15bb07/Absolution.aef183.json @@ -58,4 +58,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/AllPlayerCards.15bb07/BuriedSecrets.28080e.json b/objects/AllPlayerCards.15bb07/BuriedSecrets.28080e.json index 9902422f..d116bd57 100644 --- a/objects/AllPlayerCards.15bb07/BuriedSecrets.28080e.json +++ b/objects/AllPlayerCards.15bb07/BuriedSecrets.28080e.json @@ -58,4 +58,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/AllPlayerCards.15bb07/Confound.9965de.gmnotes b/objects/AllPlayerCards.15bb07/Confound3.9965de.gmnotes similarity index 100% rename from objects/AllPlayerCards.15bb07/Confound.9965de.gmnotes rename to objects/AllPlayerCards.15bb07/Confound3.9965de.gmnotes diff --git a/objects/AllPlayerCards.15bb07/Confound.9965de.json b/objects/AllPlayerCards.15bb07/Confound3.9965de.json similarity index 94% rename from objects/AllPlayerCards.15bb07/Confound.9965de.json rename to objects/AllPlayerCards.15bb07/Confound3.9965de.json index a6e974b0..c7b7332e 100644 --- a/objects/AllPlayerCards.15bb07/Confound.9965de.json +++ b/objects/AllPlayerCards.15bb07/Confound3.9965de.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes_path": "AllPlayerCards.15bb07/Confound.9965de.gmnotes", + "GMNotes_path": "AllPlayerCards.15bb07/Confound3.9965de.gmnotes", "GUID": "9965de", "Grid": true, "GridProjection": false, @@ -58,4 +58,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/AllPlayerCards.15bb07/MontereyJackParallel.46b146.json b/objects/AllPlayerCards.15bb07/MontereyJackParallel.46b146.json index ee41bd06..1b061e9a 100644 --- a/objects/AllPlayerCards.15bb07/MontereyJackParallel.46b146.json +++ b/objects/AllPlayerCards.15bb07/MontereyJackParallel.46b146.json @@ -59,4 +59,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/AllPlayerCards.15bb07/MontereyJackParallelBack.46b148.json b/objects/AllPlayerCards.15bb07/MontereyJackParallelBack.46b148.json index f3117f03..99f523d0 100644 --- a/objects/AllPlayerCards.15bb07/MontereyJackParallelBack.46b148.json +++ b/objects/AllPlayerCards.15bb07/MontereyJackParallelBack.46b148.json @@ -59,4 +59,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/AllPlayerCards.15bb07/MontereyJackParallelFront.46b147.json b/objects/AllPlayerCards.15bb07/MontereyJackParallelFront.46b147.json index 232bb3ed..c79d005a 100644 --- a/objects/AllPlayerCards.15bb07/MontereyJackParallelFront.46b147.json +++ b/objects/AllPlayerCards.15bb07/MontereyJackParallelFront.46b147.json @@ -59,4 +59,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/AllPlayerCards.15bb07/MouseMask.32ad21.gmnotes b/objects/AllPlayerCards.15bb07/MouseMask.32ad21.gmnotes new file mode 100644 index 00000000..623dcd23 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/MouseMask.32ad21.gmnotes @@ -0,0 +1,18 @@ +{ + "id": "10043", + "type": "Asset", + "class": "Seeker", + "cost": 1, + "level": 0, + "traits": "Item. Charm. Mask.", + "willpowerIcons": 1, + "intellectIcons": 1, + "uses": [ + { + "count": 2, + "type": "Offering", + "token": "resource" + } + ], + "cycle": "The Feast of Hemlock Vale" +} diff --git a/objects/AllPlayerCards.15bb07/MouseMask.32ad21.json b/objects/AllPlayerCards.15bb07/MouseMask.32ad21.json new file mode 100644 index 00000000..8e173a50 --- /dev/null +++ b/objects/AllPlayerCards.15bb07/MouseMask.32ad21.json @@ -0,0 +1,62 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "CardID": 2400, + "ColorDiffuse": { + "b": 0.71324, + "g": 0.71324, + "r": 0.71324 + }, + "CustomDeck": { + "24": { + "BackIsHidden": true, + "BackURL": "https://i.imgur.com/EcbhVuh.jpg/", + "FaceURL": "http://cloud-3.steamusercontent.com/ugc/2317731538678126539/603CACA51D3BB18D8E97BB18CE9DE3A6E517AFF6/", + "NumHeight": 1, + "NumWidth": 1, + "Type": 0, + "UniqueBack": false + } + }, + "Description": "The Meek Watcher", + "DragSelectable": true, + "GMNotes_path": "AllPlayerCards.15bb07/MouseMask.32ad21.gmnotes", + "GUID": "32ad21", + "Grid": true, + "GridProjection": false, + "Hands": true, + "HideWhenFaceDown": true, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": false, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "CardCustom", + "Nickname": "Mouse Mask", + "SidewaysCard": false, + "Snap": true, + "Sticky": true, + "Tags": [ + "Asset", + "PlayerCard" + ], + "Tooltip": true, + "Transform": { + "posX": 13.082, + "posY": 3.548, + "posZ": -7.159, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 1, + "scaleY": 1, + "scaleZ": 1 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/AllPlayerCards.15bb07/ScrimshawCharm.c1fb2e.json b/objects/AllPlayerCards.15bb07/ScrimshawCharm.c1fb2e.json index 3cd8492d..2e235709 100644 --- a/objects/AllPlayerCards.15bb07/ScrimshawCharm.c1fb2e.json +++ b/objects/AllPlayerCards.15bb07/ScrimshawCharm.c1fb2e.json @@ -59,4 +59,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/AllPlayerCards.15bb07/StrongArmed1.294d6.gmnotes b/objects/AllPlayerCards.15bb07/Strong-Armed1.294d6.gmnotes similarity index 100% rename from objects/AllPlayerCards.15bb07/StrongArmed1.294d6.gmnotes rename to objects/AllPlayerCards.15bb07/Strong-Armed1.294d6.gmnotes diff --git a/objects/AllPlayerCards.15bb07/StrongArmed1.294d6.json b/objects/AllPlayerCards.15bb07/Strong-Armed1.294d6.json similarity index 94% rename from objects/AllPlayerCards.15bb07/StrongArmed1.294d6.json rename to objects/AllPlayerCards.15bb07/Strong-Armed1.294d6.json index f379c372..c0151b34 100644 --- a/objects/AllPlayerCards.15bb07/StrongArmed1.294d6.json +++ b/objects/AllPlayerCards.15bb07/Strong-Armed1.294d6.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes_path": "AllPlayerCards.15bb07/StrongArmed1.294d6.gmnotes", + "GMNotes_path": "AllPlayerCards.15bb07/Strong-Armed1.294d6.gmnotes", "GUID": "294d6", "Grid": true, "GridProjection": false, @@ -58,4 +58,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/AllPlayerCards.15bb07/SurvivalTechnique2.2ea0d4.json b/objects/AllPlayerCards.15bb07/SurvivalTechnique2.2ea0d4.json index 7152a665..f516a248 100644 --- a/objects/AllPlayerCards.15bb07/SurvivalTechnique2.2ea0d4.json +++ b/objects/AllPlayerCards.15bb07/SurvivalTechnique2.2ea0d4.json @@ -59,4 +59,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/AllPlayerCards.15bb07/ThrowTheBookAtThem.d617ab.gmnotes b/objects/AllPlayerCards.15bb07/ThrowtheBookatThem.d617ab.gmnotes similarity index 100% rename from objects/AllPlayerCards.15bb07/ThrowTheBookAtThem.d617ab.gmnotes rename to objects/AllPlayerCards.15bb07/ThrowtheBookatThem.d617ab.gmnotes diff --git a/objects/AllPlayerCards.15bb07/ThrowTheBookAtThem.d617ab.json b/objects/AllPlayerCards.15bb07/ThrowtheBookatThem.d617ab.json similarity index 94% rename from objects/AllPlayerCards.15bb07/ThrowTheBookAtThem.d617ab.json rename to objects/AllPlayerCards.15bb07/ThrowtheBookatThem.d617ab.json index a6c4ada0..dcb7c6bb 100644 --- a/objects/AllPlayerCards.15bb07/ThrowTheBookAtThem.d617ab.json +++ b/objects/AllPlayerCards.15bb07/ThrowtheBookatThem.d617ab.json @@ -24,7 +24,7 @@ }, "Description": "", "DragSelectable": true, - "GMNotes_path": "AllPlayerCards.15bb07/ThrowTheBookAtThem.d617ab.gmnotes", + "GMNotes_path": "AllPlayerCards.15bb07/ThrowtheBookatThem.d617ab.gmnotes", "GUID": "d617ab", "Grid": true, "GridProjection": false, @@ -58,4 +58,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/AllPlayerCards.15bb07/TrustyBullwhip.ca9a61.json b/objects/AllPlayerCards.15bb07/TrustyBullwhip.ca9a61.json index 75cce435..e4bef902 100644 --- a/objects/AllPlayerCards.15bb07/TrustyBullwhip.ca9a61.json +++ b/objects/AllPlayerCards.15bb07/TrustyBullwhip.ca9a61.json @@ -59,4 +59,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/AllPlayerCards.15bb07/Vamp3.add233.json b/objects/AllPlayerCards.15bb07/Vamp3.add233.json index 10146d70..d089c3d8 100644 --- a/objects/AllPlayerCards.15bb07/Vamp3.add233.json +++ b/objects/AllPlayerCards.15bb07/Vamp3.add233.json @@ -58,4 +58,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/AllPlayerCards.15bb07/WolfMask.975d89.json b/objects/AllPlayerCards.15bb07/WolfMask.975d89.json index 63db211e..4337805c 100644 --- a/objects/AllPlayerCards.15bb07/WolfMask.975d89.json +++ b/objects/AllPlayerCards.15bb07/WolfMask.975d89.json @@ -59,4 +59,4 @@ }, "Value": 0, "XmlUI": "" -} \ No newline at end of file +} diff --git a/objects/FogOfWarTrigger.3aab97.json b/objects/FogOfWarTrigger.3aab97.json index 42a8b166..4ea396cb 100644 --- a/objects/FogOfWarTrigger.3aab97.json +++ b/objects/FogOfWarTrigger.3aab97.json @@ -6,7 +6,7 @@ }, "Autoraise": true, "ColorDiffuse": { - "a": 0.75, + "a": 0.25, "b": 0.168, "g": 0.701, "r": 0.192 diff --git a/objects/GameData.3dbe47.json b/objects/GameData.3dbe47.json index be58a685..92a87544 100644 --- a/objects/GameData.3dbe47.json +++ b/objects/GameData.3dbe47.json @@ -6,7 +6,7 @@ }, "Autoraise": true, "ColorDiffuse": { - "a": 0.75, + "a": 0.25, "b": 0.25, "g": 0.25, "r": 0.25 @@ -36,13 +36,13 @@ "Tooltip": true, "Transform": { "posX": 78, - "posY": 1.9, + "posY": 2.4, "posZ": 0, "rotX": 0, "rotY": 270, "rotZ": 0, "scaleX": 84, - "scaleY": 1.5, + "scaleY": 2.5, "scaleZ": 3 }, "Value": 0, diff --git a/objects/MythosArea.9f334f.json b/objects/MythosArea.9f334f.json index 1eeead24..32bc9eca 100644 --- a/objects/MythosArea.9f334f.json +++ b/objects/MythosArea.9f334f.json @@ -48,6 +48,13 @@ "ImageURL": "http://cloud-3.steamusercontent.com/ugc/952965089462071147/F586DAA07E810B16A62C23AE2EA526BE3C7FD7FB/", "WidthScale": 0 }, + "CustomUIAssets": [ + { + "Name": "font_teutonic-arkham", + "Type": 1, + "URL": "http://cloud-3.steamusercontent.com/ugc/2027213118467703445/89328E273B4C5180BF491516CE998DE3C604E162/" + } + ], "Description": "", "DragSelectable": true, "GMNotes": "", @@ -82,5 +89,5 @@ "scaleZ": 6.5 }, "Value": 0, - "XmlUI": "" + "XmlUI": "\u003cInclude src=\"MythosArea.xml\"/\u003e" } diff --git a/objects/Tokencache_-1.b644d2.json b/objects/Tokencache_-1.b644d2.json new file mode 100644 index 00000000..5526a98d --- /dev/null +++ b/objects/Tokencache_-1.b644d2.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/w3XbrCC.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "b644d2", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_-1", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 2.545, + "posZ": -36, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_-2.8af600.json b/objects/Tokencache_-2.8af600.json new file mode 100644 index 00000000..907534d9 --- /dev/null +++ b/objects/Tokencache_-2.8af600.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/bfTg2hb.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "8af600", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_-2", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 2.745, + "posZ": -36, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_-3.a7a9cb.json b/objects/Tokencache_-3.a7a9cb.json new file mode 100644 index 00000000..8da0006e --- /dev/null +++ b/objects/Tokencache_-3.a7a9cb.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/yfs8gHq.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "a7a9cb", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_-3", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 77.999, + "posY": 2.245, + "posZ": -36.001, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_-4.984eec.json b/objects/Tokencache_-4.984eec.json new file mode 100644 index 00000000..1dffe951 --- /dev/null +++ b/objects/Tokencache_-4.984eec.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/qrgGQRD.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "984eec", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_-4", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 1.845, + "posZ": -36, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_-5.1df0a5.json b/objects/Tokencache_-5.1df0a5.json new file mode 100644 index 00000000..6af33256 --- /dev/null +++ b/objects/Tokencache_-5.1df0a5.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/3Ym1IeG.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "1df0a5", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_-5", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 77.999, + "posY": 2.145, + "posZ": -36.001, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_-6.2460df.json b/objects/Tokencache_-6.2460df.json new file mode 100644 index 00000000..acd7f0c3 --- /dev/null +++ b/objects/Tokencache_-6.2460df.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/c9qdSzS.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "2460df", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_-6", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 77.998, + "posY": 1.345, + "posZ": -36.004, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_-7.81a1d7.json b/objects/Tokencache_-7.81a1d7.json new file mode 100644 index 00000000..70bcda63 --- /dev/null +++ b/objects/Tokencache_-7.81a1d7.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/4WRD42n.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "81a1d7", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_-7", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 2.045, + "posZ": -36.001, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_-8.298b5f.json b/objects/Tokencache_-8.298b5f.json new file mode 100644 index 00000000..2009cf05 --- /dev/null +++ b/objects/Tokencache_-8.298b5f.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/9t3rPTQ.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "298b5f", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_-8", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 2.945, + "posZ": -36, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_0.0a8592.json b/objects/Tokencache_0.0a8592.json new file mode 100644 index 00000000..1a2cf7e9 --- /dev/null +++ b/objects/Tokencache_0.0a8592.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/btEtVfd.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "0a8592", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_0", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 2.845, + "posZ": -36, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_1.a15273.json b/objects/Tokencache_1.a15273.json new file mode 100644 index 00000000..6c10066e --- /dev/null +++ b/objects/Tokencache_1.a15273.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/uIx8jbY.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "a15273", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_+1", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 1.545, + "posZ": -36, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_Auto-fail.e31821.json b/objects/Tokencache_Auto-fail.e31821.json new file mode 100644 index 00000000..0e03c174 --- /dev/null +++ b/objects/Tokencache_Auto-fail.e31821.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/lns4fhz.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "e31821", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_Auto-fail", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 1.745, + "posZ": -36, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_Bless.8e3aab.json b/objects/Tokencache_Bless.8e3aab.json new file mode 100644 index 00000000..3cbab6e9 --- /dev/null +++ b/objects/Tokencache_Bless.8e3aab.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 0.04894, + "g": 0.32859, + "r": 0.37456 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1655601092778627699/339FB716CB25CA6025C338F13AFDFD9AC6FA8356/", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "8e3aab", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_Bless", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 77.999, + "posY": 1.245, + "posZ": -36.002, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_Cultist.7d6103.json b/objects/Tokencache_Cultist.7d6103.json new file mode 100644 index 00000000..7696d059 --- /dev/null +++ b/objects/Tokencache_Cultist.7d6103.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/VzhJJaH.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "7d6103", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_Cultist", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 1.945, + "posZ": -36, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_Curse.16a9a7.json b/objects/Tokencache_Curse.16a9a7.json new file mode 100644 index 00000000..55b373c5 --- /dev/null +++ b/objects/Tokencache_Curse.16a9a7.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 0.44425, + "g": 0.00387, + "r": 0.27072 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1655601092778636039/2A25BD38E8C44701D80DD96BF0121DA21843672E/", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "16a9a7", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_Curse", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 1.145, + "posZ": -36, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_ElderSign.0b1aca.json b/objects/Tokencache_ElderSign.0b1aca.json new file mode 100644 index 00000000..f962f0b9 --- /dev/null +++ b/objects/Tokencache_ElderSign.0b1aca.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/nEmqjmj.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "0b1aca", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_Elder Sign", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 1.645, + "posZ": -36, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_ElderThing.38609c.json b/objects/Tokencache_ElderThing.38609c.json new file mode 100644 index 00000000..32721112 --- /dev/null +++ b/objects/Tokencache_ElderThing.38609c.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/ttnspKt.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "38609c", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_Elder Thing", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 2.445, + "posZ": -36, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_Frost.b2b7be.json b/objects/Tokencache_Frost.b2b7be.json new file mode 100644 index 00000000..fd63ae5f --- /dev/null +++ b/objects/Tokencache_Frost.b2b7be.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 0.04894, + "g": 0.32859, + "r": 0.37456 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1858293462583104677/195F93C063A8881B805CE2FD4767A9718B27B6AE/", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "b2b7be", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_Frost", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 2.445, + "posZ": -36, + "rotX": 0, + "rotY": 270, + "rotZ": 180, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_Skull.cc8bbb.json b/objects/Tokencache_Skull.cc8bbb.json new file mode 100644 index 00000000..2857fd17 --- /dev/null +++ b/objects/Tokencache_Skull.cc8bbb.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/stbBxtx.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "cc8bbb", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_Skull", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 2.645, + "posZ": -36, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/objects/Tokencache_Tablet.1a1506.json b/objects/Tokencache_Tablet.1a1506.json new file mode 100644 index 00000000..55ef9a99 --- /dev/null +++ b/objects/Tokencache_Tablet.1a1506.json @@ -0,0 +1,57 @@ +{ + "AltLookAngle": { + "x": 0, + "y": 0, + "z": 0 + }, + "Autoraise": true, + "ColorDiffuse": { + "b": 1, + "g": 1, + "r": 1 + }, + "CustomImage": { + "CustomTile": { + "Stackable": false, + "Stretch": true, + "Thickness": 0.1, + "Type": 2 + }, + "ImageScalar": 1, + "ImageSecondaryURL": "", + "ImageURL": "https://i.imgur.com/1plY463.png", + "WidthScale": 0 + }, + "Description": "", + "DragSelectable": true, + "GMNotes": "", + "GUID": "1a1506", + "Grid": true, + "GridProjection": false, + "Hands": false, + "HideWhenFaceDown": false, + "IgnoreFoW": false, + "LayoutGroupSortIndex": 0, + "Locked": true, + "LuaScript": "", + "LuaScriptState": "", + "MeasureMovement": false, + "Name": "Custom_Tile", + "Nickname": "Tokencache_Tablet", + "Snap": true, + "Sticky": true, + "Tooltip": true, + "Transform": { + "posX": 78, + "posY": 1.445, + "posZ": -36, + "rotX": 0, + "rotY": 270, + "rotZ": 0, + "scaleX": 0.81, + "scaleY": 1, + "scaleZ": 0.81 + }, + "Value": 0, + "XmlUI": "" +} diff --git a/src/accessories/CleanUpHelper.ttslua b/src/accessories/CleanUpHelper.ttslua index 022f9e2b..d6d18ada 100644 --- a/src/accessories/CleanUpHelper.ttslua +++ b/src/accessories/CleanUpHelper.ttslua @@ -121,7 +121,6 @@ function cleanUp(_, color) blessCurseManagerApi.removeAll(color) removeLines() discardHands() - tokenSpawnTrackerApi.resetAll() chaosBagApi.returnChaosTokens() chaosBagApi.releaseAllSealedTokens(color) @@ -317,6 +316,8 @@ function tidyPlayerMatCoroutine() end end + -- reset spawned data + tokenSpawnTrackerApi.resetAll() local datahelper = guidReferenceApi.getObjectByOwnerAndType("Mythos", "DataHelper") if datahelper then datahelper.setTable("SPAWNED_PLAYER_CARD_GUIDS", {}) diff --git a/src/core/MythosArea.ttslua b/src/core/MythosArea.ttslua index a4f0f719..b9b94001 100644 --- a/src/core/MythosArea.ttslua +++ b/src/core/MythosArea.ttslua @@ -134,13 +134,6 @@ end function getEncounterDeck() local searchResult = searchLib.atPosition(ENCOUNTER_DECK_POS, "isCardOrDeck") - for _, obj in ipairs(searchResult) do - if obj.type == 'Deck' then - return obj - end - end - - -- if no deck was found, return the first hit (a card) if #searchResult > 0 then return searchResult[1] end @@ -151,6 +144,7 @@ function drawEncounterCard(params) local encounterDeck = getEncounterDeck() if encounterDeck then + reshuffledAlready = false local card if encounterDeck.type == "Deck" then card = encounterDeck.takeObject() @@ -160,7 +154,13 @@ function drawEncounterCard(params) actualEncounterCardDraw(card, params) else -- nothing here, time to reshuffle - reshuffleEncounterDeck(params) + if reshuffledAlready == true then + reshuffledAlready = false + return + end + reshuffleEncounterDeck() -- if there is no discard pile either, reshuffleEncounterDeck will give an error message already + reshuffledAlready = true + drawEncounterCard(params) end end @@ -180,27 +180,33 @@ function actualEncounterCardDraw(card, params) deckLib.placeOrMergeIntoDeck(card, pos, { 0, rotY, faceUpRotation }) end -function reshuffleEncounterDeck(params) +function reshuffleEncounterDeck() -- flag to avoid multiple calls if isReshuffling then return end isReshuffling = true - - -- shuffle and flip deck, draw card after completion - local searchResult = searchLib.atPosition(ENCOUNTER_DISCARD_POSITION, "isCardOrDeck") - if #searchResult > 0 then - local deck = searchResult[1] - if not deck.is_face_down then deck.flip() end - deck.shuffle() - deck.setPositionSmooth(Vector(ENCOUNTER_DECK_POS) + Vector(0, 2, 0), false, true) - Wait.time(function() actualEncounterCardDraw(deck.takeObject({ index = 0 }), params) end, 0.5) + local encounterDeck = getEncounterDeck() + local discardPile = searchLib.atPosition(ENCOUNTER_DISCARD_POSITION, "isCardOrDeck") + + if #discardPile > 0 then + local discardDeck = discardPile[1] + if not discardDeck.is_face_down then --flips discard pile + discardDeck.setRotation({0, -90, 180}) + end + if encounterDeck == nil then + discardDeck.setPosition(Vector(ENCOUNTER_DECK_POS) + Vector({0, 1, 0})) + discardDeck.shuffle() + else + encounterDeck.putObject(discardDeck) + encounterDeck.shuffle() + end + broadcastToAll("Shuffled encounter discard into deck.", "White") else - printToAll("Couldn't find encounter discard pile to reshuffle.", { 1, 0, 0 }) + broadcastToAll("Encounter discard pile is already empty.", "Red") end -- disable flag Wait.time(function() isReshuffling = false end, 1) end - --------------------------------------------------------- -- helper functions --------------------------------------------------------- diff --git a/xml/MythosArea.xml b/xml/MythosArea.xml new file mode 100644 index 00000000..356838c1 --- /dev/null +++ b/xml/MythosArea.xml @@ -0,0 +1,11 @@ + + +