Swapped terror divider assets to new one that is properly sized

spirit-island · Apr 1, 2021 · f71c3c6 · f71c3c6
1 parent 0a6db71
commit f71c3c6
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 37 deletions.
diff --git a/objects/7ac013/script.lua b/objects/7ac013/script.lua
@@ -5,16 +5,16 @@ fearSetupComplete=false
 
 function FearSetup(params)
     params.deck.takeObject({
-        guid = "2b7d0b",
+        guid = "969897",
         position = {-46.18, 0.82, 35.58},
         rotation = {0,180,180},
     })
     params.deck.takeObject({
-        guid = "4211e9",
+        guid = "f96a71",
         position = {-41.70, 0.82, 35.58},
         rotation = {0,180,180},
     })
     local fearDeck = getObjectFromGUID(Global.getVar("fearDeckSetupZone")).getObjects()[1]
     params.deck.putObject(fearDeck)
     Wait.condition(function() fearSetupComplete = true end, function() return fearDeck == nil end)
-end
+end
diff --git a/objects/2b7d0b/object.json → objects/969897/object.json b/objects/2b7d0b/object.json → objects/969897/object.json
@@ -1,24 +1,23 @@
 {
   "Name": "Card",
   "Transform": {
-    "posX": -42.26085,
+    "posX": -42.81988,
     "posY": 0.853402853,
-    "posZ": 56.3004341,
-    "rotX": 5.51032331e-09,
+    "posZ": 56.3,
+    "rotX": -2.80296275e-09,
     "rotY": 180.0,
     "rotZ": 180.0,
-    "scaleX": 1.5,
+    "scaleX": 1.53204679,
     "scaleY": 1.0,
-    "scaleZ": 1.5
+    "scaleZ": 1.53204679
   },
   "Nickname": "Terror II",
   "Description": "Spirit Island",
   "GMNotes": "",
   "ColorDiffuse": {
-    "r": 0.709803939,
-    "g": 0.709803939,
-    "b": 0.709803939,
-    "a": 0.0
+    "r": 0.713235259,
+    "g": 0.713235259,
+    "b": 0.713235259
   },
   "Tags": [
     "Fear"
@@ -31,17 +30,17 @@
   "MeasureMovement": false,
   "DragSelectable": true,
   "Autoraise": true,
-  "Sticky": false,
+  "Sticky": true,
   "Tooltip": true,
   "GridProjection": false,
   "HideWhenFaceDown": false,
   "Hands": false,
-  "CardID": 20000,
+  "CardID": 64800,
   "SidewaysCard": false,
   "CustomDeck": {
-    "200": {
-      "FaceURL": "http://cloud-3.steamusercontent.com/ugc/1753559899270603707/D603D964A69108B6ECE11CC0C3E001D293F1AA85/",
-      "BackURL": "http://cloud-3.steamusercontent.com/ugc/1753559899270603301/BE9E9ADA9A2FF5AFF35ECDBB94EF2FEA83D0F821/",
+    "648": {
+      "FaceURL": "http://cloud-3.steamusercontent.com/ugc/1718660736964009982/83E366C9AD769E6E17A6CEDC9956B8B645E5871B/",
+      "BackURL": "http://cloud-3.steamusercontent.com/ugc/1718660736964014717/46594BD698E461DF10BE671C1B8B9298CFBC6544/",
       "NumWidth": 2,
       "NumHeight": 2,
       "BackIsHidden": false,

diff --git a/objects/aidBoard/script.lua b/objects/aidBoard/script.lua
@@ -608,7 +608,7 @@ function examineCard(fearDeck, dividerPos)
         card = fearDeck
     end
 
-    if card.guid == "2b7d0b" then
+    if card.guid == "969897" then
         if fearDeck.type == "Deck" then
             card = fearDeck.takeObject({
                 position = dividerPos,
@@ -620,7 +620,7 @@ function examineCard(fearDeck, dividerPos)
             emptyDeck = true
         end
         broadcastToAll("Terror Level II Achieved!", {1,0,0})
-    elseif card.guid == "4211e9" then
+    elseif card.guid == "f96a71" then
         if fearDeck.type == "Deck" then
             card = fearDeck.takeObject({
                 position = dividerPos,

diff --git a/objects/4211e9/object.json → objects/f96a71/object.json b/objects/4211e9/object.json → objects/f96a71/object.json
@@ -1,24 +1,23 @@
 {
   "Name": "Card",
   "Transform": {
-    "posX": -38.34043,
+    "posX": -38.34,
     "posY": 0.853403,
-    "posZ": 56.2999954,
-    "rotX": 3.681271e-09,
+    "posZ": 56.3,
+    "rotX": -7.611286e-09,
     "rotY": 180.0,
     "rotZ": 180.0,
-    "scaleX": 1.5,
+    "scaleX": 1.53204679,
     "scaleY": 1.0,
-    "scaleZ": 1.5
+    "scaleZ": 1.53204679
   },
   "Nickname": "Terror III",
   "Description": "Spirit Island",
   "GMNotes": "",
   "ColorDiffuse": {
-    "r": 0.709803939,
-    "g": 0.709803939,
-    "b": 0.709803939,
-    "a": 0.0
+    "r": 0.713235259,
+    "g": 0.713235259,
+    "b": 0.713235259
   },
   "Tags": [
     "Fear"
@@ -31,17 +30,17 @@
   "MeasureMovement": false,
   "DragSelectable": true,
   "Autoraise": true,
-  "Sticky": false,
+  "Sticky": true,
   "Tooltip": true,
   "GridProjection": false,
   "HideWhenFaceDown": false,
   "Hands": false,
-  "CardID": 20001,
+  "CardID": 64801,
   "SidewaysCard": false,
   "CustomDeck": {
-    "200": {
-      "FaceURL": "http://cloud-3.steamusercontent.com/ugc/1753559899270603707/D603D964A69108B6ECE11CC0C3E001D293F1AA85/",
-      "BackURL": "http://cloud-3.steamusercontent.com/ugc/1753559899270603301/BE9E9ADA9A2FF5AFF35ECDBB94EF2FEA83D0F821/",
+    "648": {
+      "FaceURL": "http://cloud-3.steamusercontent.com/ugc/1718660736964009982/83E366C9AD769E6E17A6CEDC9956B8B645E5871B/",
+      "BackURL": "http://cloud-3.steamusercontent.com/ugc/1718660736964014717/46594BD698E461DF10BE671C1B8B9298CFBC6544/",
       "NumWidth": 2,
       "NumHeight": 2,
       "BackIsHidden": false,

diff --git a/objects/index.list b/objects/index.list
@@ -189,8 +189,6 @@ bd3f44
 f4ab64
 aee27f
 837ddf
-2b7d0b
-4211e9
 ba3767
 239d5b
 114ff8
@@ -245,3 +243,5 @@ a95c14
 606f23
 3d6e8a
 63d96e
+f96a71
+969897
diff --git a/script.lua b/script.lua
@@ -829,7 +829,7 @@ function SetupFear()
         table.insert(cardTable, card)
     end
 
-    local card = getObjectFromGUID("4211e9")
+    local card = getObjectFromGUID("f96a71")
     card.setPositionSmooth(zone.getPosition() + Vector(count,0,0))
     count = count + 1
     cardsLoaded = cardsLoaded + 1
@@ -850,7 +850,7 @@ function SetupFear()
         table.insert(cardTable, card)
     end
 
-    card = getObjectFromGUID("2b7d0b")
+    card = getObjectFromGUID("969897")
     card.setPositionSmooth(zone.getPosition() + Vector(count,0,0))
     count = count + 1
     cardsLoaded = cardsLoaded + 1