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

Merge pull request #257 from argonui/threat-area-move

Browse Source 
Playermat: moving threat area down
This commit is contained in:
BootleggerFinn 2023-04-12 18:08:06 -05:00 committed by GitHub
commit a95e96d703
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 64 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
objects/Playermat1White.8b081b.json
View File

@ -231,9 +231,9 @@
}, },
{ {
"Position": { "Position": {
"x": 1.38, "x": 1.365,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -243,9 +243,9 @@
}, },
{ {
"Position": { "Position": {
"x": 0.92, "x": 0.91,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -255,9 +255,9 @@
}, },
{ {
"Position": { "Position": {
"x": 0.46, "x": 0.455,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -269,7 +269,7 @@
"Position": { "Position": {
"x": 0, "x": 0,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -279,9 +279,9 @@
}, },
{ {
"Position": { "Position": {
"x": -0.46, "x": -0.455,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -291,9 +291,9 @@
}, },
{ {
"Position": { "Position": {
"x": -0.92, "x": -0.91,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -303,9 +303,9 @@
}, },
{ {
"Position": { "Position": {
"x": -1.38, "x": -1.365,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -329,7 +329,7 @@
}, },
"ImageScalar": 1, "ImageScalar": 1,
"ImageSecondaryURL": "", "ImageSecondaryURL": "",
"ImageURL": "http://cloud-3.steamusercontent.com/ugc/1859438430150777205/4ED2E0BC2A2C4728DA5E155C06AF1BA1FCB00D3B/", "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2037357630681963618/E7271737B19CE0BFAAA382BEEEF497FE3E06ECC1/",
"WidthScale": 0 "WidthScale": 0
}, },
"Description": "", "Description": "",

28
objects/Playermat2Orange.bd0ff4.json
View File

@ -231,9 +231,9 @@
}, },
{ {
"Position": { "Position": {
"x": 1.38, "x": 1.365,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -243,9 +243,9 @@
}, },
{ {
"Position": { "Position": {
"x": 0.92, "x": 0.91,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -255,9 +255,9 @@
}, },
{ {
"Position": { "Position": {
"x": 0.46, "x": 0.455,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -269,7 +269,7 @@
"Position": { "Position": {
"x": 0, "x": 0,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -279,9 +279,9 @@
}, },
{ {
"Position": { "Position": {
"x": -0.46, "x": -0.455,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -291,9 +291,9 @@
}, },
{ {
"Position": { "Position": {
"x": -0.92, "x": -0.91,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -303,9 +303,9 @@
}, },
{ {
"Position": { "Position": {
"x": -1.38, "x": -1.365,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -329,7 +329,7 @@
}, },
"ImageScalar": 1, "ImageScalar": 1,
"ImageSecondaryURL": "", "ImageSecondaryURL": "",
"ImageURL": "http://cloud-3.steamusercontent.com/ugc/1859438430150777205/4ED2E0BC2A2C4728DA5E155C06AF1BA1FCB00D3B/", "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2037357630681963618/E7271737B19CE0BFAAA382BEEEF497FE3E06ECC1/",
"WidthScale": 0 "WidthScale": 0
}, },
"Description": "", "Description": "",

28
objects/Playermat3Green.383d8b.json
View File

@ -231,9 +231,9 @@
}, },
{ {
"Position": { "Position": {
"x": 1.38, "x": 1.365,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -243,9 +243,9 @@
}, },
{ {
"Position": { "Position": {
"x": 0.92, "x": 0.91,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -255,9 +255,9 @@
}, },
{ {
"Position": { "Position": {
"x": 0.46, "x": 0.455,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -269,7 +269,7 @@
"Position": { "Position": {
"x": 0, "x": 0,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -279,9 +279,9 @@
}, },
{ {
"Position": { "Position": {
"x": -0.46, "x": -0.455,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -291,9 +291,9 @@
}, },
{ {
"Position": { "Position": {
"x": -0.92, "x": -0.91,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -303,9 +303,9 @@
}, },
{ {
"Position": { "Position": {
"x": -1.38, "x": -1.365,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -329,7 +329,7 @@
}, },
"ImageScalar": 1, "ImageScalar": 1,
"ImageSecondaryURL": "", "ImageSecondaryURL": "",
"ImageURL": "http://cloud-3.steamusercontent.com/ugc/1859438430150777205/4ED2E0BC2A2C4728DA5E155C06AF1BA1FCB00D3B/", "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2037357630681963618/E7271737B19CE0BFAAA382BEEEF497FE3E06ECC1/",
"WidthScale": 0 "WidthScale": 0
}, },
"Description": "", "Description": "",

28
objects/Playermat4Red.0840d5.json
View File

@ -231,9 +231,9 @@
}, },
{ {
"Position": { "Position": {
"x": 1.38, "x": 1.365,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -243,9 +243,9 @@
}, },
{ {
"Position": { "Position": {
"x": 0.92, "x": 0.91,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -255,9 +255,9 @@
}, },
{ {
"Position": { "Position": {
"x": 0.46, "x": 0.455,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -269,7 +269,7 @@
"Position": { "Position": {
"x": 0, "x": 0,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -279,9 +279,9 @@
}, },
{ {
"Position": { "Position": {
"x": -0.46, "x": -0.455,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -291,9 +291,9 @@
}, },
{ {
"Position": { "Position": {
"x": -0.92, "x": -0.91,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -303,9 +303,9 @@
}, },
{ {
"Position": { "Position": {
"x": -1.38, "x": -1.365,
"y": 0.1, "y": 0.1,
"z": -0.645 "z": -0.625
}, },
"Rotation": { "Rotation": {
"x": 0, "x": 0,
@ -329,7 +329,7 @@
}, },
"ImageScalar": 1, "ImageScalar": 1,
"ImageSecondaryURL": "", "ImageSecondaryURL": "",
"ImageURL": "http://cloud-3.steamusercontent.com/ugc/1859438430150777205/4ED2E0BC2A2C4728DA5E155C06AF1BA1FCB00D3B/", "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2037357630681963618/E7271737B19CE0BFAAA382BEEEF497FE3E06ECC1/",
"WidthScale": 0 "WidthScale": 0
}, },
"Description": "", "Description": "",

19
src/playermat/Playmat.ttslua
View File

@ -8,17 +8,13 @@ local DEBUG = false
local collisionEnabled = false local collisionEnabled = false
-- position offsets relative to mat [x, y, z] -- position offsets relative to mat [x, y, z]
local DRAWN_ENCOUNTER_CARD_OFFSET = {1.365, 0.5, -0.635} local DRAWN_ENCOUNTER_CARD_OFFSET = {1.365, 0.5, -0.625}
local DRAWN_CHAOS_TOKEN_OFFSET = {-1.55, 0.5, -0.58} local DRAWN_CHAOS_TOKEN_OFFSET = {-1.55, 0.25, -0.58}
local DISCARD_BUTTON_OFFSETS = {
{-1.38, 0.1, -0.94},
{-0.92, 0.1, -0.94},
{-0.46, 0.1, -0.94},
{0.00, 0.1, -0.94},
{0.46, 0.1, -0.94},
{0.92, 0.1, -0.94}
}
-- x-Values for discard buttons
local DISCARD_BUTTON_OFFSETS = {-1.365, -0.91, -0.455, 0, 0.455, 0.91}
-- defined areas for the function "inArea()""
local MAIN_PLAY_AREA = { local MAIN_PLAY_AREA = {
upperLeft = { upperLeft = {
x = 1.98, x = 1.98,
@ -193,7 +189,8 @@ function makeDiscardHandlerFor(searchPosition, discardPosition)
end end
-- build a discard button to discard from searchPosition to discardPosition (number must be unique) -- build a discard button to discard from searchPosition to discardPosition (number must be unique)
function makeDiscardButton(position, discardPosition, number) function makeDiscardButton(xValue, discardPosition, number)
local position = { xValue, 0.1, -0.94}
local searchPosition = {-position[1], position[2], position[3] + 0.32} local searchPosition = {-position[1], position[2], position[3] + 0.32}
local handler = makeDiscardHandlerFor(searchPosition, discardPosition) local handler = makeDiscardHandlerFor(searchPosition, discardPosition)
local handlerName = 'handler' .. number local handlerName = 'handler' .. number