4.0.4 Release

spirit-island · Nov 27, 2023 · de4d84f · de4d84f
1 parent c0f74fa
commit de4d84f
Show file tree

Hide file tree

Showing 120 changed files with 866 additions and 764 deletions.
diff --git a/objects/0cad5e/object.json b/objects/0cad5e/object.json
@@ -4,7 +4,7 @@
     "posX": -50.099998474121094,
     "posY": 0.9329411387443542,
     "posZ": 56.29999923706055,
-    "rotX": -6.696131293892904e-08,
+    "rotX": -6.414558839651363e-08,
     "rotY": 180.0,
     "rotZ": 180.0,
     "scaleX": 1.5299999713897705,

diff --git a/objects/0e627b/contained/fddf31/script.lua b/objects/0e627b/contained/fddf31/script.lua
@@ -28,27 +28,15 @@ function doSetup(params)
             Player[color].broadcast("Don't forget to gain 1 Time", "Blue")
         end
 
-        local playtestPowers = Global.getVar("playtestMinorPowers")
-        local playtestCount = playtestPowers
-        if playtestPowers == 1 then
-            playtestCount = math.floor(count / 3)
-        elseif playtestPowers == 2 then
-            playtestCount = math.floor(count / 2)
-        end
+        local playtestCount = Global.call("getPlaytestCount", {count = count, major = false})
         local minorPowerDeck = getObjectFromGUID(Global.getVar("minorPowerZone")).getObjects()[1]
         minorPowerDeck.deal(count - playtestCount, color, 3)
         if playtestCount > 0 then
             minorPowerDeck = getObjectFromGUID(Global.getVar("playtestMinorPowerZone")).getObjects()[1]
             minorPowerDeck.deal(playtestCount, color, 3)
         end
 
-        playtestPowers = Global.getVar("playtestMajorPowers")
-        playtestCount = playtestPowers
-        if playtestPowers == 1 then
-            playtestCount = math.floor(count / 3)
-        elseif playtestPowers == 2 then
-            playtestCount = math.floor(count / 2)
-        end
+        playtestCount = Global.call("getPlaytestCount", {count = count, major = true})
         local majorPowerDeck = getObjectFromGUID(Global.getVar("majorPowerZone")).getObjects()[1]
         majorPowerDeck.deal(count - playtestCount, color, 3)
         if playtestCount > 0 then

diff --git a/objects/107788/object.json b/objects/107788/object.json
@@ -21,7 +21,7 @@
   },
   "ColorDiffuse": {
     "r": 0.6534000039100647,
-    "g": 0.3328997492790222,
+    "g": 0.33289986848831177,
     "b": 0.9320999979972839
   },
   "Tags": [

diff --git a/objects/114ff8/object.json b/objects/114ff8/object.json
@@ -20,8 +20,8 @@
     "z": 0.0
   },
   "ColorDiffuse": {
-    "r": 0.082399882376194,
-    "g": 0.05879990756511688,
+    "r": 0.08239992707967758,
+    "g": 0.05879995971918106,
     "b": 0.03920000046491623
   },
   "Tags": [

diff --git a/objects/125e82/object.json b/objects/125e82/object.json
@@ -22,7 +22,7 @@
   "ColorDiffuse": {
     "r": 0.8392000198364258,
     "g": 0.5724999904632568,
-    "b": 0.3960997760295868
+    "b": 0.39609989523887634
   },
   "Tags": [
     "Seat",

diff --git a/objects/15990d/object.json b/objects/15990d/object.json
@@ -1,9 +1,9 @@
 {
   "Name": "3DText",
   "Transform": {
-    "posX": -38.30000686645508,
+    "posX": -38.300010681152344,
     "posY": 1.0,
-    "posZ": 48.510005950927734,
+    "posZ": 48.510013580322266,
     "rotX": 90.0,
     "rotY": 0.0,
     "rotZ": 0.0,

diff --git a/objects/196f99/object.json b/objects/196f99/object.json
@@ -1,9 +1,9 @@
 {
   "Name": "3DText",
   "Transform": {
-    "posX": 105.00001525878906,
+    "posX": 105.00003051757812,
     "posY": 0.9599999785423279,
-    "posZ": -2.1700005531311035,
+    "posZ": -2.1700010299682617,
     "rotX": 90.0,
     "rotY": 0.0,
     "rotZ": 0.0,

diff --git a/objects/19d429/object.json b/objects/19d429/object.json
@@ -20,8 +20,8 @@
     "z": 0.0
   },
   "ColorDiffuse": {
-    "r": 0.12829986214637756,
-    "g": 0.04659990966320038,
+    "r": 0.12829992175102234,
+    "g": 0.04659996181726456,
     "b": 0.010700000450015068
   },
   "Tags": [

diff --git a/objects/1a3d98/contained/241617/script.lua b/objects/1a3d98/contained/241617/script.lua
@@ -20,3 +20,16 @@ function doSetup(params)
     end
     return true
 end
+
+function onDestroy()
+    local lightning = Global.call("getSpirit", {name = "Lightning's Swift Strike"})
+    local json = JSON.decode(lightning.script_state)
+    if json.immense then
+        for _,data in pairs(json.trackEnergy) do
+            data.count = math.floor(data.count / 2)
+        end
+        json.immense = nil
+        lightning.script_state = JSON.encode(json)
+        lightning.setTable("trackEnergy", json.trackEnergy)
+    end
+end
diff --git a/objects/1b39da/object.json b/objects/1b39da/object.json
@@ -24,6 +24,9 @@
     "g": 0.7131999731063843,
     "b": 0.7131999731063843
   },
+  "Tags": [
+    "Modify Cost"
+  ],
   "LayoutGroupSortIndex": 0,
   "Value": 0,
   "Locked": true,

diff --git a/objects/1b39da/script.lua b/objects/1b39da/script.lua
@@ -2,15 +2,20 @@ difficulty=0
 setupBlightTokens=1
 blightTokens=-1
 
-postSetup=true
-postSetupComplete=false
 hasBroadcast = true
 
-function PostSetup()
-    Global.setVar("fastDiscount", 1)
-    postSetupComplete = true
-end
-
 function Broadcast(params)
     return "Blitz - Remember, Invaders get an additional set of Actions at the end of Setup"
 end
+
+function modifyCost(params)
+    if Global.getVar("gameStarted") and Global.getVar("scenarioCard") ~= nil and Global.getVar("scenarioCard").guid == self.guid then
+        for guid,cost in pairs(params.costs) do
+            local card = getObjectFromGUID(guid)
+            if (card.hasTag("Fast") and not card.hasTag("Temporary Slow")) or card.hasTag("Temporary Fast") then
+                params.costs[guid] = cost-1
+            end
+        end
+    end
+    return params.costs
+end
diff --git a/objects/1ea4cf/script.lua b/objects/1ea4cf/script.lua
@@ -201,17 +201,35 @@ function checkLoss()
     local count = 0
     local beasts = getObjectsWithTag("Beasts")
     for _,obj in pairs(beasts) do
-        local quantity = obj.getQuantity()
-        if quantity == -1 then
-            count = count + 1
-        else
-            count = count + quantity
+        -- Count the beast if it's not in a player area, or if it is in a player area but over the island (e.g. the Endless Dark)
+        local isOnIsland = (#obj.getZones() == 0)
+        if not isOnIsland then
+            local hits = Physics.cast({
+                origin = obj.getBounds().center,
+                direction = Vector(0,-1,0),
+                max_distance = 6,
+            })
+            for _,v in pairs(hits) do
+                if v.hit_object ~= obj and Global.call("isIsland", {obj=v.hit_object}) then
+                    isOnIsland = true
+                    break
+                end
+            end
+        end
+        if isOnIsland then
+            local quantity = obj.getQuantity()
+            if quantity == -1 then
+                count = count + 1
+            else
+                count = count + quantity
+            end
         end
     end
     if not Global.getVar("SetupChecker").call("isSpiritPickable", {guid="165f82"}) then
         local color = Global.call("getSpiritColor", {name = "Many Minds Move as One"})
         for _,obj in pairs(getObjectsWithTag("Presence")) do
             -- Presence is not in player area
+            -- This optimisation is permissible because we don't want to count presence in the Endless Dark (which may be a in player area)
             if #obj.getZones() == 0 then
                 if color == string.sub(obj.getName(),1,-12) then
                     if obj.getQuantity() >= 2 then
@@ -222,6 +240,7 @@ function checkLoss()
                             max_distance = 6,
                         })
                         for _,v in pairs(hits) do
+                            -- The use of isIslandBoard rather than isIsland here is intentional: the Endless Dark is not a land and thus cannot be a sacred site
                             if v.hit_object ~= obj and Global.call("isIslandBoard", {obj=v.hit_object}) then
                                 count = count + 1
                                 break

diff --git a/objects/22928c/object.json b/objects/22928c/object.json
@@ -1,9 +1,9 @@
 {
   "Name": "3DText",
   "Transform": {
-    "posX": -36.66000747680664,
+    "posX": -36.66001510620117,
     "posY": 0.9599999785423279,
-    "posZ": 47.720008850097656,
+    "posZ": 47.72001647949219,
     "rotX": 90.0,
     "rotY": 0.0,
     "rotZ": 0.0,

diff --git a/objects/239d5b/object.json b/objects/239d5b/object.json
@@ -20,8 +20,8 @@
     "z": 0.0
   },
   "ColorDiffuse": {
-    "r": 0.082399882376194,
-    "g": 0.05879990756511688,
+    "r": 0.08239992707967758,
+    "g": 0.05879995971918106,
     "b": 0.03920000046491623
   },
   "Tags": [

diff --git a/objects/2ca216/object.json b/objects/2ca216/object.json
@@ -22,7 +22,7 @@
   "ColorDiffuse": {
     "r": 0.8392000198364258,
     "g": 0.5724999904632568,
-    "b": 0.3960997760295868
+    "b": 0.39609989523887634
   },
   "Tags": [
     "Uninteractable"

diff --git a/objects/308a01/contained/072caf/script-state.json b/objects/308a01/contained/072caf/script-state.json
@@ -5,7 +5,7 @@
       "position": {
         "x": 0.31,
         "y": 0,
-        "z": 1.05
+        "z": 1.07
       }
     }
   ]

diff --git a/objects/308a01/contained/13e389/script-state.json b/objects/308a01/contained/13e389/script-state.json
@@ -3,9 +3,9 @@
     {
       "elements": "00300320",
       "position": {
-        "x": 0.32,
+        "x": 0.3,
         "y": 0,
-        "z": 1.12
+        "z": 1.14
       }
     }
   ]

diff --git a/objects/308a01/contained/152fe0/object.json b/objects/308a01/contained/152fe0/object.json
@@ -115,7 +115,7 @@
         }
       },
       "LuaScript": "elements=\"01100001\"\nenergy=3\nfunction onLoad(saved_data)\n    if saved_data ~= \"\" then\n        local loaded_data = JSON.decode(saved_data)\n        self.setTable(\"thresholds\", loaded_data.thresholds)\n    end\nend\n-- card loading end",
-      "LuaScriptState": "{\"thresholds\": [{\"elements\": \"00000003\", \"position\": {\"x\": 0.08, \"y\": 0, \"z\": 0.99}}]}",
+      "LuaScriptState": "{\"thresholds\": [{\"elements\": \"00000003\", \"position\": {\"x\": 0.06, \"y\": 0, \"z\": 1.0}}]}",
       "XmlUI": ""
     }
   }

diff --git a/objects/308a01/contained/152fe0/script-state.json b/objects/308a01/contained/152fe0/script-state.json
@@ -3,9 +3,9 @@
     {
       "elements": "00000003",
       "position": {
-        "x": 0.08,
+        "x": 0.05,
         "y": 0,
-        "z": 0.99
+        "z": 1.02
       }
     }
   ]

diff --git a/objects/308a01/contained/19769e/script-state.json b/objects/308a01/contained/19769e/script-state.json
@@ -3,9 +3,9 @@
     {
       "elements": "00004000",
       "position": {
-        "x": 0.07,
+        "x": 0.06,
         "y": 0,
-        "z": 1.07
+        "z": 1.06
       }
     }
   ]

diff --git a/objects/308a01/contained/1a5df5/script-state.json b/objects/308a01/contained/1a5df5/script-state.json
@@ -3,9 +3,9 @@
     {
       "elements": "00003200",
       "position": {
-        "x": 0.19,
+        "x": 0.18,
         "y": 0,
-        "z": 0.87
+        "z": 0.86
       }
     }
   ]

diff --git a/objects/308a01/contained/2c08c1/script-state.json b/objects/308a01/contained/2c08c1/script-state.json
@@ -3,9 +3,9 @@
     {
       "elements": "00002040",
       "position": {
-        "x": 0.19,
+        "x": 0.17,
         "y": 0,
-        "z": 1
+        "z": 1.04
       }
     }
   ]

diff --git a/objects/308a01/contained/2f5ed3/script-state.json b/objects/308a01/contained/2f5ed3/script-state.json
@@ -3,9 +3,9 @@
     {
       "elements": "00000322",
       "position": {
-        "x": 0.32,
+        "x": 0.3,
         "y": 0,
-        "z": 0.98
+        "z": 0.99
       }
     }
   ]

diff --git a/objects/308a01/contained/32645b/script-state.json b/objects/308a01/contained/32645b/script-state.json
@@ -5,7 +5,7 @@
       "position": {
         "x": 0.18,
         "y": 0,
-        "z": 1.05
+        "z": 1.07
       }
     }
   ]

diff --git a/objects/308a01/contained/36f5f5/script-state.json b/objects/308a01/contained/36f5f5/script-state.json
@@ -3,9 +3,9 @@
     {
       "elements": "30002030",
       "position": {
-        "x": 0.32,
+        "x": 0.31,
         "y": 0,
-        "z": 1.06
+        "z": 1.08
       }
     }
   ]

diff --git a/objects/308a01/contained/36f624/script-state.json b/objects/308a01/contained/36f624/script-state.json
@@ -5,7 +5,7 @@
       "position": {
         "x": 0.17,
         "y": 0,
-        "z": 0.84
+        "z": 0.87
       }
     }
   ]

diff --git a/objects/308a01/contained/38e53f/script-state.json b/objects/308a01/contained/38e53f/script-state.json
@@ -3,9 +3,9 @@
     {
       "elements": "20000220",
       "position": {
-        "x": 0.32,
+        "x": 0.31,
         "y": 0,
-        "z": 0.99
+        "z": 1.0
       }
     }
   ]

diff --git a/objects/308a01/contained/427183/script-state.json b/objects/308a01/contained/427183/script-state.json
@@ -3,7 +3,7 @@
     {
       "elements": "02032000",
       "position": {
-        "x": 0.32,
+        "x": 0.3,
         "y": 0,
         "z": 1.05
       }

diff --git a/objects/308a01/contained/835ce4/script-state.json b/objects/308a01/contained/835ce4/script-state.json
@@ -5,7 +5,7 @@
       "position": {
         "x": 0.06,
         "y": 0,
-        "z": 0.92
+        "z": 0.94
       }
     }
   ]