diff --git a/objects/125e82/object.json b/objects/125e82/object.json index 9ce8e9d84..623adc6e3 100644 --- a/objects/125e82/object.json +++ b/objects/125e82/object.json @@ -2,7 +2,7 @@ "Name": "Custom_Assetbundle", "Transform": { "posX": 42.0, - "posY": 0.81, + "posY": 0.85, "posZ": -29.9, "rotX": 0.0, "rotY": 180.0, diff --git a/objects/2230b3/contained/10d56e/object.json b/objects/2230b3/contained/10d56e/object.json index dbf86cb3c..a2c656a5c 100644 --- a/objects/2230b3/contained/10d56e/object.json +++ b/objects/2230b3/contained/10d56e/object.json @@ -42,14 +42,14 @@ "GridProjection": false, "HideWhenFaceDown": true, "Hands": true, - "CardID": 261700, + "CardID": 262002, "SidewaysCard": false, "CustomDeck": { - "2617": { - "FaceURL": "https://steamusercontent-a.akamaihd.net/ugc/14173935050270112/6DE23461763B3273CA728B9C935713ECC3DE59AE/", + "2620": { + "FaceURL": "https://steamusercontent-a.akamaihd.net/ugc/17538001415825719266/2EEEA6B46847EDEE7B868173E2D26082652DDD34/", "BackURL": "https://steamusercontent-a.akamaihd.net/ugc/14170847386118717/E293A387637D7541BE79FE7CABA80AF7A9853323/", - "NumWidth": 1, - "NumHeight": 1, + "NumWidth": 2, + "NumHeight": 2, "BackIsHidden": true, "UniqueBack": false, "Type": 0 diff --git a/objects/2230b3/contained/14b03e/object.json b/objects/2230b3/contained/14b03e/object.json index 0ec8036c2..4177ec62f 100644 --- a/objects/2230b3/contained/14b03e/object.json +++ b/objects/2230b3/contained/14b03e/object.json @@ -42,14 +42,14 @@ "GridProjection": false, "HideWhenFaceDown": true, "Hands": true, - "CardID": 261400, + "CardID": 262003, "SidewaysCard": false, "CustomDeck": { - "2614": { - "FaceURL": "https://steamusercontent-a.akamaihd.net/ugc/14173935050270227/1DB5D348689A179B507B0313D1755170F7A8FC30/", + "2620": { + "FaceURL": "https://steamusercontent-a.akamaihd.net/ugc/17538001415825719266/2EEEA6B46847EDEE7B868173E2D26082652DDD34/", "BackURL": "https://steamusercontent-a.akamaihd.net/ugc/14170847386118717/E293A387637D7541BE79FE7CABA80AF7A9853323/", - "NumWidth": 1, - "NumHeight": 1, + "NumWidth": 2, + "NumHeight": 2, "BackIsHidden": true, "UniqueBack": false, "Type": 0 diff --git a/objects/2230b3/contained/14b03e/script.lua b/objects/2230b3/contained/14b03e/script.lua index 65030463b..4001b79ca 100644 --- a/objects/2230b3/contained/14b03e/script.lua +++ b/objects/2230b3/contained/14b03e/script.lua @@ -1,2 +1,2 @@ -elements="01110000" -energy=1 +elements="01110100" +energy=2 diff --git a/objects/2230b3/contained/888522/object.json b/objects/2230b3/contained/888522/object.json index 3b1f45541..69c711365 100644 --- a/objects/2230b3/contained/888522/object.json +++ b/objects/2230b3/contained/888522/object.json @@ -42,14 +42,14 @@ "GridProjection": false, "HideWhenFaceDown": true, "Hands": true, - "CardID": 261600, + "CardID": 262001, "SidewaysCard": false, "CustomDeck": { - "2616": { - "FaceURL": "https://steamusercontent-a.akamaihd.net/ugc/14173935050270348/27456D012C9919A4CD9BAA09C8A7523DD87985A7/", + "2620": { + "FaceURL": "https://steamusercontent-a.akamaihd.net/ugc/17538001415825719266/2EEEA6B46847EDEE7B868173E2D26082652DDD34/", "BackURL": "https://steamusercontent-a.akamaihd.net/ugc/14170847386118717/E293A387637D7541BE79FE7CABA80AF7A9853323/", - "NumWidth": 1, - "NumHeight": 1, + "NumWidth": 2, + "NumHeight": 2, "BackIsHidden": true, "UniqueBack": false, "Type": 0 diff --git a/objects/2230b3/contained/911ecb/contained/c964ff/object.json b/objects/2230b3/contained/911ecb/contained/c964ff/object.json index 252bea4fa..c1b9c90d2 100644 --- a/objects/2230b3/contained/911ecb/contained/c964ff/object.json +++ b/objects/2230b3/contained/911ecb/contained/c964ff/object.json @@ -24,9 +24,6 @@ "g": 0.1603, "b": 0.1518 }, - "Tags": [ - "Modify Card Gain" - ], "LayoutGroupSortIndex": 0, "Value": 0, "Locked": false, @@ -42,7 +39,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/14173935050252002/F80549AF1D817C8EAC501D71C60E0FF734D88762/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/16847704530730587702/5CBEC1D5383DA2A2F842B35AE352CA60A9C63105/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -168,23 +165,23 @@ }, { "Position": { - "x": 0.2084, + "x": 0.2828, "y": 0.2, - "z": -0.6614 + "z": -0.6572 } }, { "Position": { - "x": 0.316, + "x": 0.2845, "y": 0.2, - "z": -0.2847 + "z": -0.2874 } }, { "Position": { - "x": 0.3115, + "x": 0.2853, "y": 0.2, - "z": 0.1418 + "z": 0.1425 } }, { diff --git a/objects/2230b3/contained/911ecb/contained/c964ff/script-state.json b/objects/2230b3/contained/911ecb/contained/c964ff/script-state.json index 6c53e52da..5d20f539f 100644 --- a/objects/2230b3/contained/911ecb/contained/c964ff/script-state.json +++ b/objects/2230b3/contained/911ecb/contained/c964ff/script-state.json @@ -1,7 +1,7 @@ { "thresholds": [ { - "elements": "00100100", + "elements": "00200000", "position": { "x": -0.62, "y": 0, @@ -9,7 +9,7 @@ } }, { - "elements": "00300200", + "elements": "00300202", "position": { "x": -0.62, "y": 0, @@ -17,7 +17,7 @@ } }, { - "elements": "00320300", + "elements": "00400202", "position": { "x": -0.62, "y": 0, @@ -25,7 +25,7 @@ } }, { - "elements": "00010101", + "elements": "00020000", "position": { "x": -0.62, "y": 0, @@ -33,7 +33,7 @@ } }, { - "elements": "00030102", + "elements": "00030202", "position": { "x": -0.62, "y": 0, @@ -41,7 +41,7 @@ } }, { - "elements": "00030303", + "elements": "00040202", "position": { "x": -0.62, "y": 0, @@ -49,7 +49,7 @@ } }, { - "elements": "10000101", + "elements": "20000000", "position": { "x": -0.62, "y": 0, @@ -57,7 +57,7 @@ } }, { - "elements": "30000102", + "elements": "30000202", "position": { "x": -0.62, "y": 0, @@ -65,7 +65,7 @@ } }, { - "elements": "30000203", + "elements": "40000202", "position": { "x": -0.62, "y": 0, diff --git a/objects/2230b3/contained/911ecb/contained/c964ff/script.lua b/objects/2230b3/contained/911ecb/contained/c964ff/script.lua index 88db32223..59d8c2655 100644 --- a/objects/2230b3/contained/911ecb/contained/c964ff/script.lua +++ b/objects/2230b3/contained/911ecb/contained/c964ff/script.lua @@ -5,41 +5,3 @@ function onLoad(saved_data) end end -- card loading end - -function hasBoundlessAvarice() - local snaps = self.getSnapPoints() - local hits = Physics.cast({ - origin = self.positionToWorld(snaps[21].position), - direction = Vector(0, 1, 0), - max_distance = 1, - type = 1, --ray - -- debug = true - }) - for _, hit in pairs(hits) do - if hit.hit_object.getName() == "Treasure Marker" then - return true - end - end - return false -end - -function isThisPlayer(color) - local selected = Global.getTable("selectedColors")[color] - if not selected then return false end - - -- Go through all the zones this object is in to see if one is the relevant player's zone - for _,zone in ipairs(self.getZones()) do - if zone == selected.zone then - return true - end - end - return false -end - -function modifyCardGain(params) - if params.major and hasBoundlessAvarice() and isThisPlayer(params.color) then - return params.count + 2 - else - return params.count - end -end diff --git a/objects/2230b3/contained/95a82a/object.json b/objects/2230b3/contained/95a82a/object.json index 3441a93e7..b9caf3c32 100644 --- a/objects/2230b3/contained/95a82a/object.json +++ b/objects/2230b3/contained/95a82a/object.json @@ -11,7 +11,7 @@ "scaleY": 1.0, "scaleZ": 0.6499 }, - "Nickname": "Lair Marker", + "Nickname": "Hoard Marker", "Description": "", "GMNotes": "", "AltLookAngle": { diff --git a/objects/2230b3/contained/9e601f/contained/09c960/object.json b/objects/2230b3/contained/9e601f/contained/09c960/object.json index c5c872888..c8c901d93 100644 --- a/objects/2230b3/contained/9e601f/contained/09c960/object.json +++ b/objects/2230b3/contained/9e601f/contained/09c960/object.json @@ -1,17 +1,17 @@ { - "Name": "Custom_Token", + "Name": "Custom_Model", "Transform": { - "posX": 50.885, - "posY": 3.0355, - "posZ": 14.2339, + "posX": 0.96, + "posY": 1.7472, + "posZ": 0.96, "rotX": 0.0, "rotY": 0.0, "rotZ": 0.0, - "scaleX": 0.3331, - "scaleY": 1.0, - "scaleZ": 0.3331 + "scaleX": 1.4, + "scaleY": 1.4, + "scaleZ": 1.4 }, - "Nickname": "Metal Token", + "Nickname": "Metal", "Description": "", "GMNotes": "", "AltLookAngle": { @@ -24,6 +24,11 @@ "g": 0.4221, "b": 0.5383 }, + "Tags": [ + "Destroy", + "Highlight", + "Label" + ], "LayoutGroupSortIndex": 0, "Value": 0, "Locked": false, @@ -38,16 +43,24 @@ "GridProjection": false, "HideWhenFaceDown": false, "Hands": false, - "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/2473119299006881282/7A3A6A5F7F1ED7B825E03E6FF5DEC402EF0D708B/", - "ImageSecondaryURL": "", - "ImageScalar": 1.0, - "WidthScale": 0.0, - "CustomToken": { - "Thickness": 0.2, - "MergeDistancePixels": 15.0, - "StandUp": false, - "Stackable": false - } + "CustomMesh": { + "MeshURL": "https://steamusercontent-a.akamaihd.net/ugc/13953333404298826878/82E8D8B5C8CE0CAB6ED59D90B93790D0381D78C8/", + "DiffuseURL": "https://steamusercontent-a.akamaihd.net/ugc/14618988941293102057/BB32F399C55FD1956F4BB55A15DA2008EEFDD6E9/", + "NormalURL": "", + "ColliderURL": "", + "Convex": true, + "MaterialIndex": 1, + "TypeIndex": 5, + "CustomShader": { + "SpecularColor": { + "r": 1.0, + "g": 1.0, + "b": 1.0 + }, + "SpecularIntensity": 0.0, + "SpecularSharpness": 2.0, + "FresnelStrength": 0.0 + }, + "CastShadows": true } } diff --git a/objects/2230b3/contained/9e601f/object.json b/objects/2230b3/contained/9e601f/object.json index 76ed3d3bc..1e3d1e651 100644 --- a/objects/2230b3/contained/9e601f/object.json +++ b/objects/2230b3/contained/9e601f/object.json @@ -1,17 +1,17 @@ { - "Name": "Infinite_Bag", + "Name": "Custom_Model_Infinite_Bag", "Transform": { - "posX": 77.332, - "posY": 0.995, - "posZ": 120.5617, + "posX": 143.3882, + "posY": 1.3039, + "posZ": 105.6027, "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 1.0, - "scaleY": 1.0, - "scaleZ": 1.0 + "scaleX": 2.2, + "scaleY": 2.2, + "scaleZ": 2.2 }, - "Nickname": "Metal Tokens", + "Nickname": "Metal", "Description": "", "GMNotes": "", "AltLookAngle": { @@ -20,9 +20,9 @@ "z": 0.0 }, "ColorDiffuse": { - "r": 0.3059, - "g": 0.3726, - "b": 1.0 + "r": 0.3667, + "g": 0.4221, + "b": 0.5383 }, "LayoutGroupSortIndex": 0, "Value": 0, @@ -39,5 +39,25 @@ "HideWhenFaceDown": false, "Hands": false, "MaterialIndex": -1, - "MeshIndex": -1 + "MeshIndex": -1, + "CustomMesh": { + "MeshURL": "https://steamusercontent-a.akamaihd.net/ugc/13953333404298826878/82E8D8B5C8CE0CAB6ED59D90B93790D0381D78C8/", + "DiffuseURL": "https://steamusercontent-a.akamaihd.net/ugc/14618988941293102057/BB32F399C55FD1956F4BB55A15DA2008EEFDD6E9/", + "NormalURL": "", + "ColliderURL": "", + "Convex": true, + "MaterialIndex": 1, + "TypeIndex": 7, + "CustomShader": { + "SpecularColor": { + "r": 1.0, + "g": 1.0, + "b": 1.0 + }, + "SpecularIntensity": 0.0, + "SpecularSharpness": 2.0, + "FresnelStrength": 0.0 + }, + "CastShadows": true + } } diff --git a/objects/2230b3/contained/b6dd02/object.json b/objects/2230b3/contained/b6dd02/object.json index 5dfa3c466..4e0a37d6d 100644 --- a/objects/2230b3/contained/b6dd02/object.json +++ b/objects/2230b3/contained/b6dd02/object.json @@ -42,8 +42,8 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/14170847386118415/78E57C380DC814C8891F19FA6A199A909BE48955/", - "ImageSecondaryURL": "https://steamusercontent-a.akamaihd.net/ugc/14173935050251672/8D891F0585DE0BFBD601D67E3256677FCE547B0D/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/12212359852422174451/9ED37B17BD85A2DD4CCD37920498A356E116BAD8/", + "ImageSecondaryURL": "https://steamusercontent-a.akamaihd.net/ugc/17352148892339766846/4F2CF8A242FAA7A3A75BE0A38B970A27A50C0974/", "ImageScalar": 1.0, "WidthScale": 0.0, "CustomTile": { @@ -98,37 +98,37 @@ }, { "Position": { - "x": -0.0224, + "x": -1.3439, "y": 0.2, - "z": 0.005 + "z": -0.386 } }, { "Position": { - "x": -0.246, + "x": -0.0224, "y": 0.2, "z": 0.005 } }, { "Position": { - "x": -0.4746, + "x": -0.246, "y": 0.2, "z": 0.005 } }, { "Position": { - "x": -0.6923, + "x": -0.4646, "y": 0.2, - "z": -0.1132 + "z": 0.005 } }, { "Position": { - "x": -0.6935, + "x": -0.6823, "y": 0.2, - "z": 0.1139 + "z": 0.005 } }, { diff --git a/objects/2230b3/contained/b6dd02/script-state.json b/objects/2230b3/contained/b6dd02/script-state.json index d838c5e6a..87bc03dfe 100644 --- a/objects/2230b3/contained/b6dd02/script-state.json +++ b/objects/2230b3/contained/b6dd02/script-state.json @@ -17,7 +17,7 @@ } }, { - "elements": "00120200", + "elements": "00200200", "position": { "x": 0.35, "y": 0, @@ -25,91 +25,107 @@ } }, { - "elements": "20200300", + "elements": "00020300", "position": { "x": 0.35, "y": 0, - "z": 0.83 + "z": 0.8 } }, { - "elements": "20000202", + "elements": "00000400", "position": { - "x": -0.52, + "x": 0.35, "y": 0, - "z": 0.63 + "z": 0.91 } }, { - "elements": "00000400", + "elements": "20000200", "position": { - "x": -0.52, + "x": -0.55, "y": 0, - "z": 0.81 + "z": 0.58 } - } - ], - "trackElements": [ + }, { - "elements": "00000001", + "elements": "00000202", "position": { - "x": -0.69, + "x": -0.55, "y": 0, - "z": 0.11 + "z": 0.69 } - }, + } + ], + "trackElements": [ { "elements": "00000100", "position": { - "x": -0.69, + "x": -1.12, "y": 0, "z": -0.39 } }, { - "elements": "00100000", + "elements": "00000001", "position": { "x": -0.69, "y": 0, - "z": -0.11 + "z": 0 } }, { - "elements": "10000000", + "elements": "00000001", "position": { "x": -0.47, "y": 0, - "z": -0.01 + "z": -0.39 } }, { "elements": "00010000", "position": { - "x": -0.02, + "x": -0.47, "y": 0, - "z": 0.01 + "z": 0 } }, { - "elements": "00100001", + "elements": "00100000", "position": { - "x": -0.91, + "x": -0.03, "y": 0, "z": -0.39 } + }, + { + "elements": "10000000", + "position": { + "x": -0.03, + "y": 0, + "z": 0 + } } ], "trackEnergy": [ { "count": 5, "position": { - "x": -1.12, + "x": -1.34, "y": 0, "z": -0.39 } }, { "count": 3, + "position": { + "x": -0.91, + "y": 0, + "z": -0.39 + } + }, + { + "count": 2, "position": { "x": -0.47, "y": 0, @@ -119,7 +135,7 @@ { "count": 1, "position": { - "x": -0.02, + "x": -0.25, "y": 0, "z": -0.39 } diff --git a/objects/2230b3/contained/c2a8e9/object.json b/objects/2230b3/contained/c2a8e9/object.json index 5dfe8ee7a..4096eabb4 100644 --- a/objects/2230b3/contained/c2a8e9/object.json +++ b/objects/2230b3/contained/c2a8e9/object.json @@ -42,14 +42,14 @@ "GridProjection": false, "HideWhenFaceDown": true, "Hands": true, - "CardID": 261500, + "CardID": 262000, "SidewaysCard": false, "CustomDeck": { - "2615": { - "FaceURL": "https://steamusercontent-a.akamaihd.net/ugc/14173935050270175/9C1F9CE1B82EE39DEC5102B5DE0D9D7C83BC6296/", + "2620": { + "FaceURL": "https://steamusercontent-a.akamaihd.net/ugc/17538001415825719266/2EEEA6B46847EDEE7B868173E2D26082652DDD34/", "BackURL": "https://steamusercontent-a.akamaihd.net/ugc/14170847386118717/E293A387637D7541BE79FE7CABA80AF7A9853323/", - "NumWidth": 1, - "NumHeight": 1, + "NumWidth": 2, + "NumHeight": 2, "BackIsHidden": true, "UniqueBack": false, "Type": 0 diff --git a/objects/2230b3/contained/c2a8e9/script.lua b/objects/2230b3/contained/c2a8e9/script.lua index fe497a33b..d80e920da 100644 --- a/objects/2230b3/contained/c2a8e9/script.lua +++ b/objects/2230b3/contained/c2a8e9/script.lua @@ -1,2 +1,2 @@ -elements="10100100" -energy=2 +elements="11100100" +energy=1 diff --git a/objects/2230b3/object.json b/objects/2230b3/object.json index 70f7a432d..20590e015 100644 --- a/objects/2230b3/object.json +++ b/objects/2230b3/object.json @@ -114,8 +114,8 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/14170847386118415/78E57C380DC814C8891F19FA6A199A909BE48955/", - "ImageSecondaryURL": "https://steamusercontent-a.akamaihd.net/ugc/14173935050251672/8D891F0585DE0BFBD601D67E3256677FCE547B0D/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/12212359852422174451/9ED37B17BD85A2DD4CCD37920498A356E116BAD8/", + "ImageSecondaryURL": "https://steamusercontent-a.akamaihd.net/ugc/17352148892339766846/4F2CF8A242FAA7A3A75BE0A38B970A27A50C0974/", "ImageScalar": 1.0, "WidthScale": 0.0, "CustomTile": { diff --git a/objects/2ca216/object.json b/objects/2ca216/object.json index 35dc2560e..c82c56d2f 100644 --- a/objects/2ca216/object.json +++ b/objects/2ca216/object.json @@ -2,7 +2,7 @@ "Name": "Custom_Assetbundle", "Transform": { "posX": 107.4494, - "posY": 0.81, + "posY": 0.85, "posZ": -26.03, "rotX": 0.0, "rotY": 180.0, diff --git a/objects/33c4af/object.json b/objects/33c4af/object.json index 4a2360683..e278f36c4 100644 --- a/objects/33c4af/object.json +++ b/objects/33c4af/object.json @@ -2,7 +2,7 @@ "Name": "Custom_Assetbundle", "Transform": { "posX": 87.8, - "posY": 0.81, + "posY": 0.85, "posZ": -29.9, "rotX": 0.0, "rotY": 180.0, diff --git a/objects/57d9fe/object.json b/objects/57d9fe/object.json index 2f41de665..2cc73505c 100644 --- a/objects/57d9fe/object.json +++ b/objects/57d9fe/object.json @@ -39,7 +39,7 @@ "HideWhenFaceDown": false, "Hands": false, "Text": { - "Text": "version 4.5.3-beta.3", + "Text": "version 4.7.0-beta.1", "colorstate": { "r": 0.7334, "g": 0.7334, diff --git a/objects/794c81/object.json b/objects/794c81/object.json index a3d87becd..efb15ddc8 100644 --- a/objects/794c81/object.json +++ b/objects/794c81/object.json @@ -2,7 +2,7 @@ "Name": "Custom_Assetbundle", "Transform": { "posX": 19.1, - "posY": 0.81, + "posY": 0.85, "posZ": -29.9, "rotX": 0.0, "rotY": 180.0, diff --git a/objects/SetupChecker/script.lua b/objects/SetupChecker/script.lua index 977033d58..030dbac17 100644 --- a/objects/SetupChecker/script.lua +++ b/objects/SetupChecker/script.lua @@ -11,7 +11,6 @@ spiritGuids = {} spiritTags = {} spiritComplexities = {} spiritChoices = {} -spiritChoicesLength = 0 allSpirits = {} -- intentionally not backed up on script state weeklyChallenge = false @@ -1931,10 +1930,8 @@ function getGainSpiritChoices(obj) local choices = {} getXml(obj, {matchRecurse("GainSpirits", function (t) for _, button in pairs(t.children) do - if button.tag == "Button" then + if button.tag == "Button" and button.attributes.spirit then table.insert(choices, {spirit = button.attributes.spirit, aspect = button.attributes.aspect}) - else - table.insert(choices, {}) end end end)}) @@ -1942,8 +1939,10 @@ function getGainSpiritChoices(obj) end function setupGainSpiritChoices(obj, choices) local buttons = {} + local count = 0 for _, choice in pairs(choices) do if choice.spirit ~= nil then + count = count + 1 local label = choice.spirit if choice.aspect ~= nil and choice.aspect ~= "" then label = label .. " - " .. choice.aspect @@ -1960,21 +1959,40 @@ function setupGainSpiritChoices(obj, choices) spirit = choice.spirit, aspect = choice.aspect, }, - children = {}, - }) - else - table.insert(buttons, { - tag = "Text", - attributes = { - minHeight = "110", - }, - children = {}, }) end end + if count < 4 then + table.insert(buttons, { + tag = "Text", + attributes = { + color = "#FFFF00", + text = "No other spirits available.", + fontSize = "44", + minWidth = "800", + minHeight = "110" + } + }) + end + if count > 0 then + table.insert(buttons, {tag = "Text"}) -- Empty text to offset the reroll button from the spirit choices. + table.insert(buttons, { + tag = "Button", + attributes = { + colors = "#92E5AF|#92E5AF|#72B389|#72B38980", + id = "reroll! " .. obj.guid, + text = "Reroll Spirit Choices", + onClick = "SetupChecker/gainSpirit(reroll)", + fontSize = "36", + minWidth = "400", + minHeight = "80", + }, + }) + end updateXml(obj, {matchRecurse("GainSpirits", function (t) t.children = buttons end)}) end -function gainSpirit(player) +function gainSpirit(player, value, id) + local reroll = (value == 'reroll') if player.color == "Grey" or player.color == "Black" then player.broadcast("You need to pick a color before gaining spirits.", Color.Red) return @@ -1988,15 +2006,20 @@ function gainSpirit(player) player.broadcast("You need to pick a table before gaining spirits.", Color.Red) return end - local choices = getGainSpiritChoices(obj) local numChoices = 0 for _, choice in pairs(choices) do if choice.spirit ~= nil then - numChoices = numChoices + 1 + if reroll and spiritChoices[choice.spirit] then + spiritChoices[choice.spirit] = nil + else + numChoices = numChoices + 1 + end end end - + if reroll then + choices = {} + end if numChoices == 4 then player.broadcast("You already have Spirit options", Color.Red) return @@ -2032,21 +2055,23 @@ function gainSpirit(player) end end function getNewSpirit(tags, complexities) - if spiritChoicesLength >= #spiritGuids then - return nil - end - local spirit = getObjectFromGUID(spiritGuids[math.random(1,#spiritGuids)]) - local count = 0 - while((not tags[spiritTags[spirit.guid]] or not complexities[spiritComplexities[spirit.guid]] or spiritChoices[spirit.getName()]) and count < 100) do - spirit = getObjectFromGUID(spiritGuids[math.random(1,#spiritGuids)]) - count = count + 1 + -- Uses reservoir sampling -- see https://en.wikipedia.org/wiki/Reservoir_sampling for details + local spirit, candidate + local count = 0 -- # of eligible spirits seen so far + for _, guid in pairs(spiritGuids) do + candidate = getObjectFromGUID(guid) + if tags[spiritTags[guid]] and complexities[spiritComplexities[guid]] and not spiritChoices[candidate.getName()] then + count = count + 1 + if math.random(1, count) == 1 then + spirit = candidate + end + end end - if count >= 100 then + if not spirit then -- Never found an eligible candidate. return nil end local aspect = RandomAspect({obj = spirit}) spiritChoices[spirit.getName()] = {guid=spirit.guid} - spiritChoicesLength = spiritChoicesLength + 1 return spirit, aspect end function replaceSpirit(obj, oldSpirit, player) @@ -2073,7 +2098,7 @@ function replaceSpirit(obj, oldSpirit, player) if spirit ~= nil then player.broadcast("Spirit unavailable getting new one", Color.Red) else - player.broadcast("No suitable replacment was found", Color.Red) + player.broadcast("No suitable replacement was found", Color.Red) end end function pickGainSpiritChoice(player, guid, id) @@ -2083,6 +2108,14 @@ function pickGainSpiritChoice(player, guid, id) local aspect = obj.UI.getAttribute(id, "aspect") local spiritGuid = spiritChoices[spirit].guid if isSpiritPickable({guid = spiritGuid}) then + -- Return the unchosen spirits to the pool + local choices = getGainSpiritChoices(obj) + for _, choice in pairs(choices) do + if choice.spirit ~= nil and choice.spirit ~= spirit then + spiritChoices[choice.spirit] = nil + end + end + -- Choose the spirit sourceSpirit.call("PickSpirit", {obj = getObjectFromGUID(spiritGuid), color = player.color, aspect = aspect}) else replaceSpirit(obj, spirit, player) @@ -2184,7 +2217,6 @@ function removeSpirit(params) found = false for _,data in pairs(spiritChoices) do if data.guid == params.spirit.guid then - spiritChoicesLength = spiritChoicesLength - 1 found = true break end @@ -2688,7 +2720,7 @@ function getWeeklyChallengeConfig(tier, prevTierConfig) local boards if config.boardLayout == "Thematic" then boards = {} - for _,board in pairs(setups[numBoards]["Thematic"]) do + for _,board in pairs(setups[numBoards]["Thematic"][1]) do boards[board.board] = false end boardsCount = numBoards diff --git a/objects/ThematicMapBag/contained/051c66/object.json b/objects/ThematicMapBag/contained/051c66/object.json index b8cba4f16..61a4c081c 100644 --- a/objects/ThematicMapBag/contained/051c66/object.json +++ b/objects/ThematicMapBag/contained/051c66/object.json @@ -7,9 +7,9 @@ "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.15, + "scaleX": 6.65, "scaleY": 1.0, - "scaleZ": 7.15 + "scaleZ": 6.65 }, "Nickname": "E", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/1617312248751931114/8047E206BA417A37B1952B9B98DE6199EEA27D8C/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/15840865627556463834/BB97E08D514AD14AD73E08885F5CAAABC64E5F61/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -64,9 +64,9 @@ "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.15, + "scaleX": 6.65, "scaleY": 1.0, - "scaleZ": 7.15 + "scaleZ": 6.65 }, "Nickname": "E", "Description": "", @@ -99,18 +99,18 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/1662353477268238916/E1A72ADACB260F7F93DE360F015509C953CBC1C6/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/2488891055302063778/AA72A9462301418202B441F8356C8014DAE3DBEF/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, "CustomToken": { - "Thickness": 0.4, + "Thickness": 0.395, "MergeDistancePixels": 15.0, "StandUp": false, "Stackable": false } }, - "LuaScript": "posMap = {\n-- Land 1\n{ {\n x=-0.564615384615384, y=0.7, z=-0.958461538461539\n}, {\n x=-0.755384615384615, y=0.7, z=-1.11538461538462\n}, {\n x=-0.830769230769231, y=0.7, z=-0.813846153846155\n}, {\n x=-0.450769230769231, y=0.7, z=-1.19538461538462\n}, {\n x=-0.976923076923077, y=0.7, z=-0.540000000000001\n} },\n-- Land 2\n{ {\n x=-0.953846153846154, y=0.7, z=0.0046153846153837\n}, {\n x=-0.735384615384615, y=0.7, z=0.224615384615384\n}, {\n x=-0.935384615384615, y=0.7, z=0.241538461538461\n}, {\n x=-1.22, y=0.7, z=0.139999999999999\n}, {\n x=-1.49076923076923, y=0.7, z=0.306153846153845\n}, {\n x=-1.49076923076923, y=0.7, z=0.664615384615384\n}, {\n x=-1.18, y=0.7, z=-0.186153846153846\n} },\n-- Land 3\n{ {\n x=-1.33230769230769, y=0.7, z=0.961538461538461\n}, {\n x=-1.62923076923077, y=0.7, z=1.02461538461538\n}, {\n x=-1.29076923076923, y=0.7, z=1.18\n}, {\n x=-1.31230769230769, y=0.7, z=1.35230769230769\n}, {\n x=-1.50923076923077, y=0.7, z=1.28153846153846\n}, {\n x=-1.11846153846154, y=0.7, z=1.12\n}, {\n x=-0.849230769230769, y=0.7, z=1.14\n}, {\n x=-0.603076923076923, y=0.7, z=0.933846153846153\n} },\n-- Land 4\n{ {\n x=0.292307692307693, y=0.7, z=0.238461538461538\n}, {\n x=0.112307692307692, y=0.7, z=0.235384615384615\n}, {\n x=-0.0676923076923073, y=0.7, z=0.229230769230768\n}, {\n x=-0.250769230769231, y=0.7, z=0.235384615384615\n}, {\n x=-0.446153846153846, y=0.7, z=0.39076923076923\n}, {\n x=-0.703076923076923, y=0.7, z=0.563076923076923\n}, {\n x=-0.973846153846154, y=0.7, z=0.732307692307692\n} },\n-- Land 5\n{ {\n x=-0.316923076923077, y=0.7, z=-0.407692307692309\n}, {\n x=-0.464615384615385, y=0.7, z=-0.127692307692309\n}, {\n x=-0.153846153846154, y=0.7, z=-0.155384615384616\n}, {\n x=-0.00923076923076903, y=0.7, z=-0.447692307692308\n}, {\n x=-0.624615384615385, y=0.7, z=-0.393846153846154\n} },\n-- Land 6\n{ {\n x=1.27230769230769, y=0.7, z=-1.25538461538462\n}, {\n x=1, y=0.7, z=-1.11538461538462\n}, {\n x=0.678461538461538, y=0.7, z=-1.11692307692308\n}, {\n x=0.410769230769231, y=0.7, z=-0.950769230769232\n}, {\n x=0.112307692307692, y=0.7, z=-0.847692307692309\n}, {\n x=-0.189230769230769, y=0.7, z=-0.761538461538462\n} },\n-- Land 7\n{ {\n x=0.458461538461539, y=0.7, z=0.815384615384615\n}, {\n x=0.158461538461539, y=0.7, z=0.866153846153846\n}, {\n x=0.335384615384615, y=0.7, z=1.1\n}, {\n x=-0.163076923076923, y=0.7, z=0.855384615384615\n}, {\n x=0.767692307692308, y=0.7, z=0.815384615384615\n}, {\n x=0.643076923076923, y=0.7, z=1.10153846153846\n} },\n-- Land 8\n{ {\n x=0.809230769230769, y=0.7, z=0.326153846153846\n}, {\n x=1.02923076923077, y=0.7, z=0.447692307692307\n}, {\n x=0.936923076923077, y=0.7, z=0.12\n}, {\n x=1.24153846153846, y=0.7, z=0.198461538461538\n}, {\n x=0.598461538461539, y=0.7, z=0.444615384615384\n} },\n-- Land 9\n{ {\n x=1.40461538461538, y=0.7, z=-0.233846153846154\n}, {\n x=1.21538461538462, y=0.7, z=-0.312307692307693\n}, {\n x=0.975384615384616, y=0.7, z=-0.256923076923077\n}, {\n x=0.669230769230769, y=0.7, z=-0.178461538461539\n}, {\n x=0.587692307692308, y=0.7, z=-0.487692307692308\n}, {\n x=0.361538461538462, y=0.7, z=-0.247692307692309\n} },\n-- Land 10\n{ {\n x=1.32923076923077, y=0.7, z=-0.890769230769232\n}, {\n x=1.17692307692308, y=0.7, z=-0.781538461538462\n}, {\n x=1.6, y=0.7, z=-0.838461538461539\n}, {\n x=1.65846153846154, y=0.7, z=-1.14923076923077\n}, {\n x=1.36923076923077, y=0.7, z=-0.632307692307693\n}, {\n x=1.95846153846154, y=0.7, z=-1.04769230769231\n} } }\n\npieceMap = {\n{ \"Explorer\" },\n{ \"TownS\", \"Disease\", \"Disease\" },\n{ \"TownS\", \"City\", \"Dahan\", \"Dahan\", \"Box Blight\", \"Disease\" },\n{ \"Explorer\", \"Dahan\", \"Dahan\", \"Dahan\" },\n{ },\n{ \"Badlands\" },\n{ \"Vitality\" },\n{ \"Explorer\" },\n{ \"Dahan\", \"Dahan\" },\n{ \"Dahan\", \"Dahan\" }\n}", + "LuaScript": "posMap = { {\n{x=-0.931034624576569, y=0.7, z=-0.590262413024902},\n{x=-0.375422567129135, y=0.7, z=-1.07223510742188},\n{x=-0.76880943775177, y=0.7, z=-1.06561946868896},\n{x=-0.780147790908813, y=0.7, z=-0.769019544124603}\n}, {\n{x=-1.33410263061523, y=0.7, z=0.314444333314896},\n{x=-1.40010416507721, y=0.7, z=0.581892013549805},\n{x=-1.09834766387939, y=0.7, z=0.441803723573685},\n{x=-0.973022520542145, y=0.7, z=0.181638672947884},\n{x=-1.16724729537964, y=0.7, z=-0.0442767515778542},\n{x=-1.54801821708679, y=0.7, z=0.770958840847015}\n}, {\n{x=-1.64648222923279, y=0.7, z=1.11905360221863},\n{x=-0.760024666786194, y=0.7, z=1.0501697063446},\n{x=-1.28626704216003, y=0.7, z=1.21973323822021},\n{x=-1.32190895080566, y=0.7, z=1.01171720027924},\n{x=-1.05700480937958, y=0.7, z=1.06520080566406},\n{x=-1.50078701972961, y=0.7, z=1.28457391262054},\n{x=-1.88874340057373, y=0.7, z=1.04294002056122},\n{x=-0.459139317274094, y=0.7, z=1.01264333724976}\n}, {\n{x=-0.517012715339661, y=0.7, z=0.638115346431732},\n{x=-0.201359301805496, y=0.7, z=0.57531464099884},\n{x=-0.231053978204727, y=0.7, z=0.359684944152832},\n{x=0.0459257923066616, y=0.7, z=0.389426678419113},\n{x=-0.792304575443268, y=0.7, z=0.71843409538269},\n{x=-0.499467194080353, y=0.7, z=0.418513864278793}\n}, {\n{x=-0.461570888757706, y=0.7, z=-0.285338670015335},\n{x=-0.258702099323273, y=0.7, z=-0.0560907572507858}\n}, {\n{x=0.297420918941498, y=0.7, z=-0.850184142589569},\n{x=0.623441517353058, y=0.7, z=-1.01389122009277},\n{x=0.986298561096191, y=0.7, z=-1.13783323764801}\n}, {\n{x=0.417892068624496, y=0.7, z=1.03191208839417},\n{x=0.669674873352051, y=0.7, z=0.898595154285431},\n{x=0.160439848899841, y=0.7, z=0.941180467605591}\n}, {\n{x=0.912447512149811, y=0.7, z=0.383291691541672},\n{x=1.15963435173035, y=0.7, z=0.370837062597275},\n{x=0.645887851715088, y=0.7, z=0.473435431718826}\n}, {\n{x=0.678259551525116, y=0.7, z=-0.135212823748589},\n{x=0.35136154294014, y=0.7, z=-0.119581267237663},\n{x=1.34168350696564, y=0.7, z=-0.195038288831711},\n{x=1.00083982944489, y=0.7, z=-0.153778076171875}\n}, {\n{x=1.21307945251465, y=0.7, z=-0.56586629152298},\n{x=1.3211704492569, y=0.7, z=-0.789553046226501},\n{x=1.60036742687225, y=0.7, z=-0.938916206359863},\n{x=1.94238615036011, y=0.7, z=-1.04816913604736}\n}, }\n\npieceMap = { {\n\"Explorer\"\n}, {\n\"Disease\",\n\"Disease\",\n\"TownS\"\n}, {\n\"Disease\",\n\"TownS\",\n\"Dahan\",\n\"Dahan\",\n\"City\",\n\"Box Blight\"\n}, {\n\"Explorer\",\n\"Dahan\",\n\"Dahan\",\n\"Dahan\"\n}, {\n\n}, {\n\"Badlands\"\n}, {\n\"Vitality\"\n}, {\n\"Explorer\"\n}, {\n\"Dahan\",\n\"Dahan\"\n}, {\n\"Dahan\",\n\"Dahan\"\n}, }", "LuaScriptState": "", "XmlUI": "" } diff --git a/objects/ThematicMapBag/contained/051c66/script.lua b/objects/ThematicMapBag/contained/051c66/script.lua index e1293b600..c64f0aa8f 100644 --- a/objects/ThematicMapBag/contained/051c66/script.lua +++ b/objects/ThematicMapBag/contained/051c66/script.lua @@ -1,152 +1,98 @@ -posMap = { --- Land 1 -{ { - x=-0.547692307692308, y=0.7, z=-0.976923076923077 -}, { - x=-0.738461538461538, y=0.7, z=-1.13384615384615 -}, { - x=-0.813846153846154, y=0.7, z=-0.832307692307693 -}, { - x=-0.433846153846154, y=0.7, z=-1.21384615384615 -}, { - x=-0.96, y=0.7, z=-0.558461538461539 -} }, --- Land 2 -{ { - x=-1.08153846153846, y=0.7, z=0.0784615384615382 -}, { - x=-0.853846153846153, y=0.7, z=0.0692307692307686 -}, { - x=-0.738461538461538, y=0.7, z=0.224615384615384 -}, { - x=-1.36615384615385, y=0.7, z=0.167692307692307 -}, { - x=-1.5, y=0.7, z=0.63076923076923 -}, { - x=-1.12461538461538, y=0.7, z=-0.215384615384616 -} }, --- Land 3 -{ { - x=-1.31538461538462, y=0.7, z=0.943076923076922 -}, { - x=-1.63230769230769, y=0.7, z=0.97076923076923 -}, { - x=-1.09076923076923, y=0.7, z=1.03846153846154 -}, { - x=-1.04307692307692, y=0.7, z=1.19538461538461 -}, { - x=-0.873846153846154, y=0.7, z=1.08 -}, { - x=-1.62, y=0.7, z=1.22923076923077 -}, { - x=-0.590769230769231, y=0.7, z=0.904615384615384 -}, { - x=-1.31846153846154, y=0.7, z=1.25076923076923 -} }, --- Land 4 -{ { - x=0.30923076923077, y=0.7, z=0.219999999999999 -}, { - x=0.135384615384616, y=0.7, z=0.2 -}, { - x=-0.0353846153846149, y=0.7, z=0.181538461538461 -}, { - x=-0.206153846153846, y=0.7, z=0.186153846153846 -}, { - x=-0.407692307692307, y=0.7, z=0.359999999999999 -}, { - x=-0.669230769230769, y=0.7, z=0.541538461538461 -}, { - x=-0.943076923076923, y=0.7, z=0.695384615384615 -} }, --- Land 5 -{ { - x=-0.263076923076923, y=0.7, z=-0.432307692307693 -}, { - x=-0.57076923076923, y=0.7, z=-0.418461538461539 -}, { - x=-0.410769230769231, y=0.7, z=-0.153846153846154 -}, { - x=0.0384615384615385, y=0.7, z=-0.503076923076924 -}, { - x=-0.0999999999999998, y=0.7, z=-0.18 -} }, --- Land 6 -{ { - x=1.26153846153846, y=0.7, z=-1.24 -}, { - x=0.843076923076923, y=0.7, z=-1.14307692307692 -}, { - x=0.529230769230769, y=0.7, z=-1.09846153846154 -}, { - x=0.266153846153846, y=0.7, z=-0.930769230769232 -}, { - x=-0.092307692307692, y=0.7, z=-0.835384615384616 -} }, --- Land 7 -{ { - x=0.458461538461539, y=0.7, z=0.793846153846153 -}, { - x=0.147692307692308, y=0.7, z=0.833846153846154 -}, { - x=0.333846153846154, y=0.7, z=1.07846153846154 -}, { - x=0.767692307692308, y=0.7, z=0.793846153846153 -}, { - x=-0.163076923076923, y=0.7, z=0.833846153846154 -}, { - x=0.643076923076923, y=0.7, z=1.08 -} }, --- Land 8 -{ { - x=0.809230769230769, y=0.7, z=0.309230769230769 -}, { - x=0.938461538461539, y=0.7, z=0.101538461538461 -}, { - x=1.02923076923077, y=0.7, z=0.418461538461538 -}, { - x=0.595384615384616, y=0.7, z=0.421538461538461 -}, { - x=1.24307692307692, y=0.7, z=0.18 -} }, --- Land 9 -{ { - x=1.39076923076923, y=0.7, z=-0.18923076923077 -}, { - x=1.23230769230769, y=0.7, z=-0.330769230769232 +posMap = { { +{x=-0.585302352905273, y=0.7, z=-0.869804382324219}, +{x=-0.505916476249695, y=0.7, z=-1.0640424489975}, +{x=-0.194830536842346, y=0.7, z=-1.00883650779724}, +{x=-0.74003392457962, y=0.7, z=-0.675932288169861}, +{x=-0.849262833595276, y=0.7, z=-0.407351791858673} +}, { +{x=-0.996252000331879, y=0.7, z=-0.0592635571956635}, +{x=-1.10840356349945, y=0.7, z=0.165897071361542}, +{x=-0.861903548240662, y=0.7, z=0.160758152604103}, +{x=-0.953233778476715, y=0.7, z=0.424967497587204}, +{x=-1.25202202796936, y=0.7, z=0.347317725419998}, +{x=-1.3629195690155, y=0.7, z=0.669427871704102} +}, { +{x=-1.49483370780945, y=0.7, z=1.00564777851105}, +{x=-1.48625314235687, y=0.7, z=1.22577822208405}, +{x=-1.18392884731293, y=0.7, z=0.980215609073639}, +{x=-0.756746470928192, y=0.7, z=1.05716955661774}, +{x=-0.693930208683014, y=0.7, z=1.2203723192215}, +{x=-0.898911952972412, y=0.7, z=1.21956479549408}, +{x=-1.19562828540802, y=0.7, z=1.25394558906555}, +{x=-0.493573695421219, y=0.7, z=0.947632908821106} +}, { +{x=-0.477335661649704, y=0.7, z=0.495912879705429}, +{x=-0.346075087785721, y=0.7, z=0.327284634113312}, +{x=-0.294946104288101, y=0.7, z=0.490126311779022}, +{x=-0.0383902154862881, y=0.7, z=0.2779660820961}, +{x=0.25189271569252, y=0.7, z=0.346844047307968}, +{x=0.0336949154734612, y=0.7, z=0.506305813789368}, +{x=-0.813284337520599, y=0.7, z=0.727163791656494} +}, { +{x=0.0896121487021446, y=0.7, z=-0.379665046930313}, +{x=-0.0232553090900183, y=0.7, z=-0.0305875632911921}, +{x=-0.195101380348206, y=0.7, z=-0.265267729759216}, +{x=-0.499492406845093, y=0.7, z=0.00799189042299986}, +{x=-0.481674015522003, y=0.7, z=-0.298273205757141} +}, { +{x=0.723597049713135, y=0.7, z=-0.88647872209549}, +{x=1.26024580001831, y=0.7, z=-1.13841104507446}, +{x=0.968983054161072, y=0.7, z=-1.00798749923706}, +{x=0.42554646730423, y=0.7, z=-0.842640697956085} +}, { +{x=0.409035265445709, y=0.7, z=1.00634181499481}, +{x=0.654044926166534, y=0.7, z=0.967337548732758}, +{x=0.176199331879616, y=0.7, z=0.993615567684174}, +{x=-0.110655553638935, y=0.7, z=0.897901117801666} +}, { +{x=0.969781458377838, y=0.7, z=0.402572810649872}, +{x=1.21101605892181, y=0.7, z=0.380028545856476}, +{x=0.945940494537354, y=0.7, z=0.205132409930229}, +{x=0.715093851089478, y=0.7, z=0.429882019758224} +}, { +{x=0.703207015991211, y=0.7, z=-0.195727467536926}, +{x=0.486193746328354, y=0.7, z=-0.176853910088539}, +{x=1.3160492181778, y=0.7, z=-0.125797405838966}, +{x=0.984881937503815, y=0.7, z=-0.143415600061417}, +{x=0.573930680751801, y=0.7, z=-0.414780855178833} +}, { +{x=1.7041974067688, y=0.7, z=-0.918882966041565}, +{x=1.48545467853546, y=0.7, z=-0.907826602458954}, +{x=1.57552778720856, y=0.7, z=-0.691915035247803}, +{x=1.28930222988129, y=0.7, z=-0.718625128269196}, +{x=1.09255743026733, y=0.7, z=-0.50375759601593} +}, } + +pieceMap = { { +"Explorer" }, { - x=0.636923076923077, y=0.7, z=-0.210769230769231 +"TownS", +"Disease", +"Disease" }, { - x=0.395384615384615, y=0.7, z=-0.403076923076924 +"City", +"Disease", +"TownS", +"Dahan", +"Dahan", +"Box Blight" }, { - x=0.346153846153846, y=0.7, z=-0.0969230769230773 +"Dahan", +"Dahan", +"Dahan", +"Explorer" }, { - x=0.683076923076923, y=0.7, z=-0.516923076923078 -} }, --- Land 10 -{ { - x=1.15076923076923, y=0.7, z=-0.764615384615386 + }, { - x=1.31076923076923, y=0.7, z=-0.923076923076923 +"Badlands" }, { - x=1.58769230769231, y=0.7, z=-0.870769230769231 +"Vitality" }, { - x=1.65230769230769, y=0.7, z=-1.16615384615385 +"Explorer" }, { - x=1.37230769230769, y=0.7, z=-0.643076923076924 +"Dahan", +"Dahan" }, { - x=1.94, y=0.7, z=-1.05230769230769 -} } } - -pieceMap = { -{ "Explorer" }, -{ "TownS", "Disease", "Disease" }, -{ "TownS", "City", "Dahan", "Dahan", "Box Blight", "Disease" }, -{ "Explorer", "Dahan", "Dahan", "Dahan" }, -{ }, -{ "Badlands" }, -{ "Vitality" }, -{ "Explorer" }, -{ "Dahan", "Dahan" }, -{ "Dahan", "Dahan" } -} +"Dahan", +"Dahan" +}, } diff --git a/objects/ThematicMapBag/contained/0f2e60/object.json b/objects/ThematicMapBag/contained/0f2e60/object.json index 7810d9165..cbb8510b7 100644 --- a/objects/ThematicMapBag/contained/0f2e60/object.json +++ b/objects/ThematicMapBag/contained/0f2e60/object.json @@ -7,9 +7,9 @@ "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.15, + "scaleX": 6.65, "scaleY": 1.0, - "scaleZ": 7.15 + "scaleZ": 6.65 }, "Nickname": "SW", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/1617312248751948495/DBF2E8A416F5CE350E43BF25F508ED5F8DD26C05/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/11141416703474929271/A54C1B85DBB8FA8674B5A7DB71DEEE217F6FC7BB/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -64,9 +64,9 @@ "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.15, + "scaleX": 6.65, "scaleY": 1.0, - "scaleZ": 7.15 + "scaleZ": 6.65 }, "Nickname": "SW", "Description": "", @@ -99,18 +99,18 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/1617313479141324033/1BE39A5C0215AC0446EB74C0AB64A1689B7E91F0/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/2488891055302065230/08537077ABB65DF1C4A1E473731CEAB20F35EFED/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, "CustomToken": { - "Thickness": 0.405, + "Thickness": 0.395, "MergeDistancePixels": 15.0, "StandUp": false, "Stackable": false } }, - "LuaScript": "posMap = {\n-- Land 1\n{ {\n x=0.816923076923077, y=0.7, z=0.94\n}, {\n x=0.549230769230769, y=0.7, z=0.836923076923077\n}, {\n x=0.813846153846154, y=0.7, z=0.658461538461538\n}, {\n x=0.384615384615385, y=0.7, z=1.10615384615385\n} },\n-- Land 2\n{ {\n x=1.15538461538462, y=0.7, z=-0.149230769230769\n}, {\n x=1.04615384615385, y=0.7, z=0.0738461538461536\n}, {\n x=1.45692307692308, y=0.7, z=-0.216923076923077\n}, {\n x=1.27538461538462, y=0.7, z=-0.483076923076923\n}, {\n x=1.56461538461538, y=0.7, z=-0.630769230769231\n} },\n-- Land 3\n{ {\n x=1.48923076923077, y=0.7, z=-1.31230769230769\n}, {\n x=1.24461538461538, y=0.7, z=-1.31230769230769\n}, {\n x=1.69076923076923, y=0.7, z=-1.09076923076923\n}, {\n x=1.4, y=0.7, z=-1.01230769230769\n}, {\n x=1.09384615384615, y=0.7, z=-1.11076923076923\n}, {\n x=0.827692307692308, y=0.7, z=-0.938461538461539\n} },\n-- Land 4\n{ {\n x=0.593846153846154, y=0.7, z=0.135384615384615\n}, {\n x=0.398461538461538, y=0.7, z=-0.0107692307692308\n}, {\n x=0.370769230769231, y=0.7, z=0.295384615384615\n}, {\n x=0.675384615384615, y=0.7, z=-0.135384615384616\n}, {\n x=0.396923076923077, y=0.7, z=-0.313846153846154\n}, {\n x=0.718461538461538, y=0.7, z=-0.463076923076923\n} },\n-- Land 5\n{ {\n x=0.123076923076923, y=0.7, z=0.786153846153846\n}, {\n x=-0.0923076923076925, y=0.7, z=0.732307692307692\n}, {\n x=-0.358461538461539, y=0.7, z=0.809230769230769\n}, {\n x=-0.595384615384616, y=0.7, z=1.02461538461538\n}, {\n x=-0.910769230769231, y=0.7, z=1.02307692307692\n}, {\n x=-1.19538461538462, y=0.7, z=1.16923076923077\n} },\n-- Land 6\n{ {\n x=-0.0692307692307697, y=0.7, z=0.333846153846154\n}, {\n x=-0.296923076923077, y=0.7, z=0.333846153846154\n}, {\n x=-0.0261538461538464, y=0.7, z=0.0630769230769228\n}, {\n x=-0.343076923076923, y=0.7, z=0.043076923076923\n}, {\n x=-0.587692307692308, y=0.7, z=0.253846153846154\n} },\n-- Land 7\n{ {\n x=-0.389230769230769, y=0.7, z=-0.430769230769231\n}, {\n x=-0.212307692307693, y=0.7, z=-0.6\n}, {\n x=-0.118461538461538, y=0.7, z=-0.910769230769231\n}, {\n x=0.203076923076923, y=0.7, z=-0.923076923076923\n}, {\n x=0.489230769230769, y=0.7, z=-1.12769230769231\n}, {\n x=-0.635384615384616, y=0.7, z=-0.364615384615385\n} },\n-- Land 8\n{ {\n x=-1.28769230769231, y=0.7, z=-0.278461538461539\n}, {\n x=-1.07384615384615, y=0.7, z=-0.38\n}, {\n x=-1.27692307692308, y=0.7, z=-0.567692307692308\n}, {\n x=-0.972307692307692, y=0.7, z=-0.663076923076923\n}, {\n x=-0.743076923076923, y=0.7, z=-0.903076923076923\n}, {\n x=-0.503076923076923, y=0.7, z=-1.10923076923077\n} },\n-- Land 9\n{ {\n x=-1.08, y=0.7, z=0.253846153846154\n}, {\n x=-1.35846153846154, y=0.7, z=0.0969230769230768\n}, {\n x=-1.45538461538462, y=0.7, z=0.406153846153846\n} },\n-- Land 10\n{ {\n x=-1.31230769230769, y=0.7, z=0.775384615384615\n}, {\n x=-1.62153846153846, y=0.7, z=0.829230769230769\n}, {\n x=-1.87692307692308, y=0.7, z=1.02153846153846\n}, {\n x=-1.57846153846154, y=0.7, z=1.14153846153846\n}, {\n x=-1.01846153846154, y=0.7, z=0.656923076923077\n} } }\n\npieceMap = {\n{ \"Beasts\" },\n{ \"Town\", \"Dahan\" },\n{ \"TownS\", \"Dahan\", \"Box Blight\" },\n{ \"Explorer\", \"Town\", \"Beasts\" },\n{ \"Beasts\", \"Wilds\" },\n{ \"Explorer\", \"Badlands\" },\n{ \"Explorer\" },\n{ \"Box Blight\", \"Wilds\" },\n{ },\n{ },\n}", + "LuaScript": "posMap = { {\n{x=0.694562792778015, y=0.7, z=1.00899744033813},\n{x=0.731692254543304, y=0.7, z=0.775564193725586},\n{x=0.434450834989548, y=0.7, z=1.12221467494965},\n{x=1.00797617435455, y=0.7, z=0.588353037834167}\n}, {\n{x=1.21155405044556, y=0.7, z=-0.154494553804398},\n{x=0.966544687747955, y=0.7, z=-0.0125770578160882},\n{x=1.49530708789825, y=0.7, z=-0.506032168865204},\n{x=0.937553107738495, y=0.7, z=0.2286626547575},\n{x=1.16575145721436, y=0.7, z=-0.41491162776947}\n}, {\n{x=1.39475047588348, y=0.7, z=-0.858004868030548},\n{x=1.63020420074463, y=0.7, z=-1.10818982124329},\n{x=1.13113141059875, y=0.7, z=-0.944863677024841},\n{x=0.898353576660156, y=0.7, z=-0.843020021915436},\n{x=2.06004309654236, y=0.7, z=-1.07776951789856},\n{x=1.34297657012939, y=0.7, z=-1.26581335067749}\n}, {\n{x=0.5808464884758, y=0.7, z=-0.170711681246758},\n{x=0.415976703166962, y=0.7, z=0.300192803144455},\n{x=0.445539861917496, y=0.7, z=0.0638829469680786},\n{x=0.679280757904053, y=0.7, z=-0.459125638008118},\n{x=0.308197110891342, y=0.7, z=-0.145292744040489}\n}, {\n{x=-0.173179194331169, y=0.7, z=0.856042623519897},\n{x=-0.476339221000671, y=0.7, z=0.925432622432709},\n{x=-0.769041836261749, y=0.7, z=1.06145226955414},\n{x=0.132300674915314, y=0.7, z=0.736832916736603}\n}, {\n{x=-0.355259865522385, y=0.7, z=0.421240448951721},\n{x=-0.0146560594439507, y=0.7, z=0.172321051359177},\n{x=-0.245079815387726, y=0.7, z=0.17288938164711},\n{x=-0.0907376036047935, y=0.7, z=-0.0892978087067604}\n}, {\n{x=0.0175759885460138, y=0.7, z=-0.607674956321716},\n{x=0.00729309627786279, y=0.7, z=-0.879293441772461},\n{x=0.423107773065567, y=0.7, z=-0.991826176643372},\n{x=-0.255298256874084, y=0.7, z=-0.49119833111763}\n}, {\n{x=-1.11962139606476, y=0.7, z=-0.563762962818146},\n{x=-0.809089064598084, y=0.7, z=-0.61897087097168},\n{x=-0.521058917045593, y=0.7, z=-1.14780306816101},\n{x=-0.620350182056427, y=0.7, z=-0.849403738975525}\n}, {\n{x=-0.833657205104828, y=0.7, z=0.282418489456177},\n{x=-1.0693826675415, y=0.7, z=0.0541755519807339},\n{x=-1.27030181884766, y=0.7, z=0.31926017999649}\n}, {\n{x=-1.26867651939392, y=0.7, z=0.841954827308655},\n{x=-1.6843649148941, y=0.7, z=0.922519624233246},\n{x=-1.52421772480011, y=0.7, z=1.18372631072998}\n}, }\n\npieceMap = { {\n\"Beasts\"\n}, {\n\"Town\",\n\"Dahan\"\n}, {\n\"Box Blight\",\n\"TownS\",\n\"Dahan\"\n}, {\n\"Town\",\n\"Beasts\",\n\"Explorer\"\n}, {\n\"Beasts\",\n\"Wilds\"\n}, {\n\"Badlands\",\n\"Explorer\"\n}, {\n\"Explorer\"\n}, {\n\"Wilds\",\n\"Box Blight\"\n}, {\n\n}, {\n\n}, }", "LuaScriptState": "", "XmlUI": "" } diff --git a/objects/ThematicMapBag/contained/0f2e60/script.lua b/objects/ThematicMapBag/contained/0f2e60/script.lua index 3f24fd617..d4c3bf161 100644 --- a/objects/ThematicMapBag/contained/0f2e60/script.lua +++ b/objects/ThematicMapBag/contained/0f2e60/script.lua @@ -1,136 +1,90 @@ -posMap = { --- Land 1 -{ { - x=0.88, y=0.7, z=0.686153846153846 -}, { - x=0.68, y=0.7, z=1.10769230769231 -}, { - x=0.595384615384615, y=0.7, z=0.832307692307692 -}, { - x=0.42, y=0.7, z=1.09846153846154 -} }, --- Land 2 -{ { - x=1.26, y=0.7, z=-0.106153846153846 -}, { - x=1.10923076923077, y=0.7, z=0.0784615384615384 -}, { - x=1.53692307692308, y=0.7, z=-0.204615384615385 -}, { - x=1.29076923076923, y=0.7, z=-0.403076923076923 -}, { - x=1.58769230769231, y=0.7, z=-0.516923076923077 -} }, --- Land 3 -{ { - x=1.53230769230769, y=0.7, z=-1.26923076923077 -}, { - x=1.29384615384615, y=0.7, z=-1.31384615384615 -}, { - x=1.75384615384615, y=0.7, z=-1.09230769230769 -}, { - x=1.36615384615385, y=0.7, z=-1.01846153846154 -}, { - x=1.05846153846154, y=0.7, z=-1.07230769230769 -}, { - x=0.712307692307692, y=0.7, z=-0.826153846153846 -} }, --- Land 4 -{ { - x=0.658461538461538, y=0.7, z=0.209230769230769 -}, { - x=0.463076923076923, y=0.7, z=0.107692307692308 -}, { - x=0.527692307692308, y=0.7, z=0.347692307692308 -}, { - x=0.715384615384615, y=0.7, z=-0.0738461538461539 -}, { - x=0.392307692307692, y=0.7, z=-0.207692307692308 -}, { - x=0.652307692307692, y=0.7, z=-0.386153846153846 -} }, --- Land 5 -{ { - x=0.14, y=0.7, z=0.761538461538461 -}, { - x=-0.0707692307692309, y=0.7, z=0.727692307692308 -}, { - x=-0.333846153846154, y=0.7, z=0.796923076923077 -}, { - x=-0.613846153846154, y=0.7, z=0.938461538461539 -}, { - x=-0.904615384615385, y=0.7, z=1.06153846153846 -} }, --- Land 6 -{ { - x=-0.0200000000000004, y=0.7, z=0.266153846153846 -}, { - x=-0.241538461538462, y=0.7, z=0.293846153846154 -}, { - x=0.0446153846153845, y=0.7, z=0.0199999999999998 -}, { - x=-0.278461538461539, y=0.7, z=0.00461538461538452 -}, { - x=-0.523076923076923, y=0.7, z=0.224615384615384 -} }, --- Land 7 -{ { - x=-0.176923076923077, y=0.7, z=-0.627692307692308 -}, { - x=-0.0230769230769234, y=0.7, z=-0.823076923076923 -}, { - x=-0.170769230769231, y=0.7, z=-0.389230769230769 -}, { - x=-0.489230769230769, y=0.7, z=-0.332307692307692 -}, { - x=0.272307692307692, y=0.7, z=-0.941538461538461 -}, { - x=0.553846153846154, y=0.7, z=-1.11692307692308 -} }, --- Land 8 -{ { - x=-1.07384615384615, y=0.7, z=-0.406153846153847 -}, { - x=-1.27230769230769, y=0.7, z=-0.536923076923077 -}, { - x=-0.72923076923077, y=0.7, z=-0.887692307692308 +posMap = { { +{x=0.639165341854095, y=0.7, z=0.849677622318268}, +{x=0.269207954406738, y=0.7, z=1.05982720851898}, +{x=0.82119232416153, y=0.7, z=0.616915941238403}, +{x=0.57292377948761, y=0.7, z=1.11408841609955} +}, { +{x=1.17114925384521, y=0.7, z=-0.24257992208004}, +{x=1.42736554145813, y=0.7, z=-0.233498632907867}, +{x=1.54456257820129, y=0.7, z=-0.657955527305603}, +{x=1.27819919586182, y=0.7, z=-0.503155291080475}, +{x=1.11900329589844, y=0.7, z=0.0169068053364754} +}, { +{x=1.05536353588104, y=0.7, z=-1.0102174282074}, +{x=1.32741630077362, y=0.7, z=-1.03094458580017}, +{x=1.55927968025208, y=0.7, z=-1.04518568515778}, +{x=1.28133368492126, y=0.7, z=-1.27281618118286}, +{x=0.833784997463226, y=0.7, z=-0.898625135421753}, +{x=0.586164712905884, y=0.7, z=-0.787256300449371} +}, { +{x=0.5400630235672, y=0.7, z=0.141748160123825}, +{x=0.48010516166687, y=0.7, z=-0.0612926781177521}, +{x=0.70787125825882, y=0.7, z=-0.0805409550666809}, +{x=0.365970522165298, y=0.7, z=0.354416519403458}, +{x=0.729252576828003, y=0.7, z=-0.455693900585175}, +{x=0.272902309894562, y=0.7, z=-0.286479145288467} +}, { +{x=-0.37723633646965, y=0.7, z=0.843244671821594}, +{x=-0.642644047737122, y=0.7, z=0.953394174575806}, +{x=-0.96850061416626, y=0.7, z=1.08375036716461}, +{x=-0.0794885978102684, y=0.7, z=0.74762225151062} +}, { +{x=-0.0844608470797539, y=0.7, z=0.0972863137722015}, +{x=-0.312559634447098, y=0.7, z=0.12869781255722}, +{x=-0.156571269035339, y=0.7, z=0.351756662130356}, +{x=-0.475022166967392, y=0.7, z=0.340412139892578}, +{x=0.116838723421097, y=0.7, z=0.00392771419137716} +}, { +{x=-0.194142788648605, y=0.7, z=-0.634822249412537}, +{x=0.229897812008858, y=0.7, z=-0.901511132717133}, +{x=0.504073023796082, y=0.7, z=-1.08182489871979}, +{x=-0.0769220069050789, y=0.7, z=-0.840199649333954}, +{x=-0.557439625263214, y=0.7, z=-0.342585921287537}, +{x=-0.239530816674232, y=0.7, z=-0.401058495044708} +}, { +{x=-0.719671487808228, y=0.7, z=-0.741584479808807}, +{x=-0.997052192687988, y=0.7, z=-0.446077972650528}, +{x=-0.429466545581818, y=0.7, z=-0.907659649848938}, +{x=-0.600550830364227, y=0.7, z=-1.13361871242523}, +{x=-1.01794290542603, y=0.7, z=-0.684849321842194} +}, { +{x=-0.895639836788177, y=0.7, z=0.0840762034058571}, +{x=-1.20324432849884, y=0.7, z=0.0303182043135166}, +{x=-1.37975466251373, y=0.7, z=0.266003519296646} +}, { +{x=-1.40880393981934, y=0.7, z=0.89338356256485}, +{x=-1.22198116779327, y=0.7, z=0.625533819198608}, +{x=-0.907022595405579, y=0.7, z=0.609774172306061}, +{x=-1.71198916435242, y=0.7, z=0.884914994239807}, +{x=-1.67147135734558, y=0.7, z=1.17226088047028} +}, } + +pieceMap = { { +"Beasts" }, { - x=-0.918461538461539, y=0.7, z=-0.636923076923077 +"Dahan", +"Town" }, { - x=-0.481538461538462, y=0.7, z=-1.08 -} }, --- Land 9 -{ { - x=-0.944615384615385, y=0.7, z=0.118461538461538 +"Box Blight", +"Dahan", +"TownS" }, { - x=-1.25076923076923, y=0.7, z=0.046153846153846 +"Beasts", +"Town", +"Explorer" }, { - x=-1.42461538461538, y=0.7, z=0.312307692307692 -} }, --- Land 10 -{ { - x=-1.15538461538462, y=0.7, z=0.644615384615385 +"Beasts", +"Wilds" }, { - x=-1.34, y=0.7, z=0.896923076923077 +"Explorer", +"Badlands" }, { - x=-1.65692307692308, y=0.7, z=0.887692307692308 +"Explorer" }, { - x=-1.92307692307692, y=0.7, z=1.06 +"Wilds", +"Box Blight" }, { - x=-1.64307692307692, y=0.7, z=1.20153846153846 + }, { - x=-0.838461538461539, y=0.7, z=0.621538461538461 -} } } -pieceMap = { -{ "Beasts" }, -{ "Town", "Dahan" }, -{ "TownS", "Dahan", "Box Blight" }, -{ "Explorer", "Town", "Beasts" }, -{ "Beasts", "Wilds" }, -{ "Explorer", "Badlands" }, -{ "Explorer" }, -{ "Box Blight", "Wilds" }, -{ }, -{ }, -} +}, } diff --git a/objects/ThematicMapBag/contained/505d5d/object.json b/objects/ThematicMapBag/contained/505d5d/object.json index 61f4103f3..8195e8c58 100644 --- a/objects/ThematicMapBag/contained/505d5d/object.json +++ b/objects/ThematicMapBag/contained/505d5d/object.json @@ -7,9 +7,9 @@ "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.15, + "scaleX": 6.65, "scaleY": 1.0, - "scaleZ": 7.15 + "scaleZ": 6.65 }, "Nickname": "SE", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/1617312248751945553/271CF63D4307A57320E9BDC42E6F84A96960532F/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/9346368888519341772/5D2C5968FB3546022DF07F31D90D8FDB7E8E797C/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -64,9 +64,9 @@ "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.15, + "scaleX": 6.65, "scaleY": 1.0, - "scaleZ": 7.15 + "scaleZ": 6.65 }, "Nickname": "SE", "Description": "", @@ -99,18 +99,18 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/1617313684071610132/AED0113EF9D7AB63EE1CDBBF162D08A2B3DAC0FA/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/2488891055302066432/19E8CC2B341E20DA8C1B11D676433BED0232E56A/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, "CustomToken": { - "Thickness": 0.4, + "Thickness": 0.395, "MergeDistancePixels": 15.0, "StandUp": false, "Stackable": false } }, - "LuaScript": "posMap = {\n-- Land 1\n{ {\n x=-0.0492307692307693, y=0.7, z=-0.533846153846155\n}, {\n x=-0.276923076923077, y=0.7, z=-0.492307692307693\n}, {\n x=-0.48, y=0.7, z=-0.447692307692308\n}, {\n x=-0.309230769230769, y=0.7, z=-0.766153846153847\n}, {\n x=-0.00153846153846123, y=0.7, z=-0.844615384615385\n}, {\n x=0.258461538461538, y=0.7, z=-0.643076923076924\n} },\n-- Land 2\n{ {\n x=-0.556923076923077, y=0.7, z=0.0799999999999994\n}, {\n x=-0.689230769230769, y=0.7, z=0.239999999999999\n}, {\n x=-0.856923076923077, y=0.7, z=-0.12923076923077\n}, {\n x=-1.17230769230769, y=0.7, z=-0.127692307692309\n}, {\n x=-0.927692307692308, y=0.7, z=0.181538461538461\n}, {\n x=-1.24, y=0.7, z=0.186153846153846\n}, {\n x=-1.01230769230769, y=0.7, z=-0.403076923076924\n}, {\n x=-0.876923076923077, y=0.7, z=-0.68923076923077\n} },\n-- Land 3\n{ {\n x=-1.02461538461538, y=0.7, z=0.644615384615384\n}, {\n x=-1.43384615384615, y=0.7, z=0.53076923076923\n}, {\n x=-1.32461538461538, y=0.7, z=0.832307692307692\n}, {\n x=-1.64153846153846, y=0.7, z=0.772307692307692\n}, {\n x=-1.36769230769231, y=0.7, z=1.14461538461538\n}, {\n x=-1.67846153846154, y=0.7, z=1.08923076923077\n} },\n-- Land 4\n{ {\n x=-0.249230769230769, y=0.7, z=0.632307692307692\n}, {\n x=-0.0523076923076917, y=0.7, z=0.896923076923077\n}, {\n x=-0.546153846153846, y=0.7, z=0.76\n}, {\n x=-0.78, y=0.7, z=0.996923076923077\n} },\n-- Land 5\n{ {\n x=0.363076923076923, y=0.7, z=0.2\n}, {\n x=0.136923076923077, y=0.7, z=0.0769230769230764\n}, {\n x=-0.178461538461538, y=0.7, z=0.0507692307692305\n}, {\n x=0.152307692307693, y=0.7, z=0.393846153846153\n}, {\n x=0.613846153846154, y=0.7, z=0.26\n}, {\n x=0.926153846153847, y=0.7, z=0.195384615384615\n} },\n-- Land 6\n{ {\n x=0.99076923076923, y=0.7, z=-0.807692307692308\n}, {\n x=0.706153846153847, y=0.7, z=-0.800000000000001\n}, {\n x=0.9, y=0.7, z=-0.34\n}, {\n x=0.781538461538461, y=0.7, z=-0.195384615384616\n}, {\n x=0.703076923076923, y=0.7, z=-0.483076923076923\n}, {\n x=0.518461538461538, y=0.7, z=-0.223076923076924\n}, {\n x=0.853846153846153, y=0.7, z=-1.07846153846154\n}, {\n x=0.544615384615385, y=0.7, z=-1.05692307692308\n} },\n-- Land 7\n{ {\n x=0.427692307692308, y=0.7, z=0.824615384615384\n}, {\n x=0.646153846153847, y=0.7, z=0.706153846153846\n}, {\n x=0.598461538461539, y=0.7, z=1.02\n}, {\n x=0.963076923076923, y=0.7, z=0.658461538461538\n}, {\n x=1.24153846153846, y=0.7, z=0.513846153846153\n} },\n-- Land 8\n{ {\n x=1.21230769230769, y=0.7, z=-0.524615384615385\n}, {\n x=1.43692307692308, y=0.7, z=-0.612307692307693\n}, {\n x=1.46307692307692, y=0.7, z=-0.333846153846154\n}, {\n x=1.20153846153846, y=0.7, z=-0.14923076923077\n} },\n-- Land 9\n{ {\n x=1.61538461538462, y=0.7, z=-1.23076923076923\n}, {\n x=1.29692307692308, y=0.7, z=-1.23384615384615\n}, {\n x=1.46461538461539, y=0.7, z=-0.94923076923077\n}, {\n x=1.88153846153846, y=0.7, z=-1.05846153846154\n} } }\n\npieceMap = {\n{ \"Town\", \"Dahan\", \"Dahan\" },\n{ \"Dahan\", \"Dahan\" },\n{ \"Dahan\"},\n{ },\n{ \"Beasts\" },\n{ \"Town\", \"Town\", \"Dahan\", \"Disease\" },\n{ \"Explorer\" },\n{ \"Box Blight\", \"Wilds\" },\n{ },\n}", + "LuaScript": "posMap = { {\n{x=-0.476439982652664, y=0.7, z=-0.846576988697052},\n{x=-0.677029669284821, y=0.7, z=-0.479827255010605},\n{x=-0.499185860157013, y=0.7, z=-0.240660056471825},\n{x=-0.287950724363327, y=0.7, z=-0.46979895234108},\n{x=-0.797838807106018, y=0.7, z=-0.812914431095123},\n{x=-0.496960997581482, y=0.7, z=-1.15207397937775}\n}, {\n{x=-0.887108981609344, y=0.7, z=0.150939211249352},\n{x=-0.915263056755066, y=0.7, z=0.427070885896683},\n{x=-1.09339082241058, y=0.7, z=-0.304082691669464},\n{x=-1.17643797397614, y=0.7, z=0.0193619709461927},\n{x=-1.2093220949173, y=0.7, z=0.336201399564743}\n}, {\n{x=-1.27021324634552, y=0.7, z=0.877427160739899},\n{x=-1.54654061794281, y=0.7, z=0.761852562427521},\n{x=-1.47999489307404, y=0.7, z=1.18035590648651},\n{x=-1.87687063217163, y=0.7, z=1.04542481899261}\n}, {\n{x=-0.703055202960968, y=0.7, z=1.0737931728363},\n{x=-0.365765780210495, y=0.7, z=0.923354029655457}\n}, {\n{x=0.146697700023651, y=0.7, z=0.451435327529907},\n{x=-0.145565435290337, y=0.7, z=0.358186006546021},\n{x=0.481399685144424, y=0.7, z=0.446400791406631}\n}, {\n{x=0.20429639518261, y=0.7, z=-0.145616888999939},\n{x=0.460346966981888, y=0.7, z=-0.524160623550415},\n{x=0.232368379831314, y=0.7, z=-0.780758619308472},\n{x=0.53088104724884, y=0.7, z=-0.859749972820282},\n{x=0.198630169034004, y=0.7, z=-0.448015451431274},\n{x=0.491766184568405, y=0.7, z=-0.186412498354912}\n}, {\n{x=0.456946462392807, y=0.7, z=0.970854341983795},\n{x=1.06588840484619, y=0.7, z=0.594260334968567},\n{x=0.707080066204071, y=0.7, z=0.857990622520447}\n}, {\n{x=1.20580470561981, y=0.7, z=-0.0865104719996452},\n{x=0.975817799568176, y=0.7, z=0.0511561594903469},\n{x=1.35671353340149, y=0.7, z=-0.34654712677002},\n{x=1.01383745670319, y=0.7, z=-0.416406482458115}\n}, {\n{x=1.474613904953, y=0.7, z=-0.825516521930695},\n{x=1.19929945468903, y=0.7, z=-1.09683918952942},\n{x=1.64464902877808, y=0.7, z=-1.12166404724121}\n}, }\n\npieceMap = { {\n\"Town\",\n\"Dahan\",\n\"Dahan\"\n}, {\n\"Dahan\",\n\"Dahan\"\n}, {\n\"Dahan\"\n}, {\n\n}, {\n\"Beasts\"\n}, {\n\"Dahan\",\n\"Disease\",\n\"Town\",\n\"Town\"\n}, {\n\"Explorer\"\n}, {\n\"Wilds\",\n\"Box Blight\"\n}, {\n\n}, }", "LuaScriptState": "", "XmlUI": "" } diff --git a/objects/ThematicMapBag/contained/505d5d/script.lua b/objects/ThematicMapBag/contained/505d5d/script.lua index 7dc00c0a5..63bd4bb2a 100644 --- a/objects/ThematicMapBag/contained/505d5d/script.lua +++ b/objects/ThematicMapBag/contained/505d5d/script.lua @@ -1,133 +1,84 @@ -posMap = { --- Land 1 -{ { - x=0.0246153846153852, y=0.7, z=-0.516923076923078 -}, { - x=-0.209230769230769, y=0.7, z=-0.516923076923078 -}, { - x=-0.392307692307692, y=0.7, z=-0.475384615384616 -}, { - x=-0.246153846153846, y=0.7, z=-0.755384615384616 -}, { - x=0.0661538461538461, y=0.7, z=-0.821538461538462 -}, { - x=0.329230769230769, y=0.7, z=-0.633846153846155 -} }, --- Land 2 -{ { - x=-0.358461538461538, y=0.7, z=0.196923076923077 -}, { - x=-0.581538461538462, y=0.7, z=0.313846153846153 -}, { - x=-0.561538461538461, y=0.7, z=0.0276923076923071 -}, { - x=-0.875384615384615, y=0.7, z=0.0369230769230761 -}, { - x=-1.2, y=0.7, z=0.0199999999999993 -}, { - x=-1.04461538461538, y=0.7, z=0.309230769230769 -}, { - x=-0.835384615384615, y=0.7, z=-0.273846153846154 -}, { - x=-1.14615384615385, y=0.7, z=-0.301538461538462 -}, { - x=-0.849230769230769, y=0.7, z=-0.590769230769231 -}, { - x=-0.666153846153846, y=0.7, z=-0.855384615384616 -} }, --- Land 3 -{ { - x=-1.03846153846154, y=0.7, z=0.71076923076923 -}, { - x=-1.40769230769231, y=0.7, z=0.635384615384615 -}, { - x=-1.60307692307692, y=0.7, z=0.904615384615384 -}, { - x=-1.28923076923077, y=0.7, z=0.924615384615384 -}, { - x=-1.50923076923077, y=0.7, z=1.20769230769231 -} }, --- Land 4 -{ { - x=-0.0184615384615381, y=0.7, z=0.799999999999999 -}, { - x=-0.338461538461539, y=0.7, z=0.738461538461538 -}, { - x=-0.646153846153847, y=0.7, z=0.853846153846153 -}, { - x=-0.838461538461539, y=0.7, z=1.11076923076923 -} }, --- Land 5 -{ { - x=0.327692307692308, y=0.7, z=0.243076923076923 -}, { - x=0.0692307692307697, y=0.7, z=0.283076923076923 -}, { - x=0.0215384615384616, y=0.7, z=-0.0323076923076924 -}, { - x=0.592307692307693, y=0.7, z=0.26 -}, { - x=0.906153846153846, y=0.7, z=0.252307692307692 -} }, --- Land 6 -{ { - x=0.986153846153847, y=0.7, z=-0.796923076923078 -}, { - x=0.701538461538462, y=0.7, z=-0.78923076923077 -}, { - x=0.933846153846154, y=0.7, z=-0.550769230769232 -}, { - x=0.906153846153846, y=0.7, z=-0.292307692307693 -}, { - x=0.704615384615384, y=0.7, z=-0.486153846153847 -}, { - x=0.526153846153846, y=0.7, z=-0.232307692307693 -}, { - x=0.873846153846154, y=0.7, z=-1.07692307692308 -}, { - x=0.549230769230769, y=0.7, z=-1.05230769230769 -} }, --- Land 7 -{ { - x=0.48, y=0.7, z=0.73076923076923 -}, { - x=0.71076923076923, y=0.7, z=0.827692307692307 -}, { - x=0.453846153846154, y=0.7, z=1.01846153846154 +posMap = { { +{x=-0.315770328044891, y=0.7, z=-0.600127696990967}, +{x=-0.0961292311549187, y=0.7, z=-0.719468355178833}, +{x=0.178358495235443, y=0.7, z=-0.684528589248657}, +{x=-0.0135396858677268, y=0.7, z=-0.953712701797485}, +{x=-0.195881679654121, y=0.7, z=-0.375954896211624}, +{x=0.0996787622570992, y=0.7, z=-0.424119740724564} +}, { +{x=-0.836799502372742, y=0.7, z=0.0479922145605087}, +{x=-0.568823039531708, y=0.7, z=0.0378081426024437}, +{x=-1.03251826763153, y=0.7, z=-0.148366436362267}, +{x=-1.01757609844208, y=0.7, z=0.269315719604492}, +{x=-0.65910130739212, y=0.7, z=0.262170374393463}, +{x=-0.315473914146423, y=0.7, z=0.11574474722147}, +{x=-0.816917181015015, y=0.7, z=-0.362265795469284} +}, { +{x=-1.24645102024078, y=0.7, z=0.713408708572388}, +{x=-1.537757396698, y=0.7, z=0.899217486381531}, +{x=-1.43570029735565, y=0.7, z=1.22909903526306}, +{x=-1.00928246974945, y=0.7, z=0.692647457122803}, +{x=-1.25546407699585, y=0.7, z=0.987748622894287} +}, { +{x=0.00999483279883862, y=0.7, z=0.824891805648804}, +{x=-0.811483323574066, y=0.7, z=1.13785576820374}, +{x=-0.615488171577454, y=0.7, z=0.876374661922455}, +{x=-0.310031294822693, y=0.7, z=0.763000786304474} +}, { +{x=0.33249107003212, y=0.7, z=0.248043686151505}, +{x=0.923299968242645, y=0.7, z=0.264870434999466}, +{x=0.609192550182343, y=0.7, z=0.282914698123932}, +{x=0.0910110175609589, y=0.7, z=0.307516932487488}, +{x=0.0557007119059563, y=0.7, z=0.0104161221534014} +}, { +{x=0.886326789855957, y=0.7, z=-0.559155702590942}, +{x=0.951815009117126, y=0.7, z=-0.894047915935516}, +{x=0.713348269462585, y=0.7, z=-0.893877267837524}, +{x=0.675754249095917, y=0.7, z=-0.633750319480896}, +{x=0.852450430393219, y=0.7, z=-0.233626320958138}, +{x=0.450031727552414, y=0.7, z=-0.953692972660065}, +{x=0.562552928924561, y=0.7, z=-0.243896052241325} +}, { +{x=0.705758333206177, y=0.7, z=0.768395483493805}, +{x=0.510147511959076, y=0.7, z=1.05513787269592}, +{x=1.22557592391968, y=0.7, z=0.499311894178391}, +{x=0.935257375240326, y=0.7, z=0.620734453201294}, +{x=0.475635707378387, y=0.7, z=0.749125719070435} +}, { +{x=1.1778529882431, y=0.7, z=-0.187915310263634}, +{x=1.41946589946747, y=0.7, z=-0.259031146764755}, +{x=1.21341192722321, y=0.7, z=-0.425291866064072}, +{x=1.26333117485046, y=0.7, z=0.0431708469986916} +}, { +{x=1.81687879562378, y=0.7, z=-0.981319189071655}, +{x=1.49463152885437, y=0.7, z=-1.17896771430969}, +{x=1.47636008262634, y=0.7, z=-0.841110289096832}, +{x=1.16799938678741, y=0.7, z=-1.23683834075928} +}, } + +pieceMap = { { +"Dahan", +"Dahan", +"Town" }, { - x=0.953846153846154, y=0.7, z=0.632307692307692 +"Dahan", +"Dahan" }, { - x=1.24153846153846, y=0.7, z=0.501538461538461 -} }, --- Land 8 -{ { - x=1.21846153846154, y=0.7, z=-0.372307692307693 +"Dahan" }, { - x=1.42615384615385, y=0.7, z=-0.473846153846155 + }, { - x=1.47230769230769, y=0.7, z=-0.206153846153847 +"Beasts" }, { - x=1.24307692307692, y=0.7, z=0.0107692307692297 -} }, --- Land 9 -{ { - x=1.48461538461538, y=0.7, z=-0.972307692307692 +"Dahan", +"Town", +"Town", +"Disease" }, { - x=1.79230769230769, y=0.7, z=-1.03846153846154 +"Explorer" }, { - x=1.58, y=0.7, z=-1.27384615384615 +"Box Blight", +"Wilds" }, { - x=1.27230769230769, y=0.7, z=-1.21692307692308 -} } } -pieceMap = { -{ "Town", "Dahan", "Dahan" }, -{ "Dahan", "Dahan" }, -{ "Dahan"}, -{ }, -{ "Beasts" }, -{ "Town", "Town", "Dahan", "Disease" }, -{ "Explorer" }, -{ "Box Blight", "Wilds" }, -{ }, -} +}, } diff --git a/objects/ThematicMapBag/contained/9d9b8f/object.json b/objects/ThematicMapBag/contained/9d9b8f/object.json index c14827762..a0f0f918c 100644 --- a/objects/ThematicMapBag/contained/9d9b8f/object.json +++ b/objects/ThematicMapBag/contained/9d9b8f/object.json @@ -7,9 +7,9 @@ "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.15, + "scaleX": 6.65, "scaleY": 1.0, - "scaleZ": 7.15 + "scaleZ": 6.65 }, "Nickname": "W", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/1617312248751948979/43993A841C9DDA6119FF2FC44F8A1E297801719A/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/10446595517739930954/106C736ED3D0B7F032CFF06DA989DE16343CE8EC/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -64,9 +64,9 @@ "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.15, + "scaleX": 6.65, "scaleY": 1.0, - "scaleZ": 7.15 + "scaleZ": 6.65 }, "Nickname": "W", "Description": "", @@ -99,18 +99,18 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/1617313684071596020/DA49EFC90C32486096FF9964BD7A8381B1731FC0/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/2488891055302062722/0572FE6781990BE349D39C2FF5E4EEFC98D88399/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, "CustomToken": { - "Thickness": 0.4, + "Thickness": 0.395, "MergeDistancePixels": 15.0, "StandUp": false, "Stackable": false } }, - "LuaScript": "posMap = {\n-- Land 1\n{ {\n x=0.792307692307692, y=0.7, z=0.484615384615385\n}, {\n x=0.512307692307692, y=0.7, z=0.444615384615385\n}, {\n x=0.610769230769231, y=0.7, z=0.696923076923077\n}, {\n x=0.424615384615384, y=0.7, z=0.664615384615385\n}, {\n x=0.207692307692308, y=0.7, z=0.355384615384615\n}, {\n x=0.0215384615384616, y=0.7, z=0.616923076923077\n}, {\n x=0.0661538461538461, y=0.7, z=0.944615384615385\n}, {\n x=0.4, y=0.7, z=0.972307692307692\n}, {\n x=0.716923076923076, y=0.7, z=0.983076923076923\n} },\n-- Land 2\n{ {\n x=1.17538461538462, y=0.7, z=0.489230769230769\n}, {\n x=1.21384615384615, y=0.7, z=0.190769230769231\n}, {\n x=1.23230769230769, y=0.7, z=-0.124615384615385\n}, {\n x=1.19230769230769, y=0.7, z=-0.44\n} },\n-- Land 3\n{ {\n x=1.34153846153846, y=0.7, z=-0.76\n}, {\n x=1.6, y=0.7, z=-0.846153846153846\n}, {\n x=1.86461538461538, y=0.7, z=-1.03538461538462\n}, {\n x=1.56307692307692, y=0.7, z=-1.17230769230769\n} },\n-- Land 4\n{ {\n x=1.09384615384615, y=0.7, z=-0.933846153846154\n}, {\n x=0.883076923076923, y=0.7, z=-1.10307692307692\n}, {\n x=1.19076923076923, y=0.7, z=-1.18461538461538\n} },\n-- Land 5\n{ {\n x=0.72923076923077, y=0.7, z=0.0107692307692307\n}, {\n x=0.564615384615385, y=0.7, z=-0.184615384615385\n}, {\n x=0.652307692307693, y=0.7, z=-0.487692307692308\n}, {\n x=0.307692307692308, y=0.7, z=-0.392307692307692\n}, {\n x=0.267692307692308, y=0.7, z=-0.0692307692307693\n}, {\n x=0.887692307692308, y=0.7, z=-0.183076923076923\n} },\n-- Land 6\n{ {\n x=0.184615384615385, y=0.7, z=-0.893846153846154\n}, {\n x=-0.00153846153846123, y=0.7, z=-0.936923076923077\n}, {\n x=0.432307692307693, y=0.7, z=-0.950769230769231\n}, {\n x=-0.324615384615385, y=0.7, z=-1.08615384615385\n}, {\n x=-0.212307692307693, y=0.7, z=-0.787692307692308\n}, {\n x=-0.635384615384616, y=0.7, z=-1.13384615384615\n} },\n-- Land 7\n{ {\n x=-0.147692307692308, y=0.7, z=-0.32\n}, {\n x=-0.336923076923077, y=0.7, z=-0.276923076923077\n}, {\n x=-0.583076923076923, y=0.7, z=-0.269230769230769\n}, {\n x=-0.896923076923077, y=0.7, z=-0.346153846153846\n}, {\n x=-1.18923076923077, y=0.7, z=-0.504615384615385\n}, {\n x=-0.901538461538461, y=0.7, z=-0.676923076923077\n} },\n-- Land 8\n{ {\n x=-0.249230769230769, y=0.7, z=0.233846153846154\n}, {\n x=-0.466153846153846, y=0.7, z=0.196923076923077\n}, {\n x=-0.743076923076923, y=0.7, z=0.233846153846154\n}, {\n x=-1.01076923076923, y=0.7, z=0.02\n}, {\n x=-1.32, y=0.7, z=0.135384615384615\n} },\n-- Land 9\n{ {\n x=-0.489230769230769, y=0.7, z=1.03076923076923\n}, {\n x=-0.72923076923077, y=0.7, z=1.15384615384615\n}, {\n x=-0.44923076923077, y=0.7, z=0.747692307692308\n}, {\n x=-0.763076923076923, y=0.7, z=0.675384615384616\n} },\n-- Land 10\n{ {\n x=-1.25692307692308, y=0.7, z=0.867692307692308\n}, {\n x=-1.54307692307692, y=0.7, z=0.832307692307692\n}, {\n x=-1.48461538461538, y=0.7, z=1.14461538461538\n}, {\n x=-1.80307692307692, y=0.7, z=1.08307692307692\n}, {\n x=-1.38461538461538, y=0.7, z=0.56\n} } }\n\npieceMap = {\n{ \"Town\", \"Town\", \"Dahan\", \"Dahan\" },\n{ \"Town\" },\n{ \"Wilds\" },\n{ \"Beasts\" },\n{ \"Explorer\" },\n{ \"Explorer\", \"Dahan\" },\n{ \"Dahan\", \"Dahan\" },\n{ \"Dahan\", \"Dahan\" },\n{ \"Badlands\", \"Badlands\" },\n{ \"Beasts\" }\n}", + "LuaScript": "posMap = { {\n{x=0.37695774435997, y=0.7, z=0.448724210262299},\n{x=0.0823461264371872, y=0.7, z=0.408337712287903},\n{x=0.407651007175446, y=0.7, z=1.0759996175766},\n{x=0.620435357093811, y=0.7, z=0.807047128677368},\n{x=0.0979411974549294, y=0.7, z=0.924412667751312},\n{x=-0.077429287135601, y=0.7, z=0.624934017658234},\n{x=0.31482008099556, y=0.7, z=0.679011225700378}\n}, {\n{x=1.08425438404083, y=0.7, z=0.0365913398563862},\n{x=0.97553962469101, y=0.7, z=-0.388418108224869},\n{x=1.2739189863205, y=0.7, z=-0.23206028342247},\n{x=1.01924169063568, y=0.7, z=0.376613348722458}\n}, {\n{x=1.72655200958252, y=0.7, z=-0.843731105327606},\n{x=1.68663358688354, y=0.7, z=-1.10260272026062},\n{x=1.49571514129639, y=0.7, z=-0.730042219161987},\n{x=2.00880289077759, y=0.7, z=-1.07180523872375}\n}, {\n{x=0.912070035934448, y=0.7, z=-1.13448333740234},\n{x=1.01800608634949, y=0.7, z=-0.893035411834717},\n{x=1.26278686523438, y=0.7, z=-1.1700644493103}\n}, {\n{x=0.378761529922485, y=0.7, z=-0.206408962607384},\n{x=0.0417430810630322, y=0.7, z=-0.329631119966507},\n{x=0.462655037641525, y=0.7, z=-0.445058673620224},\n{x=0.294866859912872, y=0.7, z=0.0403130389750004}\n}, {\n{x=-0.0636184215545654, y=0.7, z=-0.769661903381348},\n{x=0.2588871717453, y=0.7, z=-0.890602707862854},\n{x=-0.468500405550003, y=0.7, z=-1.10806858539581},\n{x=-0.432705402374268, y=0.7, z=-0.801888406276703}\n}, {\n{x=-0.784254312515259, y=0.7, z=-0.310813069343567},\n{x=-0.462085098028183, y=0.7, z=-0.299874871969223},\n{x=-0.996440768241882, y=0.7, z=-0.597511827945709},\n{x=-1.13811802864075, y=0.7, z=-0.322192877531052}\n}, {\n{x=-0.887621700763702, y=0.7, z=0.0961267873644829},\n{x=-0.597280263900757, y=0.7, z=0.206136927008629},\n{x=-1.04282867908478, y=0.7, z=0.328575521707535},\n{x=-1.2557692527771, y=0.7, z=0.11874020844698}\n}, {\n{x=-0.447618991136551, y=0.7, z=0.945058703422546},\n{x=-0.717942774295807, y=0.7, z=0.976029455661774},\n{x=-1.01235020160675, y=0.7, z=1.06379878520966},\n{x=-0.871317684650421, y=0.7, z=0.722212135791779}\n}, {\n{x=-1.5682772397995, y=0.7, z=0.927552342414856},\n{x=-1.47455263137817, y=0.7, z=1.17989575862885},\n{x=-1.40466165542603, y=0.7, z=0.668830692768097},\n{x=-1.89473843574524, y=0.7, z=1.03815102577209}\n}, }\n\npieceMap = { {\n\"Dahan\",\n\"Dahan\",\n\"Town\",\n\"Town\"\n}, {\n\"Town\"\n}, {\n\"Wilds\"\n}, {\n\"Beasts\"\n}, {\n\"Explorer\"\n}, {\n\"Dahan\",\n\"Explorer\"\n}, {\n\"Dahan\",\n\"Dahan\"\n}, {\n\"Dahan\",\n\"Dahan\"\n}, {\n\"Badlands\",\n\"Badlands\"\n}, {\n\"Beasts\"\n}, }", "LuaScriptState": "", "XmlUI": "" } diff --git a/objects/ThematicMapBag/contained/9d9b8f/script.lua b/objects/ThematicMapBag/contained/9d9b8f/script.lua index 04dacec64..de7be228c 100644 --- a/objects/ThematicMapBag/contained/9d9b8f/script.lua +++ b/objects/ThematicMapBag/contained/9d9b8f/script.lua @@ -1,134 +1,85 @@ -posMap = { --- Land 1 -{ { - x=0.769230769230769, y=0.7, z=0.472307692307692 -}, { - x=0.481538461538462, y=0.7, z=0.413846153846154 -}, { - x=0.786153846153846, y=0.7, z=0.764615384615385 -}, { - x=0.584615384615384, y=0.7, z=0.721538461538462 -}, { - x=0.178461538461538, y=0.7, z=0.383076923076923 -}, { - x=0.270769230769231, y=0.7, z=0.695384615384615 -}, { - x=-0.0523076923076928, y=0.7, z=0.615384615384615 -}, { - x=0.0246153846153841, y=0.7, z=0.927692307692308 -} }, --- Land 2 -{ { - x=1.13846153846154, y=0.7, z=0.384615384615385 -}, { - x=1.24, y=0.7, z=0.101538461538462 -}, { - x=1.26153846153846, y=0.7, z=-0.229230769230769 -}, { - x=1.09538461538462, y=0.7, z=-0.495384615384615 -} }, --- Land 3 -{ { - x=1.54461538461538, y=0.7, z=-0.867692307692308 -}, { - x=1.81692307692308, y=0.7, z=-0.993846153846154 -}, { - x=1.55538461538462, y=0.7, z=-1.17692307692308 -} }, --- Land 4 -{ { - x=1.08461538461538, y=0.7, z=-0.96 -}, { - x=1.16615384615385, y=0.7, z=-1.2 -}, { - x=0.861538461538462, y=0.7, z=-1.08923076923077 -} }, --- Land 5 -{ { - x=0.721538461538461, y=0.7, z=0.0107692307692307 -}, { - x=0.555384615384615, y=0.7, z=-0.190769230769231 -}, { - x=0.878461538461539, y=0.7, z=-0.189230769230769 -}, { - x=0.667692307692307, y=0.7, z=-0.496923076923077 -}, { - x=0.355384615384616, y=0.7, z=-0.435384615384615 -}, { - x=0.249230769230769, y=0.7, z=-0.136923076923077 -} }, --- Land 6 -{ { - x=0.186153846153846, y=0.7, z=-0.915384615384616 -}, { - x=0.00461538461538479, y=0.7, z=-0.929230769230769 -}, { - x=0.423076923076923, y=0.7, z=-0.987692307692308 -}, { - x=-0.332307692307693, y=0.7, z=-1.09230769230769 -}, { - x=-0.261538461538462, y=0.7, z=-0.790769230769231 -}, { - x=-0.643076923076923, y=0.7, z=-1.15538461538462 -} }, --- Land 7 -{ { - x=-0.141538461538462, y=0.7, z=-0.307692307692308 -}, { - x=-0.330769230769231, y=0.7, z=-0.378461538461539 -}, { - x=-0.586153846153847, y=0.7, z=-0.303076923076923 -}, { - x=-0.881538461538461, y=0.7, z=-0.375384615384615 -}, { - x=-1.13692307692308, y=0.7, z=-0.564615384615385 -}, { - x=-0.872307692307693, y=0.7, z=-0.730769230769231 -} }, --- Land 8 -{ { - x=-0.258461538461538, y=0.7, z=0.227692307692308 -}, { - x=-0.40923076923077, y=0.7, z=0.113846153846154 -}, { - x=-0.678461538461539, y=0.7, z=0.0784615384615384 +posMap = { { +{x=0.220833882689476, y=0.7, z=0.718248963356018}, +{x=0.458157956600189, y=0.7, z=0.779805064201355}, +{x=0.277282536029816, y=0.7, z=0.448641389608383}, +{x=0.559863269329071, y=0.7, z=0.539481639862061}, +{x=0.715302109718323, y=0.7, z=0.822407722473145}, +{x=0.0119904009625316, y=0.7, z=0.920160889625549}, +{x=-0.0550627633929253, y=0.7, z=0.56524258852005} +}, { +{x=1.07734680175781, y=0.7, z=0.313139408826828}, +{x=1.21165680885315, y=0.7, z=-0.239372134208679}, +{x=1.18509960174561, y=0.7, z=0.0387935638427734}, +{x=1.05665361881256, y=0.7, z=-0.473312318325043} +}, { +{x=1.43248891830444, y=0.7, z=-0.844319939613342}, +{x=1.74675965309143, y=0.7, z=-0.958095729351044}, +{x=1.47272562980652, y=0.7, z=-1.1572470664978}, +{x=1.42339050769806, y=0.7, z=-0.596962153911591} +}, { +{x=0.907276153564453, y=0.7, z=-1.00578010082245}, +{x=1.13931035995483, y=0.7, z=-1.09592401981354}, +{x=0.74165290594101, y=0.7, z=-0.843494832515717} +}, { +{x=0.521370708942413, y=0.7, z=-0.176042199134827}, +{x=0.821698367595673, y=0.7, z=-0.162089556455612}, +{x=0.610847234725952, y=0.7, z=-0.469620734453201}, +{x=0.208224520087242, y=0.7, z=-0.0977388322353363}, +{x=0.297858744859695, y=0.7, z=-0.406880706548691} +}, { +{x=-0.237900793552399, y=0.7, z=-0.846979200839996}, +{x=-0.0155062368139625, y=0.7, z=-0.869698464870453}, +{x=0.249773532152176, y=0.7, z=-0.807910680770874}, +{x=-0.419504135847092, y=0.7, z=-1.0572212934494} +}, { +{x=-0.814958095550537, y=0.7, z=-0.362400025129318}, +{x=-0.577386200428009, y=0.7, z=-0.341111689805985}, +{x=-1.18347215652466, y=0.7, z=-0.443834960460663}, +{x=-0.273767858743668, y=0.7, z=-0.358665019273758}, +{x=-0.948078334331512, y=0.7, z=-0.627282559871674} +}, { +{x=-0.749227702617645, y=0.7, z=0.121962115168571}, +{x=-0.50704550743103, y=0.7, z=0.110535532236099}, +{x=-1.30649363994598, y=0.7, z=0.00881843268871307}, +{x=-0.267337143421173, y=0.7, z=0.224872067570686}, +{x=-1.04029774665833, y=0.7, z=0.187863990664482} +}, { +{x=-0.779943883419037, y=0.7, z=1.14582133293152}, +{x=-0.551067233085632, y=0.7, z=1.13492655754089}, +{x=-0.471279799938202, y=0.7, z=0.72510039806366}, +{x=-0.756493508815765, y=0.7, z=0.652015388011932} +}, { +{x=-1.52184116840363, y=0.7, z=0.902207255363464}, +{x=-1.47360157966614, y=0.7, z=1.18161261081696}, +{x=-1.21927773952484, y=0.7, z=0.884458959102631}, +{x=-1.81057071685791, y=0.7, z=1.00351929664612} +}, } + +pieceMap = { { +"Dahan", +"Dahan", +"Town", +"Town" }, { - x=-0.970769230769231, y=0.7, z=0.195384615384615 +"Town" }, { - x=-1.22307692307692, y=0.7, z=0.00153846153846151 -} }, --- Land 9 -{ { - x=-0.483076923076923, y=0.7, z=1.07230769230769 +"Wilds" }, { - x=-0.74, y=0.7, z=1.15076923076923 +"Beasts" }, { - x=-0.469230769230769, y=0.7, z=0.761538461538461 +"Explorer" }, { - x=-0.773846153846154, y=0.7, z=0.667692307692308 -} }, --- Land 10 -{ { - x=-1.33384615384615, y=0.7, z=0.930769230769231 +"Dahan", +"Explorer" }, { - x=-1.58153846153846, y=0.7, z=0.812307692307692 +"Dahan", +"Dahan" }, { - x=-1.53384615384615, y=0.7, z=1.12 +"Dahan", +"Dahan" }, { - x=-1.84307692307692, y=0.7, z=1.01692307692308 +"Badlands", +"Badlands" }, { - x=-1.41384615384615, y=0.7, z=0.524615384615385 -} } } - -pieceMap = { -{ "Town", "Town", "Dahan", "Dahan" }, -{ "Town" }, -{ "Wilds" }, -{ "Beasts" }, -{ "Explorer" }, -{ "Explorer", "Dahan" }, -{ "Dahan", "Dahan" }, -{ "Dahan", "Dahan" }, -{ "Badlands", "Badlands" }, -{ "Beasts" } -} +"Beasts" +}, } diff --git a/objects/ThematicMapBag/contained/bd6555/object.json b/objects/ThematicMapBag/contained/bd6555/object.json index 5415444f7..418669f27 100644 --- a/objects/ThematicMapBag/contained/bd6555/object.json +++ b/objects/ThematicMapBag/contained/bd6555/object.json @@ -7,9 +7,9 @@ "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.15, + "scaleX": 6.65, "scaleY": 1.0, - "scaleZ": 7.15 + "scaleZ": 6.65 }, "Nickname": "NE", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/1617312248751944356/231B959FF1D7AB85611A7EE9A43440A742EE3C97/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/15037723417491722401/479445306C868008A27AC22BC48B0535E95993ED/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -64,9 +64,9 @@ "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.15, + "scaleX": 6.65, "scaleY": 1.0, - "scaleZ": 7.15 + "scaleZ": 6.65 }, "Nickname": "NE", "Description": "", @@ -99,18 +99,18 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/1617313684071905519/D507EC5A4A546FEDB157E4E52E84717281A6F8E9/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/2488891055302046933/2A8E8785514C9947445980EB9AFE5D092432BCCF/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, "CustomToken": { - "Thickness": 0.4, + "Thickness": 0.395, "MergeDistancePixels": 15.0, "StandUp": false, "Stackable": false } }, - "LuaScript": "posMap = {\n-- Land 1\n{ {\n x=-0.244615384615385, y=0.7, z=-1.06307692307692\n}, {\n x=-0.538461538461538, y=0.7, z=-1.18923076923077\n}, {\n x=-0.741538461538462, y=0.7, z=-0.932307692307692\n}, {\n x=-1.04153846153846, y=0.7, z=-0.823076923076923\n} },\n-- Land 2\n{ {\n x=-0.956923076923077, y=0.7, z=-0.0800000000000001\n}, {\n x=-0.621538461538462, y=0.7, z=-0.478461538461538\n}, {\n x=-0.932307692307693, y=0.7, z=-0.430769230769231\n}, {\n x=-1.19384615384615, y=0.7, z=-0.250769230769231\n}, {\n x=-1.32769230769231, y=0.7, z=0.04\n} },\n-- Land 3\n{ {\n x=-0.595384615384616, y=0.7, z=0.447692307692308\n}, {\n x=-0.853846153846154, y=0.7, z=0.335384615384615\n}, {\n x=-1.17846153846154, y=0.7, z=0.443076923076923\n}, {\n x=-0.576923076923077, y=0.7, z=0.173846153846154\n} },\n-- Land 4\n{ {\n x=-0.723076923076924, y=0.7, z=0.998461538461539\n}, {\n x=-1.03230769230769, y=0.7, z=0.989230769230769\n}, {\n x=-1.32307692307692, y=0.7, z=0.841538461538462\n}, {\n x=-1.65076923076923, y=0.7, z=0.775384615384615\n}, {\n x=-1.35384615384615, y=0.7, z=1.16923076923077\n} },\n-- Land 5\n{ {\n x=0.384615384615385, y=0.7, z=-0.649230769230769\n}, {\n x=0.0553846153846153, y=0.7, z=-0.706153846153846\n}, {\n x=-0.0938461538461538, y=0.7, z=-0.409230769230769\n}, {\n x=0.423076923076923, y=0.7, z=-0.952307692307692\n}, {\n x=0.693846153846154, y=0.7, z=-0.746153846153846\n}, {\n x=0.713846153846154, y=0.7, z=-1.09538461538462\n}, {\n x=0.978461538461538, y=0.7, z=-0.904615384615385\n} },\n-- Land 6\n{ {\n x=0.353846153846153, y=0.7, z=0.775384615384615\n}, {\n x=0.287692307692307, y=0.7, z=0.947692307692308\n}, {\n x=0.530769230769231, y=0.7, z=0.973846153846154\n}, {\n x=0.76, y=0.7, z=0.749230769230769\n} },\n-- Land 7\n{ {\n x=0.346153846153846, y=0.7, z=0.0799999999999999\n}, {\n x=0.169230769230769, y=0.7, z=0.0769230769230769\n}, {\n x=-0.00615384615384657, y=0.7, z=0.0569230769230769\n}, {\n x=0.267692307692307, y=0.7, z=0.301538461538462\n}, {\n x=0.0907692307692307, y=0.7, z=0.298461538461538\n}, {\n x=-0.0769230769230769, y=0.7, z=0.249230769230769\n}, {\n x=0.553846153846154, y=0.7, z=0.326153846153846\n}, {\n x=0.643076923076923, y=0.7, z=-0.00461538461538465\n}, {\n x=0.88, y=0.7, z=0.267692307692308\n}, {\n x=0.383076923076923, y=0.7, z=-0.193846153846154\n}, {\n x=1.20153846153846, y=0.7, z=0.330769230769231\n}, {\n x=0.0199999999999998, y=0.7, z=0.54\n}, {\n x=-0.193846153846154, y=0.7, z=0.806153846153846\n} },\n-- Land 8\n{ {\n x=1.20615384615385, y=0.7, z=-0.549230769230769\n}, {\n x=1.45846153846154, y=0.7, z=-0.355384615384615\n}, {\n x=0.941538461538461, y=0.7, z=-0.38\n}, {\n x=1.19846153846154, y=0.7, z=-0.178461538461538\n} },\n-- Land 9\n{ {\n x=1.29846153846154, y=0.7, z=-1.27384615384615\n}, {\n x=1.38461538461538, y=0.7, z=-1.09076923076923\n}, {\n x=1.58307692307692, y=0.7, z=-1.27692307692308\n}, {\n x=1.71076923076923, y=0.7, z=-0.989230769230769\n}, {\n x=2.02153846153846, y=0.7, z=-1.05230769230769\n} } }\n\npieceMap = {\n{ \"City\" },\n{ \"Wilds\" },\n{ \"Dahan\" },\n{ \"Dahan\" },\n{ \"Town\" },\n{ \"Dahan\", \"Dahan\" },\n{ \"Explorer\", \"Explorer\", \"Explorer\", \"Dahan\", \"Dahan\", \"Dahan\" },\n{ },\n{ \"Beasts\" , \"Disease\" }\n}", + "LuaScript": "posMap = { {\n{x=-0.534538149833679, y=0.7, z=-0.922554433345795},\n{x=-0.245485082268715, y=0.7, z=-0.93854832649231},\n{x=-0.817538559436798, y=0.7, z=-1.05550718307495},\n{x=-0.952154457569122, y=0.7, z=-0.759829580783844}\n}, {\n{x=-0.689529001712799, y=0.7, z=-0.257804661989212},\n{x=-0.497910678386688, y=0.7, z=-0.448631256818771},\n{x=-0.974483966827393, y=0.7, z=-0.354219228029251},\n{x=-1.16974198818207, y=0.7, z=-0.10971949249506}\n}, {\n{x=-0.867061197757721, y=0.7, z=0.469517529010773},\n{x=-0.685601949691772, y=0.7, z=0.238276913762093},\n{x=-1.08175754547119, y=0.7, z=0.315078914165497},\n{x=-1.36032569408417, y=0.7, z=0.514636099338531}\n}, {\n{x=-1.25269556045532, y=0.7, z=0.996265172958374},\n{x=-1.67169308662415, y=0.7, z=0.871798157691956},\n{x=-1.00411558151245, y=0.7, z=1.11315834522247},\n{x=-1.44854950904846, y=0.7, z=1.18800950050354}\n}, {\n{x=0.220640376210213, y=0.7, z=-0.646533668041229},\n{x=0.474307209253311, y=0.7, z=-1.00091576576233},\n{x=0.703624963760376, y=0.7, z=-0.768621683120728}\n}, {\n{x=0.570757925510406, y=0.7, z=0.895230889320374},\n{x=0.287462651729584, y=0.7, z=0.953425407409668},\n{x=0.356162250041962, y=0.7, z=0.695322811603546},\n{x=0.447365760803223, y=0.7, z=1.17677712440491}\n}, {\n{x=0.989228188991547, y=0.7, z=0.370616495609283},\n{x=0.732388854026794, y=0.7, z=0.319460332393646},\n{x=0.440063208341599, y=0.7, z=0.291147619485855},\n{x=-0.116522043943405, y=0.7, z=0.290507137775421},\n{x=-0.235784694552422, y=0.7, z=0.527865648269653},\n{x=-0.0240650046616793, y=0.7, z=0.488098233938217},\n{x=0.16689421236515, y=0.7, z=-0.0825736522674561},\n{x=0.147118180990219, y=0.7, z=0.223347306251526}\n}, {\n{x=1.16741597652435, y=0.7, z=-0.31862199306488},\n{x=0.807013988494873, y=0.7, z=-0.280900299549103}\n}, {\n{x=1.54028272628784, y=0.7, z=-0.968172252178192},\n{x=1.26659417152405, y=0.7, z=-1.12853908538818},\n{x=1.86308944225311, y=0.7, z=-1.04517245292664},\n{x=1.52149796485901, y=0.7, z=-1.2599333524704}\n}, }\n\npieceMap = { {\n\"City\"\n}, {\n\"Wilds\"\n}, {\n\"Dahan\"\n}, {\n\"Dahan\"\n}, {\n\"Town\"\n}, {\n\"Dahan\",\n\"Dahan\"\n}, {\n\"Dahan\",\n\"Dahan\",\n\"Dahan\",\n\"Explorer\",\n\"Explorer\",\n\"Explorer\"\n}, {\n\n}, {\n\"Disease\",\n\"Beasts\"\n}, }", "LuaScriptState": "", "XmlUI": "" } diff --git a/objects/ThematicMapBag/contained/bd6555/script.lua b/objects/ThematicMapBag/contained/bd6555/script.lua index ca4dc517f..4baecd917 100644 --- a/objects/ThematicMapBag/contained/bd6555/script.lua +++ b/objects/ThematicMapBag/contained/bd6555/script.lua @@ -1,135 +1,85 @@ -posMap = { --- Land 1 -{ { - x=-0.253846153846154, y=0.7, z=-1.09076923076923 -}, { - x=-0.549230769230769, y=0.7, z=-1.18615384615385 -}, { - x=-0.755384615384615, y=0.7, z=-0.949230769230769 -}, { - x=-1.04615384615385, y=0.7, z=-0.827692307692308 -} }, --- Land 2 -{ { - x=-1.03538461538462, y=0.7, z=-0.123076923076923 -}, { - x=-0.696923076923077, y=0.7, z=-0.298461538461538 -}, { - x=-0.964615384615385, y=0.7, z=-0.466153846153846 -}, { - x=-1.24461538461538, y=0.7, z=-0.303076923076923 -}, { - x=-0.612307692307692, y=0.7, z=-0.592307692307692 -}, { - x=-1.27076923076923, y=0.7, z=0.0107692307692308 -} }, --- Land 3 -{ { - x=-0.621538461538462, y=0.7, z=0.449230769230769 -}, { - x=-0.88, y=0.7, z=0.336923076923077 -}, { - x=-0.604615384615385, y=0.7, z=0.178461538461538 -}, { - x=-1.18153846153846, y=0.7, z=0.44 -} }, --- Land 4 -{ { - x=-0.830769230769231, y=0.7, z=0.983076923076923 -}, { - x=-1.08461538461538, y=0.7, z=0.878461538461538 -}, { - x=-1.38923076923077, y=0.7, z=0.795384615384615 -}, { - x=-1.30769230769231, y=0.7, z=1.12769230769231 -}, { - x=-1.60769230769231, y=0.7, z=1.02923076923077 -}, { - x=-1.70769230769231, y=0.7, z=0.727692307692308 -} }, --- Land 5 -{ { - x=0.475384615384615, y=0.7, z=-0.675384615384616 -}, { - x=0.432307692307692, y=0.7, z=-0.973846153846154 -}, { - x=0.713846153846154, y=0.7, z=-1.11846153846154 -}, { - x=0.169230769230769, y=0.7, z=-0.773846153846154 -}, { - x=-0.0815384615384617, y=0.7, z=-0.575384615384615 -}, { - x=0.946153846153846, y=0.7, z=-0.903076923076923 -}, { - x=-0.167692307692308, y=0.7, z=-0.266153846153846 -} }, --- Land 6 -{ { - x=0.292307692307692, y=0.7, z=0.781538461538462 -}, { - x=0.198461538461538, y=0.7, z=0.976923076923077 -}, { - x=0.52, y=0.7, z=0.912307692307692 -}, { - x=0.763076923076923, y=0.7, z=0.712307692307692 -} }, --- Land 7 -{ { - x=0.32, y=0.7, z=0.0815384615384616 -}, { - x=0.143076923076923, y=0.7, z=0.0784615384615384 -}, { - x=-0.0323076923076924, y=0.7, z=0.0584615384615385 -}, { - x=0.241538461538462, y=0.7, z=0.303076923076923 -}, { - x=0.0646153846153843, y=0.7, z=0.3 -}, { - x=-0.103076923076923, y=0.7, z=0.250769230769231 -}, { - x=0.496923076923077, y=0.7, z=0.275384615384615 -}, { - x=0.603076923076923, y=0.7, z=-0.0353846153846155 -}, { - x=0.823076923076923, y=0.7, z=0.216923076923077 -}, { - x=0.312307692307692, y=0.7, z=-0.186153846153846 -}, { - x=-0.0646153846153849, y=0.7, z=0.556923076923077 -}, { - x=-0.303076923076923, y=0.7, z=0.758461538461538 -} }, --- Land 8 -{ { - x=1.12153846153846, y=0.7, z=-0.536923076923077 +posMap = { { +{x=-0.46403631567955, y=0.7, z=-1.02474248409271}, +{x=-0.971315324306488, y=0.7, z=-0.727979063987732}, +{x=-0.743600249290466, y=0.7, z=-0.907816529273987}, +{x=-0.169271498918533, y=0.7, z=-1.02744996547699} +}, { +{x=-0.916654527187347, y=0.7, z=-0.238337755203247}, +{x=-1.29482460021973, y=0.7, z=0.15763808786869}, +{x=-0.685612380504608, y=0.7, z=-0.117018908262253}, +{x=-0.612250208854675, y=0.7, z=-0.41304224729538}, +{x=-1.14885258674622, y=0.7, z=-0.0868294909596443} +}, { +{x=-0.834461331367493, y=0.7, z=0.447160452604294}, +{x=-0.552568376064301, y=0.7, z=0.502445459365845}, +{x=-0.697721302509308, y=0.7, z=0.237539127469063}, +{x=-1.11334669589996, y=0.7, z=0.472855985164642} +}, { +{x=-1.03417015075684, y=0.7, z=0.9846231341362}, +{x=-1.67628979682922, y=0.7, z=0.705039620399475}, +{x=-1.29823732376099, y=0.7, z=1.19192516803741}, +{x=-1.26460206508636, y=0.7, z=0.848338007926941}, +{x=-0.779981732368469, y=0.7, z=1.00766396522522}, +{x=-1.53747618198395, y=0.7, z=0.974970459938049} +}, { +{x=0.432715803384781, y=0.7, z=-0.738422036170959}, +{x=0.861177980899811, y=0.7, z=-0.875383973121643}, +{x=0.559582889080048, y=0.7, z=-0.994031965732574}, +{x=0.138748899102211, y=0.7, z=-0.62626314163208}, +{x=-0.089911513030529, y=0.7, z=-0.418073028326035} +}, { +{x=0.608649492263794, y=0.7, z=0.934822261333466}, +{x=0.395765870809555, y=0.7, z=0.891038119792938}, +{x=0.768443405628204, y=0.7, z=0.742591977119446}, +{x=0.166026994585991, y=0.7, z=0.997875452041626} +}, { +{x=0.596888184547424, y=0.7, z=0.405547648668289}, +{x=0.391274869441986, y=0.7, z=0.413583189249039}, +{x=0.191476538777351, y=0.7, z=0.367893397808075}, +{x=0.574375808238983, y=0.7, z=0.120068937540054}, +{x=0.402738511562347, y=0.7, z=0.112248502671719}, +{x=0.231626108288765, y=0.7, z=0.0887138098478317}, +{x=1.15429770946503, y=0.7, z=0.484665125608444}, +{x=0.861226677894592, y=0.7, z=0.256487101316452}, +{x=0.341014981269836, y=0.7, z=-0.13568788766861}, +{x=-0.109325259923935, y=0.7, z=0.619289994239807}, +{x=-0.0745311751961708, y=0.7, z=0.279368340969086} +}, { +{x=1.48015439510345, y=0.7, z=-0.301293224096298}, +{x=1.2593230009079, y=0.7, z=-0.564273297786713}, +{x=1.17471325397491, y=0.7, z=-0.220414236187935}, +{x=0.84522557258606, y=0.7, z=-0.31428450345993} +}, { +{x=1.54706346988678, y=0.7, z=-1.01623463630676}, +{x=1.34187233448029, y=0.7, z=-1.21986198425293}, +{x=1.90427911281586, y=0.7, z=-1.00269329547882}, +{x=1.58564102649689, y=0.7, z=-0.7818962931633}, +{x=1.61257696151733, y=0.7, z=-1.25984573364258} +}, } + +pieceMap = { { +"City" }, { - x=1.42769230769231, y=0.7, z=-0.436923076923077 +"Wilds" }, { - x=1.18769230769231, y=0.7, z=-0.230769230769231 +"Dahan" }, { - x=0.884615384615384, y=0.7, z=-0.332307692307692 -} }, --- Land 9 -{ { - x=1.26307692307692, y=0.7, z=-1.19230769230769 +"Dahan" }, { - x=1.46923076923077, y=0.7, z=-1.06 +"Town" }, { - x=1.49384615384615, y=0.7, z=-1.31692307692308 +"Dahan", +"Dahan" }, { - x=1.74, y=0.7, z=-1.11846153846154 +"Dahan", +"Dahan", +"Dahan", +"Explorer", +"Explorer", +"Explorer" }, { - x=2.04153846153846, y=0.7, z=-1.09384615384615 -} } } -pieceMap = { -{ "City" }, -{ "Wilds" }, -{ "Dahan" }, -{ "Dahan" }, -{ "Town" }, -{ "Dahan", "Dahan" }, -{ "Explorer", "Explorer", "Explorer", "Dahan", "Dahan", "Dahan" }, -{ }, -{ "Beasts" , "Disease" } -} +}, { +"Disease", +"Beasts" +}, } diff --git a/objects/ThematicMapBag/contained/e0c325/object.json b/objects/ThematicMapBag/contained/e0c325/object.json index 1be973256..fc27982cc 100644 --- a/objects/ThematicMapBag/contained/e0c325/object.json +++ b/objects/ThematicMapBag/contained/e0c325/object.json @@ -7,9 +7,9 @@ "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.15, + "scaleX": 6.65, "scaleY": 1.0, - "scaleZ": 7.15 + "scaleZ": 6.65 }, "Nickname": "NW", "Description": "", @@ -42,7 +42,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/1617312248751945075/1E88313DA3E8059E02262C13471276200E9005A2/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/13334447005323699558/F1ACFBF42BA1F2CC96952DD705EC46FDA5D9FD4C/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -64,9 +64,9 @@ "rotX": 0.0, "rotY": 180.0, "rotZ": 0.0, - "scaleX": 7.15, + "scaleX": 6.65, "scaleY": 1.0, - "scaleZ": 7.15 + "scaleZ": 6.65 }, "Nickname": "NW", "Description": "", @@ -99,7 +99,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/1617313684071612327/BCAFF7A46F5717C482E8D1437217458705862051/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/2488891055302045516/5106F3D0363C8BEE19BF279F80FFB5691718B5AB/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, @@ -110,7 +110,7 @@ "Stackable": false } }, - "LuaScript": "posMap = {\n-- Land 1\n{ {\n x=0.796923076923077, y=0.7, z=0.950769230769231\n}, {\n x=0.610769230769231, y=0.7, z=0.893846153846154\n}, {\n x=0.663076923076924, y=0.7, z=1.06\n}, {\n x=0.769230769230769, y=0.7, z=0.690769230769231\n}, {\n x=0.941538461538461, y=0.7, z=0.412307692307693\n}, {\n x=0.624615384615385, y=0.7, z=0.407692307692308\n} },\n-- Land 2\n{ {\n x=1.34615384615385, y=0.7, z=-0.689230769230769\n}, {\n x=1.02307692307692, y=0.7, z=-0.689230769230769\n}, {\n x=1.34923076923077, y=0.7, z=-0.363076923076923\n}, {\n x=1.02461538461538, y=0.7, z=-0.361538461538462\n}, {\n x=0.713846153846154, y=0.7, z=-0.486153846153846\n}, {\n x=0.755384615384615, y=0.7, z=-0.166153846153846\n} },\n-- Land 3\n{ {\n x=1.55846153846154, y=0.7, z=-1.26769230769231\n}, {\n x=1.75230769230769, y=0.7, z=-1.12153846153846\n}, {\n x=1.29076923076923, y=0.7, z=-1.15230769230769\n}, {\n x=0.99076923076923, y=0.7, z=-1.20769230769231\n}, {\n x=1.23161220550537, y=0.7, z=-1.40991246700287\n} },\n-- Land 4\n{ {\n x=0.324615384615385, y=0.7, z=-0.9\n}, {\n x=0.012307692307692, y=0.7, z=-0.963076923076923\n}, {\n x=-0.238461538461538, y=0.7, z=-0.772307692307692\n}, {\n x=-0.286153846153846, y=0.7, z=-1.08\n}, {\n x=0.621538461538461, y=0.7, z=-0.996923076923077\n} },\n-- Land 5\n{ {\n x=-0.106153846153846, y=0.7, z=0.0200000000000001\n}, {\n x=-0.370769230769231, y=0.7, z=-0.163076923076923\n}, {\n x=-0.375384615384615, y=0.7, z=0.184615384615385\n}, {\n x=-0.0907692307692313, y=0.7, z=-0.32\n}, {\n x=0.170769230769231, y=0.7, z=-0.138461538461538\n}, {\n x=0.206153846153846, y=0.7, z=-0.458461538461539\n}, {\n x=-0.647692307692308, y=0.7, z=0.0200000000000001\n} },\n-- Land 6\n{ {\n x=-0.296923076923077, y=0.7, z=0.904615384615385\n}, {\n x=-0.438461538461539, y=0.7, z=0.750769230769231\n}, {\n x=0.18, y=0.7, z=0.932307692307692\n}, {\n x=0.221538461538461, y=0.7, z=0.609230769230769\n}, {\n x=-0.106153846153846, y=0.7, z=0.666153846153846\n} },\n-- Land 7\n{ {\n x=-1.09230769230769, y=0.7, z=-0.333846153846154\n}, {\n x=-1.28, y=0.7, z=-0.183076923076923\n}, {\n x=-0.847692307692307, y=0.7, z=-0.309230769230769\n}, {\n x=-1.04923076923077, y=0.7, z=-0.609230769230769\n}, {\n x=-0.690769230769231, y=0.7, z=-0.970769230769231\n} },\n-- Land 8\n{ {\n x=-1.06923076923077, y=0.7, z=0.546153846153846\n}, {\n x=-1.20307692307692, y=0.7, z=0.673846153846154\n}, {\n x=-1.02615384615385, y=0.7, z=0.213846153846154\n}, {\n x=-1.32923076923077, y=0.7, z=0.267692307692308\n}, {\n x=-0.836923076923077, y=0.7, z=0.472307692307692\n}, {\n x=-1.44461538461538, y=0.7, z=0.564615384615385\n} },\n-- Land 9\n{ {\n x=-0.866153846153847, y=0.7, z=1.08\n}, {\n x=-1.19384615384615, y=0.7, z=1.16615384615385\n}, {\n x=-1.47076923076923, y=0.7, z=0.969230769230769\n}, {\n x=-1.79230769230769, y=0.7, z=0.987692307692308\n}, {\n x=-1.49230769230769, y=0.7, z=1.29230769230769\n} } }\n\npieceMap = {\n{ \"Explorer\", \"Explorer\", \"Dahan\", \"Vitality\" },\n{ \"City\" },\n{ \"Town\", \"Disease\" },\n{ },\n{ \"Vitality\" },\n{ \"Dahan\", \"Dahan\", \"Vitality\" },\n{ \"Dahan\", \"Badlands\" },\n{ \"Explorer\", \"Dahan\" },\n{ \"Dahan\" }\n}", + "LuaScript": "posMap = { {\n{x=1.03206992149353, y=0.7, z=0.368191510438919},\n{x=0.770852625370026, y=0.7, z=0.452800720930099},\n{x=0.487140119075775, y=0.7, z=0.406007498502731},\n{x=0.527745604515076, y=0.7, z=0.720632076263428},\n{x=0.802995383739471, y=0.7, z=0.701526880264282},\n{x=0.456201195716858, y=0.7, z=1.10497581958771},\n{x=0.722643852233887, y=0.7, z=0.974576532840729}\n}, {\n{x=1.03417432308197, y=0.7, z=-0.213406413793564},\n{x=0.714948534965515, y=0.7, z=-0.164409995079041},\n{x=0.930232584476471, y=0.7, z=-0.504953563213348},\n{x=1.37290716171265, y=0.7, z=-0.483955383300781}\n}, {\n{x=1.57526290416718, y=0.7, z=-1.12479865550995},\n{x=1.28288865089417, y=0.7, z=-0.940917551517487},\n{x=1.8775440454483, y=0.7, z=-1.02955079078674},\n{x=1.29889500141144, y=0.7, z=-1.25504040718079},\n{x=1.01473760604858, y=0.7, z=-1.03009259700775}\n}, {\n{x=-0.275172770023346, y=0.7, z=-0.8930783867836},\n{x=0.0399612337350845, y=0.7, z=-0.94649875164032},\n{x=0.324840277433395, y=0.7, z=-0.947936534881592}\n}, {\n{x=-0.401353985071182, y=0.7, z=0.139266029000282},\n{x=-0.120020247995853, y=0.7, z=-0.0051779611967504},\n{x=-0.000917755358386785, y=0.7, z=-0.370400696992874},\n{x=-0.464753925800323, y=0.7, z=-0.273988097906113}\n}, {\n{x=-0.498670190572739, y=0.7, z=0.738214671611786},\n{x=-0.188703119754791, y=0.7, z=0.6575728058815},\n{x=0.100383311510086, y=0.7, z=0.639071762561798},\n{x=0.0385243594646454, y=0.7, z=0.933713912963867},\n{x=-0.27738481760025, y=0.7, z=0.91776305437088}\n}, {\n{x=-1.16328227519989, y=0.7, z=-0.480714291334152},\n{x=-0.899096131324768, y=0.7, z=-0.35194456577301},\n{x=-1.17825126647949, y=0.7, z=-0.211371451616287},\n{x=-0.923183739185333, y=0.7, z=-0.632657706737518}\n}, {\n{x=-1.12474024295807, y=0.7, z=0.23615263402462},\n{x=-1.02201306819916, y=0.7, z=0.493113249540329},\n{x=-1.36999881267548, y=0.7, z=0.495774835348129},\n{x=-1.07998502254486, y=0.7, z=0.782303750514984}\n}, {\n{x=-1.11906015872955, y=0.7, z=1.11325764656067},\n{x=-1.43082535266876, y=0.7, z=1.15355372428894},\n{x=-1.73219347000122, y=0.7, z=1.00080335140228}\n}, }\n\npieceMap = { {\n\"Explorer\",\n\"Explorer\",\n\"Vitality\",\n\"Dahan\"\n}, {\n\"City\"\n}, {\n\"Town\",\n\"Disease\"\n}, {\n\n}, {\n\"Vitality\"\n}, {\n\"Vitality\",\n\"Dahan\",\n\"Dahan\"\n}, {\n\"Dahan\",\n\"Badlands\"\n}, {\n\"Explorer\",\n\"Dahan\"\n}, {\n\"Dahan\"\n}, }", "LuaScriptState": "", "XmlUI": "" } diff --git a/objects/ThematicMapBag/contained/e0c325/script.lua b/objects/ThematicMapBag/contained/e0c325/script.lua index b472172e5..2cc3c5c57 100644 --- a/objects/ThematicMapBag/contained/e0c325/script.lua +++ b/objects/ThematicMapBag/contained/e0c325/script.lua @@ -1,131 +1,83 @@ -posMap = { --- Land 1 -{ { - x=0.790769230769231, y=0.7, z=0.826153846153846 -}, { - x=0.604615384615385, y=0.7, z=0.769230769230769 -}, { - x=0.64, y=0.7, z=0.955384615384616 -}, { - x=0.758461538461538, y=0.7, z=0.524615384615385 -}, { - x=1.00307692307692, y=0.7, z=0.296923076923077 -}, { - x=0.529230769230769, y=0.7, z=0.292307692307692 -} }, --- Land 2 -{ { - x=1.35384615384615, y=0.7, z=-0.687692307692308 -}, { - x=1.03076923076923, y=0.7, z=-0.687692307692308 -}, { - x=0.721538461538461, y=0.7, z=-0.484615384615384 -}, { - x=1.35692307692308, y=0.7, z=-0.361538461538462 -}, { - x=1.03230769230769, y=0.7, z=-0.36 -}, { - x=0.763076923076923, y=0.7, z=-0.164615384615384 -} }, --- Land 3 -{ { - x=1.47538461538461, y=0.7, z=-1.33230769230769 -}, { - x=1.66, y=0.7, z=-1.16923076923077 -}, { - x=1.25230769230769, y=0.7, z=-1.14307692307692 -}, { - x=0.943076923076924, y=0.7, z=-1.18923076923077 -}, { - x=1.23161220550537, y=0.7, z=-1.40991246700287 -} }, --- Land 4 -{ { - x=0.3, y=0.7, z=-0.938461538461538 -}, { - x=-0.00923076923076958, y=0.7, z=-0.938461538461538 -}, { - x=-0.290769230769231, y=0.7, z=-1.07538461538462 -}, { - x=-0.264615384615384, y=0.7, z=-0.76 -}, { - x=0.610769230769231, y=0.7, z=-0.955384615384616 -} }, --- Land 5 -{ { - x=-0.0846153846153842, y=0.7, z=-0.307692307692308 -}, { - x=-0.352307692307692, y=0.7, z=-0.152307692307692 -}, { - x=-0.0861538461538465, y=0.7, z=0.0138461538461541 -}, { - x=-0.355384615384616, y=0.7, z=0.170769230769231 -}, { - x=-0.62, y=0.7, z=0.00307692307692328 -}, { - x=0.181538461538461, y=0.7, z=-0.14 -}, { - x=0.198461538461538, y=0.7, z=-0.453846153846154 -} }, --- Land 6 -{ { - x=-0.324615384615385, y=0.7, z=0.781538461538462 -}, { - x=-0.481538461538462, y=0.7, z=0.709230769230769 -}, { - x=-0.0984615384615385, y=0.7, z=0.667692307692308 -}, { - x=0.187692307692308, y=0.7, z=0.933846153846154 -}, { - x=0.22923076923077, y=0.7, z=0.610769230769231 -} }, --- Land 7 -{ { - x=-1.09692307692308, y=0.7, z=-0.358461538461538 -}, { - x=-1.26615384615385, y=0.7, z=-0.209230769230769 -}, { - x=-0.852307692307692, y=0.7, z=-0.312307692307692 -}, { - x=-1.06, y=0.7, z=-0.595384615384615 -}, { - x=-0.726153846153846, y=0.7, z=-0.936923076923077 -} }, --- Land 8 -{ { - x=-1.09538461538462, y=0.7, z=0.518461538461539 -}, { - x=-1.16615384615385, y=0.7, z=0.655384615384616 +posMap = { { +{x=0.562236249446869, y=0.7, z=0.804251194000244}, +{x=0.626833379268646, y=0.7, z=0.571195006370544}, +{x=0.768832743167877, y=0.7, z=0.773338437080383}, +{x=0.789261877536774, y=0.7, z=0.55965918302536}, +{x=0.557954788208008, y=0.7, z=0.327097415924072}, +{x=0.564677000045776, y=0.7, z=1.07441902160645}, +{x=0.949659526348114, y=0.7, z=0.307980358600616} +}, { +{x=1.04502713680267, y=0.7, z=-0.41182541847229}, +{x=0.861301064491272, y=0.7, z=-0.149049609899521}, +{x=0.736223101615906, y=0.7, z=-0.443063527345657}, +{x=1.335813164711, y=0.7, z=-0.467417299747467}, +{x=1.09625375270844, y=0.7, z=-0.694818019866943} +}, { +{x=1.20294559001923, y=0.7, z=-1.09487652778625}, +{x=1.4356701374054, y=0.7, z=-1.20379257202148}, +{x=0.868377149105072, y=0.7, z=-1.21808767318726}, +{x=1.71388304233551, y=0.7, z=-1.15842580795288}, +{x=1.13405692577362, y=0.7, z=-1.31069827079773} +}, { +{x=0.18845097720623, y=0.7, z=-0.899850904941559}, +{x=-0.152972131967545, y=0.7, z=-0.983735203742981}, +{x=0.518430292606354, y=0.7, z=-0.927516281604767}, +{x=-0.324869871139526, y=0.7, z=-0.722529411315918} +}, { +{x=-0.178023591637611, y=0.7, z=-0.0471020564436913}, +{x=0.0838220939040184, y=0.7, z=-0.12449162453413}, +{x=-0.182464972138405, y=0.7, z=-0.299968868494034}, +{x=-0.380006343126297, y=0.7, z=0.191692799329758}, +{x=-0.49094232916832, y=0.7, z=-0.0985660776495934} +}, { +{x=-0.242083892226219, y=0.7, z=0.659137189388275}, +{x=-0.0358668155968189, y=0.7, z=0.67292058467865}, +{x=0.182004600763321, y=0.7, z=0.711634337902069}, +{x=-0.479539334774017, y=0.7, z=0.730701446533203}, +{x=0.149772942066193, y=0.7, z=0.979898750782013} +}, { +{x=-0.904606342315674, y=0.7, z=-0.389519661664963}, +{x=-1.13764333724976, y=0.7, z=-0.348962277173996}, +{x=-1.05271065235138, y=0.7, z=-0.666372001171112}, +{x=-0.911246836185455, y=0.7, z=-0.156531140208244}, +{x=-0.697559177875519, y=0.7, z=-0.941079556941986} +}, { +{x=-1.18115162849426, y=0.7, z=0.480544447898865}, +{x=-0.96795392036438, y=0.7, z=0.438731968402863}, +{x=-1.01780831813812, y=0.7, z=0.712997198104858}, +{x=-1.01018059253693, y=0.7, z=0.198437586426735}, +{x=-1.29113268852234, y=0.7, z=0.263895481824875} +}, { +{x=-1.24506855010986, y=0.7, z=1.09700345993042}, +{x=-1.8882040977478, y=0.7, z=1.04138290882111}, +{x=-1.53966295719147, y=0.7, z=1.01377022266388}, +{x=-0.899852097034454, y=0.7, z=1.10540330410004} +}, } + +pieceMap = { { +"Vitality", +"Explorer", +"Dahan", +"Explorer" }, { - x=-1.01846153846154, y=0.7, z=0.215384615384615 +"City" }, { - x=-0.853846153846153, y=0.7, z=0.487692307692308 +"Disease", +"Town" }, { - x=-1.32153846153846, y=0.7, z=0.269230769230769 + }, { - x=-1.43692307692308, y=0.7, z=0.566153846153846 -} }, --- Land 9 -{ { - x=-0.893846153846154, y=0.7, z=1.05538461538462 +"Vitality" }, { - x=-1.18615384615385, y=0.7, z=1.16769230769231 +"Vitality", +"Dahan", +"Dahan" }, { - x=-1.46307692307692, y=0.7, z=0.970769230769231 +"Dahan", +"Badlands" }, { - x=-1.78461538461539, y=0.7, z=0.989230769230769 +"Dahan", +"Explorer" }, { - x=-1.48461538461538, y=0.7, z=1.29384615384615 -} } } - -pieceMap = { -{ "Explorer", "Explorer", "Dahan", "Vitality" }, -{ "City" }, -{ "Town", "Disease" }, -{ }, -{ "Vitality" }, -{ "Dahan", "Dahan", "Vitality" }, -{ "Dahan", "Badlands" }, -{ "Explorer", "Dahan" }, -{ "Dahan" } -} +"Dahan" +}, } diff --git a/objects/ThematicMapBag/object.json b/objects/ThematicMapBag/object.json index d76627de8..35d2bbbc2 100644 --- a/objects/ThematicMapBag/object.json +++ b/objects/ThematicMapBag/object.json @@ -106,13 +106,13 @@ "HideWhenFaceDown": false, "Hands": false, "CustomImage": { - "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/1617312248751944356/231B959FF1D7AB85611A7EE9A43440A742EE3C97/", + "ImageURL": "https://steamusercontent-a.akamaihd.net/ugc/15037723417491722401/479445306C868008A27AC22BC48B0535E95993ED/", "ImageSecondaryURL": "", "ImageScalar": 1.0, "WidthScale": 0.0, "CustomToken": { "Thickness": 0.395, - "MergeDistancePixels": 15.0, + "MergeDistancePixels": 7.0, "StandUp": false, "Stackable": false } diff --git a/objects/c4e8cd/script.lua b/objects/c4e8cd/script.lua index f6a94652b..b36a84e85 100644 --- a/objects/c4e8cd/script.lua +++ b/objects/c4e8cd/script.lua @@ -477,7 +477,7 @@ end function scanCards() for zoneGUID,_ in pairs(destinyPlayers) do destinyPlayers[zoneGUID].cards = {} - for _,card in pairs(Global.call("getPowerZoneObjects", getTablePos(zoneGUID))) do + for _,card in pairs(Global.call("getPowerDraftObjects", getTablePos(zoneGUID))) do destinyPlayers[zoneGUID].cards[card.guid] = false end end diff --git a/objects/c99d4d/object.json b/objects/c99d4d/object.json index 62fd3e3cf..5e40f3039 100644 --- a/objects/c99d4d/object.json +++ b/objects/c99d4d/object.json @@ -2,7 +2,7 @@ "Name": "Custom_Assetbundle", "Transform": { "posX": -3.8, - "posY": 0.81, + "posY": 0.85, "posZ": -29.9, "rotX": 0.0, "rotY": 180.0, diff --git a/objects/d7d593/object.json b/objects/d7d593/object.json index f4eae47c2..3380f3f2f 100644 --- a/objects/d7d593/object.json +++ b/objects/d7d593/object.json @@ -2,7 +2,7 @@ "Name": "Custom_Assetbundle", "Transform": { "posX": 64.9, - "posY": 0.81, + "posY": 0.85, "posZ": -29.9, "rotX": 0.0, "rotY": 180.0, diff --git a/objects/dce473/object.json b/objects/dce473/object.json index 2cd8983d1..d4046b88e 100644 --- a/objects/dce473/object.json +++ b/objects/dce473/object.json @@ -2,7 +2,7 @@ "Name": "Custom_Assetbundle", "Transform": { "posX": -26.7, - "posY": 0.8101, + "posY": 0.85, "posZ": -29.9, "rotX": 0.0, "rotY": 180.0, diff --git a/objects/fe680a/object.json b/objects/fe680a/object.json index a3e7d91cc..e181f4084 100644 --- a/objects/fe680a/object.json +++ b/objects/fe680a/object.json @@ -2,7 +2,7 @@ "Name": "Custom_Assetbundle", "Transform": { "posX": -46.34, - "posY": 0.81, + "posY": 0.85, "posZ": -26.03, "rotX": 0.0, "rotY": 180.0, diff --git a/script.lua b/script.lua index 872dbf045..da7942853 100644 --- a/script.lua +++ b/script.lua @@ -1,5 +1,5 @@ ---- Versioning -version = "4.5.3-beta.3" +version = "4.7.0-beta.1" versionGuid = "57d9fe" ---- Used with Spirit Board Scripts counterBag = "EnergyCounters" @@ -1280,13 +1280,16 @@ function randomAdversary(attempts) end end if #combos ~= 0 then - local index if randomMaximizeLevel then table.sort(combos, function(a, b) return a.sortKey < b.sortKey end) - index = #combos - else - index = math.random(1,#combos) + local maxLevel = combos[#combos].sortKey + for i = #combos, 1, -1 do + if combos[i].sortKey < maxLevel then + table.remove(combos, i) + end + end end + local index = math.random(1,#combos) adversaryCard = adversary adversaryLevel = combos[index].leadingLevel adversaryCard2 = adversary2 @@ -3370,7 +3373,12 @@ function BoardSetup() if SetupChecker.getVar("optionalThematicPermute") then MapPlacen(getPermutedThematicLayout()) else - MapPlacen(boardLayouts[numBoards][boardLayout]) + local optionalThematicRedo = SetupChecker.getVar("optionalThematicRedo") + if optionalThematicRedo then + MapPlacen(boardLayouts[numBoards][boardLayout][2]) + else + MapPlacen(boardLayouts[numBoards][boardLayout][1]) + end end else StandardMapBag.shuffle() @@ -3880,7 +3888,7 @@ function StartGame() wt(2) end printToAll("Game Started!", Color.White) - printToAll("Don't forget to perform the initial Explore Step!", Color.SoftYellow) + printToAll("Don't forget to perform the initial Explore Action!", Color.SoftYellow) if SetupChecker.getVar("optionalExtraBoard") and numPlayers == 1 then printToAll("But not on the extra board!", Color.SoftYellow) end @@ -4331,7 +4339,12 @@ scaleFactors = { boardLayouts = { { -- 1 Board ["Thematic"] = { - { pos = Vector(-1.93, 1.05, 20.44), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + { + { pos = Vector(-17.73, 1.05, 7.00), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + }, + { -- thematic redo + { pos = Vector(-7.42, 1.05, 16.43), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + } }, ["Balanced"] = { { pos = Vector(-5.11, 1.05, 20.91), rot = Vector(0.00, 180.00, 0.00) }, @@ -4339,8 +4352,14 @@ boardLayouts = { }, { -- 2 Board ["Thematic"] = { - { 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" }, + { + { pos = Vector(2.39, 1.05, 8.03), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(-17.52, 1.06, 7.08), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + }, + { -- thematic redo + { pos = Vector(7.73, 1.05, 15.21), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(-12.43, 1.05, 14.93), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + } }, ["Balanced"] = { { pos = Vector(-6.57, 1.05, 16.92), rot = Vector(0.00, 0.00, 0.00) }, @@ -4369,9 +4388,16 @@ boardLayouts = { }, { -- 3 Board ["Thematic"] = { - { 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" }, + { + { pos = Vector(8.95, 1.05, 6.09), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(-10.96, 1.06, 5.14), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + { pos = Vector(-0.73, 1.07, 22.41), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + }, + { -- thematic redo + { pos = Vector(10.41, 1.05, 12.42), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(-9.75, 1.05, 12.14), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + { pos = Vector(0.31, 1.05, 29.79), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + } }, ["Balanced"] = { { pos = Vector(-6.47, 1.05, 25.50), rot = Vector(0.00, 120.00, 0.00) }, @@ -4391,10 +4417,18 @@ boardLayouts = { }, { -- 4 Board ["Thematic"] = { - { 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" }, + { + { pos = Vector(23.51, 1.05, 8.25), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(3.60, 1.06, 7.30), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + { pos = Vector(13.83, 1.07, 24.57), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + { pos = Vector(-6.31, 1.08, 23.88), rot = Vector(0.00, 180.00, 0.00), board = "NW" }, + }, + { -- thematic redo + { pos = Vector(22.67, 1.05, 14.26), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(2.51, 1.05, 13.98), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + { pos = Vector(12.58, 1.05, 31.63), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + { pos = Vector(-7.58, 1.05, 31.35), rot = Vector(0.00, 180.00, 0.00), board = "NW" }, + } }, ["Balanced"] = { { pos = Vector(17.54, 1.05, 16.10), rot = Vector(0.00, 0.00, 0.00) }, @@ -4417,11 +4451,20 @@ boardLayouts = { }, { -- 5 Board ["Thematic"] = { - { 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(30.42, 1.05, 23.39), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(10.51, 1.06, 22.44), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + { pos = Vector(20.74, 1.07, 39.71), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + { pos = Vector(0.60, 1.08, 39.02), rot = Vector(0.00, 180.00, 0.00), board = "NW" }, + { pos = Vector(39.81, 1.09, 6.04), rot = Vector(0.00, 180.00, 0.00), board = "SE" }, + }, + { -- thematic redo + { pos = Vector(28.41, 1.05, 27.72), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(8.25, 1.05, 27.45), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + { pos = Vector(18.32, 1.05, 45.09), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + { pos = Vector(-1.84, 1.05, 44.81), rot = Vector(0.00, 180.00, 0.00), board = "NW" }, + { pos = Vector(38.51, 1.05, 10.35), rot = Vector(0.00, 180.00, 0.00), board = "SE" }, + } }, ["Balanced"] = { { pos = Vector(23.69, 1.05, 14.13), rot = Vector(0.00, 0.00, 0.00) }, @@ -4453,7 +4496,7 @@ boardLayouts = { }, ["Meeple"] = { { pos = Vector(14.02, 1.05, 18.02), rot = Vector(0.00, 150.00, 0.00) }, - { pos = Vector(31.59, 1.06, 17.89), rot = Vector(0.00, 90.00, 0.00) }, + { pos = Vector(31.59, 1.05, 17.89), rot = Vector(0.00, 90.00, 0.00) }, { pos = Vector(5.35, 1.05, 33.22), rot = Vector(0.00, 210.00, 0.00) }, { pos = Vector(40.55, 1.05, 33.07), rot = Vector(0.00, 30.00, 0.00) }, { pos = Vector(22.95, 1.05, 43.25), rot = Vector(0.00, 210.00, 0.00) }, @@ -4461,12 +4504,22 @@ boardLayouts = { }, { -- 6 Board ["Thematic"] = { - { 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" }, + { + { pos = Vector(41.98, 1.05, 23.55), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(22.07, 1.06, 22.60), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + { pos = Vector(32.30, 1.07, 39.87), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + { pos = Vector(12.16, 1.08, 39.18), rot = Vector(0.00, 180.00, 0.00), board = "NW" }, + { pos = Vector(51.37, 1.09, 6.20), rot = Vector(0.00, 180.00, 0.00), board = "SE" }, + { pos = Vector(31.76, 1.10, 5.69), rot = Vector(0.00, 180.00, 0.00), board = "SW" }, + }, + { -- thematic redo + { pos = Vector(36.55, 1.05, 27.72), rot = Vector(0.00, 180.00, 0.00), board = "E" }, + { pos = Vector(16.39, 1.05, 27.45), rot = Vector(0.00, 180.00, 0.00), board = "W" }, + { pos = Vector(26.46, 1.05, 45.09), rot = Vector(0.00, 180.00, 0.00), board = "NE" }, + { pos = Vector(6.30, 1.05, 44.81), rot = Vector(0.00, 180.00, 0.00), board = "NW" }, + { pos = Vector(46.65, 1.05, 10.35), rot = Vector(0.00, 180.00, 0.00), board = "SE" }, + { pos = Vector(26.49, 1.05, 10.07), rot = Vector(0.00, 180.00, 0.00), board = "SW" }, + } }, ["Balanced"] = { { pos = Vector(56.74, 1.05, 19.56), rot = Vector(0.00, 330.00, 0.00) }, @@ -4504,12 +4557,12 @@ boardLayouts = { { -- 7 Board ["Thematic"] = {}, ["Balanced"] = { - { 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(51.80, 1.05, 46.82), rot = Vector(0.00, 180.00, 0.00) }, + { pos = Vector(51.78, 1.05, 29.25), rot = Vector(0.00, 60.00, 0.00) }, + { pos = Vector(66.96, 1.05, 38.01), rot = Vector(0.00, 300.0, 0.00) }, + { pos = Vector(31.62, 1.05, 29.39), rot = Vector(0.00, 240.0, 0.00) }, + { pos = Vector(-3.63, 1.05, 20.60), rot = Vector(0.00, 120.00, 0.00) }, + { pos = Vector(11.55, 1.05, 11.83), rot = Vector(0.00, 0.00, 0.00) }, { pos = Vector(11.60, 1.05, 29.37), rot = Vector(0.00, 240.00, 0.00) }, }, ["Pi"] = { @@ -4622,7 +4675,13 @@ function getPermutedThematicLayout() -- Select a random permutation of the appropriate length. local permutation = thematicPermutations[numBoards][math.random(#thematicPermutations[numBoards])] -- Subset the six-player thematic map with the appropriate permutation. - local template = boardLayouts[6]["Thematic"] + local template + local optionalThematicRedo = SetupChecker.getVar("optionalThematicRedo") + if optionalThematicRedo then + template = boardLayouts[6]["Thematic"][2] + else + template = boardLayouts[6]["Thematic"][1] + end local boards = {} for _,boardName in pairs(permutation) do for _,boardData in pairs(template) do