diff --git a/forge-gui/res/adventure/Shandalar/maps/map/forest_town_generic.tmx b/forge-gui/res/adventure/Shandalar/maps/map/forest_town_generic.tmx index 03412e910cd..d12fdd3164a 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/forest_town_generic.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/forest_town_generic.tmx @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -103,7 +103,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/forest_town_tribal.tmx b/forge-gui/res/adventure/Shandalar/maps/map/forest_town_tribal.tmx index 06c6bcf1d8b..dc3b9a746a1 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/forest_town_tribal.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/forest_town_tribal.tmx @@ -35,7 +35,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -104,7 +104,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/island_town_generic.tmx b/forge-gui/res/adventure/Shandalar/maps/map/island_town_generic.tmx index 206de9779ae..46eee11be37 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/island_town_generic.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/island_town_generic.tmx @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -103,7 +103,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/island_town_tribal.tmx b/forge-gui/res/adventure/Shandalar/maps/map/island_town_tribal.tmx index 685af78128c..ce1be5dc17f 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/island_town_tribal.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/island_town_tribal.tmx @@ -35,7 +35,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -104,7 +104,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/forest_capital.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/forest_capital.tmx index 7b8b0ec26f8..ba8488ed164 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/forest_capital.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/forest_capital.tmx @@ -38,7 +38,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -213,7 +213,7 @@ - + @@ -223,7 +223,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/island_capital.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/island_capital.tmx index 2d41597ecab..0c8d8669ff1 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/island_capital.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/island_capital.tmx @@ -43,7 +43,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -215,7 +215,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/mountain_capital.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/mountain_capital.tmx index b8b51a39da2..4147cab1786 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/mountain_capital.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/mountain_capital.tmx @@ -38,7 +38,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -206,7 +206,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/plains_capital.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/plains_capital.tmx index 34ffc2a88ef..91a7846ea68 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/plains_capital.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/plains_capital.tmx @@ -38,7 +38,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -224,7 +224,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/swamp_capital.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/swamp_capital.tmx index f3594ff88b4..57746c4c24a 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/swamp_capital.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/swamp_capital.tmx @@ -130,7 +130,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -194,7 +194,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -217,7 +217,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/mountain_town_generic.tmx b/forge-gui/res/adventure/Shandalar/maps/map/mountain_town_generic.tmx index aaaefa18c71..3a82be48255 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/mountain_town_generic.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/mountain_town_generic.tmx @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -108,7 +108,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/mountain_town_tribal.tmx b/forge-gui/res/adventure/Shandalar/maps/map/mountain_town_tribal.tmx index ace2f63670c..0ee5cb81949 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/mountain_town_tribal.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/mountain_town_tribal.tmx @@ -35,7 +35,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -109,7 +109,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/plains_town_generic.tmx b/forge-gui/res/adventure/Shandalar/maps/map/plains_town_generic.tmx index 172c95e7e9d..f29e4eaec61 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/plains_town_generic.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/plains_town_generic.tmx @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/plains_town_tribal.tmx b/forge-gui/res/adventure/Shandalar/maps/map/plains_town_tribal.tmx index 79b3964ad52..ac64a7601bb 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/plains_town_tribal.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/plains_town_tribal.tmx @@ -35,7 +35,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -100,7 +100,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/swamp_town_generic.tmx b/forge-gui/res/adventure/Shandalar/maps/map/swamp_town_generic.tmx index 3e8d8f6039f..aff54508da3 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/swamp_town_generic.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/swamp_town_generic.tmx @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -104,7 +104,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/swamp_town_tribal.tmx b/forge-gui/res/adventure/Shandalar/maps/map/swamp_town_tribal.tmx index d3b04da1f25..d85148eea25 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/swamp_town_tribal.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/swamp_town_tribal.tmx @@ -35,7 +35,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -105,7 +105,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/waste_town_generic.tmx b/forge-gui/res/adventure/Shandalar/maps/map/waste_town_generic.tmx index ec258eb928c..f0184b909da 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/waste_town_generic.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/waste_town_generic.tmx @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -105,7 +105,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/map/waste_town_tribal.tmx b/forge-gui/res/adventure/Shandalar/maps/map/waste_town_tribal.tmx index ff746867fe6..a00b6552217 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/waste_town_tribal.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/waste_town_tribal.tmx @@ -35,7 +35,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -106,7 +106,7 @@ - + diff --git a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas index a4448801267..0126e01451a 100644 --- a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas +++ b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas @@ -370,6 +370,9 @@ Overlay4White Overlay2White xy: 405, 848 size: 5, 16 +PhyrexianShop + xy: 304, 912 + size: 16, 16 Test xy: 128, 48 size: 32, 32 diff --git a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.png b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.png index dc09805b10d..9f9d558c1bd 100644 Binary files a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.png and b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.png differ diff --git a/forge-gui/res/adventure/Shandalar/world/shops.json b/forge-gui/res/adventure/Shandalar/world/shops.json index 7bab1c0eb94..934b954811a 100644 --- a/forge-gui/res/adventure/Shandalar/world/shops.json +++ b/forge-gui/res/adventure/Shandalar/world/shops.json @@ -15,7 +15,9 @@ "count":2, "cardText": "(destroy|exile) target|sacrifice" }] -},{ +}, + +{ "name":"Black2", "description":"March of the Returned", "spriteAtlas":"maps/tileset/buildings.atlas", @@ -31,7 +33,8 @@ "count":2, "cardText": "destroyed|dies|return.*(hand|battlefield|library|to play)|put.*battlefield from" }] -},{ +}, +{ "name":"Black3", "description":"Essence Extraction", "spriteAtlas":"maps/tileset/buildings.atlas", @@ -4837,6 +4840,192 @@ ] }] }, +{ +"name":"PhyrexianColorless", +"description":"A Compleat Bargain", +"spriteAtlas":"maps/tileset/buildings.atlas", +"sprite":"PhyrexianShop", + "rewards": [ + { + "count":8, + "type":"Union", + "cardUnion": [ + { + "count":1, + "subTypes": ["Phyrexian"] + }, + { + "count":1, + "cardText": "infect|oil|proliferate|incubate|toxic|corrupted|phyrexian|poison|living weapon|for mirrodin" + } + ] + }] +}, +{ +"name":"PhyrexianWhite", +"description":"Orthodoxy Offerings", +"spriteAtlas":"maps/tileset/buildings.atlas", +"sprite":"PhyrexianShop", + "rewards": [ + { + "count":5 + "type":"Union" + "cardUnion":[ + { + "count":1, + "colors":["white"] + "subTypes": ["Phyrexian"] + }, + { + "count":1, + "colors":["white"] + "cardText": "infect|oil|proliferate|incubate|toxic|corrupted|phyrexian|poison|living weapon" + }]}, + { + "count":3 + "type":"Union" + "cardUnion":[ + { + "count":1, + "subTypes": ["Phyrexian"] + }, + { + "count":1, + "cardText": "infect|oil|proliferate|incubate|toxic|corrupted|phyrexian|poison|living weapon" + } + ]}]}, +{ +"name":"PhyrexianBlue", +"description":"Eyes for Quality", +"spriteAtlas":"maps/tileset/buildings.atlas", +"sprite":"PhyrexianShop", + "rewards": [ + { + "count":5 + "type":"Union" + "cardUnion":[ + { + "count":1, + "colors":["blue"] + "subTypes": ["Phyrexian"] + }, + { + "count":1, + "colors":["blue"] + "cardText": "infect|oil|proliferate|incubate|toxic|corrupted|phyrexian|poison|living weapon" + }]}, + { + "count":3 + "type":"Union" + "cardUnion":[ + { + "count":1, + "subTypes": ["Phyrexian"] + }, + { + "count":1, + "cardText": "infect|oil|proliferate|incubate|toxic|corrupted|phyrexian|poison|living weapon" + } + ]}]}, +{ +"name":"PhyrexianGreen", +"description":"A-Maze-ing Prices", +"spriteAtlas":"maps/tileset/buildings.atlas", +"sprite":"PhyrexianShop", + "rewards": [ + { + "count":5 + "type":"Union" + "cardUnion":[ + { + "count":1, + "colors":["green"] + "subTypes": ["Phyrexian"] + }, + { + "count":1, + "colors":["green"] + "cardText": "infect|oil|proliferate|incubate|toxic|corrupted|phyrexian|poison|living weapon" + }]}, + { + "count":3 + "type":"Union" + "cardUnion":[ + { + "count":1, + "subTypes": ["Phyrexian"] + }, + { + "count":1, + "cardText": "infect|oil|proliferate|incubate|toxic|corrupted|phyrexian|poison|living weapon" + } + ]}]}, +{ +"name":"PhyrexianRed", +"description":"Realmbreaker's Rebels", +"spriteAtlas":"maps/tileset/buildings.atlas", +"sprite":"PhyrexianShop", + "rewards": [ + { + "count":5 + "type":"Union" + "cardUnion":[ + { + "count":1, + "colors":["red"] + "subTypes": ["Phyrexian"] + }, + { + "count":1, + "colors":["red"] + "cardText": "infect|oil|proliferate|incubate|toxic|corrupted|phyrexian|poison|living weapon|for mirrodin" + }]}, + { + "count":3 + "type":"Union" + "cardUnion":[ + { + "count":1, + "subTypes": ["Phyrexian"] + }, + { + "count":1, + "cardText": "infect|oil|proliferate|incubate|toxic|corrupted|phyrexian|poison|living weapon|for mirrodin" + } + ]}]}, +{ +"name":"PhyrexianBlack", +"description":"Dross Bits", +"spriteAtlas":"maps/tileset/buildings.atlas", +"sprite":"PhyrexianShop", + "rewards": [ + { + "count":5 + "type":"Union" + "cardUnion":[ + { + "count":1, + "colors":["black"] + "subTypes": ["Phyrexian"] + }, + { + "count":1, + "colors":["black"] + "cardText": "infect|oil|proliferate|incubate|toxic|corrupted|phyrexian|poison|living weapon" + }]}, + { + "count":3 + "type":"Union" + "cardUnion":[ + { + "count":1, + "subTypes": ["Phyrexian"] + }, + { + "count":1, + "cardText": "infect|oil|proliferate|incubate|toxic|corrupted|phyrexian|poison|living weapon" + } + ]}]}, { "name":"UnionTest", "description":"Soldier text OR Soldier type OR black goblin", @@ -4864,4 +5053,4 @@ ] }] } -] \ No newline at end of file +]