diff --git a/objects/0cad5e/object.json b/objects/0cad5e/object.json index 45b6d6df2..aa3e94264 100644 --- 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.414558839651363e-08, + "rotX": -8.708996546147318e-08, "rotY": 180.0, "rotZ": 180.0, "scaleX": 1.5299999713897705, diff --git a/objects/0dadff/contained/00aa5c/script-state.json b/objects/0dadff/contained/00aa5c/script-state.json index dc380898e..24e31bff1 100644 --- a/objects/0dadff/contained/00aa5c/script-state.json +++ b/objects/0dadff/contained/00aa5c/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.2995, + "width": 1.9503, + "x": 0.519, + "y": -0.0864 + }, "thresholds": [ { "elements": "00000200", diff --git a/objects/0dbf0f/object.json b/objects/0dbf0f/object.json index 544c52d57..dd1c82e95 100644 --- a/objects/0dbf0f/object.json +++ b/objects/0dbf0f/object.json @@ -1,17 +1,17 @@ { "Name": "Custom_Token", "Transform": { - "posX": -52.92850112915039, - "posY": -0.10000000149011612, - "posZ": 60.48210144042969, + "posX": -50.694698333740234, + "posY": -0.7549999952316284, + "posZ": 69.59420013427734, "rotX": -0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 0.8119999766349792, + "scaleX": 0.6000000238418579, "scaleY": 1.0, - "scaleZ": 0.8119999766349792 + "scaleZ": 0.6000000238418579 }, - "Nickname": "NORMAL A", + "Nickname": "NORMAL B", "Description": "", "GMNotes": "", "AltLookAngle": { @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173049727/ED8C799A5F30403BE8B266276A0D22C2871AA2C1/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245059248/465BF72B0A091AFFD64731757DBB55430D574CA0/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/0e627b/contained/013dfc/script-state.json b/objects/0e627b/contained/013dfc/script-state.json index 9a5dcf8b3..86244e428 100644 --- a/objects/0e627b/contained/013dfc/script-state.json +++ b/objects/0e627b/contained/013dfc/script-state.json @@ -1,5 +1,12 @@ { "broadcast": "When Gaining a Power Card, to keep an extra Power Card for your Days That Never Were, right click the \"Pick Power\" button.", + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.6714, + "width": 2.5084, + "x": 0.5867, + "y": -0.2521 + }, "thresholds": [ { "elements": "03010000", diff --git a/objects/0e627b/contained/fddf31/script.lua b/objects/0e627b/contained/fddf31/script.lua index 2cc6a0c6a..a2033ec33 100644 --- a/objects/0e627b/contained/fddf31/script.lua +++ b/objects/0e627b/contained/fddf31/script.lua @@ -1,13 +1,7 @@ +spiritName = "Fractured Days Split the Sky" + function doSetup(params) local color = params.color - if not Global.getVar("gameStarted") then - Player[color].broadcast("Please wait for the game to start before pressing this button!", Color.Red) - return false - elseif color ~= Global.call("getSpiritColor", {name = "Fractured Days Split the Sky"}) then - Player[color].broadcast("You have not picked Fractured Days Split the Sky!", Color.Red) - return false - end - local position = Player[color].getHandTransform(2).position position.z = position.z - 5.5 Global.call("SpawnHand", {color = color, position = position}) diff --git a/objects/107788/object.json b/objects/107788/object.json index 3116d03f7..abc02fa47 100644 --- a/objects/107788/object.json +++ b/objects/107788/object.json @@ -21,7 +21,7 @@ }, "ColorDiffuse": { "r": 0.6534000039100647, - "g": 0.33289986848831177, + "g": 0.332899808883667, "b": 0.9320999979972839 }, "Tags": [ diff --git a/objects/114ff8/object.json b/objects/114ff8/object.json index 504a13e01..022911b4e 100644 --- a/objects/114ff8/object.json +++ b/objects/114ff8/object.json @@ -20,8 +20,8 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.08239992707967758, - "g": 0.05879995971918106, + "r": 0.0823998972773552, + "g": 0.05879993736743927, "b": 0.03920000046491623 }, "Tags": [ diff --git a/objects/125e82/object.json b/objects/125e82/object.json index ed78dd322..36c02ec87 100644 --- a/objects/125e82/object.json +++ b/objects/125e82/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.8392000198364258, "g": 0.5724999904632568, - "b": 0.39609989523887634 + "b": 0.39609983563423157 }, "Tags": [ "Seat", diff --git a/objects/15990d/object.json b/objects/15990d/object.json index 9d59f7295..c06fda4e2 100644 --- a/objects/15990d/object.json +++ b/objects/15990d/object.json @@ -3,7 +3,7 @@ "Transform": { "posX": -38.300010681152344, "posY": 1.0, - "posZ": 48.510013580322266, + "posZ": 48.5100212097168, "rotX": 90.0, "rotY": 0.0, "rotZ": 0.0, diff --git a/objects/165f82/contained/a576cc/object.json b/objects/165f82/contained/a576cc/object.json index 7e63462b3..d1b2fb335 100644 --- a/objects/165f82/contained/a576cc/object.json +++ b/objects/165f82/contained/a576cc/object.json @@ -26,7 +26,6 @@ }, "Tags": [ "JE", - "Lower Spirit Image", "Moderate", "Spirit" ], diff --git a/objects/165f82/contained/a576cc/script-state.json b/objects/165f82/contained/a576cc/script-state.json index e24be1ec9..84e2b85e0 100644 --- a/objects/165f82/contained/a576cc/script-state.json +++ b/objects/165f82/contained/a576cc/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageURL", + "height": 1.6702, + "width": 2.5067, + "x": 0.7631, + "y": -0.3075 + }, "thresholds": [ { "elements": "00020001", diff --git a/objects/196f99/object.json b/objects/196f99/object.json index 9f1dc0dec..c6fbc72d6 100644 --- a/objects/196f99/object.json +++ b/objects/196f99/object.json @@ -3,7 +3,7 @@ "Transform": { "posX": 105.00003051757812, "posY": 0.9599999785423279, - "posZ": -2.1700010299682617, + "posZ": -2.17000150680542, "rotX": 90.0, "rotY": 0.0, "rotZ": 0.0, diff --git a/objects/19d429/object.json b/objects/19d429/object.json index 365eff684..dc5fd00e3 100644 --- a/objects/19d429/object.json +++ b/objects/19d429/object.json @@ -20,8 +20,8 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.12829992175102234, - "g": 0.04659996181726456, + "r": 0.12829989194869995, + "g": 0.046599939465522766, "b": 0.010700000450015068 }, "Tags": [ diff --git a/objects/1a3d98/contained/241617/script.lua b/objects/1a3d98/contained/241617/script.lua index c1b96861b..b85bd71f7 100644 --- a/objects/1a3d98/contained/241617/script.lua +++ b/objects/1a3d98/contained/241617/script.lua @@ -1,14 +1,7 @@ -function doSetup(params) - local color = params.color - if not Global.getVar("gameStarted") then - Player[color].broadcast("Please wait for the game to start before pressing this button!", Color.Red) - return false - elseif color ~= Global.call("getSpiritColor", {name = "Lightning's Swift Strike"}) then - Player[color].broadcast("You have not picked Lightning's Swift Strike!", Color.Red) - return false - end +spiritName = "Lightning's Swift Strike" - local lightning = Global.call("getSpirit", {name = "Lightning's Swift Strike"}) +function doSetup(params) + local lightning = Global.call("getSpirit", {name = spiritName}) local json = JSON.decode(lightning.script_state) if not json.immense then for _,data in pairs(json.trackEnergy) do @@ -22,7 +15,7 @@ function doSetup(params) end function onDestroy() - local lightning = Global.call("getSpirit", {name = "Lightning's Swift Strike"}) + local lightning = Global.call("getSpirit", {name = spiritName}) local json = JSON.decode(lightning.script_state) if json.immense then for _,data in pairs(json.trackEnergy) do diff --git a/objects/1a3d98/contained/4a0884/object.json b/objects/1a3d98/contained/4a0884/object.json index 67aaebfdd..07f35b023 100644 --- a/objects/1a3d98/contained/4a0884/object.json +++ b/objects/1a3d98/contained/4a0884/object.json @@ -27,7 +27,6 @@ "Tags": [ "Base", "Low", - "Lower Spirit Image", "Spirit" ], "LayoutGroupSortIndex": 0, diff --git a/objects/1a3d98/contained/4a0884/script-state.json b/objects/1a3d98/contained/4a0884/script-state.json index 447385c85..2edaf4d73 100644 --- a/objects/1a3d98/contained/4a0884/script-state.json +++ b/objects/1a3d98/contained/4a0884/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.2698, + "width": 1.9057, + "x": 0.4996, + "y": -0.0638 + }, "thresholds": [ { "elements": "00320000", diff --git a/objects/1da681/object.json b/objects/1da681/object.json index 530fe3018..12df8ad0d 100644 --- a/objects/1da681/object.json +++ b/objects/1da681/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": -50.7599983215332, - "posY": -0.10000000149011612, - "posZ": 54.810001373291016, + "posX": -45.12120056152344, + "posY": -0.7549999952316284, + "posZ": 71.43910217285156, "rotX": -0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 0.8100000023841858, + "scaleX": 0.6000000238418579, "scaleY": 1.0, - "scaleZ": 0.8100000023841858 + "scaleZ": 0.6000000238418579 }, "Nickname": "NORMAL G", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2050879843778159452/609814EA84810D27B67E97C91E441F3D4301C4B9/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245064321/45B703C37F42B0A3F9BFE48985F463335A2F97A2/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/1ea4cf/script.lua b/objects/1ea4cf/script.lua index e85d588d4..74acf1f27 100644 --- a/objects/1ea4cf/script.lua +++ b/objects/1ea4cf/script.lua @@ -202,7 +202,7 @@ function checkLoss() local beasts = getObjectsWithTag("Beasts") for _,obj in pairs(beasts) do -- 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) + local isOnIsland = (#obj.getZones() == 0 and not obj.hasTag("Presence")) if not isOnIsland then local hits = Physics.cast({ origin = obj.getBounds().center, diff --git a/objects/1f095d/contained/0e8787/object.json b/objects/1f095d/contained/0e8787/object.json index c613bd3c7..5f0e94e78 100644 --- a/objects/1f095d/contained/0e8787/object.json +++ b/objects/1f095d/contained/0e8787/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": 102.73770141601562, - "posY": 2.1689999103546143, - "posZ": 38.12300109863281, + "posX": -106.01570129394531, + "posY": 1.2877999544143677, + "posZ": 133.6020965576172, "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "C", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173050050/0F371D1DF35AA44E0EBA967519E8778A21BD0711/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245060182/C5A69D9CCC2E748DD080FA36226E67F3DBCADC0A/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -52,5 +52,25 @@ "StandUp": false, "Stackable": false } - } + }, + "AttachedDecals": [ + { + "Transform": { + "posX": 1.7307000160217285, + "posY": 0.20749999582767487, + "posZ": 0.08089999854564667, + "rotX": 90.0, + "rotY": 179.4980926513672, + "rotZ": 0.0, + "scaleX": 0.2696000039577484, + "scaleY": 0.266400009393692, + "scaleZ": 1.7716000080108643 + }, + "CustomDecal": { + "Name": "Dirty 2 Boat", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245362039/488B18C9D38481BDE5A13B0001D297437884D699/", + "Size": 1.0 + } + } + ] } diff --git a/objects/1f095d/contained/0e8787/script.lua b/objects/1f095d/contained/0e8787/script.lua index d85598dc9..54b628932 100644 --- a/objects/1f095d/contained/0e8787/script.lua +++ b/objects/1f095d/contained/0e8787/script.lua @@ -11,33 +11,33 @@ posMap = { } }, -- Land 2 { { - x=0.778461538461538, y=0.7, z=0.213846153846154 + x=0.778462469577789, y=0.7, z=0.213842749595642 }, { - x=1.16923076923077, y=0.7, z=0.216923076923077 + x=1.16923379898071, y=0.7, z=0.21691569685936 }, { - x=1.13076923076923, y=0.7, z=-0.129230769230769 + x=1.00514197349548, y=0.7, z=-0.109882481396198 }, { - x=0.786153846153846, y=0.7, z=-0.113846153846154 + x=1.28506374359131, y=0.7, z=0.489777773618698 }, { - x=0.826153846153846, y=0.7, z=0.521538461538462 + x=0.865199983119965, y=0.7, z=0.523668825626373 } }, -- Land 3 { { - x=1.48923076923077, y=0.7, z=0.901538461538462 + x=1.19798541069031, y=0.7, z=0.949151217937469 }, { - x=1.22923076923077, y=0.7, z=0.898461538461538 + x=1.55753540992737, y=0.7, z=0.923320412635803 }, { - x=0.94, y=0.7, z=0.915384615384616 + x=1.36988091468811, y=0.7, z=1.18786549568176 }, { - x=1.74769230769231, y=0.7, z=0.923076923076923 + x=1.84446823596954, y=0.7, z=1.00353193283081 } }, -- Land 4 { { - x=0.36, y=0.7, z=0.787692307692308 + x=0.360675811767578, y=0.7, z=0.800610542297363 }, { - x=-0.0953846153846155, y=0.7, z=0.796923076923077 + x=-0.374241799116135, y=0.7, z=0.954020380973816 }, { - x=-0.561538461538462, y=0.7, z=0.810769230769231 + x=0.0107099795714021, y=0.7, z=0.898428499698639 } }, -- Land 5 { { @@ -61,25 +61,25 @@ posMap = { } }, -- Land 7 { { - x=-0.787692307692308, y=0.7, z=-0.14 + x=-0.791155099868774, y=0.7, z=-0.1283058822155 }, { - x=-0.943076923076924, y=0.7, z=0.056923076923077 + x=-1.17007374763489, y=0.7, z=-0.14752721786499 }, { - x=-0.787692307692308, y=0.7, z=0.156923076923077 + x=-0.966049253940582, y=0.7, z=0.226053789258003 }, { - x=-1.04561519622803, y=0.7, z=0.367100417613983 + x=-1.20735359191895, y=0.7, z=0.444981813430786 } }, -- Land 8 { { - x=-1.50615384615385, y=0.7, z=-0.933846153846153 + x=-1.47859072685242, y=0.7, z=-0.914169609546661 }, { - x=-1.28, y=0.7, z=-0.661538461538461 + x=-1.78907954692841, y=0.7, z=-1.04244077205658 }, { - x=-1.21230769230769, y=0.7, z=-0.93076923076923 + x=-1.26716983318329, y=0.7, z=-1.19797778129578 }, { - x=-1.27230769230769, y=0.7, z=-1.19538461538462 + x=-1.55832231044769, y=0.7, z=-1.2252504825592 }, { - x=-1.79538461538462, y=0.7, z=-0.970769230769231 + x=-1.42264628410339, y=0.7, z=-0.615060031414032 } } } pieceMap = { { "Dahan" }, { "City" }, { "Dahan" , "Dahan" }, {}, { "Dahan" , "Dahan" , "Box Blight" }, { "Dahan" }, { "Town" }, {} } diff --git a/objects/1f095d/contained/1a46dc/object.json b/objects/1f095d/contained/1a46dc/object.json index c9b5c2079..0a5e30d5e 100644 --- a/objects/1f095d/contained/1a46dc/object.json +++ b/objects/1f095d/contained/1a46dc/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": 145.84739685058594, - "posY": 2.5100998878479004, - "posZ": 38.44049835205078, + "posX": -106.0156021118164, + "posY": 1.2074999809265137, + "posZ": 114.56690216064453, "rotX": 0.0, - "rotY": 180.01300048828125, + "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "G", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2050879843778159452/609814EA84810D27B67E97C91E441F3D4301C4B9/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245064321/45B703C37F42B0A3F9BFE48985F463335A2F97A2/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -52,5 +52,25 @@ "StandUp": false, "Stackable": false } - } + }, + "AttachedDecals": [ + { + "Transform": { + "posX": 1.7711999416351318, + "posY": 0.20749999582767487, + "posZ": 0.12680000066757202, + "rotX": 90.0, + "rotY": 179.16090393066406, + "rotZ": 0.0, + "scaleX": 0.2696000039577484, + "scaleY": 0.266400009393692, + "scaleZ": 1.7716000080108643 + }, + "CustomDecal": { + "Name": "Dirty 2 Boat", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245362039/488B18C9D38481BDE5A13B0001D297437884D699/", + "Size": 1.0 + } + } + ] } diff --git a/objects/1f095d/contained/1a46dc/script.lua b/objects/1f095d/contained/1a46dc/script.lua index ea9464064..f2627ae02 100644 --- a/objects/1f095d/contained/1a46dc/script.lua +++ b/objects/1f095d/contained/1a46dc/script.lua @@ -1,91 +1,91 @@ posMap = { -- Land 1 { { - x=0.80917275, y=0.7, z=-0.9164281 + x=0.466594159603119, y=0.7, z=-1.14484286308289 }, { - x=0.4233784, y=0.7, z=-1.089459 + x=0.786623477935791, y=0.7, z=-0.976119160652161 }, { - x=0.422714949, y=0.7, z=-0.6349831 + x=0.497543215751648, y=0.7, z=-0.803458869457245 }, { - x=0.7963159, y=0.7, z=-0.529047966 + x=0.138874843716621, y=0.7, z=-0.952580511569977 }, { - x=0.202889442, y=0.7, z=-0.871043861 + x=0.85438597202301, y=0.7, z=-0.633658885955811 } }, -- Land 2 { { - x=1.21915281, y=0.7, z=0.170175448 + x=1.19509077072144, y=0.7, z=0.271594375371933 }, { - x=0.9945905, y=0.7, z=0.444805235 + x=0.931795001029968, y=0.7, z=0.439501255750656 }, { - x=0.599481642, y=0.7, z=-0.05260679 + x=0.860804796218872, y=0.7, z=0.131175071001053 }, { - x=1.0708214, y=0.7, z=-0.125429153 + x=1.14935088157654, y=0.7, z=-0.0413709916174412 }, { - x=0.8640266, y=0.7, z=0.175323144 + x=0.796646058559418, y=0.7, z=-0.187335401773453 } }, -- Land 3 { { - x=0.8075184, y=0.7, z=1.02396584 + x=1.71144545078278, y=0.7, z=0.968284785747528 }, { - x=1.46317267, y=0.7, z=0.6971853 + x=1.43075573444366, y=0.7, z=0.803867220878601 }, { - x=1.343082, y=0.7, z=1.050841 + x=1.13463509082794, y=0.7, z=0.996527075767517 } }, -- Land 4 { { - x=0.652125, y=0.7, z=0.722644567 + x=0.452821433544159, y=0.7, z=0.769953846931458 }, { - x=-0.006116643, y=0.7, z=0.6432832 + x=0.137884795665741, y=0.7, z=0.766980588436127 }, { - x=-0.282010883, y=0.7, z=0.887872756 + x=-0.205511480569839, y=0.7, z=0.836871147155762 } }, -- Land 5 { { - x=0.111241542, y=0.7, z=-0.08834861 + x=0.0875590145587921, y=0.7, z=0.230189442634583 }, { - x=-0.349029, y=0.7, z=0.181676462 + x=-0.12455216050148, y=0.7, z=0.00516002252697945 }, { - x=0.0435770862, y=0.7, z=0.233111143 + x=-0.496069639921188, y=0.7, z=0.0407632254064083 } }, -- Land 6 { { - x=-0.572368, y=0.7, z=-1.007813 + x=0.0782995894551277, y=0.7, z=-0.458357125520706 }, { - x=-0.114140153, y=0.7, z=-0.591935158 + x=-0.266146570444107, y=0.7, z=-0.581923246383667 }, { - x=-0.965316, y=0.7, z=-0.9270013 + x=-0.588230550289154, y=0.7, z=-0.773764729499817 }, { - x=-0.5898231, y=0.7, z=-0.7269506 + x=-0.802419722080231, y=0.7, z=-1.0445202589035 } }, -- Land 7 { { - x=-0.79987514, y=0.7, z=0.205558047 + x=-0.670666992664337, y=0.7, z=0.681343972682953 }, { - x=-0.568775356, y=0.7, z=0.5836249 + x=-0.993663907051086, y=0.7, z=0.670999050140381 }, { - x=-1.10202265, y=0.7, z=0.391890436 + x=-0.803678274154663, y=0.7, z=0.430996119976044 }, { - x=-0.8030872, y=0.7, z=0.659214735 + x=-1.0688818693161, y=0.7, z=0.190717712044716 }, { - x=-0.6533989, y=0.7, z=0.8329117 + x=-1.21745133399963, y=0.7, z=0.492125064134598 }, { - x=-0.8242404, y=0.7, z=0.4558289 + x=-0.632467925548553, y=0.7, z=1.01568341255188 } }, -- Land 8 { { - x=-1.23343563, y=0.7, z=-0.46983698 + x=-1.14286923408508, y=0.7, z=-0.346533238887787 }, { - x=-0.8663316, y=0.7, z=-0.1377456 + x=-1.40311396121979, y=0.7, z=-0.644955992698669 }, { - x=-0.7249009, y=0.7, z=-0.3941193 + x=-1.60752320289612, y=0.7, z=-0.914716005325317 }, { - x=-1.2111274, y=0.7, z=-0.161169529 + x=-1.07858979701996, y=0.7, z=-0.645205497741699 }, { - x=-1.53989255, y=0.7, z=-0.9337228 + x=-1.39860618114471, y=0.7, z=-0.164565548300743 }, { - x=-1.43200219, y=0.7, z=-0.7024647 + x=-1.55108070373535, y=0.7, z=-1.19916903972626 }, { - x=-1.001844, y=0.7, z=-0.317439765 + x=-1.95678246021271, y=0.7, z=-1.0586268901825 } } } pieceMap = { { "Dahan" , "Dahan" }, { "City" }, { "Dahan" }, { "Dahan" }, { "Box Blight" }, {}, { "Dahan" , "Dahan" }, { "Town" } } diff --git a/objects/1f095d/contained/2d6be7/object.json b/objects/1f095d/contained/2d6be7/object.json index c893d60cd..1d47616a6 100644 --- a/objects/1f095d/contained/2d6be7/object.json +++ b/objects/1f095d/contained/2d6be7/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": 118.16089630126953, - "posY": 2.4484000205993652, - "posZ": 44.064998626708984, + "posX": -164.4031982421875, + "posY": 1.3985999822616577, + "posZ": 114.56169891357422, "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "E", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173050185/2C44D3FC1F0B51E31FD954D041797DAFDDFC1BFF/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245062231/7F2066071470CFC4C79AC8A2C720B5682D999EC8/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -52,5 +52,25 @@ "StandUp": false, "Stackable": false } - } + }, + "AttachedDecals": [ + { + "Transform": { + "posX": 1.7783000469207764, + "posY": 0.20749999582767487, + "posZ": 0.11029999703168869, + "rotX": 90.0, + "rotY": 180.67990112304688, + "rotZ": 0.0, + "scaleX": 0.2696000039577484, + "scaleY": 0.266400009393692, + "scaleZ": 1.7716000080108643 + }, + "CustomDecal": { + "Name": "Dirty 2 Boat", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245362039/488B18C9D38481BDE5A13B0001D297437884D699/", + "Size": 1.0 + } + } + ] } diff --git a/objects/1f095d/contained/2d6be7/script.lua b/objects/1f095d/contained/2d6be7/script.lua index bdea8b705..2022fe3e6 100644 --- a/objects/1f095d/contained/2d6be7/script.lua +++ b/objects/1f095d/contained/2d6be7/script.lua @@ -1,43 +1,43 @@ posMap = { -- Land 1 { { - x=0.624615384615385, y=0.7, z=-0.967692307692308 + x=0.6246018409729, y=0.7, z=-0.967696905136108 }, { - x=0.338461538461538, y=0.7, z=-0.86923076923077 + x=0.328016132116318, y=0.7, z=-0.91425085067749 }, { - x=0.0538461538461538, y=0.7, z=-0.721538461538462 + x=0.0523369759321213, y=0.7, z=-0.793708980083466 }, { - x=-0.273846153846154, y=0.7, z=-0.792307692307693 + x=-0.29016038775444, y=0.7, z=-0.863296627998352 } }, -- Land 2 { { - x=0.698461538461538, y=0.7, z=-0.144615384615385 + x=0.715136289596558, y=0.7, z=-0.140049159526825 }, { - x=0.973846153846154, y=0.7, z=-0.136923076923077 + x=1.08148860931396, y=0.7, z=-0.135375171899796 }, { - x=0.849230769230769, y=0.7, z=-0.415384615384615 + x=1.07555508613586, y=0.7, z=-0.453485876321793 }, { - x=0.567692307692308, y=0.7, z=-0.412307692307692 + x=0.690903723239899, y=0.7, z=-0.43890592455864 }, { - x=0.850769230769231, y=0.7, z=0.130769230769231 + x=1.29988849163055, y=0.7, z=0.139795556664467 }, { - x=1.16, y=0.7, z=0.161538461538462 + x=0.936742603778839, y=0.7, z=0.177793681621552 } }, -- Land 3 { { - x=1.21538461538462, y=0.7, z=0.729230769230769 + x=1.2684121131897, y=0.7, z=0.774732053279877 }, { - x=1.40769230769231, y=0.7, z=1.02769230769231 + x=1.53495013713837, y=0.7, z=1.01175475120544 }, { - x=1.08, y=0.7, z=1.02 + x=1.19672751426697, y=0.7, z=1.08766853809357 }, { - x=1.53230769230769, y=0.7, z=0.709230769230769 + x=1.69309067726135, y=0.7, z=0.781639039516449 } }, -- Land 4 { { - x=0.383076923076923, y=0.7, z=0.806153846153846 + x=0.382041811943054, y=0.7, z=0.87813538312912 }, { - x=-0.18, y=0.7, z=0.709230769230769 + x=-0.0334098823368549, y=0.7, z=0.809107184410095 } }, -- Land 5 { { @@ -49,37 +49,37 @@ posMap = { } }, -- Land 6 { { - x=-0.975384615384616, y=0.7, z=0.536923076923077 + x=-1.04248213768005, y=0.7, z=0.599315524101257 }, { - x=-0.7, y=0.7, z=0.575384615384615 + x=-0.776452302932739, y=0.7, z=0.636013150215149 }, { - x=-0.941538461538461, y=0.7, z=0.276923076923077 + x=-1.0436315536499, y=0.7, z=0.269108533859253 }, { - x=-0.621538461538462, y=0.7, z=0.835384615384615 + x=-0.678584933280945, y=0.7, z=0.980016946792603 } }, -- Land 7 { { - x=-0.607692307692308, y=0.7, z=-0.123076923076923 + x=-0.675676643848419, y=0.7, z=-0.1238903850317 }, { - x=-0.667692307692308, y=0.7, z=-0.492307692307692 + x=-0.720439851284027, y=0.7, z=-0.450989782810211 }, { - x=-0.667692307692308, y=0.7, z=-0.692307692307692 + x=-0.789272904396057, y=0.7, z=-0.804942488670349 }, { - x=-0.955012261867523, y=0.7, z=-0.966971278190613 + x=-1.01930487155914, y=0.7, z=-1.0505565404892 } }, -- Land 8 { { - x=-1.53230769230769, y=0.7, z=-0.878461538461538 + x=-1.86404514312744, y=0.7, z=-1.02213335037231 }, { - x=-1.82307692307692, y=0.7, z=-0.996923076923077 + x=-1.53158748149872, y=0.7, z=-0.878933668136597 }, { - x=-1.45692307692308, y=0.7, z=-1.12461538461538 + x=-1.64740169048309, y=0.7, z=-1.15216505527496 }, { - x=-1.28153846153846, y=0.7, z=-0.667692307692308 + x=-1.40223979949951, y=0.7, z=-0.652436852455139 }, { - x=-1.27538461538462, y=0.7, z=-0.184615384615385 + x=-1.42244386672974, y=0.7, z=-0.336007207632065 }, { - x=-1.28461538461538, y=0.7, z=-0.433846153846154 + x=-1.38696134090424, y=0.7, z=-0.0632536113262177 } } } pieceMap = { { "Dahan" }, { "City" }, { "Dahan" , "Dahan" }, {"Box Blight" }, { "Dahan" }, {}, { "Town" }, { "Dahan", "Dahan" } } diff --git a/objects/1f095d/contained/385dae/object.json b/objects/1f095d/contained/385dae/object.json index a00faab33..74258ddfa 100644 --- a/objects/1f095d/contained/385dae/object.json +++ b/objects/1f095d/contained/385dae/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": 109.64959716796875, - "posY": 2.5051000118255615, - "posZ": 39.590301513671875, + "posX": -135.19509887695312, + "posY": 1.2735999822616577, + "posZ": 133.66409301757812, "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "B", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173049851/20D6983DD3B1A5CA2D62BFE1AA209D90E1058D85/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245059248/465BF72B0A091AFFD64731757DBB55430D574CA0/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -52,5 +52,25 @@ "StandUp": false, "Stackable": false } - } + }, + "AttachedDecals": [ + { + "Transform": { + "posX": 1.7316999435424805, + "posY": 0.20749999582767487, + "posZ": 0.07829999923706055, + "rotX": 90.0, + "rotY": 179.4228057861328, + "rotZ": 0.0, + "scaleX": 0.2696000039577484, + "scaleY": 0.266400009393692, + "scaleZ": 1.7716000080108643 + }, + "CustomDecal": { + "Name": "Dirty 2 Boat", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245362039/488B18C9D38481BDE5A13B0001D297437884D699/", + "Size": 1.0 + } + } + ] } diff --git a/objects/1f095d/contained/385dae/script.lua b/objects/1f095d/contained/385dae/script.lua index e506ff095..5c499aa57 100644 --- a/objects/1f095d/contained/385dae/script.lua +++ b/objects/1f095d/contained/385dae/script.lua @@ -11,25 +11,25 @@ posMap = { } }, -- Land 2 { { - x=1.11692307692308, y=0.7, z=0.146153846153846 + x=1.21060407161713, y=0.7, z=0.135501116514206 }, { - x=0.815384615384615, y=0.7, z=0.167692307692307 + x=0.876397132873535, y=0.7, z=0.176219373941422 }, { - x=0.816923076923076, y=0.7, z=0.450769230769231 + x=1.02500343322754, y=0.7, z=-0.163170397281647 }, { - x=1.08769230769231, y=0.7, z=-0.132307692307692 + x=0.956552028656006, y=0.7, z=0.478511601686478 }, { - x=0.806153846153845, y=0.7, z=-0.121538461538461 + x=1.34336352348328, y=0.7, z=0.46575602889061 } }, -- Land 3 { { - x=1.26, y=0.7, z=0.899999999999999 + x=1.12060546875, y=0.7, z=1.03422236442566 }, { - x=0.996923076923077, y=0.7, z=0.913846153846154 + x=1.42119097709656, y=0.7, z=1.02917265892029 }, { - x=1.52, y=0.7, z=0.863076923076923 + x=0.796164870262146, y=0.7, z=1.03875386714935 }, { - x=0.739999999999999, y=0.7, z=0.933846153846154 + x=1.71353626251221, y=0.7, z=0.967856585979462 } }, -- Land 4 { { @@ -49,39 +49,39 @@ posMap = { } }, -- Land 6 { { - x=-0.323076923076923, y=0.7, z=-0.790769230769231 + x=-0.38404992222786, y=0.7, z=-0.85864245891571 }, { x=-0.669230769230769, y=0.7, z=-0.607692307692308 }, { - x=-0.709230769230769, y=0.7, z=-0.790769230769231 + x=-0.679556787014008, y=0.7, z=-0.670551598072052 }, { - x=-0.811671733856201, y=0.7, z=-0.364942520856857 + x=-0.898112595081329, y=0.7, z=-0.449047267436981 } }, -- Land 7 { { - x=-0.753846153846154, y=0.7, z=0.5 + x=-0.799152076244354, y=0.7, z=0.607852935791016 }, { - x=-0.830769230769231, y=0.7, z=0.204615384615384 + x=-0.97474730014801, y=0.7, z=0.322272658348084 }, { - x=-0.575384615384616, y=0.7, z=0.807692307692308 + x=-1.22922313213348, y=0.7, z=0.0367842726409435 }, { - x=-1.12923076923077, y=0.7, z=-0.0246153846153852 + x=-0.606918394565582, y=0.7, z=0.917128384113312 } }, -- Land 8 { { - x=-1.28461538461539, y=0.7, z=-0.896923076923078 + x=-1.5799115896225, y=0.7, z=-0.956137359142303 }, { - x=-1.53230769230769, y=0.7, z=-0.947692307692308 + x=-1.30842888355255, y=0.7, z=-0.908494770526886 }, { - x=-1.27076923076923, y=0.7, z=-1.17076923076923 + x=-1.40648984909058, y=0.7, z=-0.661517143249512 }, { - x=-1.79538461538462, y=0.7, z=-0.987692307692308 + x=-1.56786823272705, y=0.7, z=-1.19445610046387 }, { - x=-1.03230769230769, y=0.7, z=-0.781538461538462 + x=-1.2516952753067, y=0.7, z=-1.1953284740448 }, { - x=-1.00153846153846, y=0.7, z=-1.02461538461539 + x=-1.88103914260864, y=0.7, z=-1.03520464897156 }, { - x=-1.28461538461539, y=0.7, z=-0.64923076923077 + x=-1.08243036270142, y=0.7, z=-0.909557938575745 } } } pieceMap = { { "Dahan" }, { "City" }, { "Dahan" , "Dahan" }, { "Box Blight" }, {}, { "Town" }, { "Dahan" }, { "Dahan" , "Dahan" } } diff --git a/objects/1f095d/contained/451b0e/object.json b/objects/1f095d/contained/451b0e/object.json index 1f82fe423..847efe5f7 100644 --- a/objects/1f095d/contained/451b0e/object.json +++ b/objects/1f095d/contained/451b0e/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": 105.61979675292969, - "posY": 2.344899892807007, - "posZ": 38.24209976196289, + "posX": -164.40699768066406, + "posY": 1.2882000207901, + "posZ": 133.6710968017578, "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "A", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173049727/ED8C799A5F30403BE8B266276A0D22C2871AA2C1/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245056835/6AD4A0AD972B5E1E9F068D15564B26CAB74316A5/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -52,5 +52,25 @@ "StandUp": false, "Stackable": false } - } + }, + "AttachedDecals": [ + { + "Transform": { + "posX": 1.7171000242233276, + "posY": 0.20749999582767487, + "posZ": 0.0625, + "rotX": 90.0, + "rotY": 179.60470581054688, + "rotZ": 0.0, + "scaleX": 0.2696000039577484, + "scaleY": 0.266400009393692, + "scaleZ": 1.7716000080108643 + }, + "CustomDecal": { + "Name": "Dirty 2 Boat", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245362039/488B18C9D38481BDE5A13B0001D297437884D699/", + "Size": 1.0 + } + } + ] } diff --git a/objects/1f095d/contained/451b0e/script.lua b/objects/1f095d/contained/451b0e/script.lua index 61130ece6..f5ce36ddf 100644 --- a/objects/1f095d/contained/451b0e/script.lua +++ b/objects/1f095d/contained/451b0e/script.lua @@ -11,27 +11,27 @@ posMap = { } }, -- Land 2 { { - x=1.03230769230769, y=0.7, z=-0.0692307692307697 + x=1.19043374061584, y=0.7, z=-0.127509549260139 }, { - x=0.930769230769231, y=0.7, z=0.206153846153846 + x=1.02029383182526, y=0.7, z=0.183003976941109 }, { - x=1.26461538461538, y=0.7, z=0.232307692307692 + x=1.33722579479218, y=0.7, z=0.211051315069199 }, { - x=0.926153846153846, y=0.7, z=-0.375384615384616 + x=1.03024351596832, y=0.7, z=-0.412251114845276 }, { - x=1.01846153846154, y=0.7, z=0.481538461538461 + x=1.43348228931427, y=0.7, z=0.475611567497253 }, { - x=1.30923076923077, y=0.7, z=0.489230769230769 + x=1.0903844833374, y=0.7, z=0.503891587257385 } }, -- Land 3 { { - x=1.23230769230769, y=0.7, z=0.887692307692307 + x=1.68459141254425, y=0.7, z=0.953367233276367 }, { - x=1.56615384615385, y=0.7, z=0.855384615384615 + x=1.35076546669006, y=0.7, z=0.985692143440247 }, { - x=0.950769230769231, y=0.7, z=0.916923076923077 + x=1.03999745845795, y=0.7, z=1.08481800556183 }, { - x=1.83076923076923, y=0.7, z=0.833846153846154 + x=2.04466986656189, y=0.7, z=0.983274281024933 } }, -- Land 4 { { @@ -59,27 +59,27 @@ posMap = { } }, -- Land 7 { { - x=-0.829230769230769, y=0.7, z=0.536923076923077 + x=-0.864366292953491, y=0.7, z=0.533630311489105 }, { - x=-1.10153846153846, y=0.7, z=0.387692307692307 + x=-1.17277193069458, y=0.7, z=0.411366730928421 }, { - x=-0.847692307692308, y=0.7, z=0.253846153846154 + x=-0.990218997001648, y=0.7, z=0.175435319542885 }, { - x=-1.08769230769231, y=0.7, z=0.0661538461538461 + x=-1.23529231548309, y=0.7, z=-0.0713538601994514 }, { - x=-0.598461538461539, y=0.7, z=0.826153846153846 + x=-0.759929656982422, y=0.7, z=0.782618939876556 }, { - x=-1.18615384615385, y=0.7, z=-0.18923076923077 + x=-0.60497260093689, y=0.7, z=1.05018043518066 } }, -- Land 8 { { - x=-1.05076923076923, y=0.7, z=-0.727692307692308 + x=-1.08048045635223, y=0.7, z=-0.763587296009064 }, { - x=-1.33076923076923, y=0.7, z=-0.738461538461539 + x=-1.39759528636932, y=0.7, z=-0.692142009735107 }, { - x=-1.06615384615385, y=0.7, z=-1.01692307692308 + x=-1.16707873344421, y=0.7, z=-1.06396245956421 }, { - x=-1.36923076923077, y=0.7, z=-1.02307692307692 + x=-1.51574611663818, y=0.7, z=-1.01089406013489 } } } pieceMap = { {}, { "Dahan" , "City" }, { "Dahan" , "Dahan" }, { "Box Blight" }, {}, { "Dahan" }, { "Dahan" , "Dahan" }, { "Town" } } diff --git a/objects/1f095d/contained/477cef/object.json b/objects/1f095d/contained/477cef/object.json index 94eecf508..2a6bbf505 100644 --- a/objects/1f095d/contained/477cef/object.json +++ b/objects/1f095d/contained/477cef/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": 109.6624984741211, - "posY": 2.9163999557495117, - "posZ": 39.450401306152344, + "posX": -135.210205078125, + "posY": 1.2074999809265137, + "posZ": 114.56050109863281, "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "F", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173050275/ABC6A538F595F82E657060369394A54A4BC97217/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245063314/89E499AE330BCA1C35FDEC9A36413FDAAD5B21CA/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -52,5 +52,25 @@ "StandUp": false, "Stackable": false } - } + }, + "AttachedDecals": [ + { + "Transform": { + "posX": 1.7648999691009521, + "posY": 0.20749999582767487, + "posZ": 0.11649999767541885, + "rotX": 90.0, + "rotY": 178.50759887695312, + "rotZ": 0.0, + "scaleX": 0.2696000039577484, + "scaleY": 0.266400009393692, + "scaleZ": 1.7716000080108643 + }, + "CustomDecal": { + "Name": "Dirty 2 Boat", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245362039/488B18C9D38481BDE5A13B0001D297437884D699/", + "Size": 1.0 + } + } + ] } diff --git a/objects/1f095d/contained/477cef/script.lua b/objects/1f095d/contained/477cef/script.lua index b79f2b320..8aa9d0591 100644 --- a/objects/1f095d/contained/477cef/script.lua +++ b/objects/1f095d/contained/477cef/script.lua @@ -1,37 +1,37 @@ posMap = { -- Land 1 { { - x=0.575384615384615, y=0.7, z=-1.00461538461538 + x=0.295414686203003, y=0.7, z=-1.00435209274292 }, { - x=0.263076923076922, y=0.7, z=-0.930769230769231 + x=0.579348504543304, y=0.7, z=-0.911259710788727 }, { - x=0.0046153846153837, y=0.7, z=-0.883076923076923 + x=0.482561528682709, y=0.7, z=-1.17598521709442 }, { - x=0.512307692307692, y=0.7, z=-0.76 + x=0.805809795856476, y=0.7, z=-0.754437744617462 }, { - x=0.77076923076923, y=0.7, z=-0.752307692307692 + x=-0.0184904970228672, y=0.7, z=-0.942664802074432 } }, -- Land 2 { { - x=0.647692307692307, y=0.7, z=-0.0123076923076923 + x=0.647685527801514, y=0.7, z=-0.0122667727991939 }, { - x=0.916923076923077, y=0.7, z=-0.163076923076923 + x=0.921342968940735, y=0.7, z=-0.139816775918007 }, { - x=0.575384615384615, y=0.7, z=-0.332307692307692 + x=1.22286033630371, y=0.7, z=-0.0462367013096809 }, { - x=0.929230769230769, y=0.7, z=0.161538461538462 + x=0.963801205158234, y=0.7, z=0.218193352222443 }, { - x=0.586153846153845, y=0.7, z=0.333846153846154 + x=0.594713687896729, y=0.7, z=-0.333373308181763 } }, -- Land 3 { { - x=1.32153846153846, y=0.7, z=0.973846153846154 + x=1.37460446357727, y=0.7, z=0.955753207206726 }, { - x=1.32769230769231, y=0.7, z=0.646153846153846 + x=1.70484983921051, y=0.7, z=0.793865740299225 }, { - x=1.02, y=0.7, z=0.701538461538462 + x=1.36191964149475, y=0.7, z=0.693762540817261 }, { - x=1.62769230769231, y=0.7, z=0.846153846153846 + x=1.6341518163681, y=0.7, z=1.09400510787964 } }, -- Land 4 { { @@ -49,37 +49,37 @@ posMap = { } }, -- Land 6 { { - x=-0.94923076923077, y=0.7, z=-0.763076923076923 + x=-0.740380048751831, y=0.7, z=-1.03215658664703 }, { - x=-0.956923076923078, y=0.7, z=-1.04615384615385 + x=-1.00525140762329, y=0.7, z=-0.804748952388763 }, { - x=-1.25230769230769, y=0.7, z=-1.12615384615385 + x=-1.06817591190338, y=0.7, z=-1.10275602340698 }, { - x=-0.62923076923077, y=0.7, z=-0.983076923076923 + x=-0.655937016010284, y=0.7, z=-0.753069221973419 }, { - x=-0.624615384615385, y=0.7, z=-0.712307692307692 + x=-1.38093650341034, y=0.7, z=-1.2572193145752 } }, -- Land 7 { { - x=-0.581538461538462, y=0.7, z=0.746153846153846 + x=-0.576253354549408, y=0.7, z=0.830743372440338 }, { - x=-0.756923076923077, y=0.7, z=0.498461538461539 + x=-0.818668305873871, y=0.7, z=0.655832827091217 }, { - x=-1.04923076923077, y=0.7, z=0.512307692307692 + x=-1.1601140499115, y=0.7, z=0.397607058286667 }, { - x=-0.473846153846155, y=0.7, z=1.00153846153846 + x=-0.460329174995422, y=0.7, z=1.10328960418701 }, { - x=-1.08615384615385, y=0.7, z=0.275384615384615 + x=-1.1076819896698, y=0.7, z=0.660956501960754 } }, -- Land 8 { { - x=-1.02, y=0.7, z=-0.221538461538461 + x=-1.02000176906586, y=0.7, z=-0.221510708332062 }, { - x=-1.24461538461539, y=0.7, z=-0.495384615384616 + x=-1.34112560749054, y=0.7, z=-0.129982471466064 }, { - x=-0.772307692307693, y=0.7, z=0.0292307692307693 + x=-1.35712480545044, y=0.7, z=-0.514423251152039 }, { - x=-1.63846153846154, y=0.7, z=-0.958461538461539 + x=-1.60705816745758, y=0.7, z=-0.83261501789093 } } } pieceMap = { { "Dahan" , "Dahan" }, { "City" }, { "Dahan" }, { "Box Blight" }, { "Dahan" }, { "Dahan", "Dahan" }, {}, {"Town" } } diff --git a/objects/1f095d/contained/524150/object.json b/objects/1f095d/contained/524150/object.json index 475568ab4..72a7c2437 100644 --- a/objects/1f095d/contained/524150/object.json +++ b/objects/1f095d/contained/524150/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": 110.48590087890625, - "posY": 2.1747000217437744, - "posZ": 40.24980163574219, + "posX": -76.1958999633789, + "posY": 1.2889000177383423, + "posZ": 133.7957000732422, "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "D", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173050115/BDCB4D53B81F945AB7126C8D9986F15FD6642252/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245061067/615CED9200F4FC7C2C26F9277C5DDCA686D81C76/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -52,5 +52,25 @@ "StandUp": false, "Stackable": false } - } + }, + "AttachedDecals": [ + { + "Transform": { + "posX": 1.7344000339508057, + "posY": 0.20749999582767487, + "posZ": 0.09260000288486481, + "rotX": 90.0, + "rotY": 179.48060607910156, + "rotZ": 0.0, + "scaleX": 0.2696000039577484, + "scaleY": 0.266400009393692, + "scaleZ": 1.7716000080108643 + }, + "CustomDecal": { + "Name": "Dirty 2 Boat", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245362039/488B18C9D38481BDE5A13B0001D297437884D699/", + "Size": 1.0 + } + } + ] } diff --git a/objects/1f095d/contained/524150/script.lua b/objects/1f095d/contained/524150/script.lua index d7349e269..0afd62fa9 100644 --- a/objects/1f095d/contained/524150/script.lua +++ b/objects/1f095d/contained/524150/script.lua @@ -1,37 +1,37 @@ posMap = { -- Land 1 { { - x=0.206153846153846, y=0.7, z=-0.881538461538462 + x=-0.0397344194352627, y=0.7, z=-0.918821334838867 }, { - x=-0.163076923076923, y=0.7, z=-0.867692307692308 + x=0.329503178596497, y=0.7, z=-0.932651937007904 }, { - x=-0.507692307692308, y=0.7, z=-0.94923076923077 + x=0.653727054595947, y=0.7, z=-1.0581248998642 }, { - x=-0.816923076923077, y=0.7, z=-1.03538461538462 + x=-0.444588482379913, y=0.7, z=-0.959595084190369 }, { - x=0.579999999999999, y=0.7, z=-0.903076923076923 + x=-0.837849140167236, y=0.7, z=-1.06302523612976 } }, -- Land 2 { { - x=0.713846153846154, y=0.7, z=-0.0876923076923077 + x=0.713842570781708, y=0.7, z=-0.0876922234892845 }, { - x=1.05846153846154, y=0.7, z=-0.0569230769230771 + x=1.00999987125397, y=0.7, z=0.305886685848236 }, { - x=0.766153846153846, y=0.7, z=0.276923076923077 + x=1.09564077854156, y=0.7, z=-0.0525706596672535 }, { - x=1.12615384615385, y=0.7, z=0.304615384615385 + x=0.887426018714905, y=0.7, z=-0.408061861991882 }, { - x=0.618461538461538, y=0.7, z=-0.42 + x=1.29327094554901, y=0.7, z=0.27456995844841 }, { - x=0.952307692307692, y=0.7, z=-0.4 + x=0.71928608417511, y=0.7, z=0.292653679847717 } }, -- Land 3 { { - x=1.43076923076923, y=0.7, z=1.02 + x=1.39293324947357, y=0.7, z=1.01535642147064 }, { - x=1.57230769230769, y=0.7, z=0.736923076923077 + x=1.8665759563446, y=0.7, z=0.972501158714294 }, { - x=1.22769230769231, y=0.7, z=0.747692307692308 + x=1.57639253139496, y=0.7, z=0.820593297481537 } }, -- Land 4 { { @@ -61,27 +61,27 @@ posMap = { } }, -- Land 7 { { - x=-0.861538461538462, y=0.7, z=-0.0307692307692307 + x=-0.920684278011322, y=0.7, z=-0.0729885846376419 }, { - x=-1.15076923076923, y=0.7, z=0.0 + x=-1.03217172622681, y=0.7, z=-0.329989820718765 }, { - x=-0.912307692307692, y=0.7, z=-0.295384615384616 + x=-1.15077340602875, y=0.7, z=-2.54394376497658E-06 }, { - x=-0.792307692307692, y=0.7, z=-0.58 + x=-0.859705805778503, y=0.7, z=-0.589296221733093 }, { - x=-1.15076923076923, y=0.7, z=-0.19 + x=-1.2080944776535, y=0.7, z=0.301689088344574 } }, -- Land 8 { { - x=-1.13692307692308, y=0.7, z=-0.758461538461538 + x=-1.49647307395935, y=0.7, z=-0.837458968162537 }, { - x=-1.40153846153846, y=0.7, z=-0.773846153846154 + x=-1.72015154361725, y=0.7, z=-1.07035875320435 }, { - x=-1.48, y=0.7, z=-1.02461538461538 + x=-1.23478174209595, y=0.7, z=-0.918381690979004 }, { - x=-1.78615384615385, y=0.7, z=-0.989230769230769 + x=-1.32417607307434, y=0.7, z=-0.570079624652863 }, { - x=-1.27846153846154, y=0.7, z=-0.516923076923077 + x=-1.98431897163391, y=0.7, z=-1.05675113201141 } } } pieceMap = { { "Dahan" , "Dahan" }, { "City" , "Dahan" }, {}, {}, { "Dahan" , "Box Blight" }, {}, { "Town" , "Dahan" , "Dahan" }, {} } diff --git a/objects/1f095d/contained/f822e5/object.json b/objects/1f095d/contained/f822e5/object.json index bdc0638b2..f21b40bf4 100644 --- a/objects/1f095d/contained/f822e5/object.json +++ b/objects/1f095d/contained/f822e5/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": 149.3677978515625, - "posY": 2.5100998878479004, - "posZ": 39.70790100097656, + "posX": -76.8230972290039, + "posY": 1.2074999809265137, + "posZ": 114.5696029663086, "rotX": 0.0, - "rotY": 180.00180053710938, + "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "H", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2050879843778159681/F2218563E33276F8D515FC9084104E8DE3445FDC/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245065090/10EA39780A41780BC36D19AD5EAAA0D11B04E194/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -52,5 +52,25 @@ "StandUp": false, "Stackable": false } - } + }, + "AttachedDecals": [ + { + "Transform": { + "posX": 1.7354999780654907, + "posY": 0.20749999582767487, + "posZ": 0.09769999980926514, + "rotX": 90.0, + "rotY": 179.1656036376953, + "rotZ": 0.0, + "scaleX": 0.2696000039577484, + "scaleY": 0.266400009393692, + "scaleZ": 1.7716000080108643 + }, + "CustomDecal": { + "Name": "Dirty 2 Boat", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245362039/488B18C9D38481BDE5A13B0001D297437884D699/", + "Size": 1.0 + } + } + ] } diff --git a/objects/1f095d/contained/f822e5/script.lua b/objects/1f095d/contained/f822e5/script.lua index 98fa4843b..558e81335 100644 --- a/objects/1f095d/contained/f822e5/script.lua +++ b/objects/1f095d/contained/f822e5/script.lua @@ -1,91 +1,101 @@ posMap = { -- Land 1 { { - x=-0.344038576, y=0.7, z=-0.762384534 + x=0.606787502765656, y=0.7, z=-0.702788829803467 }, { - x=0.8674067, y=0.7, z=-0.450371474 + x=0.889944970607758, y=0.7, z=-0.793093204498291 }, { - x=0.6699971, y=0.7, z=-0.9061058 + x=0.365371346473694, y=0.7, z=-0.925653398036957 }, { - x=0.225898162, y=0.7, z=-0.84858 + x=0.678611159324646, y=0.7, z=-1.06899225711823 +}, { + x=0.0452758856117725, y=0.7, z=-0.984942853450775 } }, -- Land 2 { { - x=1.2371726, y=0.7, z=0.390213519 + x=1.20251607894897, y=0.7, z=0.0234557203948498 +}, { + x=0.890212953090668, y=0.7, z=0.0598223209381104 }, { - x=0.9733116, y=0.7, z=0.464436561 + x=0.916922271251678, y=0.7, z=0.345370411872864 }, { - x=0.8899854, y=0.7, z=-0.0221666489 + x=1.25656294822693, y=0.7, z=0.317247331142426 }, { - x=1.1640631, y=0.7, z=0.05664577 + x=0.913507044315338, y=0.7, z=-0.199875220656395 }, { - x=0.8372602, y=0.7, z=0.2667543 + x=0.631202518939972, y=0.7, z=-0.0104367239400744 } }, -- Land 3 { { - x=1.61211181, y=0.7, z=0.915966868 + x=1.65275514125824, y=0.7, z=0.971570491790771 +}, { + x=1.3871248960495, y=0.7, z=0.834771275520325 }, { - x=0.84078294, y=0.7, z=0.7562717 + x=1.07886910438538, y=0.7, z=0.918640792369843 }, { - x=1.18173933, y=0.7, z=1.02816975 + x=1.38530015945435, y=0.7, z=1.16758489608765 } }, -- Land 4 { { - x=-0.5011906, y=0.7, z=0.9974738 + x=-0.338775515556335, y=0.7, z=0.910422623157501 }, { - x=-0.000335643534, y=0.7, z=0.80473 + x=-0.0500571057200432, y=0.7, z=0.806999027729034 }, { - x=-0.521644652, y=0.7, z=0.5834986 + x=-0.625546097755432, y=0.7, z=0.814426004886627 }, { - x=0.423514962, y=0.7, z=0.845947146 + x=-0.55334597826004, y=0.7, z=1.12422406673431 +}, { + x=0.260001927614212, y=0.7, z=0.901102125644684 } }, -- Land 5 { { - x=-0.465799868, y=0.7, z=0.145581529 + x=0.428826212882996, y=0.7, z=0.50605696439743 +}, { + x=0.217282578349113, y=0.7, z=0.246988505125046 }, { - x=0.314012825, y=0.7, z=0.365963 + x=-0.122900731861591, y=0.7, z=0.189754694700241 }, { - x=-0.0437099747, y=0.7, z=0.267948568 + x=-0.440019398927689, y=0.7, z=0.312062829732895 } }, -- Land 6 { { - x=0.365040541, y=0.7, z=-0.382406473 + x=-0.00385107565671206, y=0.7, z=-0.318432807922363 }, { - x=0.00497957552, y=0.7, z=-0.492247462 + x=-0.296396046876907, y=0.7, z=-0.351993322372437 }, { - x=-0.348455459, y=0.7, z=-0.2758032 + x=-0.109612546861172, y=0.7, z=-0.599950432777405 }, { - x=-0.649190247, y=0.7, z=-0.321999341 + x=0.224599227309227, y=0.7, z=-0.460850477218628 }, { - x=0.45613423, y=0.7, z=-0.06350146 + x=-0.608102083206177, y=0.7, z=-0.364467889070511 } }, -- Land 7 { { - x=-1.26171243, y=0.7, z=-0.241281465 + x=-1.03838932514191, y=0.7, z=-0.0704759582877159 }, { - x=-1.06307125, y=0.7, z=0.372014672 + x=-1.23839235305786, y=0.7, z=0.188561633229256 }, { - x=-1.08768475, y=0.7, z=0.0969993845 + x=-1.37852764129639, y=0.7, z=-0.192327216267586 }, { - x=-1.0260433, y=0.7, z=-0.47474727 + x=-1.19353497028351, y=0.7, z=-0.478257477283478 }, { - x=-1.2494005, y=0.7, z=-0.5704601 + x=-0.970830738544464, y=0.7, z=0.414619773626328 } }, -- Land 8 { { - x=-0.7835812, y=0.7, z=-0.755513251 + x=-1.14766108989716, y=0.7, z=-0.960133850574493 }, { - x=-0.9338355, y=0.7, z=-1.02808869 + x=-1.43291211128235, y=0.7, z=-1.01894247531891 }, { - x=-1.68357253, y=0.7, z=-0.9529828 + x=-1.25582635402679, y=0.7, z=-1.20624983310699 }, { - x=-1.45530355, y=0.7, z=-0.8734425 + x=-0.933460652828217, y=0.7, z=-1.11064803600311 }, { - x=-1.43194914, y=0.7, z=-1.11343491 + x=-1.75487339496613, y=0.7, z=-0.972771883010864 }, { - x=-1.16429842, y=0.7, z=-1.15231454 + x=-0.872244834899902, y=0.7, z=-0.814574241638184 }, { - x=-1.158073, y=0.7, z=-0.924259841 + x=-1.57989311218262, y=0.7, z=-1.23021709918976 } } } pieceMap = { { "Dahan" }, { "City" }, { "Dahan" }, {}, { "Box Blight" }, { "Dahan" , "Dahan" }, { "Town" }, { "Dahan" , "Dahan" } } diff --git a/objects/1f095d/object.json b/objects/1f095d/object.json index e3350f175..892fdab62 100644 --- a/objects/1f095d/object.json +++ b/objects/1f095d/object.json @@ -69,14 +69,14 @@ "Name": "Custom_Token", "Transform": { "posX": 0.0, - "posY": 0.6625000238418579, + "posY": 0.0, "posZ": 0.0, "rotX": 0.0, "rotY": 345.0, "rotZ": 0.0, - "scaleX": 0.5382999777793884, - "scaleY": 2.2850000858306885, - "scaleZ": 0.5382999777793884 + "scaleX": 0.46129998564720154, + "scaleY": 5.472799777984619, + "scaleZ": 0.46129998564720154 }, "Nickname": "", "Description": "", @@ -106,7 +106,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173049851/20D6983DD3B1A5CA2D62BFE1AA209D90E1058D85/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245056835/6AD4A0AD972B5E1E9F068D15564B26CAB74316A5/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -123,19 +123,19 @@ "AttachedDecals": [ { "Transform": { - "posX": 0.08410000056028366, - "posY": 0.2337999939918518, - "posZ": -0.014800000004470348, + "posX": -0.0348999984562397, + "posY": 0.2126999944448471, + "posZ": -0.018799999728798866, "rotX": 90.0, - "rotY": 195.99960327148438, + "rotY": 195.4998016357422, "rotZ": 0.0, - "scaleX": 1.864799976348877, - "scaleY": 1.8460999727249146, - "scaleZ": 2.2565999031066895 + "scaleX": 3.511399984359741, + "scaleY": 3.4697000980377197, + "scaleZ": 1.5226999521255493 }, "CustomDecal": { - "Name": "a", - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1616219505080617822/E2AA0C5E430D8E48373022F7D00F6307B02E5E7C/", + "Name": "Dirty 2 Boat", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245362039/488B18C9D38481BDE5A13B0001D297437884D699/", "Size": 1.0 } } diff --git a/objects/22928c/object.json b/objects/22928c/object.json index 48d4db594..6a4d563e9 100644 --- a/objects/22928c/object.json +++ b/objects/22928c/object.json @@ -1,9 +1,9 @@ { "Name": "3DText", "Transform": { - "posX": -36.66001510620117, + "posX": -36.6600227355957, "posY": 0.9599999785423279, - "posZ": 47.72001647949219, + "posZ": 47.72002410888672, "rotX": 90.0, "rotY": 0.0, "rotZ": 0.0, diff --git a/objects/239d5b/object.json b/objects/239d5b/object.json index d80ee9cf4..7674116f5 100644 --- a/objects/239d5b/object.json +++ b/objects/239d5b/object.json @@ -20,8 +20,8 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.08239992707967758, - "g": 0.05879995971918106, + "r": 0.0823998972773552, + "g": 0.05879993736743927, "b": 0.03920000046491623 }, "Tags": [ diff --git a/objects/27008c/contained/5aa2d9/object.json b/objects/27008c/contained/5aa2d9/object.json index 068a026a4..d89f8f283 100644 --- a/objects/27008c/contained/5aa2d9/object.json +++ b/objects/27008c/contained/5aa2d9/object.json @@ -26,7 +26,6 @@ }, "Tags": [ "JE", - "Lower Spirit Image", "Moderate", "Spirit" ], diff --git a/objects/27008c/contained/5aa2d9/script-state.json b/objects/27008c/contained/5aa2d9/script-state.json index 316a39356..828aff0b4 100644 --- a/objects/27008c/contained/5aa2d9/script-state.json +++ b/objects/27008c/contained/5aa2d9/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.3468, + "width": 2.0213, + "x": 0.5171, + "y": -0.0983 + }, "thresholds": [ { "elements": "00000200", diff --git a/objects/2ca216/object.json b/objects/2ca216/object.json index 5d7c75127..e5312842b 100644 --- a/objects/2ca216/object.json +++ b/objects/2ca216/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.8392000198364258, "g": 0.5724999904632568, - "b": 0.39609989523887634 + "b": 0.39609983563423157 }, "Tags": [ "Uninteractable" diff --git a/objects/308a01/object.json b/objects/308a01/object.json index fb2890e6c..cd1e7b418 100644 --- a/objects/308a01/object.json +++ b/objects/308a01/object.json @@ -4,7 +4,7 @@ "posX": -50.099998474121094, "posY": 0.9299384951591492, "posZ": 46.220001220703125, - "rotX": 4.14378540369853e-08, + "rotX": -5.3198910165974667e-08, "rotY": 180.0, "rotZ": 180.0, "scaleX": 1.5299999713897705, diff --git a/objects/33c4af/object.json b/objects/33c4af/object.json index 316219562..b50f1acc5 100644 --- a/objects/33c4af/object.json +++ b/objects/33c4af/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.8392000198364258, "g": 0.5724999904632568, - "b": 0.39609989523887634 + "b": 0.39609983563423157 }, "Tags": [ "Seat", diff --git a/objects/3c6a69/contained/743f66/script-state.json b/objects/3c6a69/contained/743f66/script-state.json index ab96e3106..5e0d82738 100644 --- a/objects/3c6a69/contained/743f66/script-state.json +++ b/objects/3c6a69/contained/743f66/script-state.json @@ -25,6 +25,13 @@ } } ], + "reminder": { + "field": "ImageURL", + "height": 1.7495, + "width": 2.6258, + "x": 0.7697, + "y": -0.3929 + }, "thresholds": [ { "elements": "02020000", diff --git a/objects/3d23e1/contained/41e774/script-state.json b/objects/3d23e1/contained/41e774/script-state.json index 19513e25f..0e04739da 100644 --- a/objects/3d23e1/contained/41e774/script-state.json +++ b/objects/3d23e1/contained/41e774/script-state.json @@ -1,5 +1,12 @@ { "bonusEnergy": [], + "reminder": { + "field": "ImageURL", + "height": 1.6707, + "width": 2.5074, + "x": 0.7606, + "y": -0.3419 + }, "thresholds": [ { "elements": "00220000", diff --git a/objects/3d55c5/object.json b/objects/3d55c5/object.json index c4cd7c7da..6602389c7 100644 --- a/objects/3d55c5/object.json +++ b/objects/3d55c5/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": -49.92020034790039, - "posY": -0.10000000149011612, - "posZ": 56.71030044555664, + "posX": -50.694698333740234, + "posY": -0.7549999952316284, + "posZ": 71.43910217285156, "rotX": -0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 0.8119999766349792, + "scaleX": 0.6000000238418579, "scaleY": 1.0, - "scaleZ": 0.8119999766349792 + "scaleZ": 0.6000000238418579 }, "Nickname": "NORMAL E", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173050185/2C44D3FC1F0B51E31FD954D041797DAFDDFC1BFF/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245062231/7F2066071470CFC4C79AC8A2C720B5682D999EC8/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/416644/contained/240d50/script-state.json b/objects/416644/contained/240d50/script-state.json index 6738e5ff9..eb58013c1 100644 --- a/objects/416644/contained/240d50/script-state.json +++ b/objects/416644/contained/240d50/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageURL", + "height": 1.6714, + "width": 2.5084, + "x": 0.7524, + "y": -0.3546 + }, "thresholds": [ { "elements": "10000220", diff --git a/objects/45e367/contained/bd2a4a/object.json b/objects/45e367/contained/bd2a4a/object.json index 35ea622bc..a948abf1b 100644 --- a/objects/45e367/contained/bd2a4a/object.json +++ b/objects/45e367/contained/bd2a4a/object.json @@ -27,7 +27,6 @@ "Tags": [ "Base", "Low", - "Lower Spirit Image", "Spirit" ], "LayoutGroupSortIndex": 0, @@ -159,7 +158,6 @@ "Tags": [ "Base", "Low", - "Lower Spirit Image", "Spirit" ], "LayoutGroupSortIndex": 0, @@ -189,7 +187,7 @@ } }, "LuaScript": "-- Spirit Panel for MJ & iakona's Spirit Island Mod --\nuseProgression = false\nuseAspect = 2\n\nfunction onLoad(saved_data)\n Color.Add(\"SoftBlue\", Color.new(0.53,0.92,1))\n Color.Add(\"SoftYellow\", Color.new(1,0.8,0.5))\n getObjectFromGUID(\"SourceSpirit\").call(\"load\", {obj = self, saved_data = saved_data})\nend", - "LuaScriptState": "{\"thresholds\": [{\"elements\": \"02100000\", \"position\": {\"x\": 0.34, \"y\": 0, \"z\": 0.44}}, {\"elements\": \"03200000\", \"position\": {\"x\": 0.34, \"y\": 0, \"z\": 0.56}}, {\"elements\": \"04320000\", \"position\": {\"x\": 0.34, \"y\": 0, \"z\": 0.69}}], \"trackEnergy\": [{\"count\": 7, \"position\": {\"x\": -0.92, \"y\": 0, \"z\": -0.4}}, {\"count\": 6, \"position\": {\"x\": -0.69, \"y\": 0, \"z\": -0.41}}, {\"count\": 5, \"position\": {\"x\": -0.48, \"y\": 0, \"z\": -0.4}}, {\"count\": 4, \"position\": {\"x\": -0.25, \"y\": 0, \"z\": -0.41}}, {\"count\": 2, \"position\": {\"x\": -0.03, \"y\": 0, \"z\": -0.4}}, {\"count\": 1, \"position\": {\"x\": 0.2, \"y\": 0, \"z\": -0.4}}]}", + "LuaScriptState": "{\"reminder\":{\"field\":\"ImageSecondaryURL\",\"height\":1.51109801983961,\"width\":2.26891583157023,\"x\":0.511900388092855,\"y\":0.290799897803623},\"thresholds\":[{\"elements\":\"02100000\",\"position\":{\"x\":0.34,\"y\":0,\"z\":0.44}},{\"elements\":\"03200000\",\"position\":{\"x\":0.34,\"y\":0,\"z\":0.56}},{\"elements\":\"04320000\",\"position\":{\"x\":0.34,\"y\":0,\"z\":0.69}}],\"trackEnergy\":[{\"count\":7,\"position\":{\"x\":-0.92,\"y\":0,\"z\":-0.4}},{\"count\":6,\"position\":{\"x\":-0.69,\"y\":0,\"z\":-0.41}},{\"count\":5,\"position\":{\"x\":-0.48,\"y\":0,\"z\":-0.4}},{\"count\":4,\"position\":{\"x\":-0.25,\"y\":0,\"z\":-0.41}},{\"count\":2,\"position\":{\"x\":-0.03,\"y\":0,\"z\":-0.4}},{\"count\":1,\"position\":{\"x\":0.2,\"y\":0,\"z\":-0.4}}]}", "XmlUI": "", "AttachedSnapPoints": [ { diff --git a/objects/45e367/contained/bd2a4a/script-state.json b/objects/45e367/contained/bd2a4a/script-state.json index e9faef454..52a0ee7a5 100644 --- a/objects/45e367/contained/bd2a4a/script-state.json +++ b/objects/45e367/contained/bd2a4a/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.5111, + "width": 2.2679, + "x": 0.5119, + "y": 0.2908 + }, "thresholds": [ { "elements": "02100000", diff --git a/objects/472723/contained/14aabe/script-state.json b/objects/472723/contained/14aabe/script-state.json index 3a1090dc9..5ee9eb5b1 100644 --- a/objects/472723/contained/14aabe/script-state.json +++ b/objects/472723/contained/14aabe/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.3977, + "width": 2.0977, + "x": 0.5477, + "y": -0.1394 + }, "thresholds": [ { "elements": "01120000", diff --git a/objects/476241/contained/468673/script-state.json b/objects/476241/contained/468673/script-state.json index 56b677e1e..777c44e1c 100644 --- a/objects/476241/contained/468673/script-state.json +++ b/objects/476241/contained/468673/script-state.json @@ -1,5 +1,12 @@ { "bonusEnergy": [], + "reminder": { + "field": "ImageURL", + "height": 2.4985, + "width": 3.7498, + "x": 0.942, + "y": -0.7513 + }, "thresholds": [ { "elements": "00100001", diff --git a/objects/47d44b/contained/72de5c/script-state.json b/objects/47d44b/contained/72de5c/script-state.json index 6d7d49e9b..7e07af900 100644 --- a/objects/47d44b/contained/72de5c/script-state.json +++ b/objects/47d44b/contained/72de5c/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.5328, + "width": 2.3006, + "x": 0.6954, + "y": -0.1096 + }, "thresholds": [ { "elements": "00100003", diff --git a/objects/4a1ff8/object.json b/objects/4a1ff8/object.json index b0e1ee8aa..f29f1be84 100644 --- a/objects/4a1ff8/object.json +++ b/objects/4a1ff8/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.0, "g": 0.7215999960899353, - "b": 0.2225998342037201 + "b": 0.22259977459907532 }, "Tags": [ "Uninteractable" diff --git a/objects/4e6aee/object.json b/objects/4e6aee/object.json index aa9f8633b..654f85c46 100644 --- a/objects/4e6aee/object.json +++ b/objects/4e6aee/object.json @@ -1,9 +1,9 @@ { "Name": "3DText", "Transform": { - "posX": -36.66001510620117, + "posX": -36.6600227355957, "posY": 0.9599999785423279, - "posZ": 45.22001647949219, + "posZ": 45.22002029418945, "rotX": 90.0, "rotY": 0.0, "rotZ": 0.0, diff --git a/objects/5247c8/object.json b/objects/5247c8/object.json index a74037efa..bda84b195 100644 --- a/objects/5247c8/object.json +++ b/objects/5247c8/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": -49.079498291015625, - "posY": -0.10000000149011612, - "posZ": 58.60820007324219, + "posX": -45.12120056152344, + "posY": -0.7549999952316284, + "posZ": 69.59420013427734, "rotX": -0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 0.8119999766349792, + "scaleX": 0.6000000238418579, "scaleY": 1.0, - "scaleZ": 0.8119999766349792 + "scaleZ": 0.6000000238418579 }, "Nickname": "NORMAL C", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173050050/0F371D1DF35AA44E0EBA967519E8778A21BD0711/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245060182/C5A69D9CCC2E748DD080FA36226E67F3DBCADC0A/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/538feb/object.json b/objects/538feb/object.json index e1e2551f2..f82700830 100644 --- a/objects/538feb/object.json +++ b/objects/538feb/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": -46.871700286865234, - "posY": -0.10000000149011612, - "posZ": 58.58190155029297, + "posX": -42.33449935913086, + "posY": -0.7549999952316284, + "posZ": 69.59420013427734, "rotX": -0.0, - "rotY": 0.0, + "rotY": 180.0, "rotZ": 0.0, - "scaleX": 0.8119999766349792, + "scaleX": 0.6000000238418579, "scaleY": 1.0, - "scaleZ": 0.8119999766349792 + "scaleZ": 0.6000000238418579 }, "Nickname": "NORMAL D", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173050115/BDCB4D53B81F945AB7126C8D9986F15FD6642252/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245061067/615CED9200F4FC7C2C26F9277C5DDCA686D81C76/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/57d9fe/object.json b/objects/57d9fe/object.json index f0bb2ae17..9eacc2ba5 100644 --- a/objects/57d9fe/object.json +++ b/objects/57d9fe/object.json @@ -1,7 +1,7 @@ { "Name": "3DText", "Transform": { - "posX": 105.1300277709961, + "posX": 105.13003540039062, "posY": 0.9599999785423279, "posZ": -0.25, "rotX": 90.0, @@ -39,7 +39,7 @@ "HideWhenFaceDown": false, "Hands": false, "Text": { - "Text": "version 4.0.4", + "Text": "version 4.1.0", "colorstate": { "r": 0.7333999872207642, "g": 0.7333999872207642, diff --git a/objects/598ecb/contained/a393e9/script-state.json b/objects/598ecb/contained/a393e9/script-state.json index 3207d59bc..c846d3746 100644 --- a/objects/598ecb/contained/a393e9/script-state.json +++ b/objects/598ecb/contained/a393e9/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.3977, + "width": 2.0977, + "x": 0.5179, + "y": -0.069 + }, "thresholds": [ { "elements": "01000020", diff --git a/objects/5c0d50/object.json b/objects/5c0d50/object.json index 7fddff616..d22eb4aa0 100644 --- a/objects/5c0d50/object.json +++ b/objects/5c0d50/object.json @@ -4,7 +4,7 @@ "posX": -46.18000030517578, "posY": 0.9973350167274475, "posZ": 46.220001220703125, - "rotX": 6.677835528989817e-08, + "rotX": 6.430520471667478e-08, "rotY": 180.0, "rotZ": 180.0, "scaleX": 1.5299999713897705, diff --git a/objects/5d4828/contained/cccbab/script-state.json b/objects/5d4828/contained/cccbab/script-state.json index 574a8d958..b6565aa00 100644 --- a/objects/5d4828/contained/cccbab/script-state.json +++ b/objects/5d4828/contained/cccbab/script-state.json @@ -1,5 +1,12 @@ { "bonusEnergy": [], + "reminder": { + "field": "ImageURL", + "height": 1.6489, + "width": 2.4704, + "x": 0.7577, + "y": -0.3239 + }, "thresholds": [ { "elements": "01000020", diff --git a/objects/6b0f27/object.json b/objects/6b0f27/object.json index e9b105ee2..2d0113b7c 100644 --- a/objects/6b0f27/object.json +++ b/objects/6b0f27/object.json @@ -20,8 +20,8 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.08239992707967758, - "g": 0.05879995971918106, + "r": 0.0823998972773552, + "g": 0.05879993736743927, "b": 0.03920000046491623 }, "Tags": [ diff --git a/objects/7019af/object.json b/objects/7019af/object.json index cf62c843f..12041bd2d 100644 --- a/objects/7019af/object.json +++ b/objects/7019af/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.89410001039505, "g": 0.8510000109672546, - "b": 0.3528998792171478 + "b": 0.35289981961250305 }, "LayoutGroupSortIndex": 0, "Value": 0, diff --git a/objects/746488/object.json b/objects/746488/object.json index 9f8fe3701..481efb847 100644 --- a/objects/746488/object.json +++ b/objects/746488/object.json @@ -1,9 +1,9 @@ { "Name": "3DText", "Transform": { - "posX": -36.66001510620117, + "posX": -36.6600227355957, "posY": 0.9599999785423279, - "posZ": 40.22001647949219, + "posZ": 40.22002410888672, "rotX": 90.0, "rotY": 0.0, "rotZ": 0.0, diff --git a/objects/759e18/object.json b/objects/759e18/object.json index 5c0807829..08aa8613b 100644 --- a/objects/759e18/object.json +++ b/objects/759e18/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": -47.681400299072266, - "posY": -0.10000000149011612, - "posZ": 56.7489013671875, + "posX": -47.907901763916016, + "posY": -0.7549999952316284, + "posZ": 71.43910217285156, "rotX": -0.0, - "rotY": 0.0, + "rotY": 180.0, "rotZ": 0.0, - "scaleX": 0.8119999766349792, + "scaleX": 0.6000000238418579, "scaleY": 1.0, - "scaleZ": 0.8119999766349792 + "scaleZ": 0.6000000238418579 }, "Nickname": "NORMAL F", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173050275/ABC6A538F595F82E657060369394A54A4BC97217/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245063314/89E499AE330BCA1C35FDEC9A36413FDAAD5B21CA/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/76f418/object.json b/objects/76f418/object.json index 43512c1cf..0476c63c7 100644 --- a/objects/76f418/object.json +++ b/objects/76f418/object.json @@ -21,7 +21,7 @@ }, "ColorDiffuse": { "r": 1.0, - "g": 0.3754998445510864, + "g": 0.37549978494644165, "b": 0.0 }, "Tags": [ diff --git a/objects/782f57/object.json b/objects/782f57/object.json index e67449c6f..d06e398a3 100644 --- a/objects/782f57/object.json +++ b/objects/782f57/object.json @@ -20,8 +20,8 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.08239992707967758, - "g": 0.05879995971918106, + "r": 0.0823998972773552, + "g": 0.05879993736743927, "b": 0.03920000046491623 }, "Tags": [ diff --git a/objects/794c81/object.json b/objects/794c81/object.json index ee640283d..fbe51b74f 100644 --- a/objects/794c81/object.json +++ b/objects/794c81/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.8392000198364258, "g": 0.5724999904632568, - "b": 0.39609989523887634 + "b": 0.39609983563423157 }, "Tags": [ "Seat", diff --git a/objects/7f1e11/object.json b/objects/7f1e11/object.json index bf75212dd..2e58bccab 100644 --- a/objects/7f1e11/object.json +++ b/objects/7f1e11/object.json @@ -3,7 +3,7 @@ "Transform": { "posX": -38.22999954223633, "posY": 0.9599999785423279, - "posZ": 45.22001647949219, + "posZ": 45.22002029418945, "rotX": 90.0, "rotY": 0.0, "rotZ": 0.0, diff --git a/objects/82c5e4/object.json b/objects/82c5e4/object.json index e9d91b102..5d8e7231a 100644 --- a/objects/82c5e4/object.json +++ b/objects/82c5e4/object.json @@ -20,8 +20,8 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.08239992707967758, - "g": 0.05879995971918106, + "r": 0.0823998972773552, + "g": 0.05879993736743927, "b": 0.03920000046491623 }, "Tags": [ diff --git a/objects/82e3c3/contained/4c061f/object.json b/objects/82e3c3/contained/4c061f/object.json index d26db4bac..0909133d5 100644 --- a/objects/82e3c3/contained/4c061f/object.json +++ b/objects/82e3c3/contained/4c061f/object.json @@ -27,7 +27,6 @@ "Tags": [ "FnF", "High", - "Lower Spirit Image", "Spirit" ], "LayoutGroupSortIndex": 0, diff --git a/objects/82e3c3/contained/4c061f/script-state.json b/objects/82e3c3/contained/4c061f/script-state.json index 245f4dd16..a053d2119 100644 --- a/objects/82e3c3/contained/4c061f/script-state.json +++ b/objects/82e3c3/contained/4c061f/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.2845, + "width": 1.9278, + "x": 0.5004, + "y": -0.0602 + }, "thresholds": [ { "elements": "00000010", diff --git a/objects/837ddf/object.json b/objects/837ddf/object.json index 65c8514a5..3589ae9fe 100644 --- a/objects/837ddf/object.json +++ b/objects/837ddf/object.json @@ -20,8 +20,8 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.08239992707967758, - "g": 0.05879995971918106, + "r": 0.0823998972773552, + "g": 0.05879993736743927, "b": 0.03920000046491623 }, "Tags": [ diff --git a/objects/87ee9c/object.json b/objects/87ee9c/object.json index 52009cbd4..5f8b64e72 100644 --- a/objects/87ee9c/object.json +++ b/objects/87ee9c/object.json @@ -1,7 +1,7 @@ { "Name": "3DText", "Transform": { - "posX": -36.66001510620117, + "posX": -36.6600227355957, "posY": 0.9599999785423279, "posZ": 42.720001220703125, "rotX": 90.0, diff --git a/objects/8a9e53/contained/92e7df/script-state.json b/objects/8a9e53/contained/92e7df/script-state.json index 50c1b6700..f240affe6 100644 --- a/objects/8a9e53/contained/92e7df/script-state.json +++ b/objects/8a9e53/contained/92e7df/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageURL", + "height": 1.6704, + "width": 2.5069, + "x": 0.7717, + "y": -0.3459 + }, "thresholds": [ { "elements": "00200200", diff --git a/objects/8aa186/object.json b/objects/8aa186/object.json index 7d26ce13b..43b16b9fa 100644 --- a/objects/8aa186/object.json +++ b/objects/8aa186/object.json @@ -4,7 +4,7 @@ "posX": -37.66999816894531, "posY": 0.8896148800849915, "posZ": 56.29999923706055, - "rotX": 4.9505953114703516e-08, + "rotX": -6.480633629735166e-08, "rotY": 180.0, "rotZ": 180.0, "scaleX": 1.098099946975708, diff --git a/objects/8f11a0/object.json b/objects/8f11a0/object.json index 3a440f913..5fe71dfa9 100644 --- a/objects/8f11a0/object.json +++ b/objects/8f11a0/object.json @@ -1,7 +1,7 @@ { "Name": "3DText", "Transform": { - "posX": 105.1300277709961, + "posX": 105.13003540039062, "posY": 0.9599999785423279, "posZ": -1.1699999570846558, "rotX": 90.0, diff --git a/objects/901e41/object.json b/objects/901e41/object.json index 25dd7f711..79e771fe9 100644 --- a/objects/901e41/object.json +++ b/objects/901e41/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.8391000032424927, "g": 0.5720000267028809, - "b": 0.39709988236427307 + "b": 0.3970998227596283 }, "Tags": [ "Uninteractable" diff --git a/objects/969897/object.json b/objects/969897/object.json index cabc8fb9a..6e09977e8 100644 --- a/objects/969897/object.json +++ b/objects/969897/object.json @@ -4,9 +4,9 @@ "posX": -42.2599983215332, "posY": 0.8534048795700073, "posZ": 51.2599983215332, - "rotX": -1.0499470182168125e-09, + "rotX": 1.11610090058889e-08, "rotY": 180.0, - "rotZ": -2.325084658139076e-08, + "rotZ": -2.0215928486777557e-08, "scaleX": 1.531999945640564, "scaleY": 1.0, "scaleZ": 1.531999945640564 diff --git a/objects/9802f8/object.json b/objects/9802f8/object.json index b13faafb4..466b57f69 100644 --- a/objects/9802f8/object.json +++ b/objects/9802f8/object.json @@ -3,7 +3,7 @@ "Transform": { "posX": -40.25, "posY": 0.9599999785423279, - "posZ": 40.22001647949219, + "posZ": 40.22002410888672, "rotX": 90.0, "rotY": 0.0, "rotZ": 0.0, diff --git a/objects/985c7c/contained/33a1d8/script-state.json b/objects/985c7c/contained/33a1d8/script-state.json index 7624ab0cc..3debc37c8 100644 --- a/objects/985c7c/contained/33a1d8/script-state.json +++ b/objects/985c7c/contained/33a1d8/script-state.json @@ -1,5 +1,12 @@ { "bonusEnergy": [], + "reminder": { + "field": "ImageURL", + "height": 1.6464, + "width": 2.471, + "x": 0.7505, + "y": -0.3389 + }, "thresholds": [ { "elements": "00001000", diff --git a/objects/9d6d46/contained/b35fd5/script-state.json b/objects/9d6d46/contained/b35fd5/script-state.json index 486a4b42c..6ea2bff81 100644 --- a/objects/9d6d46/contained/b35fd5/script-state.json +++ b/objects/9d6d46/contained/b35fd5/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageURL", + "height": 1.7227, + "width": 2.5855, + "x": 0.7941, + "y": -0.3761 + }, "thresholds": [ { "elements": "02000000", diff --git a/objects/BalancedMapBag/contained/2f2f8a/object.json b/objects/BalancedMapBag/contained/2f2f8a/object.json index e43d04c20..c0e8e365d 100644 --- a/objects/BalancedMapBag/contained/2f2f8a/object.json +++ b/objects/BalancedMapBag/contained/2f2f8a/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": -48.9651985168457, - "posY": 1.4567999839782715, - "posZ": 53.78860092163086, + "posX": 110.04900360107422, + "posY": 1.6195000410079956, + "posZ": -11.218400001525879, "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "B", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173049851/20D6983DD3B1A5CA2D62BFE1AA209D90E1058D85/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245059248/465BF72B0A091AFFD64731757DBB55430D574CA0/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/BalancedMapBag/contained/2f2f8a/script.lua b/objects/BalancedMapBag/contained/2f2f8a/script.lua index e506ff095..5c499aa57 100644 --- a/objects/BalancedMapBag/contained/2f2f8a/script.lua +++ b/objects/BalancedMapBag/contained/2f2f8a/script.lua @@ -11,25 +11,25 @@ posMap = { } }, -- Land 2 { { - x=1.11692307692308, y=0.7, z=0.146153846153846 + x=1.21060407161713, y=0.7, z=0.135501116514206 }, { - x=0.815384615384615, y=0.7, z=0.167692307692307 + x=0.876397132873535, y=0.7, z=0.176219373941422 }, { - x=0.816923076923076, y=0.7, z=0.450769230769231 + x=1.02500343322754, y=0.7, z=-0.163170397281647 }, { - x=1.08769230769231, y=0.7, z=-0.132307692307692 + x=0.956552028656006, y=0.7, z=0.478511601686478 }, { - x=0.806153846153845, y=0.7, z=-0.121538461538461 + x=1.34336352348328, y=0.7, z=0.46575602889061 } }, -- Land 3 { { - x=1.26, y=0.7, z=0.899999999999999 + x=1.12060546875, y=0.7, z=1.03422236442566 }, { - x=0.996923076923077, y=0.7, z=0.913846153846154 + x=1.42119097709656, y=0.7, z=1.02917265892029 }, { - x=1.52, y=0.7, z=0.863076923076923 + x=0.796164870262146, y=0.7, z=1.03875386714935 }, { - x=0.739999999999999, y=0.7, z=0.933846153846154 + x=1.71353626251221, y=0.7, z=0.967856585979462 } }, -- Land 4 { { @@ -49,39 +49,39 @@ posMap = { } }, -- Land 6 { { - x=-0.323076923076923, y=0.7, z=-0.790769230769231 + x=-0.38404992222786, y=0.7, z=-0.85864245891571 }, { x=-0.669230769230769, y=0.7, z=-0.607692307692308 }, { - x=-0.709230769230769, y=0.7, z=-0.790769230769231 + x=-0.679556787014008, y=0.7, z=-0.670551598072052 }, { - x=-0.811671733856201, y=0.7, z=-0.364942520856857 + x=-0.898112595081329, y=0.7, z=-0.449047267436981 } }, -- Land 7 { { - x=-0.753846153846154, y=0.7, z=0.5 + x=-0.799152076244354, y=0.7, z=0.607852935791016 }, { - x=-0.830769230769231, y=0.7, z=0.204615384615384 + x=-0.97474730014801, y=0.7, z=0.322272658348084 }, { - x=-0.575384615384616, y=0.7, z=0.807692307692308 + x=-1.22922313213348, y=0.7, z=0.0367842726409435 }, { - x=-1.12923076923077, y=0.7, z=-0.0246153846153852 + x=-0.606918394565582, y=0.7, z=0.917128384113312 } }, -- Land 8 { { - x=-1.28461538461539, y=0.7, z=-0.896923076923078 + x=-1.5799115896225, y=0.7, z=-0.956137359142303 }, { - x=-1.53230769230769, y=0.7, z=-0.947692307692308 + x=-1.30842888355255, y=0.7, z=-0.908494770526886 }, { - x=-1.27076923076923, y=0.7, z=-1.17076923076923 + x=-1.40648984909058, y=0.7, z=-0.661517143249512 }, { - x=-1.79538461538462, y=0.7, z=-0.987692307692308 + x=-1.56786823272705, y=0.7, z=-1.19445610046387 }, { - x=-1.03230769230769, y=0.7, z=-0.781538461538462 + x=-1.2516952753067, y=0.7, z=-1.1953284740448 }, { - x=-1.00153846153846, y=0.7, z=-1.02461538461539 + x=-1.88103914260864, y=0.7, z=-1.03520464897156 }, { - x=-1.28461538461539, y=0.7, z=-0.64923076923077 + x=-1.08243036270142, y=0.7, z=-0.909557938575745 } } } pieceMap = { { "Dahan" }, { "City" }, { "Dahan" , "Dahan" }, { "Box Blight" }, {}, { "Town" }, { "Dahan" }, { "Dahan" , "Dahan" } } diff --git a/objects/BalancedMapBag/contained/34347d/object.json b/objects/BalancedMapBag/contained/34347d/object.json index f26c73cb0..0084dd0eb 100644 --- a/objects/BalancedMapBag/contained/34347d/object.json +++ b/objects/BalancedMapBag/contained/34347d/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": -47.024200439453125, - "posY": 1.597599983215332, - "posZ": 51.176300048828125, + "posX": 112.10459899902344, + "posY": 1.6096999645233154, + "posZ": -12.99120044708252, "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "D", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173050115/BDCB4D53B81F945AB7126C8D9986F15FD6642252/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245061067/615CED9200F4FC7C2C26F9277C5DDCA686D81C76/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/BalancedMapBag/contained/34347d/script.lua b/objects/BalancedMapBag/contained/34347d/script.lua index d7349e269..0afd62fa9 100644 --- a/objects/BalancedMapBag/contained/34347d/script.lua +++ b/objects/BalancedMapBag/contained/34347d/script.lua @@ -1,37 +1,37 @@ posMap = { -- Land 1 { { - x=0.206153846153846, y=0.7, z=-0.881538461538462 + x=-0.0397344194352627, y=0.7, z=-0.918821334838867 }, { - x=-0.163076923076923, y=0.7, z=-0.867692307692308 + x=0.329503178596497, y=0.7, z=-0.932651937007904 }, { - x=-0.507692307692308, y=0.7, z=-0.94923076923077 + x=0.653727054595947, y=0.7, z=-1.0581248998642 }, { - x=-0.816923076923077, y=0.7, z=-1.03538461538462 + x=-0.444588482379913, y=0.7, z=-0.959595084190369 }, { - x=0.579999999999999, y=0.7, z=-0.903076923076923 + x=-0.837849140167236, y=0.7, z=-1.06302523612976 } }, -- Land 2 { { - x=0.713846153846154, y=0.7, z=-0.0876923076923077 + x=0.713842570781708, y=0.7, z=-0.0876922234892845 }, { - x=1.05846153846154, y=0.7, z=-0.0569230769230771 + x=1.00999987125397, y=0.7, z=0.305886685848236 }, { - x=0.766153846153846, y=0.7, z=0.276923076923077 + x=1.09564077854156, y=0.7, z=-0.0525706596672535 }, { - x=1.12615384615385, y=0.7, z=0.304615384615385 + x=0.887426018714905, y=0.7, z=-0.408061861991882 }, { - x=0.618461538461538, y=0.7, z=-0.42 + x=1.29327094554901, y=0.7, z=0.27456995844841 }, { - x=0.952307692307692, y=0.7, z=-0.4 + x=0.71928608417511, y=0.7, z=0.292653679847717 } }, -- Land 3 { { - x=1.43076923076923, y=0.7, z=1.02 + x=1.39293324947357, y=0.7, z=1.01535642147064 }, { - x=1.57230769230769, y=0.7, z=0.736923076923077 + x=1.8665759563446, y=0.7, z=0.972501158714294 }, { - x=1.22769230769231, y=0.7, z=0.747692307692308 + x=1.57639253139496, y=0.7, z=0.820593297481537 } }, -- Land 4 { { @@ -61,27 +61,27 @@ posMap = { } }, -- Land 7 { { - x=-0.861538461538462, y=0.7, z=-0.0307692307692307 + x=-0.920684278011322, y=0.7, z=-0.0729885846376419 }, { - x=-1.15076923076923, y=0.7, z=0.0 + x=-1.03217172622681, y=0.7, z=-0.329989820718765 }, { - x=-0.912307692307692, y=0.7, z=-0.295384615384616 + x=-1.15077340602875, y=0.7, z=-2.54394376497658E-06 }, { - x=-0.792307692307692, y=0.7, z=-0.58 + x=-0.859705805778503, y=0.7, z=-0.589296221733093 }, { - x=-1.15076923076923, y=0.7, z=-0.19 + x=-1.2080944776535, y=0.7, z=0.301689088344574 } }, -- Land 8 { { - x=-1.13692307692308, y=0.7, z=-0.758461538461538 + x=-1.49647307395935, y=0.7, z=-0.837458968162537 }, { - x=-1.40153846153846, y=0.7, z=-0.773846153846154 + x=-1.72015154361725, y=0.7, z=-1.07035875320435 }, { - x=-1.48, y=0.7, z=-1.02461538461538 + x=-1.23478174209595, y=0.7, z=-0.918381690979004 }, { - x=-1.78615384615385, y=0.7, z=-0.989230769230769 + x=-1.32417607307434, y=0.7, z=-0.570079624652863 }, { - x=-1.27846153846154, y=0.7, z=-0.516923076923077 + x=-1.98431897163391, y=0.7, z=-1.05675113201141 } } } pieceMap = { { "Dahan" , "Dahan" }, { "City" , "Dahan" }, {}, {}, { "Dahan" , "Box Blight" }, {}, { "Town" , "Dahan" , "Dahan" }, {} } diff --git a/objects/BalancedMapBag/contained/39803e/object.json b/objects/BalancedMapBag/contained/39803e/object.json index da4469128..234fc6278 100644 --- a/objects/BalancedMapBag/contained/39803e/object.json +++ b/objects/BalancedMapBag/contained/39803e/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": 108.8281021118164, - "posY": 2.5141000747680664, - "posZ": 47.43989944458008, + "posX": 120.80909729003906, + "posY": 1.6123000383377075, + "posZ": -19.55069923400879, "rotX": 0.0, - "rotY": 180.01300048828125, + "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "G", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2050879843778159452/609814EA84810D27B67E97C91E441F3D4301C4B9/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245064321/45B703C37F42B0A3F9BFE48985F463335A2F97A2/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/BalancedMapBag/contained/39803e/script.lua b/objects/BalancedMapBag/contained/39803e/script.lua index ea9464064..f2627ae02 100644 --- a/objects/BalancedMapBag/contained/39803e/script.lua +++ b/objects/BalancedMapBag/contained/39803e/script.lua @@ -1,91 +1,91 @@ posMap = { -- Land 1 { { - x=0.80917275, y=0.7, z=-0.9164281 + x=0.466594159603119, y=0.7, z=-1.14484286308289 }, { - x=0.4233784, y=0.7, z=-1.089459 + x=0.786623477935791, y=0.7, z=-0.976119160652161 }, { - x=0.422714949, y=0.7, z=-0.6349831 + x=0.497543215751648, y=0.7, z=-0.803458869457245 }, { - x=0.7963159, y=0.7, z=-0.529047966 + x=0.138874843716621, y=0.7, z=-0.952580511569977 }, { - x=0.202889442, y=0.7, z=-0.871043861 + x=0.85438597202301, y=0.7, z=-0.633658885955811 } }, -- Land 2 { { - x=1.21915281, y=0.7, z=0.170175448 + x=1.19509077072144, y=0.7, z=0.271594375371933 }, { - x=0.9945905, y=0.7, z=0.444805235 + x=0.931795001029968, y=0.7, z=0.439501255750656 }, { - x=0.599481642, y=0.7, z=-0.05260679 + x=0.860804796218872, y=0.7, z=0.131175071001053 }, { - x=1.0708214, y=0.7, z=-0.125429153 + x=1.14935088157654, y=0.7, z=-0.0413709916174412 }, { - x=0.8640266, y=0.7, z=0.175323144 + x=0.796646058559418, y=0.7, z=-0.187335401773453 } }, -- Land 3 { { - x=0.8075184, y=0.7, z=1.02396584 + x=1.71144545078278, y=0.7, z=0.968284785747528 }, { - x=1.46317267, y=0.7, z=0.6971853 + x=1.43075573444366, y=0.7, z=0.803867220878601 }, { - x=1.343082, y=0.7, z=1.050841 + x=1.13463509082794, y=0.7, z=0.996527075767517 } }, -- Land 4 { { - x=0.652125, y=0.7, z=0.722644567 + x=0.452821433544159, y=0.7, z=0.769953846931458 }, { - x=-0.006116643, y=0.7, z=0.6432832 + x=0.137884795665741, y=0.7, z=0.766980588436127 }, { - x=-0.282010883, y=0.7, z=0.887872756 + x=-0.205511480569839, y=0.7, z=0.836871147155762 } }, -- Land 5 { { - x=0.111241542, y=0.7, z=-0.08834861 + x=0.0875590145587921, y=0.7, z=0.230189442634583 }, { - x=-0.349029, y=0.7, z=0.181676462 + x=-0.12455216050148, y=0.7, z=0.00516002252697945 }, { - x=0.0435770862, y=0.7, z=0.233111143 + x=-0.496069639921188, y=0.7, z=0.0407632254064083 } }, -- Land 6 { { - x=-0.572368, y=0.7, z=-1.007813 + x=0.0782995894551277, y=0.7, z=-0.458357125520706 }, { - x=-0.114140153, y=0.7, z=-0.591935158 + x=-0.266146570444107, y=0.7, z=-0.581923246383667 }, { - x=-0.965316, y=0.7, z=-0.9270013 + x=-0.588230550289154, y=0.7, z=-0.773764729499817 }, { - x=-0.5898231, y=0.7, z=-0.7269506 + x=-0.802419722080231, y=0.7, z=-1.0445202589035 } }, -- Land 7 { { - x=-0.79987514, y=0.7, z=0.205558047 + x=-0.670666992664337, y=0.7, z=0.681343972682953 }, { - x=-0.568775356, y=0.7, z=0.5836249 + x=-0.993663907051086, y=0.7, z=0.670999050140381 }, { - x=-1.10202265, y=0.7, z=0.391890436 + x=-0.803678274154663, y=0.7, z=0.430996119976044 }, { - x=-0.8030872, y=0.7, z=0.659214735 + x=-1.0688818693161, y=0.7, z=0.190717712044716 }, { - x=-0.6533989, y=0.7, z=0.8329117 + x=-1.21745133399963, y=0.7, z=0.492125064134598 }, { - x=-0.8242404, y=0.7, z=0.4558289 + x=-0.632467925548553, y=0.7, z=1.01568341255188 } }, -- Land 8 { { - x=-1.23343563, y=0.7, z=-0.46983698 + x=-1.14286923408508, y=0.7, z=-0.346533238887787 }, { - x=-0.8663316, y=0.7, z=-0.1377456 + x=-1.40311396121979, y=0.7, z=-0.644955992698669 }, { - x=-0.7249009, y=0.7, z=-0.3941193 + x=-1.60752320289612, y=0.7, z=-0.914716005325317 }, { - x=-1.2111274, y=0.7, z=-0.161169529 + x=-1.07858979701996, y=0.7, z=-0.645205497741699 }, { - x=-1.53989255, y=0.7, z=-0.9337228 + x=-1.39860618114471, y=0.7, z=-0.164565548300743 }, { - x=-1.43200219, y=0.7, z=-0.7024647 + x=-1.55108070373535, y=0.7, z=-1.19916903972626 }, { - x=-1.001844, y=0.7, z=-0.317439765 + x=-1.95678246021271, y=0.7, z=-1.0586268901825 } } } pieceMap = { { "Dahan" , "Dahan" }, { "City" }, { "Dahan" }, { "Dahan" }, { "Box Blight" }, {}, { "Dahan" , "Dahan" }, { "Town" } } diff --git a/objects/BalancedMapBag/contained/5d334c/object.json b/objects/BalancedMapBag/contained/5d334c/object.json index b98e1c601..2200ec81d 100644 --- a/objects/BalancedMapBag/contained/5d334c/object.json +++ b/objects/BalancedMapBag/contained/5d334c/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": -46.85459899902344, - "posY": 1.5547000169754028, - "posZ": 52.679298400878906, + "posX": 153.3966064453125, + "posY": 1.2128000259399414, + "posZ": -14.179300308227539, "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "C", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173050050/0F371D1DF35AA44E0EBA967519E8778A21BD0711/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245060182/C5A69D9CCC2E748DD080FA36226E67F3DBCADC0A/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/BalancedMapBag/contained/5d334c/script.lua b/objects/BalancedMapBag/contained/5d334c/script.lua index d85598dc9..54b628932 100644 --- a/objects/BalancedMapBag/contained/5d334c/script.lua +++ b/objects/BalancedMapBag/contained/5d334c/script.lua @@ -11,33 +11,33 @@ posMap = { } }, -- Land 2 { { - x=0.778461538461538, y=0.7, z=0.213846153846154 + x=0.778462469577789, y=0.7, z=0.213842749595642 }, { - x=1.16923076923077, y=0.7, z=0.216923076923077 + x=1.16923379898071, y=0.7, z=0.21691569685936 }, { - x=1.13076923076923, y=0.7, z=-0.129230769230769 + x=1.00514197349548, y=0.7, z=-0.109882481396198 }, { - x=0.786153846153846, y=0.7, z=-0.113846153846154 + x=1.28506374359131, y=0.7, z=0.489777773618698 }, { - x=0.826153846153846, y=0.7, z=0.521538461538462 + x=0.865199983119965, y=0.7, z=0.523668825626373 } }, -- Land 3 { { - x=1.48923076923077, y=0.7, z=0.901538461538462 + x=1.19798541069031, y=0.7, z=0.949151217937469 }, { - x=1.22923076923077, y=0.7, z=0.898461538461538 + x=1.55753540992737, y=0.7, z=0.923320412635803 }, { - x=0.94, y=0.7, z=0.915384615384616 + x=1.36988091468811, y=0.7, z=1.18786549568176 }, { - x=1.74769230769231, y=0.7, z=0.923076923076923 + x=1.84446823596954, y=0.7, z=1.00353193283081 } }, -- Land 4 { { - x=0.36, y=0.7, z=0.787692307692308 + x=0.360675811767578, y=0.7, z=0.800610542297363 }, { - x=-0.0953846153846155, y=0.7, z=0.796923076923077 + x=-0.374241799116135, y=0.7, z=0.954020380973816 }, { - x=-0.561538461538462, y=0.7, z=0.810769230769231 + x=0.0107099795714021, y=0.7, z=0.898428499698639 } }, -- Land 5 { { @@ -61,25 +61,25 @@ posMap = { } }, -- Land 7 { { - x=-0.787692307692308, y=0.7, z=-0.14 + x=-0.791155099868774, y=0.7, z=-0.1283058822155 }, { - x=-0.943076923076924, y=0.7, z=0.056923076923077 + x=-1.17007374763489, y=0.7, z=-0.14752721786499 }, { - x=-0.787692307692308, y=0.7, z=0.156923076923077 + x=-0.966049253940582, y=0.7, z=0.226053789258003 }, { - x=-1.04561519622803, y=0.7, z=0.367100417613983 + x=-1.20735359191895, y=0.7, z=0.444981813430786 } }, -- Land 8 { { - x=-1.50615384615385, y=0.7, z=-0.933846153846153 + x=-1.47859072685242, y=0.7, z=-0.914169609546661 }, { - x=-1.28, y=0.7, z=-0.661538461538461 + x=-1.78907954692841, y=0.7, z=-1.04244077205658 }, { - x=-1.21230769230769, y=0.7, z=-0.93076923076923 + x=-1.26716983318329, y=0.7, z=-1.19797778129578 }, { - x=-1.27230769230769, y=0.7, z=-1.19538461538462 + x=-1.55832231044769, y=0.7, z=-1.2252504825592 }, { - x=-1.79538461538462, y=0.7, z=-0.970769230769231 + x=-1.42264628410339, y=0.7, z=-0.615060031414032 } } } pieceMap = { { "Dahan" }, { "City" }, { "Dahan" , "Dahan" }, {}, { "Dahan" , "Dahan" , "Box Blight" }, { "Dahan" }, { "Town" }, {} } diff --git a/objects/BalancedMapBag/contained/b397ce/object.json b/objects/BalancedMapBag/contained/b397ce/object.json index 7a8bf2dcc..1655eec4b 100644 --- a/objects/BalancedMapBag/contained/b397ce/object.json +++ b/objects/BalancedMapBag/contained/b397ce/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": 120.50039672851562, - "posY": 2.5099000930786133, - "posZ": 51.42449951171875, + "posX": 147.22120666503906, + "posY": 1.3035000562667847, + "posZ": -21.673500061035156, "rotX": 0.0, - "rotY": 180.00180053710938, + "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "H", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2050879843778159681/F2218563E33276F8D515FC9084104E8DE3445FDC/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245065090/10EA39780A41780BC36D19AD5EAAA0D11B04E194/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/BalancedMapBag/contained/b397ce/script.lua b/objects/BalancedMapBag/contained/b397ce/script.lua index 98fa4843b..558e81335 100644 --- a/objects/BalancedMapBag/contained/b397ce/script.lua +++ b/objects/BalancedMapBag/contained/b397ce/script.lua @@ -1,91 +1,101 @@ posMap = { -- Land 1 { { - x=-0.344038576, y=0.7, z=-0.762384534 + x=0.606787502765656, y=0.7, z=-0.702788829803467 }, { - x=0.8674067, y=0.7, z=-0.450371474 + x=0.889944970607758, y=0.7, z=-0.793093204498291 }, { - x=0.6699971, y=0.7, z=-0.9061058 + x=0.365371346473694, y=0.7, z=-0.925653398036957 }, { - x=0.225898162, y=0.7, z=-0.84858 + x=0.678611159324646, y=0.7, z=-1.06899225711823 +}, { + x=0.0452758856117725, y=0.7, z=-0.984942853450775 } }, -- Land 2 { { - x=1.2371726, y=0.7, z=0.390213519 + x=1.20251607894897, y=0.7, z=0.0234557203948498 +}, { + x=0.890212953090668, y=0.7, z=0.0598223209381104 }, { - x=0.9733116, y=0.7, z=0.464436561 + x=0.916922271251678, y=0.7, z=0.345370411872864 }, { - x=0.8899854, y=0.7, z=-0.0221666489 + x=1.25656294822693, y=0.7, z=0.317247331142426 }, { - x=1.1640631, y=0.7, z=0.05664577 + x=0.913507044315338, y=0.7, z=-0.199875220656395 }, { - x=0.8372602, y=0.7, z=0.2667543 + x=0.631202518939972, y=0.7, z=-0.0104367239400744 } }, -- Land 3 { { - x=1.61211181, y=0.7, z=0.915966868 + x=1.65275514125824, y=0.7, z=0.971570491790771 +}, { + x=1.3871248960495, y=0.7, z=0.834771275520325 }, { - x=0.84078294, y=0.7, z=0.7562717 + x=1.07886910438538, y=0.7, z=0.918640792369843 }, { - x=1.18173933, y=0.7, z=1.02816975 + x=1.38530015945435, y=0.7, z=1.16758489608765 } }, -- Land 4 { { - x=-0.5011906, y=0.7, z=0.9974738 + x=-0.338775515556335, y=0.7, z=0.910422623157501 }, { - x=-0.000335643534, y=0.7, z=0.80473 + x=-0.0500571057200432, y=0.7, z=0.806999027729034 }, { - x=-0.521644652, y=0.7, z=0.5834986 + x=-0.625546097755432, y=0.7, z=0.814426004886627 }, { - x=0.423514962, y=0.7, z=0.845947146 + x=-0.55334597826004, y=0.7, z=1.12422406673431 +}, { + x=0.260001927614212, y=0.7, z=0.901102125644684 } }, -- Land 5 { { - x=-0.465799868, y=0.7, z=0.145581529 + x=0.428826212882996, y=0.7, z=0.50605696439743 +}, { + x=0.217282578349113, y=0.7, z=0.246988505125046 }, { - x=0.314012825, y=0.7, z=0.365963 + x=-0.122900731861591, y=0.7, z=0.189754694700241 }, { - x=-0.0437099747, y=0.7, z=0.267948568 + x=-0.440019398927689, y=0.7, z=0.312062829732895 } }, -- Land 6 { { - x=0.365040541, y=0.7, z=-0.382406473 + x=-0.00385107565671206, y=0.7, z=-0.318432807922363 }, { - x=0.00497957552, y=0.7, z=-0.492247462 + x=-0.296396046876907, y=0.7, z=-0.351993322372437 }, { - x=-0.348455459, y=0.7, z=-0.2758032 + x=-0.109612546861172, y=0.7, z=-0.599950432777405 }, { - x=-0.649190247, y=0.7, z=-0.321999341 + x=0.224599227309227, y=0.7, z=-0.460850477218628 }, { - x=0.45613423, y=0.7, z=-0.06350146 + x=-0.608102083206177, y=0.7, z=-0.364467889070511 } }, -- Land 7 { { - x=-1.26171243, y=0.7, z=-0.241281465 + x=-1.03838932514191, y=0.7, z=-0.0704759582877159 }, { - x=-1.06307125, y=0.7, z=0.372014672 + x=-1.23839235305786, y=0.7, z=0.188561633229256 }, { - x=-1.08768475, y=0.7, z=0.0969993845 + x=-1.37852764129639, y=0.7, z=-0.192327216267586 }, { - x=-1.0260433, y=0.7, z=-0.47474727 + x=-1.19353497028351, y=0.7, z=-0.478257477283478 }, { - x=-1.2494005, y=0.7, z=-0.5704601 + x=-0.970830738544464, y=0.7, z=0.414619773626328 } }, -- Land 8 { { - x=-0.7835812, y=0.7, z=-0.755513251 + x=-1.14766108989716, y=0.7, z=-0.960133850574493 }, { - x=-0.9338355, y=0.7, z=-1.02808869 + x=-1.43291211128235, y=0.7, z=-1.01894247531891 }, { - x=-1.68357253, y=0.7, z=-0.9529828 + x=-1.25582635402679, y=0.7, z=-1.20624983310699 }, { - x=-1.45530355, y=0.7, z=-0.8734425 + x=-0.933460652828217, y=0.7, z=-1.11064803600311 }, { - x=-1.43194914, y=0.7, z=-1.11343491 + x=-1.75487339496613, y=0.7, z=-0.972771883010864 }, { - x=-1.16429842, y=0.7, z=-1.15231454 + x=-0.872244834899902, y=0.7, z=-0.814574241638184 }, { - x=-1.158073, y=0.7, z=-0.924259841 + x=-1.57989311218262, y=0.7, z=-1.23021709918976 } } } pieceMap = { { "Dahan" }, { "City" }, { "Dahan" }, {}, { "Box Blight" }, { "Dahan" , "Dahan" }, { "Town" }, { "Dahan" , "Dahan" } } diff --git a/objects/BalancedMapBag/contained/c3bebd/object.json b/objects/BalancedMapBag/contained/c3bebd/object.json index 532891886..ce9911df0 100644 --- a/objects/BalancedMapBag/contained/c3bebd/object.json +++ b/objects/BalancedMapBag/contained/c3bebd/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": -46.93539810180664, - "posY": 1.6088999509811401, - "posZ": 51.10409927368164, + "posX": 145.1800994873047, + "posY": 1.235200047492981, + "posZ": -26.617399215698242, "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "E", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173050185/2C44D3FC1F0B51E31FD954D041797DAFDDFC1BFF/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245062231/7F2066071470CFC4C79AC8A2C720B5682D999EC8/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/BalancedMapBag/contained/c3bebd/script.lua b/objects/BalancedMapBag/contained/c3bebd/script.lua index bdea8b705..2022fe3e6 100644 --- a/objects/BalancedMapBag/contained/c3bebd/script.lua +++ b/objects/BalancedMapBag/contained/c3bebd/script.lua @@ -1,43 +1,43 @@ posMap = { -- Land 1 { { - x=0.624615384615385, y=0.7, z=-0.967692307692308 + x=0.6246018409729, y=0.7, z=-0.967696905136108 }, { - x=0.338461538461538, y=0.7, z=-0.86923076923077 + x=0.328016132116318, y=0.7, z=-0.91425085067749 }, { - x=0.0538461538461538, y=0.7, z=-0.721538461538462 + x=0.0523369759321213, y=0.7, z=-0.793708980083466 }, { - x=-0.273846153846154, y=0.7, z=-0.792307692307693 + x=-0.29016038775444, y=0.7, z=-0.863296627998352 } }, -- Land 2 { { - x=0.698461538461538, y=0.7, z=-0.144615384615385 + x=0.715136289596558, y=0.7, z=-0.140049159526825 }, { - x=0.973846153846154, y=0.7, z=-0.136923076923077 + x=1.08148860931396, y=0.7, z=-0.135375171899796 }, { - x=0.849230769230769, y=0.7, z=-0.415384615384615 + x=1.07555508613586, y=0.7, z=-0.453485876321793 }, { - x=0.567692307692308, y=0.7, z=-0.412307692307692 + x=0.690903723239899, y=0.7, z=-0.43890592455864 }, { - x=0.850769230769231, y=0.7, z=0.130769230769231 + x=1.29988849163055, y=0.7, z=0.139795556664467 }, { - x=1.16, y=0.7, z=0.161538461538462 + x=0.936742603778839, y=0.7, z=0.177793681621552 } }, -- Land 3 { { - x=1.21538461538462, y=0.7, z=0.729230769230769 + x=1.2684121131897, y=0.7, z=0.774732053279877 }, { - x=1.40769230769231, y=0.7, z=1.02769230769231 + x=1.53495013713837, y=0.7, z=1.01175475120544 }, { - x=1.08, y=0.7, z=1.02 + x=1.19672751426697, y=0.7, z=1.08766853809357 }, { - x=1.53230769230769, y=0.7, z=0.709230769230769 + x=1.69309067726135, y=0.7, z=0.781639039516449 } }, -- Land 4 { { - x=0.383076923076923, y=0.7, z=0.806153846153846 + x=0.382041811943054, y=0.7, z=0.87813538312912 }, { - x=-0.18, y=0.7, z=0.709230769230769 + x=-0.0334098823368549, y=0.7, z=0.809107184410095 } }, -- Land 5 { { @@ -49,37 +49,37 @@ posMap = { } }, -- Land 6 { { - x=-0.975384615384616, y=0.7, z=0.536923076923077 + x=-1.04248213768005, y=0.7, z=0.599315524101257 }, { - x=-0.7, y=0.7, z=0.575384615384615 + x=-0.776452302932739, y=0.7, z=0.636013150215149 }, { - x=-0.941538461538461, y=0.7, z=0.276923076923077 + x=-1.0436315536499, y=0.7, z=0.269108533859253 }, { - x=-0.621538461538462, y=0.7, z=0.835384615384615 + x=-0.678584933280945, y=0.7, z=0.980016946792603 } }, -- Land 7 { { - x=-0.607692307692308, y=0.7, z=-0.123076923076923 + x=-0.675676643848419, y=0.7, z=-0.1238903850317 }, { - x=-0.667692307692308, y=0.7, z=-0.492307692307692 + x=-0.720439851284027, y=0.7, z=-0.450989782810211 }, { - x=-0.667692307692308, y=0.7, z=-0.692307692307692 + x=-0.789272904396057, y=0.7, z=-0.804942488670349 }, { - x=-0.955012261867523, y=0.7, z=-0.966971278190613 + x=-1.01930487155914, y=0.7, z=-1.0505565404892 } }, -- Land 8 { { - x=-1.53230769230769, y=0.7, z=-0.878461538461538 + x=-1.86404514312744, y=0.7, z=-1.02213335037231 }, { - x=-1.82307692307692, y=0.7, z=-0.996923076923077 + x=-1.53158748149872, y=0.7, z=-0.878933668136597 }, { - x=-1.45692307692308, y=0.7, z=-1.12461538461538 + x=-1.64740169048309, y=0.7, z=-1.15216505527496 }, { - x=-1.28153846153846, y=0.7, z=-0.667692307692308 + x=-1.40223979949951, y=0.7, z=-0.652436852455139 }, { - x=-1.27538461538462, y=0.7, z=-0.184615384615385 + x=-1.42244386672974, y=0.7, z=-0.336007207632065 }, { - x=-1.28461538461538, y=0.7, z=-0.433846153846154 + x=-1.38696134090424, y=0.7, z=-0.0632536113262177 } } } pieceMap = { { "Dahan" }, { "City" }, { "Dahan" , "Dahan" }, {"Box Blight" }, { "Dahan" }, {}, { "Town" }, { "Dahan", "Dahan" } } diff --git a/objects/BalancedMapBag/contained/ce60f5/object.json b/objects/BalancedMapBag/contained/ce60f5/object.json index 42db8e902..419e05e9b 100644 --- a/objects/BalancedMapBag/contained/ce60f5/object.json +++ b/objects/BalancedMapBag/contained/ce60f5/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": -48.04719924926758, - "posY": 1.5801000595092773, - "posZ": 51.51380157470703, + "posX": -36.505401611328125, + "posY": 1.6604000329971313, + "posZ": 94.42739868164062, "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "A", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173049727/ED8C799A5F30403BE8B266276A0D22C2871AA2C1/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245056835/6AD4A0AD972B5E1E9F068D15564B26CAB74316A5/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/BalancedMapBag/contained/ce60f5/script.lua b/objects/BalancedMapBag/contained/ce60f5/script.lua index 61130ece6..f5ce36ddf 100644 --- a/objects/BalancedMapBag/contained/ce60f5/script.lua +++ b/objects/BalancedMapBag/contained/ce60f5/script.lua @@ -11,27 +11,27 @@ posMap = { } }, -- Land 2 { { - x=1.03230769230769, y=0.7, z=-0.0692307692307697 + x=1.19043374061584, y=0.7, z=-0.127509549260139 }, { - x=0.930769230769231, y=0.7, z=0.206153846153846 + x=1.02029383182526, y=0.7, z=0.183003976941109 }, { - x=1.26461538461538, y=0.7, z=0.232307692307692 + x=1.33722579479218, y=0.7, z=0.211051315069199 }, { - x=0.926153846153846, y=0.7, z=-0.375384615384616 + x=1.03024351596832, y=0.7, z=-0.412251114845276 }, { - x=1.01846153846154, y=0.7, z=0.481538461538461 + x=1.43348228931427, y=0.7, z=0.475611567497253 }, { - x=1.30923076923077, y=0.7, z=0.489230769230769 + x=1.0903844833374, y=0.7, z=0.503891587257385 } }, -- Land 3 { { - x=1.23230769230769, y=0.7, z=0.887692307692307 + x=1.68459141254425, y=0.7, z=0.953367233276367 }, { - x=1.56615384615385, y=0.7, z=0.855384615384615 + x=1.35076546669006, y=0.7, z=0.985692143440247 }, { - x=0.950769230769231, y=0.7, z=0.916923076923077 + x=1.03999745845795, y=0.7, z=1.08481800556183 }, { - x=1.83076923076923, y=0.7, z=0.833846153846154 + x=2.04466986656189, y=0.7, z=0.983274281024933 } }, -- Land 4 { { @@ -59,27 +59,27 @@ posMap = { } }, -- Land 7 { { - x=-0.829230769230769, y=0.7, z=0.536923076923077 + x=-0.864366292953491, y=0.7, z=0.533630311489105 }, { - x=-1.10153846153846, y=0.7, z=0.387692307692307 + x=-1.17277193069458, y=0.7, z=0.411366730928421 }, { - x=-0.847692307692308, y=0.7, z=0.253846153846154 + x=-0.990218997001648, y=0.7, z=0.175435319542885 }, { - x=-1.08769230769231, y=0.7, z=0.0661538461538461 + x=-1.23529231548309, y=0.7, z=-0.0713538601994514 }, { - x=-0.598461538461539, y=0.7, z=0.826153846153846 + x=-0.759929656982422, y=0.7, z=0.782618939876556 }, { - x=-1.18615384615385, y=0.7, z=-0.18923076923077 + x=-0.60497260093689, y=0.7, z=1.05018043518066 } }, -- Land 8 { { - x=-1.05076923076923, y=0.7, z=-0.727692307692308 + x=-1.08048045635223, y=0.7, z=-0.763587296009064 }, { - x=-1.33076923076923, y=0.7, z=-0.738461538461539 + x=-1.39759528636932, y=0.7, z=-0.692142009735107 }, { - x=-1.06615384615385, y=0.7, z=-1.01692307692308 + x=-1.16707873344421, y=0.7, z=-1.06396245956421 }, { - x=-1.36923076923077, y=0.7, z=-1.02307692307692 + x=-1.51574611663818, y=0.7, z=-1.01089406013489 } } } pieceMap = { {}, { "Dahan" , "City" }, { "Dahan" , "Dahan" }, { "Box Blight" }, {}, { "Dahan" }, { "Dahan" , "Dahan" }, { "Town" } } diff --git a/objects/BalancedMapBag/contained/d56c85/object.json b/objects/BalancedMapBag/contained/d56c85/object.json index bc90d468b..e63b144be 100644 --- a/objects/BalancedMapBag/contained/d56c85/object.json +++ b/objects/BalancedMapBag/contained/d56c85/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": -47.33649826049805, - "posY": 1.5807000398635864, - "posZ": 51.443199157714844, + "posX": 153.64779663085938, + "posY": 1.2210999727249146, + "posZ": -26.456499099731445, "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.150000095367432, + "scaleX": 6.650000095367432, "scaleY": 1.0, - "scaleZ": 7.150000095367432 + "scaleZ": 6.650000095367432 }, "Nickname": "F", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173050275/ABC6A538F595F82E657060369394A54A4BC97217/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245063314/89E499AE330BCA1C35FDEC9A36413FDAAD5B21CA/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/BalancedMapBag/contained/d56c85/script.lua b/objects/BalancedMapBag/contained/d56c85/script.lua index b79f2b320..8aa9d0591 100644 --- a/objects/BalancedMapBag/contained/d56c85/script.lua +++ b/objects/BalancedMapBag/contained/d56c85/script.lua @@ -1,37 +1,37 @@ posMap = { -- Land 1 { { - x=0.575384615384615, y=0.7, z=-1.00461538461538 + x=0.295414686203003, y=0.7, z=-1.00435209274292 }, { - x=0.263076923076922, y=0.7, z=-0.930769230769231 + x=0.579348504543304, y=0.7, z=-0.911259710788727 }, { - x=0.0046153846153837, y=0.7, z=-0.883076923076923 + x=0.482561528682709, y=0.7, z=-1.17598521709442 }, { - x=0.512307692307692, y=0.7, z=-0.76 + x=0.805809795856476, y=0.7, z=-0.754437744617462 }, { - x=0.77076923076923, y=0.7, z=-0.752307692307692 + x=-0.0184904970228672, y=0.7, z=-0.942664802074432 } }, -- Land 2 { { - x=0.647692307692307, y=0.7, z=-0.0123076923076923 + x=0.647685527801514, y=0.7, z=-0.0122667727991939 }, { - x=0.916923076923077, y=0.7, z=-0.163076923076923 + x=0.921342968940735, y=0.7, z=-0.139816775918007 }, { - x=0.575384615384615, y=0.7, z=-0.332307692307692 + x=1.22286033630371, y=0.7, z=-0.0462367013096809 }, { - x=0.929230769230769, y=0.7, z=0.161538461538462 + x=0.963801205158234, y=0.7, z=0.218193352222443 }, { - x=0.586153846153845, y=0.7, z=0.333846153846154 + x=0.594713687896729, y=0.7, z=-0.333373308181763 } }, -- Land 3 { { - x=1.32153846153846, y=0.7, z=0.973846153846154 + x=1.37460446357727, y=0.7, z=0.955753207206726 }, { - x=1.32769230769231, y=0.7, z=0.646153846153846 + x=1.70484983921051, y=0.7, z=0.793865740299225 }, { - x=1.02, y=0.7, z=0.701538461538462 + x=1.36191964149475, y=0.7, z=0.693762540817261 }, { - x=1.62769230769231, y=0.7, z=0.846153846153846 + x=1.6341518163681, y=0.7, z=1.09400510787964 } }, -- Land 4 { { @@ -49,37 +49,37 @@ posMap = { } }, -- Land 6 { { - x=-0.94923076923077, y=0.7, z=-0.763076923076923 + x=-0.740380048751831, y=0.7, z=-1.03215658664703 }, { - x=-0.956923076923078, y=0.7, z=-1.04615384615385 + x=-1.00525140762329, y=0.7, z=-0.804748952388763 }, { - x=-1.25230769230769, y=0.7, z=-1.12615384615385 + x=-1.06817591190338, y=0.7, z=-1.10275602340698 }, { - x=-0.62923076923077, y=0.7, z=-0.983076923076923 + x=-0.655937016010284, y=0.7, z=-0.753069221973419 }, { - x=-0.624615384615385, y=0.7, z=-0.712307692307692 + x=-1.38093650341034, y=0.7, z=-1.2572193145752 } }, -- Land 7 { { - x=-0.581538461538462, y=0.7, z=0.746153846153846 + x=-0.576253354549408, y=0.7, z=0.830743372440338 }, { - x=-0.756923076923077, y=0.7, z=0.498461538461539 + x=-0.818668305873871, y=0.7, z=0.655832827091217 }, { - x=-1.04923076923077, y=0.7, z=0.512307692307692 + x=-1.1601140499115, y=0.7, z=0.397607058286667 }, { - x=-0.473846153846155, y=0.7, z=1.00153846153846 + x=-0.460329174995422, y=0.7, z=1.10328960418701 }, { - x=-1.08615384615385, y=0.7, z=0.275384615384615 + x=-1.1076819896698, y=0.7, z=0.660956501960754 } }, -- Land 8 { { - x=-1.02, y=0.7, z=-0.221538461538461 + x=-1.02000176906586, y=0.7, z=-0.221510708332062 }, { - x=-1.24461538461539, y=0.7, z=-0.495384615384616 + x=-1.34112560749054, y=0.7, z=-0.129982471466064 }, { - x=-0.772307692307693, y=0.7, z=0.0292307692307693 + x=-1.35712480545044, y=0.7, z=-0.514423251152039 }, { - x=-1.63846153846154, y=0.7, z=-0.958461538461539 + x=-1.60705816745758, y=0.7, z=-0.83261501789093 } } } pieceMap = { { "Dahan" , "Dahan" }, { "City" }, { "Dahan" }, { "Box Blight" }, { "Dahan" }, { "Dahan", "Dahan" }, {}, {"Town" } } diff --git a/objects/BalancedMapBag/object.json b/objects/BalancedMapBag/object.json index 424437193..a638f3a82 100644 --- a/objects/BalancedMapBag/object.json +++ b/objects/BalancedMapBag/object.json @@ -69,14 +69,14 @@ "Name": "Custom_Token", "Transform": { "posX": 0.0, - "posY": 0.6180999875068665, + "posY": 0.0, "posZ": 0.0, "rotX": 0.0, "rotY": 345.0, "rotZ": 0.0, - "scaleX": 0.5385000109672546, - "scaleY": 2.2239999771118164, - "scaleZ": 0.5385000109672546 + "scaleX": 0.46140000224113464, + "scaleY": 5.472799777984619, + "scaleZ": 0.46140000224113464 }, "Nickname": "", "Description": "", @@ -106,7 +106,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/1895469513173049851/20D6983DD3B1A5CA2D62BFE1AA209D90E1058D85/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245056835/6AD4A0AD972B5E1E9F068D15564B26CAB74316A5/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/Editors/contained/PowerEditor/script.lua b/objects/Editors/contained/PowerEditor/script.lua index ce23f0cce..73db839ac 100644 --- a/objects/Editors/contained/PowerEditor/script.lua +++ b/objects/Editors/contained/PowerEditor/script.lua @@ -487,6 +487,50 @@ function populateThreshold() end end +function updateReminder(player) + if currentCard == nil then + return + end + local hits = upCast(currentCard, 0.4, 0, {"Generic"}, "Reminder") + local location = nil + for _, entry in pairs(hits) do + location = entry.call("getImageLocation", {obj = currentCard}) + entry.destroy() + end + + local state = {} + if currentCard.script_state ~= "" then + state = JSON.decode(currentCard.script_state) + end + state.reminder = location + currentCard.script_state = JSON.encode(state) + + local opString = "Updated" + if location == nil then + opString = "Reset" + end + player.broadcast(opString .. " reminder image location for " .. currentCard.getName() .. ".", Color.SoftBlue) +end +function populateReminder() + if currentCard == nil then + return + end + local location = Global.call("getReminderLocation", {obj = currentCard}) + if location == nil then + return + end + + local reminderBag = getObjectFromGUID("Reminder") + reminderBag.takeObject{ + smooth = false, + callback_function = function(obj) + Wait.frames(function() + obj.call("setToLocation", {obj = currentCard, location = location}) + end, 1) + end, + } +end + function upCast(obj,dist,offset,types,name) dist = dist or 1 offset = offset or 0 diff --git a/objects/Editors/contained/PowerEditor/ui.xml b/objects/Editors/contained/PowerEditor/ui.xml index f68a59b7f..c6c23f231 100644 --- a/objects/Editors/contained/PowerEditor/ui.xml +++ b/objects/Editors/contained/PowerEditor/ui.xml @@ -5,3 +5,11 @@ + + + + + + + + diff --git a/objects/Editors/contained/Reminder/contained/b2a49e/object.json b/objects/Editors/contained/Reminder/contained/b2a49e/object.json new file mode 100644 index 000000000..23ef5be9b --- /dev/null +++ b/objects/Editors/contained/Reminder/contained/b2a49e/object.json @@ -0,0 +1,51 @@ +{ + "Name": "Custom_Model", + "Transform": { + "posX": 116.41510009765625, + "posY": 1.0295000076293945, + "posZ": 54.188201904296875, + "rotX": 0.0, + "rotY": 0.0, + "rotZ": 0.0, + "scaleX": 0.8999999761581421, + "scaleY": 0.8999999761581421, + "scaleZ": 0.8999999761581421 + }, + "Nickname": "Reminder", + "Description": "", + "GMNotes": "", + "AltLookAngle": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "ColorDiffuse": { + "r": 1.0, + "g": 1.0, + "b": 1.0 + }, + "LayoutGroupSortIndex": 0, + "Value": 0, + "Locked": false, + "Grid": false, + "Snap": false, + "IgnoreFoW": false, + "MeasureMovement": false, + "DragSelectable": true, + "Autoraise": true, + "Sticky": false, + "Tooltip": true, + "GridProjection": false, + "HideWhenFaceDown": false, + "Hands": false, + "CustomMesh": { + "MeshURL": "http://cloud-3.steamusercontent.com/ugc/1749061746121830431/DE000E849E99F439C3775E5C92E327CE09E4DB65/", + "DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/2050879298352687582/0903B5F8D08AB12D8F4C05A703A9E193F049A702/", + "NormalURL": "", + "ColliderURL": "", + "Convex": true, + "MaterialIndex": 1, + "TypeIndex": 0, + "CastShadows": true + } +} diff --git a/objects/Editors/contained/Reminder/contained/b2a49e/script.lua b/objects/Editors/contained/Reminder/contained/b2a49e/script.lua new file mode 100644 index 000000000..f8092a54c --- /dev/null +++ b/objects/Editors/contained/Reminder/contained/b2a49e/script.lua @@ -0,0 +1,83 @@ +-- Gets the object (spirit or power card) beneath the reminder token +function getObject() + local hits = Physics.cast({ + origin = self.getBounds().center, + direction = Vector(0,-1,0), + max_distance = 2, + }) + for _,v in pairs(hits) do + local obj = v.hit_object + if (obj.hasTag("Spirit") and obj.type == "Tile") or obj.type == "Card" then + return obj + end + end + return nil +end + +-- Gets a set of parameters for image location suitable to be saved to script state +-- These are agnostic of the actual image on the object, and of the mask size +function getImageLocation(params) + local obj = params.obj + if obj == nil then + return nil + end + + local location = {} + + if obj.type == "Card" then + location.field = "FaceURL" + elseif obj.is_face_down then + location.field = "ImageSecondaryURL" + else + location.field = "ImageURL" + end + + local selfPos = self.getPosition() + local objPos = obj.getPosition() + local selfBounds = self.getBounds() + local objBounds = obj.getBounds() + local selfSize = selfBounds.size.x -- We're not quite square, so only use our width + + location.width = objBounds.size.x / selfSize + location.height = objBounds.size.z / selfSize + + location.x = (objPos.x - selfPos.x) / objBounds.size.x * location.width + location.y = (objPos.z - selfPos.z) / objBounds.size.z * location.height + + return location +end + +-- Sets this object's position and size above a given object such that getImageLocation() would return a given location. +-- We can't do this with takeObject(), as that can't set size. +-- So we might as well do this here, so that the code sits next to getImageLocation(). +function setToLocation(params) + local obj = params.obj + local location = params.location + if obj == nil or location == nil then + return + end + + local objPos = obj.getPosition() + local selfBounds = self.getBounds() + local objBounds = obj.getBounds() + local selfSize = selfBounds.size.x + + local desiredX = objPos.x - location.x * objBounds.size.x / location.width + local desiredZ = objPos.z - location.y * objBounds.size.z / location.height + local desiredY = objPos.y + 1 + self.setPosition(Vector(desiredX, desiredY, desiredZ)) + + local desiredSize = objBounds.size.x / location.width -- Use only use our width, as in getImageLocation(). + self.setScale(self.getScale():scale(desiredSize / selfSize)) +end + +function updateImage() + local obj = getObject() + local location = getImageLocation({obj = obj}) + local attributes = Global.call("getReminderImageAttributes", {obj = obj, location = location}) + self.UI.setAttributes("image", attributes) +end + +function onLoad() + Wait.time(updateImage, 0.1, -1) +end diff --git a/objects/Editors/contained/Reminder/contained/b2a49e/ui.xml b/objects/Editors/contained/Reminder/contained/b2a49e/ui.xml new file mode 100644 index 000000000..c5edd773a --- /dev/null +++ b/objects/Editors/contained/Reminder/contained/b2a49e/ui.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/objects/Editors/contained/Reminder/contained/index.list b/objects/Editors/contained/Reminder/contained/index.list new file mode 100644 index 000000000..6379ce0d0 --- /dev/null +++ b/objects/Editors/contained/Reminder/contained/index.list @@ -0,0 +1 @@ +b2a49e diff --git a/objects/Editors/contained/Reminder/object.json b/objects/Editors/contained/Reminder/object.json new file mode 100644 index 000000000..ad60573f1 --- /dev/null +++ b/objects/Editors/contained/Reminder/object.json @@ -0,0 +1,53 @@ +{ + "Name": "Custom_Model_Infinite_Bag", + "Transform": { + "posX": 116.4800033569336, + "posY": 0.949999988079071, + "posZ": 54.38999938964844, + "rotX": 0.0, + "rotY": 180.0, + "rotZ": 0.0, + "scaleX": 0.8999999761581421, + "scaleY": 0.8999999761581421, + "scaleZ": 0.8999999761581421 + }, + "Nickname": "Reminder", + "Description": "Place this reminder on the spirit or power card to set the position and scale of the reminder token image. Rescale as necessary.", + "GMNotes": "", + "AltLookAngle": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "ColorDiffuse": { + "r": 1.0, + "g": 1.0, + "b": 1.0 + }, + "LayoutGroupSortIndex": 0, + "Value": 0, + "Locked": false, + "Grid": false, + "Snap": false, + "IgnoreFoW": false, + "MeasureMovement": false, + "DragSelectable": true, + "Autoraise": true, + "Sticky": false, + "Tooltip": true, + "GridProjection": false, + "HideWhenFaceDown": false, + "Hands": false, + "MaterialIndex": -1, + "MeshIndex": -1, + "CustomMesh": { + "MeshURL": "http://cloud-3.steamusercontent.com/ugc/1749061746121830431/DE000E849E99F439C3775E5C92E327CE09E4DB65/", + "DiffuseURL": "http://cloud-3.steamusercontent.com/ugc/2050879298352687582/0903B5F8D08AB12D8F4C05A703A9E193F049A702/", + "NormalURL": "", + "ColliderURL": "", + "Convex": true, + "MaterialIndex": 1, + "TypeIndex": 7, + "CastShadows": true + } +} diff --git a/objects/Editors/contained/SpiritEditor/script.lua b/objects/Editors/contained/SpiritEditor/script.lua index 4addb9972..bee2844b5 100644 --- a/objects/Editors/contained/SpiritEditor/script.lua +++ b/objects/Editors/contained/SpiritEditor/script.lua @@ -296,6 +296,55 @@ function populateThreshold() end end +function updateReminder(player) + if currentSpirit == nil then + return + end + local hits = upCast(currentSpirit, 0.4, 0, {"Generic"}, "Reminder") + local location = nil + for _, entry in pairs(hits) do + location = entry.call("getImageLocation", {obj = currentSpirit}) + entry.destroy() + end + + local state = {} + if currentSpirit.script_state ~= "" then + state = JSON.decode(currentSpirit.script_state) + end + state.reminder = location + currentSpirit.script_state = JSON.encode(state) + + local opString = "Updated" + if location == nil then + opString = "Reset" + end + player.broadcast(opString .. " reminder image location for " .. currentSpirit.getName() .. ".", Color.SoftBlue) +end +function populateReminder(player) + if currentSpirit == nil then + return + end + local location = Global.call("getReminderLocation", {obj = currentSpirit}) + if location == nil then + return + end + + if (location.field == "ImageURL" and currentSpirit.is_face_down) or (location.field == "ImageSecondaryURL" and not currentSpirit.is_face_down) then + player.broadcast("Current reminder image uses the reverse of the panel. Please flip it.", Color.Red) + return + end + + local reminderBag = getObjectFromGUID("Reminder") + reminderBag.takeObject{ + smooth = false, + callback_function = function(obj) + Wait.frames(function() + obj.call("setToLocation", {obj = currentSpirit, location = location}) + end, 1) + end, + } +end + function makeSpirit(obj) obj.addTag("Spirit") obj.setVar("reload", true) diff --git a/objects/Editors/contained/SpiritEditor/ui.xml b/objects/Editors/contained/SpiritEditor/ui.xml index 798c8e927..a93b4eacc 100644 --- a/objects/Editors/contained/SpiritEditor/ui.xml +++ b/objects/Editors/contained/SpiritEditor/ui.xml @@ -1,3 +1,11 @@ + + + + + + + + diff --git a/objects/Editors/contained/index.list b/objects/Editors/contained/index.list index 6f2472f19..b67237acc 100644 --- a/objects/Editors/contained/index.list +++ b/objects/Editors/contained/index.list @@ -1,4 +1,5 @@ SpiritEditor +Reminder AnyElements Energy Threshold diff --git a/objects/Editors/script.lua b/objects/Editors/script.lua index 752a77f86..33686dc0f 100644 --- a/objects/Editors/script.lua +++ b/objects/Editors/script.lua @@ -1,6 +1,7 @@ empty = false contents = { ["SpiritEditor"] = {105.22, 0.85, 52.59}, + ["Reminder"] = {115.645, 0.95, 59.34}, ["AnyElements"] = {114.81, 0.95, 54.39}, ["Energy"] = {116.48, 0.95, 54.39}, ["Threshold"] = {114.81, 0.95, 49.44}, diff --git a/objects/SourceSpirit/object.json b/objects/SourceSpirit/object.json index a8fba1722..e7b04d251 100644 --- a/objects/SourceSpirit/object.json +++ b/objects/SourceSpirit/object.json @@ -20,9 +20,9 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.20029985904693604, - "g": 0.1602998673915863, - "b": 0.15179988741874695 + "r": 0.20029979944229126, + "g": 0.16029980778694153, + "b": 0.15179982781410217 }, "Tags": [ "Uninteractable" diff --git a/objects/a42427/object.json b/objects/a42427/object.json index 92b5f284d..301c99b3d 100644 --- a/objects/a42427/object.json +++ b/objects/a42427/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.964699923992157, "g": 0.5842999815940857, - "b": 0.5175997614860535 + "b": 0.5175996422767639 }, "LayoutGroupSortIndex": 0, "Value": 0, diff --git a/objects/adffc0/contained/07dd23/script-state.json b/objects/adffc0/contained/07dd23/script-state.json index fc4b8afa7..d5d213c04 100644 --- a/objects/adffc0/contained/07dd23/script-state.json +++ b/objects/adffc0/contained/07dd23/script-state.json @@ -1,5 +1,12 @@ { "broadcast": "Drag invaders into drowned bag to automatically generate fear and for easy energy exchange", + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.2698, + "width": 1.9057, + "x": 0.5089, + "y": -0.0727 + }, "thresholds": [ { "elements": "01012000", diff --git a/objects/adffc0/contained/38188e/script.lua b/objects/adffc0/contained/38188e/script.lua index c6b30831e..6af028abe 100644 --- a/objects/adffc0/contained/38188e/script.lua +++ b/objects/adffc0/contained/38188e/script.lua @@ -1,3 +1,5 @@ +spiritName = "Ocean's Hungry Grasp" + local healthCount = 0 local autoExchange = true @@ -59,9 +61,6 @@ function tryObjectEnter(enter_object) end function doSetup(params) - if not Global.getVar("gameStarted") then - return false - end self.UI.setAttribute("count", "text", healthCount) self.UI.setAttribute("players", "text", getNumPlayers()) self.UI.setAttribute("drownPanel", "visibility", "") @@ -88,9 +87,9 @@ function toggleExchange() self.UI.setAttribute("toggleExchange", "isOn", autoExchange) end function exchange(_, color, alt_click) - local spiritColor = Global.call("getSpiritColor", {name = "Ocean's Hungry Grasp"}) + local spiritColor = Global.call("getSpiritColor", {name = spiritName}) if spiritColor == nil then - Player[color].broadcast("Unable to find Ocean's Hungry Grasp", Color.Red) + Player[color].broadcast("Unable to find "..spiritName.."!", Color.Red) return end local numPlayers = getNumPlayers() @@ -122,7 +121,10 @@ function exchangeAuto() local numPlayers = getNumPlayers() local energy = math.floor(healthCount / numPlayers) if energy == 0 then return end - local color = Global.call("getSpiritColor", {name = "Ocean's Hungry Grasp"}) + local color = Global.call("getSpiritColor", {name = spiritName}) + if color == nil then + return + end local success = Global.call("giveEnergy", {color=color, energy=energy, ignoreDebt=false}) if success then healthCount = healthCount % numPlayers diff --git a/objects/aee27f/object.json b/objects/aee27f/object.json index 8a0a56fce..736ca7fbd 100644 --- a/objects/aee27f/object.json +++ b/objects/aee27f/object.json @@ -20,8 +20,8 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.08239992707967758, - "g": 0.05879995971918106, + "r": 0.0823998972773552, + "g": 0.05879993736743927, "b": 0.03920000046491623 }, "Tags": [ diff --git a/objects/af4e63/object.json b/objects/af4e63/object.json index fe39d5219..dd48c2f77 100644 --- a/objects/af4e63/object.json +++ b/objects/af4e63/object.json @@ -20,7 +20,7 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.39609989523887634, + "r": 0.39609983563423157, "g": 0.7646999955177307, "b": 0.9136999845504761 }, diff --git a/objects/af50b8/object.json b/objects/af50b8/object.json index fbe493de9..425d1f826 100644 --- a/objects/af50b8/object.json +++ b/objects/af50b8/object.json @@ -20,9 +20,9 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.18039986491203308, - "g": 0.18039986491203308, - "b": 0.18039986491203308 + "r": 0.1803998053073883, + "g": 0.1803998053073883, + "b": 0.1803998053073883 }, "LayoutGroupSortIndex": 0, "Value": 0, diff --git a/objects/afcc64/contained/f7422a/object.json b/objects/afcc64/contained/f7422a/object.json index 5ab04ac58..c4b743dac 100644 --- a/objects/afcc64/contained/f7422a/object.json +++ b/objects/afcc64/contained/f7422a/object.json @@ -26,7 +26,6 @@ }, "Tags": [ "BnC", - "Lower Spirit Image", "Moderate", "Spirit" ], diff --git a/objects/afcc64/contained/f7422a/script-state.json b/objects/afcc64/contained/f7422a/script-state.json index def42f87a..8a7143189 100644 --- a/objects/afcc64/contained/f7422a/script-state.json +++ b/objects/afcc64/contained/f7422a/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.3977, + "width": 2.0977, + "x": 0.5939, + "y": -0.0637 + }, "thresholds": [ { "elements": "00000002", diff --git a/objects/b7bbcc/contained/74d027/script-state.json b/objects/b7bbcc/contained/74d027/script-state.json index e0f02d461..e56e02f99 100644 --- a/objects/b7bbcc/contained/74d027/script-state.json +++ b/objects/b7bbcc/contained/74d027/script-state.json @@ -1,5 +1,12 @@ { "broadcast": "For Boon of Reimagining right click the \"Gain a Minor\" button to choose from 6 Minor Power Card, and right click the \"Pick Power\" button for your first choice", + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.3149, + "width": 1.9734, + "x": 0.5336, + "y": -0.0679 + }, "thresholds": [ { "elements": "00030000", diff --git a/objects/ba3767/object.json b/objects/ba3767/object.json index 49533d929..c4a3c4fb9 100644 --- a/objects/ba3767/object.json +++ b/objects/ba3767/object.json @@ -20,8 +20,8 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.08239992707967758, - "g": 0.05879995971918106, + "r": 0.0823998972773552, + "g": 0.05879993736743927, "b": 0.03920000046491623 }, "Tags": [ diff --git a/objects/bd3f44/object.json b/objects/bd3f44/object.json index 5065e6ba2..c409e219c 100644 --- a/objects/bd3f44/object.json +++ b/objects/bd3f44/object.json @@ -20,8 +20,8 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.08239992707967758, - "g": 0.05879995971918106, + "r": 0.0823998972773552, + "g": 0.05879993736743927, "b": 0.03920000046491623 }, "Tags": [ diff --git a/objects/c323b4/object.json b/objects/c323b4/object.json index 5558f8fb5..db5bfd0b0 100644 --- a/objects/c323b4/object.json +++ b/objects/c323b4/object.json @@ -20,8 +20,8 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.08239992707967758, - "g": 0.05879995971918106, + "r": 0.0823998972773552, + "g": 0.05879993736743927, "b": 0.03920000046491623 }, "Tags": [ diff --git a/objects/c44b9c/object.json b/objects/c44b9c/object.json index 784ed36ff..8f5f90046 100644 --- a/objects/c44b9c/object.json +++ b/objects/c44b9c/object.json @@ -20,9 +20,9 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.4267998933792114, - "g": 0.36939987540245056, - "b": 0.4395998418331146 + "r": 0.42679983377456665, + "g": 0.3693998157978058, + "b": 0.43959978222846985 }, "Tags": [ "Uninteractable" diff --git a/objects/c4ac1d/object.json b/objects/c4ac1d/object.json index 90d36babd..de2ea9c7d 100644 --- a/objects/c4ac1d/object.json +++ b/objects/c4ac1d/object.json @@ -1,7 +1,7 @@ { "Name": "3DText", "Transform": { - "posX": 105.1300277709961, + "posX": 105.13003540039062, "posY": 0.9599999785423279, "posZ": 1.090000033378601, "rotX": 90.0, diff --git a/objects/c5e07e/contained/a95c14/script-state.json b/objects/c5e07e/contained/a95c14/script-state.json index 29aded3b7..47024d0ca 100644 --- a/objects/c5e07e/contained/a95c14/script-state.json +++ b/objects/c5e07e/contained/a95c14/script-state.json @@ -1,5 +1,12 @@ { "broadcast": "To prevent Invaders/Dahan healing during Time Passes, lock that Invader/Dahan (if Invaders/Dahan are stacked on top of each other, you only need to lock the bottom piece in the stack).", + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.3468, + "width": 2.0213, + "x": 0.5145, + "y": -0.0614 + }, "thresholds": [ { "elements": "01021000", diff --git a/objects/c99d4d/object.json b/objects/c99d4d/object.json index 5f2b5e4a3..521f535f8 100644 --- a/objects/c99d4d/object.json +++ b/objects/c99d4d/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.8392000198364258, "g": 0.5724999904632568, - "b": 0.39609989523887634 + "b": 0.39609983563423157 }, "Tags": [ "Seat", diff --git a/objects/d35f30/contained/8b2903/script-state.json b/objects/d35f30/contained/8b2903/script-state.json index b7fef8f96..aea66d074 100644 --- a/objects/d35f30/contained/8b2903/script-state.json +++ b/objects/d35f30/contained/8b2903/script-state.json @@ -1,5 +1,12 @@ { "bonusEnergy": [], + "reminder": { + "field": "ImageURL", + "height": 1.8993, + "width": 2.8506, + "x": 0.8021, + "y": -0.4545 + }, "thresholds": [ { "elements": "10020000", diff --git a/objects/d3dd7e/object.json b/objects/d3dd7e/object.json index 24dd88094..54b88912c 100644 --- a/objects/d3dd7e/object.json +++ b/objects/d3dd7e/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.8391000032424927, "g": 0.5720000267028809, - "b": 0.39709988236427307 + "b": 0.3970998227596283 }, "Tags": [ "Uninteractable" diff --git a/objects/d3f7f8/object.json b/objects/d3f7f8/object.json index ea04b90b6..96272d66d 100644 --- a/objects/d3f7f8/object.json +++ b/objects/d3f7f8/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.9961000084877014, "g": 0.7411999702453613, - "b": 0.1058998629450798 + "b": 0.10589980334043503 }, "LayoutGroupSortIndex": 0, "Value": 0, diff --git a/objects/d3fb56/object.json b/objects/d3fb56/object.json index c769c0325..71b102c57 100644 --- a/objects/d3fb56/object.json +++ b/objects/d3fb56/object.json @@ -1,9 +1,9 @@ { "Name": "3DText", "Transform": { - "posX": -36.66001510620117, + "posX": -36.6600227355957, "posY": 0.9599999785423279, - "posZ": 48.510013580322266, + "posZ": 48.5100212097168, "rotX": 90.0, "rotY": 0.0, "rotZ": 0.0, diff --git a/objects/d7d593/object.json b/objects/d7d593/object.json index 6c5b84c43..f87281c7d 100644 --- a/objects/d7d593/object.json +++ b/objects/d7d593/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.8392000198364258, "g": 0.5724999904632568, - "b": 0.39609989523887634 + "b": 0.39609983563423157 }, "Tags": [ "Seat", diff --git a/objects/d8b6c7/object.json b/objects/d8b6c7/object.json index e3d2d82ef..a45e2e986 100644 --- a/objects/d8b6c7/object.json +++ b/objects/d8b6c7/object.json @@ -3,7 +3,7 @@ "Transform": { "posX": -38.22999954223633, "posY": 0.9599999785423279, - "posZ": 47.72001647949219, + "posZ": 47.72002410888672, "rotX": 90.0, "rotY": 0.0, "rotZ": 0.0, diff --git a/objects/d936f3/object.json b/objects/d936f3/object.json index 1baef6383..4299618de 100644 --- a/objects/d936f3/object.json +++ b/objects/d936f3/object.json @@ -3,7 +3,7 @@ "Transform": { "posX": -38.22999954223633, "posY": 0.9599999785423279, - "posZ": 40.22001647949219, + "posZ": 40.22002410888672, "rotX": 90.0, "rotY": 0.0, "rotZ": 0.0, diff --git a/objects/dce473/object.json b/objects/dce473/object.json index 07854038e..b335ae0c4 100644 --- a/objects/dce473/object.json +++ b/objects/dce473/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.8392000198364258, "g": 0.5724999904632568, - "b": 0.39609989523887634 + "b": 0.39609983563423157 }, "Tags": [ "Seat", diff --git a/objects/df9e09/object.json b/objects/df9e09/object.json index 6bd41281d..5cc8be9b8 100644 --- a/objects/df9e09/object.json +++ b/objects/df9e09/object.json @@ -1,15 +1,15 @@ { "Name": "Custom_Token", "Transform": { - "posX": -48.4900016784668, - "posY": -0.10000000149011612, - "posZ": 54.91999816894531, + "posX": -42.33449935913086, + "posY": -0.7549999952316284, + "posZ": 71.43920135498047, "rotX": -0.0, - "rotY": 0.0, + "rotY": 180.0, "rotZ": 0.0, - "scaleX": 0.8100000023841858, + "scaleX": 0.6000000238418579, "scaleY": 1.0, - "scaleZ": 0.8100000023841858 + "scaleZ": 0.6000000238418579 }, "Nickname": "NORMAL H", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2050879843778159681/F2218563E33276F8D515FC9084104E8DE3445FDC/", + "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2308721072245065090/10EA39780A41780BC36D19AD5EAAA0D11B04E194/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, diff --git a/objects/e267b0/object.json b/objects/e267b0/object.json index 44d34a10d..d323911fc 100644 --- a/objects/e267b0/object.json +++ b/objects/e267b0/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.8391000032424927, "g": 0.5720000267028809, - "b": 0.39709988236427307 + "b": 0.3970998227596283 }, "Tags": [ "Uninteractable" diff --git a/objects/e35f78/object.json b/objects/e35f78/object.json index 919e0c99f..4a5536965 100644 --- a/objects/e35f78/object.json +++ b/objects/e35f78/object.json @@ -3,7 +3,7 @@ "Transform": { "posX": -40.25, "posY": 0.9599999785423279, - "posZ": 47.72001647949219, + "posZ": 47.72002410888672, "rotX": 90.0, "rotY": 0.0, "rotZ": 0.0, diff --git a/objects/e3da46/contained/e9c468/script-state.json b/objects/e3da46/contained/e9c468/script-state.json index 8619d77ed..f897fae12 100644 --- a/objects/e3da46/contained/e9c468/script-state.json +++ b/objects/e3da46/contained/e9c468/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.3803, + "width": 2.0716, + "x": 0.5131, + "y": -0.0742 + }, "thresholds": [ { "elements": "00040000", diff --git a/objects/efad15/contained/9ad187/script.lua b/objects/efad15/contained/9ad187/script.lua index 8dfe48a83..9613e1d23 100644 --- a/objects/efad15/contained/9ad187/script.lua +++ b/objects/efad15/contained/9ad187/script.lua @@ -1,4 +1,4 @@ -local spiritName = "Serpent Slumbering Beneath the Island" +spiritName = "Serpent Slumbering Beneath the Island" local slumberTrack = {[0] = 5, 7, 8, 10, 11, 12, 13} local slumberPoints = { @@ -26,15 +26,6 @@ function onLoad(saved_data) end function doSetup(params) - local color = params.color - if not Global.getVar("gameStarted") then - Player[color].broadcast("Please wait for the game to start before pressing this button!", Color.Red) - return false - elseif color ~= Global.call("getSpiritColor", {name = spiritName}) then - Player[color].broadcast("You have not picked " .. spiritName .. "!", Color.Red) - return false - end - local serpent = Global.call("getSpirit", {name = spiritName}) local snapPoints = serpent.getSnapPoints() diff --git a/objects/efad15/contained/cebe09/object.json b/objects/efad15/contained/cebe09/object.json index d6ae64720..2321e662d 100644 --- a/objects/efad15/contained/cebe09/object.json +++ b/objects/efad15/contained/cebe09/object.json @@ -27,7 +27,6 @@ "Tags": [ "FnF", "High", - "Lower Spirit Image", "Spirit" ], "LayoutGroupSortIndex": 0, diff --git a/objects/efad15/contained/cebe09/script-state.json b/objects/efad15/contained/cebe09/script-state.json index cf01a51e2..5720167f3 100644 --- a/objects/efad15/contained/cebe09/script-state.json +++ b/objects/efad15/contained/cebe09/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.2845, + "width": 1.9278, + "x": 0.5103, + "y": 0.2003 + }, "thresholds": [ { "elements": "00201010", diff --git a/objects/f33e62/contained/1c6929/script-state.json b/objects/f33e62/contained/1c6929/script-state.json index 70cbdf49c..d556c2bd4 100644 --- a/objects/f33e62/contained/1c6929/script-state.json +++ b/objects/f33e62/contained/1c6929/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.512, + "width": 2.2692, + "x": 0.6669, + "y": -0.1794 + }, "thresholds": [ { "elements": "00013000", diff --git a/objects/f33e62/contained/d440a5/script.lua b/objects/f33e62/contained/d440a5/script.lua index d5ca2f64d..70610f638 100644 --- a/objects/f33e62/contained/d440a5/script.lua +++ b/objects/f33e62/contained/d440a5/script.lua @@ -1,3 +1,5 @@ +spiritName = "Downpour Drenches the World" + local count = 0 function onSave() @@ -38,9 +40,6 @@ function onLoad(save_state) end function doSetup(params) - if not Global.getVar("gameStarted") then - return false - end self.UI.setAttribute("count", "text", count) self.UI.setAttribute("water", "text", 0) self.UI.setAttribute("waterPanel", "visibility", "") @@ -65,7 +64,7 @@ function timePasses() end function countWater() - local color = Global.call("getSpiritColor", {name = "Downpour Drenches the World"}) + local color = Global.call("getSpiritColor", {name = spiritName}) if color == nil then return end @@ -76,9 +75,9 @@ function countWater() end function energy(_, color, alt_click) - local spiritColor = Global.call("getSpiritColor", {name = "Downpour Drenches the World"}) + local spiritColor = Global.call("getSpiritColor", {name = spiritName}) if spiritColor == nil then - Player[color].broadcast("Unable to find Downpour Drenches the World", Color.Red) + Player[color].broadcast("Unable to find "..spiritName.."!", Color.Red) return end diff --git a/objects/f39fd1/object.json b/objects/f39fd1/object.json index 4846d3016..56cbf03c0 100644 --- a/objects/f39fd1/object.json +++ b/objects/f39fd1/object.json @@ -4,7 +4,7 @@ "posX": -46.18000030517578, "posY": 0.8703587055206299, "posZ": 56.29999923706055, - "rotX": 7.849958016947767e-09, + "rotX": -9.182305582555728e-09, "rotY": 180.0, "rotZ": 180.0, "scaleX": 1.5299999713897705, diff --git a/objects/f433f0/object.json b/objects/f433f0/object.json index a4f943178..386a796a0 100644 --- a/objects/f433f0/object.json +++ b/objects/f433f0/object.json @@ -20,8 +20,8 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.19829988479614258, - "g": 0.42369988560676575, + "r": 0.1982998251914978, + "g": 0.42369982600212097, "b": 0.8391000032424927 }, "Tags": [ diff --git a/objects/f4ab64/object.json b/objects/f4ab64/object.json index 53d0db4e3..9dc6685f5 100644 --- a/objects/f4ab64/object.json +++ b/objects/f4ab64/object.json @@ -20,8 +20,8 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.08239992707967758, - "g": 0.05879995971918106, + "r": 0.0823998972773552, + "g": 0.05879993736743927, "b": 0.03920000046491623 }, "Tags": [ diff --git a/objects/f7f008/contained/b42f70/script-state.json b/objects/f7f008/contained/b42f70/script-state.json index d40d50f74..7a35b8b32 100644 --- a/objects/f7f008/contained/b42f70/script-state.json +++ b/objects/f7f008/contained/b42f70/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageURL", + "height": 1.6711, + "width": 2.5081, + "x": 0.7667, + "y": -0.3575 + }, "thresholds": [ { "elements": "20100020", diff --git a/objects/f947be/object.json b/objects/f947be/object.json index 23f85fa00..01c35596a 100644 --- a/objects/f947be/object.json +++ b/objects/f947be/object.json @@ -3,7 +3,7 @@ "Transform": { "posX": -40.25, "posY": 0.9599999785423279, - "posZ": 45.22001647949219, + "posZ": 45.22002029418945, "rotX": 90.0, "rotY": 0.0, "rotZ": 0.0, diff --git a/objects/f96a71/object.json b/objects/f96a71/object.json index fa5c137c6..38baad96c 100644 --- a/objects/f96a71/object.json +++ b/objects/f96a71/object.json @@ -4,9 +4,9 @@ "posX": -37.9989013671875, "posY": 0.8534048795700073, "posZ": 51.260101318359375, - "rotX": -9.048073401629608e-09, + "rotX": -2.0275681134052093e-09, "rotY": 180.0, - "rotZ": 1.684436479187923e-09, + "rotZ": -3.788469982168863e-09, "scaleX": 1.531999945640564, "scaleY": 1.0, "scaleZ": 1.531999945640564 diff --git a/objects/f96e34/object.json b/objects/f96e34/object.json index df43cfc17..7ce6a8260 100644 --- a/objects/f96e34/object.json +++ b/objects/f96e34/object.json @@ -4,7 +4,7 @@ "posX": -39.90999984741211, "posY": 0.8848007917404175, "posZ": 56.29999923706055, - "rotX": -3.45603083928836e-08, + "rotX": -6.162605536985666e-09, "rotY": 180.0, "rotZ": 180.0, "scaleX": 1.098099946975708, diff --git a/objects/f9aad3/object.json b/objects/f9aad3/object.json index 151013aeb..d3294c316 100644 --- a/objects/f9aad3/object.json +++ b/objects/f9aad3/object.json @@ -4,7 +4,7 @@ "posX": -42.150001525878906, "posY": 0.8799867630004883, "posZ": 56.29999923706055, - "rotX": 1.6666094060369119e-09, + "rotX": 2.6048248003007757e-08, "rotY": 180.0, "rotZ": 180.0, "scaleX": 1.098099946975708, diff --git a/objects/f9ea89/contained/9138aa/script-state.json b/objects/f9ea89/contained/9138aa/script-state.json index 59a7f3e21..c475603f3 100644 --- a/objects/f9ea89/contained/9138aa/script-state.json +++ b/objects/f9ea89/contained/9138aa/script-state.json @@ -1,5 +1,12 @@ { "broadcast": "To show your Presence in Wetlands are Sacred Sites (due to River's Domain) change that Presence to its second state.", + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.2414, + "width": 1.8631, + "x": 0.4706, + "y": 0.1028 + }, "thresholds": [ { "elements": "10002000", diff --git a/objects/f9ea89/contained/bec5da/script.lua b/objects/f9ea89/contained/bec5da/script.lua index 4bfe61b83..f0a4c9643 100644 --- a/objects/f9ea89/contained/bec5da/script.lua +++ b/objects/f9ea89/contained/bec5da/script.lua @@ -5,16 +5,10 @@ function onLoad(saved_data) end end -- card loading end +spiritName = "River Surges in Sunlight" + function doSetup(params) local color = params.color - if not Global.getVar("gameStarted") then - Player[color].broadcast("Please wait for the game to start before pressing this button!", Color.Red) - return false - elseif color ~= Global.call("getSpiritColor", {name = "River Surges in Sunlight"}) then - Player[color].broadcast("You have not picked River Surges in Sunlight!", Color.Red) - return false - end - for _, card in pairs(Player[color].getHandObjects(1)) do if card.guid == "22b2f3" then card.destruct() diff --git a/objects/fa9c2f/contained/606f23/object.json b/objects/fa9c2f/contained/606f23/object.json index 3519d561f..48b043994 100644 --- a/objects/fa9c2f/contained/606f23/object.json +++ b/objects/fa9c2f/contained/606f23/object.json @@ -194,7 +194,7 @@ } }, "LuaScript": "-- Spirit Panel for MJ & iakona's Spirit Island Mod --\nuseProgression = false\nuseAspect = 2\n\nfunction onLoad(saved_data)\n Color.Add(\"SoftBlue\", Color.new(0.53,0.92,1))\n Color.Add(\"SoftYellow\", Color.new(1,0.8,0.5))\n getObjectFromGUID(\"SourceSpirit\").call(\"load\", {obj = self, saved_data = saved_data})\nend", - "LuaScriptState": "{\"thresholds\": [{\"elements\": \"02020000\", \"position\": {\"x\": 0.34, \"y\": 0, \"z\": 0.46}}, {\"elements\": \"03000000\", \"position\": {\"x\": 0.34, \"y\": 0, \"z\": 0.74}}, {\"elements\": \"01010000\", \"position\": {\"x\": -0.56, \"y\": 0, \"z\": 0.46}}, {\"elements\": \"02010001\", \"position\": {\"x\": -0.56, \"y\": 0, \"z\": 0.58}}, {\"elements\": \"03020001\", \"position\": {\"x\": -0.56, \"y\": 0, \"z\": 0.7}}], \"trackElements\":[{\"elements\":\"01000000\",\"position\":{\"x\":-0.49,\"y\":0,\"z\":-0.4}},{\"elements\":\"00010000\",\"position\":{\"x\":-0.05,\"y\":0,\"z\":-0.4}}],\"trackEnergy\":[{\"count\":5,\"position\":{\"x\":-1.15,\"y\":0,\"z\":-0.4}},{\"count\":4,\"position\":{\"x\":-0.71,\"y\":0,\"z\":-0.4}},{\"count\":3,\"position\":{\"x\":-0.27,\"y\":0,\"z\":-0.4}},{\"count\":2,\"position\":{\"x\":0.18,\"y\":0,\"z\":-0.39}}]}", + "LuaScriptState": "{\"reminder\":{\"field\":\"ImageSecondaryURL\",\"height\":1.57653617262994,\"width\":2.36642690286374,\"x\":0.729447794679401,\"y\":-0.220131903116929},\"thresholds\":[{\"elements\":\"02020000\",\"position\":{\"x\":0.34,\"y\":0,\"z\":0.46}},{\"elements\":\"03000000\",\"position\":{\"x\":0.34,\"y\":0,\"z\":0.74}},{\"elements\":\"01010000\",\"position\":{\"x\":-0.56,\"y\":0,\"z\":0.46}},{\"elements\":\"02010001\",\"position\":{\"x\":-0.56,\"y\":0,\"z\":0.58}},{\"elements\":\"03020001\",\"position\":{\"x\":-0.56,\"y\":0,\"z\":0.7}}],\"trackElements\":[{\"elements\":\"01000000\",\"position\":{\"x\":-0.49,\"y\":0,\"z\":-0.4}},{\"elements\":\"00010000\",\"position\":{\"x\":-0.05,\"y\":0,\"z\":-0.4}}],\"trackEnergy\":[{\"count\":5,\"position\":{\"x\":-1.15,\"y\":0,\"z\":-0.4}},{\"count\":4,\"position\":{\"x\":-0.71,\"y\":0,\"z\":-0.4}},{\"count\":3,\"position\":{\"x\":-0.27,\"y\":0,\"z\":-0.4}},{\"count\":2,\"position\":{\"x\":0.18,\"y\":0,\"z\":-0.39}}]}", "XmlUI": "", "AttachedSnapPoints": [ { diff --git a/objects/fa9c2f/contained/606f23/script-state.json b/objects/fa9c2f/contained/606f23/script-state.json index 49ab81a63..c66cfc3f4 100644 --- a/objects/fa9c2f/contained/606f23/script-state.json +++ b/objects/fa9c2f/contained/606f23/script-state.json @@ -1,4 +1,11 @@ { + "reminder": { + "field": "ImageSecondaryURL", + "height": 1.5767, + "width": 2.3654, + "x": 0.7294, + "y": -0.2202 + }, "thresholds": [ { "elements": "02020000", diff --git a/objects/fdff9d/object.json b/objects/fdff9d/object.json index 91f258e2f..96fd38508 100644 --- a/objects/fdff9d/object.json +++ b/objects/fdff9d/object.json @@ -20,9 +20,9 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.4313998520374298, + "r": 0.43139979243278503, "g": 0.5254998803138733, - "b": 0.04709990322589874 + "b": 0.04709985852241516 }, "LayoutGroupSortIndex": 0, "Value": 0, diff --git a/objects/fe680a/object.json b/objects/fe680a/object.json index afc78fbd7..f79799303 100644 --- a/objects/fe680a/object.json +++ b/objects/fe680a/object.json @@ -22,7 +22,7 @@ "ColorDiffuse": { "r": 0.8392000198364258, "g": 0.5724999904632568, - "b": 0.39609989523887634 + "b": 0.39609983563423157 }, "Tags": [ "Uninteractable" diff --git a/objects/index.list b/objects/index.list index 7a31df479..a04904d53 100644 --- a/objects/index.list +++ b/objects/index.list @@ -61,11 +61,6 @@ b765cf dd3d47 c4ac1d 8f11a0 -5247c8 -759e18 -3d55c5 -0dbf0f -538feb EnergyCounters a1b7da fd0a22 @@ -186,5 +181,10 @@ fdff9d 985c7c 3d23e1 d35f30 +0dbf0f +5247c8 +538feb +3d55c5 +759e18 1da681 df9e09 diff --git a/savegame.json b/savegame.json index 18bfb5f06..90ac6eaae 100644 --- a/savegame.json +++ b/savegame.json @@ -1,7 +1,7 @@ { "SaveName": "Spirit Island [By MJ & iakona]", - "EpochTime": 1700928991, - "Date": "11/25/2023 4:16:31 PM", + "EpochTime": 1702353502, + "Date": "12/12/2023 3:58:22 AM", "VersionNumber": "v13.2.2", "GameMode": "Spirit Island [By MJ & iakona]", "GameType": "Game", @@ -622,18 +622,8 @@ }, { "Type": 0, - "Name": "CardMask", - "URL": "http://cloud-3.steamusercontent.com/ugc/2042997062885048476/D9364C4FF33C4A1D87D5C1B8B7690FB32F05E1E3/" - }, - { - "Type": 0, - "Name": "SpiritMask", - "URL": "http://cloud-3.steamusercontent.com/ugc/2050879298353456785/D66B86DC757A20FFFB766E7734211B7298E2B91C/" - }, - { - "Type": 0, - "Name": "SpiritMask2", - "URL": "http://cloud-3.steamusercontent.com/ugc/2050879298353456583/D2F073D12EE9155AF0687241797E99610212B347/" + "Name": "ReminderMask", + "URL": "http://cloud-3.steamusercontent.com/ugc/2144334608481559493/F8DA1252B35DC62BE5B9A13CF53FAD7CD5320C21/" } ], "SnapPoints": [ diff --git a/script.lua b/script.lua index a65a09c2e..01e6b554d 100644 --- a/script.lua +++ b/script.lua @@ -1,5 +1,5 @@ ---- Versioning -version = "4.0.4" +version = "4.1.0" versionGuid = "57d9fe" ---- Used with Spirit Board Scripts counterBag = "EnergyCounters" @@ -161,7 +161,7 @@ alternateBoardLayoutNames = { {"Leaf","Snake"}, {"Snail","Peninsula","V"}, {"Star","Flower","Caldera"}, - {"Pi"}, + {"Pi","Power"}, } ---- TTS Events Section @@ -452,19 +452,10 @@ function onObjectEnterScriptingZone(zone, obj) checkVictory() end elseif gameStarted and obj.hasTag("Setup") then - -- Whether the object has already done setup is stored in its script state, to persist across save/reload - local json = JSON.decode(obj.script_state) - if not json then - json = {} - end - if not json.setupComplete then - for color,data in pairs(selectedColors) do - if data.zone == zone then - local success = obj.call("doSetup", {color=color}) - json.setupComplete = success - obj.script_state = JSON.encode(json) - break - end + for color,data in pairs(selectedColors) do + if data.zone == zone then + handleDoSetup(obj, color) + break end end end @@ -2178,7 +2169,7 @@ function DealPowerCards(player, cardCount, deckZone, discardZone, playtestDeckZo for _=1, math.min(deck.getQuantity(), count) do local tempCard = deck.takeObject({ position = powerDealCentre + cardPlaceOffset[cardsAdded + 1], - flip = true, + rotation = Vector(0, 180, 0), callback_function = CreatePickPowerButton, }) tempCard.setLock(true) @@ -3771,16 +3762,7 @@ function runSpiritSetup() if data.zone then for _,obj in pairs(data.zone.getObjects()) do if obj.hasTag("Setup") then - -- Whether the object has already done setup is stored in its script state, to persist across save/reload - local json = JSON.decode(obj.script_state) - if not json then - json = {} - end - if not json.setupComplete then - local success = obj.call("doSetup", {color=color}) - json.setupComplete = success - obj.script_state = JSON.encode(json) - end + handleDoSetup(obj, color) end if obj.hasTag("Aspect") then @@ -3793,6 +3775,27 @@ function runSpiritSetup() end end end +function handleDoSetup(obj, color) + -- Whether the object has already done setup is stored in its script state, to persist across save/reload + local json = JSON.decode(obj.script_state) + if not json then + json = {} + end + if not json.setupComplete then + local spiritName = obj.getVar("spiritName") + if spiritName then + local spiritColor = getSpiritColor({name = spiritName}) + if color ~= spiritColor then + Player[color].broadcast("You have not picked "..spiritName.."!", Color.Red) + return + end + end + + local success = obj.call("doSetup", {color=color}) + json.setupComplete = success + obj.script_state = JSON.encode(json) + end +end function CompleteSetup() if setupCompleted then @@ -4094,194 +4097,204 @@ end scaleFactors = { -- Note that we scale the boards up more than the position, so the gaps -- don't increase in size. - [true]={name = "Large", position = 1.09, size = Vector(7.15, 1, 7.15)}, - [false]={name = "Standard", position = 1, size = Vector(6.5, 1, 6.5)}, + -- 'position' creates a width between the boards + [true]={name = "Large", position = 1, size = Vector(6.65, 1, 6.65)}, + [false]={name = "Standard", position = 1, size = Vector(6.65, 1, 6.65)}, } boardLayouts = { { -- 1 Board ["Thematic"] = { - { pos = Vector(-1.93, 1.08, 20.44), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + { pos = Vector(-1.93, 1.05, 20.44), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, }, ["Balanced"] = { - { pos = Vector(5.96, 1.08, 16.59), rot = Vector(0.00, 180.00, 0.00) }, + { pos = Vector(-5.11, 1.05, 20.91), rot = Vector(0.00, 180.00, 0.00) }, }, }, { -- 2 Board ["Thematic"] = { - { pos = Vector(9.54, 1.08, 18.07), rot = Vector(0.00, 180.00, 0.00), board = "E" }, - { pos = Vector(-10.34, 1.08, 18.04), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + { pos = Vector(9.54, 1.05, 18.07), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(-10.34, 1.05, 18.04), rot = Vector(0.00, 180.00, 0.00), board = "W" }, }, ["Balanced"] = { - { pos = Vector(9.13, 1.08, 25.29), rot = Vector(0.00, 180.00, 0.00) }, - { pos = Vector(0.29, 1.08, 10.21), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(3.60, 1.04, 34.30), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(-6.57, 1.04, 16.92), rot = Vector(0.00, 180.00, 0.00) }, }, ["Top to Top"] = { - { pos = Vector(9.13, 1.08, 25.29), rot = Vector(0.00, 0.00, 0.00) }, - { pos = Vector(-0.06, 1.08, 9.62), rot = Vector(0.00, 180.00, 0.00) }, + { pos = Vector(4.37, 1.04, 32.22), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(-5.81, 1.04, 14.92), rot = Vector(0.00, 180.00, 0.00) }, }, ["Coastline"] = { - { pos = Vector(2.54, 1.08, 10.34), rot = Vector(0.00, 240.69, 0.00) }, - { pos = Vector(20.38, 1.08, 9.96), rot = Vector(0.00, 240.69, 0.00) }, + { pos = Vector(11.74, 1.04, 15.80), rot = Vector(0.00, 240.00, 0.00) }, + { pos = Vector(-8.42, 1.04, 15.83), rot = Vector(0.00, 240.00, 0.00) }, }, ["Opposite Shores"] = { - { pos = Vector(-4.22, 1.08, 18.91), rot = Vector(0.00, 180.00, 0.00) }, - { pos = Vector(13.78, 1.08, 19.09), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(-5.11, 1.05, 20.91), rot = Vector(0.00, 180.00, 0.00) }, + { pos = Vector(15.08, 1.05, 20.79), rot = Vector(0.00, 0.00, 0.00) }, }, ["Fragment"] = { - { pos = Vector(-5.20, 1.08, 18.87), rot = Vector(0.00, 90.00, 0.00) }, - { pos = Vector(10.12, 1.08, 19.08), rot = Vector(0.00, 330.00, 0.00) }, + { pos = Vector(6.56, 1.04, 20.06), rot = Vector(0.00, 330.00, 0.00) }, + { pos = Vector(-10.96, 1.04, 20.09), rot = Vector(0.00, 90.00, 0.00) }, }, ["Inverted Fragment"] = { - { pos = Vector(-5.44, 1.08, 18.99), rot = Vector(0.00, 270.00, 0.00) }, - { pos = Vector(10.12, 1.08, 19.08), rot = Vector(0.00, 330.00, 0.00) }, + { pos = Vector(1.15, 1.04, 15.16), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(-13.87, 1.04, 24.00), rot = Vector(0.00, 300.00, 0.00) }, }, }, { -- 3 Board ["Thematic"] = { - { pos = Vector(24.91, 1.08, 10.20), rot = Vector(0.00, 180.00, 0.00), board = "E" }, - { pos = Vector(5.03, 1.08, 10.17), rot = Vector(0.00, 180.00, 0.00), board = "W" }, - { pos = Vector(15.03, 1.08, 27.16), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + { pos = Vector(24.91, 1.05, 10.20), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(5.03, 1.05, 10.17), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + { pos = Vector(15.03, 1.05, 27.16), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, }, ["Balanced"] = { - { pos = Vector(2.33, 1.08, 26.80), rot = Vector(0.00, 180.00, 0.00) }, - { pos = Vector(2.46, 1.08, 11.54), rot = Vector(0.00, 60.00, 0.00) }, - { pos = Vector(15.70, 1.08, 19.37), rot = Vector(0.00, 300.00, 0.00) }, + { pos = Vector(-6.47, 1.04, 25.50), rot = Vector(0.00, 120.00, 0.00) }, + { pos = Vector(8.78, 1.04, 34.19), rot = Vector(0.00, 240.00, 0.00) }, + { pos = Vector(8.70, 1.04, 16.73), rot = Vector(0.00, 0.00, 0.00) }, }, ["Coastline"] = { - { pos = Vector(-2.47, 1.08, 10.29), rot = Vector(0.00, 240.69, 0.00) }, - { pos = Vector(15.38, 1.08, 9.96), rot = Vector(0.00, 240.69, 0.00) }, - { pos = Vector(33.22, 1.08, 9.58), rot = Vector(0.00, 240.69, 0.00) }, + { pos = Vector(27.59, 1.05, 16.31), rot = Vector(0.00, 240.00, 0.00) }, + { pos = Vector(7.55, 1.05, 16.33), rot = Vector(0.00, 240.00, 0.00) }, + { pos = Vector(-12.56, 1.05, 16.38), rot = Vector(0.00, 240.00, 0.00) }, }, ["Sunrise"] = { - { pos = Vector(-6.01, 1.08, 10.63), rot = Vector(0.00, 60.00, 0.00) }, - { pos = Vector(7.19, 1.08, 18.54), rot = Vector(0.00, 300.00, 0.00) }, - { pos = Vector(20.60, 1.08, 10.69), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(18.28, 1.05, 15.00), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(3.30, 1.05, 23.74), rot = Vector(0.00, 300.00, 0.00) }, + { pos = Vector(-11.87, 1.05, 14.98), rot = Vector(0.00, 60.00, 0.00) }, }, }, { -- 4 Board ["Thematic"] = { - { pos = Vector(29.29, 1.08, 10.20), rot = Vector(0.00, 180.00, 0.00), board = "E" }, - { pos = Vector(9.41, 1.08, 10.17), rot = Vector(0.00, 180.00, 0.00), board = "W" }, - { pos = Vector(19.41, 1.08, 27.16), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, - { pos = Vector(-0.62, 1.08, 27.04), rot = Vector(0.00, 180.00, 0.00), board = "NW" }, + { pos = Vector(29.29, 1.05, 10.20), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(9.41, 1.05, 10.17), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + { pos = Vector(19.41, 1.05, 27.16), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + { pos = Vector(-0.62, 1.05, 27.04), rot = Vector(0.00, 180.00, 0.00), board = "NW" }, }, ["Balanced"] = { - { pos = Vector(2.36, 1.08, 26.47), rot = Vector(0.00, 180.00, 0.00) }, - { pos = Vector(20.40, 1.08, 26.64), rot = Vector(0.00, 0.00, 0.00) }, - { pos = Vector(-6.65, 1.08, 11.13), rot = Vector(0.00, 180.00, 0.00) }, - { pos = Vector(11.27, 1.08, 11.33), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(17.54, 1.04, 16.10), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(27.60, 1.04, 33.53), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(7.48, 1.04, 33.72), rot = Vector(0.00, 180.00, 0.00) }, + { pos = Vector(-2.58, 1.04, 16.31), rot = Vector(0.00, 180.00, 0.00) }, }, ["Leaf"] = { - { pos = Vector(7.05, 1.08, 34.30), rot = Vector(0.00, 300.27, 0.00) }, - { pos = Vector(20.53, 1.08, 26.36), rot = Vector(0.00, 0.27, 0.00) }, - { pos = Vector(-2.00, 1.08, 18.53), rot = Vector(0.00, 120.27, 0.00) }, - { pos = Vector(11.39, 1.08, 10.92), rot = Vector(0.00, 0.27, 0.00) }, + { pos = Vector(13.16, 1.04, 10.95), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(23.30, 1.04, 28.38), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(8.23, 1.04, 37.16), rot = Vector(0.00, 300.00, 0.00) }, + { pos = Vector(-2.01, 1.04, 19.78), rot = Vector(0.00, 120.00, 0.00) }, }, ["Snake"] = { - { pos = Vector(35.36, 1.08, 37.55), rot = Vector(0.00, 180.00, 0.00) }, - { pos = Vector(8.26, 1.08, 22.19), rot = Vector(0.00, 180.00, 0.00) }, - { pos = Vector(26.45, 1.08, 22.36), rot = Vector(0.00, 0.05, 0.00) }, - { pos = Vector(-0.73, 1.08, 7.00), rot = Vector(0.00, 0.01, 0.00) }, + { pos = Vector(24.16, 1.04, 25.35), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(-6.05, 1.04, 8.04), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(34.12, 1.04, 42.76), rot = Vector(0.00, 180.00, 0.00) }, + { pos = Vector(3.97, 1.04, 25.47), rot = Vector(0.00, 180.00, 0.00) }, }, }, { -- 5 Board ["Thematic"] = { - { pos = Vector(33.53, 1.08, 24.51), rot = Vector(0.00, 180.00, 0.00), board = "E" }, - { pos = Vector(13.65, 1.08, 24.48), rot = Vector(0.00, 180.00, 0.00), board = "W" }, - { pos = Vector(23.65, 1.08, 41.47), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, - { pos = Vector(3.62, 1.08, 41.35), rot = Vector(0.00, 180.00, 0.00), board = "NW" }, - { pos = Vector(43.40, 1.08, 7.63), rot = Vector(0.00, 180.00, 0.00), board = "SE" }, + { pos = Vector(33.53, 1.05, 24.51), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(13.65, 1.05, 24.48), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + { pos = Vector(23.65, 1.05, 41.47), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + { pos = Vector(3.62, 1.05, 41.35), rot = Vector(0.00, 180.00, 0.00), board = "NW" }, + { pos = Vector(43.40, 1.05, 7.63), rot = Vector(0.00, 180.00, 0.00), board = "SE" }, }, ["Balanced"] = { - { pos = Vector(3.32, 1.08, 32.42), rot = Vector(0.00, 120.00, 0.00) }, - { pos = Vector(25.46, 1.08, 24.68), rot = Vector(0.00, 240.00, 0.00) }, - { pos = Vector(38.99, 1.08, 32.44), rot = Vector(0.00, 300.00, 0.00) }, - { pos = Vector(12.18, 1.08, 16.81), rot = Vector(0.00, 120.02, 0.00) }, - { pos = Vector(25.62, 1.08, 9.32), rot = Vector(0.00, 359.99, 0.00) }, + { pos = Vector(23.69, 1.04, 14.13), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(8.52, 1.04, 22.96), rot = Vector(0.00, 120.00, 0.00) }, + { pos = Vector(38.97, 1.04, 40.27), rot = Vector(0.00, 300.00, 0.00) }, + { pos = Vector(23.72, 1.04, 31.66), rot = Vector(0.00, 240.00, 0.00) }, + { pos = Vector(-1.56, 1.04, 40.37), rot = Vector(0.00, 120.00, 0.00) }, }, ["Snail"] = { - { pos = Vector(26.42, 1.08, 41.16), rot = Vector(0.00, 240.00, 0.00) }, - { pos = Vector(13.22, 1.08, 33.29), rot = Vector(0.00, 120.02, 0.00) }, - { pos = Vector(26.68, 1.08, 25.70), rot = Vector(0.00, 359.99, 0.00) }, - { pos = Vector(8.72, 1.08, 10.08), rot = Vector(0.00, 60.01, 0.00) }, - { pos = Vector(26.67, 1.08, 9.98), rot = Vector(0.00, 60.00, 0.00) }, + { pos = Vector(26.39, 1.04, 25.76), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(11.23, 1.04, 34.59), rot = Vector(0.00, 120.00, 0.00) }, + { pos = Vector(26.25, 1.04, 8.29), rot = Vector(0.00, 60.00, 0.00) }, + { pos = Vector(26.43, 1.04, 43.30), rot = Vector(0.00, 240.00, 0.00) }, + { pos = Vector(6.12, 1.04, 8.28), rot = Vector(0.00, 60.00, 0.00) }, }, ["Peninsula"] = { - { pos = Vector(10.81, 1.08, 32.03), rot = Vector(0.00, 150.07, 0.00) }, - { pos = Vector(26.27, 1.08, 32.27), rot = Vector(0.00, 270.07, 0.00) }, - { pos = Vector(18.66, 1.08, 18.81), rot = Vector(0.00, 30.09, 0.00) }, - { pos = Vector(41.71, 1.08, 23.07), rot = Vector(0.00, 270.25, 0.00) }, - { pos = Vector(57.12, 1.08, 13.96), rot = Vector(0.00, 270.25, 0.00) }, + { pos = Vector(14.10, 1.04, 20.87), rot = Vector(0.00, 30.00, 0.00) }, + { pos = Vector(5.39, 1.04, 36.09), rot = Vector(0.00, 150.00, 0.00) }, + { pos = Vector(57.76, 1.04, 15.84), rot = Vector(0.00, 270.00, 0.00) }, + { pos = Vector(22.90, 1.04, 36.03), rot = Vector(0.00, 270.00, 0.00) }, + { pos = Vector(40.32, 1.04, 25.90), rot = Vector(0.00, 270.00, 0.00) }, }, ["V"] = { - { pos = Vector(0.17, 1.08, 33.75), rot = Vector(0.00, 119.99, 0.00) }, - { pos = Vector(40.67, 1.08, 41.60), rot = Vector(0.00, 0.01, 0.00) }, - { pos = Vector(8.96, 1.08, 18.16), rot = Vector(0.00, 119.99, 0.00) }, - { pos = Vector(31.52, 1.08, 26.14), rot = Vector(0.00, 359.99, 0.00) }, - { pos = Vector(22.40, 1.08, 10.67), rot = Vector(0.00, 0.01, 0.00) }, + { pos = Vector(37.19, 1.04, 25.59), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(27.05, 1.04, 8.14), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(47.35, 1.04, 42.88), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(11.90, 1.04, 16.96), rot = Vector(0.00, 120.00, 0.00) }, + { pos = Vector(1.90, 1.04, 34.44), rot = Vector(0.00, 120.00, 0.00) }, }, }, { -- 6 Board ["Thematic"] = { - { pos = Vector(33.53, 1.08, 24.51), rot = Vector(0.00, 180.00, 0.00), board = "E" }, - { pos = Vector(13.65, 1.08, 24.48), rot = Vector(0.00, 180.00, 0.00), board = "W" }, - { pos = Vector(23.65, 1.08, 41.47), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, - { pos = Vector(3.62, 1.08, 41.35), rot = Vector(0.00, 180.00, 0.00), board = "NW" }, - { pos = Vector(43.40, 1.08, 7.63), rot = Vector(0.00, 180.00, 0.00), board = "SE" }, - { pos = Vector(23.59, 1.08, 7.55), rot = Vector(0.00, 180.00, 0.00), board = "SW" }, + { pos = Vector(33.53, 1.05, 24.51), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(13.65, 1.05, 24.48), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + { pos = Vector(23.65, 1.05, 41.47), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + { pos = Vector(3.62, 1.05, 41.35), rot = Vector(0.00, 180.00, 0.00), board = "NW" }, + { pos = Vector(43.40, 1.05, 7.63), rot = Vector(0.00, 180.00, 0.00), board = "SE" }, + { pos = Vector(23.59, 1.05, 7.55), rot = Vector(0.00, 180.00, 0.00), board = "SW" }, }, ["Balanced"] = { - { pos = Vector(4.31, 1.08, 29.13), rot = Vector(0.00, 150.01, 0.00) }, - { pos = Vector(19.72, 1.08, 29.32), rot = Vector(0.00, 270.00, 0.00) }, - { pos = Vector(43.04, 1.08, 33.51), rot = Vector(0.00, 210.00, 0.00) }, - { pos = Vector(12.25, 1.08, 15.90), rot = Vector(0.00, 30.01, 0.00) }, - { pos = Vector(35.44, 1.08, 20.02), rot = Vector(0.00, 90.00, 0.00) }, - { pos = Vector(50.90, 1.08, 20.26), rot = Vector(0.00, 330.00, 0.00) }, + { pos = Vector(56.74, 1.04, 19.56), rot = Vector(0.00, 330.00, 0.00) }, + { pos = Vector(48.05, 1.04, 34.70), rot = Vector(0.00, 210.00, 0.00) }, + { pos = Vector(39.25, 1.04, 19.60), rot = Vector(0.00, 90.00, 0.00) }, + { pos = Vector(13.09, 1.04, 14.65), rot = Vector(0.00, 30.00, 0.00) }, + { pos = Vector(21.92, 1.04, 29.86), rot = Vector(0.00, 270.00, 0.00) }, + { pos = Vector(4.39, 1.04, 29.83), rot = Vector(0.00, 150.00, 0.00) }, }, ["Star"] = { - { pos = Vector(33.19, 1.08, 40.36), rot = Vector(0.00, 330.00, 0.00) }, - { pos = Vector(40.94, 1.08, 26.76), rot = Vector(0.00, 30.00, 0.00) }, - { pos = Vector(33.16, 1.08, 13.18), rot = Vector(0.00, 90.00, 0.00) }, - { pos = Vector(17.52, 1.08, 13.25), rot = Vector(0.00, 149.99, 0.00) }, - { pos = Vector(9.71, 1.08, 26.79), rot = Vector(0.00, 210.00, 0.00) }, - { pos = Vector(17.50, 1.08, 40.33), rot = Vector(0.00, 269.99, 0.00) }, + { pos = Vector(22.53, 1.04, 43.81), rot = Vector(0.00, 270.00, 0.00) }, + { pos = Vector(13.69, 1.04, 28.71), rot = Vector(0.00, 210.00, 0.00) }, + { pos = Vector(22.26, 1.04, 13.49), rot = Vector(0.00, 150.00, 0.00) }, + { pos = Vector(39.74, 1.04, 13.40), rot = Vector(0.00, 90.00, 0.00) }, + { pos = Vector(48.60, 1.04, 28.43), rot = Vector(0.00, 30.00, 0.00) }, + { pos = Vector(40.04, 1.04, 43.60), rot = Vector(0.00, 330.00, 0.00) }, }, ["Flower"] = { - { pos = Vector(22.76, 1.08, 45.03), rot = Vector(0.00, 162.62, 0.00) }, - { pos = Vector(33.80, 1.08, 24.36), rot = Vector(0.00, 282.64, 0.00) }, - { pos = Vector(46.88, 1.08, 12.07), rot = Vector(0.00, 282.62, 0.00) }, - { pos = Vector(18.70, 1.08, 27.55), rot = Vector(0.00, 162.65, 0.00) }, - { pos = Vector(23.48, 1.08, 12.88), rot = Vector(0.00, 42.62, 0.00) }, - { pos = Vector(6.30, 1.08, 7.69), rot = Vector(0.00, 42.61, 0.00) }, + { pos = Vector(6.32, 1.04, 8.26), rot = Vector(0.00, 45.00, 0.00) }, + { pos = Vector(26.59, 1.04, 49.73), rot = Vector(0.00, 165.00, 0.00) }, + { pos = Vector(52.48, 1.04, 11.55), rot = Vector(0.00, 285.00, 0.00) }, + { pos = Vector(25.83, 1.04, 13.42), rot = Vector(0.00, 45.00, 0.00) }, + { pos = Vector(38.29, 1.04, 25.78), rot = Vector(0.00, 285.00, 0.00) }, + { pos = Vector(21.36, 1.04, 30.34), rot = Vector(0.00, 165.00, 0.00) }, }, ["Caldera"] = { - { pos = Vector(-0.20, 1.08, 31.44), rot = Vector(0.00, 120.42, 0.00) }, - { pos = Vector(13.16, 1.08, 39.17), rot = Vector(0.00, 240.44, 0.00) }, - { pos = Vector(31.10, 1.08, 38.86), rot = Vector(0.00, 240.43, 0.00) }, - { pos = Vector(8.54, 1.08, 15.76), rot = Vector(0.00, 120.46, 0.00) }, - { pos = Vector(31.18, 1.08, 23.41), rot = Vector(0.00, 0.43, 0.00) }, - { pos = Vector(21.95, 1.08, 8.04), rot = Vector(0.00, 0.42, 0.00) }, + { pos = Vector(43.43, 1.03, 24.82), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(18.13, 1.03, 16.19), rot = Vector(0.00, 120.00, 0.00) }, + { pos = Vector(23.22, 1.03, 42.43), rot = Vector(0.00, 240.00, 0.00) }, + { pos = Vector(8.10, 1.03, 33.61), rot = Vector(0.00, 120.00, 0.00) }, + { pos = Vector(33.34, 1.03, 7.42), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(43.37, 1.03, 42.33), rot = Vector(0.00, 240.00, 0.00) }, }, }, { -- 7 Board ["Thematic"] = {}, ["Balanced"] = { - { pos = Vector(-2.92, 1.08, 26.63), rot = Vector(0.00, 140.00, 0.00) }, - { pos = Vector(12.33, 1.08, 29.40), rot = Vector(0.00, 260.00, 0.00) }, - { pos = Vector(7.18, 1.08, 14.98), rot = Vector(0.00, 20.00, 0.00) }, - { pos = Vector(29.16, 1.08, 23.23), rot = Vector(0.00, 260.00, 0.00) }, - { pos = Vector(46.29, 1.08, 16.93), rot = Vector(0.00, 80.00, 0.00) }, - { pos = Vector(51.43, 1.08, 31.42), rot = Vector(0.00, 200.00, 0.00) }, - { pos = Vector(61.44, 1.08, 19.74), rot = Vector(0.00, 320.00, 0.00) }, + { pos = Vector(51.80, 1.05, 46.82), rot = Vector(0.07, 180.00, 359.64) }, + { pos = Vector(51.78, 1.05, 29.25), rot = Vector(359.65, 60.00, 0.12) }, + { pos = Vector(66.96, 1.05, 38.01), rot = Vector(0.27, 299.99, 0.24) }, + { pos = Vector(31.62, 1.05, 29.39), rot = Vector(0.00, 239.99, 0.00) }, + { pos = Vector(-3.63, 1.05, 20.60), rot = Vector(359.93, 120.02, 359.97) }, + { pos = Vector(11.55, 1.05, 11.83), rot = Vector(358.60, 359.99, 359.91) }, + { pos = Vector(11.60, 1.05, 29.37), rot = Vector(0.00, 240.00, 0.00) }, }, ["Pi"] = { - { pos = Vector(5.50, 1.06, 8.62), rot = Vector(0.00, 0.00, 0.00) }, - { pos = Vector(14.48, 1.07, 24.01), rot = Vector(0.00, 0.00, 0.00) }, - { pos = Vector(14.36, 1.09, 39.34), rot = Vector(0.00, 240.00, 0.00) }, - { pos = Vector(32.18, 1.05, 39.30), rot = Vector(0.00, 240.00, 0.00) }, - { pos = Vector(50.00, 1.05, 39.22), rot = Vector(0.00, 240.00, 0.00) }, - { pos = Vector(50.02, 1.05, 23.67), rot = Vector(0.00, 180.00, 0.00) }, - { pos = Vector(41.01, 1.05, 8.27), rot = Vector(0.00, 180.00, 0.00) }, + { pos = Vector(55.04, 1.05, 44.78), rot = Vector(0.00, 240.00, 0.00) }, + { pos = Vector(34.91, 1.05, 44.84), rot = Vector(0.00, 240.00, 0.00) }, + { pos = Vector(14.87, 1.05, 44.93), rot = Vector(0.00, 240.00, 0.00) }, + { pos = Vector(44.97, 1.05, 9.82), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(54.97, 1.05, 27.29), rot = Vector(0.00, 180.00, 0.00) }, + { pos = Vector(14.76, 1.05, 27.46), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(4.54, 1.05, 10.14), rot = Vector(0.00, 180.00, 0.00) }, + }, + ["Power"] = { + { pos = Vector(60.79, 1.05, 27.79), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(40.59, 1.05, 27.94), rot = Vector(0.00, 180.00, 0.00) }, + { pos = Vector(30.63, 1.05, 10.48), rot = Vector(0.00, 0.00, 0.00) }, + { pos = Vector(5.48, 1.05, 36.71), rot = Vector(0.00, 120.00, 0.00) }, + { pos = Vector(15.51, 1.05, 19.38), rot = Vector(0.00, 120.00, 0.00) }, + { pos = Vector(40.69, 1.05, 45.44), rot = Vector(0.00, 240.00, 0.00) }, + { pos = Vector(20.68, 1.05, 45.42), rot = Vector(0.00, 240.00, 0.00) }, }, }, } @@ -7733,16 +7746,109 @@ function onObjectDestroy(obj) end end end -function getCardImageURL(card) - local cardData = card.getData() - if cardData.CustomDeck then - for _, data in pairs(cardData.CustomDeck) do - if data.NumWidth == 1 and data.NumHeight == 1 then - return data.FaceURL +function getReminderLocation(params) + local obj = params.obj + if obj == nil then + return nil + end + + -- Get it from the script state if it's there + local state = {} + if obj.script_state ~= nil and obj.script_state ~= "" then + state = JSON.decode(obj.script_state) + end + if state.reminder ~= nil then + return state.reminder + end + + -- Otherwise, use a sensible default + if obj.type == "Card" then + return { + field = "FaceURL", + x = -0.17, + y = -0.45, + width = 1.85, + height = 2.59, + } + elseif obj.hasTag("Spirit") then + return { + field = "ImageSecondaryURL", + x = 0.63, + y = -0.23, + width = 2.40, + height = 1.60, + } + else + return nil + end +end +function getReminderImageAttributes(params) + local objSize = 200 -- The height/width of UI panel to be the same size as the object + + local obj = params.obj + if obj == nil then + return {image = ""} + end + + local location = params.location + if location == nil then + location = getReminderLocation({obj = obj}) + end + + local imageURL = "" + local data = obj.getData() + if obj.type == "Card" then + if data.CustomDeck then + local deckID, deckData = next(data.CustomDeck) + deckID = tonumber(deckID) + imageURL = deckData[location.field] + local row = 0 -- 0-indexed + local column = 0 -- 0-indexed + if data.CardID and deckID then + local cardIndex = data.CardID - 100 * deckID -- 0-indexed + if cardIndex >= 0 and cardIndex < deckData.NumWidth * deckData.NumHeight then + column = cardIndex % deckData.NumWidth + row = (cardIndex - column) / deckData.NumWidth + end end + location.x = location.x + ((deckData.NumWidth - 1) / 2 - column) * location.width + location.y = location.y - ((deckData.NumHeight - 1) / 2 - row) * location.height + location.width = location.width * deckData.NumWidth + location.height = location.height * deckData.NumHeight end + else + imageURL = data.CustomImage[location.field] + end + + return { + image = imageURL, + position = tostring(location.x * objSize).." "..tostring(location.y * objSize).." 0", + width = tostring(location.width * objSize), + height = tostring(location.height * objSize), + } +end +function getReminderXml(params) + local attributesString = "" + for key,value in pairs(getReminderImageAttributes(params)) do + attributesString = attributesString.." "..key.."=\""..value.."\"" + end + return "" +end +function setReminderLabel(params) + local obj, num = params.obj, params.num + obj.clearButtons(); + if num > 0 then + obj.createButton({ + click_function = "nullFunc", + function_owner = Global, + label = tostring(num), + position = Vector(0,0.1,0), + font_size = 700, + font_color = Color.White, + width = 0, + height = 0, + }) end - return nil end function spawnMaskedReminder(color, obj, isMarker) if obj == nil then @@ -7751,38 +7857,21 @@ function spawnMaskedReminder(color, obj, isMarker) local objData = obj.getData() local position = obj.getPosition() - local imageURL, maskImage - local panelWidth, panelHeight, panelX, panelY local name, tags, scale + local scriptSuffix, onLoadSuffix = "", "" if obj.hasTag("Spirit") and objData.Name == "Custom_Tile" then local spiritColor = getSpiritColor({name = obj.getName()}) if spiritColor then color = spiritColor end - position = position + Vector(0, 0.5, 0) - imageURL = objData.CustomImage.ImageSecondaryURL - if obj.hasTag("Lower Spirit Image") then - panelWidth, panelHeight, panelX, panelY = 378, 252, -97, -33 - maskImage = "SpiritMask2" - else - panelWidth, panelHeight, panelX, panelY = 480, 320, -127, 46 - maskImage = "SpiritMask" - end elseif isPowerCard({card = obj}) then position = position + Vector(0, 0.02, 0) - imageURL = getCardImageURL(obj) - panelWidth, panelHeight, panelX, panelY = 350, 490, 31, 86 - maskImage = "CardMask" else return end - if imageURL == nil then - return - end - if isMarker then name = obj.getName() tags = {"Mask", "Spirit Marker"} @@ -7791,6 +7880,8 @@ function spawnMaskedReminder(color, obj, isMarker) name = color.."'s "..obj.getName().." Reminder" tags = {"Destroy", "Mask", "Reminder Token"} scale = Vector(0.9, 0.9, 0.9) + scriptSuffix = "function onNumberTyped(_, num) Global.call(\"setReminderLabel\", {obj = self, num = num}); self.script_state = tostring(num) end" + onLoadSuffix = "self.max_typed_number = 99; if(saved_data ~= \"\") then onNumberTyped(nil, tonumber(saved_data)) end" end local data = { @@ -7809,8 +7900,8 @@ function spawnMaskedReminder(color, obj, isMarker) DiffuseURL = "http://cloud-3.steamusercontent.com/ugc/2050879298352687582/0903B5F8D08AB12D8F4C05A703A9E193F049A702/", MaterialIndex = 1, }, - LuaScript = "function onLoad() Wait.frames(function() self.UI.setXml(self.UI.getXml()) end, 2) end", - XmlUI = "", + LuaScript = "function onLoad(saved_data) Wait.frames(function() self.UI.setXml(self.UI.getXml()) end, 2);"..onLoadSuffix.." end "..scriptSuffix, + XmlUI = getReminderXml({obj = obj}), } if Tints[color] then @@ -7854,17 +7945,14 @@ function applyPowerCardContextMenuItems(card) end end, false) - - -- Only allow reminder tokens to be generated on individual card images not deck image since mask requires that - if getCardImageURL(card) then - card.addContextMenuItem( - "Get Reminder Token", - function(player_color) spawnMaskedReminder(player_color, card, false) end, - false) - end + card.addContextMenuItem( + "Get Reminder Token", + function(player_color) spawnMaskedReminder(player_color, card, false) end, + false) end function applySpiritContextMenuItems(spirit) - if spirit.getData().Name == "Custom_Tile" then + local data = spirit.getData() + if data.Name == "Custom_Tile" then spirit.addContextMenuItem( "Get Spirit Marker", function(player_color) spawnMaskedReminder(player_color, spirit, true) end, @@ -7874,7 +7962,38 @@ function applySpiritContextMenuItems(spirit) "Get Reminder Token", function(player_color) spawnMaskedReminder(player_color, spirit, false) end, false) + elseif data.Name == "Custom_Model_Bag" then + spirit.addContextMenuItem( + "Duplicate Spirit", + function(player_color) duplicateSpirit(spirit) end, + false) + end +end + +function duplicateSpirit(spirit) + local suffix = " Copy" + local newName = spirit.getName()..suffix + local offset = 1 + + local function isNameTaken() + for _,obj in pairs(getObjectsWithTag("Spirit")) do + if obj.getName() == newName then + return true + end + end + return false + end + while isNameTaken() do + newName = newName..suffix + offset = offset + 1 end + + local json = spirit.getJSON(false) + json = json:gsub(spirit.getName(), newName) + spawnObjectJSON({ + json = json, + position = spirit.getPosition() + Vector(0, 4 * offset, 0) + }) end function grabSpiritMarkers()