diff --git a/forge-gui/res/adventure/Shandalar/decks/frog.json b/forge-gui/res/adventure/Shandalar/decks/frog.json new file mode 100644 index 00000000000..4eb9019a96f --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/decks/frog.json @@ -0,0 +1,12 @@ +{ +"name":"Frog", + "template": + { + "count":60, + "colors":["Blue","Black","Green"], + "tribe":"Frog", + "tribeCards":0.5, + "tribeSynergyCards":0.2, + "rares":0.5 + } +} diff --git a/forge-gui/res/adventure/Shandalar/decks/miniboss/toadboss.dck b/forge-gui/res/adventure/Shandalar/decks/miniboss/frogboss.dck similarity index 97% rename from forge-gui/res/adventure/Shandalar/decks/miniboss/toadboss.dck rename to forge-gui/res/adventure/Shandalar/decks/miniboss/frogboss.dck index 8312f1c4a64..da88a9ecf09 100644 --- a/forge-gui/res/adventure/Shandalar/decks/miniboss/toadboss.dck +++ b/forge-gui/res/adventure/Shandalar/decks/miniboss/frogboss.dck @@ -1,5 +1,5 @@ [metadata] -Name=toadboss +Name=frogboss [Avatar] [Main] diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session index 920e56dff99..aedce3aea9a 100644 --- a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session +++ b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session @@ -3,12 +3,12 @@ "height": 4300, "width": 2 }, - "activeFile": "map/tibalt.tmx", + "activeFile": "map/xira.tmx", "automapping.whileDrawing": false, "expandedProjectPaths": [ + "map", "tileset", "obj", - "map", "map/main_story" ], "file.lastUsedOpenFilter": "All Files (*)", @@ -40,7 +40,7 @@ "scale": 3, "selectedLayer": 4, "viewCenter": { - "x": 239.33333333333331, + "x": 240, "y": 136.16666666666663 } }, @@ -1811,6 +1811,17 @@ "y": 320 } }, + "map/grolnok.tmx": { + "expandedObjectLayers": [ + 4 + ], + "scale": 1, + "selectedLayer": 5, + "viewCenter": { + "x": 277, + "y": 131.5 + } + }, "map/grove_1.tmx": { "scale": 1.5, "selectedLayer": 3, @@ -2240,8 +2251,8 @@ "scale": 2, "selectedLayer": 5, "viewCenter": { - "x": 487.5, - "y": 515.75 + "x": 384, + "y": 383.75 } }, "map/main_story/black_castle_f1.tmx": { @@ -2251,8 +2262,8 @@ "scale": 1.7891666666666666, "selectedLayer": 4, "viewCenter": { - "x": 240.33535165346996, - "y": 238.93805309734518 + "x": 240.33535165347, + "y": 239.4969725197951 } }, "map/main_story/blue_castle.tmx": { @@ -2435,8 +2446,8 @@ }, "map/main_story/templeofchandra.tmx": { "expandedObjectLayers": [ - 2, - 7 + 7, + 2 ], "scale": 1.5, "selectedLayer": 5, @@ -2976,9 +2987,9 @@ 4 ], "scale": 2.044479166666666, - "selectedLayer": 0, + "selectedLayer": 4, "viewCenter": { - "x": 239.91440362765582, + "x": 245.05018596830902, "y": 136.22051255922963 } }, @@ -3036,6 +3047,14 @@ "y": 320.5 } }, + "map/swamp_town_generic.tmx": { + "scale": 2.4838541666666667, + "selectedLayer": 0, + "viewCenter": { + "x": 240.35227511008597, + "y": 136.28014258754453 + } + }, "map/teferi.tmx": { "expandedObjectLayers": [ 4 @@ -3054,7 +3073,7 @@ "scale": 5.5, "selectedLayer": 5, "viewCenter": { - "x": 317.8181818181818, + "x": 317.72727272727275, "y": 128.45454545454547 } }, @@ -3065,8 +3084,8 @@ "scale": 3, "selectedLayer": 5, "viewCenter": { - "x": 515, - "y": 264.8333333333333 + "x": 514.5, + "y": 166.83333333333334 } }, "map/tibalt_f2.tmx": { @@ -3074,10 +3093,10 @@ 12 ], "scale": 1.3764204545454546, - "selectedLayer": 0, + "selectedLayer": 4, "viewCenter": { - "x": 176.54489164086687, - "y": 168.18988648090817 + "x": 176.90815273477813, + "y": 168.91640866873067 } }, "map/tileset/buildings.tsx": { @@ -3170,10 +3189,21 @@ "scale": 1.5, "selectedLayer": 4, "viewCenter": { - "x": 240.33333333333331, + "x": 240.66666666666669, "y": 136.33333333333334 } }, + "map/xira.tmx": { + "expandedObjectLayers": [ + 4 + ], + "scale": 2, + "selectedLayer": 2, + "viewCenter": { + "x": 221.5, + "y": 130.75 + } + }, "map/yule_town.tmx": { "scale": 1.5, "selectedLayer": 5, @@ -3199,7 +3229,7 @@ }, "tileset/main.tsx": { "dynamicWrapping": false, - "scaleInDock": 1.5, + "scaleInDock": 2, "scaleInEditor": 1 } }, @@ -3217,25 +3247,27 @@ "map/tibalt.tmx", "map/tibalt_f1.tmx", "map/tibalt_f2.tmx", - "map/aerie_1.tmx", - "map/main_story/black_castle_f1.tmx", - "map/main_story/black_castle.tmx" + "map/grolnok.tmx", + "map/slimefoot_boss.tmx", + "map/xira.tmx", + "map/wurmpond_1.tmx", + "map/swamp_town_generic.tmx" ], "project": "main.tiled-project", "property.type": "string", "recentFiles": [ "map/main_story/templeofchandra.tmx", + "map/tibalt.tmx", + "map/tibalt_f1.tmx", + "map/tibalt_f2.tmx", + "map/grolnok.tmx", + "map/slimefoot_boss.tmx", + "map/swamp_town_generic.tmx", + "map/wurmpond_1.tmx", + "map/xira.tmx", "map/main_story/black_castle.tmx", "map/main_story/black_castle_f1.tmx", - "map/aerie_1.tmx", - "map/tibalt_f2.tmx", - "map/tibalt_f1.tmx", - "map/tibalt.tmx", - "map/main_story/templeofliliana.tmx", - "map/factory_4.tmx", - "map/factory_3.tmx", - "map/factory_2.tmx", - "map/factory_1.tmx" + "map/aerie_1.tmx" ], "resizeMap.removeObjects": true, "textEdit.monospace": true diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grolnok.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grolnok.tmx new file mode 100644 index 00000000000..9e5d254518e --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/maps/map/grolnok.tmx @@ -0,0 +1,143 @@ + + + + + + + { + "startBattleWithCard": [ "Thallid Shell-Dweller","Slimefoot, Thallid Transplant", "Thallid Shell-Dweller" ] +} + + + + + + eJytVFsKxDAIlIVS9mJ79J6rdL9K0HkYhVAwOo6jTUTE7xt/e77vk/kmzmqrb62d+RBuVgPlZjGIz1TPHW2QT50dMhSj5Fd8kN5dc3IzbXYx3VxF287MOnwm8F0uau8O3nX095xhKzEsT+Xl8t15ZzK/0l/Fx8FGvHc4Ke+eMgPEjdVleIxbZUjHKp71pfjf9jn1uSr8GT+mkaJppkWlUXXv7ivj0NEH8VB1RzqqtTqcsp1y/iVnp5w9Uv491rPiV+/VHhzr5EwY0mgan2mkzmRHcxTD8G4RPXek + + + + + eJxbwM7AsGAUw/F/NuqZtRgJD7RbRvHQxQyDwA3IeOEgcMMoHsWjeBQTiys5B8besgGyFxdmIlH9MVZUeiDxJQbsbqMUk2sOtrildziB3ICM6WXvQix209MNgyE9UgMDAG2aMkY= + + + + + eJydl01O5DAQhU2TpAMSK4YzwBwC1kAjLgGsZwWcgGEER4AG+jDAFqkXwAUQP5orMOTRLvymUpVOeFIp6cQuf66yy+kQku7LEO6q600easr79WcHc8m43TTTbTGeGKvXn5jFY4l5vLHlndfmX+HzLM6H8KOypfl2PFZ7jsE0Hs0Cu6qeP1R5eiyTj66SPjKmZvPsOq/z7Md4H87ZLGjzUP7/2+L5joHn10wIu0UyxBzvvBwxb5sYdeVZ6IWwNWuvd0vMu1YmY/U6smDdBBr3Nq+zSP66zO8y9h92zNNQmEgSI+bhOfJeZpvpp7qg1Yt9P9/1m2vB76zef4XWJni4r+bAfITjxPB1rvjOFFcbHp0rrhXCEFRsEVfU8JdZ3986vTvO6rHCtan/ftw70l5ioecs2q58PUV/iJUY9Nfg/UNMwoM2Q8f/lfF8vYFf9BrHFhMGieEb+RipGMn8PSYt+NQxPc7qbXQ9Fj2pvmdqLfHalHHGYcKHenJh7GNh2iTfiJu1ntto5PAMyL91RnMMsVaeY3vJz4CeedqI3KdZmhPHiA1+sd/GDg/uL1Vej7IJx3bLdQWGrdiW+UcGT1N85F7zTNN7kVjgZ+BwWzws1NvPuqjqIHL2XpguXU1jgS4MnnF8h77Yk1/fZgaTJf4+2I3Me0XKt/j0YqPXM0vqTBMTn+kY1zvbYDsNMUX8rDMJ3x23kV/XCT5jmsb1zsnVss4hsfH8X0cWrBuuodp3Vxb+zpK8iuT+p/qmWVZ5fVE8OLvAyWucn4cGDrZRvCJ/co89e5Mn/yvGf4oPICnEOg== + + + + + + + + eJyVlzmPE0EQhcvrOewAVojVhBwSQpCQ2AaJKzc2GRlHhAg3QGhDYv4C16LdRSIEfgAgIQEpPkDalAQkREDMWU/d5a4p93jHJT1N9/T19etjbCIfOdFHflwqiFJO/8uIJqoM7/HuQ0q0zfk261VC9Jr1htXi/I4Syg8nTkdYR1k3Ulfvae7G2PXdd1lTn8aYV1Zd+k4jCPGe2/9iht+ZY3qXuvcn+Zlw/io/r7GuszI1Bp6J57XMwgINC8fS9Sz3EprFxVZZEve53YM85MH/o+k80n7oOd9i/meKVzMjtC/Q/pVy/5uKWeb3OA8exWLITIOm8+o75++2ifpFYLHrJ8w2wAJfZL02fR0w9IvAhb0ClolnEi7LB6/ActkzYZ0OJcGLuXkUwRuJrpL2ZKNdZoHEuyeR/sGK/Q0O0fYCL2IxVWxghcABgeOE9wR7SFjOU1g/Cb3HSK239hixW242m3uqzofmEV8aedkTHf2i3J94C8/+ZIF7UQxVH6hr16ujymR9EJZFz0/mrs/oQ86v5M5X8n2hbMQaq7ZnFNdn1X6q6nQo+BbzRYdmqBvjBWVVfeHMgnHLs4ivIwpztP3+PF7OT2m5GKh7MNYW3oDn7JL91o0xzfth8zEu7AHoW3PvusuG+C0cdh9K9Finvey3wq5LLPT5RTp2T0lgbLv28g37m4U6otZBd9cstW/9maobI/8cqPOP8R6peYCDTL0qpjqeSXutverO0knQJInXqYrYvtLj22cdHsTGMad9WeCK3Vd1QjMs8kavF/bczczJtsH+WU+Xu//OteZZbEwqymZ7Lw9338TUWVffuSom+36z4vzaNnK+xJ8Lfi64/0ZJrNX8ulnv5Sx+WXP5UwfCs2HOu9wnvQpWMLzInFbVORWP9DdMuBZprNI91vMs9K/1ktWJtBeGr804C/a1/c0igTIdqHfbry381+X6uydpfT9/Wiv3Zc/NVh7602tj7y3N9lbxSFvMDb8XML78byGfBg98WPTt+g/yt8bP + + + + + eJzNlsENgzAMRXPoDB2hC5RLN2Q9yAI99tgRWlQMxnKwQz5JnxQlUZD8428MIfyI39HNa5onBmWP4GGcR0ULZ0istRhWLOuc9HRipEDlKIc9PVzzvY6cjZ49bRzpg9c/D9wzyz8PRzTJmDJHntpCcSRGDOt7iUR605Lcuj0jH5x/yYuE95FJm6fnyRqnO71v5Xqot3n7G8UfFW1ITV7fRqaHj5a+a37V6k+t6Oe59Dv5um5nL4i6S2kpBaENpSWF5VuLf7Oz4vf2IwvPCzAwGFlXcp9zz5og3ocPIpQsmw== + + + + + + + + + + + + { "startBattleWithCardInCommandZone": [ "Slimefoot's Boss Effect"] +} + + + + + + + + + + + + + + + + + + + + + + + + + + [ + { + "editions": [ "DMR" ], + "type": "card", + "count": 10, + "rarity": [ "Common" ] + }, + { + "editions": [ "DMR" ], + "type": "card", + "count": 3, + "rarity": [ "Uncommon" ] + }, + { + "editions": [ "DMR" ], + "type": "card", + "count": 3, + "rarity": [ "Rare", "Mythic Rare" ] + } +] + + + + + + + [{ + "type": "randomCard", + "count": 1, + "rarity": [ "rare", "mythic rare" ], + "colors": [ "colorID" ] +},{ + "type": "randomCard", + "count": 4, + "rarity": [ "uncommon" ], + "addMaxCount": 2 +}] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/xira.tmx b/forge-gui/res/adventure/Shandalar/maps/map/xira.tmx index 2f8270fd057..8ebafdf77f2 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/xira.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/xira.tmx @@ -1,83 +1,98 @@ - + - - + + - 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 - - - - - - - - eJzt0MEJg0AQQNGpQGxB+9BeTB+xRQXtIgFTgnMWAuJhBXnvNssc5m8EAAAAAAAAwHVNHdHWd19RTpet/Z/eqYqYq7L3lDJk1+vQ9sn5e3hbcl4f8AfvbBhPdGy583tALwDX7VuXCmE= + eJy1l11uwjAQhHOOEqcSoFyzLQ+cpVyhUlELV+GBYzRWGTEMs44tWkurEsX2fp79iTukrhsme/4H+4sxCN9ysvPiautGJl2PPR7l+77s+/7Uddv+1/LvbOpPuZkJa9je+lufmF/DzfqdpjWb/ur3FPiDrSvn6dl2AXeJL58prwHfKl33ee1/Tf1ibsTn1ujaWj74GEWTvI/OgelcjWm6vCudrYVvTPexZb59ut/f8YEt24H+KmdNDcH3QfJ9RxpxjjKj5hPmp4K9BDGPctH1F/Y3pPs5zBjpVjKnt4v12vjmtayd9nD1sSG2L+Hh56U5G4+dPLNv1o7zTudoTF28tZ+4XHB8pfiyJhHfXK+rtdoR+dbYDkFs5gw1m3MMtYF+inetfE477n+lvsv+UcvoMfobz/tCH3TaOD68R43uTT9jJtjnZB9BHbfEV/Mq5/JRtNuY/sGaOwZ3zui+0cLHGvK3mX1rPsKP4wNXKS8cL/PxvSr67rL/qJbZh6ur6L6h+jDfgc6acytzHg0fa1jTa86LWyb+xkQ5jHngY85S3TJfS6+JcnMuh10ezvGxJlFfcbHTvGzlyyNrwjlTurO7ePDeLnZcP25/jo2rZ/QQp1nUf1lnV7dun+g7jHfb3v/PUhO/URhWQT+r0d7ZGPRB1Gxk0d0OcSyZMkQ+IrZHRqmuovpvGT+EkeM6 - + + + { "startBattleWithCardInCommandZone": [ "Slimefoot's Boss Effect"] +} + + + + - - - + + + + + + + - + [ + { + "editions": [ "LEG" ], + "type": "card", + "count": 10, + "rarity": [ "Common" ] + }, + { + "editions": [ "LEG" ], + "type": "card", + "count": 3, + "rarity": [ "Uncommon" ] + }, + { + "editions": [ "LEG" ], + "type": "card", + "count": 3, + "rarity": [ "Rare", "Mythic Rare" ] + } +] + - + - + [{ + "type": "randomCard", + "count": 1, + "rarity": [ "rare", "mythic rare" ], + "colors": [ "colorID" ] +},{ + "type": "randomCard", + "count": 4, + "rarity": [ "uncommon" ], + "addMaxCount": 2 +}] + - + - + - + - + - - - - - + - + - + - - - - - - + diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.atlas index 2db03e4174c..19f76723d4c 100644 --- a/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.atlas +++ b/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.atlas @@ -61,7 +61,7 @@ Death xy: 64, 40 size: 14, 14 Death - xy: 96, 128 + xy: 96, 40 size: 14, 14 Death xy: 128, 40 @@ -73,5 +73,5 @@ Death xy: 192, 40 size: 14, 14 Death - xy: 224, 128 + xy: 224, 40 size: 14, 14 diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/crab.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/crab.atlas index 800907a0e5b..96d75b4b6a0 100644 --- a/forge-gui/res/adventure/Shandalar/sprites/dungeon/crab.atlas +++ b/forge-gui/res/adventure/Shandalar/sprites/dungeon/crab.atlas @@ -7,29 +7,29 @@ Avatar xy: 10, 87 size: 13, 7 Idle - xy: 0, 0 - size: 32, 32 + xy: 5,22 + size: 22, 10 Idle - xy: 32, 00 - size: 32, 32 + xy: 37, 22 + size: 22, 10 Idle - xy: 64, 00 - size: 32, 32 + xy: 69, 22 + size: 22, 10 Idle - xy: 96, 00 - size: 32, 32 + xy: 101, 22 + size: 22, 10 Walk - xy: 0, 32 - size: 32, 32 + xy: 6, 54 + size: 22, 10 Walk - xy: 32, 32 - size: 32, 32 + xy: 37, 54 + size: 22, 10 Walk - xy: 64, 32 - size: 32, 32 + xy: 69, 54 + size: 22, 10 Walk - xy: 96, 32 - size: 32, 32 + xy: 101, 43 + size: 22, 10 Attack xy: 0, 96 size: 32, 32 diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/firegiant.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/firegiant.atlas index 740e5ca2740..ff5ec56815c 100644 --- a/forge-gui/res/adventure/Shandalar/sprites/dungeon/firegiant.atlas +++ b/forge-gui/res/adventure/Shandalar/sprites/dungeon/firegiant.atlas @@ -4,8 +4,8 @@ format: RGBA8888 filter: Nearest,Nearest repeat: none Avatar - xy: 5, 1 - size: 7, 7 + xy: 3, 0 + size: 10, 10 Idle xy: 0, 0 size: 16, 16 diff --git a/forge-gui/res/adventure/Shandalar/world/enemies.json b/forge-gui/res/adventure/Shandalar/world/enemies.json index fbde0c1549c..40fc49c165f 100644 --- a/forge-gui/res/adventure/Shandalar/world/enemies.json +++ b/forge-gui/res/adventure/Shandalar/world/enemies.json @@ -14,26 +14,10 @@ "type": "deckCard", "probability": 1, "count": 2, - "addMaxCount": 4, + "addMaxCount": 6, "rarity": [ "common", - "basicland" - ] - }, - { - "type": "deckCard", - "probability": 0.5, - "count": 1, - "addMaxCount": 2, - "rarity": [ "uncommon" - ], - "cardTypes": [ - "Creature", - "Artifact", - "Enchantment", - "Instant", - "Sorcery" ] }, { @@ -87,27 +71,10 @@ "type": "deckCard", "probability": 1, "count": 2, - "addMaxCount": 4, + "addMaxCount": 6, "rarity": [ "common", - "basicland" - ] - }, - { - "type": "deckCard", - "probability": 0.5, - "count": 1, - "addMaxCount": 2, - "rarity": [ "uncommon" - ], - "cardTypes": [ - "Creature", - "Artifact", - "Enchantment", - "Instant", - "Sorcery", - "Land" ] }, { @@ -166,7 +133,7 @@ "addMaxCount": 4, "rarity": [ "common", - "basicland" + "uncommon" ] }, { @@ -239,7 +206,7 @@ "addMaxCount": 4, "rarity": [ "common", - "basicland" + "uncommon" ] }, { @@ -312,7 +279,7 @@ "addMaxCount": 4, "rarity": [ "common", - "basicland" + "uncommon" ] }, { @@ -371,61 +338,90 @@ "name": "Armored Knight", "sprite": "sprites/knight.atlas", "deck": [ - "decks/armored_knight.dck" + "decks/armored_knight.dck" ], + "ai": "", + "flying": false, "spawnRate": 1, "difficulty": 0.1, - "speed": 30, - "life": 15, + "speed": 20, + "life": 25, "rewards": [ - { + { "type": "deckCard", "probability": 1, "count": 2, - "addMaxCount": 4, - "rarity": [ - "common", - "basicland" - ] + "addMaxCount": 6 }, { - "type": "deckCard", + "type": "card", "probability": 0.5, "count": 1, - "addMaxCount": 2, "rarity": [ - "uncommon" - ], - "cardTypes": [ - "Creature", - "Artifact", - "Enchantment", - "Instant", - "Sorcery" + "Rare" ] }, { - "type": "deckCard", - "probability": 0.25, + "type": "card", + "probability": 1, "count": 1, - "addMaxCount": 1, "rarity": [ - "rare" + "uncommon", + "common" ], "cardTypes": [ - "Creature", - "Artifact", - "Enchantment", - "Instant", - "Sorcery" + "Land" ] }, { - "type": "deckCard", + "type": "item", "probability": 0.1, "count": 1, + "itemName": "Steel Armor" + }, + { + "type": "gold", + "probability": 1, + "count": 50, + "addMaxCount": 100 + } + ] +}, +{ + "name": "Crab", + "sprite": "sprites/dungeon/crab.atlas", + "scale": 0.9, + "deck": [ + "decks/crab.json" + ], + "ai": "", + "flying": false, + "spawnRate": 1, + "difficulty": 0.1, + "speed": 20, + "life": 11, + "rewards": [ + { + "type": "deckCard", + "probability": 1, + "count": 2, + "addMaxCount": 4 + }, + { + "type": "card", + "probability": 0.5, + "count": 1, "rarity": [ - "rare" + "Rare" + ] + }, + { + "type": "card", + "probability": 1, + "count": 1, + "rarity": [ + "uncommon", + "common" ], "cardTypes": [ "Land" @@ -433,12 +429,11 @@ }, { "type": "gold", - "probability": 0.3, - "count": 10, - "addMaxCount": 90 + "probability": 1, + "count": 50, + "addMaxCount": 100 } - ], - "colors": "RW" + ] }, { "name": "Ashmouth Devil", @@ -1238,7 +1233,7 @@ "ai": "", "flying": false, "spawnRate": 1, - "difficulty": 0.8, + "difficulty": 0.4, "speed": 31, "life": 13, "rewards": [ @@ -1248,12 +1243,6 @@ "count": 2, "addMaxCount": 4 }, - { - "type": "gold", - "probability": 0.7, - "count": 10, - "addMaxCount": 90 - }, { "type": "card", "probability": 0.5, @@ -1266,11 +1255,12 @@ ] }, { - "type": "deckCard", + "type": "card", "probability": 1, "count": 1, "rarity": [ - "rare" + "uncommon", + "common" ], "cardTypes": [ "Land" @@ -1342,16 +1332,10 @@ "count": 2, "addMaxCount": 4 }, - { - "type": "gold", - "probability": 0.7, - "count": 10, - "addMaxCount": 90 - }, { "type": "card", "probability": 0.5, - "count": 3, + "count": 2, "colors": [ "Green" ], @@ -1360,11 +1344,12 @@ ] }, { - "type": "deckCard", + "type": "card", "probability": 1, "count": 1, "rarity": [ - "rare" + "uncommon", + "common" ], "cardTypes": [ "Land" @@ -1536,17 +1521,31 @@ "speed": 23, "life": 18, "rewards": [ - { + { "type": "deckCard", "probability": 1, - "count": 3, - "addMaxCount": 7 + "count": 4, + "addMaxCount": 6 }, { - "type": "gold", - "probability": 0.7, - "count": 10, - "addMaxCount": 90 + "type": "card", + "probability": 0.5, + "count": 1, + "rarity": [ + "Rare" + ] + }, + { + "type": "card", + "probability": 1, + "count": 1, + "rarity": [ + "uncommon", + "common" + ], + "cardTypes": [ + "Land" + ] } ], "colors": "RGB" @@ -2640,7 +2639,6 @@ "type": "item", "probability": 1, "count": 1, - "itemName": "Chicken Egg" } ], @@ -2773,47 +2771,33 @@ "addMaxCount": 4, "rarity": [ "common", - "basicland" - ] - }, - { - "type": "deckCard", - "probability": 0.5, - "count": 1, - "addMaxCount": 2, - "rarity": [ "uncommon" - ], - "cardTypes": [ - "Creature", - "Artifact", - "Enchantment", - "Instant", - "Sorcery" ] }, { "type": "deckCard", - "probability": 0.25, - "count": 1, - "addMaxCount": 1, - "rarity": [ - "rare" - ], + "probability": 1, + "count": 2, + "addMaxCount": 4 + }, + { + "type": "card", + "probability": 0.5, + "count": 3, "cardTypes": [ - "Creature", - "Artifact", - "Enchantment", - "Instant", - "Sorcery" + "Artifact" + ], + "rarity": [ + "Rare" ] }, { - "type": "deckCard", - "probability": 0.1, + "type": "card", + "probability": 1, "count": 1, "rarity": [ - "rare" + "uncommon", + "common" ], "cardTypes": [ "Land" @@ -2821,9 +2805,9 @@ }, { "type": "gold", - "probability": 0.3, - "count": 10, - "addMaxCount": 90 + "probability": 1, + "count": 50, + "addMaxCount": 100 } ], "colors": "RU" @@ -2842,54 +2826,42 @@ "speed": 20, "life": 11, "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" - ] - }, - { - "type": "deckCard", - "probability": 0.25, - "count": 1, - "addMaxCount": 1, - "rarity": [ - "rare" - ], - "cardTypes": [ - "Creature", - "Artifact", - "Enchantment", - "Instant", - "Sorcery" - ] + "addMaxCount": 4 }, { "type": "gold", + "probability": 0.7, + "count": 10, + "addMaxCount": 90 + }, + { + "type": "card", + "probability": 0.5, + "count": 1, + "rarity": [ + "Rare" + ] + }, + { + "type": "card", "probability": 1, - "count": 50, - "addMaxCount": 100 + "count": 1, + "rarity": [ + "uncommon", + "common" + ], + "cardTypes": [ + "Land" + ] } ], "colors": "UB" - }, - { +}, +{ "name": "Curselord", "sprite": "sprites/black_wiz2.atlas", "deck": [ @@ -2902,50 +2874,37 @@ "speed": 31, "life": 20, "rewards": [ - { + { "type": "deckCard", "probability": 1, - "count": 2, - "addMaxCount": 4, - "rarity": [ - "common", - "basicland" - ] + "count": 3, + "addMaxCount": 6 }, { - "type": "deckCard", + "type": "card", "probability": 0.5, - "count": 1, - "addMaxCount": 2, + "count": 4, "rarity": [ - "rare" - ], - "cardTypes": [ - "Enchantment" + "Rare" ] }, { - "type": "deckCard", - "probability": 0.1, - "count": 1, + "type": "card", + "probability": 1, + "count": 3, "rarity": [ - "rare" + "uncomon", + "common" ], "cardTypes": [ "Land" ] }, - { - "type": "card", - "probability": 1, - "count": 1, - "cardName": "Lightning Bolt" - }, { "type": "gold", - "probability": 0.3, - "count": 10, - "addMaxCount": 90 + "probability": 1, + "count": 50, + "addMaxCount": 100 } ], "colors": "RBU" @@ -3279,118 +3238,18 @@ "speed": 24, "life": 11, "rewards": [ - { + { "type": "deckCard", "probability": 1, "count": 2, - "addMaxCount": 4, - "rarity": [ - "common", - "basicland" - ] + "addMaxCount": 4 }, { - "type": "deckCard", + "type": "card", "probability": 0.5, "count": 1, - "addMaxCount": 2, "rarity": [ - "uncommon" - ], - "cardTypes": [ - "Creature", - "Artifact", - "Enchantment", - "Instant", - "Sorcery" - ] - }, - { - "type": "deckCard", - "probability": 0.25, - "count": 1, - "addMaxCount": 1, - "rarity": [ - "rare" - ], - "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": "R" -}, -{ - "name": "Giant Crab", - "sprite": "sprites/dungeon/giant_crab.atlas", - "scale": 0.5, - "deck": [ - "decks/giant_crab.dck" - ], - "ai": "", - "flying": false, - "spawnRate": 1, - "difficulty": 0.4, - "speed": 31, - "life": 15, - "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" - ] - }, - { - "type": "deckCard", - "probability": 0.25, - "count": 1, - "addMaxCount": 1, - "rarity": [ - "rare" - ], - "cardTypes": [ - "Creature", - "Artifact", - "Enchantment", - "Instant", - "Sorcery" + "Rare" ] }, { @@ -3398,9 +3257,21 @@ "probability": 1, "count": 50, "addMaxCount": 100 + }, + { + "type": "card", + "probability": 1, + "count": 1, + "rarity": [ + "uncommon", + "common" + ], + "cardTypes": [ + "Land" + ] } ], - "colors": "U" + "colors": "R" }, { "name": "Dino", @@ -4405,16 +4276,26 @@ "speed": 23, "life": 15, "rewards": [ - { + { "type": "deckCard", "probability": 1, "count": 2, - "addMaxCount": 4, + "addMaxCount": 4 + }, + { + "type": "card", + "probability": 0.5, + "count": 4, "rarity": [ - "common", - "uncommon" + "Rare" ] }, + { + "type": "gold", + "probability": 1, + "count": 50, + "addMaxCount": 200 + }, { "type": "card", "probability": 1, @@ -4426,20 +4307,6 @@ "cardTypes": [ "Land" ] - }, - { - "type": "card", - "probability": 0.5, - "count": 1, - "rarity": [ - "Rare" - ] - }, - { - "type": "gold", - "probability": 0.7, - "count": 10, - "addMaxCount": 90 } ], "colors": "R" @@ -4531,53 +4398,90 @@ "scale": 0.5, "life": 10, "rewards": [ - { + { "type": "deckCard", "probability": 1, - "count": 1, - "rarity": [ - "Common" - ], - "cardTypes": [ - "Creature", - "Artifact", - "Enchantment", - "Instant", - "Sorcery" - ] + "count": 2, + "addMaxCount": 8 }, { - "type": "deckCard", - "probability": 0.25, + "type": "card", + "probability": 0.5, "count": 1, "rarity": [ "Rare" - ], - "cardTypes": [ - "Creature", - "Artifact", - "Enchantment", - "Instant", - "Sorcery" ] }, { "type": "gold", "probability": 1, - "count": 30, + "count": 50, "addMaxCount": 100 }, - { + { "type": "card", - "probability": 0.5, - "count": 2, - "colors": [ - "White" + "probability": 1, + "count": 1, + "rarity": [ + "uncommon", + "common" + ], + "cardTypes": [ + "Land" ] } ], "colors": "W" }, +{ + "name": "Frog", + "sprite": "sprites/dungeon/frog.atlas", + "deck": [ + "decks/frog.json" + ], + "ai": "", + "flying": false, + "spawnRate": 1, + "difficulty": 0.1, + "speed": 15, + "scale": 0.5, + "life": 10, + "rewards": [ + { + "type": "deckCard", + "probability": 1, + "count": 2, + "addMaxCount": 8 + }, + { + "type": "card", + "probability": 0.5, + "count": 1, + "rarity": [ + "Rare" + ] + }, + { + "type": "gold", + "probability": 1, + "count": 50, + "addMaxCount": 100 + }, + { + "type": "card", + "probability": 1, + "count": 1, + "rarity": [ + "uncommon", + "common" + ], + "cardTypes": [ + "Land" + ] + } + ], + "colors": "BGU" +}, { "name": "Frost Titan", "sprite": "sprites/titan.atlas", @@ -4813,43 +4717,55 @@ "scale": 0.5, "difficulty": 1, "speed": 30, - "life": 20, + "life": 25, "rewards": [ { "type": "card", - "probability": 1, + "probability": 0.5, "count": 1, "cardName": "Garruk Wildspeaker" }, { "type": "card", - "probability": 1, + "probability": 0.5, "count": 1, "cardName": "Garruk, Apex Predator" }, { "type": "card", - "probability": 1, + "probability": 0.5, "count": 1, "cardName": "Exploration" }, { "type": "card", - "probability": 1, + "probability": 0.5, "count": 1, "cardName": "Primeval Titan" }, { "type": "card", - "probability": 1, + "probability": 0.5, "count": 1, "cardName": "In Garruk's Wake" }, + { + "type": "card", + "probability": 0.5, + "count": 1, + "cardName": "Elder Gargaroth" + }, + { + "type": "card", + "probability": 0.5, + "count": 1, + "cardName": "Thragtusk" + }, { "type": "gold", "probability": 1, - "count": 100, - "addMaxCount": 900 + "count": 1000, + "addMaxCount": 9000 }, { "type": "item", @@ -5036,6 +4952,55 @@ ], "colors": "B" }, +{ + "name": "Giant Crab", + "sprite": "sprites/dungeon/giant_crab.atlas", + "scale": 0.4, + "deck": [ + "decks/giant_crab.dck" + ], + "ai": "", + "flying": false, + "spawnRate": 1, + "difficulty": 0.4, + "speed": 31, + "life": 15, + "rewards": [ + { + "type": "deckCard", + "probability": 1, + "count": 2, + "addMaxCount": 4 + }, + { + "type": "card", + "probability": 0.5, + "count": 4, + "rarity": [ + "Rare" + ] + }, + { + "type": "gold", + "probability": 1, + "count": 200, + "addMaxCount": 500 + }, + { + "type": "card", + "probability": 1, + "count": 1, + "rarity": [ + "uncommon", + "common" + ], + "cardTypes": [ + "Land" + ] + } + ], + "colors": "U" +}, { "name": "Giant Spider", "sprite": "sprites/spider_2.atlas", @@ -5062,6 +5027,89 @@ ], "colors": "G" }, +{ + "name": "Grolnok", + "sprite": "sprites/dungeon/frogboss.atlas", + "scale": 0.50, + "deck": [ + "decks/miniboss/frogboss.dck" + ], + "boss": true, + "ai": "", + "flying": false, + "spawnRate": 1, + "difficulty": 0.8, + "speed": 31, + "life": 50, + "rewards": [ + { + "type": "deckCard", + "probability": 1, + "count": 4, + "rarity": [ + "rare" + ], + "cardTypes": [ + "Land" + ] + }, + { + "type": "gold", + "probability": 1, + "count": 500, + "addMaxCount": 1000 + }, + { + "type": "card", + "probability": 1, + "count": 1, + "cardName": "Grolnok, the Omnivore" + }, + { + "type": "card", + "probability": 0.50, + "count": 1, + "cardName": "The Gitrog Monster" + }, + { + "type": "card", + "probability": 1, + "count": 1, + "cardName": "Thalia and The Gitrog Monster" + }, + { + "type": "card", + "probability": 1, + "count": 1, + "cardName": "Damnation" + }, + { + "type": "card", + "probability": 1, + "count": 1, + "cardName": "Gitrog, Horror of Zhava" + }, + { + "type": "card", + "probability": 1, + "count": 1, + "cardName": "Froghemoth" + }, + { + "type": "card", + "probability": 1, + "count": 1, + "cardName": "Yargle and Multani" + }, + { + "type": "item", + "probability": 1, + "count": 1, + "itemName": "Grolnok's poisonous skin" + } + ], + "colors": "BGU" +}, { "name": "Gorilla", "sprite": "sprites/dungeon/gorilla.atlas", @@ -5079,68 +5127,36 @@ { "type": "deckCard", "probability": 1, - "count": 1, - "rarity": [ - "Common" - ], - "cardTypes": [ - "Creature", - "Artifact", - "Enchantment", - "Instant", - "Sorcery" - ] + "count": 2, + "addMaxCount": 4 }, { "type": "card", - "probability": 1, - "count": 1, - "cardName": "Silverback Elder" - }, - { - "type": "card", - "probability": 1, - "count": 1, - "cardName": "Kogla, the Titan Ape" - }, - { - "type": "deckCard", - "probability": 0.25, - "count": 1, + "probability": 0.5, + "count": 4, "rarity": [ "Rare" - ], - "cardTypes": [ - "Creature", - "Artifact", - "Enchantment", - "Instant", - "Sorcery" ] }, { "type": "gold", "probability": 1, - "count": 30, - "addMaxCount": 100 - }, - { - "type": "card", - "probability": 0.5, - "count": 2, - "colors": [ - "Red" - ] + "count": 200, + "addMaxCount": 500 }, { "type": "card", - "probability": 0.5, - "count": 2, - "colors": [ - "Green" - ] - } + "probability": 1, + "count": 1, + "rarity": [ + "uncommon", + "common" ], + "cardTypes": [ + "Land" + ] + } + ], "colors": "RG" }, { @@ -9740,6 +9756,90 @@ ], "colors": "WU" }, +{ + "name": "Tibalt", + "sprite": "sprites/dungeon/tibalt.atlas", + "scale": 0.50, + "deck": [ + "decks/miniboss/tibalt.dck" + ], + "boss": true, + "ai": "", + "flying": false, + "spawnRate": 1, + "difficulty": 0.8, + "speed": 31, + "life": 50, + "rewards": [ + { + "type": "card", + "probability": 1, + "count": 1, + "rarity": [ + "rare" + ], + "cardTypes": [ + "Land" + ] + }, + { + "type": "gold", + "probability": 1, + "count": 500, + "addMaxCount": 1000 + }, + { + "type": "card", + "probability": 0.50, + "count": 1, + "cardName": "Valki, God of Lies" + }, + { + "type": "card", + "probability": 0.50, + "count": 1, + "cardName": "Tibalt, Wicked Tormentor" + }, + { + "type": "card", + "probability": 0.50, + "count": 1, + "cardName": "Mayhem Devil" + }, + { + "type": "card", + "probability": 0.50, + "count": 1, + "cardName": "Fiendish Duo" + }, + { + "type": "card", + "probability": 0.50, + "count": 1, + "cardName": "Hellrider" + }, + { + "type": "card", + "probability": 0.50, + "count": 1, + "cardName": "Badlands" + }, + { + "type": "card", + "probability": 0.50, + "count": 1, + "cardName": "Wheel of Fortune" + }, + { + "type": "item", + "probability": 1, + "count": 1, + "itemName": "Tibalt's Box of Tricks" + } + ], + "colors": "R" + +}, { "name": "Treefolk", "sprite": "sprites/treant.atlas", @@ -9755,30 +9855,14 @@ "type": "deckCard", "probability": 1, "count": 2, - "addMaxCount": 4, + "addMaxCount": 6, "rarity": [ "common", - "basicland" - ] - }, - { - "type": "deckCard", - "probability": 0.5, - "count": 1, - "addMaxCount": 2, - "rarity": [ "uncommon" - ], - "cardTypes": [ - "Creature", - "Artifact", - "Enchantment", - "Instant", - "Sorcery" ] }, { - "type": "deckCard", + "type": "card", "probability": 0.25, "count": 1, "addMaxCount": 1, @@ -9793,17 +9877,6 @@ "Sorcery" ] }, - { - "type": "deckCard", - "probability": 0.1, - "count": 1, - "rarity": [ - "rare" - ], - "cardTypes": [ - "Land" - ] - }, { "type": "gold", "probability": 0.3,