RC11.2

- strref patching for Float Text(330)(Cynicism) using external EFF file and Param3(0x60)=StrRef (issue #29) - fixed issue with days passed counter during BG2 transition (issue #30) - removed Mur'Neth and Vynd BG1 compatibility importation patches due to native compatibility (issue #27)
Gibberlings3 · Nov 1, 2018 · c1bfa80 · c1bfa80
1 parent a315797
commit c1bfa80
Show file tree

Hide file tree

Showing 15 changed files with 112 additions and 139 deletions.
diff --git a/EET/compat/Vynd/include.tph b/EET/compat/Vynd/include.tph
diff --git a/EET/compat/Vynd/list.txt b/EET/compat/Vynd/list.txt
diff --git a/EET/compat/mur'neth/include.tph b/EET/compat/mur'neth/include.tph
diff --git a/EET/compat/mur'neth/list.txt b/EET/compat/mur'neth/list.txt
diff --git a/EET/compile/baf/K#TELBGT.baf b/EET/compile/baf/K#TELBGT.baf
@@ -61,9 +61,7 @@ IF
 THEN
   RESPONSE #100
     SetGlobal("K#FrameDelay","LOCALS",2)
-    SetGlobal("K#temp","GLOBAL",29)
     AdvanceTime(ONE_MONTH)
-    AddGlobals("K#DaysPassed","K#temp")
     ActionOverride("K#ImportContainer",TakeCreatureItems(Player1,ALL))
     ActionOverride("K#ImportContainer",TakeCreatureItems(Player2,ALL))
     ActionOverride("K#ImportContainer",TakeCreatureItems(Player3,ALL))

diff --git a/EET/lang/de_DE/compatibility.tra b/EET/lang/de_DE/compatibility.tra
@@ -1,7 +1,5 @@
 //Indira
 @5000000 = ~Bringt mir Indira, die Halbelfenkämpferin/magierin~
-//Mur'Neth
-@5000001 = ~Bringt mir Mur'Neth, den Ghaunadanischen Formwandler.~
 //Finch
 @5000002 = ~Bringt mir Finch, die gnomische Klerikerin.~
 //Gavin
@@ -10,8 +8,6 @@
 @5000004 = ~Bringt mir Valerie, die Hexenmeisterin.~
 //Isra
 @5000005 = ~Bringt mir Isra, die Paladinin.~
-//Vynd
-@5000006 = ~Bringt mir Vynd, den Drowmeuchelmörder.~
 //Sirene
 @5000007 = ~Bringt mir Sirene, die Tieflingspaladinin des Illmaters.~
 //Tenya

diff --git a/EET/lang/en_US/compatibility.tra b/EET/lang/en_US/compatibility.tra
@@ -1,7 +1,5 @@
 //Indira
 @5000000 = ~Bring me Indira, the half-elven fighter/mage.~
-//Mur'Neth
-@5000001 = ~Bring me Mur'Neth, the ghaunadan shapechanger.~
 //Finch
 @5000002 = ~Bring me Finch, the gnome cleric.~
 //Gavin
@@ -10,8 +8,6 @@
 @5000004 = ~Bring me Valerie, the sorceress.~
 //Isra
 @5000005 = ~Bring me Isra, the paladin.~
-//Vynd
-@5000006 = ~Bring me Vynd, the drow assassin.~
 //Sirene
 @5000007 = ~Bring me Sirene, the tiefling martyr.~
 //Tenya

diff --git a/EET/lang/es_ES/compatibility.tra b/EET/lang/es_ES/compatibility.tra
@@ -1,7 +1,5 @@
 //Indira
 @5000000 = ~Traedme a Indira, la guerrera y maga semielfa.~
-//Mur'Neth
-@5000001 = ~Traedme a Mur'Neth, el cambiaformas ghaunadan.~
 //Finch
 @5000002 = ~Traedme a Finch, la clérigo gnoma.~
 //Gavin
@@ -10,8 +8,6 @@
 @5000004 = ~Traedme a Valerie, la hechicera nata.~
 //Isra
 @5000005 = ~Traedme a Isra, la paladín.~
-//Vynd
-@5000006 = ~Traedme a Vynd, el asesino drow.~
 //Sirene
 @5000007 = ~Traedme a Sirene, la mártir tiflin.~
 //Tenya

diff --git a/EET/lang/fr_FR/compatibility.tra b/EET/lang/fr_FR/compatibility.tra
@@ -1,7 +1,5 @@
 //Indira
 @5000000 = ~Faites venir Indira, la guerričre/mage demi-elfe.~
-//Mur'Neth
-@5000001 = ~Faites venir Mur'Neth, le métamorphe ghaunadain.~
 //Finch
 @5000002 = ~Faites venir Finch, la gnome clerc.~
 //Gavin
@@ -10,8 +8,6 @@
 @5000004 = ~Faites venir Valérie, la sorcičre.~
 //Isra
 @5000005 = ~Faites venir Isra, la paladine.~
-//Vynd
-@5000006 = ~Faites venir Vynd, l'assassin drow.~
 //Sirene
 @5000007 = ~Faites venir Sirčne, la martyre tieffeline.~ // Martyr est le non du kit de paladin
 //Tenya

diff --git a/EET/lang/pl_PL/compatibility.tra b/EET/lang/pl_PL/compatibility.tra
@@ -1,7 +1,5 @@
 //Indira
 @5000000 = ~Przywołaj Indirę, półelfią wojowniczkę/maga.~
-//Mur'Neth
-@5000001 = ~Przywołaj Mur'Netha, ghaunadańskiego zmiennokształtnego.~
 //Finch
 @5000002 = ~Przywołaj Finch, gnomią kapłankę.~
 //Gavin
@@ -10,8 +8,6 @@
 @5000004 = ~Przywołaj Valerie, czarownicę.~
 //Isra
 @5000005 = ~Przywołaj Isrę, paladynkę.~
-//Vynd
-@5000006 = ~Przywołaj Vynd, mrocznego elfa zabójcę.~
 //Sirene
 @5000007 = ~Przywołaj Sirenę, męczenniczkę diabelstwo.~
 //Tenya

diff --git a/EET/lib/bg1_BCS.tph b/EET/lib/bg1_BCS.tph
@@ -1149,9 +1149,7 @@ THEN
     SetGlobal("DREAM","GLOBAL",7)
     SetGlobal("ENDOFBG1","GLOBAL",1)
     SetGlobal("NEWGAME_SOD","GLOBAL",1)
-    //SetGlobal("K#temp","GLOBAL",364)
     //AdvanceTime(ONE_YEAR)
-    //AddGlobals("K#DaysPassed","K#temp")
     RemoveWorldmapAreaFlag("BG0900",ENABLED) //Reveal from linked area
     ReallyForceSpellRES("K#REMBHA",Player1)
     TakeItemListPartyNum("K#PLOT",99)

diff --git a/EET/lib/bg2_BCS.tph b/EET/lib/bg2_BCS.tph
@@ -2429,9 +2429,7 @@ THEN
     SetGlobal("DREAM","GLOBAL",7)
     SetGlobal("ENDOFBG1","GLOBAL",2)
     SetGlobal("NEWGAME_SOA","GLOBAL",1)
-    //SetGlobal("K#temp","GLOBAL",364)
     //AdvanceTime(ONE_YEAR)
-    //AddGlobals("K#DaysPassed","K#temp")
     ActionOverride(Player1,LeaveAreaLUAPanic("AR0602","",[3744.2801],S))
     ActionOverride(Player1,LeaveAreaLUA("AR0602","",[3744.2801],S))
     ActionOverride(Player2,LeaveAreaLUA("AR0602","",[3585.2917],SWW))

diff --git a/EET/lib/macros.tph b/EET/lib/macros.tph
@@ -503,7 +503,7 @@ DEFINE_PATCH_FUNCTION ~EET_expand_tlk~
 								READ_LONG offset "strref"
 								LPM EET_expand_str
 								WRITE_LONG offset "%str%"
-								SPRINT headerType ~global~ LPM EET_clone
+								//SPRINT headerType ~global~ LPM EET_clone
 							END ELSE PATCH_IF ("%fx_type%" = 319) BEGIN //Restrict item
 								SET offset = ("%actors_emb_off%"+"%fx_off%"+0x30*cnt2+0x2c)
 								READ_LONG offset "strref"
@@ -527,7 +527,6 @@ DEFINE_PATCH_FUNCTION ~EET_expand_tlk~
 							OR ("%fx_type%" = 253) //Set automap note
 							OR ("%fx_type%" = 254) //Remove automap note
 							OR ("%fx_type%" = 290) //Change title
-							OR ("%fx_type%" = 330) //Float text
 							OR ("%fx_type%" = 338) //Disable rest or save
 							BEGIN
 								SET offset = ("%actors_emb_off%"+"%fx_off%"+0x108*cnt2+0x14)
@@ -559,6 +558,15 @@ DEFINE_PATCH_FUNCTION ~EET_expand_tlk~
 									LPM EET_expand_str
 									WRITE_LONG offset "%str%"
 								END
+							END ELSE PATCH_IF ("%fx_type%" = 330) BEGIN //Float text
+								SET offset = ("%actors_emb_off%"+"%fx_off%"+0x108*cnt2+0x14)
+								READ_LONG offset "strref"
+								LPM EET_expand_str
+								WRITE_LONG offset "%str%"
+								SET offset = ("%actors_emb_off%"+"%fx_off%"+0x108*cnt2+0x58)
+								READ_LONG offset "strref"
+								LPM EET_expand_str
+								WRITE_LONG offset "%str%"
 							END
 						END
 					END
@@ -646,49 +654,105 @@ DEFINE_PATCH_FUNCTION ~EET_expand_tlk~
 		END
 		READ_LONG ("%cre_struct_off%"+0x2c4) "fx_off"
 		READ_LONG ("%cre_struct_off%"+0x2c8) "fx_cnt"
+		READ_BYTE ("%cre_struct_off%"+0x33) "eff_ver"
 		FOR (cnt=0; cnt<"%fx_cnt%"; cnt=cnt+1) BEGIN
-			READ_LONG ("%fx_off%"+0x108*cnt+0x8) "fx_type"
-			PATCH_IF ("%fx_type%" = 103) //Change name
-			OR ("%fx_type%" = 139) //Display string
-			OR ("%fx_type%" = 180) //Disallow item
-			OR ("%fx_type%" = 183) //Use EFF file while on type
-			OR ("%fx_type%" = 206) //Protection from spell
-			OR ("%fx_type%" = 253) //Set automap note
-			OR ("%fx_type%" = 254) //Remove automap note
-			OR ("%fx_type%" = 290) //Change title
-			OR ("%fx_type%" = 330) //Float text
-			OR ("%fx_type%" = 338) //Disable rest or save
-			BEGIN
-				SET offset = ("%fx_off%"+0x108*cnt+0x14)
-				READ_LONG offset "strref"
-				LPM EET_expand_str
-				WRITE_LONG offset "%str%"
-			END ELSE PATCH_IF ("%fx_type%" = 181) //Disallow item type
-			OR ("%fx_type%" = 324) //Immunity to spell and message
-			BEGIN
-				SET offset = ("%fx_off%"+0x108*cnt+0x40)
-				READ_LONG offset "strref"
-				LPM EET_expand_str
-				WRITE_LONG offset "%str%"
-			END ELSE PATCH_IF ("%fx_type%" = 267) BEGIN //Disable display string
-				SET offset = ("%fx_off%"+0x108*cnt+0x14)
-				READ_LONG offset "strref"
-				LPM EET_expand_str
-				WRITE_LONG offset "%str%"
-				PATCH_IF (~%SOURCE_EXT%~ STR_EQ ~cre~) BEGIN
-					SPRINT headerType ~global~ LPM EET_clone
+			PATCH_IF (eff_ver = 0) BEGIN //EFF v1
+				READ_SHORT ("%fx_off%"+0x30*cnt) "fx_type"
+				PATCH_IF ("%fx_type%" = 103) //Change name
+				OR ("%fx_type%" = 139) //Display string
+				OR ("%fx_type%" = 180) //Disallow item
+				OR ("%fx_type%" = 183) //Use EFF file while on type
+				OR ("%fx_type%" = 206) //Protection from spell
+				OR ("%fx_type%" = 253) //Set automap note
+				OR ("%fx_type%" = 254) //Remove automap note
+				OR ("%fx_type%" = 290) //Change title
+				OR ("%fx_type%" = 330) //Float text
+				OR ("%fx_type%" = 338) //Disable rest or save
+				BEGIN
+					SET offset = ("%fx_off%"+0x30*cnt+0x4)
+					READ_LONG offset "strref"
+					LPM EET_expand_str
+					WRITE_LONG offset "%str%"
+				END ELSE PATCH_IF ("%fx_type%" = 181) //Disallow item type
+				OR ("%fx_type%" = 324) //Immunity to spell and message
+				BEGIN
+					SET offset = ("%fx_off%"+0x30*cnt+0x2c)
+					READ_LONG offset "strref"
+					LPM EET_expand_str
+					WRITE_LONG offset "%str%"
+				END ELSE PATCH_IF ("%fx_type%" = 267) BEGIN //Disable display string
+					SET offset = ("%fx_off%"+0x30*cnt+0x4)
+					READ_LONG offset "strref"
+					LPM EET_expand_str
+					WRITE_LONG offset "%str%"
+					PATCH_IF (~%SOURCE_EXT%~ STR_EQ ~cre~) BEGIN
+						SPRINT headerType ~global~ LPM EET_clone
+					END
+				END ELSE PATCH_IF ("%fx_type%" = 319) BEGIN //Restrict item
+					SET offset = ("%fx_off%"+0x30*cnt+0x2c)
+					READ_LONG offset "strref"
+					LPM EET_expand_str
+					WRITE_LONG offset "%str%"
+					READ_LONG ("%fx_off%"+0x30*cnt+0x8) "ids_target"
+					PATCH_IF (ids_target = 10) BEGIN //Actor's name
+						SET offset = ("%fx_off%"+0x30*cnt+0x4)
+						READ_LONG offset "strref"
+						LPM EET_expand_str
+						WRITE_LONG offset "%str%"
+					END
 				END
-			END ELSE PATCH_IF ("%fx_type%" = 319) BEGIN //Restrict item
-				SET offset = ("%fx_off%"+0x108*cnt+0x40)
-				READ_LONG offset "strref"
-				LPM EET_expand_str
-				WRITE_LONG offset "%str%"
-				READ_LONG ("%fx_off%"+0x108*cnt+0x18) "ids_target"
-				PATCH_IF (ids_target = 10) BEGIN //Actor's name
+			END ELSE BEGIN //EFF v2
+				READ_LONG ("%fx_off%"+0x108*cnt+0x8) "fx_type"
+				PATCH_IF ("%fx_type%" = 103) //Change name
+				OR ("%fx_type%" = 139) //Display string
+				OR ("%fx_type%" = 180) //Disallow item
+				OR ("%fx_type%" = 183) //Use EFF file while on type
+				OR ("%fx_type%" = 206) //Protection from spell
+				OR ("%fx_type%" = 253) //Set automap note
+				OR ("%fx_type%" = 254) //Remove automap note
+				OR ("%fx_type%" = 290) //Change title
+				OR ("%fx_type%" = 338) //Disable rest or save
+				BEGIN
+					SET offset = ("%fx_off%"+0x108*cnt+0x14)
+					READ_LONG offset "strref"
+					LPM EET_expand_str
+					WRITE_LONG offset "%str%"
+				END ELSE PATCH_IF ("%fx_type%" = 181) //Disallow item type
+				OR ("%fx_type%" = 324) //Immunity to spell and message
+				BEGIN
+					SET offset = ("%fx_off%"+0x108*cnt+0x40)
+					READ_LONG offset "strref"
+					LPM EET_expand_str
+					WRITE_LONG offset "%str%"
+				END ELSE PATCH_IF ("%fx_type%" = 267) BEGIN //Disable display string
 					SET offset = ("%fx_off%"+0x108*cnt+0x14)
 					READ_LONG offset "strref"
 					LPM EET_expand_str
 					WRITE_LONG offset "%str%"
+					PATCH_IF (~%SOURCE_EXT%~ STR_EQ ~cre~) BEGIN
+						SPRINT headerType ~global~ LPM EET_clone
+					END
+				END ELSE PATCH_IF ("%fx_type%" = 319) BEGIN //Restrict item
+					SET offset = ("%fx_off%"+0x108*cnt+0x40)
+					READ_LONG offset "strref"
+					LPM EET_expand_str
+					WRITE_LONG offset "%str%"
+					READ_LONG ("%fx_off%"+0x108*cnt+0x18) "ids_target"
+					PATCH_IF (ids_target = 10) BEGIN //Actor's name
+						SET offset = ("%fx_off%"+0x108*cnt+0x14)
+						READ_LONG offset "strref"
+						LPM EET_expand_str
+						WRITE_LONG offset "%str%"
+					END
+				END ELSE PATCH_IF ("%fx_type%" = 330) BEGIN //Float text
+					SET offset = ("%fx_off%"+0x108*cnt+0x14)
+					READ_LONG offset "strref"
+					LPM EET_expand_str
+					WRITE_LONG offset "%str%"
+					SET offset = ("%fx_off%"+0x108*cnt+0x58)
+					READ_LONG offset "strref"
+					LPM EET_expand_str
+					WRITE_LONG offset "%str%"
 				END
 			END
 		END
@@ -704,7 +768,6 @@ DEFINE_PATCH_FUNCTION ~EET_expand_tlk~
 		OR ("%fx_type%" = 254) //Remove automap note
 		OR ("%fx_type%" = 267) //Disable display string
 		OR ("%fx_type%" = 290) //Change title
-		OR ("%fx_type%" = 330) //Float text
 		OR ("%fx_type%" = 338) //Disable rest or save
 		BEGIN
 			SET offset = 0x1c
@@ -730,6 +793,15 @@ DEFINE_PATCH_FUNCTION ~EET_expand_tlk~
 				LPM EET_expand_str
 				WRITE_LONG offset "%str%"
 			END
+		END ELSE PATCH_IF ("%fx_type%" = 330) BEGIN //Float text
+			SET offset = 0x1c
+			READ_LONG offset "strref"
+			LPM EET_expand_str
+			WRITE_LONG offset "%str%"
+			SET offset = 0x60
+			READ_LONG offset "strref"
+			LPM EET_expand_str
+			WRITE_LONG offset "%str%"
 		END
 	//ITM
 	END ELSE PATCH_IF (~%SOURCE_EXT%~ STR_EQ ~itm~) BEGIN