From 67967f8086ff2be5b700a80baeee62c28b0ad490 Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Mon, 24 May 2021 17:55:37 +0000 Subject: [PATCH] Fix for issue reported on forum where the quest markers for Skyrider position shows even when player already found/escort him (by Shadooow). git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2590 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Scripts/strategicmap.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gamedir/Data-1.13/Scripts/strategicmap.lua b/gamedir/Data-1.13/Scripts/strategicmap.lua index 1b534755d..e9fa38a6b 100644 --- a/gamedir/Data-1.13/Scripts/strategicmap.lua +++ b/gamedir/Data-1.13/Scripts/strategicmap.lua @@ -1135,8 +1135,12 @@ function GetIntelAndQuestMapData( aLevel ) SetIntelAndQuestMapDataForSector(15, 10, -1, MapSymbols.QUESTIONMARK_BLUE, "Destroy bloodcat nest", "") end - - if ( gubQuest( Quests.QUEST_CHOPPER_PILOT ) == qStatus.QUESTINPROGRESS ) then + + if ( gubQuest( Quests.QUEST_ESCORT_SKYRIDER ) == qStatus.QUESTINPROGRESS ) then + + SetIntelAndQuestMapDataForSector(13, 2, -1, MapSymbols.HELI, "Escort Skyrider here", "") + + elseif ( gubQuest( Quests.QUEST_ESCORT_SKYRIDER ) == qStatus.QUESTNOTSTARTED and gubQuest( Quests.QUEST_CHOPPER_PILOT ) == qStatus.QUESTINPROGRESS ) then -- list all possible sectors where Skyrider might hide SetIntelAndQuestMapDataForSector(15, 2, -1, MapSymbols.QUESTIONMARK_BLUE, "Find chopper pilot", "") @@ -1146,11 +1150,7 @@ function GetIntelAndQuestMapData( aLevel ) end - if ( gubQuest( Quests.QUEST_ESCORT_SKYRIDER ) == qStatus.QUESTINPROGRESS ) then - - SetIntelAndQuestMapDataForSector(13, 2, -1, MapSymbols.HELI, "Escort Skyrider here", "") - - end + if ( gubQuest( Quests.QUEST_FREE_DYNAMO ) == qStatus.QUESTINPROGRESS ) then