From 161db5186fef23c0d3a8abbe92e4f566718dd664 Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Fri, 26 Feb 2021 14:29:12 -0700 Subject: [PATCH 01/10] Only call `getName` once for each object in time passes. --- global-script.lua | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/global-script.lua b/global-script.lua index 5ecdb6674..6b2bac445 100644 --- a/global-script.lua +++ b/global-script.lua @@ -2185,30 +2185,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 @@ -2250,14 +2251,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() From fa854d41927c027005542f2b1efc0feda54a04ce Mon Sep 17 00:00:00 2001 From: iakona <1824122+iakona@users.noreply.github.com> Date: Sun, 28 Feb 2021 18:12:42 -0600 Subject: [PATCH 02/10] Changed ready token position --- objects/00aa5c/script.lua | 2 +- objects/013dfc/script.lua | 2 +- objects/07dd23/script.lua | 2 +- objects/14aabe/script.lua | 2 +- objects/1c6929/script.lua | 2 +- objects/21f561/script.lua | 2 +- objects/240d50/script.lua | 2 +- objects/4a0884/script.lua | 2 +- objects/4c061f/script.lua | 2 +- objects/5aa2d9/script.lua | 2 +- objects/606f23/object.json | 14 +++++++------- objects/606f23/script.lua | 2 +- objects/72de5c/script.lua | 2 +- objects/743f66/script.lua | 2 +- objects/74d027/script.lua | 2 +- objects/9138aa/script.lua | 2 +- objects/92e7df/script.lua | 2 +- objects/a393e9/script.lua | 2 +- objects/a576cc/script.lua | 2 +- objects/a95c14/script.lua | 2 +- objects/b35fd5/script.lua | 2 +- objects/b42f70/script.lua | 2 +- objects/bd2a4a/script.lua | 2 +- objects/cebe09/script.lua | 2 +- objects/e9c468/script.lua | 2 +- objects/f7422a/script.lua | 2 +- 26 files changed, 32 insertions(+), 32 deletions(-) diff --git a/objects/00aa5c/script.lua b/objects/00aa5c/script.lua index a744c2c93..7254000e1 100644 --- 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 index a744c2c93..7254000e1 100644 --- 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/07dd23/script.lua b/objects/07dd23/script.lua index a744c2c93..7254000e1 100644 --- 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 index a744c2c93..7254000e1 100644 --- 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/1c6929/script.lua b/objects/1c6929/script.lua index a744c2c93..7254000e1 100644 --- 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/21f561/script.lua b/objects/21f561/script.lua index a744c2c93..7254000e1 100644 --- a/objects/21f561/script.lua +++ b/objects/21f561/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/240d50/script.lua b/objects/240d50/script.lua index a744c2c93..7254000e1 100644 --- 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/4a0884/script.lua b/objects/4a0884/script.lua index a744c2c93..7254000e1 100644 --- 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 index a744c2c93..7254000e1 100644 --- 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/5aa2d9/script.lua b/objects/5aa2d9/script.lua index a744c2c93..7254000e1 100644 --- 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), }) diff --git a/objects/606f23/object.json b/objects/606f23/object.json index 050809e26..00a5b423c 100644 --- a/objects/606f23/object.json +++ b/objects/606f23/object.json @@ -15,9 +15,9 @@ "Description": "Base", "GMNotes": "", "ColorDiffuse": { - "r": 0.2002706, - "g": 0.160315871, - "b": 0.151754141 + "r": 0.200270265, + "g": 0.160315543, + "b": 0.151753813 }, "Tags": [ "Spirit" @@ -156,9 +156,9 @@ "Description": "Base", "GMNotes": "", "ColorDiffuse": { - "r": 0.2002792, - "g": 0.160324484, - "b": 0.151762754 + "r": 0.200279146, + "g": 0.160324425, + "b": 0.1517627 }, "Tags": [ "Spirit" @@ -188,7 +188,7 @@ "Stretch": true } }, - "LuaScript": "-- Spirit Tile for Bone White's Spirit Island Mod v2 --\nuseProgression = false\nprogressionCard = nil\nuseAspect = 2\naspect = nil\n\nfunction onLoad()\n Color.Add(\"SoftBlue\", Color.new(0.45,0.6,0.7))\n if Global.getVar(\"gameStarted\") then return end\n self.createButton({\n click_function = \"SetupSpirit\",\n function_owner = self,\n label = \"Choose Spirit\",\n position = Vector(0.7, -0.1, 0.9),\n rotation = Vector(0,0,180),\n scale = Vector(0.2,0.2,0.2),\n width = 1800,\n height = 500,\n font_size = 300,\n })\n self.createButton({\n click_function = \"ToggleProgression\",\n function_owner = self,\n label = \"\",\n position = Vector(-0.7, -0.1, 0.9),\n rotation = Vector(0,0,180),\n scale = Vector(0.2,0.2,0.2),\n width = 0,\n height = 0,\n font_size = 300,\n tooltip = \"Enable/Disable Progression Deck\",\n })\n self.createButton({\n click_function = \"ToggleAspect\",\n function_owner = self,\n label = \"\",\n position = Vector(0.7, -0.2, 0.4),\n rotation = Vector(0,0,180),\n scale = Vector(0.2,0.2,0.2),\n width = 0,\n height = 0,\n font_size = 300,\n tooltip = \"Enable/Disable Aspect Deck\",\n })\n local castObjects = upCast(self)\n for _,obj in pairs (castObjects) do\n if string.find(obj.getName(),\"Progression\") then\n progressionCard = obj\n self.editButton({\n index = 1,\n label = \"Progression: No\",\n width = 2200,\n height = 500,\n })\n elseif string.find(obj.getName(),\"Aspects\") then\n self.editButton({\n index = 2,\n label = \"Aspects: All\",\n width = 2300,\n height = 500,\n })\n end\n end\n Global.call(\"addSpirit\", {spirit=self})\nend\n\nfunction RandomAspect()\n for _,obj in pairs(upCast(self)) do\n if obj.type == \"Deck\" and obj.getName() == \"Aspects\" then\n local objs = obj.getObjects()\n local index = math.random(0,#objs)\n if index == 0 then\n return \"\"\n end\n return objs[index].name\n end\n end\n return nil\nend\nfunction PickSpirit(params)\n if params.aspect then\n if params.aspect == \"Random\" then\n useAspect = 1\n elseif params.aspect == \"\" then\n useAspect = 0\n else\n useAspect = 3\n aspect = params.aspect\n end\n end\n SetupSpirit(nil, params.color)\nend\nfunction SetupSpirit(object_pick,player_color)\n local xPadding = 1.3\n local xOffset = 1\n local PlayerBag = getObjectFromGUID(Global.getTable(\"PlayerBags\")[player_color])\n if #PlayerBag.getObjects() ~= 0 then\n local castObjects = upCast(self)\n local hpos = Player[player_color].getHandTransform().position\n self.setPosition(Vector(hpos.x,0,hpos.z) + Vector(0,1.05,11.8))\n self.setRotation(Vector(0,180,0))\n self.setLock(true)\n self.clearButtons()\n local spos = self.getPosition()\n local snaps = self.getSnapPoints()\n local placed = 0\n\n -- Setup Presence\n for i = 1,13 do\n local p = snaps[i]\n if i <= #snaps then\n PlayerBag.takeObject({position = self.positionToWorld(p.position)})\n else\n PlayerBag.takeObject({position = Vector(spos.x,0,spos.z) + Vector(-placed*xPadding+xOffset,1.1,10)})\n placed = placed + 1\n end\n end\n\n -- Setup Ready Token\n local ready = PlayerBag.takeObject({\n position = Vector(spos.x,0,spos.z) + Vector(7, 1.1, 7),\n rotation = Vector(0, 180, 0),\n })\n\n -- Setup Energy Counter\n local counter = getObjectFromGUID(Global.getVar(\"counterBag\")).takeObject({position = Vector(spos.x,0,spos.z) + Vector(-5,1,5)})\n counter.setLock(true)\n\n Global.call(\"removeSpirit\", {spirit=self.guid, color=player_color, ready=ready, counter=counter})\n\n -- Setup Progression Deck if enabled\n if useProgression then\n local minorPowerDeck = getObjectFromGUID(Global.getVar(\"minorPowerZone\")).getObjects()[1]\n local majorPowerDeck = getObjectFromGUID(Global.getVar(\"majorPowerZone\")).getObjects()[1]\n local progressionDeck = progressionCard.getVar(\"progressionDeck\")\n for i,card in pairs(progressionDeck) do\n if card[2] then\n majorPowerDeck.takeObject({\n position = Vector(spos.x,i,spos.z) + Vector(0,1.1,14),\n rotation = Vector(0,180,180),\n guid = card[1],\n })\n else\n minorPowerDeck.takeObject({\n position = Vector(spos.x,i,spos.z) + Vector(0,1.1,14),\n rotation = Vector(0,180,180),\n guid = card[1],\n })\n end\n end\n end\n\n -- Setup objects on top of board\n for _, obj in pairs(castObjects) do\n obj.setLock(false)\n if obj.type == \"Deck\" then\n if obj.getName() == \"Aspects\" then\n HandleAspect(obj, player_color)\n else\n obj.deal(#obj.getObjects(),player_color)\n end\n elseif obj.type == \"Card\" and obj.getName() == \"Progression\" then\n if useProgression then\n obj.setPositionSmooth(Vector(spos.x,8,spos.z) + Vector(0,1.1,14))\n else\n obj.destruct()\n end\n else\n obj.setPositionSmooth(Vector(spos.x,0,spos.z) + Vector(-placed*xPadding+xOffset,1.1,10))\n placed = placed + 1\n end\n end\n else\n Player[player_color].broadcast(\"You already picked a spirit\", \"Red\")\n end\nend\nfunction HandleAspect(deck, player_color)\n if useAspect == 0 then\n deck.destruct()\n elseif useAspect == 1 then\n local index = math.random(0,#deck.getObjects())\n if index == 0 then\n Player[player_color].broadcast(\"Your random Aspect is no Aspect\", Color.SoftBlue)\n deck.destruct()\n else\n deck.takeObject({\n index = index - 1,\n position = deck.getPosition() + Vector(0,2,0),\n callback_function = function(obj) obj.deal(1, player_color) deck.destruct() Player[player_color].broadcast(\"Your random Aspect is \"..obj.getName(), Color.SoftBlue) end,\n })\n if deck.remainder then deck = deck.remainder end\n end\n elseif useAspect == 3 then\n local found = false\n for _, data in pairs(deck.getObjects()) do\n if data.name == aspect then\n found = true\n deck.takeObject({\n index = data.index,\n position = deck.getPosition() + Vector(0,2,0),\n callback_function = function(obj) obj.deal(1, player_color) deck.destruct() end,\n })\n if deck.remainder then deck = deck.remainder end\n break\n end\n end\n if not found then\n deck.destruct()\n Player[player_color].broadcast(\"Unable to find aspect \"..aspect, \"Red\")\n end\n else\n deck.deal(#deck.getObjects(), player_color)\n end\nend\n\nfunction ToggleProgression()\n useProgression = not useProgression\n if useProgression then\n self.editButton({\n index = 1,\n label = \"Progression: Yes\",\n })\n else\n self.editButton({\n index = 1,\n label = \"Progression: No\",\n })\n end\nend\nfunction ToggleAspect(_, _, alt_click)\n if alt_click then\n useAspect = (useAspect - 1) % 3\n else\n useAspect = (useAspect + 1) % 3\n end\n if useAspect == 0 then\n self.editButton({\n index = 2,\n label = \"Aspects: None\",\n })\n elseif useAspect == 1 then\n self.editButton({\n index = 2,\n label = \"Aspects: Random\",\n })\n else\n self.editButton({\n index = 2,\n label = \"Aspects: All\",\n })\n end\nend\n-----\nfunction upCast(obj)\n local hits = Physics.cast({\n origin = obj.getPosition() + Vector(0,0.1,0),\n direction = Vector(0,1,0),\n type = 3,\n size = obj.getBoundsNormalized().size,\n orientation = obj.getRotation(),\n max_distance = 0,\n --debug = true,\n })\n local hitObjects = {}\n for _, v in pairs(hits) do\n if v.hit_object ~= obj then table.insert(hitObjects,v.hit_object) end\n end\n return hitObjects\nend\n", + "LuaScript": "-- Spirit Tile for Bone White's Spirit Island Mod v2 --\nuseProgression = false\nprogressionCard = nil\nuseAspect = 2\naspect = nil\n\nfunction onLoad()\n Color.Add(\"SoftBlue\", Color.new(0.45,0.6,0.7))\n if Global.getVar(\"gameStarted\") then return end\n self.createButton({\n click_function = \"SetupSpirit\",\n function_owner = self,\n label = \"Choose Spirit\",\n position = Vector(0.7, -0.1, 0.9),\n rotation = Vector(0,0,180),\n scale = Vector(0.2,0.2,0.2),\n width = 1800,\n height = 500,\n font_size = 300,\n })\n self.createButton({\n click_function = \"ToggleProgression\",\n function_owner = self,\n label = \"\",\n position = Vector(-0.7, -0.1, 0.9),\n rotation = Vector(0,0,180),\n scale = Vector(0.2,0.2,0.2),\n width = 0,\n height = 0,\n font_size = 300,\n tooltip = \"Enable/Disable Progression Deck\",\n })\n self.createButton({\n click_function = \"ToggleAspect\",\n function_owner = self,\n label = \"\",\n position = Vector(0.7, -0.2, 0.4),\n rotation = Vector(0,0,180),\n scale = Vector(0.2,0.2,0.2),\n width = 0,\n height = 0,\n font_size = 300,\n tooltip = \"Enable/Disable Aspect Deck\",\n })\n local castObjects = upCast(self)\n for _,obj in pairs (castObjects) do\n if string.find(obj.getName(),\"Progression\") then\n progressionCard = obj\n self.editButton({\n index = 1,\n label = \"Progression: No\",\n width = 2200,\n height = 500,\n })\n elseif string.find(obj.getName(),\"Aspects\") then\n self.editButton({\n index = 2,\n label = \"Aspects: All\",\n width = 2300,\n height = 500,\n })\n end\n end\n Global.call(\"addSpirit\", {spirit=self})\nend\n\nfunction RandomAspect()\n for _,obj in pairs(upCast(self)) do\n if obj.type == \"Deck\" and obj.getName() == \"Aspects\" then\n local objs = obj.getObjects()\n local index = math.random(0,#objs)\n if index == 0 then\n return \"\"\n end\n return objs[index].name\n end\n end\n return nil\nend\nfunction PickSpirit(params)\n if params.aspect then\n if params.aspect == \"Random\" then\n useAspect = 1\n elseif params.aspect == \"\" then\n useAspect = 0\n else\n useAspect = 3\n aspect = params.aspect\n end\n end\n SetupSpirit(nil, params.color)\nend\nfunction SetupSpirit(object_pick,player_color)\n local xPadding = 1.3\n local xOffset = 1\n local PlayerBag = getObjectFromGUID(Global.getTable(\"PlayerBags\")[player_color])\n if #PlayerBag.getObjects() ~= 0 then\n local castObjects = upCast(self)\n local hpos = Player[player_color].getHandTransform().position\n self.setPosition(Vector(hpos.x,0,hpos.z) + Vector(0,1.05,11.8))\n self.setRotation(Vector(0,180,0))\n self.setLock(true)\n self.clearButtons()\n local spos = self.getPosition()\n local snaps = self.getSnapPoints()\n local placed = 0\n\n -- Setup Presence\n for i = 1,13 do\n local p = snaps[i]\n if i <= #snaps then\n PlayerBag.takeObject({position = self.positionToWorld(p.position)})\n else\n PlayerBag.takeObject({position = Vector(spos.x,0,spos.z) + Vector(-placed*xPadding+xOffset,1.1,10)})\n placed = placed + 1\n end\n end\n\n -- Setup Ready Token\n local ready = PlayerBag.takeObject({\n position = Vector(spos.x,0,spos.z) + Vector(7.5, 1.1, 6.5),\n rotation = Vector(0, 180, 0),\n })\n\n -- Setup Energy Counter\n local counter = getObjectFromGUID(Global.getVar(\"counterBag\")).takeObject({position = Vector(spos.x,0,spos.z) + Vector(-5,1,5)})\n counter.setLock(true)\n\n Global.call(\"removeSpirit\", {spirit=self.guid, color=player_color, ready=ready, counter=counter})\n\n -- Setup Progression Deck if enabled\n if useProgression then\n local minorPowerDeck = getObjectFromGUID(Global.getVar(\"minorPowerZone\")).getObjects()[1]\n local majorPowerDeck = getObjectFromGUID(Global.getVar(\"majorPowerZone\")).getObjects()[1]\n local progressionDeck = progressionCard.getVar(\"progressionDeck\")\n for i,card in pairs(progressionDeck) do\n if card[2] then\n majorPowerDeck.takeObject({\n position = Vector(spos.x,i,spos.z) + Vector(0,1.1,14),\n rotation = Vector(0,180,180),\n guid = card[1],\n })\n else\n minorPowerDeck.takeObject({\n position = Vector(spos.x,i,spos.z) + Vector(0,1.1,14),\n rotation = Vector(0,180,180),\n guid = card[1],\n })\n end\n end\n end\n\n -- Setup objects on top of board\n for _, obj in pairs(castObjects) do\n obj.setLock(false)\n if obj.type == \"Deck\" then\n if obj.getName() == \"Aspects\" then\n HandleAspect(obj, player_color)\n else\n obj.deal(#obj.getObjects(),player_color)\n end\n elseif obj.type == \"Card\" and obj.getName() == \"Progression\" then\n if useProgression then\n obj.setPositionSmooth(Vector(spos.x,8,spos.z) + Vector(0,1.1,14))\n else\n obj.destruct()\n end\n else\n obj.setPositionSmooth(Vector(spos.x,0,spos.z) + Vector(-placed*xPadding+xOffset,1.1,10))\n placed = placed + 1\n end\n end\n else\n Player[player_color].broadcast(\"You already picked a spirit\", \"Red\")\n end\nend\nfunction HandleAspect(deck, player_color)\n if useAspect == 0 then\n deck.destruct()\n elseif useAspect == 1 then\n local index = math.random(0,#deck.getObjects())\n if index == 0 then\n Player[player_color].broadcast(\"Your random Aspect is no Aspect\", Color.SoftBlue)\n deck.destruct()\n else\n deck.takeObject({\n index = index - 1,\n position = deck.getPosition() + Vector(0,2,0),\n callback_function = function(obj) obj.deal(1, player_color) deck.destruct() Player[player_color].broadcast(\"Your random Aspect is \"..obj.getName(), Color.SoftBlue) end,\n })\n if deck.remainder then deck = deck.remainder end\n end\n elseif useAspect == 3 then\n local found = false\n for _, data in pairs(deck.getObjects()) do\n if data.name == aspect then\n found = true\n deck.takeObject({\n index = data.index,\n position = deck.getPosition() + Vector(0,2,0),\n callback_function = function(obj) obj.deal(1, player_color) deck.destruct() end,\n })\n if deck.remainder then deck = deck.remainder end\n break\n end\n end\n if not found then\n deck.destruct()\n Player[player_color].broadcast(\"Unable to find aspect \"..aspect, \"Red\")\n end\n else\n deck.deal(#deck.getObjects(), player_color)\n end\nend\n\nfunction ToggleProgression()\n useProgression = not useProgression\n if useProgression then\n self.editButton({\n index = 1,\n label = \"Progression: Yes\",\n })\n else\n self.editButton({\n index = 1,\n label = \"Progression: No\",\n })\n end\nend\nfunction ToggleAspect(_, _, alt_click)\n if alt_click then\n useAspect = (useAspect - 1) % 3\n else\n useAspect = (useAspect + 1) % 3\n end\n if useAspect == 0 then\n self.editButton({\n index = 2,\n label = \"Aspects: None\",\n })\n elseif useAspect == 1 then\n self.editButton({\n index = 2,\n label = \"Aspects: Random\",\n })\n else\n self.editButton({\n index = 2,\n label = \"Aspects: All\",\n })\n end\nend\n-----\nfunction upCast(obj)\n local hits = Physics.cast({\n origin = obj.getPosition() + Vector(0,0.1,0),\n direction = Vector(0,1,0),\n type = 3,\n size = obj.getBoundsNormalized().size,\n orientation = obj.getRotation(),\n max_distance = 0,\n --debug = true,\n })\n local hitObjects = {}\n for _, v in pairs(hits) do\n if v.hit_object ~= obj then table.insert(hitObjects,v.hit_object) end\n end\n return hitObjects\nend\n", "LuaScriptState": "", "XmlUI": "", "AttachedSnapPoints": [ diff --git a/objects/606f23/script.lua b/objects/606f23/script.lua index a744c2c93..7254000e1 100644 --- a/objects/606f23/script.lua +++ b/objects/606f23/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/72de5c/script.lua b/objects/72de5c/script.lua index a744c2c93..7254000e1 100644 --- a/objects/72de5c/script.lua +++ b/objects/72de5c/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/743f66/script.lua b/objects/743f66/script.lua index a744c2c93..7254000e1 100644 --- a/objects/743f66/script.lua +++ b/objects/743f66/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/74d027/script.lua b/objects/74d027/script.lua index a744c2c93..7254000e1 100644 --- a/objects/74d027/script.lua +++ b/objects/74d027/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/9138aa/script.lua b/objects/9138aa/script.lua index a744c2c93..7254000e1 100644 --- a/objects/9138aa/script.lua +++ b/objects/9138aa/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/92e7df/script.lua b/objects/92e7df/script.lua index a744c2c93..7254000e1 100644 --- a/objects/92e7df/script.lua +++ b/objects/92e7df/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/a393e9/script.lua b/objects/a393e9/script.lua index a744c2c93..7254000e1 100644 --- a/objects/a393e9/script.lua +++ b/objects/a393e9/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/a576cc/script.lua b/objects/a576cc/script.lua index a744c2c93..7254000e1 100644 --- a/objects/a576cc/script.lua +++ b/objects/a576cc/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/a95c14/script.lua b/objects/a95c14/script.lua index a744c2c93..7254000e1 100644 --- a/objects/a95c14/script.lua +++ b/objects/a95c14/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/b35fd5/script.lua b/objects/b35fd5/script.lua index a744c2c93..7254000e1 100644 --- a/objects/b35fd5/script.lua +++ b/objects/b35fd5/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/b42f70/script.lua b/objects/b42f70/script.lua index a744c2c93..7254000e1 100644 --- a/objects/b42f70/script.lua +++ b/objects/b42f70/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/bd2a4a/script.lua b/objects/bd2a4a/script.lua index a744c2c93..7254000e1 100644 --- a/objects/bd2a4a/script.lua +++ b/objects/bd2a4a/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/cebe09/script.lua b/objects/cebe09/script.lua index a744c2c93..7254000e1 100644 --- a/objects/cebe09/script.lua +++ b/objects/cebe09/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/e9c468/script.lua b/objects/e9c468/script.lua index a744c2c93..7254000e1 100644 --- a/objects/e9c468/script.lua +++ b/objects/e9c468/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/f7422a/script.lua b/objects/f7422a/script.lua index a744c2c93..7254000e1 100644 --- a/objects/f7422a/script.lua +++ b/objects/f7422a/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), }) From a06a5d51900c9544e4ed14d776e5719ee3baba5b Mon Sep 17 00:00:00 2001 From: iakona <1824122+iakona@users.noreply.github.com> Date: Sun, 28 Feb 2021 18:16:23 -0600 Subject: [PATCH 03/10] Enlarged speed tokens a bit --- objects/65fc65/contained/58a1d6/object.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/objects/65fc65/contained/58a1d6/object.json b/objects/65fc65/contained/58a1d6/object.json index 5b2a1117a..8e9aeeb3e 100644 --- a/objects/65fc65/contained/58a1d6/object.json +++ b/objects/65fc65/contained/58a1d6/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Model", "Transform": { - "posX": -107.22, - "posY": 1.19029784, - "posZ": 47.9, - "rotX": -6.78097535e-07, - "rotY": 359.980072, - "rotZ": -1.13878127e-06, - "scaleX": 0.5, - "scaleY": 0.5, - "scaleZ": 0.5 + "posX": -107.115837, + "posY": 1.18623424, + "posZ": 47.91916, + "rotX": 1.33963923e-07, + "rotY": 359.9799, + "rotZ": -1.22198958e-06, + "scaleX": 0.7, + "scaleY": 0.7, + "scaleZ": 0.7 }, "Nickname": "Speed Token", "Description": "Place this on a Power to show you have changed its speed. This only has a functional difference when playing with the Blitz Scenario.", From d107ae838662b12b5eced2aeccaf5555ee2bdee4 Mon Sep 17 00:00:00 2001 From: iakona <1824122+iakona@users.noreply.github.com> Date: Sun, 28 Feb 2021 18:18:23 -0600 Subject: [PATCH 04/10] Updated to version 1.5.0-beta.6 --- global-script.lua | 2 +- objects/57d9fe/object.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/global-script.lua b/global-script.lua index 6b2bac445..11881f075 100644 --- a/global-script.lua +++ b/global-script.lua @@ -1,5 +1,5 @@ ---- Versioning -version = "1.5.0-beta.5" +version = "1.5.0-beta.6" versionGuid = "57d9fe" ---- Used with Spirit Board Scripts counterBag = "5f595a" diff --git a/objects/57d9fe/object.json b/objects/57d9fe/object.json index 7b5cbe006..a2a0418f0 100644 --- 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.6", "colorstate": { "r": 0.7334495, "g": 0.7334495, From b33df3f8e14185fc8b221609a66c6af4c3e6f0f5 Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Mon, 1 Mar 2021 11:52:15 -0700 Subject: [PATCH 05/10] Give the source spirit a memorable name. --- global-script.lua | 2 +- objects/3f3e22/contained/8616a2/script.lua | 2 +- objects/SetupChecker/script.lua | 2 +- objects/{21f561 => SourceSpirit}/object.json | 0 objects/{21f561 => SourceSpirit}/script.lua | 0 objects/index.list | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename objects/{21f561 => SourceSpirit}/object.json (100%) rename objects/{21f561 => SourceSpirit}/script.lua (100%) diff --git a/global-script.lua b/global-script.lua index 11881f075..6359894ec 100644 --- a/global-script.lua +++ b/global-script.lua @@ -105,7 +105,7 @@ adversaryLossCallback2 = nil aidBoard = "bee103" SetupChecker = "SetupChecker" fearDeckSetupZone = "fbbf69" -sourceSpirit = "21f561" +sourceSpirit = "SourceSpirit" ------ dahanBag = "f4c173" blightBag = "af50b8" diff --git a/objects/3f3e22/contained/8616a2/script.lua b/objects/3f3e22/contained/8616a2/script.lua index a8c707630..8db20bbf8 100644 --- 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/SetupChecker/script.lua b/objects/SetupChecker/script.lua index ea8f52038..b75bf3ca3 100644 --- a/objects/SetupChecker/script.lua +++ b/objects/SetupChecker/script.lua @@ -1043,7 +1043,7 @@ function isSpiritPickable(params) end function addSpirit(params) -- Ignore Source Spirit - if params.spirit.guid == "21f561" then return end + if params.spirit.guid == "SourceSpirit" then return end -- In case of state change, update existing choice with new guid for name,_ in pairs(spiritChoices) do diff --git a/objects/21f561/object.json b/objects/SourceSpirit/object.json similarity index 100% rename from objects/21f561/object.json rename to objects/SourceSpirit/object.json diff --git a/objects/21f561/script.lua b/objects/SourceSpirit/script.lua similarity index 100% rename from objects/21f561/script.lua rename to objects/SourceSpirit/script.lua diff --git a/objects/index.list b/objects/index.list index b2e375bf4..dfce6d438 100644 --- a/objects/index.list +++ b/objects/index.list @@ -203,7 +203,7 @@ e949cd a1d2cd 7ec4a4 2216dc -21f561 +SourceSpirit 37a592 1ea4cf 1d9bcd From 4ecdddf540a747217ceb31fc12324edc55229b3b Mon Sep 17 00:00:00 2001 From: iakona <1824122+iakona@users.noreply.github.com> Date: Mon, 1 Mar 2021 17:47:41 -0600 Subject: [PATCH 06/10] Fixed russia setup issue where a globally used variable became local --- global-script.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global-script.lua b/global-script.lua index 11881f075..10555781d 100644 --- a/global-script.lua +++ b/global-script.lua @@ -101,6 +101,7 @@ useRandomBoard = false useRandomScenario = false adversaryLossCallback = nil adversaryLossCallback2 = nil +fearCards = {3,3,3} ------ aidBoard = "bee103" SetupChecker = "SetupChecker" @@ -792,7 +793,6 @@ end function SetupFear() setupFearTokens() - local fearCards = {3,3,3} if scenarioCard ~= nil then local extraFearCards = scenarioCard.getVar("fearCards") if extraFearCards ~= nil then From 906b7e655fd011bb60db2f7eb7b482f6847e92df Mon Sep 17 00:00:00 2001 From: iakona <1824122+iakona@users.noreply.github.com> Date: Mon, 1 Mar 2021 17:50:16 -0600 Subject: [PATCH 07/10] Updated order of objects --- objects/index.list | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/objects/index.list b/objects/index.list index b2e375bf4..a268ff122 100644 --- a/objects/index.list +++ b/objects/index.list @@ -273,6 +273,18 @@ uniquePowerDiscard bb3991 684a58 65fc65 +f15d5c +aad2a3 +5e8d9b +f73834 +772ebb +fa4196 +f5652f +80d97c +d66cd2 +57264f +13959c +0c9976 9138aa 4a0884 bd2a4a @@ -297,15 +309,3 @@ a95c14 14aabe 72de5c 606f23 -f15d5c -aad2a3 -5e8d9b -f73834 -772ebb -fa4196 -f5652f -80d97c -d66cd2 -57264f -13959c -0c9976 From a2f88f85811ca8363d2aacb73107da9ecef497e4 Mon Sep 17 00:00:00 2001 From: iakona <1824122+iakona@users.noreply.github.com> Date: Mon, 1 Mar 2021 17:54:47 -0600 Subject: [PATCH 08/10] Setting source spirit to uninteractable --- global-script.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global-script.lua b/global-script.lua index cb5d90c30..bd5a796fe 100644 --- a/global-script.lua +++ b/global-script.lua @@ -170,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 } From 9a2fff7e8d1a5558b37c08148f6f1138c5528857 Mon Sep 17 00:00:00 2001 From: iakona <1824122+iakona@users.noreply.github.com> Date: Mon, 1 Mar 2021 18:10:42 -0600 Subject: [PATCH 09/10] Updated toggles for scenario and adversary cards --- objects/04397d/object.json | 8 ++++---- objects/1b39da/object.json | 8 ++++---- objects/1d9bcd/object.json | 8 ++++---- objects/1ea4cf/object.json | 8 ++++---- objects/37a592/object.json | 8 ++++---- objects/3d1ba3/object.json | 8 ++++---- objects/5a95bc/object.json | 8 ++++---- objects/64caee/object.json | 8 ++++---- objects/7ac013/object.json | 8 ++++---- objects/a69e8c/object.json | 8 ++++---- objects/b765cf/object.json | 8 ++++---- objects/b8b521/object.json | 8 ++++---- objects/bd528e/object.json | 8 ++++---- objects/ca88f0/object.json | 8 ++++---- objects/dd3d47/object.json | 8 ++++---- objects/e8f3e3/object.json | 8 ++++---- objects/e924fe/object.json | 8 ++++---- objects/ec49d4/object.json | 8 ++++---- objects/ee90ad/object.json | 8 ++++---- objects/f114f8/object.json | 8 ++++---- 20 files changed, 80 insertions(+), 80 deletions(-) diff --git a/objects/04397d/object.json b/objects/04397d/object.json index f5d9b6d20..ec13b870d 100644 --- 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/1b39da/object.json b/objects/1b39da/object.json index 10f1f3585..fff2ad127 100644 --- 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/1d9bcd/object.json b/objects/1d9bcd/object.json index 1a93a97b5..7e95762c8 100644 --- 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 index 4cb82eec7..93f769fd5 100644 --- 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/37a592/object.json b/objects/37a592/object.json index 4be2a79f7..f874f56e6 100644 --- 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 index 1fbff3b4d..388054167 100644 --- 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/5a95bc/object.json b/objects/5a95bc/object.json index 1020bb70c..e431bbfc6 100644 --- 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/64caee/object.json b/objects/64caee/object.json index 156cf8018..a3c59f667 100644 --- a/objects/64caee/object.json +++ b/objects/64caee/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": 54406, "SidewaysCard": false, "CustomDeck": { diff --git a/objects/7ac013/object.json b/objects/7ac013/object.json index bf670a88f..d0ab40e58 100644 --- a/objects/7ac013/object.json +++ b/objects/7ac013/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": 17506, "SidewaysCard": false, "CustomDeck": { diff --git a/objects/a69e8c/object.json b/objects/a69e8c/object.json index 612d7a8d0..b41191058 100644 --- a/objects/a69e8c/object.json +++ b/objects/a69e8c/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": 17505, "SidewaysCard": false, "CustomDeck": { diff --git a/objects/b765cf/object.json b/objects/b765cf/object.json index 33837d4f2..883730f21 100644 --- a/objects/b765cf/object.json +++ b/objects/b765cf/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": 63401, "SidewaysCard": false, "CustomDeck": { diff --git a/objects/b8b521/object.json b/objects/b8b521/object.json index b08c9c9ee..d689d8f67 100644 --- a/objects/b8b521/object.json +++ b/objects/b8b521/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": 54203, "SidewaysCard": false, "CustomDeck": { diff --git a/objects/bd528e/object.json b/objects/bd528e/object.json index 67dd0e6bf..ef553f087 100644 --- a/objects/bd528e/object.json +++ b/objects/bd528e/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": 17504, "SidewaysCard": false, "CustomDeck": { diff --git a/objects/ca88f0/object.json b/objects/ca88f0/object.json index ad0c941f9..92f55eb5a 100644 --- a/objects/ca88f0/object.json +++ b/objects/ca88f0/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": 17503, "SidewaysCard": false, "CustomDeck": { diff --git a/objects/dd3d47/object.json b/objects/dd3d47/object.json index 384518b8e..e0b14b839 100644 --- a/objects/dd3d47/object.json +++ b/objects/dd3d47/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": 63400, "SidewaysCard": false, "CustomDeck": { diff --git a/objects/e8f3e3/object.json b/objects/e8f3e3/object.json index a8e908c22..b3b250e2e 100644 --- a/objects/e8f3e3/object.json +++ b/objects/e8f3e3/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": 63403, "SidewaysCard": false, "CustomDeck": { diff --git a/objects/e924fe/object.json b/objects/e924fe/object.json index 68d035063..b8e288ea3 100644 --- a/objects/e924fe/object.json +++ b/objects/e924fe/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": 17502, "SidewaysCard": false, "CustomDeck": { diff --git a/objects/ec49d4/object.json b/objects/ec49d4/object.json index 1dca5134f..bcc9cbaf1 100644 --- a/objects/ec49d4/object.json +++ b/objects/ec49d4/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": 54101, "SidewaysCard": false, "CustomDeck": { diff --git a/objects/ee90ad/object.json b/objects/ee90ad/object.json index cf7bcf586..e5a5b7075 100644 --- a/objects/ee90ad/object.json +++ b/objects/ee90ad/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": 17507, "SidewaysCard": false, "CustomDeck": { diff --git a/objects/f114f8/object.json b/objects/f114f8/object.json index 797fc4188..0f8ac0152 100644 --- a/objects/f114f8/object.json +++ b/objects/f114f8/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": 63402, "SidewaysCard": false, "CustomDeck": { From 86a7b2908ca37a2b153c0e335d0b9fff19ebcbac Mon Sep 17 00:00:00 2001 From: iakona <1824122+iakona@users.noreply.github.com> Date: Mon, 1 Mar 2021 18:14:06 -0600 Subject: [PATCH 10/10] Updated version to 1.5.0-beta.7 --- global-script.lua | 2 +- objects/57d9fe/object.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/global-script.lua b/global-script.lua index bd5a796fe..29d5e12c4 100644 --- a/global-script.lua +++ b/global-script.lua @@ -1,5 +1,5 @@ ---- Versioning -version = "1.5.0-beta.6" +version = "1.5.0-beta.7" versionGuid = "57d9fe" ---- Used with Spirit Board Scripts counterBag = "5f595a" diff --git a/objects/57d9fe/object.json b/objects/57d9fe/object.json index a2a0418f0..72930d9aa 100644 --- 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.6", + "Text": "version 1.5.0-beta.7", "colorstate": { "r": 0.7334495, "g": 0.7334495,