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

Merge pull request #147 from argonui/token-manager-counter-token

Browse Source 
Token Manager: Bugfix for spawning of multiple tokens and default rotation of damage and horror tokens
This commit is contained in:
Chr1Z 2023-01-04 10:22:32 +01:00 committed by GitHub
commit 817a15bec6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 205 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

298
objects/TokenSource.124381/Damage.cd2a02.json
View File

@ -87,9 +87,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.000002114869, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -0.00000344551631, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -144,9 +144,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.00999987, "posY": 1.00999987,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000637244239, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 1.0489314e-7, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -201,9 +201,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.000006856813, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 6.24681149e-7, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -258,9 +258,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000810479651, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 4.15571648e-8, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -315,9 +315,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.00000515672855, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -9.08177e-7, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -372,9 +372,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.000007670889, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 2.730384e-7, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -429,9 +429,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.000009659233, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 0.000003145974, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -486,9 +486,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.00999987, "posY": 1.00999987,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 9.30901138e-7, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 0.0000140537149, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -543,9 +543,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000349763832, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -0.000011208811, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -600,9 +600,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01000011, "posY": 1.01000011,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000487788157, "rotX": 0,
"rotY": 180.000015, "rotY": 270,
"rotZ": 0.00000283701524, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -657,9 +657,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.00999987, "posY": 1.00999987,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.0000112864509, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 0.000009893568, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -714,9 +714,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000381104314, "rotX": 0,
"rotY": 180.000015, "rotY": 270,
"rotZ": -0.0000125628785, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -771,9 +771,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.0000109130187, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 0.00001615263, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -828,9 +828,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.00999987, "posY": 1.00999987,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 3.85535827e-7, "rotX": 0,
"rotY": 180.000015, "rotY": 270,
"rotZ": -3.36548e-7, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -885,9 +885,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.0000105401759, "rotX": 0,
"rotY": 180.000015, "rotY": 270,
"rotZ": 0.00000126669079, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -942,9 +942,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000114314139, "rotX": 0,
"rotY": 180.000015, "rotY": 270,
"rotZ": 0.00000173802164, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -999,9 +999,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.00000184584269, "rotX": 0,
"rotY": 180.000015, "rotY": 270,
"rotZ": 0.0000053036315, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1056,9 +1056,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000102766649, "rotX": 0,
"rotY": 180.000015, "rotY": 270,
"rotZ": -0.0000137765155, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1113,9 +1113,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.0000019677243, "rotX": 0,
"rotY": 180.000015, "rotY": 270,
"rotZ": 0.00000249157665, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1170,9 +1170,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.00001276227, "rotX": 0,
"rotY": 180.000015, "rotY": 270,
"rotZ": 0.00000153182373, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1227,9 +1227,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.00000313882947, "rotX": 0,
"rotY": 180.000015, "rotY": 270,
"rotZ": -4.327291e-8, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1284,9 +1284,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -9.526744e-8, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -7.436876e-8, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1341,9 +1341,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.00000168156157, "rotX": 0,
"rotY": 180.000015, "rotY": 270,
"rotZ": 0.00000219717617, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1398,9 +1398,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.0000069150783, "rotX": 0,
"rotY": 180.000015, "rotY": 270,
"rotZ": 0.000002574338, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1455,9 +1455,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.000011233, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 0.0000167793787, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1512,9 +1512,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.00000190952255, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 6.814834e-7, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1569,9 +1569,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.0000108585373, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 0.00000540023439, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1626,9 +1626,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000721516062, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -0.000002222035, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1683,9 +1683,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000655812164, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -4.21542978e-7, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1740,9 +1740,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.000008363716, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 0.0000125134511, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1797,9 +1797,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000165363917, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 0.00000755110068, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1854,9 +1854,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.00999987, "posY": 1.00999987,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000433588548, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 0.0000134007632, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1911,9 +1911,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.000003948265, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -0.0000210753624, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -1968,9 +1968,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.00000305671983, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -0.000004596211, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2025,9 +2025,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 6.80305163e-7, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -0.00000447995035, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2082,9 +2082,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000368703422, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 2.98529955e-7, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2139,9 +2139,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000327916132, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 8.00865e-8, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2196,9 +2196,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.0000132305695, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -0.000008536388, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2253,9 +2253,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.00999987, "posY": 1.00999987,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.000008879468, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -0.0000035132357, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2310,9 +2310,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000577568835, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 0.000007164294, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2367,9 +2367,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.0000150068281, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 0.00000370904536, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2424,9 +2424,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000477549, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -0.000008039457, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2481,9 +2481,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01000011, "posY": 1.01000011,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.0000132930072, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -0.0000175149926, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2538,9 +2538,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.00999987, "posY": 1.00999987,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.0000251728725, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -0.0000107583146, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2595,9 +2595,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.0000107346423, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 0.0000103672137, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2652,9 +2652,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 1.53614124e-7, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -0.000009400431, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2709,9 +2709,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": -0.00000806476, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -0.0000194595268, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2766,9 +2766,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.00000166816653, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": -0.0000142901517, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2823,9 +2823,9 @@
"posX": -26.8049335, "posX": -26.8049335,
"posY": 1.01, "posY": 1.01,
"posZ": 9.519388, "posZ": 9.519388,
"rotX": 0.00000192622952, "rotX": 0,
"rotY": 180, "rotY": 270,
"rotZ": 0.00000437234166, "rotZ": 0,
"scaleX": 0.239203319, "scaleX": 0.239203319,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.239203319 "scaleZ": 0.239203319
@ -2840,9 +2840,9 @@
"posX": 78.665, "posX": 78.665,
"posY": 2.351, "posY": 2.351,
"posZ": -1.205, "posZ": -1.205,
"rotX": 357, "rotX": 0,
"rotY": 270, "rotY": 270,
"rotZ": 5, "rotZ": 0,
"scaleX": 0.24, "scaleX": 0.24,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.24 "scaleZ": 0.24

52
objects/TokenSource.124381/Horror.36be72.json
View File

@ -87,9 +87,9 @@
"posX": -27.7533741, "posX": -27.7533741,
"posY": 1.210006, "posY": 1.210006,
"posZ": 15.9442654, "posZ": 15.9442654,
"rotX": -0.0000202706469, "rotX": 0,
"rotY": 270.015259, "rotY": 270,
"rotZ": 0.0000220759175, "rotZ": 0,
"scaleX": 0.25, "scaleX": 0.25,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.25 "scaleZ": 0.25
@ -144,9 +144,9 @@
"posX": -27.7533741, "posX": -27.7533741,
"posY": 1.210006, "posY": 1.210006,
"posZ": 15.9442368, "posZ": 15.9442368,
"rotX": -0.0000104253941, "rotX": 0,
"rotY": 270.015137, "rotY": 270,
"rotZ": 0.0000102804506, "rotZ": 0,
"scaleX": 0.25, "scaleX": 0.25,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.25 "scaleZ": 0.25
@ -201,9 +201,9 @@
"posX": -27.7533741, "posX": -27.7533741,
"posY": 1.21000612, "posY": 1.21000612,
"posZ": 15.9442348, "posZ": 15.9442348,
"rotX": 0.00000189065361, "rotX": 0,
"rotY": 270.01532, "rotY": 270,
"rotZ": 0.0000159575811, "rotZ": 0,
"scaleX": 0.25, "scaleX": 0.25,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.25 "scaleZ": 0.25
@ -258,9 +258,9 @@
"posX": -27.7533741, "posX": -27.7533741,
"posY": 1.21000612, "posY": 1.21000612,
"posZ": 15.9442024, "posZ": 15.9442024,
"rotX": -0.00003432232, "rotX": 0,
"rotY": 270.016, "rotY": 270,
"rotZ": -0.00000373151761, "rotZ": 0,
"scaleX": 0.25, "scaleX": 0.25,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.25 "scaleZ": 0.25
@ -315,9 +315,9 @@
"posX": -27.7533741, "posX": -27.7533741,
"posY": 1.21000624, "posY": 1.21000624,
"posZ": 15.94415, "posZ": 15.94415,
"rotX": -0.0000249414188, "rotX": 0,
"rotY": 270.0157, "rotY": 270,
"rotZ": 0.00000292043842, "rotZ": 0,
"scaleX": 0.25, "scaleX": 0.25,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.25 "scaleZ": 0.25
@ -372,9 +372,9 @@
"posX": -27.7533741, "posX": -27.7533741,
"posY": 1.21000612, "posY": 1.21000612,
"posZ": 15.944108, "posZ": 15.944108,
"rotX": -0.0000233948358, "rotX": 0,
"rotY": 270.015656, "rotY": 270,
"rotZ": 0.00000218774017, "rotZ": 0,
"scaleX": 0.25, "scaleX": 0.25,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.25 "scaleZ": 0.25
@ -429,9 +429,9 @@
"posX": -27.753376, "posX": -27.753376,
"posY": 1.210006, "posY": 1.210006,
"posZ": 15.9440966, "posZ": 15.9440966,
"rotX": -1.57902083e-8, "rotX": 0,
"rotY": 270.016541, "rotY": 270,
"rotZ": -0.0000219759459, "rotZ": 0,
"scaleX": 0.25, "scaleX": 0.25,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.25 "scaleZ": 0.25
@ -486,9 +486,9 @@
"posX": -27.753376, "posX": -27.753376,
"posY": 1.21000612, "posY": 1.21000612,
"posZ": 15.9440622, "posZ": 15.9440622,
"rotX": -0.0000209277514, "rotX": 0,
"rotY": 270.016724, "rotY": 270,
"rotZ": 0.00004970206, "rotZ": 0,
"scaleX": 0.25, "scaleX": 0.25,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.25 "scaleZ": 0.25
@ -503,9 +503,9 @@
"posX": 79.031, "posX": 79.031,
"posY": 2.307, "posY": 2.307,
"posZ": -1.38, "posZ": -1.38,
"rotX": 358, "rotX": 0,
"rotY": 270, "rotY": 270,
"rotZ": 1, "rotZ": 0,
"scaleX": 0.25, "scaleX": 0.25,
"scaleY": 1, "scaleY": 1,
"scaleZ": 0.25 "scaleZ": 0.25

74
src/core/token/TokenManager.ttslua
View File

@ -4,22 +4,22 @@ do
local PLAYER_CARD_TOKEN_OFFSETS = { local PLAYER_CARD_TOKEN_OFFSETS = {
[1] = { [1] = {
Vector(0, 8, -0.2) Vector(0, 3, -0.2)
}, },
[2] = { [2] = {
Vector(0.4, 20, -0.2), Vector(0.4, 3, -0.2),
Vector(-0.4, 20, -0.2) Vector(-0.4, 3, -0.2)
}, },
[3] = { [3] = {
Vector(0, 8, -0.9), Vector(0, 3, -0.9),
Vector(0.4, 8, -0.2), Vector(0.4, 3, -0.2),
Vector(-0.4, 8, -0.2) Vector(-0.4, 3, -0.2)
}, },
[4] = { [4] = {
Vector(0.4, 10, -0.9), Vector(0.4, 3, -0.9),
Vector(-0.4, 10, -0.9), Vector(-0.4, 3, -0.9),
Vector(0.4, 10, -0.2), Vector(0.4, 3, -0.2),
Vector(-0.4, 10, -0.2) Vector(-0.4, 3, -0.2)
}, },
[5] = { [5] = {
Vector(0.7, 3, -0.9), Vector(0.7, 3, -0.9),
@ -145,9 +145,9 @@ do
---@param card Object Card to spawn tokens on ---@param card Object Card to spawn tokens on
---@param tokenType String type of token to spawn, valid values are "damage", "horror", ---@param tokenType String type of token to spawn, valid values are "damage", "horror",
-- "resource", "doom", or "clue" -- "resource", "doom", or "clue"
---@param tokenCount How many tokens to spawn. For damage or horror this value will be set to the ---@param tokenCount Number How many tokens to spawn. For damage or horror this value will be set to the
-- spawned state object rather than spawning multiple tokens -- spawned state object rather than spawning multiple tokens
---@param shiftDown An offset for the z-value of this group of tokens ---@param shiftDown Number An offset for the z-value of this group of tokens
TokenManager.spawnTokenGroup = function(card, tokenType, tokenCount, shiftDown) TokenManager.spawnTokenGroup = function(card, tokenType, tokenCount, shiftDown)
local optionPanel = Global.getTable("optionPanel") local optionPanel = Global.getTable("optionPanel")
@ -165,27 +165,13 @@ do
---@param card Object Card to spawn tokens on ---@param card Object Card to spawn tokens on
---@param tokenType String type of token to spawn, valid values are "damage" and "horror". Other ---@param tokenType String type of token to spawn, valid values are "damage" and "horror". Other
-- types should use spawnMultipleTokens() -- types should use spawnMultipleTokens()
---@param tokenValue Value to set the damage/horror to ---@param tokenValue Number Value to set the damage/horror to
---@param shiftDown An offset for the z-value of this group of tokens
TokenManager.spawnCounterToken = function(card, tokenType, tokenValue, shiftDown) TokenManager.spawnCounterToken = function(card, tokenType, tokenValue, shiftDown)
if tokenCount < 1 or tokenCount > 50 then if tokenValue < 1 or tokenValue > 50 then return end
return
end local pos = card.positionToWorld(PLAYER_CARD_TOKEN_OFFSETS[1][1] + Vector(0, 0, shiftDown))
local offsets = PLAYER_CARD_TOKEN_OFFSETS[1] local rot = card.getRotation()
if shiftDown ~= nil then TokenManager.spawnToken(pos, tokenType, rot, function(spawned) spawned.setState(tokenValue) end)
-- Copy the offsets to make sure we don't change the static values
local baseOffsets = offsets
offsets = { }
for i, baseOffset in ipairs(baseOffsets) do
offsets[i] = baseOffset
offsets[i][3] = offsets[i][3] + shiftDown
end
end
local pos = card.positionToWorld(offsets[1])
pos.y = card.getPosition().y + 0.15
TokenManager.spawnToken(pos, tokenType, card.getRotation(), function(spawned)
spawned.setState(tokenValue)
end)
end end
TokenManager.spawnResourceCounterToken = function(card, tokenCount) TokenManager.spawnResourceCounterToken = function(card, tokenCount)
@ -199,18 +185,17 @@ do
-- Spawns a number of tokens. -- Spawns a number of tokens.
---@param tokenType String type of token to spawn, valid values are resource", "doom", or "clue". ---@param tokenType String type of token to spawn, valid values are resource", "doom", or "clue".
-- Other types should use spawnCounterToken() -- Other types should use spawnCounterToken()
---@param tokenCount How many tokens to spawn. For damage or horror this value will be set to the ---@param tokenCount Number How many tokens to spawn
-- spawned state object rather than spawning multiple tokens ---@param shiftDown Number An offset for the z-value of this group of tokens
---@param shiftDown An offset for the z-value of this group of tokens
TokenManager.spawnMultipleTokens = function(card, tokenType, tokenCount, shiftDown) TokenManager.spawnMultipleTokens = function(card, tokenType, tokenCount, shiftDown)
if tokenCount < 1 or tokenCount > 12 then if tokenCount < 1 or tokenCount > 12 then
return return
end end
local offsets
local offsets = {}
if tokenType == "clue" then if tokenType == "clue" then
offsets = internal.buildClueOffsets(card, tokenCount) offsets = internal.buildClueOffsets(card, tokenCount)
else else
offsets = { }
for i = 1, tokenCount do for i = 1, tokenCount do
offsets[i] = card.positionToWorld(PLAYER_CARD_TOKEN_OFFSETS[tokenCount][i]) offsets[i] = card.positionToWorld(PLAYER_CARD_TOKEN_OFFSETS[tokenCount][i])
-- Fix the y-position for the spawn, since positionToWorld considers rotation which can -- Fix the y-position for the spawn, since positionToWorld considers rotation which can
@ -218,7 +203,7 @@ do
offsets[i].y = card.getPosition().y + 0.15 offsets[i].y = card.getPosition().y + 0.15
end end
end end
-- end
if shiftDown ~= nil then if shiftDown ~= nil then
-- Copy the offsets to make sure we don't change the static values -- Copy the offsets to make sure we don't change the static values
local baseOffsets = offsets local baseOffsets = offsets
@ -228,8 +213,10 @@ do
offsets[i][3] = offsets[i][3] + shiftDown offsets[i][3] = offsets[i][3] + shiftDown
end end
end end
if offsets == nil then if offsets == nil then
error("couldn't find offsets for " .. tokenCount .. ' tokens') error("couldn't find offsets for " .. tokenCount .. ' tokens')
return
end end
for i = 1, tokenCount do for i = 1, tokenCount do
@ -243,7 +230,7 @@ do
-- "resource", "doom", or "clue" -- "resource", "doom", or "clue"
---@param rotation Vector Rotation to be used for the new token. Only the y-value will be used, ---@param rotation Vector Rotation to be used for the new token. Only the y-value will be used,
-- x and z will use the default rotation from the source bag -- x and z will use the default rotation from the source bag
---@param callback A callback function triggered after the new token is spawned ---@param callback function A callback function triggered after the new token is spawned
TokenManager.spawnToken = function(position, tokenType, rotation, callback) TokenManager.spawnToken = function(position, tokenType, rotation, callback)
internal.initTokenTemplates() internal.initTokenTemplates()
if tokenTemplates[tokenType] == nil then if tokenTemplates[tokenType] == nil then
@ -251,14 +238,13 @@ do
return return
end end
local tokenTemplate = tokenTemplates[tokenType] local tokenTemplate = tokenTemplates[tokenType]
-- Take ONLY the Y-value for rotation, so we don't flip the token coming out of the bag -- Take ONLY the Y-value for rotation, so we don't flip the token coming out of the bag
local rot = Vector(tokenTemplate.Transform.rotX, local rot = Vector(tokenTemplate.Transform.rotX,
tokenTemplate.Transform.rotY, 270,
tokenTemplate.Transform.rotZ) tokenTemplate.Transform.rotZ)
if rotation ~= nil then if rotation ~= nil then
rot.y = rotation.y rot.y = rotation.y
else
rot.y = 270
end end
tokenTemplate.Nickname = "" tokenTemplate.Nickname = ""
@ -363,7 +349,7 @@ do
end end
log("Spawning use array tokens for "..card.getName()..'['..card.getDescription()..']: '..tokenCount.."x "..token) log("Spawning use array tokens for "..card.getName()..'['..card.getDescription()..']: '..tokenCount.."x "..token)
-- Shift each spawned group after the first down so they don't pile on each other -- Shift each spawned group after the first down so they don't pile on each other
TokenManager.spawnTokenGroup(card, token, tokenCount, (i - 1) * 0.6) TokenManager.spawnTokenGroup(card, token, tokenCount, (i - 1) * 0.8)
end end
end end
tokenSpawnTracker.markTokensSpawned(card.getGUID()) tokenSpawnTracker.markTokensSpawned(card.getGUID())
@ -409,7 +395,7 @@ do
end end
internal.getPlayerCardData = function(card) internal.getPlayerCardData = function(card)
return playerCardData[card.getName()..':'..card.getDescription()] return playerCardData[card.getName() .. ':' .. card.getDescription()]
or playerCardData[card.getName()] or playerCardData[card.getName()]
end end