From 50583f52d117d0a6048a5c1040e3e616bf5ccc47 Mon Sep 17 00:00:00 2001 From: Simisays <67333662+Simisays@users.noreply.github.com> Date: Mon, 27 Mar 2023 20:32:18 +0200 Subject: [PATCH] update --- .gitignore | 1 + .../Shandalar/maps/main.tiled-session | 95 +++++---- .../Shandalar/maps/map/magetower_1.tmx | 3 +- .../Shandalar/maps/map/magetower_13.tmx | 80 ++++---- .../Shandalar/maps/map/magetower_14.tmx | 140 ++++++++++++-- .../Shandalar/maps/map/magetower_6.tmx | 3 +- .../Shandalar/maps/map/magetower_8.tmx | 181 ++++++++++++------ .../res/adventure/Shandalar/world/blue.json | 2 - .../adventure/Shandalar/world/enemies.json | 18 +- .../res/adventure/Shandalar/world/items.json | 9 +- .../Shandalar/world/points_of_interest.json | 9 - 11 files changed, 381 insertions(+), 160 deletions(-) diff --git a/.gitignore b/.gitignore index 6d5c30fcce2..3617920a94b 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ forge-gui/tools/PerSetTrackingResults *.tiled-session *.tiled-session +*.tiled-session diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session index 35173e545e8..739af184f5d 100644 --- a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session +++ b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session @@ -1,10 +1,10 @@ { - "activeFile": "map/cave_19.tmx", + "activeFile": "map/magetower_13.tmx", "expandedProjectPaths": [ - "tileset", "map", "obj", - "map/main_story" + "map/main_story", + "tileset" ], "fileStates": { "map/cave_1..tmx": { @@ -195,11 +195,25 @@ } }, "map/magetower_13.tmx": { + "expandedObjectLayers": [ + 4 + ], "scale": 1.6941666666666666, - "selectedLayer": 0, + "selectedLayer": 5, "viewCenter": { - "x": 240.2361042793901, - "y": 332.02164289227744 + "x": 240.82636497786527, + "y": 331.4313821938023 + } + }, + "map/magetower_14.tmx": { + "expandedObjectLayers": [ + 4 + ], + "scale": 3, + "selectedLayer": 4, + "viewCenter": { + "x": 240, + "y": 136.16666666666663 } }, "map/magetower_4.tmx": { @@ -210,7 +224,7 @@ "selectedLayer": 5, "viewCenter": { "x": 240.21654135338346, - "y": 136.5654135338346 + "y": 137.14285714285714 } }, "map/magetower_5.tmx": { @@ -221,7 +235,7 @@ "selectedLayer": 4, "viewCenter": { "x": 224.20210526315788, - "y": 136.08421052631581 + "y": 136.62315789473683 } }, "map/magetower_6.tmx": { @@ -239,13 +253,35 @@ "expandedObjectLayers": [ 4 ], - "scale": 1.7317708333333333, + "scale": 3, "selectedLayer": 3, "viewCenter": { - "x": 239.63909774436092, + "x": 239, + "y": 110.5 + } + }, + "map/phyrexian_w1.tmx": { + "expandedObjectLayers": [ + 4 + ], + "scale": 1.7317708333333333, + "selectedLayer": 5, + "viewCenter": { + "x": 240.21654135338346, "y": 136.5654135338346 } }, + "map/tibalt_f1.tmx": { + "expandedObjectLayers": [ + 12 + ], + "scale": 1.1294157608695652, + "selectedLayer": 5, + "viewCenter": { + "x": 368.332030075188, + "y": 224.45233082706767 + } + }, "tileset/buildings.tsx": { "scaleInDock": 1 }, @@ -254,39 +290,26 @@ } }, "openFiles": [ - "map/cave_1..tmx", - "map/cave_2.tmx", - "map/cave_3.tmx", - "map/cave_4.tmx", - "map/cave_5.tmx", - "map/cave_6.tmx", - "map/cave_7.tmx", - "map/cave_8.tmx", - "map/cave_9.tmx", - "map/cave_11.tmx", - "map/cave_12.tmx", - "map/cave_20.tmx", - "map/cave_22.tmx", - "map/cave_10.tmx", - "map/cave_14.tmx", - "map/cave_13.tmx", - "map/cave_15.tmx", - "map/cave_17.tmx", - "map/cave_19.tmx" + "map/magetower_5.tmx", + "map/magetower_4.tmx", + "map/magetower_1.tmx", + "map/magetower_8.tmx", + "map/magetower_6.tmx", + "map/magetower_13.tmx" ], "project": "", "recentFiles": [ + "map/magetower_5.tmx", + "map/magetower_4.tmx", + "map/magetower_1.tmx", + "map/magetower_8.tmx", + "map/magetower_6.tmx", + "map/magetower_13.tmx", "map/cave_19.tmx", "map/cave_17.tmx", "map/cave_15.tmx", "map/cave_13.tmx", "map/cave_10.tmx", - "map/cave_22.tmx", - "map/cave_20.tmx", - "map/cave_12.tmx", - "map/cave_11.tmx", - "map/cave_9.tmx", - "map/cave_8.tmx", - "map/cave_7.tmx" + "map/cave_22.tmx" ] } diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_1.tmx index 9641c84c84f..01ddff43e85 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_1.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/magetower_1.tmx @@ -1,5 +1,5 @@ - + @@ -98,5 +98,6 @@ + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_13.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_13.tmx index 7971f951003..a785efdaa9d 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_13.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/magetower_13.tmx @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@ } - + eJztyDENAAAIwDAE4F8M6jgQAC9Jm+xZBAAAAB9UTtu7auBAAxk= @@ -22,12 +22,12 @@ - eJzt0mEKgkAQhuH5Gyr439WD1VmqW3QWM72bKzYwLO5k0xcRjPCysqiPu9qXRL3neZ7n/UGnimgo8x2r75iPON4ORO1zTLuDbWkuba0Vbafmnj61LSbCzn3HvTXG9Wr/Lr9T8+I6xHqXg8+li16vts+/ckO9jl2Nd6fYtbD9U+d432h0g2Jr+8xmMLqanXMRpmZvuUgztS/FmnR5Dm1Km5OunH/3mTPAN3+e + eJzt0kEOgjAQheHZEsDENXgMbuJKz6LewrOA4N0s0TGTph1hfC5MpskfSAN8tNBXRL3neZ7n/UHHmuhW5TvUvzHHcLwWRLvXMW4A29KcS60Vbcfmkr61LSbCzn3HpTXG9Wr/Lr9T8+E6xHrnwefS5bn9FrNebZ9TLmqfNbfb0Hug3XvoUtr+qVO4bzK6rWJr+8xma3Q1O+ciTM1OuUgzts/lM+nyHNqUNiddOb/2mQ+rsX6u - eJxjYBgFo2AUjIJRMAqGFpDlGWgXjIJRQD6ApV96p+ORZi82AHOD9CBwyygYBYMFAAAfygFw + eJxjYBgFo2AUjIJRMAqGFpDlGWgXjIJRQD6ApV96p+ORZu8oGAWjgDgAACmLASA= @@ -35,7 +35,7 @@ - eJxjYBgFo2AUjIJRMApGwSiAgDYqqxsFCCDLQ5l+aQr1owP0OKRnnNbxMzDUA3EDPx0tHQFgNP+OAnIAAPloBR8= + eJxjYBgFo2AUjIJRMApGwSiAgEZx4tS10dYZwxLI8lCmX5pC/egAPQ5H43TkAGLz+UCZNwroCwCDVQOr @@ -44,32 +44,14 @@ - - - [{ - "text":"A big gate is blocking the path", - "options":[ - { "name":"go away" }, - { - "name":"unlock with blue key", - "condition":[ { "item": "Blue Key" } ], - "text":"The gate is unlocked", - "options":[ - { - "name":"continue","action":[{"deleteMapObject":-1}] - } - ] - } - ] -}] - - - + + + - + [ { @@ -84,9 +66,11 @@ "startBattleWithCard": [ "Fellwar Stone" ] } + + - + { "lifeModifier": 15, @@ -94,23 +78,29 @@ "startBattleWithCard": [ "Fellwar Stone", "Frozen Aether" ] } + + - + { "lifeModifier": 10, "startBattleWithCard": [ "Hesitation", "Hesitation" ] } + + - + + + - + { "lifeModifier": 30, @@ -120,11 +110,15 @@ } } + + - + + + @@ -223,7 +217,7 @@ - + [ { @@ -269,7 +263,7 @@ }] - + [{ "type": "randomCard", @@ -282,5 +276,23 @@ }] + + + + + + + + + + + + + + + + + + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_14.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_14.tmx index 9e48a872ca8..dcf257b2fe0 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_14.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/magetower_14.tmx @@ -1,23 +1,23 @@ - + - + - eJxjYBgFo2AUjIJRMApGwWAFu3ggmJAYsQAA2igDGQ== + eJxjYBgFo2AUjIKRA1ZwIDA9gRsnAtPSDhM+2toxWO1Fx8PJ3l08EPuQMUgMhMkBALjxDFA= - eJxr4mZgaBrFo3gUj+JRPIpH8YjAAJnxGPY= + eJxr4mZgaBrFo3gUj+JRPOSxDA8DGIDoUXuHp70wTIk5AJTeEms= - eJzN1G0KgCAMBmD/myewLlZnqa7V590yYjBkzW1INBhBNR/fCJfGueWDbrOWzAzBua157z7Uc+H5be7pytUqsDV5c5PKKrWlriSnJrfEtZglW+J2RhMqGvNy/y7sKRbeq50Xu7Xz/tGVlNU9U8/eZo5p7jC6LWNz3xlMal3NOUnZby5nas9Jyqbckql1sT35p7EL90qmxc1nsKvdP+4Lkd3cuQ== + eJzN1F8KgzAMBvC+q3vbk+5i7ixuV/EY/pmX8ERWJCyU2H4JRQx8CGr8NSodSueGC9IEQXrelXNTeZ62yufS9d2c/TFWI2Br5g1NaVbURl1kTs3ciGsxUzbivowmVW2cN/bv0prqxH255+Vu7nnv6CJldRefb4E7/fOfzvf9jG4TsaX3vD6OkCk9V7NPSvbZ942Z2n1SsiU3ZWpdbn+KI9ylcynT4oY9vLTr59kAetHgSA== @@ -25,19 +25,135 @@ - eJxjYBgFIxm0UVndKEAAWR7K9EtTqB8doMfhaJwOfTCaf0cBOQAADEIDdQ== + eJxjYBgFIxk48aDy37EzMHxih9DIoI3K9oqzUUfNYAayPITV4APSFOjnEkVlgzB6HLYhyWHTNxzBVF4GhmlIeDov5Wai5yEQqONGYBAw5gPmKTEGhgXQ8DXlo9xeECCULy8C7ekRZ2C4xAfBl6lkLyHQxI1K0wOIAMsLUSAWG+LlBj0AALryE3E= - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [ + { + "editions": [ "M14" ], + "type": "card", + "count": 10, + "rarity": [ "Common" ] + "colors": [ "Blue" ] + }, + { + "editions": [ "M14" ], + "type": "card", + "count": 3, + "rarity": [ "Uncommon" ] + "colors": [ "Blue" ] + }, + { + "editions": [ "M14" ], + "type": "card", + "count": 1, + "rarity": [ "Rare", "Mythic Rare" ] + "colors": [ "Blue" ] + } +] + + + + + + [ + { + "editions": [ "M13" ], + "type": "card", + "count": 10, + "rarity": [ "Common" ] + "colors": [ "Blue" ] + }, + { + "editions": [ "M13" ], + "type": "card", + "count": 3, + "rarity": [ "Uncommon" ] + "colors": [ "Blue" ] + }, + { + "editions": [ "M13" ], + "type": "card", + "count": 1, + "rarity": [ "Rare", "Mythic Rare" ] + "colors": [ "Blue" ] + } +] + + + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_6.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_6.tmx index f4591370116..b45b3afd957 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_6.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/magetower_6.tmx @@ -1,5 +1,5 @@ - + @@ -169,5 +169,6 @@ + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_8.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_8.tmx index 4ff64961966..0a28fae8582 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_8.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/magetower_8.tmx @@ -1,23 +1,23 @@ - + - + - eJxjYBj8QJaHgUGaB8KWRmIPV3ujeBkYonkR9sLYtAY7gXbt5sFkj4JRMApGwSgYGLCLB4GJEScGAADolQpX + eJxjYBj8QJaHgUGaB8KWRmLTCpjwQTA2e2FytARRvAwM0bwIe2FsWoOdQLt282CyhxNAjz8Yn5Zxis2OUXtH7R0Fo4AYsIsHgYkRJwYAABuBFGU= - eJybzMnAMHkUj+JRPIpH8SgexSMCAwDxIjbY + eJybzMnAMHkUj+JRPIpH8bDHO3gG3g2jeOAxAEJuNwA= - eJzt1FsKgCAQBVD/zRVoG6u1WNuy194yYkik8s4QfUTCRVDGM4IYKqXCC3FZkJrWKDVW12nMcy7tb+YU57sxADbnvoiJ2qjLMREbcSVmyUbcWmjSsML7/u633SWm1zLTx7pZ6DqhTebZuZx/kmPfmdx/ErVLJtdN7U7voR68PtZKpsTNa+itW0H/aVYIl805 + eJzl1GsKgCAQBGDpX2gnqC5WZ+lxLHvdLSWWIipntwgiYQiM7XMgtEYp+0KyXZCZMlGqN+cpkudceu/NwT2vVgfYnL6IidqoyzERG3ElZshG3Fxo0kqFfe+6rf5X36+5k0ujZWbl5kahmwltb0bx8Xc59yTHpp5XXdB7ErVDJtfd2rVeQmeo9LoXMiXufob+9VRw/m1mPKPM4A== @@ -25,7 +25,7 @@ - eJxjYBj8YA8/BKOzh6u9vAIMDHwCmGxags/spImPAuIAcviRyh4FpIEF/OSzRwF5AFcYjobt4AYAEOASbg== + eJxjYBj8YIUmBKOzaQWCBCEYm70g8QBB2tr/E2jPL01U9jt22to5EsAhCQTGJ0Zt8E8SgfGJgYA0DwPDLh4IG0aTC5QlEBifGMxeagFSwtmYD0KniFBuLynhDLOXGoCccG4Rp579xACYvXJUjGdS7B0FgwsAAL1qK7A= @@ -34,94 +34,155 @@ - + - + + + - - + - - + - + - - + [ + { + "editions": [ "M11" ], + "type": "card", + "count": 10, + "rarity": [ "Common" ] + "colors": [ "Blue" ] + }, + { + "editions": [ "M10" ], + "type": "card", + "count": 3, + "rarity": [ "Uncommon" ] + "colors": [ "Blue" ] + }, + { + "editions": [ "M10" ], + "type": "card", + "count": 1, + "rarity": [ "Rare", "Mythic Rare" ] + "colors": [ "Blue" ] + } +] + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + - + - - + [ + { + "editions": [ "M10" ], + "type": "card", + "count": 10, + "rarity": [ "Common" ] + "colors": [ "Blue" ] + }, + { + "editions": [ "M10" ], + "type": "card", + "count": 3, + "rarity": [ "Uncommon" ] + "colors": [ "Blue" ] + }, + { + "editions": [ "M10" ], + "type": "card", + "count": 1, + "rarity": [ "Rare", "Mythic Rare" ] + "colors": [ "Blue" ] + } +] + - + - - + + [ + { + "type": "item", + "probability": 1, + "count": 1, + "itemName": "Illusionist's Key" + } +] + + + - + + + + + + + + + + + + - - + - + + - - - - - - - - - - - - - - - - - - - - + [{ + "text":"This door is locked", + "options":[ + { "name":"go away" }, + { + "name":"unlock with Illusionist's key", + "condition":[{"item":"Illusionist's Key"}], + "text":"The gate is unlocked", + "options":[{"name":"continue", "action":[ {"deleteMapObject":-1},{"removeItem":"Illusionist's Key"}]} ] + } + ] +}] diff --git a/forge-gui/res/adventure/Shandalar/world/blue.json b/forge-gui/res/adventure/Shandalar/world/blue.json index cccd5b61f33..bec69f04d76 100644 --- a/forge-gui/res/adventure/Shandalar/world/blue.json +++ b/forge-gui/res/adventure/Shandalar/world/blue.json @@ -89,9 +89,7 @@ "MageTowerU3", "MageTowerU4", "MageTowerU5", - "MageTowerU6", "MageTowerU7", - "MageTowerUD", "MerfolkPool", "MerfolkPool1", "MerfolkPool2", diff --git a/forge-gui/res/adventure/Shandalar/world/enemies.json b/forge-gui/res/adventure/Shandalar/world/enemies.json index db203d6a3bb..0c7aec8db6d 100644 --- a/forge-gui/res/adventure/Shandalar/world/enemies.json +++ b/forge-gui/res/adventure/Shandalar/world/enemies.json @@ -3613,6 +3613,14 @@ "rarity": [ "common", "uncommon", + "rare" + ] + }, + { + "type": "deckCard", + "probability": 0.25, + "count": 1, + "rarity": [ "rare", "mythicrare", "special" @@ -4283,9 +4291,9 @@ "decks/eye.dck" ], "ai": "", - "flying": false, + "flying": true, "spawnRate": 1, - "scale":0.80, + "scale":0.85, "difficulty": 0.1, "speed": 25, "life": 25, @@ -4294,7 +4302,11 @@ "type": "deckCard", "probability": 1, "count": 2, - "addMaxCount": 4 + "addMaxCount": 4, + "rarity": [ + "uncommon", + "common" + ] }, { "type": "card", diff --git a/forge-gui/res/adventure/Shandalar/world/items.json b/forge-gui/res/adventure/Shandalar/world/items.json index a3413851139..8bf6769e733 100644 --- a/forge-gui/res/adventure/Shandalar/world/items.json +++ b/forge-gui/res/adventure/Shandalar/world/items.json @@ -207,12 +207,17 @@ "iconName": "StrangeKey", "questItem": true }, - { + { "name": "Torturer's Key", "iconName": "StrangeKey", "questItem": true }, - { + { + "name": "Illusionist's Key", + "iconName": "StrangeKey", + "questItem": true + }, + { "name": "Tibalt's Key", "iconName": "StrangeKey", "questItem": true diff --git a/forge-gui/res/adventure/Shandalar/world/points_of_interest.json b/forge-gui/res/adventure/Shandalar/world/points_of_interest.json index f641f9363ec..3085f9d85bd 100644 --- a/forge-gui/res/adventure/Shandalar/world/points_of_interest.json +++ b/forge-gui/res/adventure/Shandalar/world/points_of_interest.json @@ -1362,15 +1362,6 @@ "map": "maps/map/magetower_6.tmx", "radiusFactor": 0.8 }, -{ - "name": "MageTowerU6", - "type": "dungeon", - "count": 2, - "spriteAtlas": "maps/tileset/buildings.atlas", - "sprite": "MageTower", - "map": "maps/map/magetower_7.tmx", - "radiusFactor": 0.8 -}, { "name": "MageTowerU7", "type": "dungeon",