Merge pull request #6 from Gitjas/master

update to v4

c#greythedog/Setup-c#greythedog.tp2

@@ -15,7 +15,7 @@ AUTHOR ~https://www.gibberlings3.net/forums/forum/211-grey-the-dog/~
 
 //MODDER
 
-VERSION ~3~ 
+VERSION ~4~ 
 
 README ~c#greythedog/readme.greythedog.%LANGUAGE%.txt~ ~c#greythedog/readme.greythedog.english.txt~
 
@@ -261,11 +261,15 @@ END
 ACTION_IF GAME_IS ~bgee~ THEN BEGIN
   /* #31323: Farmer Brun's Missing Son */
   ADD_JOURNAL TITLE (#31323) @100002 USING ~c#greythedog\tra\%LANGUAGE%\journal.tra~
+  /* #31418: The Tale of Captain Brage */
+  ADD_JOURNAL TITLE (#31418) @100000 @100001 USING ~c#greythedog\tra\%LANGUAGE%\journal.tra~
 END
 
 ACTION_IF GAME_IS ~eet~ THEN BEGIN
   /* #31323: Farmer Brun's Missing Son */
   ADD_JOURNAL TITLE (#231323) @100002 USING ~c#greythedog\tra\%LANGUAGE%\journal.tra~
+  /* #31418: The Tale of Captain Brage */
+  ADD_JOURNAL TITLE (#231418) @100000 @100001 USING ~c#greythedog\tra\%LANGUAGE%\journal.tra~
 END
 
 ADD_JOURNAL TITLE (@100016) @100003 @100004 @100005 @100006 @100007 USING ~c#greythedog\tra\%LANGUAGE%\journal.tra~

c#greythedog/dialog/c#grey_interjections_bg1.d

@@ -91,7 +91,7 @@ END
 
 IF ~~ THEN jondalar_08
 SAY @31
-IF ~~ THEN DO ~EraseJournalEntry(@10008)~ SOLVED_JOURNAL @100009 + jondalar_11
+IF ~~ THEN DO ~EraseJournalEntry(@100008)~ SOLVED_JOURNAL @100009 + jondalar_11
 END
 
 IF ~~ THEN jondalar_09
@@ -149,19 +149,41 @@ END //APPEND
 
 /* BG1 */
 
+ADD_TRANS_ACTION ~%tutu_var%TAEROM~ BEGIN 1 END BEGIN END ~IncrementGlobal("C#Grey_TaeromArmorCheck","GLOBAL",1)~
+
+ADD_TRANS_ACTION ~%tutu_var%TAEROM~ BEGIN 5 END BEGIN END ~IncrementGlobal("C#Grey_TaeromArmorCheck","GLOBAL",1)~
+
+ADD_TRANS_ACTION ~%tutu_var%TAEROM~ BEGIN 9 END BEGIN END ~IncrementGlobal("C#Grey_TaeromArmorCheck","GLOBAL",1)~
+
 /* Beregost: Thunderhammer Smithy. Armor for Grey! */
 EXTEND_BOTTOM ~%tutu_var%TAEROM~ 0
 + ~Global("C#Grey_TaeromTeeth","GLOBAL",2) PartyHasItem("C#GrTo#1") PartyGoldGT(2999) !Global("C#Grey_TaeromArmor","GLOBAL",2)~ + @40 + weapon_offer_02
 + ~Global("C#Grey_TaeromTeeth","GLOBAL",2) PartyHasItem("C#GrTo#1") PartyGoldGT(2999) Global("C#Grey_TaeromArmor","GLOBAL",2)~ + @40 + wardog_armor_03_d
-+ ~Global("MakeArmor","GLOBAL",2) Global("C#Grey_TaeromArmor","GLOBAL",0)~ + @41 DO ~setGlobal("C#Grey_TaeromArmor","GLOBAL",1)~ + wardog_armor
++ ~GlobalGT("C#Grey_TaeromArmorCheck","GLOBAL",0) Global("C#Grey_TaeromArmor","GLOBAL",0)~ + @41 DO ~SetGlobal("C#Grey_TaeromArmor","GLOBAL",1)~ + wardog_armor
 + ~!Global("C#Grey_TaeromTeeth","GLOBAL",3) PartyHasItem("%tutu_var%MISC12") PartyGoldGT(3999) Global("C#Grey_TaeromArmor","GLOBAL",1)~ + @42 + wardog_armor_01
 + ~Global("C#Grey_TaeromTeeth","GLOBAL",3) PartyHasItem("%tutu_var%MISC12") PartyGoldGT(3999) Global("C#Grey_TaeromArmor","GLOBAL",1)~ + @42 + wardog_armor_03_c
 END
 
+EXTEND_BOTTOM ~%tutu_var%TAEROM~ 4
++ ~Global("C#Grey_TaeromTeeth","GLOBAL",2) PartyHasItem("C#GrTo#1") PartyGoldGT(2999) !Global("C#Grey_TaeromArmor","GLOBAL",2)~ + @40 + weapon_offer_02
++ ~Global("C#Grey_TaeromTeeth","GLOBAL",2) PartyHasItem("C#GrTo#1") PartyGoldGT(2999) Global("C#Grey_TaeromArmor","GLOBAL",2)~ + @40 + wardog_armor_03_b
++ ~GlobalGT("C#Grey_TaeromArmorCheck","GLOBAL",1) Global("C#Grey_TaeromArmor","GLOBAL",0)~ + @41 DO ~SetGlobal("C#Grey_TaeromArmor","GLOBAL",1)~ + wardog_armor
++ ~!Global("C#Grey_TaeromTeeth","GLOBAL",3) PartyHasItem("%tutu_var%MISC12") PartyGoldGT(3999) Global("C#Grey_TaeromArmor","GLOBAL",1)~ + @42 + wardog_armor_01
++ ~Global("C#Grey_TaeromTeeth","GLOBAL",3) PartyHasItem("%tutu_var%MISC12") PartyGoldGT(3999) Global("C#Grey_TaeromArmor","GLOBAL",1)~ + @42 + wardog_armor_03
+END
+
+EXTEND_BOTTOM ~%tutu_var%TAEROM~ 12
++ ~Global("C#Grey_TaeromTeeth","GLOBAL",2) PartyHasItem("C#GrTo#1") PartyGoldGT(2999) !Global("C#Grey_TaeromArmor","GLOBAL",2)~ + @40 + weapon_offer_02
++ ~Global("C#Grey_TaeromTeeth","GLOBAL",2) PartyHasItem("C#GrTo#1") PartyGoldGT(2999) Global("C#Grey_TaeromArmor","GLOBAL",2)~ + @40 + wardog_armor_03_b
++ ~GlobalGT("C#Grey_TaeromArmorCheck","GLOBAL",1) Global("C#Grey_TaeromArmor","GLOBAL",0)~ + @41 DO ~SetGlobal("C#Grey_TaeromArmor","GLOBAL",1)~ + wardog_armor
++ ~!Global("C#Grey_TaeromTeeth","GLOBAL",3) PartyHasItem("%tutu_var%MISC12") PartyGoldGT(3999) Global("C#Grey_TaeromArmor","GLOBAL",1)~ + @42 + wardog_armor_01
++ ~Global("C#Grey_TaeromTeeth","GLOBAL",3) PartyHasItem("%tutu_var%MISC12") PartyGoldGT(3999) Global("C#Grey_TaeromArmor","GLOBAL",1)~ + @42 + wardog_armor_03
+END
+
 EXTEND_BOTTOM ~%tutu_var%TAEROM~ 14
 + ~Global("C#Grey_TaeromTeeth","GLOBAL",2) PartyHasItem("C#GrTo#1") PartyGoldGT(2999) !Global("C#Grey_TaeromArmor","GLOBAL",2)~ + @40 + weapon_offer_02
 + ~Global("C#Grey_TaeromTeeth","GLOBAL",2) PartyHasItem("C#GrTo#1") PartyGoldGT(2999) Global("C#Grey_TaeromArmor","GLOBAL",2)~ + @40 + wardog_armor_03_b
-+ ~Global("MakeArmor","GLOBAL",2) Global("C#Grey_TaeromArmor","GLOBAL",0)~ + @41 DO ~setGlobal("C#Grey_TaeromArmor","GLOBAL",1)~ + wardog_armor
++ ~GlobalGT("C#Grey_TaeromArmorCheck","GLOBAL",0) Global("C#Grey_TaeromArmor","GLOBAL",0)~ + @41 DO ~SetGlobal("C#Grey_TaeromArmor","GLOBAL",1)~ + wardog_armor
 + ~!Global("C#Grey_TaeromTeeth","GLOBAL",3) PartyHasItem("%tutu_var%MISC12") PartyGoldGT(3999) Global("C#Grey_TaeromArmor","GLOBAL",1)~ + @42 + wardog_armor_01
 + ~Global("C#Grey_TaeromTeeth","GLOBAL",3) PartyHasItem("%tutu_var%MISC12") PartyGoldGT(3999) Global("C#Grey_TaeromArmor","GLOBAL",1)~ + @42 + wardog_armor_03
 END
@@ -221,7 +243,7 @@ GlobalTimerExpired("C#Grey_TaeromTimer","GLOBAL")~ THEN weapon_offer_03
 SAY @50
  IF ~~ THEN DO ~GiveItemCreate("C#GrToo1",LastTalkedToBy,0,0,0)
 SetGlobal("C#Grey_TaeromTeeth","GLOBAL",4)
-EraseJournalEntry(@10004)~ SOLVED_JOURNAL @100005 EXIT
+EraseJournalEntry(@100004)~ SOLVED_JOURNAL @100005 EXIT
 END
 
 IF ~~ THEN weapon_offer_04

c#greythedog/dialog/c#greyp.d

@@ -22,7 +22,8 @@ END
 
 IF ~~ leave
 SAY @4 /* ~Woof! (whines)~ */
-IF ~~ THEN DO ~SetGlobal("C#Grey_GreyJondalar","GLOBAL",3)
+IF ~~ THEN DO ~SetInterrupt(FALSE)
+SetGlobal("C#Grey_GreyJondalar","GLOBAL",3)
 SetGlobal("C#GreyJoined","GLOBAL",0)
 DestroyItem("c#grcol1")
 DestroyItem("c#grcol2")
@@ -33,20 +34,25 @@ DestroyItem("c#grpaw9")
 DestroyItem("c#grpa12")
 DestroyItem("c#grpa15")
 DestroyItem("c#grpa25")
-GivePartyAllEquipment() EscapeArea()~ EXIT
+GivePartyAllEquipment() 
+SetInterrupt(TRUE)
+EscapeArea()~ EXIT
 END
 
 IF ~~ follow_charname
 SAY @0 /* ~Woof!~ */
-IF ~~ THEN DO ~SetGlobal("C#GreyJoined","GLOBAL",2)
+IF ~~ THEN DO ~SetInterrupt(FALSE)
+SetGlobal("C#GreyJoined","GLOBAL",2)
 %Grey_MakeGlobalOverride%
 ChangeEnemyAlly(Myself, FAMILIAR)
 AddFamiliar()
 SetDialog("C#GreyJ")
 ChangeAIScript("DEFAULT",CLASS)
+//ChangeAIScript("FIGHTER2",CLASS)
 ChangeAIScript("",RACE)
 ChangeAIScript("",GENERAL)
-ChangeAIScript("",DEFAULT)~ EXIT
+ChangeAIScript("",DEFAULT)
+SetInterrupt(TRUE)~ EXIT
 END
 
 

c#greythedog/readme.greythedog.english.txt

@@ -140,6 +140,16 @@ This mod is also not developed, supported, or endorsed by BioWare, Black Isle St
 
 HISTORY
 
+Version 4:
+-Angel's item file structure fixes: Verified all the item files with DLTCEP and fixed the ones with inconsistencies, also made sure all magical weapons had an enchantment value set.
+-Compatibility with Tweaks Anthology "Allow Taerom to Make Additional Ankheg Armors": Option to forge Grey's Ankheg armor should be available if tweak is installed, too.
+-more typo corrections
+-7th party member mode: detecion of "party rested via scripted Rest()" should work now
+-(EE) journal entries belonging to "The Tale of Captain Brage" should be correctly added to journal.
+-7th party member mode: effects of C#5MINHP.spl should not be applied to party.
+-all journal entries should be erased from journal as intended
+-Scripts when changing into 7th party member mode and back should not be interrupted.
+
 Version 3:
 -Angel's fix for c#grtoo4.itm, Lauriel's fix for c#grtoo6.itm -> items should no longer gives install errors for Tweaks Anthology etc.
 -changed enchanted level from c#grtoo4.itm to "1"

c#greythedog/script/c#grey.baf

@@ -1,6 +1,5 @@
 /* c#grey Grey's main script */
 
-
 /* in case Grey follows as 7th party member and Player1 was rested via script and not via  RestParty() */
 
 /* spell and priciple taken from Zed Nocear's BG1 Trigger Simulations! */
@@ -22,9 +21,11 @@ IF
 	InMyArea(Player1)
 THEN
 	RESPONSE #100
+		SetInterrupt(FALSE)
 		SetGlobal("C#GreyRestCounter","GLOBAL",1)
 		Rest()
-		ReallyForceSpellRES("C#GRREST",Myself)		
+		ReallyForceSpellRES("C#GRREST",Myself)	
+		SetInterrupt(TRUE)	
 END
 
 /* follows as familiar: reset variable for refreshing of min HP spell after fight */
@@ -46,8 +47,10 @@ IF
 	See([ENEMY])
 THEN
 	RESPONSE #100
+		SetInterrupt(FALSE)
 		SetGlobal("C#Grey_Has1HPEffect","GLOBAL",2)
 		ReallyForceSpellRES("C#MIN5HP","C#Grey") 
+		SetInterrupt(TRUE)
 END
 
 
@@ -60,17 +63,20 @@ IF
 	CombatCounter(0)
 THEN
 	RESPONSE #100
+		SetInterrupt(FALSE)
 		ReallyForceSpellRES("C#GRREST","C#Grey")     	
 		SetGlobal("C#Grey_IsUnconscious","GLOBAL",0)		
 		DisplayStringHead(Myself,@50004)
 		ChangeEnemyAlly(Myself, FAMILIAR)
 		AddFamiliar()	
 		SetDialog("C#GreyJ")
 		ChangeAIScript("DEFAULT",CLASS)
+		//ChangeAIScript("FIGHTER2",CLASS)
 		ChangeAIScript("",RACE)
 		ChangeAIScript("",GENERAL)
 		ChangeAIScript("",DEFAULT)	
 		DisplayStringHead(Myself,@50007)
+		SetInterrupt(TRUE)
 END
 
 /* follows as familiar: fight ends - resetting health warn variable */
@@ -124,6 +130,7 @@ IF
 	HPLT(Myself,6)
 THEN
 	RESPONSE #100
+		SetInterrupt(FALSE)
 		DisplayStringHead(Myself,@50006) 
 		ClearActions(Myself)
 		RemoveFamiliar()
@@ -133,6 +140,7 @@ THEN
 		ChangeAIScript("",GENERAL)
 		ChangeAIScript("",DEFAULT)	
 		SetGlobal("C#Grey_IsUnconscious","GLOBAL",1)
+		SetInterrupt(TRUE)
 END
 
 /* follows as familiar: Grey is at 1 HP and passes out */
@@ -153,9 +161,12 @@ IF
 	Global("C#Grey_Has1HPEffect","GLOBAL",0)
 THEN
   RESPONSE #100
+		SetInterrupt(FALSE)
 		ReallyForceSpellRES("C#GRREST","C#Grey") //make sure there is no negative effect
 		ReallyForceSpellRES("C#MIN5HP","C#Grey") //give him min 5 HP and immunities
-		SetGlobal("C#Grey_Has1HPEffect","GLOBAL",1)	
+		SetGlobal("C#Grey_Has1HPEffect","GLOBAL",1)
+		IncrementGlobal("C#7thPartyMemberRestCounter","GLOBAL",1) 
+		SetInterrupt(TRUE)	
 END
 
 
@@ -166,8 +177,11 @@ IF
 	Global("C#Grey_Has1HPEffect","GLOBAL",1)
 THEN
   RESPONSE #100
+	SetInterrupt(FALSE)
 	ReallyForceSpellRES("C#MIN0HP","C#Grey")
-	SetGlobal("C#Grey_Has1HPEffect","GLOBAL",0)	
+	SetGlobal("C#Grey_Has1HPEffect","GLOBAL",0)
+	IncrementGlobal("C#7thPartyMemberRestCounter","GLOBAL",-1)
+	SetInterrupt(TRUE)	
 END
 
 /* talk to PC if kicked out unhappy */

c#greythedog/script/c#grey_sod_bd0120.baf

@@ -6,18 +6,21 @@ IF
 	NumInPartyLT(6)	
 THEN
 	RESPONSE #100
+		SetInterrupt(FALSE)
             	SetGlobal("C#Grey_Exists","GLOBAL",6)
 	    	CreateCreature("C#Grey03",[780.1578],S)
 		ActionOverride("C#Grey",MakeGlobalOverride()) 
 		ActionOverride("C#Grey",JoinParty())
 		SetGlobal("C#GreyJoined","GLOBAL",1)
+		SetInterrupt(TRUE)
 END
 
 IF 
 	Global("C#Grey_Exists","GLOBAL",0)
 	NumInParty(6)	
 THEN
 	RESPONSE #100
+		SetInterrupt(FALSE)
             	SetGlobal("C#Grey_Exists","GLOBAL",6)
 	    	CreateCreature("C#Grey03",[780.1578],S)
 		ActionOverride("C#Grey",MakeGlobalOverride())
@@ -27,7 +30,9 @@ THEN
 		ActionOverride("C#Grey",SetDialog("c#greyj"))
 		ActionOverride("C#Grey",AddFamiliar())
 		ActionOverride("C#Grey",ChangeAIScript("DEFAULT",CLASS))
+//		ActionOverride("C#Grey",ChangeAIScript("FIGHTER2",CLASS))
 		ActionOverride("C#Grey",ChangeAIScript("",RACE))
 		ActionOverride("C#Grey",ChangeAIScript("",GENERAL))
-		ActionOverride("C#Grey",ChangeAIScript("",DEFAULT))	
+		ActionOverride("C#Grey",ChangeAIScript("",DEFAULT))
+		SetInterrupt(TRUE)	
 END

c#greythedog/script/c#grey_sod_bdcut64x.baf

@@ -16,6 +16,7 @@ THEN
 		ActionOverride("C#Grey",AddFamiliar())
 		ActionOverride("C#Grey",SetDialog("C#GreyJ"))
 		ActionOverride("C#Grey",ChangeAIScript("DEFAULT",CLASS))
+//		ActionOverride("C#Grey",ChangeAIScript("FIGHTER2",CLASS))
 		ActionOverride("C#Grey",ChangeAIScript("",RACE))
 		ActionOverride("C#Grey",ChangeAIScript("",GENERAL))
 		ActionOverride("C#Grey",ChangeAIScript("",DEFAULT))	

c#greythedog/tra/english/c#grey_interjections_BG1.tra

@@ -21,15 +21,15 @@
 @20   = ~Know what... Grey already chose you as his master. And the way he ran away... No well-trained war dog should do this.~
 @21   = ~Know what... Grey already chose you as his mistress. And the way he ran away... No well-trained war dog should do this.~
 @22   = ~Well, you let him wander free on the premises...~
-@23   = ~I let him wander free on the premises, but that doesn't count. Grey should know this doesn't include following someone else astray. No, his value is deminished tremendously... I am not sure I would keep him as a trained dog, not after this.~
+@23   = ~I let him wander free on the premises, but that doesn't count. Grey should know this doesn't include following someone else astray. No, his value is deminished tremendously... I'm not sure I would keep him as a trained dog, not after this.~
 @24   = ~What? Jondalar, are you serious? Grey did such good... Ah, OK, gotcha, gotcha, sorry!~
 @25   = ~Yes, what a shame, but Jondalar is probably right. Grey should stay with you, kiddo. (winks)~
 @26   = ~Grey will stay with you, <CHARNAME>. Don't turn the offer down. A well-trained dog is a great help in any situation, especially in times like these.~
 @27   = ~Thank you very much, Jondalar. I appreciate it.~
-@28   = ~I'll take him with me, but you don't have to bad-talk him if you don't mean it.~
+@28   = ~I'll take him with me, but you don't have to bad-mouth him if you don't mean it.~
 @29   = ~No way. Sorry, but a dog is the last thing I'll need.~
 @30   = ~Ha! I knew I wouldn't succeed in messing about with you.~
-@31   = ~I tried to talk him small so it wouldn't be as awkward that I'd just leave him with you. But what I said is true, he seems to have accepted you now. They are intelligent, these wolfhounds. He's probably sensing that you need protection.~
+@31   = ~I only tried to bad-mouth him, so it wouldn't be as awkward when I left him with you. But what I said is true, he seems to have accepted you now. They are intelligent, these wolfhounds. He's probably sensing that you need protection.~
 @32   = ~Sorry to hear that, <CHARNAME>. If that is the case, I'll take him back with me.~
 @33   = ~Yes, take him with you. Good day.~
 @34   = ~On second thought... A trained war dog might come in handy.~
@@ -39,7 +39,7 @@
 @38   = ~Ha, good boy.~
 @39   = ~Farewell, and safe travels. I wished I could do more for you.~
 @40   = ~I want you to forge the poison weapon for my war dog now.~
-@41   = ~Is there any chance you could make an ankheg armor for a war dog, if I bring you another shell?~
+@41   = ~Is there any chance you could make an ankheg armor for a war dog, if I brought you another shell?~
 @42   = ~I have all you need to forge a war dog's ankheg armor. Please start righ away!~
 @43   = ~A war wolfhound! It's been a while since I saw one. I tell you what: I have a war dog's canine enforcer strap ready, but I didn't equip it with a weapon due to the iron shortage. You find me a good material I can use as weapon for the enforcing, and I'll forge it into a weapon for your dog.~
 @44   = ~What do I see? A spider's poison fang! Hm, with a little tweaking I could use this to equip the war dog's canine enforcer. It needs special treatment, so this would take a while - five days at least. I could do this for 3000 gold.~
@@ -78,7 +78,7 @@
 @77   = ~We have that cursed sword. Maybe my dog could sniff out the culprit who handed it to your captain?~
 @78   = ~I would like to investigate the incidents around Captain Brage a bit more. Could you give me some details?~
 @79   = ~Good day.~
-@80   = ~Is that so? We are grateful for any help we can get. Here, take his spare pair of gauntlets. It should have his scent enough for your dog to catch. Best you start right here, in the Garrison. Brage shortly returned here after... after being home. He went off right away, though. If only we would have been awake enough to realize. As it seems we can be thankful his rage didn't make him take advantage of us sleeping but let him flee instead...~
+@80   = ~Is that so? We are grateful for any help we can get. Here, take his spare pair of gauntlets. It should have enough of his scent for your dog to catch. Best you start right here, in the Garrison. Brage shortly returned here after... after being home. He went off right away, though. If only we would have been awake enough to realize. As it seems we can be thankful his rage didn't make him take advantage of us sleeping but let him flee instead...~
 @81   = ~(sigh) There is also the matter with the unit we sent after him. Five men! Five men and they didn't return. If you see anything of them, let us know. Time is passing and we start to assume the worst.~
 @82   = ~Well, Brage surely didn't spend any time to clean it, that's for sure. But I doubt your dog would smell anything beside the blood on its blade, plus, where would you start looking?~
 @83   = ~The cursed sword. It's another jigsaw falling into place.~
@@ -110,7 +110,7 @@
 @109  = ~Sniff! Grrrrr!~ [c#GREY06]
 @110  = ~The dog wantss the cat, too, hm?~
 @111  = ~Ssssss...~
-@112  = ~This is doppelgangers! Did I see it right that Grey smells them out? That is really extraordinary. I wasn't aware a dog can do this. Would think that it won't work on a Greater Doppelganger, though. Never heard of Durlag Trollkiller ordering a bunch of war dogs to get rid of his doppelganger poblem!~
+@112  = ~This is doppelgangers! Did I see it right that Grey smells them out? That is really extraordinary. I wasn't aware a dog can do this. Would think that it won't work on a Greater Doppelganger, though. Never heard of Durlag Trollkiller ordering a bunch of war dogs to get rid of his doppelganger problem!~
 @113  = ~We have to stop these foul creatures. How come the catacombs are overrun by doppelgangers?!~
 @114  = ~No! No chance. Grey senses your foulness!~
 @115  = ~By all that is good, <CHARNAME>, what have they done to your mind to haunt it so?~