diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Slimefoot Boss Effect.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Slimefoot's Boss Effect.fullborder.jpg similarity index 100% rename from forge-gui/res/adventure/Shandalar/custom_card_pics/Slimefoot Boss Effect.fullborder.jpg rename to forge-gui/res/adventure/Shandalar/custom_card_pics/Slimefoot's Boss Effect.fullborder.jpg diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/scarecrow_captain.txt b/forge-gui/res/adventure/Shandalar/custom_cards/scarecrow_captain.txt new file mode 100644 index 00000000000..966591107b5 --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/custom_cards/scarecrow_captain.txt @@ -0,0 +1,11 @@ +Name:Scarecrow Leader +ManaCost:no cost +Types:Enchantment +T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigChoose | TriggerDescription$ At the beginning of your end step, conjure a duplicate of a random creature card from your opponent's library into your hand. The duplicate perpetually becomes an Artifact Scarecrow in addition to it's other types. +SVar:TrigChoose:DB$ ChooseCard | Choices$ Creature.OppCtrl | ChoiceZone$ Library | AtRandom$ True | SubAbility$ DBConjure +SVar:DBConjure:DB$ MakeCard | Conjure$ True | DefinedName$ ChosenCard | Zone$ Hand | RememberMade$ True | SubAbility$ DBClearChosen +SVar:DBClearChosen:DB$ Cleanup | ClearChosenCard$ True | SubAbility$ DBEffect +SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Name$ Scarecrow Captain's Perpetual Effect | SubAbility$ DBCleanup +SVar:PerpetualAbility:Mode$ Continuous | Affected$ Card.IsRemembered | AddStaticAbility$ SpendAnyMana | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command || AddType$ Artifact & Scarecrow | Description$ That duplicate perpetually becomes an Artifact Scarecrow in addition to it's other types. +SVar:SpendAnyMana:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AffectedZone$ Stack | AddHiddenKeyword$ May spend mana as though it were mana of any color to cast CARDNAME | Description$ You may spend mana as though it were mana of any color to cast this spell. +Oracle:At the beginning of your end step, conjure a duplicate of a random creature card from your opponent's library into your hand. The duplicate perpetually becomes an Artifact Scarecrow in addition to it's other types. \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/decks/boar.json b/forge-gui/res/adventure/Shandalar/decks/boar.json new file mode 100644 index 00000000000..d19dd88d4be --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/decks/boar.json @@ -0,0 +1,12 @@ +{ +"name":"Boar", + "template": + { + "count":60, + "colors":["Green"], + "tribe":"Boar", + "tribeCards":1.0, + "tribeSynergyCards":0.2, + "rares":0.4 + } +} diff --git a/forge-gui/res/adventure/Shandalar/decks/bull.dck b/forge-gui/res/adventure/Shandalar/decks/bull.dck new file mode 100644 index 00000000000..f6b8be89980 --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/decks/bull.dck @@ -0,0 +1,30 @@ +[metadata] +Name=bull +[Avatar] + +[Main] +4 Aurochs|ME2|1 +4 Aurochs Herd|CSP|1 +4 Bartered Cow|MB1|1 +4 Bull Aurochs|CSP|1 +4 Earth-Origin Yak|GS1|1 +3 Forest|CST|1 +6 Forest|CST|2 +5 Forest|CST|3 +4 Giant Ox|J22|1 +2 Plains|CST|1 +2 Plains|CST|2 +6 Plains|CST|3 +4 Rimehorn Aurochs|CSP|1 +4 Yoked Ox|ORI|1 +4 Zodiac Ox|PRM|1 +[Sideboard] + +[Planes] + +[Schemes] + +[Conspiracy] + +[Dungeon] + diff --git a/forge-gui/res/adventure/Shandalar/decks/chicken.dck b/forge-gui/res/adventure/Shandalar/decks/chicken.dck new file mode 100644 index 00000000000..9b56fb61932 --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/decks/chicken.dck @@ -0,0 +1,32 @@ +[metadata] +Name=chicken +[Avatar] + +[Main] +4 Battle Screech|J21|1 +4 Chicken Egg|UGL|1 +4 Chicken à la King|UND|1 +4 Disenchant|M20|1 +2 Forest|UGL|1 +2 Island|UGL|1 +4 Jetmir's Garden|SNC|1 +4 Ketria Triome|IKO|1 +2 Mountain|UGL|1 +2 Plains|UGL|1 +4 Robot Chicken|PCEL|1 +4 Roc Egg|C19|1 +4 Rukh Egg|P8ED|1 +4 Shock|M21|1 +4 Spara's Headquarters|SNC|1 +4 Verdant Catacombs|SLU|1 +4 Zodiac Rooster|PRM|1 +[Sideboard] + +[Planes] + +[Schemes] + +[Conspiracy] + +[Dungeon] + diff --git a/forge-gui/res/adventure/Shandalar/decks/gorilla.dck b/forge-gui/res/adventure/Shandalar/decks/gorilla.dck new file mode 100644 index 00000000000..6acfd217449 --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/decks/gorilla.dck @@ -0,0 +1,35 @@ +[metadata] +Name=gorilla +[Avatar] + +[Main] +4 Cinder Glade|SCD|1 +2 Ferocious Tigorilla|IKO|1 +5 Forest|J22|3 +2 Gorilla Chieftain|ALL|1 +3 Gorilla Shaman|MH2|1 +1 Gorilla Titan|ODY|1 +2 Grunn, the Lonely King|DOM|1 +1 Hooting Mandrills|MB1|1 +4 Kibo, Uktabi Prince|J22|1 +4 Kird Ape|EMA|1 +2 Kogla, the Titan Ape|IKO|1 +5 Mountain|J22|3 +2 Ragavan, Nimble Pilferer|MH2|1 +2 Ravenous Baboons|EXO|1 +2 Sheltered Thicket|AKR|1 +4 Silverback Elder|DMU|1 +4 Taiga|OLGC|1 +2 Tree Monkey|9ED|1 +4 Treetop Village|J22|1 +4 Uktabi Orangutan|J22|1 +[Sideboard] + +[Planes] + +[Schemes] + +[Conspiracy] + +[Dungeon] + diff --git a/forge-gui/res/adventure/Shandalar/decks/horse.dck b/forge-gui/res/adventure/Shandalar/decks/horse.dck new file mode 100644 index 00000000000..15fdcd0190b --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/decks/horse.dck @@ -0,0 +1,33 @@ +[metadata] +Name=horse +[Avatar] + +[Main] +4 Armored Warhorse|M12|1 +4 Brightmare|J22|1 +3 Canopy Vista|MIC|1 +4 Crested Sunmare|HOU|1 +4 Diamond Mare|M19|1 +3 Forest|INV|1 +1 Forest|INV|2 +1 Forest|INV|4 +2 Krosan Verge|ONC|1 +4 Mesa Unicorn|JMP|1 +4 Plains|INV|1 +2 Plains|INV|3 +4 Savannah|30A|1 +4 Scattered Groves|AKH|1 +4 Shield Mare|M19|1 +4 Tarpan|ICE|1 +4 Thundering Mightmare|VOC|1 +4 Zodiac Horse|PRM|1 +[Sideboard] + +[Planes] + +[Schemes] + +[Conspiracy] + +[Dungeon] + diff --git a/forge-gui/res/adventure/Shandalar/decks/insect.dck b/forge-gui/res/adventure/Shandalar/decks/insect.dck new file mode 100644 index 00000000000..39e26a1f583 --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/decks/insect.dck @@ -0,0 +1,46 @@ +[metadata] +Name=insect_toxic +[Avatar] + +[Main] +1 Beacon of Creation|5DN|1 +1 Blex, Vexing Pest|STX|1 +2 Broodhatch Nantuko|ONS|1 +1 Crash of Rhino Beetles|C18|1 +2 Crawling Infestation|VOW|1 +2 Disenchant|BRO|1 +1 Forest|STX|1 +1 Forest|STX|2 +1 Grist, the Hunger Tide|MH2|1 +1 Hornet Queen|SCD|1 +4 Indatha Triome|IKO|1 +1 Kathril, Aspect Warper|C20|1 +1 Luminous Broodmoth|IKO|1 +2 Murder|ZNC|1 +2 Nantuko Monastery|DMR|1 +3 Nantuko Slicer|YDMU|1 +2 Nature's Lore|AFC|1 +4 Overgrown Tomb|GRN|1 +4 Phyresis Roach|YONE|1 +1 Phyrexian Swarmlord|ONC|1 +2 Plague Stinger|ONC|1 +1 Plains|STX|1 +4 Sandsteppe Citadel|CM2|1 +2 Scute Mob|C18|1 +2 Scute Swarm|NCC|1 +1 Spring-Leaf Avenger|NEO|1 +2 Swamp|STX|1 +2 Swamp Mosquito|TSB|1 +1 Vishgraz, the Doomhive|ONC|2 +4 Woodland Chasm|KHM|1 +2 Zask, Skittering Swarmlord|J22|1 +[Sideboard] + +[Planes] + +[Schemes] + +[Conspiracy] + +[Dungeon] + diff --git a/forge-gui/res/adventure/Shandalar/decks/scarecrow.dck b/forge-gui/res/adventure/Shandalar/decks/scarecrow.dck new file mode 100644 index 00000000000..364088539af --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/decks/scarecrow.dck @@ -0,0 +1,27 @@ +[metadata] +Name=scarecrow +[Avatar] + +[Main] +3 Ancient Tomb|UMA|1 +3 Colossal Plow|NEC|1 +1 Farmstead Gleaner|MH1|1 +4 Field Creeper|M19|1 +4 Jousting Dummy|JMP|1 +4 Meekstone|30A|1 +4 Scarecrone|JMP|1 +4 Scuttlemutt|JMP|1 +4 Signpost Scarecrow|PLIST|1 +21 Wastes|J22|1 +4 Wicker Witch|SOI|1 +4 Wickerwing Effigy|YMID|1 +[Sideboard] + +[Planes] + +[Schemes] + +[Conspiracy] + +[Dungeon] + diff --git a/forge-gui/res/adventure/Shandalar/decks/scarecrowcaptain.dck b/forge-gui/res/adventure/Shandalar/decks/scarecrowcaptain.dck new file mode 100644 index 00000000000..505f782aaad --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/decks/scarecrowcaptain.dck @@ -0,0 +1,30 @@ +[metadata] +Name=scarecrowleader +[Avatar] + +[Main] +2 All Is Dust|UMA|1 +3 Ancient Tomb|UMA|1 +2 Damnation|PLC|1 +3 Death Cloud|DST|1 +4 Defile|MH1|1 +3 Feed the Swarm|J21|1 +4 Gate of the Black Dragon|HBG|1 +4 Mind Stone|WTH|1 +4 Power Word Kill|AFR|1 +4 Reaper King|SLD|1 +2 Sol Ring|LEA|1 +14 Swamp|SCD|1 +4 Torment of Hailfire|HOU|1 +3 Unearth|ULG|1 +4 Witch's Cottage|ELD|1 +[Sideboard] + +[Planes] + +[Schemes] + +[Conspiracy] + +[Dungeon] + diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session index 4dc9a2b656d..1e6da2c07ff 100644 --- a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session +++ b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session @@ -3,13 +3,13 @@ "height": 4300, "width": 2 }, - "activeFile": "map/maze_3.tmx", + "activeFile": "map/grove_4.tmx", "automapping.whileDrawing": false, "expandedProjectPaths": [ - "tileset", - "obj", + "map", "map/main_story", - "map" + "obj", + "tileset" ], "file.lastUsedOpenFilter": "All Files (*)", "fileStates": { @@ -35,10 +35,10 @@ }, "map/aerie_1.tmx": { "scale": 3, - "selectedLayer": -1, + "selectedLayer": 0, "viewCenter": { - "x": 232.16666666666666, - "y": 167 + "x": 239.83333333333331, + "y": 136.16666666666663 } }, "map/aerie_1B.tmx": { @@ -1513,7 +1513,7 @@ "scale": 1.5, "selectedLayer": 0, "viewCenter": { - "x": 240, + "x": 240.33333333333337, "y": 136.33333333333334 } }, @@ -1553,7 +1553,7 @@ "scale": 1.5, "selectedLayer": 0, "viewCenter": { - "x": 239.66666666666663, + "x": 240.33333333333337, "y": 136.33333333333334 } }, @@ -1741,7 +1741,7 @@ 4 ], "scale": 2.0504166666666666, - "selectedLayer": 3, + "selectedLayer": 4, "viewCenter": { "x": 271.89595610648246, "y": 215.8097947571632 @@ -1797,8 +1797,8 @@ "scale": 1.5, "selectedLayer": 3, "viewCenter": { - "x": 255.99999999999997, - "y": 104 + "x": 240.33333333333337, + "y": 136.33333333333334 } }, "map/grove_10.tmx": { @@ -1925,56 +1925,59 @@ "scale": 2, "selectedLayer": 0, "viewCenter": { - "x": 240, - "y": 136 + "x": 239.75, + "y": 136.25 } }, "map/grove_3.tmx": { "scale": 2, "selectedLayer": 2, "viewCenter": { - "x": 240, - "y": 136 + "x": 239.75, + "y": 136.25 } }, "map/grove_4.tmx": { - "scale": 1.5, + "expandedObjectLayers": [ + 4 + ], + "scale": 2, "selectedLayer": 3, "viewCenter": { - "x": 239.66666666666663, - "y": 136.33333333333334 + "x": 239.75, + "y": 136.25 } }, "map/grove_5.tmx": { "scale": 2, "selectedLayer": 0, "viewCenter": { - "x": 240, - "y": 136 + "x": 239.75, + "y": 136.25 } }, "map/grove_6.tmx": { "scale": 2, - "selectedLayer": 0, + "selectedLayer": 3, "viewCenter": { - "x": 240, - "y": 136 + "x": 239.75, + "y": 136.25 } }, "map/grove_7.tmx": { "scale": 2, "selectedLayer": 3, "viewCenter": { - "x": 240, - "y": 136 + "x": 239.75, + "y": 136.25 } }, "map/grove_8.tmx": { "scale": 1.5, "selectedLayer": 0, "viewCenter": { - "x": 239.99999999999997, - "y": 136 + "x": 240.33333333333337, + "y": 136.33333333333334 } }, "map/grove_9.tmx": { @@ -1984,8 +1987,8 @@ "scale": 1.5, "selectedLayer": 4, "viewCenter": { - "x": 245.66666666666666, - "y": 115 + "x": 240.33333333333337, + "y": 136.33333333333334 } }, "map/island_town.tmx": { @@ -2025,7 +2028,7 @@ "scale": 2.177083333333333, "selectedLayer": 2, "viewCenter": { - "x": 239.54066985645935, + "x": 239.54066985645937, "y": 136.19138755980865 } }, @@ -2456,8 +2459,8 @@ "scale": 1, "selectedLayer": 3, "viewCenter": { - "x": 232, - "y": 137 + "x": 240.5, + "y": 136.5 } }, "map/maze_3.tmx": { @@ -2477,43 +2480,49 @@ } }, "map/merfolkpool_1.tmx": { + "scale": 2, + "selectedLayer": 2, + "viewCenter": { + "x": 239.75, + "y": 136.25 + } + }, + "map/merfolkpool_2.tmx": { "scale": 4, - "selectedLayer": 4, + "selectedLayer": 3, "viewCenter": { "x": 239.875, "y": 135.875 } }, - "map/merfolkpool_2.tmx": { - "scale": 1, - "selectedLayer": 4, - "viewCenter": { - "x": 240, - "y": 136.5 - } - }, "map/merfolkpool_3.tmx": { - "scale": 1.5, - "selectedLayer": 4, + "scale": 4, + "selectedLayer": 1, "viewCenter": { - "x": 240, - "y": 136.33333333333334 + "x": 239.875, + "y": 135.875 } }, "map/merfolkpool_4.tmx": { - "scale": 1.5, + "expandedObjectLayers": [ + 4 + ], + "scale": 2, "selectedLayer": 3, "viewCenter": { - "x": 240, - "y": 136.33333333333334 + "x": 239.75, + "y": 136.25 } }, "map/merfolkpool_5.tmx": { - "scale": 1, - "selectedLayer": 4, + "expandedObjectLayers": [ + 4 + ], + "scale": 3, + "selectedLayer": 3, "viewCenter": { - "x": 240, - "y": 136.5 + "x": 239.83333333333331, + "y": 136.16666666666663 } }, "map/merfolkpool_6.tmx": { @@ -2596,10 +2605,10 @@ 4 ], "scale": 1.5333593749999999, - "selectedLayer": 3, + "selectedLayer": 4, "viewCenter": { "x": 319.88587150354107, - "y": 208.36602639221485 + "y": 209.01818922912318 } }, "map/nest_blue_1.tmx": { @@ -2861,6 +2870,17 @@ "y": 135.5 } }, + "map/scarecrow_farm.tmx": { + "expandedObjectLayers": [ + 4 + ], + "scale": 3, + "selectedLayer": 0, + "viewCenter": { + "x": 263.8333333333333, + "y": 191.83333333333331 + } + }, "map/skullcave_1.tmx": { "scale": 2, "selectedLayer": 0, @@ -2919,7 +2939,7 @@ "scale": 1.6011458333333333, "selectedLayer": 4, "viewCenter": { - "x": 239.5159716348969, + "x": 240.1405243640622, "y": 136.46477132262055 } }, @@ -2952,7 +2972,7 @@ }, "map/teferi.tmx": { "scale": 3, - "selectedLayer": 3, + "selectedLayer": 4, "viewCenter": { "x": 239.83333333333331, "y": 136.16666666666663 @@ -2982,7 +3002,7 @@ }, "map/vampirecastle_2.tmx": { "scale": 4, - "selectedLayer": 2, + "selectedLayer": 3, "viewCenter": { "x": 239.875, "y": 135.875 @@ -3074,7 +3094,7 @@ }, "tileset/main.tsx": { "dynamicWrapping": false, - "scaleInDock": 1.5, + "scaleInDock": 1, "scaleInEditor": 1 } }, @@ -3089,13 +3109,6 @@ "map.width": 90, "openFiles": [ "map/jacehold.tmx", - "map/fort_6.tmx", - "map/fort_5.tmx", - "map/fort_4.tmx", - "map/fort_3.tmx", - "map/factory_1.tmx", - "map/factory_2.tmx", - "map/factory_3.tmx", "map/forest_town_generic.tmx", "map/fort_9.tmx", "map/kiora_island.tmx", @@ -3104,11 +3117,6 @@ "map/lavaforge_2.tmx", "map/garruk.tmx", "map/grove_4.tmx", - "map/slime_hive.tmx", - "map/slimefoot_boss.tmx", - "map/nahiri.tmx", - "map/cave_14.tmx", - "map/teferi.tmx", "map/swamp_town.tmx", "tileset/main.tsx", "map/snowabbey_2.tmx", @@ -3116,23 +3124,40 @@ "map/vampirecastle_2.tmx", "map/catlair_1.tmx", "map/cave_13.tmx", - "map/maze_3.tmx" + "map/maze_3.tmx", + "map/maze_2.tmx", + "map/grove_6.tmx", + "map/scarecrow_farm.tmx", + "map/aerie_1.tmx", + "map/evilgrove_1.tmx", + "map/grove_1.tmx", + "map/grove_2.tmx", + "map/grove_3.tmx", + "map/grove_5.tmx", + "map/grove_7.tmx", + "map/grove_8.tmx", + "map/grove_9.tmx", + "map/merfolkpool_1.tmx", + "map/merfolkpool_2.tmx", + "map/merfolkpool_3.tmx", + "map/merfolkpool_4.tmx", + "map/merfolkpool_5.tmx" ], "project": "main.tiled-project", "property.type": "string", "recentFiles": [ "map/jacehold.tmx", - "map/fort_6.tmx", - "map/fort_5.tmx", - "map/fort_4.tmx", - "map/fort_3.tmx", - "map/factory_1.tmx", - "map/factory_2.tmx", - "map/factory_3.tmx", "map/forest_town_generic.tmx", "map/fort_9.tmx", "map/kiora_island.tmx", - "map/kobold_mine.tmx" + "map/kobold_mine.tmx", + "map/lavaforge_1.tmx", + "map/lavaforge_2.tmx", + "map/garruk.tmx", + "map/merfolkpool_5.tmx", + "map/merfolkpool_4.tmx", + "map/merfolkpool_3.tmx", + "map/merfolkpool_2.tmx" ], "resizeMap.removeObjects": true, "textEdit.monospace": true diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grove_4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grove_4.tmx index 2b361cf1990..a68f5c7226f 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/grove_4.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/grove_4.tmx @@ -1,15 +1,10 @@ - + - - - - eJztlWEOgyAMhft/zxMsXmw7i9u5AL3bJNjsSagMs+gfX0IK6aNfTdSKfPXsRDxEHl3ac8zzLeIaJfVI8Y601+iQeJzfYnisV4B9J/qDwVVp3mXPzKxg1C9xmfmrHOqsGrdvZO7RxW3njrN/arzzD65+10dz9+jinseN7+b7djzXo8we5vNrWVZf7NnyWXNB2VxjpH+w1Rd7eGYN1If6LOXzy2OdYzYzazXyWlEfbFNAdQ== - - + eJyrZWFgqB3Fo3gUj+JRPIpH8YjAADIiAQ4= @@ -25,7 +20,7 @@ - eJydVVFOwzAMtZCQNrW3aKETQoJD7DQ9CExiIMGNuo2O3YhPYjWPPoyTMJ5krbM9v2fHa1oR6WXC+mJ6hj1UIle1yHWwrp7j7P+vaS2JPKPMgH8fcg7B3uuJD2Z5m5gHawu8QE+cQ+wJftamfv2+NzzQhdyPAjfXtdj57m+gd9Y8UizH3ZtaKQ3nAjuS4kYOa1U09Lxy6g7m+zF+djKfkUL78Lj/0p+dCYM5LFaUY/eQ63aZ+i09vy5E3hZpXZiFzuwUny0v+r3NcGL+0HW3FLlfZn5AuEnwstZj1F7aY443yawZ2pvHq367J965W5937ql9Sc3Z21lF6sxT+VYX9s7yboL/JcZ4Zrb/EnI7+Xnpv8+HeuI+5/8CXd5cWbPGvfO13FxHubbBnqvfsVQcOdCpvW4L9xe4oVPzdzGG2qPhRb2n6ufMcGdyjZwN8cw3Tn5H95e+Rx5NDnTjrshxfgEAQ2tW + eJydVUFOw0AMtJA4Jb9IIBXiGbwmD4FKFP6UFlL4UY+slR0yGHuXMJLVxLY8Y6+b7UVklAUPV8sz7LERuWlFbpMN7Rpn/39Na0nmmWUF/KeU85bsvV34YJa3y3mwvsILjMQ55Z7gZ23q1/eT4YEu5H5UuLmuxdF3fwO9s+aZYiXu0dSKNGwFdiTiRg5rVXT0vHPqTub9nH8HWc9IoX143H/pz86EwRwWO8qxe8h1h0L9foMuzEJn9pmfLS/6vS/UxfxLuiLcBbys9Zy11/aY412YtUJ783jVb/fEO3fr88492pdozt7OKqLZRvlWF/bO8u6T/zXHeGa2/xpKZ3+59r/nU7twb/m/QJc3V9asce98LTfXUa5DspfmdyyKIwc6tddD5f4CN3Rq/jHHUHs2vKj33PycGe5MrlGyKZ/53skf6P7S78iTyYFu3BUlzi/cwWmy @@ -34,5 +29,21 @@ + + + + + + + + + + + + + + + + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_1.tmx index 5b1b47d639a..466a4931ae5 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_1.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_1.tmx @@ -1,23 +1,18 @@ - + - - - - eJzFlVEOgyAQBfmHnoB4sfYspeeyxbvVTd30uT6pxKKTEAGzDLAKzq1zuzj3DJ9yhTr2b3lXg8S/wrcdx3o3teWZ/Pyd0kFd6MOyjyHjWSfz9mHbuu7+t5f59pJPcAql/LZyCmv5belUmHcY+x5+2f9P2F4fsd5I9lra8SRva5j3iPyyf1jOmlbuDOcZo+SWcy5Xzkti0obzUbFudeq8MuQpmrtHYzGmhmG6a5Kf75MW9OJ6cG61ThzDFuti32gpl5Y3seJGkA== - - + - eJzr42Rg6BuE+BgrBNPLvgXsEAyzF8QmVS+5enBhbP6HuQ0dU8tObHbjspMW9pKCB8LOgbQXn92j9o7aSwt7ibGbXPeRW3ZQWt7QslzHZj8peumFARMCPzI= + eJzr42Rg6BuE+BgrBNPLvgXsEAyzF8QmVS+5etAxDGDzP0hMjhmCSbUXn50grMgKwbBwQLYTXZ5W9pIiT4mdg8FeXHbjkyPFXmR7SMFD1V5SwnKg7cWlj1b2EsKUpGlS3EesnfjsprS8oWW5js1+UvTSCwMAMOsgoA== - eJy9VUFOw0AMNJRDWNRXVKB+hyMUOHNpTpQrN4R4Ah+Bz3BGabmHFiHhUddi4uxGyYGMtIq06/HYjr1bFSKrqUgZRO702xdnal8p9/ZE5LPozwNMx/jPx83zpfpeTESudD3q2flh28eT7n843ftp038KyNPin4e/fejd6HrT9Rq1zU9Jdoh5TrVCrNeRCw7bAqtMLMb5mjT367hv/jwWdG7cH7JbF/v/sQxprtdL4f1gr22x53isi3rgX26Kdj9899BkbZ+fR021QR9A1xaAPuib61BwzjYD3HdDch2COtEPFdX5v3QBztn391i6PEeIYSxdgGdpTF1gFrW3enbZoX2hZy9H3TYpPOi87RzHZtmQ0gYPeuCiPtuoz6sLPlebY8zSjOrN2rlYPSyWXLxeF/c5tPGelKHtZ5e41z02cRbRp1wLrwfAl71d0M29V7m3Yx3vnNPQfgM9zDfs7c3D//oFRbpnUw== + eJy9lbFOAzEMhg0B6RrUh0AVqBM8CyO0MLP0JsrKhhCP0BeBl2FG17IxlBYh4V8Xqz4nOQ6Q+ktW1ST2Z+fipCqIpn2i0hPd8G9XHfP6in2vD4jeiu5+kHDE/7HXnJ9w7JEjGrPd89zZbhzjgcdfDfe234yfEuqU/Id+Mw7eFdsz21Ngp+Ig56HaK+R6GXzhU/rm+mkmF/H5cM3xJf8/3K9t7GK/kZoX3y+1bl7U32Pi076Wl9LLTs2W3HN+mov9wLdcFPF5+OzA1Oz3orZcrku32RucA3DFIJyDrrVayd7mpGuWHtDn7je1prg5tq5ZVKl9/itXs3PSNdvzvS2u7iPksC0upHvpP9yfZLnQILBXPHfRwj7nudle+5qU7rjf1sZHelmUYsMPPPhif07YToNhHNYmW6v0MXppoPZbs3O5Wq1czNf5Wi7uc7DxnpQ+jrNO3OtWi9CLOKfil+JBiCVvF7i59yr3dszDnXPk4zfQSmJjvbx5+F7footnNw== @@ -25,7 +20,7 @@ - eJzFlWsOwjAIgEl7Qh+LeiinyfSaWo1zf4VEEkTY6mMrCVlKGR/QBABeZRUAthHghN9dfNc9asK7i1Lyp7ta+JHosxbirVEr1DtqF2w/GeusmCQz4z/LxkzmUYwDxjg6+Vl8r5YhbivyzuF9Ih6TpIn5Nf6T23c3Nntq7hS5lOKWZGtGqXrneN6MzCbGAnUpOHXGvPmVVz3n0tWor6/ub98iiTnozVOvbmJafeJc2S5zYzvttVsY7ifvJK6bYyWnT9qu+5rDlHE6kT/vY4vbCi75671svSfLA3PgUBw= + eJzFlW0OgjAMhud2D0/jBfwg6qEEE/WaBozIX9tsTcrSjmEEmjRkpdvztoTVmL4drTEXZ8wTnpXzXthxjnuuzp9Xuv46NuSdwr4PeGflPG5b6z2OSXkak3hY5x20PRR9Q1wtT7IW4k1gpnhr5z31frPKY6LdXH6NYy3FzenVVOy5uXNoWYq7JDvnP5+Du4P1eWI2MvbgB8YpE3fnv3hFuJdeQn2pun/9FjW7B7XZoNWNTKlPpJXiXBvFca697XA/aSZR3XRWrfQpjsd9zWHyczqmn+axxG0ZF/Npf6Po5PYFQiZGyQ== @@ -42,12 +37,12 @@ - + - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_2.tmx index 1240a752e58..6458b3e1423 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_2.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_2.tmx @@ -1,23 +1,18 @@ - + - - - - eJy1lFEOgyAQRPkXT0C8WD1L7bna4t3aTbpxXGcBSzsJH4Lw3NnBEI6axxAecT8uMOete/Ot0v1MCc6c4n7+SfbczXslnse0srWKrkMIy3vchu25xC3VeEbJeJGdM+fxN0ypK5MeeP2dGvwvKcVjlpDr9beHqVwmPJcx1rhl4F9c5rX0luW/l4v1JOK1PHt7a9IsMWGPPW5NXnZKdx197OG2Su8k9o55In2oZUu54iv7B+OwvNr/z2NrD2WN+cWk/8rWO2rZmBtZyyYrWLvuLWWtxl4+36s+sVyy2vXbvhWy0a8a94xeNEZbgw== - - + - eJzr42Rg6BuE+BgrBNPLvgXsEAyzF8QmVe8DBtL14MPY/A9zGzIG2UuM3cTYic1ubHbCwona9hLjLmLspaadpIQzLe3FZzct7CXGz6P2Dr34beNEtZPSNI1LDbodyLiNgnKSkB589pJbRhOrB91+Yv1JbwwA6nRIuw== + eJzr42Rg6BuE+BgrBNPLvgXsEAyzF8QmVe8DBtL14MPY/A9zGzIG2UuM3cTYic1ubHbCwona9hLjLmLspaadpIQzLe3FZzct7CXGz6P2Dr34beNEtZPSNA1To8iKwOj+QsdtFJSThPTgs5fcMppYPej2E+tPemMAaWRHOA== - eJy9lbFOw0AMhl2VIQnqAzBXIF6JFjKzNBPpyoYQj8CLlJfpXKVlh5RW4n7VVhzHh1Ip4pdOke7O/myfL1clROWEqMiInsL3PyScKrAfL4ne0vb6IsQyHxPdh/GSdu1jWk7a/q1PqODvTfjeZs06eHkYH2GsmC1+iow60gyJ9TDu7isjNX1g3rex+eL5nH1azdU6bI+Guw01/UyafK2t5Xlaj05sid2zW5n4UA+c5Y75Wj89mJqdR2oDXYW5vcr5NT1xZUDog7659tWRfelao4fQw7rvzsn1XK7tr0rVeWiuPl/d6/YuDM2FvFqXJoahudJXlgvpuzQUF7z3i4bpcaEps+uwNvuDfcf+7B6ZlwHeUtXyedTlyl0WeWzYiT/Up3Y4Xj6xXOUeI7apqrdmg7l3YvWEGLx4PS7eAbA3Sbu/a3VG3hugteO7KH0qdfBqAF8b3g9uLIfY27Hlf8618hOT+MZ+efNwXr+7hW38 + eJy9lbFOw0AMhl2VIQnqAzBXIAZeCAqdWchEurIhxCP0RcrLMFdp2SGBStyv2Irj+FAqRfySFel858/n8+XKhKiYEeUZ0WP4/oeEUwb2/SnRa9r1P4RcFlOi22DPaX99TKtZN76NCeX8vQjfy6z1g7cM9hZsw2yJk2fUk2ZIrj/T/rwiUtM75n2ZNZ88vuSYVgvlx9qD4e5CTT+Sdr92reV5ep80bMndW7cx+aEeOMs987W+BzA1+yprzMv1LIzVas8vacMVg9AHQ/c6VAeOpWuNHkIP6747Zq/Hcm1/larOY3P1+epet3dhbC7k1bowOYzNlb6yXEjfpbG44K1PWqbHhebMroLv5g/2Ncezc2RcDLyVquXTpM+Vuyzy2Fgn8VCfyvhrp1+1rE/uMXKbq3prNpi1k6sn5Obl63HxDoC9Tbr9Xakz8t4ArT3fRelTqbdXA8Ta8nxwY3uIvR07/uecqzgxSWzMlzcP5/UL2zxrzA== @@ -25,7 +20,7 @@ - eJy9leEOgkAIx9ndE1o566Gytuo1y1zm12CLDRGuy6ls7PRk/O7PTQAYWhUAjhHgjuspjv2M3uC3p3KKp2+1iCPT72RFGPL26CX6G70P4BrneiimZ4WTqxI8ynHFHLdEHs0nppdbcje47kRcJ86dw/vHmMn31wruJeZrnMrtjPtL1Wgu9pLaUly56ucluZqzBtfjrKV5babFoX/5sDCbGFvVM+qY7nFz8MpvX2oNfSndU++C5wfPGEufp5uYVp34rLwvz8b71BdfP2YGGc8k1s25GqdOel/XNYcp8/Rh3M8tbie4FK/nsnWfbB8wBVhJ + eJy9lVEOgjAMhpvtxXAY41VQCHoo0US9piIRebVNbCxlnWiAJs1gNP34u6wF6FrhAPYe4Irrwff9iF7ht7tyiqdvpYgj0+9kqevytug5+hO9dWAa57oppmWpkasQPMpxxhyXSB7NJ6aVW3LXuGYirhH/PYT3izGTz68W3JMfrvFfbhM4v1iNxmJPqS3Glat+npKrOXNwLc5cmudmhjh0l3cTs4mxUT2j9PEeNwYvf/elOqAvplvWaJngXFh8fJXYXJ4fPGNC+izdxAzVSerJ1D3hfeqLjy8zg4xnEuvmXJVRJ72v6zqEKfO0rt/PQ9xGcClez+XQebK9AL0kW6M= @@ -35,17 +30,17 @@ - + - + - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_3.tmx index cbb18a20bbe..2ec46631d54 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_3.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_3.tmx @@ -1,15 +1,10 @@ - + - - - - eJzFlWEKgzAMhftfPYF4sXmWsXPV6d3cWB97ZDVNjLBAUUJ9X9q82nlIaent40bz5+E3x3lNY3o9PTGS9rO8j6SBfEvjDFdqy1osGh7uvUtprXwDrlXLwwUT/Xl0n/xKfbuay0zs51T6yp7a+m89UW6NiT7mwmW2ZR0trsZESLZlzS0uvMtnr+bXLM7mFjxHZ/3+rjXKtXqFmdH/RqZ909gepoUr2UfhYVq5YC/KvCO/RblXxz+53ruXo3XPamMHaextcA== - - + eJzr42Rg6BvFVMEPGKhn1jFWCF7ATpy9lNoNswsfprafibETl92U2EusndjsJtdeUu1EthcWv6TaTY6duOymt73khDU17KRXHGOzk5ppGmQWLjvb0NIUNcstXBjdvjY62jWQfqWlPynBADEUPkU= @@ -17,7 +12,7 @@ - eJzNlWsKwjAMxwMb2O0aw8c3zzOV3UePoGfyHKLz+6Yi2LAWs5r1Mar4h3xoaPpL0hfAp84CYJv17SSYiV8Qsud5x1vkv2HG0kXmPJU5X5lecT6b1glAJW2TuOfO8vc+mZzCs4ea1ypeo8aVIw/N3mV9P5cLx2wd9TUWNp4V81zqPtjqfnj01MU2ZdsDlE+tVM+AuUN7EMpEhdSs2eY99e0vVSlj7iPiqG4yfp8CrDzXicE0+ZRdMvmg75DGY1I2stB0TZzvn4TvZei7GEP6vhQDbzUnzLUWXUytYpaTcDb9W32Y5j+M/OMILmXjGi+QZ0Qd + eJzNlVkKwjAQhgdaMM01isuTep2qeB89gp7Jc4jWB8GHVkUwQxuaxkmalCj+MBSGTL9ZsgB86sQANknbjoxY+AUhe8wr3oT/hhlKZ5HzUOR8IXpF+WxaRgBrYauoe+2IN3PSOaljDyWvrHmF+N5YY6Y8JHubtP1ULhSz7KivsPQA94q+L2UfbHU/HXraxdZlmwHKpVZVL4+1phn4MlE+NUu2fk5d+6sqEzGPHnGq7iJ+FwMsHP8TgqnzVXZG5IO+fRyOKTUVM7iyyubc7Psn4X3pey+GkDwvqeGupoS55qyKyeuY2cCfrb6tLkz9HUb+oQdXZeM/3puZREU= @@ -25,7 +20,7 @@ - eJy9lTEOwjAMRR0xICqxwsR9uAydCFyKkQluwR16CwZiwVctyzYhrXhSFaDN//muE4iI8pqo74iOZQR78rmsxs/nz/hYEm0S0bZcuzT+biF9LA6df0/r8vdr8buV6558fWj2gbYGOnoO57c8nov3yLUAOcgqn4vqLZH5MQe+El3DWv1Wvr1TRvZNK9CwMoOTsZZhurXrC7+aGrQyON7/QOby9o/s5alAS+bNFWuYC/aV+yU6j+b29cB60P9Wj9ci57Ke9v21j736RHm8ezqXtW+j9XnnXHRWSrzequ059Gl01mktL0/031ELtGVd+X29AM7CMRI= + eJy9lT0OwjAMhV0xICqxwsQVEMfgMnSicClGJrgFd+gtGEgET32ybBPaik+q0r+8Z7tOKiLSLkWaWuSYRrAXn8uiPz9/xsdcZFWJrNOxqfr7Fuxjcaj9Z1o3X1+T3y0d98rXh2YTaGugo+fk/C2P5+w95lqANsiV34vqzXD+mANfRtewVH8o375phvtmKNCwcgYnI5ZuvLXrC7+SGgylc7z/AeflrR/u5bFAi/NtC2KYiuzL6yXaj6b29UA86H+rxzVbintH5zw362nfX/vYq0+Uj/dM52Wt2yg+b5+L9krG663SnkOfRnud1vLyif4dpUCb65q/1wu8fTGE @@ -34,11 +29,21 @@ - - + + + + + + + + + + + + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_4.tmx index 616554c4e33..63ffcba653e 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_4.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_4.tmx @@ -1,15 +1,10 @@ - + - - - - eJzFlWEOgyAMhfkvnsDsYnKWxXPh9G4bMS82FUtrSdaEGJvSr9AHpDGENerHTOLTePzPLEdq5Czxr9/XYhPJ/YmnD0b9Uo4nXJ67VktP7nsIYavMAVeby8IFE/1ZhsO/kb715lIm9rPMm5jO9njW4+XWmOhjjlc9a9bR4kpMGGdr1tziQrv07NX0mtnZ3J3n6KneS61erlYrlOm9NzLZN4ltYWq4nH1nFqaWC/YqxN3pzcvtbf/kWt9eaq13Vhpf8KhsSw== - - + eJzr42Rg6BvFVMEPGKhn1jFWCF7ATpy9lNoNswsfprafibETl92U2EusndjsJtdeUu1EthcWv6TaTY6duOymt73khDU17KRXHGOzk5ppGmQWLjvb0NIUNcstXBjdvjY62jWQfqWlPynBADEUPkU= @@ -17,7 +12,7 @@ - eJzNlWsKwjAMxwMb2O0aw8c3zzOV3UePoGfyHKLz+6Yi2LAWs5r1Mar4h3xoaPpL0hfAp84CYJv17SSYiV8Qsud5x1vkv2HG0kXmPJU5X5lecT6b1glAJW2TuOfO8vc+mZzCs4ea1ypeo8aVIw/N3mV9P5cLx2wd9TUWNp4V81zqPtjqfnj01MU2ZdsDlE+tVM+AuUN7EMpEhdSs2eY99e0vVSlj7iPiqG4yfp8CrDzXicE0+ZRdMvmg75DGY1I2stB0TZzvn4TvZei7GEP6vhQDbzUnzLUWXUytYpaTcDb9W32Y5j+M/OMILmXjGi+QZ0Qd + eJzNlVkKwjAQhgdasM01isuT9TpV8T56BD2T5xCt762KYIY2OI2TNClR/CEvw0y+WbIAfOqcAGzT7joljOMXhOypaHgz8RtmKF1kzmOZ85XpFWezaRUBbORaR/2+E/Gek87JHHuoeHXLqwjXlodi79KuncuFY9Y99VUWNp4V/VyqPtjqfjj0tI+tyzYDlEutVE8PX9MMfJkon5oVW7+nrv2lKmTMfUAc1U3G72OApeM+IZg6n7ILJh+0HeJwTKW5nEHeroUw2/5J+F76voshpO5LZnirOWGuZdLElG1MPvJn07/Vhan/w8g/DuBSNu7xAkfnPrk= @@ -25,7 +20,7 @@ - eJy9VUkOwjAMnIoDohJXOPEfPkNPFD7FkRP8gj/0FxyIBaNaVuymixgpSpu0M2PXTgGg3QJNDZzTTBzh47bpr6+/+bUGdhWwT+NQ9es5aJ0cTrW/Z3nl/p70Hmk8K5+fnE3AbUEe+47EL3vW53v1nSUXRBvEqp+L8q2h45d3xAN1Naw3jz/K9RgMfVOBrpupIEcuZuKS8dLNl3Z1qVeSg6noHO1/QMfl9Y+u5bkgl463HfCwVB1TV/fLktwa3vmRA/2w/llzU7zp/hA+qzu2jj0PUTzenu3dXN9G/rxzjutDPeTVd+l/g3UanXWWy4sn+neUgtw6r/K9PkX5M9w= + eJy9lT0OwjAMhR0xAJVYYeI+XIZOBC7FyAS34A49ASsDscpTLSt20hbxSVHapnn+qZ0SEcUNUdsQndIMDmRzXQ/Xl+/8XBJtA9EujX0YnueQdnIcG3tN6/L9Ldm7p/EItj40W0dbAx29h+PnNe3ne9HPnAsQnVjle16+JTJ+3sM+wK5E+2bpe7l+rfpRQ+mbMrJupgKNXMzgnPGlm2/atAt7NTmYSmfY/gcyLqt/ZC3PBVoy3ljwwavjsbBd2S+/1JZY50cO+IP6R81N8U32B+tpu2Pr2PLBi8da072b61vPP+ucw/NSD1n1XfvfQJ16Z53WsuLx/h21QFvmlb/XB8AKNdI= @@ -34,11 +29,22 @@ - + + + + + + + + + + + + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_5.tmx b/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_5.tmx index 3901edb4a9f..4b052d34ca4 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_5.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_5.tmx @@ -1,15 +1,10 @@ - + - - - - eJzFlVEOwyAIQP2vPYHZxeZZmp3Lrr1bZ1oyxhBwmIzENKHAQ0TJcwhr/Fx3Rsf9yzNvnwV/sL+9vlSK4gOxn5dvQjGwviXVnuNqPjR2it+5jOQuUwgb4wNca6weLjCh1o/p1G/oDEZzMRPqWf0S6ak9vvPxcjkmnGO5uJht2YfGlZgglG3Zs8aF3sX3iOtXfO8qf3feo1/7vebq5Vp7BTO970ZBdZPYPUwLl7Jb0sO0coG9CnatfvNyR8s/udKc5GYgFm3OSusAnMlx9A== - - + eJzr42Rg6BvFVMEPGKhn1jFWCF7ATpy9lNoNswsfprafibETl92U2EusndjsJtdeUu1EthcWv6TaTY6duOymt73khDU17KRXHGOzk5ppGmQWLjvb0NIUNcstXBjdvjY62jWQfqWlPynBADEUPkU= @@ -17,7 +12,7 @@ - eJzNlWsKwjAMxwMb2O0aw8c3zzOV3UePoGfyHKLz+6Yi2LAWs5r1Mar4h3xoaPpL0hfAp84CYJv17SSYiV8Qsud5x1vkv2HG0kXmPJU5X5lecT6b1glAJW2TuOfO8vc+mZzCs4ea1ypeo8aVIw/N3mV9P5cLx2wd9TUWNp4V81zqPtjqfnj01MU2ZdsDlE+tVM+AuUN7EMpEhdSs2eY99e0vVSlj7iPiqG4yfp8CrDzXicE0+ZRdMvmg75DGY1I2stB0TZzvn4TvZei7GEP6vhQDbzUnzLUWXUytYpaTcDb9W32Y5j+M/OMILmXjGi+QZ0Qd + eJzVlVkKwjAQhgdaMO01isuD4Hmq4n30CHomzyFa31sVwQxNMB2nWUoU/CEEQibfLMkE4FNnAbDNuuMkmI1fELKnecub5b9hxtJF+jyWPl+ZXHFrNq0SgI0c68S9d5K/60Q5hWcONa9RvFrOc2Vr80Ozd1l3nfOFYzaO+GoLG+8KvZc6D7a4Hx45dbGpbDVA+cRq6hmwt68GoUxUSMyaTd+pb35NldLmPsDO1E3a71OApec5MZiUb7JLxh9cO6TxmP8s7JehfTGG9Hspeno1J/S1Eq1NpWwWo3C2+bf6MOk/jPzjAK7JxjNeu4A9Jw== @@ -25,7 +20,7 @@ - eJy9lT0OwjAMhY0AISqxwgDcp5dpB0TJpRhhAG6BuAK3YCBW+4RJ7SjQwidZafPjF7tOSkRUzYjKjGjrW0e1LQdEC8VW3tbegGva64Ro3szhcUc2rGNx8mvP3o6Bcd9F8cvvBzFu+S+yui2z9pgznuEnXLOf6hqPYd1yLkAViVXOyxV9DTmONdCVFMGe8/aUXol9U8B56wp8aDGDnbKXe3dpUxd6KTn4lruh/Q9kXNr5YWQtdwW+ZLxVwh76gnXleQnP0i91LbAf1L9W46nItewv1P20jpGf2+i9PxaPNRbGpZ3bcH+b8evZuudid6XEqi2tX+oC1Gnsrgt9WfmO/TtSgW+ZV/5eT3ZqOko= + eJy9lV0OAUEMxysIJvHKA66AY+xldh/E2kt55AG3EFfYE3j1YJrdRlU7GRa/pJk1H/233c4CAMiHAJkDWPuxgMomLYCxYlNvM29EUY/nHsCo3oPrBdigjsXBnz162wvDuZPiF3/v2LrlP3XVmLnXtcJ4Jj/yzHaga9za1Yi1IPJArnxfouhr8HU6Q7qcVMScvG6J4tqP2xd6pwTWrSnkQ8uZ2CixlM2lTV3Si6nBp5SG9j/geWn3B+G93BTyxfPNI2L4FqjL74u8S7/UtaB4qP9lj899jIvals6ek2fRn9R9t4+pPpfO83woH2tN5qXdWxnfqvt4tr5zoW8lx+otbZ7rEtSnoW+d9GXVO/TfEQv55nXF93UH+kk9DQ== @@ -35,7 +30,12 @@ - + + + + + + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/scarecrow_farm.tmx b/forge-gui/res/adventure/Shandalar/maps/map/scarecrow_farm.tmx new file mode 100644 index 00000000000..c7a809204d8 --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/maps/map/scarecrow_farm.tmx @@ -0,0 +1,125 @@ + + + + + + + + + + + + + eJxjYKAfCGSlo2V43EANd4jyI7ADH/luoTYg1S3UcgOyvddwmCnOghtTC8DMwuWGgQDU9N8oGAXkAMNBkB8GgxtGASooYIfgwQBgbsGFR8EoGAVDCwAAAuYKwA== + + + + + eJzVkzEKwzAMRZVSAqU5QrderWuPkLXn6D2y5FLdiweDEFL6JdmYBv5iW/rPP/J6JloB7eTXZ8aE+KMc/Azq72Gove9LLgOLvXpYvui/2G5+f9n/V/bPi13LGawsvAzaWcnA+8qa1xVjKNxa5pF3oNVEctDWW71LhF96yXeWYZB7cm40z+jdLQ5vXf2yPKVOY+D9rDwqB68hY+8x9cnhiIvE2vsUY+Br2n6rWeiRQ5Shx91QlXnjDEfzh/RqkUP2PlmGTI+sRs8j18gcevp7+o7O4J/0BfndS/U= + + + + + eJxjYCAOLGMlUiENATXcsIyJcjeAsDIP5W4Z6iCXkzT1X9kG1g3o9n9RxI2JAdtYERgGCjUZGNaKEu8mUt0AswtE32VGiGcrMzBMJNLd1AIwN2xDy5ftZJjVLM3A0IIDE3IDCHuJQfi67AwM/WwIfIadtm5ATgOwcEjnQMiD0gMyyKKBG7CBQ4wItgobglZBygO43EItN8BACBsEg4AeBwTjAtjclEVAHhm0ceMWR5YLRnITKW6hFGBzny4HIlzwhQ0lYDIBNyADUDmpSyW3gMwC4Slo7iDkBmSQR0IZj81cmBtgGAZ2sEBoKSC9iwW//YTcAEtf6OmMEAhlxc7G5gZCgFw3fAHaK43H/+huANHvB6g9iOwGUtLFKBgYAADMGFns + + + + + + + + eJy9lbtvE0EQxjfE57soR0FBEuyKBPlF7EhI/AG0dEiho09AlFQ0gHgnJHEgEjRIVLQUCYYeBLJARGnpAAUKnjEPQcd82h3d3HrXPoWIkT7t3d7tzG9m5/ZagVKtDFoOlbo67FfbPJ+I/fqVd8/D/0d69on0mfQln40Ba10MLo5DQ3r+/i6lZgbcDNdp/RxpnnQj9NfiO/HdChP9oftJGpdoPBXpWAdV2upmBAObXQ/4LtP6CqlKqkW992OOfM2TrpB+5nX+YEEs3MPAccJcn9lN7BaXiyGrwFChNdU4zfAjr/PEHNcdcX9bdWOthP/G8IzWPDcMU+NpBuZgIV+8088aPWrPOpvTej2Y+FcqqcNN0p7BbiHfa/TedKk3A/wtWX14uKjH4ZpSMWmRYjXC9BoY+vFkpHvSpXrofyYFf3VPLcoUv1JL8j1Ce/BkQMdHfpjbLCj13qEPBf38IuVzychnpdhdCwj2iMajI0rNRjovaS93mAG1mKZ8m6EWM8BwLmyY3toQPdY2TE/N/eY2GeT3zvVoWjVBLTj2FvGMBVrVIT3uC9IsMOzVTJSNgb93e08mo/Q3w3FxjXpBYIDxc2Y5oLqZ5LxtpTgRGB6aOIumzgthEhM6nk/Wtq3+kKySiQ017Dgk42+Z/9UU5b9G58GoR61cwuDqEx8T7htRt7gPOD7yR/xO0O2T7ViQrsOrcS3JIpk4FnJbN/N8xmCUjJw/4i/vT3zYOTLDrDifcIYxi08yNox5ZE2kfzu2vMY7j3NpLtTkDX2Pbz16V3Dvb8vyw/5lPFkP2IO9ac7bZaXulLMxYN3d2F1Tad8Cdx+OkUbMteyVVYq/lpHhqxUPewGGLP+ULHrR5//UJK3mdI3XrX2V59h2dbmo63COxvMeXSjqeNhbZrgX/38G1z53dpAB/4Z+DLLHeTw9odRfR6Z21g== + + + + + + + + + + + + + + + + + + + + + + { "startBattleWithCardInCommandZone": [ "Scarecrow Leader"] +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas index a5e8412b8d7..c6efbc292d6 100644 --- a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas +++ b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas @@ -582,4 +582,7 @@ red_castle size: 64, 64 final_castle xy: 128, 864 - size: 64, 64 \ No newline at end of file + size: 64, 64 +farm + xy:351, 0 + size: 33,33 \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/maps/tileset/main.png b/forge-gui/res/adventure/Shandalar/maps/tileset/main.png index 154d640c262..93cd16fb7fe 100644 Binary files a/forge-gui/res/adventure/Shandalar/maps/tileset/main.png and b/forge-gui/res/adventure/Shandalar/maps/tileset/main.png differ diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/boar.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/boar.atlas new file mode 100644 index 00000000000..587b7f68cae --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/sprites/dungeon/boar.atlas @@ -0,0 +1,68 @@ +boar.png +size: 256,192 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +Avatar + xy: 100, 146 + size: 11, 9 +Idle + xy: 00, 11 + size: 32, 20 +Idle + xy: 32, 11 + size: 32, 20 +Idle + xy: 64, 11 + size: 32, 20 +Idle + xy: 96, 11 + size: 32, 20 +Walk + xy: 0, 41 + size: 32, 20 +Walk + xy: 32, 41 + size: 32, 20 +Walk + xy: 64, 41 + size: 32, 20 +Walk + xy: 96, 41 + size: 32, 20 +Walk + xy: 128, 41 + size: 32, 20 +Walk + xy: 160, 41 + size: 32, 20 +Walk + xy: 192, 41 + size: 32, 20 +Walk + xy: 224, 41 + size: 32, 20 +Attack + xy: 0, 64 + size: 32, 32 +Attack + xy: 32, 64 + size: 32, 32 +Attack + xy: 64, 64 + size: 32, 32 +Attack + xy: 96, 64 + size: 32, 32 +Death + xy: 0, 96 + size: 32, 32 +Death + xy: 32, 96 + size: 32, 32 +Death + xy: 64, 96 + size: 32, 32 +Death + xy: 96, 96 + size: 32, 32 \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/boar.png b/forge-gui/res/adventure/Shandalar/sprites/dungeon/boar.png new file mode 100644 index 00000000000..fdbc3889406 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/dungeon/boar.png differ diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/bull.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/bull.atlas new file mode 100644 index 00000000000..cf8e48ea75c --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/sprites/dungeon/bull.atlas @@ -0,0 +1,89 @@ +bull.png +size: 256,160 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +Avatar + xy: 20, 10 + size: 12, 13 +Idle + xy: 0, 7 + size: 32, 25 +Idle + xy: 32, 7 + size: 32, 25 +Idle + xy: 64, 7 + size: 32, 25 +Idle + xy: 96, 7 + size: 32, 25 +Idle + xy: 128, 7 + size: 32, 25 +Idle + xy: 160, 7 + size: 32, 25 +Idle + xy: 192, 7 + size: 32, 25 +Walk + xy: 0, 41 + size: 32, 25 +Walk + xy: 32,41 + size: 32, 25 +Walk + xy: 64, 41 + size: 32, 25 +Walk + xy: 96, 41 + size: 32, 25 +Walk + xy: 128, 41 + size: 32, 25 +Walk + xy: 160, 41 + size: 32, 25 +Walk + xy: 192, 41 + size: 32, 25 +Walk + xy: 224, 41 + size: 32, 25 +Attack + xy: 0, 96 + size: 32, 32 +Attack + xy: 32, 96 + size: 32, 32 +Attack + xy: 64, 96 + size: 32, 32 +Attack + xy: 96, 96 + size: 32, 32 +Attack + xy: 128, 96 + size: 32, 32 +Attack + xy: 160, 96 + size: 32, 32 +Attack + xy: 192, 96 + size: 32, 32 +Attack + xy: 224, 96 + size: 32, 32 +Death + xy: 0, 128 + size: 32, 32 +Death + xy: 32, 128 + size: 32, 32 +Death + xy: 64, 128 + size: 32, 32 +Death + xy: 96, 128 + size: 32, 32 \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/bull.png b/forge-gui/res/adventure/Shandalar/sprites/dungeon/bull.png new file mode 100644 index 00000000000..73b12a89e01 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/dungeon/bull.png differ diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.atlas new file mode 100644 index 00000000000..2db03e4174c --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.atlas @@ -0,0 +1,77 @@ +chicken.png +size: 239,51 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +Avatar + xy: 133, 4 + size: 9, 7 +Idle + xy: 0, 0 + size: 14, 14 +Idle + xy: 32, 0 + size: 14, 14 +Idle + xy: 64, 0 + size: 14, 14 +Idle + xy: 96, 0 + size: 14, 14 +Walk + xy: 0, 21 + size: 14, 14 +Walk + xy: 32, 20 + size: 14, 14 +Walk + xy: 64, 20 + size: 14, 14 +Walk + xy: 96, 20 + size: 14, 14 +Walk + xy: 128, 20 + size: 14, 14 +Walk + xy: 160, 20 + size: 14, 14 +Walk + xy: 192, 20 + size: 14, 14 +Walk + xy: 224, 20 + size: 14, 14 +Attack + xy: 160, 0 + size: 14, 14 +Attack + xy: 192, 0 + size: 14, 14 +Attack + xy: 224, 0 + size: 14, 14 +Death + xy: 0, 40 + size: 14, 14 +Death + xy: 32, 40 + size: 14, 14 +Death + xy: 64, 40 + size: 14, 14 +Death + xy: 96, 128 + size: 14, 14 +Death + xy: 128, 40 + size: 14, 14 +Death + xy: 160, 40 + size: 14, 14 +Death + xy: 192, 40 + size: 14, 14 +Death + xy: 224, 128 + size: 14, 14 diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.png b/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.png new file mode 100644 index 00000000000..4507c72ffdb Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.png differ diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/gorilla.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/gorilla.atlas new file mode 100644 index 00000000000..7641ad1e6c3 --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/sprites/dungeon/gorilla.atlas @@ -0,0 +1,83 @@ +gorilla.png +size: 768,640 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +Avatar + xy: 278, 214 + size: 22, 19 +Idle + xy: 10,27 + size: 38,37 +Idle + xy: 74,27 + size: 38,37 +Idle + xy: 138,27 + size: 38,37 +Idle + xy: 202,27 + size: 38,37 +Walk + xy: 0, 64 + size: 64, 64 +Walk + xy: 64, 64 + size: 64, 64 +Walk + xy: 128, 64 + size: 64, 64 +Walk + xy: 192, 64 + size: 64, 64 +Attack + xy: 0, 320 + size: 64, 64 +Attack + xy: 64, 320 + size: 64, 64 +Attack + xy: 128, 320 + size: 64, 64 +Attack + xy: 192, 320 + size: 64, 64 +Attack + xy: 256,320 + size: 64, 64 +Attack + xy: 320, 320 + size: 64, 64 +Attack + xy: 384, 320 + size: 64, 64 +Attack + xy: 448, 320 + size: 64, 64 +Attack + xy: 512, 320 + size: 64, 64 +Attack + xy: 576, 320 + size: 64, 64 +Attack + xy: 640, 320 + size: 64, 64 +Attack + xy: 704, 320 + size: 64, 64 +Death + xy: 0,512 + size: 64, 64 +Death + xy: 64, 512 + size: 64, 64 +Death + xy: 128, 512 + size: 64, 64 +Death + xy: 192, 512 + size: 64, 64 +Death + xy: 256, 512 + size: 64, 64 \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/gorilla.png b/forge-gui/res/adventure/Shandalar/sprites/dungeon/gorilla.png new file mode 100644 index 00000000000..a491d242899 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/dungeon/gorilla.png differ diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/horse.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/horse.atlas new file mode 100644 index 00000000000..8c0d9cd8d58 --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/sprites/dungeon/horse.atlas @@ -0,0 +1,56 @@ +horse.png +size: 511,256 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +Avatar + xy: 297, 224 + size: 16, 14 +Idle + xy: 10,28 + size: 47, 35 +Idle + xy: 74, 28 + size: 47, 35 +Idle + xy: 138, 28 + size: 46, 36 +Idle + xy: 202, 28 + size: 46, 36 +Walk + xy: 8, 156 + size: 46, 36 +Walk + xy: 72, 156 + size: 46, 36 +Walk + xy: 136, 156 + size: 46, 36 +Walk + xy: 200, 156 + size: 46, 36 +Walk + xy: 264, 156 + size: 46, 36 +Walk + xy: 328, 156 + size: 46, 36 +Walk + xy: 392, 156 + size: 46, 36 +Walk + xy: 456, 156 + size: 46, 36 +Attack + xy: 0, 192 + size: 64, 64 +Attack + xy: 64, 192 + size: 64, 64 +Attack + xy: 128, 192 + size: 64, 64 +Attack + xy: 192, 192 + size: 64, 64 \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/horse.png b/forge-gui/res/adventure/Shandalar/sprites/dungeon/horse.png new file mode 100644 index 00000000000..0348dd926d0 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/dungeon/horse.png differ diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/insect.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/insect.atlas new file mode 100644 index 00000000000..eb6b96c2bf6 --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/sprites/dungeon/insect.atlas @@ -0,0 +1,62 @@ +insect.png +size: 192,160 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +Avatar + xy: 78, 42 + size: 9, 11 +Idle + xy: 4, 7 + size: 23, 18 +Idle + xy: 36, 7 + size: 23, 18 +Idle + xy: 68, 7 + size: 23, 18 +Idle + xy: 100, 7 + size: 23, 18 +Walk + xy: 4, 36 + size: 23, 23 +Walk + xy: 68, 36 + size: 23, 23 +Walk + xy: 68, 36 + size: 23, 23 +Walk + xy: 100, 36 + size: 23, 23 +Attack + xy: 0, 64 + size: 32, 32 +Attack + xy: 32, 64 + size: 32, 32 +Attack + xy: 64, 64 + size: 32, 32 +Attack + xy: 96, 64 + size: 32, 32 +Death + xy: 0, 96 + size: 32, 32 +Death + xy: 32, 96 + size: 32, 32 +Death + xy: 64, 96 + size: 32, 32 +Death + xy: 96, 96 + size: 32, 32 +Death + xy: 128, 96 + size: 32, 32 +Death + xy: 160, 96 + size: 32, 32 \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/insect.png b/forge-gui/res/adventure/Shandalar/sprites/dungeon/insect.png new file mode 100644 index 00000000000..6ec3132f5e4 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/dungeon/insect.png differ diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrow.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrow.atlas new file mode 100644 index 00000000000..d99bc975603 --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrow.atlas @@ -0,0 +1,26 @@ +scarecrow.png +size: 44,420 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +Avatar + xy: 9, 149 + size: 24, 23 +Idle + xy: 0, 0 + size: 44, 70 +Idle + xy: 0, 70 + size: 44, 70 +Idle + xy: 0, 140 + size: 44, 70 +Idle + xy: 0, 210 + size: 44, 70 +Idle + xy: 0, 280 + size: 44, 70 +Idle + xy: 0, 350 + size: 44, 70 \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrow.png b/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrow.png new file mode 100644 index 00000000000..46c73a36d46 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrow.png differ diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrowcaptain.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrowcaptain.atlas new file mode 100644 index 00000000000..8452aff3e4d --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrowcaptain.atlas @@ -0,0 +1,26 @@ +scarecrowcaptain.png +size: 44,420 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +Avatar + xy: 2, 214 + size: 36, 28 +Idle + xy: 0, 0 + size: 44, 70 +Idle + xy: 0, 70 + size: 44, 70 +Idle + xy: 0, 140 + size: 44, 70 +Idle + xy: 0, 210 + size: 44, 70 +Idle + xy: 0, 280 + size: 44, 70 +Idle + xy: 0, 350 + size: 44, 70 \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrowcaptain.png b/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrowcaptain.png new file mode 100644 index 00000000000..5e9ae57c161 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrowcaptain.png differ diff --git a/forge-gui/res/adventure/Shandalar/sprites/items.atlas b/forge-gui/res/adventure/Shandalar/sprites/items.atlas index 4524cc54767..10369f3f331 100644 --- a/forge-gui/res/adventure/Shandalar/sprites/items.atlas +++ b/forge-gui/res/adventure/Shandalar/sprites/items.atlas @@ -350,4 +350,14 @@ BlueRobes size: 16, 18 Armory xy: 129,512 - size: 14, 17 \ No newline at end of file + size: 14, 17 +HorseHoove + xy: 80,496 + size: 17, 16 +PirateFlag + xy: 0,495 + size: 18, 17 +Scyte + xy: 288,977 + size: 18, 14 + \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/world/black.json b/forge-gui/res/adventure/Shandalar/world/black.json index dca50af2b11..0dd649d3b21 100644 --- a/forge-gui/res/adventure/Shandalar/world/black.json +++ b/forge-gui/res/adventure/Shandalar/world/black.json @@ -56,7 +56,9 @@ "Skeleton Soldier", "Vampire", "Zombie", - "Zombie Lord" + "Zombie Lord", + "Insect", + "Curselord" ], "pointsOfInterest": [ "Black Castle", diff --git a/forge-gui/res/adventure/Shandalar/world/enemies.json b/forge-gui/res/adventure/Shandalar/world/enemies.json index 084e277de5a..5db88a71284 100644 --- a/forge-gui/res/adventure/Shandalar/world/enemies.json +++ b/forge-gui/res/adventure/Shandalar/world/enemies.json @@ -1226,6 +1226,64 @@ } ], "colors": "U" + +}, +{ + "name": "Boar", + "sprite": "sprites/dungeon/boar.atlas", + "scale": 0.55, + "deck": [ + "decks/boar.json" + ], + "ai": "", + "flying": false, + "spawnRate": 1, + "difficulty": 0.8, + "speed": 31, + "life": 13, + "rewards": [ + { + "type": "deckCard", + "probability": 1, + "count": 2, + "addMaxCount": 4 + }, + { + "type": "gold", + "probability": 0.7, + "count": 10, + "addMaxCount": 90 + }, + { + "type": "card", + "probability": 0.5, + "count": 3, + "colors": [ + "Green" + ], + "rarity": [ + "Rare" + ] + }, + { + "type": "deckCard", + "probability": 1, + "count": 1, + "rarity": [ + "rare" + ], + "cardTypes": [ + "Land" + ] + }, + { + "type": "gold", + "probability": 1, + "count": 50, + "addMaxCount": 100 + } + ], + "colors": "G" }, { "name": "Boggart", @@ -1264,6 +1322,63 @@ ], "colors": "GR" }, +{ + "name": "Bull", + "sprite": "sprites/dungeon/bull.atlas", + "scale": 0.65, + "deck": [ + "decks/bull.dck" + ], + "ai": "", + "flying": false, + "spawnRate": 1, + "difficulty": 0.8, + "speed": 31, + "life": 13, + "rewards": [ + { + "type": "deckCard", + "probability": 1, + "count": 2, + "addMaxCount": 4 + }, + { + "type": "gold", + "probability": 0.7, + "count": 10, + "addMaxCount": 90 + }, + { + "type": "card", + "probability": 0.5, + "count": 3, + "colors": [ + "Green" + ], + "rarity": [ + "Rare" + ] + }, + { + "type": "deckCard", + "probability": 1, + "count": 1, + "rarity": [ + "rare" + ], + "cardTypes": [ + "Land" + ] + }, + { + "type": "gold", + "probability": 1, + "count": 50, + "addMaxCount": 100 + } + ], + "colors": "G" +}, { "name": "Cat", "sprite": "sprites/lion.atlas", @@ -1488,6 +1603,35 @@ ], "colors": "GW" }, +{ + "name": "Chicken", + "sprite": "sprites/dungeon/chicken.atlas", + "scale": 0.50, + "deck": [ + "decks/chicken.dck" + ], + "ai": "", + "flying": false, + "spawnRate": 1, + "difficulty": 0.8, + "speed": 31, + "life": 8, + "rewards": [ + { + "type": "card", + "probability": 1, + "count": 3, + "cardName": "Zodiac Rooster" + }, + { + "type": "card", + "probability": 1, + "count": 2, + "cardName": "Chicken Egg" + } + ], + "colors": "WG" +}, { "name": "ClayGolem", "sprite": "sprites/golem_2.atlas", @@ -3853,6 +3997,87 @@ ], "colors": "G" }, +{ + "name": "Gorilla", + "sprite": "sprites/dungeon/gorilla.atlas", + "scale": 0.55, + "deck": [ + "decks/gorilla.dck" + ], + "ai": "", + "flying": false, + "spawnRate": 1, + "difficulty": 0.8, + "speed": 31, + "life": 30, + "rewards": [ + { + "type": "deckCard", + "probability": 1, + "count": 1, + "rarity": [ + "Common" + ], + "cardTypes": [ + "Creature", + "Artifact", + "Enchantment", + "Instant", + "Sorcery" + ] + }, + { + "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, + "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" + ] + }, + { + "type": "card", + "probability": 0.5, + "count": 2, + "colors": [ + "Green" + ] + } + ], + "colors": "RG" +}, { "name": "Mammoth", "sprite": "sprites/dungeon/mammoth.atlas", @@ -5249,6 +5474,44 @@ ], "colors": "BU" }, +{ + "name": "Horse", + "sprite": "sprites/dungeon/horse.atlas", + "deck": [ + "decks/horse.dck" + ], + "spawnRate": 1, + "difficulty": 0.1, + "speed": 30, + "scale": 0.5, + "life": 14, + "rewards": [ + { + "type": "deckCard", + "probability": 1, + "count": 2, + "addMaxCount": 4 + }, + { + "type": "gold", + "probability": 0.7, + "count": 10, + "addMaxCount": 90 + }, + { + "type": "card", + "probability": 0.5, + "count": 2, + "colors": [ + "White" + ], + "rarity": [ + "Mythic Rare" + ] + } + ], + "colors": "GW" +}, { "name": "Horseman", "sprite": "sprites/cavalier_2.atlas", @@ -5471,6 +5734,45 @@ ], "colors": "U" }, +{ + "name": "Insect", + "sprite": "sprites/dungeon/insect.atlas", + "deck": [ + "decks/insect.dck" + ], + "spawnRate": 1, + "difficulty": 0.1, + "speed": 30, + "flying": true, + "scale": 0.5, + "life": 14, + "rewards": [ + { + "type": "deckCard", + "probability": 1, + "count": 2, + "addMaxCount": 4 + }, + { + "type": "gold", + "probability": 0.7, + "count": 10, + "addMaxCount": 90 + }, + { + "type": "card", + "probability": 0.5, + "count": 2, + "colors": [ + "Green" + ], + "rarity": [ + "Mythic Rare" + ] + } + ], + "colors": "WBG" +}, { "name": "Immersturm Demon", "sprite": "sprites/devil_2.atlas", @@ -7127,6 +7429,155 @@ ], "colors": "GR" }, +{ + "name": "Scarecrow", + "sprite": "sprites/dungeon/scarecrow.atlas", + "deck": [ + "decks/scarecrow.dck" + ], + "spawnRate": 1, + "difficulty": 0.1, + "speed": 15, + "flying": true, + "scale": 0.35, + "life": 13, + "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" + ] + }, + { + "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": "WUBRG" +}, +{ + "name": "Scarecrow Leader", + "sprite": "sprites/dungeon/scarecrowcaptain.atlas", + "deck": [ + "decks/scarecrowcaptain.dck" + ], + "spawnRate": 1, + "difficulty": 0.1, + "speed": 15, + "scale": 0.40, + "life": 30, + "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" + ] + }, + { + "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": "WUBRG" +}, { "name": "Sea Monster", "sprite": "sprites/leech_2.atlas", @@ -7576,7 +8027,7 @@ "spawnRate": 1, "difficulty": 0.1, "speed": 23, - "scale": 0.5, + "scale": 0.7, "life": 13, "rewards": [ { diff --git a/forge-gui/res/adventure/Shandalar/world/green.json b/forge-gui/res/adventure/Shandalar/world/green.json index 95e2a43635e..7b78d6b732b 100644 --- a/forge-gui/res/adventure/Shandalar/world/green.json +++ b/forge-gui/res/adventure/Shandalar/world/green.json @@ -99,7 +99,8 @@ "CaveG9", "CaveGB", "Slime Cave", - "Garruk Forest" + "Garruk Forest", + "Scarecrow Farm" ], "structures": [ { 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 d7c18c33fc9..b5a666c23aa 100644 --- a/forge-gui/res/adventure/Shandalar/world/points_of_interest.json +++ b/forge-gui/res/adventure/Shandalar/world/points_of_interest.json @@ -1894,5 +1894,14 @@ "spriteAtlas": "maps/tileset/buildings.atlas", "sprite": "EvilGrove", "map": "maps/map/garruk.tmx" +}, +{ + "name": "Scarecrow Farm", + "type": "dungeon", + "count": 1, + "radiusFactor": 0.8, + "spriteAtlas": "maps/tileset/buildings.atlas", + "sprite": "farm", + "map": "maps/map/scarecrow_farm.tmx" } ] \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/world/red.json b/forge-gui/res/adventure/Shandalar/world/red.json index 55531d4f531..45380df2c96 100644 --- a/forge-gui/res/adventure/Shandalar/world/red.json +++ b/forge-gui/res/adventure/Shandalar/world/red.json @@ -62,7 +62,9 @@ "Viashino", "Wild-Magic Sorcerer", "Yeti", - "Kobold" + "Kobold", + "Boar", + "Bull" ], "pointsOfInterest": [ "Red Castle", diff --git a/forge-gui/res/adventure/Shandalar/world/waste.json b/forge-gui/res/adventure/Shandalar/world/waste.json index 5a4e24c7554..e45e78b6444 100644 --- a/forge-gui/res/adventure/Shandalar/world/waste.json +++ b/forge-gui/res/adventure/Shandalar/world/waste.json @@ -55,7 +55,10 @@ "Doppelganger", "Pirate", "Ooze", - "Fox" + "Fox", + "Boar", + "Insect", + "Scarecrow" ], "pointsOfInterest": [ "Spawn", diff --git a/forge-gui/res/adventure/Shandalar/world/white.json b/forge-gui/res/adventure/Shandalar/world/white.json index 79ac51ef818..d5f4f952195 100644 --- a/forge-gui/res/adventure/Shandalar/world/white.json +++ b/forge-gui/res/adventure/Shandalar/world/white.json @@ -52,7 +52,9 @@ "White Wiz3", "Armored Knight", "Kor Warrior", - "Fox" + "Fox", + "Horse", + "Insect" ], "pointsOfInterest": [ "White Castle",