Merge pull request #18 from Gitjas/master

update to v10 and more

c#greythedog/Setup-c#greythedog.tp2

@@ -15,7 +15,7 @@ AUTHOR ~https://www.gibberlings3.net/forums/forum/211-grey-the-dog/~
 
 //MODDER
 
-VERSION ~9.1~ 
+VERSION ~10~ 
 
 README ~c#greythedog/readme.greythedog.%LANGUAGE%.txt~ ~c#greythedog/readme.greythedog.english.txt~
 
@@ -85,6 +85,8 @@ INCLUDE ~c#greythedog/lib/create_effect.tpa~
     OUTER_SPRINT ~IT_IS_SOD~ ~False()~
     OUTER_SPRINT ~tutu_var~ ~~
 
+    OUTER_SPRINT ~Heal_Grey~ ~~
+
     /* BGT Chapters - this doesn't have any significance, it is only needed so the d-files compile */
     OUTER_SPRINT "tutu_prologue" "0"
     OUTER_SPRINT "tutu_prologue_reset" "0"
@@ -97,6 +99,8 @@ INCLUDE ~c#greythedog/lib/create_effect.tpa~
     OUTER_SPRINT "tutu_chapter_7" "7"
 
     OUTER_SPRINT ~Grey_MakeGlobalOverride~ ~ActionOverride("C#Grey",MakeGlobal())~
+    OUTER_SPRINT ~Heal_Grey~ ~ActionOverride("C#Grey",ApplySpellRES("BGLIVE",Myself))
+	ActionOverride("C#Grey",ReallyForceSpellRES("SPWM168",Myself))~
   END
 
 
@@ -138,6 +142,8 @@ INCLUDE ~c#greythedog/lib/create_effect.tpa~
     OUTER_SPRINT ~IT_IS_SOD~ ~False()~
     OUTER_SPRINT ~tutu_var~ ~~
 
+    OUTER_SPRINT ~Heal_Grey~ ~~
+
     /* BGT Chapters - this doesn't have any significance, it is only needed so the d-files compile */
     OUTER_SPRINT "tutu_prologue" "0"
     OUTER_SPRINT "tutu_prologue_reset" "0"
@@ -170,6 +176,12 @@ INCLUDE ~c#greythedog/lib/create_effect.tpa~
       OUTER_SPRINT ~IT_IS_SOD~ ~Global("ENDOFBG1","GLOBAL",1)~
     END
 
+    OUTER_SPRINT ~Heal_Grey~ ~ApplySpellRES("bdresurr","C#Grey")
+		SmallWait(10)
+		ApplySpellRES("K#UNREST","C#Grey")
+		SmallWait(10)
+		ApplySpellRES("bdrejuve","C#Grey")
+		SmallWait(10)~
     OUTER_SET BG1AREA = IDS_OF_SYMBOL (~areatype~ ~BG1AREA~)
   END
 
@@ -188,7 +200,7 @@ INCLUDE ~c#greythedog/lib/create_effect.tpa~
   END
 
 
-
+OUTER_SET eet_200000 = GAME_IS ~eet~ ? 200000 : 0
 
 //////////////////////////////////////////////////////////////////////
 /* all following actions are only processed ONCE for the whole mod, independent of un- and reinstalling of single components */
@@ -214,6 +226,7 @@ END
 
     /* Copies tra files into the autotra-folder (to leave the originals untouched) */
     DEFINE_ACTION_FUNCTION autotra_workaround BEGIN
+      COPY ~c#greythedog/tra/english~  ~c#greythedog/tra/autotra/english~
       COPY ~c#greythedog/tra/english~  ~c#greythedog/tra/autotra/%LANGUAGE%~
       COPY ~c#greythedog/tra/%LANGUAGE%~  ~c#greythedog/tra/autotra/%LANGUAGE%~
     END
@@ -226,6 +239,7 @@ END
         INT_VAR
           infer_charsets = 1
         STR_VAR
+	  default_language = ~english~
           tra_path = EVAL ~c#greythedog/tra/autotra~
           noconvert_array = c#noconvert
           reload_array = c#reload

c#greythedog/dialog/grey_quest_sod.d

@@ -162,7 +162,7 @@ IF ~~ THEN ham_01
 SAY @53 /* [Belegarm]Oh, of course. If something goes wrong, everyone gets the memo right away, I suppose! A hock of the finest ham was stolen and we have not the slightest clue who did it. Why, what is it to you? Did your dog take it? */
 ++ @54 /* No, but a friendly scout informed me, saying it might be wise to clear up any possible misunderstandings. */ + ham_02_b
 ++ @55 /* No, he didn't, and neither did I. */ + ham_03
-++ @56 /* Don't be rediculous. */ + ham_02
+++ @56 /* Don't be ridiculous. */ + ham_02
 ++ @57 /* You have no idea who the thief would be, but are throwing accusations because you don't like me? */ + ham_02_a
 END
 
@@ -251,8 +251,8 @@ IF ~~ THEN + ham_05_d
 END
 
 IF ~~ THEN ham_07
-SAY @81 /* [Belegarm]Do you have any clues about who the thief could be? Or - do you want to offer your dog sniffing them out? What a rediculous thought, a dog inside a storage tent full of food. */
-++ @82 /* Is it that rediculous? Grey is well trained, he could take on a scent I am sure. */ + ham_08
+SAY @81 /* [Belegarm]Do you have any clues about who the thief could be? Or - do you want to offer your dog sniffing them out? What a ridiculous thought, a dog inside a storage tent full of food. */
+++ @82 /* Is it that ridiculous? Grey is well trained, he could take on a scent I am sure. */ + ham_08
 ++ @83 /* Well, I'll be on my way, then. */ + ham_14
 END
 
@@ -524,7 +524,7 @@ IF ~~ THEN + ham_bd3000_02
 END
 
 IF ~~ THEN ham_bd3000_05
-SAY @158 /* [Belegarm]This is getting rediculous. Someone going around, playing the gift fairy, saying it's from Baldur's Gate - with high chance from the stolen ham of all things? This sounds like a really bad jest to me - really bad, for whoever is doing this. If you hear anything, let me know! */
+SAY @158 /* [Belegarm]This is getting ridiculous. Someone going around, playing the gift fairy, saying it's from Baldur's Gate - with high chance from the stolen ham of all things? This sounds like a really bad jest to me - really bad, for whoever is doing this. If you hear anything, let me know! */
 IF ~~ THEN DO ~SetGlobal("C#Grey_SoDQuest","GLOBAL",11)~ UNSOLVED_JOURNAL @100507 EXIT
 END
 

c#greythedog/dialog/greypc_clicktalk.d

@@ -245,9 +245,9 @@ Global("Arrested","GLOBAL",1) Global("C#Grey_Capter6PID2","LOCALS",0)~ + @30 /*
 + ~Global("C#Grey_KnowBhaal","GLOBAL",1) Global("C#Grey_BhaalheritagePID","LOCALS",0)~ + @33 /* A child of Bhaal! I have the power in me, Grey. I will rule the world, and you will help me conquer it! Are you ready? */ /* @33 /* A child of Bhaal! I have the power in me, Grey. I will rule the world, and you will help me conquer it! Are you ready? */ */ DO ~SetGlobal("C#Grey_BhaalheritagePID","LOCALS",1)~ + talkto_growl
 
 /* Sarevok is dead! */
-+ ~Global("C#Grey_SarevokDeadPID","LOCALS",0)~ + @86 /* [PC Reply]Sarevok is finally dead, Grey... but will is really change anything? (sigh) */ /* ~Sarevok is finally dead, Grey... but will is really change anything? (sigh)~ */ DO ~SetGlobal("C#Grey_SarevokDeadPID","LOCALS",1)~ + talkto_whine 
-+ ~Global("C#Grey_SarevokDeadPID","LOCALS",0)~ + @87 /* [PC Reply]We did it, Grey! The murderer of Gorion is defeated. We are victorious! */ /* ~We did it, Grey! The murderer of Gorion is defeated. We are victorious!~ */ DO ~SetGlobal("C#Grey_SarevokDeadPID","LOCALS",1)~ + talkto_bark 
-+ ~Global("C#Grey_SarevokDeadPID","LOCALS",0)~ + @88 /* [PC Reply]Sarevok, the Iron Throne, the whole conspiracy! All fell by our hand, Grey! Nothing can stop us! */ /* ~Sarevok, the Iron Throne, the whole conspiracy! All fell by our hand, Grey! Nothing can stop us!~ */ DO ~SetGlobal("C#Grey_SarevokDeadPID","LOCALS",1)~ + talkto_growl
++ ~%BGT_VAR% Global("C#Grey_SarevokDeadPID","LOCALS",0) Dead("sarevok")~ + @86 /* [PC Reply]Sarevok is finally dead, Grey... but will is really change anything? (sigh) */ /* ~Sarevok is finally dead, Grey... but will is really change anything? (sigh)~ */ DO ~SetGlobal("C#Grey_SarevokDeadPID","LOCALS",1)~ + talkto_whine 
++ ~%BGT_VAR% Global("C#Grey_SarevokDeadPID","LOCALS",0) Dead("sarevok")~ + @87 /* [PC Reply]We did it, Grey! The murderer of Gorion is defeated. We are victorious! */ /* ~We did it, Grey! The murderer of Gorion is defeated. We are victorious!~ */ DO ~SetGlobal("C#Grey_SarevokDeadPID","LOCALS",1)~ + talkto_bark 
++ ~%BGT_VAR% Global("C#Grey_SarevokDeadPID","LOCALS",0) Dead("sarevok")~ + @88 /* [PC Reply]Sarevok, the Iron Throne, the whole conspiracy! All fell by our hand, Grey! Nothing can stop us! */ /* ~Sarevok, the Iron Throne, the whole conspiracy! All fell by our hand, Grey! Nothing can stop us!~ */ DO ~SetGlobal("C#Grey_SarevokDeadPID","LOCALS",1)~ + talkto_growl
 
 /* SoD */
 

c#greythedog/readme.greythedog.english.txt

@@ -7,7 +7,7 @@ Everything else: jastey
 
 GENERAL
 
-Please note: So far, the mod contains no official BGII content.
+Please note: So far, the mod contains no official BGII content. Grey is already available in Irenicus' Dungeon and can join the group, though.
 
 Grey is a full-fledged joinable NPC, but still a real dog. The only magic on him is his magically enchanted items.
 He has sensible interjections (Woof!), NPC banters (mostly NPC dialogues about him with the PC), a click dialogue (PID) if the PC feels like playing fetch or just needs someone to talk to. There are dialogue options that reflect the game story and I'll promise: Grey will always listen to your PC's woes. Grey initiates no dialogues so there is no friendship track and - I am really sorry, but no romance. Not even for Shapeshifters.
@@ -157,9 +157,11 @@ This mod is also not developed, supported, or endorsed by BioWare, Black Isle St
 
 HISTORY
 
-Version 9.1:
+Version 10:
 -Crossmod banter with Brandock should not end abruptly.
 -Grey's movement rate upped by 2 at level 1 (now +4 instead of +2 compared to before).
+-PIDs after Sarevok's death should not show before.
+-Optimized scripting for Transition to BGII (BGT/EET).
 
 Version 9:
 -SoD content completed.

c#greythedog/script/c#grey_bg1_transition.baf

@@ -3,41 +3,18 @@
 /* for BGT, this goes to ARAM00.bcs. */
 
 
-/* Grey is in party, but dead */
+/* Grey is in party */
 IF
 	InPartyAllowDead("C#Grey")
-	Dead("C#Grey")
 	GlobalLT("C#Grey_Exists","GLOBAL",5)
 THEN
 	RESPONSE #100
 		SetInterrupt(FALSE)
-		ReallyForceSpellRES("CLERIC_RESURRECTION","C#Grey") //SPRR712
+		%Heal_Grey%
 		ActionOverride("C#Grey",ChangeAIScript("",DEFAULT))
 		ActionOverride("C#Grey",LeaveParty())
-		SetGlobal("C#GreyJoined","GLOBAL",0)
-		SetGlobal("C#Grey_Exists","GLOBAL",5)
-		SetInterrupt(TRUE)
-		Continue()
-END
-
-
-/* Grey is in party alive - silent MoveGlobal */
-
-
-IF
-	InParty("C#Grey")
-	!Dead("C#Grey")
-	GlobalLT("C#Grey_Exists","GLOBAL",5)
-	GlobalLT("BD_PLOT","GLOBAL",51)
-THEN
-	RESPONSE #100
-		SetInterrupt(FALSE)
-		ReallyForceSpellRES("SPWM168","C#Grey") //Heal
-		ActionOverride("C#Grey",ChangeAIScript("",DEFAULT))
-		ActionOverride("C#Grey",LeaveParty())
-		SetGlobal("C#GreyJoined","GLOBAL",0)
 		ActionOverride("C#Grey",GivePartyAllEquipment())
-		SetGlobal("C#Grey_Exists","GLOBAL",5)
+		SetGlobal("C#GreyJoined","GLOBAL",0)
 		SetGlobal("C#Grey_Exists","GLOBAL",5)
 		SetInterrupt(TRUE)
 		Continue()
@@ -49,19 +26,17 @@ IF
 	!Dead("C#Grey")
 	Global("C#GreyJoined","GLOBAL",2)
 	GlobalLT("C#Grey_Exists","GLOBAL",5)
-	GlobalLT("BD_PLOT","GLOBAL",51)
 THEN
 	RESPONSE #100
 		SetInterrupt(FALSE)
-		ReallyForceSpellRES("SPWM168","C#Grey") //Heal
+		%Heal_Grey%
 		SetGlobal("C#GreyJoined","GLOBAL",0)
 		ActionOverride("C#Grey",RemoveFamiliar())
 		ActionOverride("C#Grey",ChangeAIScript("",DEFAULT))
 		ChangeEnemyAlly("C#Grey",NEUTRAL)
 		SetGlobal("C#GreyJoined","GLOBAL",0)
 		ActionOverride("C#Grey",GivePartyAllEquipment())
 		SetGlobal("C#Grey_Exists","GLOBAL",5)
-		SetGlobal("C#Grey_Exists","GLOBAL",5)
 		SetInterrupt(TRUE)
 		Continue()
 END

c#greythedog/script/c#grey_bg2_ar0602.baf

@@ -26,15 +26,15 @@ THEN
 	RESPONSE #100
 		SetInterrupt(FALSE)
 		SetGlobal("C#Grey_Exists","GLOBAL",10)
+		SetGlobal("C#GreyJoined","GLOBAL",0)
+		MoveGlobal("AR0602","C#Grey",[4245.1985])  // Grey
+//		MoveGlobal("AR0602","C#Grey",[3939.2929])  // ##for testing
+		%Heal_Grey%
 		ActionOverride("C#Grey",SetDialogue("C#Grey2"))
 		ActionOverride("C#Grey",ChangeAIScript("",DEFAULT))
 		ActionOverride("C#Grey",ChangeAIScript("C#Grey",OVERRIDE))
-		MoveGlobal("AR0602","C#Grey",[4245.1985])  // Grey
-//		MoveGlobal("AR0602","C#Grey",[3939.2929])  // ##for testing
-		ReallyForceSpellRES("SPWM168","C#Grey")  // Heal
-		SetGlobal("C#GreyJoined","GLOBAL",0)
-		ActionOverride("C#Grey",SetGlobal("C#LevelUp","LOCALS",0)) 
 	        ActionOverride("C#Grey",DestroyAllEquipment())
+		ActionOverride("C#Grey",SetGlobal("C#LevelUp","LOCALS",0)) 
 		SetInterrupt(TRUE)
 //		Continue()		
 END
@@ -51,13 +51,13 @@ THEN
 	RESPONSE #100
 		SetInterrupt(FALSE)
 		SetGlobal("C#Grey_Exists","GLOBAL",10)
+		SetGlobal("C#GreyJoined","GLOBAL",0)
 		CreateCreature("C#Grey02",[4245.1985],8)  // Grey
+		%Grey_MakeGlobalOverride%
 		ActionOverride("C#Grey",SetGlobal("C#LevelUp","LOCALS",0)) 
 		ActionOverride("C#Grey",SetDialogue("C#Grey2"))
 		ActionOverride("C#Grey",ChangeAIScript("C#Grey",OVERRIDE))
-		SetGlobal("C#GreyJoined","GLOBAL",0)
 	        ActionOverride("C#Grey",DestroyAllEquipment())
-		%Grey_MakeGlobalOverride%
 		SetInterrupt(TRUE)	
 //		Continue()		
 END
@@ -106,12 +106,22 @@ END
 
 IF
       GlobalGT("C#Grey_Exists","GLOBAL",9)
-      Global("C#Grey_weapons","MYAREA",0)	
+      Global("C#Gr_weapons_JailkTable","MYAREA",0)	
+THEN
+	RESPONSE #100
+		ActionOverride("JailkeepTable",CreateItem("c#grtoo0",1,0,0))
+      		SetGlobal("C#Gr_weapons_JailkTable","MYAREA",1)	
+//		Continue()	
+END
+
+IF
+      GlobalGT("C#Grey_Exists","GLOBAL",9)
+      Global("C#Gr_weapons_Chest7","MYAREA",0)	
 THEN
 	RESPONSE #100
-		ActionOverride("JailkeepTable",CreateItem("c#grtoo3",1,0,0))
-		ActionOverride("JailkeepTable",CreateItem("c#grarm3",1,0,0))
-      		SetGlobal("C#Grey_weapons","MYAREA",1)	
+		ActionOverride("Chest7",CreateItem("c#grarm2",1,0,0))
+		ActionOverride("Chest7",CreateItem("c#grhel2",1,0,0))
+      		SetGlobal("C#Gr_weapons_Chest7","MYAREA",1)	
 //		Continue()	
 END
 

c#greythedog/script/c#grey_eet_transition.baf

@@ -8,12 +8,7 @@ THEN
 		SetInterrupt(FALSE)
 		SetGlobal("C#Grey_EETBGIITransition","MYAREA",1)
 		DisableAI("C#Grey",FALSE)
-		ApplySpellRES("bdresurr","C#Grey")
-		smallWait(10)
-		ApplySpellRES("K#UNREST","C#Grey")
-		smallWait(10)
-		ApplySpellRES("bdrejuve","C#Grey")
-		smallWait(10)
+		%Heal_Grey%
 		ActionOverride("C#Grey",DestroyItem("c#grpaw1"))
 		ActionOverride("C#Grey",DestroyItem("c#grpaw3"))
 		ActionOverride("C#Grey",DestroyItem("c#grpaw6"))
@@ -39,12 +34,7 @@ THEN
 	RESPONSE #100
 		SetInterrupt(FALSE)
 		SetGlobal("C#Grey_EETBGIITransition","MYAREA",1)
-		ApplySpellRES("K#UNREST","C#Grey")
-		smallWait(10)
-		ApplySpellRES("bdrejuve","C#Grey")
-		smallWait(10)
-		ReallyForceSpellRES("C#MIN0HP","C#Grey")
-		smallWait(10)
+		%Heal_Grey%
 		SetGlobal("C#Grey_Has1HPEffect","GLOBAL",0)
 		ActionOverride("C#Grey",DestroyItem("c#grpaw1"))
 		ActionOverride("C#Grey",DestroyItem("c#grpaw3"))

c#greythedog/tra/russian/c#grey_sod.tra

@@ -6,7 +6,7 @@
 @5    = ~��� ������ �� ���� ��������, ������ �� �� ���, ��� ��������! ��� �� �����?~
 @6    = ~�� ��� � �� ������� �� ��� ������. ������ ��� ������ �� ���� ��������?~
 @7    = ~��� ������ �������, ���� ��� ��� ������� �������� ����������, �?~
-@8    = ~�����!~~ [c#GREY06]
+@8    = ~�����!~ [c#GREY06]
 @9    = ~(����������) (������)~ [C#Grey07]
 @10   = ~���, � ��... � �� ������� ���. � ������ �� �������!~
 @11   = ~����� ����, ��� ������ ������ ����� ����� ������. � ���� ���� �����-������ �� ����, ����� ������� �����?~