diff --git a/forge-gui/res/adventure/Shandalar/decks/aether_channeler.dck b/forge-gui/res/adventure/Shandalar/decks/aether_channeler.dck new file mode 100644 index 00000000000..9956eb43a88 --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/decks/aether_channeler.dck @@ -0,0 +1,30 @@ +[metadata] +Name=aether_channeler +[Main] +2 Aether Channeler|DMU|1 +1 Agent of Treachery|M20|1 +1 Brago, King Eternal|KHC|1 +1 Charming Prince|ELD|1 +2 Circuit Mender|NEO|1 +2 Cloudblazer|AFC|1 +1 Eerie Interlude|KHC|1 +1 Ephemerate|MH1|1 +1 Ethereal Valkyrie|KHC|1 +1 Hallowed Respite|MID|1 +4 Idyllic Beachfront|DMU|1 +9 Island|KHM|1 +1 Meteor Golem|AFC|1 +1 Panharmonicon|KLD|1 +9 Plains|KHM|1 +2 Prairie Stream|C20|1 +1 Ranar the Ever-Watchful|KHC|1 +2 Ravenform|KHM|1 +2 Reflector Mage|OGW|1 +1 Saw It Coming|KHM|1 +2 Settle Beyond Reality|MH1|1 +2 Skyclave Apparition|ZNR|1 +3 Soulherder|MH1|1 +1 Spectral Deluge|KHC|1 +3 Teleportation Circle|AFR|1 +2 Wall of Omens|KHC|1 +2 Whirler Rogue|ZNC|1 diff --git a/forge-gui/res/adventure/Shandalar/decks/horror.dck b/forge-gui/res/adventure/Shandalar/decks/horror.dck index 6de9a6a68bb..a5d1fc929ba 100644 --- a/forge-gui/res/adventure/Shandalar/decks/horror.dck +++ b/forge-gui/res/adventure/Shandalar/decks/horror.dck @@ -15,7 +15,7 @@ Name=horror 1 Dismal Failure|PLC|1 2 Drowned Catacomb|E01|1 1 Hullbreaker Horror|VOW|1 -8 Island|MID|1 +8 Island|MID|3 3 Man-o'-War|EMA|1 2 Mesmeric Fiend|A25|1 1 Mindslicer|9ED|1 @@ -24,7 +24,7 @@ Name=horror 4 Recoil|DDH|1 1 River's Rebuke|XLN|1 1 Skull Fracture|ODY|1 -9 Swamp|MID|1 +9 Swamp|MID|3 2 Thing in the Ice|SOI|1 2 Uchuulon|CLB|1 2 Underground River|C16|1 diff --git a/forge-gui/res/adventure/Shandalar/decks/kavu.dck b/forge-gui/res/adventure/Shandalar/decks/kavu.dck index 0e932e678ce..4dc8ab82a97 100644 --- a/forge-gui/res/adventure/Shandalar/decks/kavu.dck +++ b/forge-gui/res/adventure/Shandalar/decks/kavu.dck @@ -3,7 +3,7 @@ Name=kavu [Main] 2 Canopy Vista|MIC|1 2 Farseek|C19|1 -2 Fiery Justice|PLIST|1 +2 Fiery Justice|MM3|1 2 Fires of Yavimaya|PCA|1 3 Flametongue Kavu|JVC|1 1 Flametongue Yearling|MH2|1 @@ -11,18 +11,18 @@ Name=kavu 3 Forest|MH2|1 4 Forest|MH2|2 4 Grove of the Burnwillows|IMA|1 -1 Healing Technique|C21|2 +1 Healing Technique|C21|1 3 Invigorate|2XM|1 -2 Jetmir's Garden|SNC|2 +2 Jetmir's Garden|SNC|1 3 Kavu Howler|APC|1 2 Kavu Monarch|INV|1 4 Kavu Predator|A25|1 1 Kavu Primarch|TSR|1 4 Mountain|MH2|1 3 Mountain|MH2|2 -2 Punishing Fire|PZ1|1 +2 Punishing Fire|C11|1 2 Raging Kavu|INV|1 2 Ram Through|IKO|1 2 Sacred Foundry|GRN|1 -1 Territorial Kavu|MH2|2 +1 Territorial Kavu|MH2|1 2 Untamed Kavu|DOM|1 diff --git a/forge-gui/res/adventure/Shandalar/maps/map/crawlspace.tmx b/forge-gui/res/adventure/Shandalar/maps/map/crawlspace.tmx new file mode 100644 index 00000000000..27a872e76fe --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/maps/map/crawlspace.tmx @@ -0,0 +1,115 @@ + + + + + + + { + "startBattleWithCard": [ "Crawlspace|C13|1" ], +} + + + + + + eJztlEEOgzAMBM0NfwwhPlo18KuqhWc0VruSiRyokWkvXWmVS+KJNwaiv0o1yr/iWo5UaolG5an9DrdnoktmzXm95vXGazadyB34VfdRYYs7XjuCqzlg4y4WM4Ldv+trjs5gi5vUTHgk5+4VrmSgZ83iYv/g7B29ylwtBXfvm4Jx1iPrLfHGUktWzLmV8cx+pu4ZOdV6WoyMcdej+oRbzlY6kO0Wd0+R/w8PN1Jnc5+JeTWg + + + + + eJxby8LAsHYUo+CZnBA80O5AxkwiEDxQ9lLLbnMuCCbVv5TGRxIHBBPrV2r5WZUdgXGpaRVkYGgThNjXIkgdu4mxV1mIgUFFCGKXEpQGuUUNyJ7GCcHk2onPXlUhhH9h+CBQbBYnbe0Fma8hhGqvBpJfybE3mQOC8am7LcrAoI5mLyiMjbnIsxeEPzFAMD417YKI+AVhTSGIWyhN08RgdL/Sy150N9DbzqGCAQFePTw= + + + + + eJztk1EOgjAMQOs3Gx5gcBa9hUS8hp/iWfQWCB5Lv23jltU6owPcjzZ5YWnGHi1doQCKPz9HrQFOyrPWabwlsssAGmSPtInc5DV2fVav3bwvU3wXebnHuWfw6Ozw6WKKnpT2PMNy5Lzq5z082hEzweuQXn5uF/DyMBFOYmPfI0/P8ivtz6zsOp/7HO3f5vc1zWQf6Q39S5c/IEfl51yGuwOxTt5T6SUWWOdSzNqY3kouOuwN9abJPEPrfFfvt5F3JhXVh30eyg19sWgW + + + + + + + + eJxjYBh8gJEETGt7iXEXrezGZg+17MdnLjY+Ln2U2DuRD7s5+OylBsBnFiMWddSyG2bOV14GBmkezLBGdwM17G1DMkeWB2EvvjDuoNDO3wyo9oDsRQYdDJh+hOFfZNgHM7+Wm4FhDx57QWA9GwPDBiS8kY30cEYPP/QwBeF6boh7qFmGIevBFpcgvJcHNQzQw5mVRvbSoswm1V5aAJi96O6hpZ3o9tICAADo2BAb + + + + + + + + + + + + [ + { + "type": "gold", + "count": 110, + "addMaxCount": 50 + } +] + + + + + [{ + "type": "randomCard", + "count": 2, + "probability": 1, + "colors": [ "colorID" ] +},{ + "type": "randomCard", + "count": 1, + "probability": 1, + "rarity": [ "rare", "mythicrare" ], + "colors": [ "colorID" ] +},{ + "type": "randomCard", + "count": 1, + "addMaxCount": 2 +}] + + + + + [ + { + "type": "gold", + "count": 40, + "addMaxCount": 40 + } +] + + + + + { + "lifeModifier": 4, + "startBattleWithCard": [ "Ensnaring Bridge|2XM|1" ] +} + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/lichsmirror.tmx b/forge-gui/res/adventure/Shandalar/maps/map/lichsmirror.tmx new file mode 100644 index 00000000000..aa4a80b3456 --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/maps/map/lichsmirror.tmx @@ -0,0 +1,136 @@ + + + + + + + { + "startBattleWithCard": [ "Mirror of Life Trapping|CLB|1" ], +} + + + + + + eJxjYBgF6IARCdMTLOdgYHjOiR2v5KCdvV6cEIzsbxD2AIq5c9LXXgYa2guzA2TnYyBeDQzTp2hsatsLsu8F0MxnOMIYhmlhrxsnAoP8h+zfJ1D8lAb2ruFA2IsvD+EKC3LtRbb7GZ6whsUJshspzevo/iYGU6t8IcVuapZr+MIX2U30LkcHouweagAA95omZQ== + + + + + eJzNlN0JwjAUhYNY23QJn5xA0I7gZm5QjTs4guAsPriCqH0wB4m5XNJEkiv48NEf2nw5JyG9Vqr/U4ZJGmnno1HKaA91HadvfuE17HlRe7Yz38dnXo1cVty7bBz4adelftpvymu079v9cyhw3uz1Hpm389J1Buu2zMkdY3m5N2ef7RM9OQf9XtK7ZF3tIpkB7yfXG8qMdQvRWea2702l1LXK865a70UOnnuMi/Wd63yvc9MOv3HDCUq6DvnROfb6k4CzAe9Ogk6+f2NI+lIddBlng0QHpWO8AFO/SIc= + + + + + eJyTEGBgkBiE+DcTA8M2AfxYisp2SgPxTGYGhhYGCG5lQAXNULGtQHWKjNRzg6QAxPw2NgaGdjaEG1qhds4G8pUZIWr2A+l4JogbKLEf5NftUHtV2BkY1rAwYIB1QLGDjAg+zG4QEKfQTkL2wvwOiwOY3aTai24nzF4vVgYGbyB+BcUgtg8rJOyRw7uSHxLXNfzkxSkIyAPtU2CH2BvMgB2rAeVimSDhDbKTVPuw2fsU6J+HrBC7D0NxEgcEw/hH2CF+biUzTrHZuxdopgvQ3udADApGXBjkz2p+SFqnhr0wu+vYIH7GZe9WaJrYSkH+gdkbh2QuzG4lIO3Bih0/YqUsfmuhYYYOQHbHAeO1hQ0Tu1BoJ7LdVTjsRweVULWU2onNfmQMcwst7CMU/4wU5pmBtBcAchl6zg== + + + + + + + + eJxjYBicQFoAQu8A0owMqHiHAO3s3Y5mHzqAiW+jshtg5k4DEtPR8AwoRlYHCwdsbiTFPnT9j3hQ+WZMuPWSay8xAN1eewrsJAUg2wvzZxU/9cz/xI5qProYsji1wCW0sCSUtikFlcDwqoaGWRsB82cyMzCIC1AnTW0VgORfdDlkc2PRxPHldXz2IesB0b9xyOOyg1r2wjAszLGJMeDQR4696BgW5oTEKPUvPjOolW7Jcc9QBQCxBBg8 + + + + + + + + + + + + [ + { + "type": "gold", + "count": 110, + "addMaxCount": 50 + } +] + + + + + [{ + "type": "randomCard", + "count": 2, + "probability": 1, + "colors": [ "colorID" ] +},{ + "type": "randomCard", + "count": 1, + "probability": 1, + "rarity": [ "mythicrare" ], + "colors": [ "colorID" ] +},{ + "type": "randomCard", + "count": 1, + "probability": 0.6, + "rarity": [ "rare", "mythicrare" ], + "addMaxCount": 1 +},{ + "type": "randomCard", + "count": 1, + "probability": 0.5, + "addMaxCount": 2 +}] + + + + + [{ + "type": "randomCard", + "count": 2, + "probability": 1, + "colors": [ "colorID" ] +},{ + "type": "randomCard", + "count": 1, + "probability": 0.8, + "rarity": [ "rare" ], + "colors": [ "colorID" ] +},{ + "type": "randomCard", + "count": 1, + "addMaxCount": 2 +}] + + + + + + { + "lifeModifier": 4, + "startBattleWithCard": [ "Heirloom Mirror|MID|1" ] +} + + + + + + { + "lifeModifier": 3, + "startBattleWithCard": [ "Cathedral Sanctifier|DDQ|1" ] +} + + + + + + + + + + + + + + + + + + + + diff --git a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas index 0f600cb9e19..4d43133f117 100644 --- a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas +++ b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas @@ -325,6 +325,12 @@ Grove WurmPond xy: 224, 400 size: 32, 32 +StonePyramid + xy: 384, 464 + size: 32, 32 +Mine + xy: 96, 144 + size: 32, 32 black_castle xy: 0, 800 size: 64, 64 diff --git a/forge-gui/res/adventure/Shandalar/sprites/monk_3.atlas b/forge-gui/res/adventure/Shandalar/sprites/monk_3.atlas new file mode 100644 index 00000000000..2dfc1b79524 --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/sprites/monk_3.atlas @@ -0,0 +1,68 @@ +monk_3.png +size: 64,96 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +Avatar + xy: 0, 0 + size: 16, 16 +Idle + xy: 0, 16 + size: 16, 16 +Idle + xy: 16, 16 + size: 16, 16 +Idle + xy: 32, 16 + size: 16, 16 +Idle + xy: 48, 16 + size: 16, 16 +Walk + xy: 0, 32 + size: 16, 16 +Walk + xy: 16, 32 + size: 16, 16 +Walk + xy: 32, 32 + size: 16, 16 +Walk + xy: 48, 32 + size: 16, 16 +Attack + xy: 0, 48 + size: 16, 16 +Attack + xy: 16, 48 + size: 16, 16 +Attack + xy: 32, 48 + size: 16, 16 +Attack + xy: 48, 48 + size: 16, 16 +Hit + xy: 0, 64 + size: 16, 16 +Hit + xy: 16, 64 + size: 16, 16 +Hit + xy: 32, 64 + size: 16, 16 +Hit + xy: 48, 64 + size: 16, 16 +Death + xy: 0, 80 + size: 16, 16 +Death + xy: 16, 80 + size: 16, 16 +Death + xy: 32, 80 + size: 16, 16 +Death + xy: 48, 80 + size: 16, 16 diff --git a/forge-gui/res/adventure/Shandalar/sprites/monk_3.png b/forge-gui/res/adventure/Shandalar/sprites/monk_3.png new file mode 100644 index 00000000000..d4f3a845ea2 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/monk_3.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/blue.json b/forge-gui/res/adventure/Shandalar/world/blue.json index c731654e18d..47c3607466f 100644 --- a/forge-gui/res/adventure/Shandalar/world/blue.json +++ b/forge-gui/res/adventure/Shandalar/world/blue.json @@ -28,6 +28,7 @@ "Shell" ], "enemies": [ + "Aether Channeler", "Bird", "Djinn", "Elemental", diff --git a/forge-gui/res/adventure/Shandalar/world/enemies.json b/forge-gui/res/adventure/Shandalar/world/enemies.json index b85fedbf160..aeb325819ba 100644 --- a/forge-gui/res/adventure/Shandalar/world/enemies.json +++ b/forge-gui/res/adventure/Shandalar/world/enemies.json @@ -70,6 +70,79 @@ ], "colors": "UW" }, +{ + "name": "Aether Channeler", + "sprite": "sprites/monk_3.atlas", + "deck": "decks/aether_channeler.dck", + "spawnRate": 1, + "difficulty": 0.1, + "speed": 24, + "life": 12, + "rewards": [ + { + "type": "deckCard", + "probability": 1, + "count": 2, + "addMaxCount": 4, + "rarity": [ + "common", + "basicland" + ] + }, + { + "type": "deckCard", + "probability": 0.5, + "count": 1, + "addMaxCount": 2, + "rarity": [ + "uncommon" + ], + "cardTypes": [ + "Creature", + "Artifact", + "Enchantment", + "Instant", + "Sorcery", + "Land" + ] + }, + { + "type": "deckCard", + "probability": 0.25, + "count": 1, + "addMaxCount": 1, + "rarity": [ + "rare", + "mythicrare" + ], + "cardTypes": [ + "Creature", + "Artifact", + "Enchantment", + "Instant", + "Sorcery" + ] + }, + { + "type": "deckCard", + "probability": 0.1, + "count": 1, + "rarity": [ + "rare" + ], + "cardTypes": [ + "Land" + ] + }, + { + "type": "gold", + "probability": 0.3, + "count": 10, + "addMaxCount": 90 + } + ], + "colors": "WU" +}, { "name": "Amonkhet Minotaur", "sprite": "sprites/warden.atlas", 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 344be964005..3f79f7b970a 100644 --- a/forge-gui/res/adventure/Shandalar/world/points_of_interest.json +++ b/forge-gui/res/adventure/Shandalar/world/points_of_interest.json @@ -1621,10 +1621,29 @@ }, { "name": "Kavu Lair", + "type": "cave", "count": 1, "radiusFactor": 0.8, "spriteAtlas": "maps/tileset/buildings.atlas", "sprite": "Cave", "map": "maps/map/kavulair.tmx" +}, +{ + "name": "Lich's Mirror", + "type": "dungeon", + "count": 1, + "radiusFactor": 0.8, + "spriteAtlas": "maps/tileset/buildings.atlas", + "sprite": "StonePyramid", + "map": "maps/map/lichsmirror.tmx" +}, +{ + "name": "Crawlspace", + "type": "dungeon", + "count": 1, + "radiusFactor": 0.8, + "spriteAtlas": "maps/tileset/buildings.atlas", + "sprite": "Mine", + "map": "maps/map/crawlspace.tmx" } ] \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/world/waste.json b/forge-gui/res/adventure/Shandalar/world/waste.json index 063de353ddf..694c3bd935b 100644 --- a/forge-gui/res/adventure/Shandalar/world/waste.json +++ b/forge-gui/res/adventure/Shandalar/world/waste.json @@ -89,7 +89,9 @@ "CaveC9", "CaveCA", "CaveCB", - "CaveCD" + "CaveCD", + "Crawlspace", + "Lich's Mirror" ], "structures": [ { diff --git a/forge-gui/res/adventure/Shandalar/world/white.json b/forge-gui/res/adventure/Shandalar/world/white.json index 6fb5719e258..a237f818231 100644 --- a/forge-gui/res/adventure/Shandalar/world/white.json +++ b/forge-gui/res/adventure/Shandalar/world/white.json @@ -30,6 +30,7 @@ ], "enemies": [ "Adventurer", + "Aether Channeler", "Archer", "Beastmaster", "Cat",