0.8.1

+Readme, +journals (some)
subtledoctor · Dec 23, 2024 · 7503978 · 7503978
1 parent d1cc3ea
commit 7503978
Show file tree

Hide file tree

Showing 15 changed files with 1,951 additions and 1,565 deletions.
diff --git a/README.MD b/README.MD
diff --git a/Reflections/Reflections.tp2 b/Reflections/Reflections.tp2
@@ -1,7 +1,7 @@
 BACKUP ~weidu_external/backup/Reflections~
 AUTHOR ~SubtleD~
 
-VERSION ~0.8.0~
+VERSION ~0.8.1~
 
 ALWAYS
   INCLUDE ~%MOD_FOLDER%/lib/misc_functions.tpa~
@@ -79,6 +79,11 @@ INCLUDE ~%MOD_FOLDER%/comp/comp_106.tpa~	//	dukes post-sarevok
 INCLUDE ~%MOD_FOLDER%/comp/comp_107.tpa~	//	off-ramp to BG2
 INCLUDE ~%MOD_FOLDER%/comp/comp_108.tpa~	//	quest introducing the crusade
 
+// prep journal entries
+
+ADD_JOURNAL TITLE (@10200) @10234 @10235 @10321 @10322 @10323 @10435 @10415 @10501 @10601 @10650
+ADD_JOURNAL TITLE (@10800) @10801 @10803 @10805 @10807 @10808 @10809
+
 LAF kill_thalantyr END
 LAF delay_maze END
 LAF early_korlasz END
@@ -99,6 +104,19 @@ INCLUDE ~%MOD_FOLDER%/comp/comp_110.tpa~
 
 LAF mirror_shards END
 
+//___________________________________________________________________________________
+//
+/*
+BEGIN @150	//	bp in bg
+DESIGNATED 150
+LABEL ~D5_REFLECTIONS_BP_IN_BG~
+REQUIRE_PREDICATE (GAME_IS ~eet~) OR (GAME_INCLUDES ~sod~) ~ ~
+
+INCLUDE ~%MOD_FOLDER%/comp/comp_150.tpa~
+
+LAF put_bp_in_bg END
+*/
+
 //___________________________________________________________________________________
 //
 BEGIN @200	//	rewriting history
@@ -177,12 +195,24 @@ LAF clone_saga END
 
 //___________________________________________________________________________________
 //
-BEGIN @310	//	SoD content in BG2
-DESIGNATED 310
+BEGIN @320	//	imoen can die
+DESIGNATED 320
+LABEL ~D5_REFLECTIONS_IMOEN_CAN_DIE~
+REQUIRE_PREDICATE (GAME_IS ~bg2ee eet~) ~ ~
+// forbid if i4eva installed
+
+INCLUDE ~%MOD_FOLDER%/comp/comp_320.tpa~
+
+LAF imoen_can_die END
+
+//___________________________________________________________________________________
+//
+BEGIN @330	//	SoD content in BG2
+DESIGNATED 330
 LABEL ~D5_REFLECTIONS_SOD_CONTENT_SOA~
 REQUIRE_PREDICATE (GAME_IS ~eet~) ~ ~
 
-INCLUDE ~%MOD_FOLDER%/comp/comp_310.tpa~
+INCLUDE ~%MOD_FOLDER%/comp/comp_330.tpa~
 
 LAF reveal_small_teeth END
 LAF sod_remix_coldhearth_dungeon END
@@ -191,18 +221,6 @@ LAF sod_remix_wyrm_forest END
 LAF sod_remix_bloodbark_grove END
 // LAF sod_remix_underground_river END
 
-//___________________________________________________________________________________
-//
-BEGIN @330	//	imoen can die
-DESIGNATED 330
-LABEL ~D5_REFLECTIONS_IMOEN_CAN_DIE~
-REQUIRE_PREDICATE (GAME_IS ~bg2ee eet~) ~ ~
-// forbid if i4eva installed
-
-INCLUDE ~%MOD_FOLDER%/comp/comp_330.tpa~
-
-LAF imoen_can_die END
-
 //___________________________________________________________________________________
 //
 

diff --git a/Reflections/comp/comp_102.tpa b/Reflections/comp/comp_102.tpa
@@ -36,7 +36,7 @@ COPY_EXISTING ~liia.cre~ ~override~
 
 // prep journal entries
 
-ADD_JOURNAL TITLE (@10200) @10234 @10235
+// ADD_JOURNAL TITLE (@10200) @10234 @10235
 
 // add to Belt's dialogue
 

diff --git a/Reflections/comp/comp_103.tpa b/Reflections/comp/comp_103.tpa
@@ -30,7 +30,7 @@ DEFINE_ACTION_FUNCTION early_korlasz BEGIN
 
 // prep journal entries
 
-ADD_JOURNAL TITLE (@10200) @10321 @10322 @10323
+// ADD_JOURNAL TITLE (@10200) @10321 @10322 @10323
 
 INCLUDE ~%MOD_FOLDER%/lib/get_response_strrefs.tph~
 

diff --git a/Reflections/comp/comp_104.tpa b/Reflections/comp/comp_104.tpa
@@ -31,7 +31,7 @@ DEFINE_ACTION_FUNCTION entar_accuse BEGIN
 
 // prep journal entries
 
-ADD_JOURNAL TITLE (@10200) @10435 @10415
+// ADD_JOURNAL TITLE (@10200) @10435 @10415
 
 // add a game check to record the last time Imoen is in the party
 

diff --git a/Reflections/comp/comp_105.tpa b/Reflections/comp/comp_105.tpa
@@ -22,7 +22,7 @@ DEFINE_ACTION_FUNCTION keep_playing BEGIN
 
 // prep journal entries
 
-ADD_JOURNAL TITLE (@10200) @10501
+// ADD_JOURNAL TITLE (@10200) @10501
 
 // stuff from EBG1
 

diff --git a/Reflections/comp/comp_106.tpa b/Reflections/comp/comp_106.tpa
@@ -41,7 +41,7 @@ TO DO:
 
 // prep journal entries
 
-ADD_JOURNAL TITLE (@10200) @10601 @10650
+// ADD_JOURNAL TITLE (@10200) @10601 @10650
 
 <<<<<<<< .../c#st2sod.baf
 IF
@@ -368,7 +368,8 @@ IF ~~ BEGIN d5beltsd_14
   IF ~~ 
     DO ~SetGlobal("D5DaustonQuest","GLOBAL",1)
     	SetGlobal("BD_KICK_DAUSTON","GLOBAL",99)
-  		AddJournalEntry(@10601,QUEST_DONE)~
+  		AddJournalEntry(@10601,QUEST_DONE)
+  		AddJournalEntry(@10801,QUEST)~
   	EXIT
 END
 
@@ -387,7 +388,8 @@ IF WEIGHT #-1 ~Global("C#st_HeroCutScene","GLOBAL",1) Global("D5AltEndSoD","GLOB
   IF ~~ 
     DO ~SetGlobal("D5DaustonQuest","GLOBAL",1)
     	SetGlobal("BD_KICK_DAUSTON","GLOBAL",99)
-  		AddJournalEntry(@10601,QUEST_DONE)~
+  		AddJournalEntry(@10601,QUEST_DONE)
+  		AddJournalEntry(@10801,QUEST)~
   	EXIT
 END
 

diff --git a/Reflections/comp/comp_107.tpa b/Reflections/comp/comp_107.tpa
@@ -19,7 +19,7 @@ TO DO:
 
 // prep journal entries ...?
 
-//ADD_JOURNAL TITLE (@10701) @10702
+// ADD_JOURNAL TITLE (@10701) @10702
 
 
 // copy in stuff

diff --git a/Reflections/comp/comp_108.tpa b/Reflections/comp/comp_108.tpa
@@ -4,8 +4,6 @@ DEFINE_ACTION_FUNCTION one_for_the_road BEGIN
 /*  
 TO DO:
 
-***** WRITE JOURNAL ENTRIES
-
 ***** add phantom sarevok
 
 - after killing Sarevok, dukes talk about Caelar
@@ -32,7 +30,7 @@ TO DO:
 
 // prep journal entries
 
-ADD_JOURNAL TITLE (@10800) @10801 @10802 @10803 @10805 @10807 @10808 @10809
+// ADD_JOURNAL TITLE (@10800) @10801 @10802 @10803 @10805 @10807 @10808 @10809
 
 // make spells for soul glow
 
@@ -130,7 +128,10 @@ END
 
 IF ~~ BEGIN d5bart3dq_3
   SAY @10813
-  IF ~~ REPLY @10812 DO ~SetGlobal("D5DaustonQuest","GLOBAL",4) AddJournalEntry(@10803,QUEST)~ EXIT
+  IF ~~ REPLY @10812 
+    DO ~SetGlobal("D5DaustonQuest","GLOBAL",4) 
+    	AddJournalEntry(@10803,QUEST)~
+    EXIT
 END
 
 END
@@ -225,7 +226,10 @@ APPEND BART14
 
 IF ~~ BEGIN d5bart14dq_1
   SAY @10816
-  IF ~~ REPLY @10818 DO ~SetGlobal("D5DaustonQuest","GLOBAL",6) AddJournalEntry(@10805,QUEST)~ EXIT
+  IF ~~ REPLY @10818 
+    DO ~SetGlobal("D5DaustonQuest","GLOBAL",6) 
+    	AddJournalEntry(@10805,QUEST)~ 
+    EXIT
 END
 
 END
@@ -352,6 +356,7 @@ IF ~~ BEGIN d5ubmay1_14
   SAY @10843
   IF ~~ REPLY @10818 
     DO ~SetGlobal("D5DaustonQuest","GLOBAL",6)
+    	AddJournalEntry(@10805,QUEST)
     	SetGlobal("D5UBRefugeesMove","GLOBAL",3)
     	SetGlobal("D5UBRefugeeSpeech","%bg1_area_prefix%1000",4)~ EXIT
 END