Merge pull request #26 from Gitjas/master

update to v17

c#endlessbg1/c#endlessbg1.tp2

@@ -8,7 +8,7 @@
 BACKUP ~c#endlessbg1/backup~
 AUTHOR ~https://www.gibberlings3.net/forums/~ //jastey
 
-VERSION ~16~
+VERSION ~17~
 
 README ~c#endlessbg1/readme.c#endlessbg1.%LANGUAGE%.txt~ ~c#endlessbg1/readme.c#endlessbg1.english.txt~
 
@@ -55,6 +55,7 @@ ACTION_IF (GAME_IS ~bgee~ AND NOT FILE_EXISTS_IN_GAME ~bd0103.are~) THEN BEGIN
   OUTER_SET BGTIMOENPState0 = 0 
   OUTER_SET BGTIMOENPState4 = 4
   OUTER_SPRINT ~eet_2~ ~~
+  OUTER_SPRINT ~eet_0~ ~~
 OUTER_SET eet_200000 = GAME_IS ~eet~ ? 200000 : 0
 END
 
@@ -74,6 +75,7 @@ ACTION_IF (GAME_IS ~bgee~ AND FILE_EXISTS_IN_GAME ~bd0103.are~) THEN BEGIN
   OUTER_SET BGTIMOENPState0 = 0 
   OUTER_SET BGTIMOENPState4 = 4
   OUTER_SPRINT ~eet_2~ ~~
+  OUTER_SPRINT ~eet_0~ ~~
 OUTER_SET eet_200000 = GAME_IS ~eet~ ? 200000 : 0
 END
 
@@ -98,6 +100,7 @@ StartCutSceneEx("c#ebg122",TRUE)~
   OUTER_SET BGTIMOENPState0 = 0 
   OUTER_SET BGTIMOENPState4 = 4
   OUTER_SPRINT ~eet_2~ ~2~
+  OUTER_SPRINT ~eet_0~ ~0~
 OUTER_SET eet_200000 = GAME_IS ~eet~ ? 200000 : 0
 END
 

c#endlessbg1/korlasz_dungeon_bg1/korlasz_dungeon_bg1.d

@@ -58,7 +58,7 @@ InParty("%IMOEN_DV%") InMyArea("%IMOEN_DV%") !StateCheck("%IMOEN_DV%",CD_STATE_N
 InMyArea("LIIA") !StateCheck("LIIA",CD_STATE_NOTVALID)~ THEN @223 /* ~Here it is, Duke Liia. Look at the size of that pile!~ */
 == LIIA IF ~GlobalGT("C#EBG1_BhaalResearchKD","GLOBAL",2) GlobalLT("C#EBG1_BhaalResearchKD","GLOBAL",5)
 InMyArea("LIIA") !StateCheck("LIIA",CD_STATE_NOTVALID)~ THEN @224 /* ~I thank you for the tomes Imoen gave me. Here, take these for compensation.~ */ DO ~GiveItemCreate("SCRL07",Player1,2,0,0) SetGlobal("C#EBG1_BhaalResearchKD","GLOBAL",6)~
-== LIIA IF ~OR(2) PartyHasItem("BDSHBHR") GlobalGT("C#EBG1_BhaalResearchKD","GLOBAL",1)
+== LIIA IF ~PartyHasItem("BDSHBHR")
 GlobalLT("C#EBG1_BhaalResearchKD","GLOBAL",4)
 InMyArea("LIIA") !StateCheck("LIIA",CD_STATE_NOTVALID)~ THEN @225 /* ~I am very interested in these old tomes you found in Korlasz' family crypt for my research. Please hand them to me as soon as you can spare them, <CHARNAME>.~ */ DO ~SetGlobal("C#EBG1_BhaalResearchKD","GLOBAL",5)~
 END

c#endlessbg1/korlasz_dungeon_bg1/switch_dlgs/switch_npc_to_bg1_cutscene.baf

@@ -30,7 +30,7 @@ THEN
 	RESPONSE #100
 		CutSceneId(Player1)
 		ActionOverride("minsc",SetDialog("%MINSC_JOINED%"))
-		ActionOverride("minsc",ChangeAIScript("5MINSC_BCS%",OVERRIDE))
+		ActionOverride("minsc",ChangeAIScript("%MINSC_BCS%",OVERRIDE))
 END
 
 IF

c#endlessbg1/korlasz_dungeon_bg1/switch_dlgs/switch_npc_to_sod.baf

@@ -8,6 +8,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("%IMOEN_DV%",SetDialog("BDIMOEN"))
+		ActionOverride("%IMOEN_DV%",ChangeAIScript("BDIMOEN",OVERRIDE))
 		SetGlobal("C#EBG1_imoen_to_sod","MYAREA",2)
 END
 
@@ -18,6 +19,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("dynaheir",SetDialog("bddynahj"))
+		ActionOverride("dynaheir",ChangeAIScript("bddynahe",OVERRIDE))
 		SetGlobal("C#EBG1_dynaheir_to_sod","MYAREA",2)
 END
 
@@ -28,6 +30,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("minsc",SetDialog("bdminscj"))
+		ActionOverride("minsc",ChangeAIScript("bdminsc",OVERRIDE))
 		SetGlobal("C#EBG1_minsc_to_sod","MYAREA",2)
 END
 
@@ -38,6 +41,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Rasaad",SetDialog("bdRasaaj"))
+		ActionOverride("Rasaad",ChangeAIScript("bdrasaad",OVERRIDE))
 		SetGlobal("C#EBG1_Rasaad_to_sod","MYAREA",2)
 END
 
@@ -48,6 +52,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Viconia",SetDialog("bdViconj"))
+		ActionOverride("Viconia",ChangeAIScript("bdviconi",OVERRIDE))
 		SetGlobal("C#EBG1_Viconia_to_sod","MYAREA",2)
 END
 
@@ -58,6 +63,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Safana",SetDialog("bdSafanj"))
+		ActionOverride("Safana",ChangeAIScript("bdsafana",OVERRIDE))
 		SetGlobal("C#EBG1_Safana_to_sod","MYAREA",2)
 END
 
@@ -68,6 +74,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Edwin",SetDialog("bdEdwinj"))
+		ActionOverride("Edwin",ChangeAIScript("bdedwin",OVERRIDE))
 		SetGlobal("C#EBG1_Edwin_to_sod","MYAREA",2)
 END
 
@@ -78,6 +85,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Jaheira",SetDialog("bdJaheij"))
+		ActionOverride("Jaheira",ChangeAIScript("bdjaheir",OVERRIDE))
 		SetGlobal("C#EBG1_Jaheira_to_sod","MYAREA",2)
 END
 
@@ -88,6 +96,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Khalid",SetDialog("bdKhalij"))
+		ActionOverride("Khalid",ChangeAIScript("bdkhalid",OVERRIDE))
 		SetGlobal("C#EBG1_Khalid_to_sod","MYAREA",2)
 END
 
@@ -98,6 +107,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Dorn",SetDialog("bdDornj"))
+		ActionOverride("Dorn",ChangeAIScript("bddorn",OVERRIDE))
 		SetGlobal("C#EBG1_Dorn_to_sod","MYAREA",2)
 END
 
@@ -108,6 +118,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Neera",SetDialog("bdNeeraj"))
+		ActionOverride("Neera",ChangeAIScript("bdneera",OVERRIDE))
 		SetGlobal("C#EBG1_Neera_to_sod","MYAREA",2)
 END
 
@@ -118,6 +129,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Baeloth",SetDialog("bdBaeloj"))
+		ActionOverride("Baeloth",ChangeAIScript("bdbaelot",OVERRIDE))
 		SetGlobal("C#EBG1_Baeloth_to_sod","MYAREA",2)
 END
 
@@ -128,6 +140,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Ajantis",SetDialog("bdAjantj"))
+		ActionOverride("Ajantis",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Ajantis_to_sod","MYAREA",2)
 END
 
@@ -138,6 +151,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Alora",SetDialog("bdAloraj"))
+		ActionOverride("Alora",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Alora_to_sod","MYAREA",2)
 END
 
@@ -148,6 +162,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Branwen",SetDialog("bdBranwj"))
+		ActionOverride("Branwen",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Branwen_to_sod","MYAREA",2)
 END
 
@@ -158,6 +173,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Coran",SetDialog("bdCoranj"))
+		ActionOverride("Coran",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Coran_to_sod","MYAREA",2)
 END
 
@@ -168,6 +184,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Eldoth",SetDialog("bdEldotj"))
+		ActionOverride("Eldoth",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Eldoth_to_sod","MYAREA",2)
 END
 
@@ -178,6 +195,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Faldorn",SetDialog("bdFaldoj"))
+		ActionOverride("Faldorn",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Faldorn_to_sod","MYAREA",2)
 END
 
@@ -188,6 +206,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Garrick",SetDialog("bdGarrij"))
+		ActionOverride("Garrick",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Garrick_to_sod","MYAREA",2)
 END
 
@@ -198,6 +217,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Kagain",SetDialog("bdKagaij"))
+		ActionOverride("Kagain",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Kagain_to_sod","MYAREA",2)
 END
 
@@ -208,6 +228,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Kivan",SetDialog("bdKivanj"))
+		ActionOverride("Kivan",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Kivan_to_sod","MYAREA",2)
 END
 
@@ -218,6 +239,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Montaron",SetDialog("bdMontaj"))
+		ActionOverride("Montaron",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Montaron_to_sod","MYAREA",2)
 END
 
@@ -228,6 +250,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Quayle",SetDialog("bdQuaylj"))
+		ActionOverride("Quayle",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Quayle_to_sod","MYAREA",2)
 END
 
@@ -240,7 +263,9 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Shar-Teel",SetDialog("bdSharTj"))
+		ActionOverride("Shar-Teel",ChangeAIScript("",OVERRIDE))
 		ActionOverride("SharTeel",SetDialog("bdSharTj"))
+		ActionOverride("SharTeel",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_SharTeel_to_sod","MYAREA",2)
 END
 
@@ -251,6 +276,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Skie",SetDialog("bdSkiej"))
+		ActionOverride("Skie",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Skie_to_sod","MYAREA",2)
 END
 
@@ -261,6 +287,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Tiax",SetDialog("bdTiaxj"))
+		ActionOverride("Tiax",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Tiax_to_sod","MYAREA",2)
 END
 
@@ -271,6 +298,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Xan",SetDialog("bdXanj"))
+		ActionOverride("Xan",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Xan_to_sod","MYAREA",2)
 END
 
@@ -281,6 +309,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Xzar",SetDialog("bdXzarj"))
+		ActionOverride("Xzar",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Xzar_to_sod","MYAREA",2)
 END
 
@@ -291,6 +320,7 @@ IF
 THEN
 	RESPONSE #100
 		ActionOverride("Yeslick",SetDialog("bdYeslij"))
+		ActionOverride("Yeslick",ChangeAIScript("",OVERRIDE))
 		SetGlobal("C#EBG1_Yeslick_to_sod","MYAREA",2)
 END
 

c#endlessbg1/maincomponent/erasejournalentries.baf

@@ -0,0 +1,12 @@
+IF
+	GlobalGT("SarevokBehavior","GLOBAL",0)
+	Global("C#EBG1_EraseJournEntries","MYAREA",0)
+THEN
+	RESPONSE #100
+		EraseJournalEntry(%eet_2%27178) //Ivanne
+		EraseJournalEntry(%eet_2%27177) //Ivanne
+		EraseJournalEntry(%eet_2%%eet_0%9703) //Sorrel
+		EraseJournalEntry(%eet_2%%eet_0%9704) //Sorrel
+		SetGlobal("C#EBG1_EraseJournEntries","MYAREA",1)
+END
+

c#endlessbg1/maincomponent/general.tpa

@@ -309,4 +309,10 @@ EXTEND_BOTTOM ~%EBaldursGate_ThievesGuild%.bcs~ ~.../ar0146_detection_add.baf~ E
 
 /* give winski2.cre DV (same as Bg1NPC Project) */
 COPY_EXISTING ~winski2.cre~ ~override~
-  WRITE_ASCII 0x280 ~winski2~ #32
+  WRITE_ASCII 0x280 ~winski2~ #32
+
+
+
+/* erase open journal entries */
+
+EXTEND_BOTTOM ~%NBaldursGate_DucalPalace_L1%.bcs~ ~c#endlessbg1/maincomponent/erasejournalentries.baf~ EVALUATE_BUFFER 

c#endlessbg1/maincomponent/sarevok_cleanup.tpa

@@ -1,3 +1,17 @@
+/* NBaldursGate: Sorrel */
+<<<<<<<< .../ar0200_add.baf
+IF
+	Exists("SORREL")  // Sorrel
+	InMyArea("SORREL")
+	GlobalGT("SarevokBehavior","GLOBAL",0)
+THEN
+	RESPONSE #100
+		ActionOverride("SORREL",DestroySelf())
+END
+>>>>>>>>
+EXTEND_BOTTOM ~%NBaldursGate%.bcs~ ~.../ar0200_add.baf~
+
+
 /* NW Baldur's Gate : Sugar */
 <<<<<<<< .../ar0100_add.baf
 IF
@@ -269,6 +283,21 @@ END
 >>>>>>>>
 EXTEND_BOTTOM ~%CentralBaldursGate%.bcs~ ~.../ar0700_add.baf~
 
+
+/* NBaldursGate_ThreeOldKegs_L1: Delthyr */
+<<<<<<<< .../ar0119_add.baf
+IF
+	Exists("Delthyr")  // Delthyr
+	InMyArea("Delthyr")
+	GlobalGT("SarevokBehavior","GLOBAL",0)
+THEN
+	RESPONSE #100
+		ActionOverride("Delthyr",DestroySelf())
+END
+>>>>>>>>
+EXTEND_BOTTOM ~%CentralBaldursGate%.bcs~ ~.../ar0119_add.baf~
+
+
 /* E Baldur's Gate : Delthyr, Herschel, Tamoko */
   COPY_EXISTING ~%EBaldursGate%.bcs~ ~override~
 	DECOMPILE_AND_PATCH BEGIN