Merge pull request #24 from Gitjas/master

Update to Version 25.6:

bgqe/bragesword/brages_sword.d

@@ -860,7 +860,7 @@ END
 
 /* Borda was not met yet */
 IF ~OR(2)
-	Global("C#q13Brage_FakeMerchant","GLOBAL",0) /* PC came with third letter fromTazok's tent */
+	Global("C#q13Brage_FakeMerchant","GLOBAL",0) /* PC came with third letter from Tazok's tent */
 	Global("C#q13Brage_FakeMerchant","GLOBAL",4)~ THEN DO ~SetGlobal("C#q13Brage_FakeMerchant","GLOBAL",6) EraseJournalEntry(@1009)~ UNSOLVED_JOURNAL @1016 EXIT
 IF ~OR(2)
 	Global("C#q13Brage_FakeMerchant","GLOBAL",0)
@@ -895,17 +895,14 @@ END //APPEND
 
 
 /* Borda, der Händler verfluchter Waren */
-/* if met before, Borda will approach the PC after he made inquiries at MYSMER */
 
+/* check for first meeting in AR4700.are: */
+/* Add check variable whether Borda was met first time */
+ADD_TRANS_ACTION BORDA BEGIN 0 END BEGIN END ~IncrementGlobal("C#q13Brage_FakeMerchant","GLOBAL",1)~
 
 EXTEND_BOTTOM ~%tutu_var%BORDA~ 0
 /* PC heard from Laryssa about merchant of cursed items but didn't talk to MYSMER at Carneval and just tries his luck */
 + ~Global("C#q13Brage_FakeMerchant","GLOBAL",4)~ + @136 + confrontation_01
-
-/*
-/* PC spoke to MYSMER and confronts Borda */
-+ ~Global("C#q13Brage_FakeMerchant","GLOBAL",6)~ + @137 + confrontation_02
-*/
 END
 
 APPEND ~%tutu_var%BORDA~
@@ -918,6 +915,7 @@ EraseJournalEntry(@1009)
 Enemy()~ UNSOLVED_JOURNAL @1012 EXIT
 END
 
+/* PC spoke to MYSMER and confronts Borda: Borda will know at first meeting. */
 IF WEIGHT #-1
 ~Global("C#q13Brage_FakeMerchant","GLOBAL",6)~ THEN confrontation_02
 SAY @139
@@ -930,7 +928,7 @@ END
 
 END
 
-
+/* if met before, Borda will approach the PC after he made inquiries at MYSMER */
 BEGIN c#q13bor
 IF ~True()~ THEN confrontation
 SAY @139
@@ -941,4 +939,3 @@ EraseJournalEntry(@1016)
 EraseJournalEntry(@1017) Enemy()~ UNSOLVED_JOURNAL @1011 EXIT
 END
 
-

bgqe/bragesword/c#q13lar.baf

@@ -1,3 +1,20 @@
+/* [Borda is still alive and has to appear a second time.] Laryssa spawns outside temple in Nashkel after Nalin looked at the sword: set variable */
+IF
+	Global("C#q13_LarissaSpawn","MYAREA",1)
+	OR(2)
+		Global("C#q13Brage_FakeMerchant","GLOBAL",0)
+		Global("C#q13Brage_FakeMerchant","GLOBAL",1)
+	AreaCheck("%Nashkel%")
+	GlobalGT("C#q13Brage_NalinVouch","GLOBAL",1)
+	OR(2)
+		GlobalLT("C#Q13_BragesSwordQuest","GLOBAL",4)
+		Global("C#Q13_BragesSwordQuest","GLOBAL",6)
+THEN
+	RESPONSE #100
+		SetGlobal("C#q13_LarissaSpawn","MYAREA",2)
+		IncrementGlobal("C#q13Brage_FakeMerchant","GLOBAL",2)
+END
+
 IF
 	GlobalGT("BrageRiddle","GLOBAL",1)
 	AreaCheck("%ArchaeologicalSite%")

bgqe/bragesword/q13_ar4700.baf

@@ -1,5 +1,23 @@
 /* check, whether Borda was met the first time and is still alive */
 
+/* new for v25.6: IncrementGlobal("C#q13Brage_FakeMerchant","GLOBAL",1) is set in Borda's greeting's dialogue no matter what. Correct the variable if he's killed and letter is picked up afterwards: - hopefully, this will prevent the quest from not kicking in because the player left the area too quickly */
+/* correct variable if letter is picked up */
+IF
+	OR(4)
+		Global("C#q13Brage_FakeMerchant","GLOBAL",1)
+		Global("C#q13Brage_FakeMerchant","GLOBAL",3)
+		Global("C#q13Brage_FakeMerchant","GLOBAL",5)
+		Global("C#q13Brage_FakeMerchant","GLOBAL",7)
+	Dead("BORDA")
+	PartyHasItem("c#q13le2") //letter on Borda
+THEN
+	RESPONSE #100
+		IncrementGlobal("C#q13Brage_FakeMerchant","GLOBAL",-1)
+		Continue()
+END
+
+/* ald script blocks: I'll leave them in in case another mod adds to Borda after bgqe where the ADD_TRANS_ACTION was not patched to */ 
+/* met Borda before quest */
 IF
 	Global("C#q13Brage_FakeMerchant","GLOBAL",0)
 	!Exists("BORDA")
@@ -27,4 +45,4 @@ THEN
 	RESPONSE #100
 		IncrementGlobal("C#q13Brage_FakeMerchant","GLOBAL",1)
 		Continue()
-END
+END

bgqe/bragesword/q13_ar4800.baf

@@ -26,31 +26,14 @@ THEN
 END
 
 
+/* Laryssa spawn */
 /* [Borda is still alive and has to appear a second time.] Laryssa spawns outside temple in Nashkel after Nalin looked at the sword */
-IF
-	Global("C#q13_LarissaSpawn","MYAREA",0)
-	OR(2)
-		Global("C#q13Brage_FakeMerchant","GLOBAL",0)
-		Global("C#q13Brage_FakeMerchant","GLOBAL",1)
-	!Dead("BORDA") 
-	!Dead("Brage")
-	GlobalGT("C#q13Brage_NalinVouch","GLOBAL",1)
-	OR(2)
-		GlobalLT("C#Q13_BragesSwordQuest","GLOBAL",4)
-		Global("C#Q13_BragesSwordQuest","GLOBAL",6)
-THEN
-	RESPONSE #100
-		SetGlobal("C#q13_LarissaSpawn","MYAREA",1)
-		CreateCreature("c#q13lar",[2450.1198],13)
-		IncrementGlobal("C#q13Brage_FakeMerchant","GLOBAL",2)
-		Continue()
-END
-
 /* in case innocence was proven with third letter out of Tazok's tent (PC didn't need Larissa to find the merchant */
 IF
 	Global("C#q13_LarissaSpawn","MYAREA",0)
 	Dead("BORDA") 
 	!Dead("Brage")
+	!Dead("LARYSSA")
 	GlobalGT("C#q13Brage_NalinVouch","GLOBAL",1)
 	OR(2)
 		GlobalLT("C#Q13_BragesSwordQuest","GLOBAL",4)

bgqe/familytreasure/dialogues/c#q02005.d

@@ -165,6 +165,7 @@ END
 IF ~Global("C#Q02_DudleyQuestSolved","GLOBAL",1) !Global("C#Q02_GaveMoney","GLOBAL",1)~ THEN husband_dudley_01
 SAY @57
 IF ~~ THEN EXTERN C#Q02005 wife_dudley_01
+IF ~Global("C#Q02_MoneyOffer","GLOBAL",1)~ THEN EXTERN C#Q02005 wife_dudley_chain_run
 END
 
 IF ~Global("C#Q02_GaveNecklace","GLOBAL",1)~ THEN necklace_husband
@@ -534,7 +535,8 @@ IF ~~ THEN DO ~SetGlobal("C#Q02_DudleysLeave","GLOBAL",3) ActionOverride("C#Q020
 
 CHAIN
 IF WEIGHT #-1
-~Global("C#Q02_DudleyQuestSolved","GLOBAL",1) !Global("C#Q02_GaveMoney","GLOBAL",1)~ THEN C#Q02005 wife_dudley_01
+~Global("C#Q02_DudleyQuestSolved","GLOBAL",1) !Global("C#Q02_GaveMoney","GLOBAL",1)
+!Global("C#Q02_MoneyOffer","GLOBAL",1)~ THEN C#Q02005 wife_dudley_01
 @9
 
 == %XZAR_JOINED% IF ~Global("C#BGQE_NPCReactions","GLOBAL",0)
@@ -668,17 +670,8 @@ InParty("DYNAHEIR") Detect("DYNAHEIR") !StateCheck("DYNAHEIR",CD_STATE_NOTVALID)
 
 //Rasaad
 == %RASAAD_JOINED% IF ~Global("C#BGQE_NPCReactions","GLOBAL",0) InParty("RASAAD") Detect("RASAAD") !StateCheck("RASAAD",CD_STATE_NOTVALID)~ THEN @256
-
-== C#Q02005 @249
 END
-+ ~Global("C#Q02_MoneyOffer","GLOBAL",0) !Global("C#Q02_GotReward","GLOBAL",1)~ + @10 DO ~AddExperienceParty(500) SetGlobal("C#Q02_GotReward","GLOBAL",1)~ EXTERN ~C#Q02006~ chain_moneyoffer
-+ ~!Global("C#Q02_GotReward","GLOBAL",1)~ + @11 DO ~AddExperienceParty(500) SetGlobal("C#Q02_GotReward","GLOBAL",1)~ EXIT
-+ ~!Global("C#Q02_GotReward","GLOBAL",1)~ + @12 DO ~AddExperienceParty(500) SetGlobal("C#Q02_GotReward","GLOBAL",1)~ EXIT
-+ ~Global("C#Q02_MoneyOffer","GLOBAL",0) Global("C#Q02_GotReward","GLOBAL",1)~ + @10 EXTERN ~C#Q02006~ chain_moneyoffer
-+ ~Global("C#Q02_GotReward","GLOBAL",1)~ + @11 EXIT
-+ ~Global("C#Q02_GotReward","GLOBAL",1)~ + @12 EXIT
-+ ~Global("C#Q02_MoneyOffer","GLOBAL",1) PartyGoldGT(499)~ + @13 DO ~SetGlobal("C#Q02_MoneyOffer","GLOBAL",0) %ERASEJOURNALENTRY_10014%~ + necklace_sold
-
+IF ~~ THEN EXTERN C#Q02005 wife_dudley_chain_run
 
 CHAIN
 IF ~~ THEN C#Q02005 necklace_sold
@@ -881,3 +874,15 @@ InParty("MONTARON") Detect("MONTARON") !StateCheck("MONTARON",CD_STATE_NOTVALID)
 END
 IF ~~ THEN DO ~GiveItemCreate("C#Q02004",[PC],1,0,0) SetGlobal("C#Q02_GaveNecklace","GLOBAL",1) SetGlobalTimer("C#Q02_GaveNecklaceT","GLOBAL",TWO_DAYS)~ EXIT 
 
+CHAIN
+IF WEIGHT #-1
+~Global("C#Q02_MoneyOffer","GLOBAL",1)~ THEN C#Q02005 wife_dudley_chain_run
+@249
+END
++ ~Global("C#Q02_MoneyOffer","GLOBAL",0) !Global("C#Q02_GotReward","GLOBAL",1)~ + @10 DO ~AddExperienceParty(500) SetGlobal("C#Q02_GotReward","GLOBAL",1)~ EXTERN ~C#Q02006~ chain_moneyoffer
++ ~!Global("C#Q02_GotReward","GLOBAL",1)~ + @11 DO ~AddExperienceParty(500) SetGlobal("C#Q02_GotReward","GLOBAL",1)~ EXIT
++ ~!Global("C#Q02_GotReward","GLOBAL",1)~ + @12 DO ~AddExperienceParty(500) SetGlobal("C#Q02_GotReward","GLOBAL",1)~ EXIT
++ ~Global("C#Q02_MoneyOffer","GLOBAL",0) Global("C#Q02_GotReward","GLOBAL",1)~ + @10 EXTERN ~C#Q02006~ chain_moneyoffer
++ ~Global("C#Q02_GotReward","GLOBAL",1)~ + @11 EXIT
++ ~Global("C#Q02_GotReward","GLOBAL",1)~ + @12 EXIT
++ ~Global("C#Q02_MoneyOffer","GLOBAL",1) PartyGoldGT(499)~ + @13 DO ~SetGlobal("C#Q02_MoneyOffer","GLOBAL",0) %ERASEJOURNALENTRY_10014%~ + necklace_sold

bgqe/hamsterquest/scripts/c#q10_minsc.baf

@@ -11,7 +11,8 @@ END
 
 
 IF %BGT_VAR%
-	PartyHasItem("C#Q10001")
+//	PartyHasItem("C#Q10001")
+	HasItem("C#Q10001",Myself)
 	Global("C#Q10_HamsterQuest","GLOBAL",1)
 	InParty(Myself)
 	!StateCheck(Player1,CD_STATE_NOTVALID)
@@ -27,7 +28,8 @@ END
 /* check, ob itm in inventory -> triggers dialogue */
 
 IF %BGT_VAR%
-	PartyHasItem("C#Q10001")
+//	PartyHasItem("C#Q10001")
+	HasItem("C#Q10001",Myself)
 	Global("C#Q10_HamsterQuest","GLOBAL",2)
 	InParty(Myself)
 	See(Player1)
@@ -49,7 +51,8 @@ END
 IF %BGT_VAR%
 	!PartyHasItem("C#Q10002")
 	GlobalTimerExpired("C#Q10_HamsterTimer","GLOBAL")
-	PartyHasItem("C#Q10001")
+//	PartyHasItem("C#Q10001")
+	HasItem("C#Q10001",Myself)
 	Global("C#Q10_HamsterQuest","GLOBAL",3)
 	InParty(Myself)
 THEN
@@ -66,7 +69,8 @@ END
 IF %BGT_VAR%
 	PartyHasItem("C#Q10002")
 	GlobalTimerExpired("C#Q10_HamsterTimer","GLOBAL")
-	PartyHasItem("C#Q10001")
+//	PartyHasItem("C#Q10001")
+	HasItem("C#Q10001",Myself)
 	Global("C#Q10_HamsterQuest","GLOBAL",3)
 	InParty(Myself)
 	!StateCheck(Player1,CD_STATE_NOTVALID)
@@ -99,7 +103,8 @@ END
 
 IF %BGT_VAR%
 	GlobalTimerExpired("C#Q10_HamsterTimer","GLOBAL")
-	PartyHasItem("C#Q10001")
+//	PartyHasItem("C#Q10001")
+	HasItem("C#Q10001",Myself)
 	GlobalGT("C#Q10_HamsterQuest","GLOBAL",3)
 	InParty(Myself)
 THEN
@@ -110,7 +115,8 @@ END
 
 IF %BGT_VAR%
 	GlobalTimerExpired("C#Q10_HamsterTimer","GLOBAL")
-	PartyHasItem("C#Q10001")
+//	PartyHasItem("C#Q10001")
+	HasItem("C#Q10001",Myself)
 	GlobalGT("C#Q10_HamsterQuest","GLOBAL",3)
 	InParty(Myself)
 THEN
@@ -121,7 +127,8 @@ END
 
 IF %BGT_VAR%
 	GlobalTimerExpired("C#Q10_HamsterTimer","GLOBAL")
-	PartyHasItem("C#Q10001")
+//	PartyHasItem("C#Q10001")
+	HasItem("C#Q10001",Myself)
 	GlobalGT("C#Q10_HamsterQuest","GLOBAL",3)
 	InParty(Myself)
 THEN
@@ -132,7 +139,8 @@ END
 
 IF %BGT_VAR%
 	GlobalTimerExpired("C#Q10_HamsterTimer","GLOBAL")
-	PartyHasItem("C#Q10001")
+//	PartyHasItem("C#Q10001")
+	HasItem("C#Q10001",Myself)
 	GlobalGT("C#Q10_HamsterQuest","GLOBAL",3)
 	InParty(Myself)
 THEN
@@ -143,7 +151,8 @@ END
 
 IF %BGT_VAR%
 	GlobalTimerExpired("C#Q10_HamsterTimer","GLOBAL")
-	PartyHasItem("C#Q10001")
+//	PartyHasItem("C#Q10001")
+	HasItem("C#Q10001",Myself)
 	GlobalGT("C#Q10_HamsterQuest","GLOBAL",3)
 	InParty(Myself)
 THEN
@@ -154,7 +163,8 @@ END
 
 IF %BGT_VAR%
 	GlobalTimerExpired("C#Q10_HamsterTimer","GLOBAL")
-	PartyHasItem("C#Q10001")
+//	PartyHasItem("C#Q10001")
+	HasItem("C#Q10001",Myself)
 	GlobalGT("C#Q10_HamsterQuest","GLOBAL",3)
 	InParty(Myself)
 THEN

bgqe/readmes/english.bgqe.txt

@@ -380,11 +380,17 @@ MAINTENANCE NOTE: This mod accepts bug fixes, compatibility fixes, and translati
 
 HISTORY
 
+Version 25.6:
+-"Brage's Sword": optimized Laryssa's spawning and added check whether she's dead; made check whether Borda was met in AR4700.are more stable; letter and sword should not be stealable from Borda.
+-"Many Little Paws": no little hamsters should appear if not both hamsters are in Minsc's inventory.
+-"Bodies for a good cause": Sylar should also accept female bodies.
+-"Family Treasure Quest": at end, dialogue should not repeat completely if the family is spoken to again in case PC didn#t have enough gold to buy necklace.
+
 Version 25.5:
 -"Many Little Paws" (EET): Minsc should start the quest.
 
 Version 25.4:
--"Lovesick Half-Orc": Workaround for BG:EE removed because AR4300.are now has functioning area script assigned. Fixes bug od Ulguth not spawning.
+-"Lovesick Half-Orc": Workaround for BG:EE removed because AR4300.are now has functioning area script assigned. Fixes bug of Ulguth not spawning.
 
 Version 25.3:
 -"Brage's Sword": Larissa should not spawn twice if Borda was found and killed before finding and rescuing Brage.

bgqe/readmes/german.bgqe.txt

@@ -371,6 +371,12 @@ MAINTENANCE NOTE: This mod accepts bug fixes, compatibility fixes, and translati
 
 HISTORIE
 
+Version 25.6:
+-"Brage's Sword": optimized Laryssa's spawning and added check whether she's dead; made check whether Borda was met in AR4700.are more stable; letter and sword should not be stealable from Borda.
+-"Many Little Paws": no little hamsters should appear if not both hamsters are in Minsc's inventory.
+-"Bodies for a good cause": Sylar should also accept female bodies.
+-"Family Treasure Quest": at end, dialogue should not repeat completely if the family is spoken to again in case PC didn#t have enough gold to buy necklace.
+
 Version 25.5:
 -"Many Little Paws" (EET): Minsc should start the quest.
 

bgqe/readmes/italiano.bgqe.txt

@@ -380,6 +380,12 @@ MAINTENANCE NOTE: This mod accepts bug fixes, compatibility fixes, and translati
 
 HISTORY
 
+Version 25.6:
+-"Brage's Sword": optimized Laryssa's spawning and added check whether she's dead; made check whether Borda was met in AR4700.are more stable; letter and sword should not be stealable from Borda.
+-"Many Little Paws": no little hamsters should appear if not both hamsters are in Minsc's inventory.
+-"Bodies for a good cause": Sylar should also accept female bodies.
+-"Family Treasure Quest": at end, dialogue should not repeat completely if the family is spoken to again in case PC didn#t have enough gold to buy necklace.
+
 Version 25.5:
 -"Many Little Paws" (EET): Minsc should start the quest.
 

bgqe/readmes/polski.bgqe.txt

@@ -374,6 +374,12 @@ MAINTENANCE NOTE: This mod accepts bug fixes, compatibility fixes, and translati
 
 HISTORIE
 
+Version 25.6:
+-"Brage's Sword": optimized Laryssa's spawning and added check whether she's dead; made check whether Borda was met in AR4700.are more stable; letter and sword should not be stealable from Borda.
+-"Many Little Paws": no little hamsters should appear if not both hamsters are in Minsc's inventory.
+-"Bodies for a good cause": Sylar should also accept female bodies.
+-"Family Treasure Quest": at end, dialogue should not repeat completely if the family is spoken to again in case PC didn#t have enough gold to buy necklace.
+
 Version 25.5:
 -"Many Little Paws" (EET): Minsc should start the quest.
 

bgqe/setup-bgqe.tp2

@@ -11,7 +11,7 @@ BACKUP ~bgqe/Backup~
 AUTHOR ~Please post in one of the forums as listed in the readme~
 
 //MODDER
-VERSION ~v25.5~ 
+VERSION ~v25.6~ 
 
 README ~bgqe/readmes/%LANGUAGE%.bgqe.txt~ ~bgqe/readmes/english.bgqe.txt~