Merge branch 'beta' into ui

spirit-island · Mar 2, 2021 · f698881 · f698881
2 parents bf4370c + 86a7b29
commit f698881
Show file tree

Hide file tree

Showing 53 changed files with 153 additions and 151 deletions.
diff --git a/global-script.lua b/global-script.lua
@@ -1,5 +1,5 @@
 ---- Versioning
-version = "1.5.0-beta.5"
+version = "1.5.0-beta.7"
 versionGuid = "57d9fe"
 ---- Used with Spirit Board Scripts
 counterBag = "5f595a"
@@ -101,11 +101,12 @@ useRandomBoard = false
 useRandomScenario = false
 adversaryLossCallback = nil
 adversaryLossCallback2 = nil
+fearCards = {3,3,3}
 ------
 aidBoard = "bee103"
 SetupChecker = "SetupChecker"
 fearDeckSetupZone = "fbbf69"
-sourceSpirit = "21f561"
+sourceSpirit = "SourceSpirit"
 ------
 dahanBag = "f4c173"
 blightBag = "af50b8"
@@ -169,7 +170,7 @@ interactableObjectsToDisableOnLoad = {
     "055a45", -- middle row border
     "5f4be2", -- sea tile
     "235564", -- white box section
-    "SetupChecker", -- start menu object
+    "SetupChecker", "SourceSpirit",
     "6b5b4b","fac8e4","36bbcc","c3c59b","661aa3","c68e2c", -- player counters
     "19d429", --Big block
 }
@@ -797,7 +798,6 @@ end
 function SetupFear()
     setupFearTokens()
 
-    local fearCards = {3,3,3}
     if scenarioCard ~= nil then
         local extraFearCards = scenarioCard.getVar("fearCards")
         if extraFearCards ~= nil then
@@ -2172,30 +2172,31 @@ function timePassesCo()
     return 1
 end
 function handlePiece(object, offset)
-    if string.sub(object.getName(),1,4) == "City" then
+    local name = object.getName()
+    if string.sub(name, 1, 4) == "City" then
         if object.getLock() == false then
             object = resetPiece(object, Vector(0,180,0), offset)
         end
-    elseif string.sub(object.getName(),1,4) == "Town" then
+    elseif string.sub(name, 1, 4) == "Town" then
         if object.getLock() == false then
             object = resetPiece(object, Vector(0,180,0), offset)
         end
-    elseif string.sub(object.getName(),1,8) == "Explorer" then
+    elseif string.sub(name, 1, 8) == "Explorer" then
         if object.getLock() == false then
             object = resetPiece(object, Vector(0,180,0), offset)
         end
-    elseif string.sub(object.getName(),1,5) == "Dahan" then
+    elseif string.sub(name, 1, 5) == "Dahan" then
         if object.getLock() == false then
             object = resetPiece(object, Vector(0,0,0), offset)
         end
-    elseif object.getName() == "Blight" then
+    elseif name == "Blight" then
         object = resetPiece(object, Vector(0,180,0), offset)
-    elseif string.sub(object.getName(),-6) == "Defend" then
+    elseif string.sub(name, -6) == "Defend" then
         if object.getLock() == false then
             object.destruct()
             object = nil
         end
-    elseif string.sub(object.getName(),-7) == "Isolate" then
+    elseif string.sub(name, -7) == "Isolate" then
         if object.getLock() == false then
             object.destruct()
             object = nil
@@ -2237,14 +2238,15 @@ end
 function handlePlayer(color, data)
     local zone = getObjectFromGUID(elementScanZones[color])
     for _, obj in ipairs(zone.getObjects()) do
-        if obj.getName() == "Any" then
+        local name = obj.getName()
+        if name == "Any" then
             if obj.getStateId() ~= 9 then obj = obj.setState(9) end
             if obj.getLock() == false then obj.destruct() end
         elseif obj.type == "Tile" and obj.getVar("elements") ~= nil then
             if obj.getLock() == false then obj.destruct() end
-        elseif string.sub(obj.getName(),-6) == "Defend" then
+        elseif string.sub(name, -6) == "Defend" then
             obj.destruct()
-        elseif string.sub(obj.getName(),-7) == "Isolate" then
+        elseif string.sub(name, -7) == "Isolate" then
             obj.destruct()
         elseif obj.getName() == "Speed Token" then
             obj.destruct()

diff --git a/objects/00aa5c/script.lua b/objects/00aa5c/script.lua
@@ -118,7 +118,7 @@ function SetupSpirit(object_pick,player_color)
 
         -- Setup Ready Token
         local ready = PlayerBag.takeObject({
-            position = Vector(spos.x,0,spos.z) + Vector(7, 1.1, 7),
+            position = Vector(spos.x,0,spos.z) + Vector(7.5, 1.1, 6.5),
             rotation = Vector(0, 180, 0),
         })
 

diff --git a/objects/013dfc/script.lua b/objects/013dfc/script.lua
@@ -118,7 +118,7 @@ function SetupSpirit(object_pick,player_color)
 
         -- Setup Ready Token
         local ready = PlayerBag.takeObject({
-            position = Vector(spos.x,0,spos.z) + Vector(7, 1.1, 7),
+            position = Vector(spos.x,0,spos.z) + Vector(7.5, 1.1, 6.5),
             rotation = Vector(0, 180, 0),
         })
 

diff --git a/objects/04397d/object.json b/objects/04397d/object.json
@@ -21,17 +21,17 @@
   },
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "Grid": true,
-  "Snap": true,
+  "Grid": false,
+  "Snap": false,
   "IgnoreFoW": false,
   "MeasureMovement": false,
   "DragSelectable": true,
   "Autoraise": true,
-  "Sticky": true,
+  "Sticky": false,
   "Tooltip": true,
   "GridProjection": false,
   "HideWhenFaceDown": false,
-  "Hands": true,
+  "Hands": false,
   "CardID": 17500,
   "SidewaysCard": false,
   "CustomDeck": {

diff --git a/objects/07dd23/script.lua b/objects/07dd23/script.lua
@@ -118,7 +118,7 @@ function SetupSpirit(object_pick,player_color)
 
         -- Setup Ready Token
         local ready = PlayerBag.takeObject({
-            position = Vector(spos.x,0,spos.z) + Vector(7, 1.1, 7),
+            position = Vector(spos.x,0,spos.z) + Vector(7.5, 1.1, 6.5),
             rotation = Vector(0, 180, 0),
         })
 

diff --git a/objects/14aabe/script.lua b/objects/14aabe/script.lua
@@ -118,7 +118,7 @@ function SetupSpirit(object_pick,player_color)
 
         -- Setup Ready Token
         local ready = PlayerBag.takeObject({
-            position = Vector(spos.x,0,spos.z) + Vector(7, 1.1, 7),
+            position = Vector(spos.x,0,spos.z) + Vector(7.5, 1.1, 6.5),
             rotation = Vector(0, 180, 0),
         })
 

diff --git a/objects/1b39da/object.json b/objects/1b39da/object.json
@@ -21,17 +21,17 @@
   },
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "Grid": true,
-  "Snap": true,
+  "Grid": false,
+  "Snap": false,
   "IgnoreFoW": false,
   "MeasureMovement": false,
   "DragSelectable": true,
   "Autoraise": true,
-  "Sticky": true,
+  "Sticky": false,
   "Tooltip": true,
   "GridProjection": false,
   "HideWhenFaceDown": false,
-  "Hands": true,
+  "Hands": false,
   "CardID": 17501,
   "SidewaysCard": false,
   "CustomDeck": {

diff --git a/objects/1c6929/script.lua b/objects/1c6929/script.lua
@@ -118,7 +118,7 @@ function SetupSpirit(object_pick,player_color)
 
         -- Setup Ready Token
         local ready = PlayerBag.takeObject({
-            position = Vector(spos.x,0,spos.z) + Vector(7, 1.1, 7),
+            position = Vector(spos.x,0,spos.z) + Vector(7.5, 1.1, 6.5),
             rotation = Vector(0, 180, 0),
         })
 

diff --git a/objects/1d9bcd/object.json b/objects/1d9bcd/object.json
@@ -21,17 +21,17 @@
   },
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "Grid": true,
-  "Snap": true,
+  "Grid": false,
+  "Snap": false,
   "IgnoreFoW": false,
   "MeasureMovement": false,
   "DragSelectable": true,
   "Autoraise": true,
-  "Sticky": true,
+  "Sticky": false,
   "Tooltip": true,
   "GridProjection": false,
   "HideWhenFaceDown": false,
-  "Hands": true,
+  "Hands": false,
   "CardID": 63404,
   "SidewaysCard": false,
   "CustomDeck": {

diff --git a/objects/1ea4cf/object.json b/objects/1ea4cf/object.json
@@ -21,17 +21,17 @@
   },
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "Grid": true,
-  "Snap": true,
+  "Grid": false,
+  "Snap": false,
   "IgnoreFoW": false,
   "MeasureMovement": false,
   "DragSelectable": true,
   "Autoraise": true,
-  "Sticky": true,
+  "Sticky": false,
   "Tooltip": true,
   "GridProjection": false,
   "HideWhenFaceDown": false,
-  "Hands": true,
+  "Hands": false,
   "CardID": 63405,
   "SidewaysCard": false,
   "CustomDeck": {

diff --git a/objects/240d50/script.lua b/objects/240d50/script.lua
@@ -118,7 +118,7 @@ function SetupSpirit(object_pick,player_color)
 
         -- Setup Ready Token
         local ready = PlayerBag.takeObject({
-            position = Vector(spos.x,0,spos.z) + Vector(7, 1.1, 7),
+            position = Vector(spos.x,0,spos.z) + Vector(7.5, 1.1, 6.5),
             rotation = Vector(0, 180, 0),
         })
 

diff --git a/objects/37a592/object.json b/objects/37a592/object.json
@@ -21,17 +21,17 @@
   },
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "Grid": true,
-  "Snap": true,
+  "Grid": false,
+  "Snap": false,
   "IgnoreFoW": false,
   "MeasureMovement": false,
   "DragSelectable": true,
   "Autoraise": true,
-  "Sticky": true,
+  "Sticky": false,
   "Tooltip": true,
   "GridProjection": false,
   "HideWhenFaceDown": false,
-  "Hands": true,
+  "Hands": false,
   "CardID": 63406,
   "SidewaysCard": false,
   "CustomDeck": {

diff --git a/objects/3d1ba3/object.json b/objects/3d1ba3/object.json
@@ -21,17 +21,17 @@
   },
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "Grid": true,
-  "Snap": true,
+  "Grid": false,
+  "Snap": false,
   "IgnoreFoW": false,
   "MeasureMovement": false,
   "DragSelectable": true,
   "Autoraise": true,
-  "Sticky": true,
+  "Sticky": false,
   "Tooltip": true,
   "GridProjection": false,
   "HideWhenFaceDown": false,
-  "Hands": true,
+  "Hands": false,
   "CardID": 54000,
   "SidewaysCard": false,
   "CustomDeck": {

diff --git a/objects/3f3e22/contained/8616a2/script.lua b/objects/3f3e22/contained/8616a2/script.lua
@@ -1,4 +1,4 @@
-sourceSpiritID = "21f561"
+sourceSpiritID = "SourceSpirit"
 
 local rescan
 

diff --git a/objects/4a0884/script.lua b/objects/4a0884/script.lua
@@ -118,7 +118,7 @@ function SetupSpirit(object_pick,player_color)
 
         -- Setup Ready Token
         local ready = PlayerBag.takeObject({
-            position = Vector(spos.x,0,spos.z) + Vector(7, 1.1, 7),
+            position = Vector(spos.x,0,spos.z) + Vector(7.5, 1.1, 6.5),
             rotation = Vector(0, 180, 0),
         })
 

diff --git a/objects/4c061f/script.lua b/objects/4c061f/script.lua
@@ -118,7 +118,7 @@ function SetupSpirit(object_pick,player_color)
 
         -- Setup Ready Token
         local ready = PlayerBag.takeObject({
-            position = Vector(spos.x,0,spos.z) + Vector(7, 1.1, 7),
+            position = Vector(spos.x,0,spos.z) + Vector(7.5, 1.1, 6.5),
             rotation = Vector(0, 180, 0),
         })
 

diff --git a/objects/57d9fe/object.json b/objects/57d9fe/object.json
@@ -33,7 +33,7 @@
   "HideWhenFaceDown": false,
   "Hands": false,
   "Text": {
-    "Text": "version 1.5.0-beta.5",
+    "Text": "version 1.5.0-beta.7",
     "colorstate": {
       "r": 0.7334495,
       "g": 0.7334495,

diff --git a/objects/5a95bc/object.json b/objects/5a95bc/object.json
@@ -21,17 +21,17 @@
   },
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "Grid": true,
-  "Snap": true,
+  "Grid": false,
+  "Snap": false,
   "IgnoreFoW": false,
   "MeasureMovement": false,
   "DragSelectable": true,
   "Autoraise": true,
-  "Sticky": true,
+  "Sticky": false,
   "Tooltip": true,
   "GridProjection": false,
   "HideWhenFaceDown": false,
-  "Hands": true,
+  "Hands": false,
   "CardID": 54304,
   "SidewaysCard": false,
   "CustomDeck": {

diff --git a/objects/5aa2d9/script.lua b/objects/5aa2d9/script.lua
@@ -118,7 +118,7 @@ function SetupSpirit(object_pick,player_color)
 
         -- Setup Ready Token
         local ready = PlayerBag.takeObject({
-            position = Vector(spos.x,0,spos.z) + Vector(7, 1.1, 7),
+            position = Vector(spos.x,0,spos.z) + Vector(7.5, 1.1, 6.5),
             rotation = Vector(0, 180, 0),
         })