diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Giant Scythe.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Giant Scythe.jpg new file mode 100644 index 00000000000..016cc9db75e Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/custom_card_pics/Giant Scythe.jpg differ diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Scarecrow Leader.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Scarecrow Leader.jpg new file mode 100644 index 00000000000..f89cb068744 Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/custom_card_pics/Scarecrow Leader.jpg differ diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/giant_scythe.txt b/forge-gui/res/adventure/Shandalar/custom_cards/giant_scythe.txt new file mode 100644 index 00000000000..5eeab0735a0 --- /dev/null +++ b/forge-gui/res/adventure/Shandalar/custom_cards/giant_scythe.txt @@ -0,0 +1,7 @@ +Name:Giant Scythe +ManaCost:no cost +Types:Artifact Equipment +S:Mode$ Continuous | Affected$ Creature.Artifact+YouCtrl | EffectZone$ Command | AddToughness$ 2 | AddType$ Scarecrow | Description$ Artifact creatures you control get +0/+2 and are Scarecrow in addition to their other types. +A:AB$ ChangeZone | Cost$ 3 Sac<3/Scarecrow/Scarecrows> | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn+Artifact | TgtPrompt$ Select target artifact creature cards from your graveyard | ChangeNum$ 1 | ActivationZone$ Command | SorcerySpeed$ True | SubAbility$ ExileSelf | SpellDescription$ Return target artifact creature from your graveyard to the battlefield tapped. Activate only as a sorcery. Exile Giant Scythe. +SVar:ExileSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile +Oracle:Artifact creatures your control get +0/+2 and are Scarecrows in addition to their other types. \n{3} {E}{E}{E}{E}, Sacrifice three Scarecrows: \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/scarecrow_captain.txt b/forge-gui/res/adventure/Shandalar/custom_cards/scarecrow_captain.txt index 966591107b5..48d65a32ee4 100644 --- a/forge-gui/res/adventure/Shandalar/custom_cards/scarecrow_captain.txt +++ b/forge-gui/res/adventure/Shandalar/custom_cards/scarecrow_captain.txt @@ -1,11 +1,10 @@ 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. +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 and has alternative manacost {4}. 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:DBConjure:DB$ MakeCard | Conjure$ True | DefinedName$ ChosenCard | Zone$ Hand | RememberMade$ 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 +SVar:PerpetualAbility:Mode$ Continuous | Affected$ Card.IsRemembered | AddKeyword$ Alternative Cost:4 | 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 and has alternative manacost {4}. +SVar:DBClearChosen:DB$ Cleanup | ClearChosenCard$ True | ClearRemembered$ True +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 and has alternative manacost {4}. \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session index 6466a7961ce..06dce0a0277 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/nahiri.tmx", + "activeFile": "map/scarecrow_farm.tmx", "automapping.whileDrawing": false, "expandedProjectPaths": [ - "tileset", - "map/main_story", "map", - "obj" + "obj", + "tileset", + "map/main_story" ], "file.lastUsedOpenFilter": "All Files (*)", "fileStates": { @@ -2613,7 +2613,7 @@ "scale": 2, "selectedLayer": 4, "viewCenter": { - "x": 495.25, + "x": 319.75, "y": 208.25 } }, @@ -2892,10 +2892,10 @@ 4 ], "scale": 3, - "selectedLayer": 3, + "selectedLayer": 4, "viewCenter": { - "x": 263.83333333333337, - "y": 191.83333333333331 + "x": 259.5, + "y": 288.5 } }, "map/skullcave_1.tmx": { @@ -2927,7 +2927,7 @@ 11 ], "scale": 3, - "selectedLayer": 2, + "selectedLayer": 4, "viewCenter": { "x": 504.8333333333333, "y": 183.83333333333331 @@ -3111,7 +3111,7 @@ }, "tileset/main.tsx": { "dynamicWrapping": false, - "scaleInDock": 2, + "scaleInDock": 1, "scaleInEditor": 1 } }, @@ -3138,13 +3138,13 @@ "property.type": "string", "recentFiles": [ "map/aerie_1.tmx", + "map/nahiri.tmx", + "map/nahiricave.tmx", + "map/aerie_1B.tmx", + "map/graveyard_2.tmx", + "map/garruk.tmx", "map/slime_hive.tmx", "map/scarecrow_farm.tmx", - "map/garruk.tmx", - "map/graveyard_2.tmx", - "map/aerie_1B.tmx", - "map/nahiricave.tmx", - "map/nahiri.tmx", "map/swamp_town.tmx", "map/grove_4.tmx", "map/lavaforge_2.tmx", diff --git a/forge-gui/res/adventure/Shandalar/maps/map/scarecrow_farm.tmx b/forge-gui/res/adventure/Shandalar/maps/map/scarecrow_farm.tmx index 4f21defa57d..af6588b7ec8 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/scarecrow_farm.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/scarecrow_farm.tmx @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ - eJxjYCAOLGMlUiENATXcsIyJcjeAsDIP5W4Z6iCXkzT1X9kG1g3o9n9RxI2JAdtYERgGCjUZGNaKEu8mUt0AswtE32VGiGcrMzBMJNLd1AIwN2xDy5ftZJjVLM3A0IIDE3IDCHuJQfi67AwM/WwIfIadtm5ATgOwcEjnQMiD0gMyyKKBG7CBQ4wItgobglZBygO43EItN8BACBsEg4AeBwTjAtjclEVAHhm0ceMWR5YLRnITKW6hFGBzny4HIlzwhQ0lYDIBNyADUDmpSyW3gMwC4Slo7iDkBmSQR0IZj81cmBtgGAZ2sEBoKSC9iwW//YTcAEtf6OmMEAhlxc7G5gZCgFw3fAHaK43H/+huANHvB6g9iOwGUtLFKBgYAADMGFns + eJxjYCAOLGMlUiENATXcsIyJcjeAsDIP5W4Z6iCXkzT1X9kG1g3o9n9RxI2JAdtYERgGCjUZGNaK4rYTHZDqBphdIPouM0I8W5mBYSKR7qYWgLlhG1q+bCfDrGZpBoYWHJiQG0DYSwzC12VnYOhnQ+Az7LR1A3IagIVDOgdCHpQekEEWDdyADRxiRLBV2BC0ClJ6xOUWarkBBkLYIBgE9DggGBfA5qYsAvLIoI0btziyXDCSm0hxC6UAm/t0ORDhgi9sKAGTCbgBGYDKLF0quQVkFghPQXMHITcggzwSynhs5sLcAMMwsIMFQksB6V0s+O0n5AZY+kJPZ4RAKCt2NjY3EALkuuEL0F5pPP5HdwOIfj9A7UFkN5CSLkbBwAAAn5la5w== @@ -28,11 +28,11 @@ - eJy9lbtvE0EQxifE57vIpqAgBLvCkJwdYkdC4g+gpbMUOvoERElFA4iXwyNxAAkaJCpaigRDb6eIQERp6QAFCp4xD0HHfNod3d7enu1AxEg/7d3t3c43j9tteUStAVjyicbzRBMOQmYtZb7CdJhV5meWqM1j2XoH63/guY/MJ+ZzNl1DW69ns6o1uOYxd2SE6GqO6NEuotmhpA6sP8/fX2duMDf99Fx8Y313/IjffD/F4yKPpwPl6zDFrapHaBBDPsYtDSF/X2YqzGTQux7XeK0GM8/8yKr4oQW+cA+DjpP6+uxu1m7pcmkYFLMn0AOi4Xs20ib64PeXlTfhrlW37WpoG3WeLkUa7D4IdQ/inX5W65F74VxG8WpY1VVqK3m4zewZToJ4G/zezERvDVhv0erDo0U15iaJ8swC+6r50TfIAQz9eCpQPemi6qfPmaB21ZRchOy/PBnFe4x9t4eUf8SHZ5sFoncO3hfU/CWO57ImzaS/7FwA2FMej48SzQUqLtNe7LAG5GKG4236CtEAw76woXtrw+ixNa2po2u6+Q8aAGoi+WhaOUEuxPcW6xnzFJURNe734lqkVrPB9jTYNZkK4v+M+MU18gWgASbzouUQJTWZz81nuDbPFvT7E+1nQef5lh/5BCeyyVqImVpNTeILOew6MM+2LX1eTXP8K7wf7EuhlYk0uPokTRPua0GSjuUf8cN/10uuKVb34nl4WVKYWkxN4guxYa9v5OKYGiV++F86EK1hxyga5oz9CXuYaEkD5jrfzZygZnXP7du8xjvPMnFdyMlr/h/fpPC24K4v6tqwzru6F/dn5gP2eG9c572Q6H44mAZ89yCfzKmdl6+euw/HmFF9bfbKMvtfGVDDF6vH1ktKwyBnyiA873M+NZnljMrxulVXcx/7W64UVR7O83ghhYtF5Q+1FQ0P8/9fg6vO3R3UgLOhnwazx2U8c5DoD3L5idM= + eJy9lbtvE0EQxifE57vIpqAgBLvCkJxtYkdC4p+gsxQ6+gRESUUDiJfDI3EACRokKlqKBENvp0AgorR0gAIFz5iHoGM+7Y5ub2/PdiBipJ/2znu38+0349u2R9QegmWfaDJPNOUgZJ6lzFeYLrPG/MwSdXgsW89g/Q8895H5xHzOpmvo6PVs1rQG1zzmjowRXckRPdxFNDeS1IH1F/j9a8x15oaf7sU31nfbj/jN99M8LvF4KlC5DlM8anqEBgn4MWlpCPn9MlNhqkH/elzltZrMAvMjq/YPLciFewR0nNDXZ3azdkuXS8OwmD2BHhAN37ORNtGHvL8s34Q7Vt22q6Fj1HmmFGmw+yDUPYhnBkW9j/fC2Yzi1aiqq9RWfLjF7BlNgv02+bnZqf4asN6S1YdHi2rMVYnyzCLnqvvRO/AAgX48GaiedFHz0+dMULtaihch5y9Xo/0iOiNqxP7w22aB6J2D9wU1f5H3c0mTFtJfthcA8YTHY+NE84HalxkvdlgDvJjl/bZ8hWhA4LuwoXtrw+gx8aara7r5DxoAaiJ+tCxP4IXk3mI9E56iMqbG/V5ci9RqLtieBrsm00H8PyN5cQ2/ADQgZF60HKKkJvN38zdcm2cL+v2xzrOofb7pRznB8WyyFhKmVlOT5IKHPQfm2balz6sZ3v8qfw/2pdDORBpcfZKmCff1IEnXyo/9I3/PS64p0fDiPrwsKUwtpibJhb3hW9/MxTE1yv6Rf/lAtIa9R9Ewb3yf8A0TLWkgXOe76Qlq1vDcuc1rPPM0E9cFT17z//FNCm8L7vqirk3rvGt48XymH4hHe+M674ZE98LhNOC9+/mkp7YvXz13H04w4/ra7JUVzr86pIYvVo+tl5SGYc6UYXg+4HxqMSsZ5fG6VVfzO/a3XC4qH87xeD6FC0WVD7UVDQ/y/1+Dq869HdSAs2GQBrPHZTx9kOgPBOOJhg== - + @@ -91,7 +91,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -116,10 +116,11 @@ - + + diff --git a/forge-gui/res/adventure/Shandalar/sprites/items.atlas b/forge-gui/res/adventure/Shandalar/sprites/items.atlas index 10369f3f331..56d4a2963c5 100644 --- a/forge-gui/res/adventure/Shandalar/sprites/items.atlas +++ b/forge-gui/res/adventure/Shandalar/sprites/items.atlas @@ -360,4 +360,8 @@ PirateFlag Scyte xy: 288,977 size: 18, 14 +ChickenEgg + xy: 306,800 + size: 13, 15 + \ No newline at end of file diff --git a/forge-gui/res/adventure/Shandalar/world/enemies.json b/forge-gui/res/adventure/Shandalar/world/enemies.json index 5db88a71284..80aa5e8f528 100644 --- a/forge-gui/res/adventure/Shandalar/world/enemies.json +++ b/forge-gui/res/adventure/Shandalar/world/enemies.json @@ -1628,6 +1628,12 @@ "probability": 1, "count": 2, "cardName": "Chicken Egg" + }, + { + "type": "item", + "probability": 1, + "count": 1, + "itemName": "Chicken Egg" } ], "colors": "WG" @@ -7485,21 +7491,34 @@ ] }, { - "type": "deckCard", - "probability": 0.1, + "type": "card", + "probability": 1, "count": 1, - "rarity": [ - "rare" - ], - "cardTypes": [ - "Land" - ] + "cardName": "Reaper King" + }, + { + "type": "card", + "probability": 1, + "count": 1, + "cardName": "Wickerwing Effigy" + }, + { + "type": "card", + "probability": 1, + "count": 1, + "cardName": "Pili-Pala" }, { "type": "gold", "probability": 0.3, "count": 10, "addMaxCount": 90 + }, + { + "type": "item", + "probability": 1, + "count": 1, + "itemName": "Giant Scythe" } ], "colors": "WUBRG" @@ -7528,34 +7547,13 @@ }, { "type": "deckCard", - "probability": 0.5, + "probability": 0.1, "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" + "Land" ] }, { @@ -7572,8 +7570,8 @@ { "type": "gold", "probability": 0.3, - "count": 10, - "addMaxCount": 90 + "count": 100, + "addMaxCount": 200 } ], "colors": "WUBRG" diff --git a/forge-gui/res/adventure/Shandalar/world/items.json b/forge-gui/res/adventure/Shandalar/world/items.json index c4e6a6df177..46112943d03 100644 --- a/forge-gui/res/adventure/Shandalar/world/items.json +++ b/forge-gui/res/adventure/Shandalar/world/items.json @@ -1027,5 +1027,27 @@ "Nahiri's Armory" ] } +}, +{ + "name": "Giant Scythe", + "equipmentSlot": "Left", + "iconName": "Scythe", + "effect": { + "lifeModifier": 1, + "startBattleWithCardInCommandZone": [ + "Giant Scrythe" + ] +} +}, +{ + "name": "Chicken Egg", + "equipmentSlot": "Right", + "iconName": "ChickenEgg", + "effect": { + "lifeModifier": 1, + "startBattleWithCard": [ + "Chicken Egg" + ] +} } ] \ No newline at end of file