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 731409c82ac..1011f8017e3 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 @@ -204,6 +204,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -247,6 +251,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -308,6 +316,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -362,6 +374,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -413,6 +429,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -454,6 +474,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -630,6 +654,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -680,6 +708,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -688,6 +720,46 @@ + [ +{"condition": [ + {"checkMapFlag":"mayorSpawned", "not":true}, + {"checkMapFlag":"warehouse", "not":true} + ], + "action": [ + {"advanceMapFlag":"warehouse"}, + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} +], + "text": "Marking warehouse as checked", + "options":[{"name":"(Continue)","action": [ + {"deleteMapObject": -1}]}] + }, + + {"condition": [ + {"checkMapFlag":"mayorSpawned", "not":true}, + {"getMapFlag":{"key":"placesAlreadyChecked","op":"<","val":6}} + ], + "text": "The mayor does not appear to be in the warehouse", + "options":[{"name":"(Continue your search)","action": [ + {"deleteMapObject": -1}]}] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned", "not":true}, + {"getMapFlag":{"key":"placesAlreadyChecked","op":">=","val":6}} + ], + "action": [ + {"advanceMapFlag":"mayorSpawned","activateMapObject":224}], + "text": "After searching most of the town, you still haven't found the mayor, but as you glance back in that direction you finally spot them out in the street!", + "options":[{"name":"(Chase after them!!!)","action": [ + {"deleteMapObject": -1}] + }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] + } +] + [ @@ -737,6 +809,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -756,6 +832,46 @@ + [ +{"condition": [ + {"checkMapFlag":"mayorSpawned", "not":true}, + {"checkMapFlag":"hut", "not":true} + ], + "action": [ + {"advanceMapFlag":"hut"}, + {"advanceMapFlag":"placesAlreadyChecked"}, + {"deleteMapObject": -1} +], + "text": "Marking hut as checked", + "options":[{"name":"(Continue)","action": [ + {"deleteMapObject": -1}]}] + }, + + {"condition": [ + {"checkMapFlag":"mayorSpawned", "not":true}, + {"getMapFlag":{"key":"placesAlreadyChecked","op":"<","val":6}} + ], + "text": "The mayor does not appear to be in the witch's hut", + "options":[{"name":"(Continue your search)","action": [ + {"deleteMapObject": -1}]}] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned", "not":true}, + {"getMapFlag":{"key":"placesAlreadyChecked","op":">=","val":6}} + ], + "action": [ + {"advanceMapFlag":"mayorSpawned","activateMapObject":224}], + "text": "After searching most of the town, you still haven't found the mayor, but as you glance back in that direction you finally spot them out in the street!", + "options":[{"name":"(Chase after them!!!)","action": [ + {"deleteMapObject": -1}] + }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] + } +] + [ { @@ -804,6 +920,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -854,6 +974,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -904,6 +1028,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -956,6 +1084,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -1006,6 +1138,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -1057,6 +1193,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -1110,6 +1250,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -1160,6 +1304,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -1215,10 +1363,14 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] - + [ { "type": "item", @@ -1266,6 +1418,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -1291,6 +1447,7 @@ "options":[ {"name":"(continue)" } + {"action":[{"deleteMapObject": 278}, {"deleteMapObject": -1}]} ] } ] @@ -1299,18 +1456,9 @@ "text":"The mayor can only keep away from you for so long before you manage to fight through the crowd and reach him.", "options":[ { "name":"Walk away" }, - { "name":"Attack the witch", - "action":[{"battleWithActorID":-1}]}, - { - "name":"Approach her slowly", - "text": "\"Be gone with you! You will not have them!\" She steps back, dropping some of the herbs and mushrooms that she appears to have been gathering.", - "options": [ - { "name":"Walk away" }, - { "name":"Attack the witch", - "action":[{"battleWithActorID":-1}] - } - ] - }] + { "name":"Attack the Mayor", + "action":[{"battleWithActorID":-1}]} + } ] { @@ -1319,8 +1467,8 @@ } - - + + [ { "type": "item", @@ -1418,6 +1566,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -1469,6 +1621,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -1591,6 +1747,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -1669,6 +1829,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -1724,6 +1888,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -1778,6 +1946,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ] @@ -1832,6 +2004,10 @@ "options":[{"name":"(Chase after them!!!)","action": [ {"deleteMapObject": -1}] }] + }, + {"condition": [ + {"checkMapFlag":"mayorSpawned"}], + "action": [{"deleteMapObject": -1}] } ]