From 5dea75e70351cc61cb613e12f898a23f63b517e9 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 21 Jul 2013 21:17:01 +0000 Subject: [PATCH] - Bugfix: Dialog is not triggered after escorting John & Mary to the Drassen airfield (by anv) git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1712 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Scripts/Overhead.lua | 5 +++-- gamedir/Data-UB/Scripts/Overhead.lua | 5 +++-- gamedir/Data/Scripts/Overhead.lua | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gamedir/Data-1.13/Scripts/Overhead.lua b/gamedir/Data-1.13/Scripts/Overhead.lua index cc5fb3f3c..e043969f5 100644 --- a/gamedir/Data-1.13/Scripts/Overhead.lua +++ b/gamedir/Data-1.13/Scripts/Overhead.lua @@ -250,8 +250,9 @@ function HandleAtNewGridNo( ProfileId ) SetFactTrue( Facts.FACT_SKYRIDER_CLOSE_TO_CHOPPER ) TriggerNPCRecord( Profil.SKYRIDER, 15 ) SetUpHelicopterForPlayer( 13, SectorY.MAP_ROW_B, Profil.SKYRIDER, 163 ) -- 163 helicopter - - elseif ( ProfileIdsSectorX == 13 and ProfileIdsSectorY == SectorY.MAP_ROW_B and ProfileIdbSectorZ == 0 ) then + + -- Mary & John + elseif ( ( CheckNPCSectorBool( Profil.MARY, 13, SectorY.MAP_ROW_B, 0 ) == true ) or ( CheckNPCSectorBool( Profil.JOHN, 13, SectorY.MAP_ROW_B, 0 ) == true ) ) then -- Mary if ( ProfileId == Profil.MARY ) then diff --git a/gamedir/Data-UB/Scripts/Overhead.lua b/gamedir/Data-UB/Scripts/Overhead.lua index 8129cc704..6466375de 100644 --- a/gamedir/Data-UB/Scripts/Overhead.lua +++ b/gamedir/Data-UB/Scripts/Overhead.lua @@ -251,8 +251,9 @@ function HandleAtNewGridNo( ProfileId ) SetFactTrue( Facts.FACT_SKYRIDER_CLOSE_TO_CHOPPER ) TriggerNPCRecord( Profil.SKYRIDER, 15 ) SetUpHelicopterForPlayer( 13, SectorY.MAP_ROW_B, Profil.SKYRIDER ) - - elseif ( ProfileIdsSectorX == 13 and ProfileIdsSectorY == SectorY.MAP_ROW_B and ProfileIdbSectorZ == 0 ) then + + -- Marie & John + elseif ( ( CheckNPCSectorBool( Profil.MARY, 13, SectorY.MAP_ROW_B, 0 ) == true ) or ( CheckNPCSectorBool( Profil.JOHN, 13, SectorY.MAP_ROW_B, 0 ) == true -- Mary if ( ProfileId == Profil.MARY ) then diff --git a/gamedir/Data/Scripts/Overhead.lua b/gamedir/Data/Scripts/Overhead.lua index dfc3208dd..57bb5fa80 100644 --- a/gamedir/Data/Scripts/Overhead.lua +++ b/gamedir/Data/Scripts/Overhead.lua @@ -250,8 +250,9 @@ function HandleAtNewGridNo( ProfileId ) SetFactTrue( Facts.FACT_SKYRIDER_CLOSE_TO_CHOPPER ) TriggerNPCRecord( Profil.SKYRIDER, 15 ) SetUpHelicopterForPlayer( 13, SectorY.MAP_ROW_B, Profil.SKYRIDER, 163 ) -- 163 helicopter - - elseif ( ProfileIdsSectorX == 13 and ProfileIdsSectorY == SectorY.MAP_ROW_B and ProfileIdbSectorZ == 0 ) then + + -- Mary & John + elseif ( ( CheckNPCSectorBool( Profil.MARY, 13, SectorY.MAP_ROW_B, 0 ) == true ) or ( CheckNPCSectorBool( Profil.JOHN, 13, SectorY.MAP_ROW_B, 0 ) == true ) ) then -- Mary if ( ProfileId == Profil.MARY ) then