diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Death Ring.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Death Ring.fullborder.jpg index 35676e69be5..9a618ed5c26 100644 Binary files a/forge-gui/res/adventure/Shandalar/custom_card_pics/Death Ring.fullborder.jpg and b/forge-gui/res/adventure/Shandalar/custom_card_pics/Death Ring.fullborder.jpg differ diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Death Ring.png b/forge-gui/res/adventure/Shandalar/custom_card_pics/Death Ring.png deleted file mode 100644 index 127b586f756..00000000000 Binary files a/forge-gui/res/adventure/Shandalar/custom_card_pics/Death Ring.png and /dev/null differ diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Demonic Contract.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Demonic Contract.fullborder.jpg index 317c50027b8..afb6b7032c3 100644 Binary files a/forge-gui/res/adventure/Shandalar/custom_card_pics/Demonic Contract.fullborder.jpg and b/forge-gui/res/adventure/Shandalar/custom_card_pics/Demonic Contract.fullborder.jpg differ diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Fire of Kaladesh.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Fire of Kaladesh.fullborder.jpg index a65e44a425e..4d2cecf6498 100644 Binary files a/forge-gui/res/adventure/Shandalar/custom_card_pics/Fire of Kaladesh.fullborder.jpg and b/forge-gui/res/adventure/Shandalar/custom_card_pics/Fire of Kaladesh.fullborder.jpg differ diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Pack Alpha.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Pack Alpha.fullborder.jpg index db22dd76b05..f3adcc8caa8 100644 Binary files a/forge-gui/res/adventure/Shandalar/custom_card_pics/Pack Alpha.fullborder.jpg and b/forge-gui/res/adventure/Shandalar/custom_card_pics/Pack Alpha.fullborder.jpg differ diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Waker of the Dead.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Waker of the Dead.fullborder.jpg index 5e117255dd9..8969f2c93c5 100644 Binary files a/forge-gui/res/adventure/Shandalar/custom_card_pics/Waker of the Dead.fullborder.jpg and b/forge-gui/res/adventure/Shandalar/custom_card_pics/Waker of the Dead.fullborder.jpg differ diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/temple_of_liliana/town.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/temple_of_liliana/town.tmx index 9f65cf9bb6f..82456859c4e 100644 --- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/temple_of_liliana/town.tmx +++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/temple_of_liliana/town.tmx @@ -178,7 +178,8 @@ ], "action": [ {"advanceMapFlag":"street"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking street as checked", "options":[{"name":"(Continue)","action": [ @@ -203,9 +204,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -222,7 +221,8 @@ ], "action": [ {"advanceMapFlag":"alley"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking alley as checked", "options":[{"name":"(Continue)","action": [ @@ -247,12 +247,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] - + [ { "type": "item", @@ -284,7 +282,8 @@ ], "action": [ {"advanceMapFlag":"docks"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking docks as checked", "options":[{"name":"(Continue)","action": [ @@ -309,9 +308,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] { @@ -339,7 +336,8 @@ ], "action": [ {"advanceMapFlag":"warehouse"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking warehouse as checked", "options":[{"name":"(Continue)","action": [ @@ -364,9 +362,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -391,7 +387,8 @@ ], "action": [ {"advanceMapFlag":"temple"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking temple as checked", "options":[{"name":"(Continue)","action": [ @@ -416,9 +413,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -433,7 +428,8 @@ ], "action": [ {"advanceMapFlag":"street"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking street as checked", "options":[{"name":"(Continue)","action": [ @@ -458,9 +454,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -610,7 +604,8 @@ ], "action": [ {"advanceMapFlag":"temple"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking temple as checked", "options":[{"name":"(Continue)","action": [ @@ -635,9 +630,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -661,7 +654,8 @@ ], "action": [ {"advanceMapFlag":"temple"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking temple as checked", "options":[{"name":"(Continue)","action": [ @@ -686,9 +680,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -719,7 +711,8 @@ ], "action": [ {"advanceMapFlag":"street"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking street as checked", "options":[{"name":"(Continue)","action": [ @@ -744,9 +737,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -787,7 +778,8 @@ ], "action": [ {"advanceMapFlag":"hut"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking hut as checked", "options":[{"name":"(Continue)","action": [ @@ -812,9 +804,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -838,7 +828,8 @@ ], "action": [ {"advanceMapFlag":"alley"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking alley as checked", "options":[{"name":"(Continue)","action": [ @@ -863,9 +854,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -889,7 +878,8 @@ ], "action": [ {"advanceMapFlag":"street"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking street as checked", "options":[{"name":"(Continue)","action": [ @@ -914,9 +904,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -992,7 +980,8 @@ ], "action": [ {"advanceMapFlag":"alley"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking alley as checked", "options":[{"name":"(Continue)","action": [ @@ -1017,9 +1006,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -1044,7 +1031,8 @@ ], "action": [ {"advanceMapFlag":"street"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking street as checked", "options":[{"name":"(Continue)","action": [ @@ -1069,9 +1057,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -1098,7 +1084,8 @@ ], "action": [ {"advanceMapFlag":"tavern"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking tavern as checked", "options":[{"name":"(Continue)","action": [ @@ -1123,11 +1110,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] + [ { "type": "item", @@ -1148,7 +1134,8 @@ ], "action": [ {"advanceMapFlag":"street"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking street as checked", "options":[{"name":"(Continue)","action": [ @@ -1173,9 +1160,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] { @@ -1204,7 +1189,8 @@ ], "action": [ {"advanceMapFlag":"tavern"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking tavern as checked", "options":[{"name":"(Continue)","action": [ @@ -1229,9 +1215,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -1256,7 +1240,8 @@ ], "action": [ {"advanceMapFlag":"street"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking street as checked", "options":[{"name":"(Continue)","action": [ @@ -1281,9 +1266,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -1409,7 +1392,8 @@ ], "action": [ {"advanceMapFlag":"archive"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking archive as checked", "options":[{"name":"(Continue)","action": [ @@ -1434,9 +1418,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -1461,7 +1443,8 @@ ], "action": [ {"advanceMapFlag":"street"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking street as checked", "options":[{"name":"(Continue)","action": [ @@ -1486,9 +1469,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -1584,7 +1565,8 @@ ], "action": [ {"advanceMapFlag":"docks"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking docks as checked", "options":[{"name":"(Continue)","action": [ @@ -1609,9 +1591,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -1663,7 +1643,8 @@ ], "action": [ {"advanceMapFlag":"graveyard"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking graveyard as checked", "options":[{"name":"(Continue)","action": [ @@ -1688,9 +1669,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] { "startBattleWithCard": [ "Endless Ranks of the Dead"] @@ -1719,7 +1698,8 @@ ], "action": [ {"advanceMapFlag":"graveyard"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking graveyard as checked", "options":[{"name":"(Continue)","action": [ @@ -1744,9 +1724,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -1774,7 +1752,8 @@ ], "action": [ {"advanceMapFlag":"graveyard"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking graveyard as checked", "options":[{"name":"(Continue)","action": [ @@ -1799,9 +1778,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] @@ -1829,7 +1806,8 @@ ], "action": [ {"advanceMapFlag":"graveyard"}, - {"advanceMapFlag":"placesAlreadyChecked"} + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} ], "text": "Marking graveyard as checked", "options":[{"name":"(Continue)","action": [ @@ -1854,9 +1832,7 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] - }, - {"action": [ - {"deleteMapObject": -1}]} + } ] { "startBattleWithCard": [ "Endless Ranks of the Dead"]