Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update bg1npc.tp2

  • Loading branch information...
commit ba824c75c6bed43351d47a95b9fcdff9fb95edca 1 parent 32d76db
@cmorganbg authored
Showing with 38 additions and 39 deletions.
  1. +38 −39 bg1npc.tp2
View
77 bg1npc.tp2
@@ -1612,11 +1612,11 @@ END // of A_I G_I Tutu, BGT
PRETTY_PRINT_2DA
/* Tutu: Giving Imoen a banter file entry in the interdi.2da */
- ACTION_IF FILE_EXISTS_IN_GAME ~FW0100.are~ THEN BEGIN
+ ACTION_IF GAME_IS ~tutu~ THEN BEGIN
APPEND ~interdia.2da~ ~IMOEN _BIMOEN~ UNLESS ~_BIMOEN~
END
- /* BGT: Giving Imoen a banter file if the Fixpack isn't installed */
- ACTION_IF NOT (FILE_EXISTS_IN_GAME ~cdbehbla.pro~) AND (FILE_EXISTS_IN_GAME ~AR7200.are~) THEN BEGIN
+ /* BGT and BG:EE : Checking for Imoen's banter file if the Fixpack isn't installed */
+ ACTION_IF NOT (FILE_EXISTS_IN_GAME ~cdbehbla.pro~) AND (GAME_IS ~bgt bgee~) THEN BEGIN
ACTION_IF FILE_EXISTS_IN_GAME ~saradush.mve~ THEN BEGIN
COPY_EXISTING ~interdia.2da~ ~override~
SET_2DA_ENTRY 17 1 2 ~BIMOEN2~ // fixes ToB version
@@ -1631,22 +1631,22 @@ END // of A_I G_I Tutu, BGT
PRETTY_PRINT_2DA
/* Imoen BIMOEN.DLG check for Tutu */
- ACTION_IF NOT (FILE_EXISTS_IN_GAME ~_bimoen.dlg~) AND (FILE_EXISTS_IN_GAME ~FW0100.are~) THEN BEGIN
+ ACTION_IF NOT (FILE_EXISTS_IN_GAME ~_bimoen.dlg~) AND (GAME_IS ~tutu~) THEN BEGIN
COMPILE ~BG1NPC/Core/dlg/X#BIMOEN_TUTU.D~
END
/* Imoen BIMOEN.DLG check for BGT */
- ACTION_IF NOT (FILE_EXISTS_IN_GAME ~bimoen2.dlg~) AND (FILE_EXISTS_IN_GAME ~AR7200.are~) THEN BEGIN
+ ACTION_IF NOT (FILE_EXISTS_IN_GAME ~bimoen2.dlg~) AND (GAME_IS ~bgt~) THEN BEGIN
COMPILE ~BG1NPC/Core/dlg/X#BIMOEN_BGT.D~
END
/* give Imoen a J file in BG:EE */
- ACTION_IF NOT (FILE_EXISTS_IN_GAME ~imoenj.dlg~) AND (FILE_EXISTS_IN_GAME ~neera.dlg~) THEN BEGIN
+ ACTION_IF NOT (FILE_EXISTS_IN_GAME ~imoenj.dlg~) AND (GAME_IS ~bgee~) THEN BEGIN
COMPILE ~BG1NPC/Core/dlg/x#imoenj_bgee.d~
END
/* give CHARNAME a dialogue file in BG:EE */
- ACTION_IF NOT (FILE_EXISTS_IN_GAME ~player1.dlg~) AND (FILE_EXISTS_IN_GAME ~neera.dlg~) THEN BEGIN
+ ACTION_IF NOT (FILE_EXISTS_IN_GAME ~player1.dlg~) AND (GAME_IS ~bgt~) THEN BEGIN
COMPILE ~BG1NPC/Core/dlg/x#player1_bgee.d~
END
@@ -1803,7 +1803,7 @@ END // of A_I G_I Tutu, BGT
BUT_ONLY_IF_IT_CHANGES
END
- ACTION_IF FILE_EXISTS_IN_GAME ~fw0100.are~ THEN BEGIN
+ ACTION_IF GAME_IS ~tutu~ THEN BEGIN
/* Music File .2da patching, Tutu only */
COPY ~BG1NPC/Core/MUS/x#blank.mus~ ~music~
COPY_EXISTING ~songlist.2da~ ~override~
@@ -1883,31 +1883,32 @@ END // of A_I G_I Tutu, BGT
/* and GTIMES.IDS, ANIMATE.IDS patching to ToB, courtesy of the BG2 Fix Pack */
INCLUDE ~BG1NPC/LIB/ids_entries_cleanup.tph~
- ACTION_IF (FILE_EXISTS_IN_GAME ~FW0100.are~) THEN BEGIN
- /* Cleaning J files from junk states */
- COMPILE EVALUATE_BUFFER ~BG1NPC/Core/dlg/X#JFIX_TUTU.D~
-
- /* Changing DPLAYER2.bcs to stop BreakingPoint SDNS from hanging Tutu Only */
- COPY_EXISTING ~DPLAYER2.bcs~ ~override~
- DECOMPILE_BCS_TO_BAF
- REPLACE_TEXTUALLY CASE_INSENSITIVE ~!InParty(Myself)~ ~False()~
- REPLACE_TEXTUALLY CASE_INSENSITIVE ~ChangeAIScript("",DEFAULT)~ ~~
- REPLACE_TEXTUALLY CASE_INSENSITIVE ~SetGlobal("IHATEYOUALL","LOCALS",0)~ ~~
- COMPILE_BAF_TO_BCS
- BUT_ONLY_IF_IT_CHANGES
-
- EXTEND_TOP ~DPLAYER2.bcs~ ~BG1NPC/Core/baf/X#DPLYR2.BAF~
- END ELSE BEGIN /* BGT Versions */
- ACTION_IF FILE_EXISTS_IN_GAME ~ar7200.are~ THEN BEGIN
- /* Cleaning J files from junk states */
- COMPILE EVALUATE_BUFFER ~BG1NPC/Core/dlg/X#JFIX_BGT.D~
- END
+/* Tutu J File junk States, DPLAYER2.BCS */
+ACTION_IF (GAME_IS ~tutu~) THEN BEGIN
+ /* Cleaning J files from junk states */
+ COMPILE EVALUATE_BUFFER ~BG1NPC/Core/dlg/X#JFIX_TUTU.D~
+
+ /* Changing DPLAYER2.bcs to stop BreakingPoint SDNS from hanging Tutu Only */
+ COPY_EXISTING ~DPLAYER2.bcs~ ~override~
+ DECOMPILE_BCS_TO_BAF
+ REPLACE_TEXTUALLY CASE_INSENSITIVE ~!InParty(Myself)~ ~False()~
+ REPLACE_TEXTUALLY CASE_INSENSITIVE ~ChangeAIScript("",DEFAULT)~ ~~
+ REPLACE_TEXTUALLY CASE_INSENSITIVE ~SetGlobal("IHATEYOUALL","LOCALS",0)~ ~~
+ COMPILE_BAF_TO_BCS
+ BUT_ONLY_IF_IT_CHANGES
+
+ EXTEND_TOP ~DPLAYER2.bcs~ ~BG1NPC/Core/baf/X#DPLYR2.BAF~
+END
+
+/* BGT J File junk States, DPLAYER2.BCS */
+ACTION_IF GAME_IS ~bgt~ THEN BEGIN
+ /* Cleaning J files from junk states */
+ COMPILE EVALUATE_BUFFER ~BG1NPC/Core/dlg/X#JFIX_BGT.D~
+ /* Changing DPLAYER2.bcs to stop BreakingPoint SDNS from hanging is unnessesary in BGT */
+END
- /* Changing DPLAYER2.bcs to stop BreakingPoint SDNS from hanging */
- /* unnessesary in BGT */
- END
- /* Dialogue Correction in X#JFIX.D */
+/* Tutu, BGT, BG:EE Dialogue Correction in X#JFIX.D */
COPY_EXISTING ~%UC_TofB_BCS%.bcs~ ~override~
DECOMPILE_BCS_TO_BAF
REPLACE_TEXTUALLY CASE_INSENSITIVE
@@ -1922,7 +1923,7 @@ END // of A_I G_I Tutu, BGT
COMPILE_BAF_TO_BCS
BUT_ONLY_IF_IT_CHANGES
- /* Trying to prevent Alora from Stuttering. */
+/* Trying to prevent Alora from Stuttering. */
COPY_EXISTING ~%tutu_var%ALORA.bcs~ ~override~
DECOMPILE_BCS_TO_BAF
REPLACE_TEXTUALLY CASE_INSENSITIVE
@@ -2011,7 +2012,8 @@ END // of A_I G_I Tutu, BGT
INCLUDE ~BG1NPC\LIB\tutu_area_script_assign.tph~
END
- ACTION_IF (FILE_EXISTS_IN_GAME ~fw0100.are~) OR (FILE_EXISTS_IN_GAME ~ar7200.are~) THEN BEGIN
+/* Do we need to extend this to BG:EE? */
+ ACTION_IF (GAME_IS ~tutu~) OR (GAME_IS ~bgt~) THEN BEGIN
/* Area Type Flagging */
/* ToSC only: Tutu and BGT */
ACTION_IF (FILE_EXISTS_IN_GAME ~FW1500.are~) OR (FILE_EXISTS_IN_GAME ~ARW500.are~) THEN BEGIN // if TotSC is installed
@@ -2119,7 +2121,7 @@ BEGIN @1007
GROUP @1006
REQUIRE_FILE ~override/X#BG1NPCCore.G3~ @1004 /* BG1 NPC Required Changes component is not installed. */
COPY ~BG1NPC/Core/X#component.xx~ ~override/X#BG1NPCPhase1.G3~
- COPY ~BG1NPC/Core/X#component.xx~ ~override/X#BG1NPCPhase2.G3~
+ COPY ~BG1NPC/Core/X#component.xx~ ~override/X#BG1NPCPhase2.G3~ //legacy file, leave in
/* makes sure PIDs go last */
UNINSTALL ~bg1npc.tp2~ 200
@@ -2128,9 +2130,6 @@ BEGIN @1007
COPY ~BG1NPC/TRA/%LANGUAGE%/X#ADDIAL_tmp.tra~ ~BG1NPC/TRA/%LANGUAGE%/X#ADDIAL.tra~
EVALUATE_BUFFER
- /* BGT compatability macro */
- INCLUDE ~BG1NPC/LIB/macro_tutu_items_to_bgt.tph~
-
/* Patching _ELDOTH.bcs */
COPY_EXISTING ~%ELDOTH_BCS%.bcs~ ~override~
DECOMPILE_BCS_TO_BAF
@@ -2165,7 +2164,7 @@ BEGIN @1007
SAY NAME2 @7
SAY UNIDENTIFIED_DESC @8
SAY DESC @9
- PATCH_IF (~%tutuorbgt%~ STRING_COMPARE_CASE ~BGT~ = 0) THEN BEGIN
+ PATCH_IF !(~%tutubgtbgee%~ STRING_COMPARE_CASE ~tutu~ = 0) THEN BEGIN // "if not tutu, do this"
WRITE_ASCII 0x44 ~GSHLD03~ #8 // ground icon8
END
@@ -3504,7 +3503,7 @@ BEGIN @1007
ADD_CRE_ITEM ~%tutu_var%POTN07~ #0 #0 #0 ~IDENTIFIED~ ~INV6~
ADD_CRE_ITEM ~X#CODYE1~ #0 #0 #0 ~IDENTIFIED&UNSTEALABLE~ ~INV1~
WRITE_EVALUATED_ASCII 0x258 ~%tutu_var%THIEF4~ #8 // Race script
- PATCH_IF (~%tutuorbgt%~ STRING_COMPARE_CASE ~BGT~ = 0) THEN BEGIN
+ PATCH_IF !(~%tutubgtbgee%~ STRING_COMPARE_CASE ~tutu~ = 0) THEN BEGIN
WRITE_ASCII 0x268 ~WTARSGT~ #8
WRITE_ASCII 0x250 ~INITDLG~ #8
END
Please sign in to comment.
Something went wrong with that request. Please try again.