diff --git a/forge-gui/res/adventure/Innistrad/config.json b/forge-gui/res/adventure/Innistrad/config.json index 57fde877508..8118b5b6b0d 100644 --- a/forge-gui/res/adventure/Innistrad/config.json +++ b/forge-gui/res/adventure/Innistrad/config.json @@ -102,7 +102,8 @@ "ISD", "DKA", "SOI", - "MID" + "MID", + "YMID" ], "allowedJumpstart": [ "Innistrad", diff --git a/forge-gui/res/adventure/Innistrad/maps/Innistrad.tiled-project b/forge-gui/res/adventure/Innistrad/maps/Innistrad.tiled-project new file mode 100644 index 00000000000..16278ebac3a --- /dev/null +++ b/forge-gui/res/adventure/Innistrad/maps/Innistrad.tiled-project @@ -0,0 +1,17 @@ +{ + "automappingRulesFile": "", + "commands": [ + ], + "compatibilityVersion": 1100, + "extensionsPath": "../../common/maps/extensions", + "folders": [ + ".", + "../../common/maps/obj", + "../../common/maps/extensions", + "../../common/maps/tileset" + ], + "properties": [ + ], + "propertyTypes": [ + ] +} diff --git a/forge-gui/res/adventure/common/maps/map/cave/inn_cave_river_entrance.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/cave/inn_cave_river_entrance.tmx similarity index 88% rename from forge-gui/res/adventure/common/maps/map/cave/inn_cave_river_entrance.tmx rename to forge-gui/res/adventure/Innistrad/maps/map/Innistrad/cave/inn_cave_river_entrance.tmx index 98d46251c94..a5e8167f30b 100644 --- a/forge-gui/res/adventure/common/maps/map/cave/inn_cave_river_entrance.tmx +++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/cave/inn_cave_river_entrance.tmx @@ -1,9 +1,9 @@ - - - - - + + + + + 2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516,2516, @@ -404,94 +404,94 @@ - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + [ { @@ -502,7 +502,7 @@ ] - + [ { @@ -513,12 +513,12 @@ ] - + - + [{ "type": "randomCard", @@ -544,7 +544,7 @@ }] - + [ { @@ -555,14 +555,14 @@ ] - + - + [ { @@ -583,17 +583,17 @@ - + - + - + [ { @@ -604,33 +604,33 @@ ] - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - - - + + + diff --git a/forge-gui/res/adventure/common/maps/map/cave/inn_cave_river_lair.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/cave/inn_cave_river_lair.tmx similarity index 80% rename from forge-gui/res/adventure/common/maps/map/cave/inn_cave_river_lair.tmx rename to forge-gui/res/adventure/Innistrad/maps/map/Innistrad/cave/inn_cave_river_lair.tmx index f842fe0c27b..d1671fb4d31 100644 --- a/forge-gui/res/adventure/common/maps/map/cave/inn_cave_river_lair.tmx +++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/cave/inn_cave_river_lair.tmx @@ -1,8 +1,8 @@ - - - - + + + + 4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104,4104, @@ -121,8 +121,8 @@ - - + + [ { @@ -145,7 +145,7 @@ - + [ { @@ -156,7 +156,7 @@ ] - + [ { @@ -167,7 +167,7 @@ ] - + @@ -175,48 +175,48 @@ - + - + - + - + - + - + - + [{ "type": "randomCard", @@ -248,28 +248,28 @@ }] - - + + - + - - - - - - - - - + + + + + + + + + [ { @@ -280,9 +280,9 @@ ] - - - - + + + + diff --git a/forge-gui/res/adventure/common/maps/map/hunting_lodge/inn_forgotten_lodge_1.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/hunting_lodge/inn_forgotten_lodge_1.tmx similarity index 71% rename from forge-gui/res/adventure/common/maps/map/hunting_lodge/inn_forgotten_lodge_1.tmx rename to forge-gui/res/adventure/Innistrad/maps/map/Innistrad/hunting_lodge/inn_forgotten_lodge_1.tmx index 504fda3ee79..2910cf56de9 100644 --- a/forge-gui/res/adventure/common/maps/map/hunting_lodge/inn_forgotten_lodge_1.tmx +++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/hunting_lodge/inn_forgotten_lodge_1.tmx @@ -1,13 +1,13 @@ - + - - - - - + + + + + eJxbqcfAsHIUj+JRPIqHMZbhoY95AFR8HD4= @@ -35,12 +35,12 @@ - + - + @@ -48,23 +48,24 @@ - + - + - + + - + @@ -72,7 +73,7 @@ - + [ { @@ -83,7 +84,7 @@ ] - + [ { @@ -110,7 +111,7 @@ - + [ { @@ -121,7 +122,7 @@ ] - + [ { @@ -134,5 +135,8 @@ + + + diff --git a/forge-gui/res/adventure/common/maps/map/hunting_lodge/inn_lodge_1.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/hunting_lodge/inn_lodge_1.tmx similarity index 67% rename from forge-gui/res/adventure/common/maps/map/hunting_lodge/inn_lodge_1.tmx rename to forge-gui/res/adventure/Innistrad/maps/map/Innistrad/hunting_lodge/inn_lodge_1.tmx index 46523536480..4853ca0629f 100644 --- a/forge-gui/res/adventure/common/maps/map/hunting_lodge/inn_lodge_1.tmx +++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/hunting_lodge/inn_lodge_1.tmx @@ -3,11 +3,11 @@ - - - - - + + + + + eJxbqcfAsHIUj+JRPIqHMZbhoY95AFR8HD4= @@ -35,12 +35,12 @@ - + - + [{ "type": "gold", @@ -55,7 +55,7 @@ }] - + @@ -63,7 +63,7 @@ - + @@ -71,7 +71,7 @@ - + [ { @@ -82,7 +82,7 @@ ] - + [ { @@ -93,11 +93,11 @@ ] - - - - - - + + + + + + diff --git a/forge-gui/res/adventure/common/maps/map/main_story/inn_approaches/davriels_mansion.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion.tmx similarity index 91% rename from forge-gui/res/adventure/common/maps/map/main_story/inn_approaches/davriels_mansion.tmx rename to forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion.tmx index 3921ab4b38f..f84b9e721bd 100644 --- a/forge-gui/res/adventure/common/maps/map/main_story/inn_approaches/davriels_mansion.tmx +++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion.tmx @@ -1,5 +1,5 @@ - + @@ -229,62 +229,62 @@ - + - + - - + + - + - + - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + [ { @@ -309,16 +309,16 @@ - - - - + + + + - - + + [ { @@ -343,7 +343,7 @@ - + [{ "type": "randomCard", @@ -364,17 +364,17 @@ }] - + - + - + [ { @@ -385,12 +385,12 @@ ] - + - + diff --git a/forge-gui/res/adventure/common/maps/map/main_story/inn_approaches/davriels_mansion_2.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion_2.tmx similarity index 100% rename from forge-gui/res/adventure/common/maps/map/main_story/inn_approaches/davriels_mansion_2.tmx rename to forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion_2.tmx diff --git a/forge-gui/res/adventure/common/maps/map/main_story/inn_approaches/davriels_mansion_dungeon.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion_dungeon.tmx similarity index 100% rename from forge-gui/res/adventure/common/maps/map/main_story/inn_approaches/davriels_mansion_dungeon.tmx rename to forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion_dungeon.tmx diff --git a/forge-gui/res/adventure/common/maps/map/library/inn_library.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/library/inn_library.tmx similarity index 99% rename from forge-gui/res/adventure/common/maps/map/library/inn_library.tmx rename to forge-gui/res/adventure/Innistrad/maps/map/Innistrad/library/inn_library.tmx index 8e892b7ca1b..0b9363732ff 100644 --- a/forge-gui/res/adventure/common/maps/map/library/inn_library.tmx +++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/library/inn_library.tmx @@ -1,6 +1,6 @@ - + 6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901,6901, diff --git a/forge-gui/res/adventure/common/maps/map/main_story/inn_crescentus.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/inn_crescentus.tmx similarity index 92% rename from forge-gui/res/adventure/common/maps/map/main_story/inn_crescentus.tmx rename to forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/inn_crescentus.tmx index b1496d3238b..faa1a8acded 100644 --- a/forge-gui/res/adventure/common/maps/map/main_story/inn_crescentus.tmx +++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/inn_crescentus.tmx @@ -1,15 +1,15 @@ - + - - - - + + + + eJztzTERACAMBMEowiXgApiYANwRCSl+qK7Yer2YOb6qoQn15DvCFFq8vLy8vJJ3hyN0ky8AAA/74tft @@ -34,7 +34,7 @@ - + [{ "text":"Hello, planeswalker {var=player_name}, welcome to my abode", @@ -115,12 +115,12 @@ - + - + diff --git a/forge-gui/res/adventure/common/maps/map/towns/inn_ulvenwald_hamlet.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_ulvenwald_hamlet.tmx similarity index 72% rename from forge-gui/res/adventure/common/maps/map/towns/inn_ulvenwald_hamlet.tmx rename to forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_ulvenwald_hamlet.tmx index 6d71ba1bdff..2dd4753691e 100644 --- a/forge-gui/res/adventure/common/maps/map/towns/inn_ulvenwald_hamlet.tmx +++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_ulvenwald_hamlet.tmx @@ -3,11 +3,11 @@ - - - - - + + + + + eJyVlf1WgzAMxTumw83BA1mOjwboce6L8chqckgOd3ft1D9yUlrozS9NwxhDGMXKJoQP8TuxN7FPsZXMfb9MtpfnQ5w9jtkHGPfw/CX7VLLnYzPtrZoPZj53tHhcN/yi0yfmD6Rf2r5L8Sfx5zjrazyqtxBfG2+X2FPXeA7ZmFt9K7ZpppxWxrc0XdUrwBfNLW+wXOT2P9A6xqU5fRbbiq1N8xJn1sK4+zjrYi6Rd6S9R1v3eFj33XKsXjWHeM2r3+pcZ98MpMFn7FqoyTG2pqnMT8a8t3eQdyCrbT53jrmceL4q01Ltk+mvm1ve3D0KidodEjWAMemz3qUd6F2sppm3g/PFffeg5RoDvcO8ztECa0V17Lyu3Sf2RW0/U48j10dcd2O5Vt5lgtdrCw17Ca8Nd+JzhtbqujJbZHj5/nbxupcg57077TnRM95a79Kz9ZiYl2sLOVk/QJyp/uLMF8pDjtf7Zf2arjOsAR8jIzLremU9cmUaI+n7e5xb1MCaQd5cLx2tlj1nOneM1/puNeSd65jjcV5mReayme9wCb3rL2P9X//3Gx//AK1XMOI= @@ -32,23 +32,23 @@ - - + + - + - + - - + + diff --git a/forge-gui/res/adventure/common/maps/map/towns/inn_ulvenwald_town.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_ulvenwald_town.tmx similarity index 67% rename from forge-gui/res/adventure/common/maps/map/towns/inn_ulvenwald_town.tmx rename to forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_ulvenwald_town.tmx index d2353f56c14..d7a766fc636 100644 --- a/forge-gui/res/adventure/common/maps/map/towns/inn_ulvenwald_town.tmx +++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_ulvenwald_town.tmx @@ -3,11 +3,11 @@ - - - - - + + + + + eJydldtOAzEMREPV0tt2X4j4XLp0S++bT2axxVgdXAcJHkZ2om1OxnHSNqfUio6iqWgmehI9iw6i7cu35pIv8j1y7mNH3ycav0kcJH5gbWXuIZtbYj/G7QI2c1Iwz3kCR9ftRSvRmvgDeO+iAu4YMEvAYW/et8ZPGV9Q0wHMHlzl7Sju8qNfzdtKXS22lX1pTa+im+gM5oa87pAn4nItS4WRMC60H8+doMYTMBvnt2BuBLNxDH/GxcVoj1rrNTyf4HmOb9hv41QwXzvHWk2sXgNYyl6Bfw781u6RruN7t8mPPcB70rHepRnxtM6HwO9I94jXnRPLGI1je7/mQ2ttXof8s4/Nr7FTsC6z7UxtH7V3xLgX1Fr99oHfkh/PeOtqUFN0t0Zw9/A6gBf59fd3dG8J+/ztTltN9Iz1/i5xtrYn79f3Fvv0/I5qEb0v5nnj6lDza+9leY37jHvAcvbInkf8P/Tw25KMb9/52jKDe4b91t5Snb9SHyzy/X/Iq1D0fez3Y369V/Z8zPc7rPnpD/n0H7+x/AsfcLhM @@ -32,35 +32,35 @@ - - + + - + - + - + - + - - - - + + + + diff --git a/forge-gui/res/adventure/common/maps/map/towns/inn_ulvenwald_village.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_ulvenwald_village.tmx similarity index 70% rename from forge-gui/res/adventure/common/maps/map/towns/inn_ulvenwald_village.tmx rename to forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_ulvenwald_village.tmx index a03648f37ee..38cc327fa6d 100644 --- a/forge-gui/res/adventure/common/maps/map/towns/inn_ulvenwald_village.tmx +++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_ulvenwald_village.tmx @@ -3,11 +3,11 @@ - - - - - + + + + + eJyVlf1WgzAMxTumw83BA1mOjwboce6L8chqckgOd3ft1D9yUlrozS9NwxhDGMXKJoQP8TuxN7FPsZXMfb9MtpfnQ5w9jtkHGPfw/CX7VLLnYzPtrZoPZj53tHhcN/yi0yfmD6Rf2r5L8Sfx5zjrazyqtxBfG2+X2FPXeA7ZmFt9K7ZpppxWxrc0XdUrwBfNLW+wXOT2P9A6xqU5fRbbiq1N8xJn1sK4+zjrYi6Rd6S9R1v3eFj33XKsXjWHeM2r3+pcZ98MpMFn7FqoyTG2pqnMT8a8t3eQdyCrbT53jrmceL4q01Ltk+mvm1ve3D0KidodEjWAMemz3qUd6F2sppm3g/PFffeg5RoDvcO8ztECa0V17Lyu3Sf2RW0/U48j10dcd2O5Vt5lgtdrCw17Ca8Nd+JzhtbqujJbZHj5/nbxupcg57077TnRM95a79Kz9ZiYl2sLOVk/QJyp/uLMF8pDjtf7Zf2arjOsAR8jIzLremU9cmUaI+n7e5xb1MCaQd5cLx2tlj1nOneM1/puNeSd65jjcV5mReayme9wCb3rL2P9X//3Gx//AK1XMOI= @@ -32,29 +32,29 @@ - - + + - + - + - + - - - + + + diff --git a/forge-gui/res/adventure/common/maps/tileset/INN_dungen_crawler_tileset.tsx b/forge-gui/res/adventure/Innistrad/maps/tileset/INN_dungen_crawler_tileset.tsx similarity index 97% rename from forge-gui/res/adventure/common/maps/tileset/INN_dungen_crawler_tileset.tsx rename to forge-gui/res/adventure/Innistrad/maps/tileset/INN_dungen_crawler_tileset.tsx index e380200853d..3e1eda58ed0 100644 --- a/forge-gui/res/adventure/common/maps/tileset/INN_dungen_crawler_tileset.tsx +++ b/forge-gui/res/adventure/Innistrad/maps/tileset/INN_dungen_crawler_tileset.tsx @@ -1,6 +1,6 @@ - - + + diff --git a/forge-gui/res/adventure/common/world/tilesets/INN_tiles/dungen_crawler.png b/forge-gui/res/adventure/Innistrad/maps/tileset/INN_tiles/dungen_crawler.png similarity index 100% rename from forge-gui/res/adventure/common/world/tilesets/INN_tiles/dungen_crawler.png rename to forge-gui/res/adventure/Innistrad/maps/tileset/INN_tiles/dungen_crawler.png diff --git a/forge-gui/res/adventure/common/world/tilesets/INN_tiles/dungen_crawler.xcf b/forge-gui/res/adventure/Innistrad/maps/tileset/INN_tiles/dungen_crawler.xcf similarity index 100% rename from forge-gui/res/adventure/common/world/tilesets/INN_tiles/dungen_crawler.xcf rename to forge-gui/res/adventure/Innistrad/maps/tileset/INN_tiles/dungen_crawler.xcf diff --git a/forge-gui/res/adventure/common/world/tilesets/INN_tiles/inn_colorless_structures.xcf b/forge-gui/res/adventure/Innistrad/maps/tileset/INN_tiles/inn_colorless_structures.xcf similarity index 100% rename from forge-gui/res/adventure/common/world/tilesets/INN_tiles/inn_colorless_structures.xcf rename to forge-gui/res/adventure/Innistrad/maps/tileset/INN_tiles/inn_colorless_structures.xcf diff --git a/forge-gui/res/adventure/common/maps/tileset/Inn_Dungeon.tsx b/forge-gui/res/adventure/Innistrad/maps/tileset/Inn_Dungeon.tsx similarity index 100% rename from forge-gui/res/adventure/common/maps/tileset/Inn_Dungeon.tsx rename to forge-gui/res/adventure/Innistrad/maps/tileset/Inn_Dungeon.tsx diff --git a/forge-gui/res/adventure/common/maps/tileset/Inn_dungeon.png b/forge-gui/res/adventure/Innistrad/maps/tileset/Inn_dungeon.png similarity index 100% rename from forge-gui/res/adventure/common/maps/tileset/Inn_dungeon.png rename to forge-gui/res/adventure/Innistrad/maps/tileset/Inn_dungeon.png diff --git a/forge-gui/res/adventure/Innistrad/maps/tileset/buildings-nocollide.tsx b/forge-gui/res/adventure/Innistrad/maps/tileset/buildings-nocollide.tsx new file mode 100644 index 00000000000..9fbe13a25fb --- /dev/null +++ b/forge-gui/res/adventure/Innistrad/maps/tileset/buildings-nocollide.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.atlas b/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.atlas new file mode 100644 index 00000000000..d70756f211e --- /dev/null +++ b/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.atlas @@ -0,0 +1,638 @@ +buildings.png +size: 448,800 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +IslandTown + xy: 144, 0 + size: 48, 48 +MountainTown + xy: 48, 0 + size: 48, 48 +SwampTown + xy: 0, 0 + size: 48, 48 +ForestTown + xy: 352, 496 + size: 32, 32 +PlainsTown + xy: 96, 0 + size: 48, 48 +PirateShop + xy: 384, 704 + size: 16, 16 +WasteTown + xy: 272, 128 + size: 48, 48 +SnowShop + xy: 368, 944 + size: 16, 16 +IslandCapital + xy: 128, 592 + size: 64, 64 +MountainCapital + xy: 128, 720 + size: 64, 64 +SwampCapital + xy: 128, 464 + size: 64, 64 +ForestCapital + xy: 64, 656 + size: 64, 64 +PlainsCapital + xy: 0, 464 + size: 64, 64 +Spawn + xy: 304, 288 + size: 16, 16 +Gate + xy: 384, 128 + size: 64, 48 +InstantShop + xy: 304, 704 + size: 16, 16 +CreatureShop + xy: 320, 704 + size: 16, 16 +GreenShop + xy: 336, 704 + size: 16, 16 +RedShop + xy: 352, 704 + size: 16, 16 +WhiteShop + xy: 368, 704 + size: 16, 16 +LandShop + xy: 304, 720 + size: 16, 16 +ColorlessShop + xy: 320, 720 + size: 16, 16 +BlackShop + xy: 336, 720 + size: 16, 16 +BlueShop + xy: 352, 720 + size: 16, 16 +MultiColorShop + xy: 368, 720 + size: 16, 16 +SelesnyaShop + xy: 304, 736 + size: 16, 16 +AzoriusShop + xy: 320, 736 + size: 16, 16 +DimirShop + xy: 336, 736 + size: 16, 16 +RakdosShop + xy: 352, 736 + size: 16, 16 +GruulShop + xy: 368, 736 + size: 16, 16 +SimicShop + xy: 304, 752 + size: 16, 16 +OrzhovShop + xy: 320, 752 + size: 16, 16 +IzzetShop + xy: 336, 752 + size: 16, 16 +GolgariShop + xy: 352, 752 + size: 16, 16 +BorosShop + xy: 368, 752 + size: 16, 16 +GoblinShop + xy: 304, 768 + size: 16, 16 +ZombieShop + xy: 320, 768 + size: 16, 16 +HumanShop + xy: 336, 768 + size: 16, 16 +ElfShop + xy: 352, 768 + size: 16, 16 +GiantShop + xy: 336, 944 + size: 16, 16 +SagaShop + xy: 304, 944 + size: 16, 16 +FlipShop + xy: 368, 928 + size: 16, 16 +BattleShop + xy: 288, 944 + size: 16, 16 +LargeSeaCreaturesShop + xy: 352, 944 + size: 16, 16 +UBShop + xy: 384, 928 + size: 16, 16 +NobleShop + xy: 320, 944 + size: 16, 16 +BoosterShop + xy: 384,944 + size:16, 16 +MerfolkShop + xy: 368, 768 + size: 16, 16 +EquipmentShop + xy: 304, 784 + size: 16, 16 +ItemShop + xy: 288, 912 + size: 16, 16 +CapitalShop + xy: 304, 816 + size: 16, 16 +ArtifactShop + xy: 320, 784 + size: 16, 16 +AngelShop + xy: 336, 784 + size: 16, 16 +GolemShop + xy: 352, 784 + size: 16, 16 +SphinxShop + xy: 320, 912 + size: 16, 16 +HydraShop + xy: 336, 912 + size: 16, 16 +InsectSpiderShop + xy: 352, 912 + size: 16, 16 +SliverShop + xy: 368, 784 + size: 16, 16 +RWBShop + xy: 304, 800 + size: 16, 16 +RWUShop + xy: 320, 800 + size: 16, 16 +RWGShop + xy: 336, 800 + size: 16, 16 +EnchantmentShop + xy: 352, 800 + size: 16, 16 +WUBRGShop + xy: 368, 800 + size: 16, 16 +RogueShop + xy: 288, 816 + size: 16, 16 +NonbasicLandShop + xy: 304, 816 + size: 16, 16 +SpaceMarineShop + xy: 320, 816 + size: 16, 16 +NecronShop + xy: 336, 816 + size: 16, 16 +ChaosShop + xy: 352, 816 + size: 16, 16 +InsectShop + xy: 368, 912 + size: 16, 16 +CatShop + xy: 288, 928 + size: 16, 16 +ShapeshifterShop + xy: 384, 912 + size: 16, 16 +GodMinigodShop + xy: 320, 928 + size: 16, 16 +MutantShop + xy: 336, 928 + size: 16, 16 +HorrorShop + xy: 352, 928 + size: 16, 16 +EldraziShop + xy: 304, 928 + size: 16, 16 +TyranidShop + xy: 368, 816 + size: 16, 16 +M22Shop + xy: 384, 720 + size: 16, 16 +M21Shop + xy: 384, 750 + size: 16, 16 +M20Shop + xy: 384, 766 + size: 16, 16 +AssassinShop + xy: 384, 784 + size: 16, 16 +SquirrelShop + xy: 384, 800 + size: 16, 16 +DragonShop + xy: 384, 816 + size: 16, 16 +AssemblyShop + xy: 288, 832 + size: 16, 16 +VampireShop + xy: 304, 832 + size: 16, 16 +VehicleShop + xy: 320, 832 + size: 16, 16 +RUBShop + xy: 336, 832 + size: 16, 16 +RGBShop + xy: 352, 832 + size: 16, 16 +RGUShop + xy: 368, 832 + size: 16, 16 +MinotaurShop + xy: 384, 832 + size: 16, 16 +DinosaurShop + xy: 288, 848 + size: 16, 16 +UWBShop + xy: 304, 848 + size: 16, 16 +UGBShop + xy: 320, 848 + size: 16, 16 +UWGShop + xy: 336, 848 + size: 16, 16 +GWBShop + xy: 352, 848 + size: 16, 16 +DwarfShop + xy: 368, 848 + size: 16, 16 +DevilShop + xy: 384, 848 + size: 16, 16 +OgreShop + xy: 288, 864 + size: 16, 16 +EquipShop + xy: 320, 864 + size: 16, 16 +SoldierShop + xy: 336, 864 + size: 16, 16 +CardShop + xy: 352, 864 + size: 16, 16 +DnDShop + xy: 368, 864 + size: 16, 16 +DemonShop + xy: 384, 864 + size: 16, 16 +RotatingShop + xy: 288, 880 + size: 16, 16 +DruidShop + xy: 304, 880 + size: 16, 16 +WandShop + xy: 320, 880 + size: 16, 16 +BirdShop + xy: 336, 880 + size: 16, 16 +WolfShop + xy: 352, 880 + size: 16, 16 +KnightShop + xy: 368, 880 + size: 16, 16 +WallShop + xy: 384, 880 + size: 16, 16 +PlaneswalkerShop + xy: 304, 896 + size: 16, 16 +SkeletonShop + xy: 320, 896 + size: 16, 16 +SpiritShop + xy: 336, 896 + size: 16, 16 +ShamanShop + xy: 352, 896 + size: 16, 16 +WizardShop + xy: 368, 896 + size: 16, 16 +LegendShop + xy: 384, 896 + size: 16, 16 +ShardTrader + xy: 288, 896 + size: 16, 16 +Waypoint + xy: 288, 912 + size: 16, 16 +Overlay8Black + xy: 400, 704 + size: 5, 16 +Overlay6Black + xy: 405, 704 + size: 5, 16 +Overlay4Black + xy: 400, 800 + size: 5,16 +Overlay2Black + xy: 405, 800 + size: 5, 16 +Overlay8Green + xy: 400, 768 + size: 5, 16 +Overlay6Green + xy: 405, 768 + size: 5, 16 +Overlay4Green + xy: 405, 864 + size: 5, 16 +Overlay2Green + xy: 405, 864 + size: 5, 16 +Overlay8Colorless + xy: 400, 784 + size: 5, 16 +Overlay6Colorless + xy: 405, 784 + size: 5, 16 +Overlay4Colorless + xy: 400, 880 + size: 5, 16 +Overlay2Colorless + xy: 405, 880 + size: 5, 16 +Overlay8Blue + xy: 400, 720 + size: 5, 16 +Overlay6Blue + xy: 405, 720 + size: 5, 16 +Overlay4Blue + xy: 400, 816 + size: 5, 16 +Overlay2Blue + xy: 405, 816 + size: 5, 16 +Overlay8Red + xy: 400, 736 + size: 5, 16 +Overlay6Red + xy: 405, 736 + size: 5, 16 +Overlay4Red + xy: 400, 832 + size: 5, 16 +Overlay2Red + xy: 405, 832 + size: 5, 16 +Overlay8White + xy: 400, 752 + size: 5, 16 +Overlay6White + xy: 405, 752 + size: 5, 16 +Overlay4White + xy: 400, 848 + size: 5, 16 +Overlay2White + xy: 405, 848 + size: 5, 16 +PhyrexianShop + xy: 304, 912 + size: 16, 16 +Test + xy: 128, 48 + size: 32, 32 +Cave + xy: 192, 272 + size: 32, 32 +Nest + xy: 256, 304 + size: 32, 32 +Nest + xy: 321, 400 + size: 32, 32 +Aerie + xy: 289, 368 + size: 32, 32 +Factory + xy: 288, 433 + size: 32, 32 +Factory + xy: 0, 146 + size: 32, 30 +Factory + xy: 192, 240 + size: 32, 32 +Fort + xy: 160, 274 + size: 32, 32 +Fort + xy: 224, 368 + size: 32, 32 +Fort + xy: 320, 368 + size: 32, 32 +Monastery + xy: 352, 367 + size: 32, 32 +Castle + xy: 160, 274 + size: 32, 32 +Castle + xy: 224, 368 + size: 32, 32 +Castle + xy: 320, 368 + size: 32, 32 +CatLair + xy: 161, 49 + size: 32, 32 +CatLair + xy: 351, 209 + size: 32, 16 +CatLair + xy: 351, 209 + size: 32, 16 +CatLair + xy: 96, 81 + size: 32, 32 +CatLair + xy: 96, 81 + size: 32, 32 +MageTower + xy: 289, 32 + size: 32, 32 +MageTower + xy: 32, 304 + size: 32, 32 +MageTower + xy: 0, 240 + size: 32, 32 +MageTower + xy: 64, 304 + size: 32, 32 +Portal + xy: 96, 48 + size: 32, 32 +DjinnPalace + xy: 128, 272 + size: 32, 32 +DjinnPalace + xy: 320, 432 + size: 32, 32 +MerfolkPool + xy: 320, 208 + size: 32, 16 +MerfolkPool + xy: 64, 112 + size: 32, 32 +MerfolkPool + xy: 352, 32 + size: 32, 32 +BlueOrb + xy: 129, 48 + size: 32, 32 +Graveyard + xy: 368, 96 + size: 48, 32 +Graveyard + xy: 256, 464 + size: 32, 32 +Graveyard + xy: 192, 400 + size: 32, 32 +Graveyard + xy: 32, 272 + size: 32, 32 +EvilGrove + xy: 256, 768 + size: 32, 32 +Slobad + xy: 416, 336 + size: 32, 32 +Jace + xy: 416, 432 + size: 32, 32 +VampireCastle + xy: 416, 464 + size: 32, 32 +SkullCave + xy: 64, 272 + size: 32, 32 +SkullCave + xy: 240, 0 + size: 48, 48 +SkullCave + xy: 256, 336 + size: 32, 32 +SkullCave + xy: 352, 336 + size: 32, 32 +BarbarianCamp + xy: 224, 304 + size: 32, 32 +Maze + xy: 0, 336 + size: 32, 32 +YuleTown + xy: 352, 592 + size: 32, 32 +SnowAbbey + xy: 192, 448 + size: 32, 32 +Grove + xy: 416, 496 + size: 32, 32 +WurmPond + xy: 224, 400 + size: 32, 32 +StonePyramid + xy: 384, 464 + size: 32, 32 +Mine + xy: 96, 144 + size: 32, 32 +LavaForge + xy: 384, 336 + size: 32, 32 +black_castle + xy: 0, 800 + size: 64, 64 +green_castle + xy: 64, 800 + size: 64, 64 +blue_castle + xy: 128, 800 + size: 64, 64 +colorless_castle + xy: 192, 800 + size: 64, 64 +white_castle + xy: 0, 864 + size: 64, 64 +red_castle + xy: 64, 864 + size: 64, 64 +final_castle + xy: 128, 864 + size: 64, 64 +farm + xy:351, 0 + size: 33,33 +hall_of_flame + xy: 194, 864 + size: 32, 32 +hall_of_fear + xy: 320, 464 + size: 32, 32 +ruinedcity + xy: 321, 96 + size: 45, 32 +digsite + xy: 320, 64 + size: 32, 32 +abandonedshardmine + xy: 32, 208 + size: 32, 32 +libraryofvarsil + xy: 0, 720 + size: 64, 64 +banditcave + xy: 32, 208 + size: 32, 32 +frostbittencavern + xy: 32, 928 + size: 32, 32 +primaljungle + xy: 0, 928 + size: 32, 32 \ No newline at end of file diff --git a/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.png b/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.png new file mode 100644 index 00000000000..19ec78526d5 Binary files /dev/null and b/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.png differ diff --git a/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.tsx b/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.tsx new file mode 100644 index 00000000000..f4a2446b2f8 --- /dev/null +++ b/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.tsx @@ -0,0 +1,4019 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.xcf b/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.xcf new file mode 100644 index 00000000000..5c98cb8920b Binary files /dev/null and b/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.xcf differ diff --git a/forge-gui/res/adventure/common/maps/tileset/inn_buildings.atlas b/forge-gui/res/adventure/Innistrad/maps/tileset/inn_buildings.atlas similarity index 100% rename from forge-gui/res/adventure/common/maps/tileset/inn_buildings.atlas rename to forge-gui/res/adventure/Innistrad/maps/tileset/inn_buildings.atlas diff --git a/forge-gui/res/adventure/common/maps/tileset/inn_dungeon_floor.png b/forge-gui/res/adventure/Innistrad/maps/tileset/inn_dungeon_floor.png similarity index 100% rename from forge-gui/res/adventure/common/maps/tileset/inn_dungeon_floor.png rename to forge-gui/res/adventure/Innistrad/maps/tileset/inn_dungeon_floor.png diff --git a/forge-gui/res/adventure/common/maps/tileset/inn_dungeon_floor.tsx b/forge-gui/res/adventure/Innistrad/maps/tileset/inn_dungeon_floor.tsx similarity index 100% rename from forge-gui/res/adventure/common/maps/tileset/inn_dungeon_floor.tsx rename to forge-gui/res/adventure/Innistrad/maps/tileset/inn_dungeon_floor.tsx diff --git a/forge-gui/res/adventure/common/maps/tileset/inn_main.png b/forge-gui/res/adventure/Innistrad/maps/tileset/inn_main.png similarity index 100% rename from forge-gui/res/adventure/common/maps/tileset/inn_main.png rename to forge-gui/res/adventure/Innistrad/maps/tileset/inn_main.png diff --git a/forge-gui/res/adventure/Innistrad/maps/tileset/inn_main.tsx b/forge-gui/res/adventure/Innistrad/maps/tileset/inn_main.tsx new file mode 100644 index 00000000000..3183138d35a --- /dev/null +++ b/forge-gui/res/adventure/Innistrad/maps/tileset/inn_main.tsx @@ -0,0 +1,2233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/forge-gui/res/adventure/common/maps/tileset/inn_main.xcf b/forge-gui/res/adventure/Innistrad/maps/tileset/inn_main.xcf similarity index 100% rename from forge-gui/res/adventure/common/maps/tileset/inn_main.xcf rename to forge-gui/res/adventure/Innistrad/maps/tileset/inn_main.xcf diff --git a/forge-gui/res/adventure/Innistrad/world/points_of_interest.json b/forge-gui/res/adventure/Innistrad/world/points_of_interest.json index 7ef086aa441..4991e7ee5a3 100644 --- a/forge-gui/res/adventure/Innistrad/world/points_of_interest.json +++ b/forge-gui/res/adventure/Innistrad/world/points_of_interest.json @@ -4,9 +4,9 @@ "name": "inn_Cave_river", "type": "cave", "count": 15, - "spriteAtlas": "../common/maps/tileset/inn_buildings.atlas", + "spriteAtlas": "../Innistrad/maps/tileset/inn_buildings.atlas", "sprite": "Cave", - "map": "../common/maps/map/cave/inn_cave_river_entrance.tmx", + "map": "../Innistrad/maps/map/Innistrad/cave/inn_cave_river_entrance.tmx", "radiusFactor": 0.8, "questTags": [ "Hostile", @@ -19,9 +19,9 @@ "name": "inn_crescentus", "type": "town", "count": 1, - "spriteAtlas": "../common/maps/tileset/inn_buildings.atlas", + "spriteAtlas": "../Innistrad/maps/tileset/inn_buildings.atlas", "sprite": "crescentus", - "map": "../common/maps/map/main_story/inn_crescentus.tmx", + "map": "../Innistrad/maps/map/Innistrad/main_story/inn_crescentus.tmx", "radiusFactor": 0.5, "questTags": [ "Capital", @@ -32,9 +32,9 @@ "name": "inn_forgotten_lodge_1", "type": "dungeon", "count": 18, - "spriteAtlas": "../common/maps/tileset/inn_buildings.atlas", + "spriteAtlas": "../Innistrad/maps/tileset/inn_buildings.atlas", "sprite": "lodge_1", - "map": "../common/maps/map/hunting_lodge/inn_forgotten_lodge_1.tmx", + "map": "../Innistrad/maps/map/Innistrad/hunting_lodge/inn_forgotten_lodge_1.tmx", "radiusFactor": 0.8, "questTags": [ "Hostile", @@ -47,9 +47,9 @@ "name": "inn_lodge_1", "type": "dungeon", "count": 12, - "spriteAtlas": "../common/maps/tileset/inn_buildings.atlas", + "spriteAtlas": "../Innistrad/maps/tileset/inn_buildings.atlas", "sprite": "lodge_1", - "map": "../common/maps/map/hunting_lodge/inn_lodge_1.tmx", + "map": "../Innistrad/maps/map/Innistrad/hunting_lodge/inn_lodge_1.tmx", "radiusFactor": 0.8, "questTags": [ "Hostile", @@ -62,9 +62,9 @@ "name": "inn_ulvenwald_hamlet", "type": "town", "count": 4, - "spriteAtlas": "../common/maps/tileset/inn_buildings.atlas", + "spriteAtlas": "../Innistrad/maps/tileset/inn_buildings.atlas", "sprite": "ulvenwaldtown", - "map": "../common/maps/map/towns/inn_ulvenwald_hamlet.tmx", + "map": "../Innistrad/maps/map/Innistrad/towns/inn_ulvenwald_hamlet.tmx", "radiusFactor": 0.8, "questTags": [ "Town", @@ -77,9 +77,9 @@ "name": "inn_ulvenwald_town", "type": "town", "count": 1, - "spriteAtlas": "../common/maps/tileset/inn_buildings.atlas", + "spriteAtlas": "../Innistrad/maps/tileset/inn_buildings.atlas", "sprite": "ulvenwaldtown", - "map": "../common/maps/map/towns/inn_ulvenwald_town.tmx", + "map": "../Innistrad/maps/map/Innistrad/towns/inn_ulvenwald_town.tmx", "radiusFactor": 0.8, "questTags": [ "Capital", @@ -93,9 +93,9 @@ "name": "inn_ulvenwald_village", "type": "town", "count": 10, - "spriteAtlas": "../common/maps/tileset/inn_buildings.atlas", + "spriteAtlas": "../Innistrad/maps/tileset/inn_buildings.atlas", "sprite": "ulvenwaldtown", - "map": "../common/maps/map/towns/inn_ulvenwald_hamlet.tmx", + "map": "../Innistrad/maps/map/Innistrad/towns/inn_ulvenwald_hamlet.tmx", "radiusFactor": 0.8, "questTags": [ "Town", diff --git a/forge-gui/res/adventure/Shandalar Old Border/config.json b/forge-gui/res/adventure/Shandalar Old Border/config.json index c1efbd268e7..5821f361163 100644 --- a/forge-gui/res/adventure/Shandalar Old Border/config.json +++ b/forge-gui/res/adventure/Shandalar Old Border/config.json @@ -71,534 +71,56 @@ "Volcanic Island" ], "restrictedEditions": [ - "10E", - "2X2", - "2XM", - "30A", - "40K", - "5DN", - "8ED", - "9ED", - "A25", - "ACR", - "AER", - "AFC", - "AFR", - "AJMP", - "AKH", - "AKR", - "ALA", - "ANA", - "ANB", - "ARB", - "ARC", - "AVR", - "BBD", - "BFZ", - "BIG", - "BLB", - "BLC", - "BNG", - "BOK", - "BOT", - "BRC", - "BRO", - "BRR", - "C13", - "C14", - "C15", - "C16", - "C17", - "C18", - "C19", - "C20", - "C21", - "CC1", - "CC2", - "CFX", - "CHK", - "CLB", - "CLU", - "CM1", - "CM2", - "CMA", - "CMB1", - "CMM", - "CMR", - "CN2", - "CNS", - "COM", - "CP1", - "CP2", - "CP3", - "CSP", - "CST", - "DA1", - "DBL", - "DCI", - "DD1", - "DD2", - "DDC", - "DDD", - "DDE", - "DDF", - "DDG", - "DDH", - "DDI", - "DDJ", - "DDK", - "DDL", - "DDM", - "DDN", - "DDO", - "DDP", - "DDQ", - "DDR", - "DDS", - "DDT", - "DDU", - "DFT", - "DGM", - "DIS", - "DKA", - "DMC", - "DMR", - "DMU", - "DOM", - "DPA", - "DRB", - "DRC", - "DS0", - "DSC", - "DSK", - "DST", - "DTK", - "DVD", - "E01", - "E02", - "EA1", - "EA2", - "EA3", - "ELD", - "EMA", - "EMN", - "EVE", - "EVG", - "EXP", - "F03", - "F04", - "F05", - "F06", - "F07", - "F08", - "F09", - "F10", - "F11", - "F12", - "F13", - "F14", - "F15", - "F16", - "F17", - "FCA", - "FDC", - "FDN", - "FIC", - "FIN", - "FMB1", - "FRF", - "FUT", - "FVE", - "FVL", - "FVR", - "G04", - "G05", - "G06", - "G07", - "G08", - "G09", - "G10", - "G11", - "G18", - "GDY", - "GK1", - "GK2", - "GN2", - "GN3", - "GNT", - "GPT", - "GRN", - "GS1", - "GTC", - "GVL", - "H1R", - "H2R", - "HA1", - "HA2", - "HA3", - "HA4", - "HA5", - "HA6", - "HA7", - "HBG", - "HHO", - "HOP", - "HOU", - "IKO", - "IMA", - "INR", - "ISD", - "J12", - "J13", - "J14", - "J15", - "J16", - "J17", - "J18", - "J19", - "J20", - "J21", - "J22", - "J25", - "JMP", - "JOU", - "JVC", - "KHC", - "KHM", - "KLD", - "KLR", - "KTK", - "LCC", - "LCI", - "LRW", - "LTC", - "LTR", - "M10", - "M11", - "M12", - "M13", - "M14", - "M15", - "M19", - "M20", - "M21", - "M3C", - "MAT", - "MB1", - "MB2", - "MBS", - "MD1", - "ME2", - "ME3", - "ME4", - "MED", - "MH1", - "MH2", - "MH3", - "MIC", - "MID", - "MKC", - "MKM", - "MM2", - "MM3", - "MMA", - "MOC", - "MOM", - "MOR", - "MPS_AKH", - "MPS_GRN", - "MPS_KLD", - "MPS_RNA", - "MPS_WAR", - "MRD", - "MUL", - "NCC", - "NEC", - "NEO", - "NPH", - "OGW", - "OLGC", - "ONC", - "ONE", - "ORI", - "OTC", - "OTJ", - "OTP", - "P04", - "P05", - "P06", - "P07", - "P08", - "P09", - "P10", - "P10E", - "P11", - "P15A", - "P22", - "P23", - "P2HG", - "P30A", - "P30H", - "P30M", - "P30T", - "P5DN", - "P8ED", - "P9ED", - "PAER", - "PAKH", - "PAL04", - "PAL05", - "PAL06", - "PALA", - "PANA", - "PARB", - "PAVR", - "PBFZ", - "PBNG", - "PBOK", - "PBOOK", - "PC2", - "PCA", - "PCBB", - "PCHK", - "PCMP", - "PCNS", - "PCON", - "PCSP", - "PDCI", - "PD2", - "PD3", - "PDGM", - "PDIS", - "PDKA", - "PDOM", - "PDP10", - "PDP12", - "PDP13", - "PDP14", - "PDP15", - "PDS", - "PDST", - "PDTK", - "PDTP", - "PEMN", - "PEVE", - "PEWK", - "PF19", - "PF20", - "PF23", - "PF24", - "PF25", - "PFRF", - "PFUT", - "PGPT", - "PGPX", - "PGRN", - "PGTC", - "PH17", - "PH18", - "PH19", - "PH20", - "PH21", - "PH22", - "PHEL", - "PHOU", - "PHTR", - "PIDW", - "PIO", - "PIP", - "PISD", - "PJ21", - "PJAS", - "PJJT", - "PJOU", - "PJSC", - "PJSE", - "PKLD", - "PKTK", - "PL21", - "PL22", - "PL23", - "PL24", - "PL25", - "PLC", - "PLG20", - "PLG21", - "PLG22", - "PLG24", - "PLG25", - "PLIST", - "PLRW", - "PLTC", - "PMEI", - "PM10", - "PM11", - "PM12", - "PM13", - "PM14", - "PM15", - "PM19", - "PM20", - "PMBS", - "PMDA", - "PMH1", - "PMOR", - "PMPS", - "PMPS06", - "PMPS07", - "PMPS08", - "PMPS09", - "PMPS10", - "PMPS11", - "PMRD", - "PNAT", - "PNPH", - "POGW", - "PORI", - "PPC1", - "PPLC", - "PPP1", - "PPRO", - "PR23", - "PRAV", - "PRCQ", - "PRES", - "PRIX", - "PRNA", - "PRM", - "PROE", - "PRTR", - "PRW2", - "PRWK", - "PS14", - "PS15", - "PS16", - "PS17", - "PS18", - "PS19", - "PSDC", - "PSHM", - "PSLDSC", - "PSOI", - "PSOK", - "PSOM", - "PSPL", - "PSS1", - "PSS2", - "PSS3", - "PSS4", - "PSVC", - "PSUS", - "PTHS", - "PTKDF", - "PTSP", - "PUMA", - "PURL", - "PUST", - "PW11", - "PW12", - "PW21", - "PW22", - "PW23", - "PW24", - "PW25", - "PWAR", - "PWCS", - "PWWK", - "PXLN", - "PXTC", - "PZ1", - "PZ2", - "PZEN", - "Q06", - "RAV", - "REX", - "RIX", - "RNA", - "ROE", - "RTR", - "RVR", + + ], + "allowedEditions": [ + "LEA", + "LEB", + "2ED", + "3ED", + "ARN", + "ATQ", + "LEG", + "DRK", + "FEM", + "4ED", + "ICE", + "CHR", + "HML", + "ALL", + "MIR", + "VIS", + "5ED", + "POR", + "WTH", + "TMP", + "STH", + "EXO", + "PO2", + "USG", + "ATH", + "ULG", + "UDS", + "6ED", + "PTK", + "S99", + "MMQ", + "BRB", + "NEM", "S00", - "SCD", - "SCH", - "SHM", - "SIR", - "SIS", - "SLC", - "SLD", - "SLP", - "SLU", - "SLX", - "SNC", - "SOI", - "SOK", - "SOM", - "SPE", - "SPG", - "SS1", - "SS2", - "SS3", - "STA", - "STX", - "TD0", - "TD1", - "TD2", - "TDC", - "TDM", - "THB", - "THS", - "TPR", - "TSB", - "TSP", - "TSR", - "UGF", - "UGL", - "UMA", - "UND", - "UNF", - "UNH", - "UST", - "V12", - "V13", - "V14", - "V15", - "V16", - "V17", - "VMA", - "VOC", - "VOW", - "W16", - "W17", - "WAR", - "WHO", - "WMC", - "WOC", - "WOE", - "WOT", - "WWK", - "XLN", - "YBLB", - "YBRO", - "YDFT", - "YDMU", - "YDSK", - "YLCI", - "YMID", - "YMKM", - "YNEO", - "YONE", - "YOTJ", - "YSNC", - "YWOE", - "ZEN", - "ZNC", - "ZNE", - "ZNR", - "PCEL", - "UNK", - "EOE", - "EOC", - "YTDM" + "PCY", + "INV", + "BTD", + "PLS", + "APC", + "7ED", + "ODY", + "DKM", + "TOR", + "JUD", + "ONS", + "LGN", + "SCG" ], "difficulties": [ { diff --git a/forge-gui/res/adventure/Shandalar Old Border/world/points_of_interest.json b/forge-gui/res/adventure/Shandalar Old Border/world/points_of_interest.json index 36818d6b267..8b78da46c8b 100644 --- a/forge-gui/res/adventure/Shandalar Old Border/world/points_of_interest.json +++ b/forge-gui/res/adventure/Shandalar Old Border/world/points_of_interest.json @@ -3407,7 +3407,7 @@ "count": 1, "spriteAtlas": "../common/maps/tileset/buildings.atlas", "sprite": "WasteTown", - "map": "../common/maps/map/main_story_explore/waste_town_abandoned.tmx", + "map": "../common/maps/map/main_story_defend/waste_town_abandoned.tmx", "radiusFactor": 0.8, "questTags": [ "Quest_APortalToNowhere" diff --git a/forge-gui/res/adventure/common/maps/tileset/inn_main.tsx b/forge-gui/res/adventure/common/maps/tileset/inn_main.tsx deleted file mode 100644 index 7ac69497ff1..00000000000 --- a/forge-gui/res/adventure/common/maps/tileset/inn_main.tsx +++ /dev/null @@ -1,1064 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/forge-gui/res/blockdata/blocks.txt b/forge-gui/res/blockdata/blocks.txt index bddb173a51a..abf2913b440 100644 --- a/forge-gui/res/blockdata/blocks.txt +++ b/forge-gui/res/blockdata/blocks.txt @@ -142,3 +142,4 @@ Innistrad Remastered, 3/6/INR, INR Aetherdrift, 3/6/DFT, DFT Tarkir Dragonstorm, 3/6/TDM, TDM Final Fantasy, 3/6/FIN, FIN +Alchemy: Innistrad, 3/6/ISD, YMID