Needed changes for BG:EE

[jastey]

The changes to Ivanne in chapter 7 need to be adapted for BG:EE.
This is what bg1ub is currently doing:

Code: [Select]

//IVANNE, AR0114 - tells player his story, refers to Iron Throne and Eltan. (J)
ADD_TRANS_ACTION %tutu_var%IVANNE
BEGIN 5 END
BEGIN 0 END
~SetGlobal("TalkedToIvanne","GLOBAL",1)~ //told his story

REPLACE_STATE_TRIGGER %tutu_var%IVANNE 0 ~Global("TalkedToIvanne","GLOBAL",0)~ //won't tell his story twice

ADD_TRANS_TRIGGER %tutu_var%IVANNE 5
~!Dead("Cythan")
!Dead("Rashad")~
DO 0

EXTEND_BOTTOM %tutu_var%IVANNE 5
IF ~Dead("Cythan") !Dead("Rashad")~ THEN JOURNAL @1 DO ~SetGlobal("TalkedToIvanne","GLOBAL",1)~ EXIT
IF ~!Dead("Cythan") Dead("Rashad")~ THEN JOURNAL @2 DO ~SetGlobal("TalkedToIvanne","GLOBAL",1)~ EXIT
IF ~Dead("Cythan") Dead("Rashad")~ THEN JOURNAL @3 DO ~SetGlobal("TalkedToIvanne","GLOBAL",1)~ EXIT
END
This is what it should be doing:

Code: [Select]

//IVANNE, AR0114 - tells player his story, refers to Iron Throne and Eltan.

ADD_TRANS_TRIGGER %tutu_var%IVANNE 5
~!Dead("Cythan")
!Dead("Rashad")~
DO 0

EXTEND_BOTTOM %tutu_var%IVANNE 5
IF ~Dead("Cythan") !Dead("Rashad")~ THEN DO ~SetGlobal("IvanneStoryTold","GLOBAL",1)
EraseJournalEntry(27178)
EraseJournalEntry(27177)
~ SOLVED_JOURNAL @1 EXIT
IF ~!Dead("Cythan") Dead("Rashad")~ THEN DO ~SetGlobal("IvanneStoryTold","GLOBAL",1)
EraseJournalEntry(27178)
EraseJournalEntry(27177)
~ SOLVED_JOURNAL @2 EXIT
IF ~Dead("Cythan") Dead("Rashad")~ THEN DO ~SetGlobal("IvanneStoryTold","GLOBAL",1)
EraseJournalEntry(27178)
EraseJournalEntry(27177)
~ SOLVED_JOURNAL @3 EXIT
END

[Isewein]

Which file does this have to be changed in? Just about to set up a reinstall and thinking I might as well incorporate recent fixes floating around such as this manually...

[jastey]

It's in dialogues/u!ch7.d and dialogues/cpm/u!ch7.d. I'm not sure which one gets used for EE.

[Frenz]

Looking at "bg1ub_dialogues.tpa", the one used in BGEE should be  "/dialogues/u!ch7.d"

Here's the code:

Code: [Select]

///// Minor Dialogue Restorations                      \\\\\

ACTION_IF !GAME_IS ~bg1 totsc~ THEN BEGIN
  COMPILE EVALUATE_BUFFER ~bg1ub/dialogues/cpm/u!minor1.d~
  COMPILE EVALUATE_BUFFER ~bg1ub/dialogues/cpm/u!ch7.d~
  COMPILE EVALUATE_BUFFER ~bg1ub/dialogues/cpm/ubhobgo5.baf~
END ELSE BEGIN
  COMPILE EVALUATE_BUFFER ~bg1ub/dialogues/u!minor1.d~
  COMPILE ~bg1ub/dialogues/u!ch7.d~
  COMPILE ~bg1ub/dialogues/ubhobgo5.baf~
END
Am I wrong or the related "ELSE" block lacks two EVALUATE_BUFFER?

[jastey]

Without checking, I'd assume that the versions for bg1 do not include variables that need to be evaluated.

[Frenz]

For what it's worth, I just opened a PR with the change you mentioned.