Merge pull request #103 from Argent77/tob-wmp-travel-fix

[tob] Oasis map should not be bypassed when travelling to Amkethran

eefixpack/files/baf/ar6300_unlock_ar5500.baf

@@ -0,0 +1,8 @@
+IF
+  Global("ar5500_enabled","AR6300",0)
+THEN
+  RESPONSE #100
+    SetGlobal("ar5500_enabled","AR6300",1)
+    AddWorldmapAreaFlag("AR5500",ENABLED)
+    Continue()
+END

eefixpack/files/d/bg2ee_core_fixes.d

@@ -49,4 +49,13 @@ ActionOverride(LastTalkedToBy(Myself), ForceSpellRES("jworphan","orphan2"))
 Wait(5)
 EndCutSceneMode()~ 
   EXIT
-END
+END
+
+// Fixes an exploit that would allow the party to bypass the Oasis when travelling to Amkethran
+// via Deepstone Clanhold (Rasaad's quest) or the Clearing (Neera's quest).
+// https://www.gibberlings3.net/forums/topic/34875-bug-report-ee-content-bugs/?do=findComment&comment=339326
+REPLACE_TRANS_ACTION ~sarmel01~
+  BEGIN 83 END
+  BEGIN 0 END
+  ~RevealAreaOnMap("AR5500")~ ~\0 RemoveWorldmapAreaFlag("AR5500",ENABLED)~
+  UNLESS ~RemoveWorldmapAreaFlag("AR5500",ENABLED)~

eefixpack/files/tph/bg2ee.tph

@@ -278,6 +278,15 @@ COPY_EXISTING ~oh7200.bcs~ ~override~
 // Yoshimo Should Have Follow-Up Banters with the PC
 EXTEND_BOTTOM ~yoshimo.bcs~ ~eefixpack/files/baf/yoshimo_banter.baf~ // add script prompt for third banter
 
+// Fixes an exploit that would allow the party to bypass the Oasis when travelling to Amkethran
+// via Deepstone Clanhold (Rasaad's quest) or the Clearing (Neera's quest).
+// https://www.gibberlings3.net/forums/topic/34875-bug-report-ee-content-bugs/?do=findComment&comment=339326
+ACTION_IF (NOT FILE_EXISTS_IN_GAME ~AR6300.BCS~) BEGIN
+  COPY - ~.../fp-inline/blank~ ~.../inlined/eefixpack/AR6300.BAF~
+  COMPILE ~.../inlined/eefixpack/AR6300.BAF~
+END
+EXTEND_TOP ~AR6300.BCS~ ~eefixpack/files/baf/ar6300_unlock_ar5500.baf~
+
 
 /////                                                  \\\\\
 ///// area fixes                                       \\\\\