Merge pull request #80 from Gitjas/master

update to v26

Author: Gitjas

bg1npc/bg1npc.ini

@@ -28,6 +28,6 @@ Download = https://github.com/Gibberlings3/BG1NPC
 
 Type = NPC
 
-After = bg2fixpack, bgqe, c#brage, Tweak_early
+After = bg2fixpack, bgqe, c#brage, Framed, Tweak_early
 
 Before = atweaks, cdtweaks, EET_end 

bg1npc/bg1npc.tp2

@@ -14,7 +14,7 @@ AUTHOR ~The BG1 NPC Project Team: forums.gibberlings3.net/index.php?showforum=45
 /* MODDER */
 
 /* WeiDU versions newer than v203 allow tp2 level version listing in the .log for troubleshooting  */
-VERSION ~v25~
+VERSION ~v26~
 /* Launch the readme file immediately. */
 /* Isaya : display in native selected language if available, otherwise english */
 README ~bg1npc/readme-bg1npc-%LANGUAGE%.html~ ~bg1npc/readme-bg1npc.html~
@@ -32,11 +32,15 @@ LANGUAGE ~Espanol (traducido por Clan DLAN)~ ~spanish~ ~bg1npc/tra/spanish/setup
 LANGUAGE ~Francais (traduit par les d'Oghmatiques)~ ~french~ ~bg1npc/tra/french/setup.tra~ // http://www.baldursgateworld.fr/lacouronne/la-chambre-des-scribes/
 LANGUAGE ~Polski (Tlumaczenie przez Children of Bhaal)~ ~polish~ ~bg1npc/tra/polish/setup.tra~ // http://athkatla.cob-bg.pl/viewtopic.php?t=5734
 LANGUAGE ~Deutsch (Teiluebersetzung vom Kerzenburgforum, teilweise noch in englisch)~ ~german~ ~bg1npc/tra/german/setup.tra~ // https://www.baldurs-gate.de/index.php
-LANGUAGE ~Russian (by Aerie Team & Arcanecoast Team)~ ~russian~ ~bg1npc/tra/russian/setup.tra~ 
+LANGUAGE ~Russian (by Aerie Team & Arcanecoast Team)~ ~russian~ ~bg1npc/tra/english/setup.tra~ 
 LANGUAGE ~Italian (by Coland)~ ~italian~ ~bg1npc/tra/italian/setup.tra~ 
 
 /* BEGIN The BG1 NPC Project: Required Modifications  */
 BEGIN @1005 DESIGNATED 0
+REQUIRE_PREDICATE GAME_IS ~tutu tutu_totsc bgt bgee eet~ @5005
+FORBID_COMPONENT ~EET_end.tp2~ ~0~ @5006
+FORBID_COMPONENT ~EET_end.tp2~ ~1~ @5006
+
 	/* Tells other mods BG1NPC Core is installed */
 	COPY ~bg1npc/Core/X#component.xx~ ~override/X#BG1NPCCore.G3~
 
@@ -510,12 +514,14 @@ BEGIN @1116 DESIGNATED 131 /* The BG1 NPC Project: Sarevok's Diary Date Changes
 BEGIN @1133 DESIGNATED 240 /* Kivan uses spears */
   SUBCOMPONENT @1132 /* The BG1 NPC Project: Kivan's Proficiency */
   GROUP @1065 /* The BG1 NPC Project: Tweaks */
+  REQUIRE_COMPONENT ~bg1npc/bg1npc.tp2~ 0 @1004 /* BG1 NPC Required Changes component is not installed. */
 
   INCLUDE "%MOD_FOLDER%/tweaks/kivan_spears.tpa"
 
 BEGIN @1134 DESIGNATED 241 /* Kivan uses halberds */
   SUBCOMPONENT @1132 /* The BG1 NPC Project: Kivan's Proficiency */
   GROUP @1065 /* The BG1 NPC Project: Tweaks */
+  REQUIRE_COMPONENT ~bg1npc/bg1npc.tp2~ 0 @1004 /* BG1 NPC Required Changes component is not installed. */
 
   INCLUDE "%MOD_FOLDER%/tweaks/kivan_halberds.tpa"
 

bg1npc/core/tpa/misc_fixes.tpa

@@ -28,8 +28,12 @@ COPY ~bg1npc/Core/cre/x#gorlet.cre~ ~override/x#gorlet.cre~
   LAUNCH_PATCH_MACRO ~bg1npc_cre_dest_res~
 
 /* add Gorion's Talking Letter Area Script */
+/*
 EXTEND_BOTTOM ~%Candlekeep_Library_L5_BCS%.bcs~ ~bg1npc/CORE/baf/X#FW2612.baf~
   EVALUATE_BUFFER
+*/
+EXTEND_BOTTOM ~baldur.bcs~ ~bg1npc/CORE/baf/X#FW2612.baf~
+  EVALUATE_BUFFER
 
 /* add Gorion's Talking Letter dialog, no need for EVAL */
 COMPILE        ~bg1npc/Core/dlg/X#GORLET.D~

bg1npc/lib/g3_bgee_cpmvars.tpa

@@ -607,7 +607,7 @@ ACTION_IF GAME_IS ~bgee~ THEN BEGIN
 	OUTER_SPRINT "Beregost_KagainsStore" "AR3353"
 	OUTER_SPRINT "Beregost_House09" "AR3354"
 	OUTER_SPRINT "Beregost_House08" "AR3355"
-	OUTER_SPRINT "Beregost_House08" "AR3356"
+	OUTER_SPRINT "Beregost_House08_L2" "AR3356"
 	OUTER_SPRINT "Beregost_RedSheaf_L1" "AR3357"
 	OUTER_SPRINT "Temple" "AR3400"
 	OUTER_SPRINT "Temple_Vestibule" "AR3401"
@@ -1095,7 +1095,7 @@ ACTION_IF GAME_IS ~bgee~ THEN BEGIN
 	OUTER_SPRINT "Beregost_KagainsStore_BCS" "AR3353"
 	OUTER_SPRINT "Beregost_House09_BCS" "AR3354"
 	OUTER_SPRINT "Beregost_House08_BCS" "AR3355"
-	OUTER_SPRINT "Beregost_House08_BCS" "AR3356"
+	OUTER_SPRINT "Beregost_House08_L2_BCS" "AR3356"
 	OUTER_SPRINT "Beregost_RedSheaf_L1_BCS" "AR3357"
 	OUTER_SPRINT "Temple_BCS" "AR3400"
 	OUTER_SPRINT "Temple_Vestibule_BCS" "AR3401"

bg1npc/lib/g3_bgt_cpmvars.tpa

@@ -611,7 +611,7 @@ ACTION_IF GAME_IS ~bgt~ THEN BEGIN
 	OUTER_SPRINT "Beregost_KagainsStore" "AR6753"
 	OUTER_SPRINT "Beregost_House09" "AR6754"
 	OUTER_SPRINT "Beregost_House08" "AR6755"
-	OUTER_SPRINT "Beregost_House08" "AR6756"
+	OUTER_SPRINT "Beregost_House08_L2" "AR6756"
 	OUTER_SPRINT "Beregost_RedSheaf_L1" "AR6757"
 	OUTER_SPRINT "Temple" "AR9300"
 	OUTER_SPRINT "Temple_Vestibule" "AR9301"
@@ -1099,7 +1099,7 @@ ACTION_IF GAME_IS ~bgt~ THEN BEGIN
 	OUTER_SPRINT "Beregost_KagainsStore_BCS" "AR6753"
 	OUTER_SPRINT "Beregost_House09_BCS" "AR6754"
 	OUTER_SPRINT "Beregost_House08_BCS" "AR6755"
-	OUTER_SPRINT "Beregost_House08_BCS" "AR6756"
+	OUTER_SPRINT "Beregost_House08_L2_BCS" "AR6756"
 	OUTER_SPRINT "Beregost_RedSheaf_L1_BCS" "AR6757"
 	OUTER_SPRINT "Temple_BCS" "AR9300"
 	OUTER_SPRINT "Temple_Vestibule_BCS" "AR9301"

bg1npc/lib/g3_tutu_cpmvars.tpa

@@ -607,7 +607,7 @@ ACTION_IF GAME_IS ~tutu tutu_totsc~ THEN BEGIN
 	OUTER_SPRINT "Beregost_KagainsStore" "FW3353"
 	OUTER_SPRINT "Beregost_House09" "FW3354"
 	OUTER_SPRINT "Beregost_House08" "FW3355"
-	OUTER_SPRINT "Beregost_House08" "FW3356"
+	OUTER_SPRINT "Beregost_House08_L2" "FW3356"
 	OUTER_SPRINT "Beregost_RedSheaf_L1" "FW3357"
 	OUTER_SPRINT "Temple" "FW3400"
 	OUTER_SPRINT "Temple_Vestibule" "FW3401"
@@ -1095,7 +1095,7 @@ ACTION_IF GAME_IS ~tutu tutu_totsc~ THEN BEGIN
 	OUTER_SPRINT "Beregost_KagainsStore_BCS" "_AR3353"
 	OUTER_SPRINT "Beregost_House09_BCS" "_AR3354"
 	OUTER_SPRINT "Beregost_House08_BCS" "_AR3355"
-	OUTER_SPRINT "Beregost_House08_BCS" "_AR3356"
+	OUTER_SPRINT "Beregost_House08_L2_BCS" "_AR3356"
 	OUTER_SPRINT "Beregost_RedSheaf_L1_BCS" "_AR3357"
 	OUTER_SPRINT "Temple_BCS" "_AR3400"
 	OUTER_SPRINT "Temple_Vestibule_BCS" "_AR3401"

bg1npc/phase1/dlg/x#addial.d

@@ -1391,7 +1391,7 @@ END ~%JAHEIRA_JOINED%~ JADRU2.11
 ADD_TRANS_TRIGGER ~%tutu_var%TETHTO2~ 1 ~Global("P#KnowBhaal","GLOBAL",1)~
 
 EXTEND_BOTTOM ~%tutu_var%TETHTO2~ 1
-IF ~Global("TalkedToKoveras","GLOBAL",1) Global("P#KnowBhaal","GLOBAL",0)~ THEN REPLY @576 DO ~GiveItemCreate("%tutu_var%scrl2J",Player1,0,0,0) SetGlobal("P#KnowBhaal","GLOBAL",1)~ GOTO 2
-IF ~Global("P#KnowBhaal","GLOBAL",0)~ THEN REPLY @577 DO ~GiveItemCreate("%tutu_var%scrl2J",Player1,0,0,0) SetGlobal("P#KnowBhaal","GLOBAL",1)~ GOTO 3
-IF ~Global("P#KnowBhaal","GLOBAL",0) Dead("rieltar")~ THEN REPLY @578 DO ~GiveItemCreate("%tutu_var%scrl2J",Player1,0,0,0) SetGlobal("P#KnowBhaal","GLOBAL",1)~ GOTO 5
+IF ~Global("TalkedToKoveras","GLOBAL",1) Global("P#KnowBhaal","GLOBAL",0)~ THEN REPLY @576 DO ~GiveItemCreate("%tutu_var%scrl2J",Player1,0,0,0)~ GOTO 2
+IF ~Global("P#KnowBhaal","GLOBAL",0)~ THEN REPLY @577 DO ~GiveItemCreate("%tutu_var%scrl2J",Player1,0,0,0)~ GOTO 3
+IF ~Global("P#KnowBhaal","GLOBAL",0) Dead("rieltar")~ THEN REPLY @578 DO ~GiveItemCreate("%tutu_var%scrl2J",Player1,0,0,0)~ GOTO 5
 END

bg1npc/phase1/dlg/x#faldorn.d

@@ -298,14 +298,14 @@ EXIT
 CHAIN IF WEIGHT #-1 ~%BGT_VAR% CombatCounter(0) InParty("kagain") Global("X#FAKA1","LOCALS",0) !See([ENEMY]) See("kagain") !StateCheck(Myself,CD_STATE_NOTVALID) !StateCheck("kagain",CD_STATE_NOTVALID)~ THEN ~%FALDORN_BANTER%~ FAKA1
 @191
 DO ~SetGlobal("X#FAKA1","LOCALS",1)~
-== ~%IMOEN_BANTER%~ @192
+== ~%KAGAIN_BANTER%~ @192
 == ~%FALDORN_BANTER%~ @193
 = @194
-== ~%IMOEN_BANTER%~ @195
+== ~%KAGAIN_BANTER%~ @195
 == ~%FALDORN_BANTER%~ @196
-== ~%IMOEN_BANTER%~ @197
+== ~%KAGAIN_BANTER%~ @197
 == ~%FALDORN_BANTER%~ @198
-== ~%IMOEN_BANTER%~ @199
+== ~%KAGAIN_BANTER%~ @199
 == ~%FALDORN_BANTER%~ @200
 EXIT