From 9a7b0d5c7be39fb51743c0cde20ec1434cf55f2d Mon Sep 17 00:00:00 2001 From: jjayers99 <56438137+jjayers99@users.noreply.github.com> Date: Fri, 25 Aug 2023 12:39:33 -0400 Subject: [PATCH 1/3] Adventure - Blue Mage Tower updates Removed extra collisions including those causing player to get stuck on 2nd level, cleaned up walls, added additional dialog to gate interaction. --- .../common/maps/map/magetower/magetower_14.tmx | 13 +++++++------ .../common/maps/map/magetower/magetower_8.tmx | 16 ++++++++-------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/forge-gui/res/adventure/common/maps/map/magetower/magetower_14.tmx b/forge-gui/res/adventure/common/maps/map/magetower/magetower_14.tmx index f855b541f7d..05098406753 100644 --- a/forge-gui/res/adventure/common/maps/map/magetower/magetower_14.tmx +++ b/forge-gui/res/adventure/common/maps/map/magetower/magetower_14.tmx @@ -5,19 +5,20 @@ + - eJxjYBgFo2AUjIKRA1ZwIDA9gRsnAtPSDhM+2toxWO1Fx8PJ3l08EPuQMUgMhMkBALjxDFA= + eJxjYBgFo2AUjIKRA1ZwIDA9gRsnAtMSmPDR1vxRe3HbS6u43cUDsQ8Zg8RAmBwAAB7VB68= - eJxr4mZgaBrFo3gUj+JRPOSxDA8DGIDoUXuHp70wTIk5AJTeEms= + eJxr4mZgaBrFo3gUj+JRPCwwCIzaOzztleFBYErMAQAesRWT - eJzN1F8KgzAMBvC+q3vbk+5i7ixuV/EY/pmX8ERWJCyU2H4JRQx8CGr8NSodSueGC9IEQXrelXNTeZ62yufS9d2c/TFWI2Br5g1NaVbURl1kTs3ciGsxUzbivowmVW2cN/bv0prqxH255+Vu7nnv6CJldRefb4E7/fOfzvf9jG4TsaX3vD6OkCk9V7NPSvbZ942Z2n1SsiU3ZWpdbn+KI9ylcynT4oY9vLTr59kAetHgSA== + eJzN1UEOgyAQBVD2anddaS9mz6K9So+hrV7CE4nRSadkhD8T0pRkYgLI46PRoXRu+EE1QSH33CvnXuV5tVU+l8Y38+2vsTYCtiZvaEpZURt1kZya3IhrMVM24t6MJrXamDf27tKe6sS83Hm5mzvvP7pIs7qzr0chr9n5/r74Hn9eP7WNT0a3idh0vvxMlsteZErrar6Tki25dA5npvY7KdmSmzK1Lrf747lOhxf2IRm0/0E+nzft/nmtlufjJA== @@ -25,7 +26,7 @@ - eJxjYBgFIxk48aDy37EzMHxih9DIoI3K9oqzUUfNYAayPITV4APSFOjnEkVlgzB6HLYhyWHTNxzBVF4GhmlIeDov5Wai5yEQqONGYBAw5gPmKTEGhgXQ8DXlo9xeECCULy8C7ekRZ2C4xAfBl6lkLyHQxI1K0wOIAMsLUSAWG+LlBj0AALryE3E= + eJxjYBgFIxk48aDy37EzMHxih9DIoI3K9oqzUUfNYAayPITV4APSFOjnEkVlgzB6HLYhyWHTNxzBVF4GhmlIeDov5Wai5yFswJgPmKfEGBgWQMPXlI9ye0GAUL68CLSnR5yB4RIfBF+mkr2EQBM3Kk0PMMUEGL9APM2EfnYOVQAA5YcT4A== @@ -39,10 +40,10 @@ - + - + diff --git a/forge-gui/res/adventure/common/maps/map/magetower/magetower_8.tmx b/forge-gui/res/adventure/common/maps/map/magetower/magetower_8.tmx index 6002977910c..022c587342a 100644 --- a/forge-gui/res/adventure/common/maps/map/magetower/magetower_8.tmx +++ b/forge-gui/res/adventure/common/maps/map/magetower/magetower_8.tmx @@ -7,17 +7,17 @@ - eJxjYBj8QJaHgUGaB8KWRmLTCpjwQTA2e2FytARRvAwM0bwIe2FsWoOdQLt282CyhxNAjz8Yn5Zxis2OUXtH7R0Fo4AYsIsHgYkRJwYAABuBFGU= + eJxjYBj8QJaHgUGaB8KWRmLTCpjwQTA2e2FytARRvAwM0bwIe2FsWoOdQLt282CyhxNAjz8Yn5Zxis2OUXtH7R0IsGMY5unhDnbxIDAx4sQAAKmkFSk= - eJybzMnAMHkUj+JRPIpH8bDHO3gG3g2jeOAxAEJuNwA= + eJxjYBi8YDInYTwQdlLbblLspJbd5NhJqd2U2EmJ3aP2jto7nOyl1G5KwUDYSY7d1AYDYSc+N1ACALeAhNk= - eJzl1GsKgCAQBGDpX2gnqC5WZ+lxLHvdLSWWIipntwgiYQiM7XMgtEYp+0KyXZCZMlGqN+cpkudceu/NwT2vVgfYnL6IidqoyzERG3ElZshG3Fxo0kqFfe+6rf5X36+5k0ujZWbl5kahmwltb0bx8Xc59yTHpp5XXdB7ErVDJtfd2rVeQmeo9LoXMiXufob+9VRw/m1mPKPM4A== + eJzV02EKgCAMBtD9V09gXazOYl3LrO6WECORGmwOJOFDGLjnQKMFiEQGRqg+nGC/2QEk+53J6dmlueedWpuSzTG1bImpYUvNN5vrjkITlxfO2+qmTm6vef/mnjmrkZkhnzsa/rDEbjGltobJtTXN2l7MHbxDME9N2yxtDL51X9W5PS+ZOt+E @@ -25,7 +25,7 @@ - eJxjYBj8YIUmBKOzaQWCBCEYm70g8QBB2tr/E2jPL01U9jt22to5EsAhCQTGJ0Zt8E8SgfGJgYA0DwPDLh4IG0aTC5QlEBifGMxeagFSwtmYD0KniFBuLynhDLOXGoCccG4Rp579xACYvXJUjGdS7B0FgwsAAL1qK7A= + eJxjYBj8YIUmBKOzaQWCBCEYm70g8QBB2tr/E2jPL01U9jt22to5EsAhCQTGJ0Zt8E8SgfGJgYA0DwPDLh4EmxKgLIHA+MSoYRcyICWcjfkgdIoI5faSEs4we6kByAnnFnHq2U8MoGb8DgV7RwF+AACy1Srn @@ -172,13 +172,13 @@ [{ - "text":"This door is locked", + "text":"This door is be locked. Judging by the scrapes and scratches on the floor, however, it seems to be opened frequently. Perhaps the key can be found nearby?", "options":[ - { "name":"go away" }, + { "name":"(Leave)" }, { - "name":"unlock with Illusionist's key", + "name":"Unlock the gate with the Illusionist's key", "condition":[{"item":"Illusionist's Key"}], - "text":"The gate is unlocked", + "text":"The door swings open and you can continue to explore the tower.", "options":[{"name":"continue", "action":[ {"deleteMapObject":-1},{"removeItem":"Illusionist's Key"}]} ] } ] From f6a032f263e07a880ba6ae02355e998737020bab Mon Sep 17 00:00:00 2001 From: TabletopGeneral <56438137+jjayers99@users.noreply.github.com> Date: Fri, 25 Aug 2023 12:53:33 -0400 Subject: [PATCH 2/3] Update magetower_8.tmx Text update --- .../res/adventure/common/maps/map/magetower/magetower_8.tmx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/adventure/common/maps/map/magetower/magetower_8.tmx b/forge-gui/res/adventure/common/maps/map/magetower/magetower_8.tmx index 022c587342a..10e556d464d 100644 --- a/forge-gui/res/adventure/common/maps/map/magetower/magetower_8.tmx +++ b/forge-gui/res/adventure/common/maps/map/magetower/magetower_8.tmx @@ -172,7 +172,7 @@ [{ - "text":"This door is be locked. Judging by the scrapes and scratches on the floor, however, it seems to be opened frequently. Perhaps the key can be found nearby?", + "text":"This door is locked. Judging by the scrapes and scratches on the floor, however, it seems to be opened frequently so the key can probably be found nearby.", "options":[ { "name":"(Leave)" }, { From 3f51f569ecec803b9a49a9d821924f8ae72fbc78 Mon Sep 17 00:00:00 2001 From: jjayers99 <56438137+jjayers99@users.noreply.github.com> Date: Fri, 25 Aug 2023 20:01:24 -0400 Subject: [PATCH 3/3] Adventure - file name correction for wolf.png --- forge-gui/res/adventure/common/sprites/enemy/beast/wolf.atlas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/adventure/common/sprites/enemy/beast/wolf.atlas b/forge-gui/res/adventure/common/sprites/enemy/beast/wolf.atlas index b4bd5ef4473..c1343a03bb4 100644 --- a/forge-gui/res/adventure/common/sprites/enemy/beast/wolf.atlas +++ b/forge-gui/res/adventure/common/sprites/enemy/beast/wolf.atlas @@ -1,4 +1,4 @@ -Wolf.png +wolf.png size: 640,384 format: RGBA8888 filter: Nearest,Nearest