From 4a56991f6cd683b5f6fe6fffded630346ca9bd6c Mon Sep 17 00:00:00 2001 From: jjayers99 <56438137+jjayers99@users.noreply.github.com> Date: Sat, 27 May 2023 00:09:25 -0400 Subject: [PATCH] Adventure fixes Bugfix for Arena quest objectives that previously caused offer dialog to hang Redo of Teferi Hideout collisions / terrain --- .../adventure/data/AdventureQuestData.java | 3 + .../adventure/Shandalar/maps/map/teferi.tmx | 20 +- .../adventure/Shandalar/maps/tileset/main.tsx | 352 ++++++++++++++++++ 3 files changed, 366 insertions(+), 9 deletions(-) diff --git a/forge-gui-mobile/src/forge/adventure/data/AdventureQuestData.java b/forge-gui-mobile/src/forge/adventure/data/AdventureQuestData.java index 039201b712a..8b308098150 100644 --- a/forge-gui-mobile/src/forge/adventure/data/AdventureQuestData.java +++ b/forge-gui-mobile/src/forge/adventure/data/AdventureQuestData.java @@ -179,6 +179,9 @@ public class AdventureQuestData implements Serializable { stage.initialize(); switch (stage.objective){ + case Arena: + stage.setTargetPOI(poiTokens); + break; case Clear: stage.setTargetPOI(poiTokens); break; diff --git a/forge-gui/res/adventure/Shandalar/maps/map/teferi.tmx b/forge-gui/res/adventure/Shandalar/maps/map/teferi.tmx index e6101d76ff1..36afa358d93 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/teferi.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/teferi.tmx @@ -1,23 +1,24 @@ - + + - eJzVkk0KwjAQhQMaiwu79DBCced53PQqWQl6BE/TjT1LsIMdOk1f2kkNiA8e+YHMl3mJMWM9CzMR7bHvJo9jDMT8FTcXc44bc2On5lrOLp9fwyWGm7GsHc6Zx3N57xRuvcN35vqNxT3GctNyj936cfjY2YF9LkGIQClcMjOqchjle2m5mj8UMiWXdNmnc31f0/e+Knolvbr6LWAgLr1FinwxdqXoJeTyGU0Otw3e13CRUC5Ipy3ep57lW5Jo3UYyX1JK/sxYy5Ki7LX/MKe+vfc/6Q0WVaCR + eJzbwM7AsGEUD3ksZkJd86axYmJs6rbgsPcaKwKTYq8ohRjZXmLtptROUTLClxp2kmovtewk1U30sncUUw+XsTEwlANxBRt97RWB0mJ09u8mIN4MxFsGQdjTAwMArIa2fg== - eJwrYGdgKBgkGASQ2djAQNlLC7tJAehuJdddxIIPHBCszwWhQeAjB6r9hMIRl3vxgVI2BgZRdlTMwYNwDzpGdy85QJQdQaPjPk4IbiOASQG/mBHmY7MXBIixl1RwnZV0PbjANVbCcUILe/EBPS5IeoXh+fSxFgOIEkjvhOTJBaA0sY1GZo+C4QUA1S5VLg== + eJxjYECAekYGhgZGhgEBckwDY+9QBJHMDAxRzKTLkQpmsaDiX0BzfzKjisHUocuRCkDu/kUld5NiJ70Btf0ZwczQgBwfEUhxgJwO/tLRr8jpgN5xOgpGwSggDABapRie - eJxjYBgaYAM7Kh7q9rYxEqfuGisqpjUA2fGeg4FhFgsDgz4XKsYHPnBAMCX29nIyMIhiCeN2PGHVxwnB5AIDoL9UmDDt9SQQPyD12NxKLAD5CWYGslmEzEVXSypAt5NcTGpcU8tefBgZwNIsPexFxyIDYCd6+qEUl7ExMJQDcQUb/f3xgE7pZSRjAHobMkU= + eJxjYEAF9YwMDA2MDKNgBIM2YPzPYqG/vSpM2MXbaZgefzEzMBzHYq8njfMANjtHwSgYBaOAHgAAE7oFrg== @@ -25,7 +26,7 @@ - eJxjYICAlewMDKuAeDUQrwHiaayomBCoY8Qvbwg0wwiLOe4cDAweQOwJxF4cmPYSsluGCb/8eaD+C3jMINZ/QwUsZMYUm8FCmhltwLhsx4I7sMTxK3YIbU+CHbjcowKNy2peCF0FpdWA4h5odsPspRTA/AoCyP40Btq9hpOB4RmSvUuR9BnzUmYnyK+iQD+IIPlDDSktI9tbjcWupZhCBAHIrm1sCDYM7EBiP8MSx9js/8BBmr0wcAjox8NArAnEYVAzQPGMbm8Z0J3lQFzBBokHZIDOxwYMuCD2wtIQLj3I9oLiFKQHFC9iSG5eBsTlSGEwhxlVD6kAZH4HE6q7NgHFNgPxFnZUu5DtsMKSb2D6QTTIDE0mVD0a0PAGYVWgu9XQywdmKEYDk9mIx0bsCPc3M0FwC1JaBrnNgJ04s7CF/1JuBBs5bHI4IHoM8Zidx4EII+S4Qk/TyOGPDyCno7NklkGE0i8heVz2outDT0fIAACuW1e6 + eJxjYGBgiGRmYIgC4m9ALMvEwCAHxKSAekYGhjogbmDEryaCGVXNdyB/MgsDwxQgngrE01hIsxfkVhkC7gWpAfkLXQ3I7h9k+pccAAtjWgEfdgi9EM0OkD9nsGDGDT73gOKqHQvuwBK/r6D22mOJO2xhi889MFDNC6GroLQaE6bdHRzY3Y4PYHNPGyOCRvanMdDuNZwQu2FgKZI+Y17S7Ue3EwRUkMxXw8GuxmLXUkwhggBk1zY2THtP4LAXn/2k2gsDh4Dsw0CsiSQGimd0e9uQ4gIUD8gAnY/PXlgawqUH2V5QnIL0qDKhii8D4nKkMJjDjKoHm72EACzMYe6ChcsRJlS7kO2wwpLHYPpB9CGkcIXp0YCaCwtzNfQ8zwzFaGAyG/HYiB3h/sNI/kB2owE7cWZhA0u5EWzksMnhgOgxxGN2HgcijJDjitw0jZyOzrJTbgY58rjsRdeHno6QAQCJOVVS @@ -53,6 +54,7 @@ + @@ -102,10 +104,9 @@ - - - - + + + [ @@ -131,5 +132,6 @@ + diff --git a/forge-gui/res/adventure/Shandalar/maps/tileset/main.tsx b/forge-gui/res/adventure/Shandalar/maps/tileset/main.tsx index 467404e4d98..8d2bf37aad7 100644 --- a/forge-gui/res/adventure/Shandalar/maps/tileset/main.tsx +++ b/forge-gui/res/adventure/Shandalar/maps/tileset/main.tsx @@ -1,6 +1,22 @@ + + + + + + + + + + + + + + + + @@ -176,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -416,6 +450,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -713,6 +772,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -721,6 +803,11 @@ + + + + + @@ -1031,6 +1118,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1358,6 +1488,16 @@ + + + + + + + + + + @@ -1629,6 +1769,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1890,6 +2055,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -1898,6 +2086,11 @@ + + + + + @@ -2365,6 +2558,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2762,6 +2998,16 @@ + + + + + + + + + + @@ -3134,6 +3380,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3484,6 +3755,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -3492,6 +3786,11 @@ + + + + + @@ -3847,6 +4146,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4212,6 +4554,16 @@ + + + + + + + + + +