Merge pull request #4 from Gitjas/main

update to EAOB.8

bst/cutscene scripts/bscut007.baf

@@ -9,5 +9,5 @@ THEN
         Wait(3)
         FadeFromColor([20.0],0)
 	EndcutSceneMode()
-	ActionOverride("bstrcmdr",StartDialogNoSet([PC]))
+//	ActionOverride("bstrcmdr",StartDialogNoSet([PC]))
 END 

bst/dialog/bsprgrd1.d

@@ -186,7 +186,7 @@ IF ~GlobalGT("bsDoppelgangerQuest","GLOBAL",1) Global("bsInTheLoop","LOCALS",1)~
 END
 
 IF ~~ THEN doppelgangerquest_grd2_03
-SAY ~(sigh) I hope *someone* tell's me what is going on.~
+SAY ~(sigh) I hope *someone* tells me what is going on.~
 IF ~~ THEN EXIT
 END
 

bst/dialog/bstrcmdr.d

@@ -231,7 +231,7 @@ END //APPEND
 /* PC received the booklet with dates bssmq003.itm */
 CHAIN
 IF ~~ THEN bstrcmdr slaversquest_04
-~Let me see. Hmm, this seems a to be a list of their planned moves. "Special creatures", eh? Yes, we know about that code name. They are planning something that night to be sure.~
+~Let me see. Hmm, this seems to be a list of their planned moves. "Special creatures", eh? Yes, we know about that code name. They are planning something that night to be sure.~
 DO ~TakePartyItem("bssmq003") DestroyItem("bssmq003") SetGlobal("bsSQCommanderKnowsTimes","LOCALS",1)~
 
 /* commander doesn't know place: general comment */

bst/dialog/bswinch1.d

@@ -78,6 +78,6 @@ END
 
 BEGIN bswnchwm
 IF ~True()~ THEN mother
-SAY @2456 /* ~It smells of old fish and sea weet in here. As if the usual stink on the tower grounds wouldn't be stenuous enough already.~ */
+SAY @2456 /* ~It smells of old fish and seaweed in here. As if the usual stink on the tower grounds wouldn't be bad enough already.~ */
 IF ~~ THEN EXIT
 END

bst/dialog/z_quest_doppelgangers.d

@@ -27,14 +27,15 @@ IF WEIGHT #-1
 == yssgt3 IF ~Global("bsJumpStartDGQuest","GLOBAL",0)~ THEN ~Not the *tower's* safety, sir. I said "ours"! They found the breach in the prison walls. We are no longer ssssafe!~
 == yssgt3 IF ~GlobalGT("bsJumpStartDGQuest","GLOBAL",0)~ THEN ~Not the *tower's* safety, sir. I said "ours"! Ourssss...~
 END
-IF ~~ THEN DO ~ActionOverride("bstrcmdr",GiveItemCreate("MINHP1","bstrcmdr",0,0,0))
+IF ~~ THEN DO ~SetInterrupt(FALSE)
+ActionOverride("bstrcmdr",GiveItemCreate("MINHP1","bstrcmdr",0,0,0))
 SetGlobal("bsDoppelgangerQuest","GLOBAL",3)
 ActionOverride("bstrcmdr",FillSlot(SLOT_BELT))
 //ActionOverride("yssgt3",ApplySpell(Myself,"bsdopsp1"))
 //ActionOverride("bsprgrd1",ApplySpell(Myself,"bsdopsp2"))
 ActionOverride("yssgt3",ReallyForceSpellRES("bsdopsp1","yssgt3"))
 ActionOverride("bsprgrd1",ReallyForceSpellRES("bsdopsp2","bsprgrd1"))
-~ EXIT
+SetInterrupt(TRUE)~ EXIT
 
 
 APPEND bstrcmdr 
@@ -70,22 +71,25 @@ IF WEIGHT #-1
 == bstrcmdr IF ~GlobalGT("bsJumpStartDGQuest","GLOBAL",0)~ THEN ~Here, take this pass, it will grant you acces to the prison if you show it to the guards.~ 
 
 END
-IF ~~ THEN DO ~GiveItemCreate("bsprpass",[PC],1,0,0)
+IF ~~ THEN DO ~SetInterrupt(FALSE)
+GiveItemCreate("bsprpass",[PC],1,0,0)
 SetGlobal("bsGavePrisonPass","GLOBAL",1)
 ActionOverride("bstrcmdr",DestroyItem("MINHP1"))
 SetGlobal("bsDoppelgangerQuest","GLOBAL",6)
 SetGlobalTimer("bsDoppelgangerQuestTimer","GLOBAL",FIVE_DAYS)
 EraseJournalEntry(@816)
 EraseJournalEntry(@817)
-AddJournalEntry(@823,QUEST)~ EXIT
-IF ~Global("bsJumpStartDGQuest","GLOBAL",0)~ THEN DO ~
+AddJournalEntry(@823,QUEST)
+SetInterrupt(TRUE)~ EXIT
+IF ~Global("bsJumpStartDGQuest","GLOBAL",0)~ THEN DO ~SetInterrupt(FALSE)
 ActionOverride("bstrcmdr",DestroyItem("MINHP1"))
 SetGlobal("bsKnowsBreakthrough","LOCALS",1)
 SetGlobal("bsDoppelgangerQuest","GLOBAL",6)
 SetGlobalTimer("bsDoppelgangerQuestTimer","GLOBAL",FIVE_DAYS)
 EraseJournalEntry(@816)
 EraseJournalEntry(@817)
-AddJournalEntry(@818,QUEST)~ EXIT
+AddJournalEntry(@818,QUEST)
+SetInterrupt(TRUE)~ EXIT
 
 
 APPEND bstrcmdr 
@@ -186,7 +190,7 @@ IF ~~ THEN + doppelgangers_18
 END
 
 IF ~~ THEN doppelgangers_18
-SAY ~Go to the barracks and talk to Captain Dungarth when you want to join the fight, and do it as soon as possible. Now that we are aware of the situation, we cannot not waste any more time than necessary to settle this.~
+SAY ~Go to the barracks and talk to Captain Dungarth when you want to join the fight, and do it as soon as possible. Now that we are aware of the situation, we cannot waste any more time than necessary to settle this.~
 IF ~~ THEN + doppelgangers_15
 END
 

bst/dialog/z_well_encounter.d

@@ -104,7 +104,7 @@ InParty("alora") InMyArea("alora") !StateCheck("alora",CD_STATE_NOTVALID)~ THEN
 == ~%MONTARON_JOINED%~ IF ~Global("bsGoldIntoWell","MYAREA",4)
 InParty("montaron") InMyArea("montaron") !StateCheck("montaron",CD_STATE_NOTVALID)~ THEN ~[Montaron] Had I known you separate so easily with gold coins, I wouldn't have joined force with you, <CHARNAME>. Are we *done* here?!~
 == ~%IMOEN_JOINED%~ IF ~Global("bsGoldIntoWell","MYAREA",4)
-InParty("%IMOEN_DV%") InMyArea("%IMOEN_DV%") !StateCheck("%IMOEN_DV%",CD_STATE_NOTVALID)~ THEN ~[Imoen] I know I just did it myself, but... Imagining all the coins at the bottom of the cold, dark water - for *millenials* before someone makes them shine again is rather depressing... Have to focus on the wishes! The wishes. I hope you wished for someting great, <CHARNAME>!~
+InParty("%IMOEN_DV%") InMyArea("%IMOEN_DV%") !StateCheck("%IMOEN_DV%",CD_STATE_NOTVALID)~ THEN ~[Imoen] I know I just did it myself, but... Imagining all the coins at the bottom of the cold, dark water - for *millenia* before someone makes them shine again is rather depressing... Have to focus on the wishes! The wishes. I hope you wished for someting great, <CHARNAME>!~
 == ~%YESLICK_JOINED%~ IF ~Global("bsGoldIntoWell","MYAREA",4)
 InParty("yeslick") InMyArea("yeslick") !StateCheck("yeslick",CD_STATE_NOTVALID)
 Gender(Player1,MALE)~ THEN ~[Yeslick, PC male] I'm not sure what you are wishing there for, lad, but I'm pretty sure doing it multiple times will not increase the likelyhood of it coming true.~

bst/dialog/zz_quest_fireelemental.d

@@ -6,11 +6,11 @@ BEGIN bsfrelem
 CHAIN
 IF ~True()~ THEN bsfrelem fire_elemental
 ~The fire elemental is literally blocking the way to the alestore. It hovers in the least moist corner of the cellar and doesn't show any intentions of attacking you. It's flames seem to be dimmer than what you would expect.~
-== ~%IMOEN_JOINED%~ IF ~InParty("%IMOEN_DV%") InMyArea("%IMOEN_DV%") !StateCheck("%IMOEN_DV%",CD_STATE_NOTVALID)~ THEN @10250
-== ~%AJANTIS_JOINED%~ IF ~InParty("ajantis") InMyArea("ajantis") !StateCheck("ajantis",CD_STATE_NOTVALID)~ THEN @10251
-== ~%KAGAIN_JOINED%~ IF ~InParty("kagain") InMyArea("kagain") !StateCheck("kagain",CD_STATE_NOTVALID)~ THEN @10252
-== ~%JAHEIRA_JOINED%~ IF ~InParty("jaheira") InMyArea("jaheira") !StateCheck("jaheira",CD_STATE_NOTVALID)~ THEN @10253
-== ~%DYNAHEIR_JOINED%~ IF ~InParty("dynaheir") InMyArea("dynaheir") !StateCheck("dynaheir",CD_STATE_NOTVALID)~ THEN @10254
+== ~%IMOEN_JOINED%~ IF ~Global("bdFEInt_Imoen","MYAREA",0) InParty("%IMOEN_DV%") InMyArea("%IMOEN_DV%") !StateCheck("%IMOEN_DV%",CD_STATE_NOTVALID)~ THEN @10250 DO ~SetGlobal("bdFEInt_Imoen","MYAREA",1)~
+== ~%AJANTIS_JOINED%~ IF ~Global("bdFEInt_Ajantis","MYAREA",0) InParty("ajantis") InMyArea("ajantis") !StateCheck("ajantis",CD_STATE_NOTVALID)~ THEN @10251 DO ~SetGlobal("bdFEInt_Ajantis","MYAREA",1)~
+== ~%KAGAIN_JOINED%~ IF ~Global("bdFEInt_Kagain","MYAREA",0) InParty("kagain") InMyArea("kagain") !StateCheck("kagain",CD_STATE_NOTVALID)~ THEN @10252 DO ~SetGlobal("bdFEInt_Kagain","MYAREA",1)~
+== ~%JAHEIRA_JOINED%~ IF ~Global("bdFEInt_Jaheira","MYAREA",0) InParty("jaheira") InMyArea("jaheira") !StateCheck("jaheira",CD_STATE_NOTVALID)~ THEN @10253 DO ~SetGlobal("bdFEInt_Jaheira","MYAREA",1)~
+== ~%DYNAHEIR_JOINED%~ IF ~Global("bdFEInt_Dynaheir","MYAREA",0) InParty("dynaheir") InMyArea("dynaheir") !StateCheck("dynaheir",CD_STATE_NOTVALID)~ THEN @10254 DO ~SetGlobal("bdFEInt_Dynaheir","MYAREA",1)~
 == bsfrelem IF ~PartyHasItem("bsbarrl1") Global("bsWoodBarrelInfo","LOCALS",0)~ THEN ~(You could try and trap the fire elemental in the wooden barrel, but it would probably eat through the wood rather quickly. The barrel would best have a fire-proof coating on the inside.)~ DO ~SetGlobal("bsWoodBarrelInfo","LOCALS",1)~
 END
 IF ~!PartyHasItem("bsbarrl3")~ THEN EXIT

bst/documentation/english.bst.txt

@@ -394,8 +394,13 @@ Just like anywhere else, the graphics and area art of the mod is copyrighted acc
 
 HISTORY
 
-Version ##:
--changed 24bit Lightmaps to 8bit (bs0110,bs0111, bs0112).
+Version EAOB.8:
+-Fixed spawning of doppelganger in Master Shizell's study.
+-NPC interjections into fire elemental quest should only happen once.
+-changed 24bit Lightmaps to 8bit (bs0110,bs0111, bs0112) to prevent random crashing.
+-more BAMs for items in EE (uses BG2 BAMs).
+-item fixes.
+-typo corrections.
 
 Version EAOB.7:
 -Fletcher should give feathers quest when asked about the barrel.

bst/language/english/bst_setup.tra

@@ -436,7 +436,7 @@ The rat plague of the Seatower Inn turned out to be Betsy, the pet rat of the In
 //
 @793  = ~Missing Monk in the Seatower
 
-Lenard, a soldier of the Badluran's Saetower is missing his secret lover Martina, a monk from the Seatower's Ilmater Monastery who went missing while being on an errand in town. She was last seen at the Ilmater Shrine in north east Baldur's Gate. I should go there and ask around whether anyone has seen her lately.~
+Lenard, a soldier of the Balduran's Saetower is missing his secret lover Martina, a monk from the Seatower's Ilmater Monastery who went missing while being on an errand in town. She was last seen at the Ilmater Shrine in north east Baldur's Gate. I should go there and ask around whether anyone has seen her lately.~
 @794  = ~Missing Monk in the Seatower
 
 A beggar inside the Ilmater's Shrine suggested I'd go around ask other beggars about the missing monk Martina. I need to find the beggar who was here at the shrine when Martina was here.~
@@ -1598,7 +1598,7 @@ I brought a sebaceous gland of a Sea Troll to the Head Winchman of Balduran's Se
 
 /* Girl and mom in Winchhouse */
 @2455 = ~I'm waiting for the chain to be wound up again!~
-@2456 = ~It smells of old fish and sea weet in here. As if the usual stink on the tower grounds wouldn't be stenuous enough already.~
+@2456 = ~It smells of old fish and seaweed in here. As if the usual stink on the tower grounds wouldn't be bad enough already.~
 
 // Tanner
 @2500 = ~Ah, you again.~
@@ -2162,7 +2162,7 @@ I brought a sebaceous gland of a Sea Troll to the Head Winchman of Balduran's Se
 @10002  = 
 @10003  = 
 */
-@10004  = ~Yes, I know this is not the right pace for a young child like this boy. I can't help it that the old crone doesn't want to see him. Lars! Stop making a mess and drink your juice properly. Man, I wished someone would go upstairs and tell this woman that I am not getting paid for waiting up until she made up her mind about this child!~
+@10004  = ~Yes, I know this is not the right place for a young child like this boy. I can't help it that the old crone doesn't want to see him. Lars! Stop making a mess and drink your juice properly. Man, I wished someone would go upstairs and tell this woman that I am not getting paid for waiting up until she made up her mind about this child!~
 @10005  = ~Great, just great. The old crone left without talking to me. At least she sent some gold my way. Come on, Lars, let's find you a new home.~
 @10006  = ~Lars, just be quiet for a moment, yes? (sigh)~
 @10007  = ~Hello! Mister bought me three juices already! Mister is really nice!~ 
@@ -2292,7 +2292,7 @@ I brought a sebaceous gland of a Sea Troll to the Head Winchman of Balduran's Se
 @11020  = ~The shell is empty.~
 @11021  = ~Aaaaaaaahhhh!~
 @11022  = ~You covered all of the tower grounds using the "Mimic Powder" fumes, but there is no more doppelgangers to be found. It seems you already demasked all of them.~
-@11023  = ~The moment the cover is removed, a stenuous stench emerges from the debths below.~
+@11023  = ~The moment the cover is removed, a stinging stench emerges from the debths below.~
 @11024  = ~The fire of the beacon burns hot with a mighty roar.~
 @11025  = ~You put the barrel with the fire elemental into the beacon fire to release the creature.~
 @11026  = ~Can I put a stick into the fire?~

bst/setup-bst.tp2

@@ -1,6 +1,6 @@
 BACKUP ~bst/backup~
 AUTHOR ~https://www.gibberlings3.net/forums/forum/213-baldurans-seatower/~
-VERSION ~vEAOB.7~  
+VERSION ~vEAOB.8~  
 
 README ~bst/documentation/english.bst.txt~
 
@@ -507,11 +507,8 @@ END
 
 //##################################################
 // Bams
-	COPY ~bst/bam/.~ ~override/.~
-
-ACTION_IF GAME_IS ~bgt~ THEN BEGIN
-  COPY ~bst/bams_bg2/.~ ~override/.~
-END
+COPY ~bst/bam/.~ ~override/.~
+COPY ~bst/bams_bg2/.~ ~override/.~
 ACTION_IF GAME_IS ~bgee eet~ THEN BEGIN
   COPY ~bst/bams_ee/.~ ~override/.~
 END