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

fixed approach and updated horror token names

Browse Source
This commit is contained in:
Chr1Z93 2023-04-11 22:37:55 +02:00
parent c2e4fc8ca8
commit 9a8dd4aeb0
4 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
objects/Horrortokens.7bd2a0/Horror.36be72.json
View File

@ -38,7 +38,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"States": { "States": {
"2": { "2": {
@ -81,7 +81,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -139,7 +139,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -197,7 +197,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -255,7 +255,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -313,7 +313,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -371,7 +371,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -429,7 +429,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -487,7 +487,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,

18
objects/Horrortokens.ae1a4e/Horror.36be72.json
View File

@ -38,7 +38,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"States": { "States": {
"2": { "2": {
@ -81,7 +81,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -139,7 +139,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -197,7 +197,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -255,7 +255,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -313,7 +313,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -371,7 +371,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -429,7 +429,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -487,7 +487,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,

18
objects/Horrortokens.c3ecf4/Horror.36be72.json
View File

@ -38,7 +38,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"States": { "States": {
"2": { "2": {
@ -81,7 +81,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -139,7 +139,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -197,7 +197,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -255,7 +255,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -313,7 +313,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -371,7 +371,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -429,7 +429,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,
@ -487,7 +487,7 @@
"MeasureMovement": false, "MeasureMovement": false,
"Memo": "horror", "Memo": "horror",
"Name": "Custom_Token", "Name": "Custom_Token",
"Nickname": "Horror", "Nickname": "",
"Snap": false, "Snap": false,
"Sticky": true, "Sticky": true,
"Tooltip": true, "Tooltip": true,

4
src/playermat/Playmat.ttslua
View File

@ -689,14 +689,12 @@ end
function removeTokensFromObject(object) function removeTokensFromObject(object)
for _, v in ipairs(searchArea(object.getPosition(), { 3, 1, 4 })) do for _, v in ipairs(searchArea(object.getPosition(), { 3, 1, 4 })) do
local obj = v.hit_object local obj = v.hit_object
local name = obj.getName()
if obj.getGUID() ~= "4ee1f2" and -- table if obj.getGUID() ~= "4ee1f2" and -- table
obj ~= self and obj ~= self and
obj.type ~= "Deck" and obj.type ~= "Deck" and
obj.type ~= "Card" and obj.type ~= "Card" and
name ~= "Horror" and obj.getLock() == false and
name ~= "Resources" and
obj.getDescription() ~= "Action Token" and obj.getDescription() ~= "Action Token" and
not tokenChecker.isChaosToken(obj) then not tokenChecker.isChaosToken(obj) then
TRASHCAN.putObject(obj) TRASHCAN.putObject(obj)