Skip to content

Commit

Permalink
Merge pull request #80 from Gitjas/master
Browse files Browse the repository at this point in the history
update to v26
  • Loading branch information
Gitjas authored May 25, 2021
2 parents 31e6a96 + 1d35dcf commit bc105d1
Show file tree
Hide file tree
Showing 58 changed files with 241 additions and 274 deletions.
2 changes: 1 addition & 1 deletion bg1npc/bg1npc.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 8 additions & 2 deletions bg1npc/bg1npc.tp2
Original file line number Diff line number Diff line change
Expand Up @@ -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~
Expand All @@ -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~

Expand Down Expand Up @@ -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"

Expand Down
4 changes: 4 additions & 0 deletions bg1npc/core/tpa/misc_fixes.tpa
Original file line number Diff line number Diff line change
Expand Up @@ -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~
Expand Down
4 changes: 2 additions & 2 deletions bg1npc/lib/g3_bgee_cpmvars.tpa
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions bg1npc/lib/g3_bgt_cpmvars.tpa
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions bg1npc/lib/g3_tutu_cpmvars.tpa
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions bg1npc/phase1/dlg/x#addial.d
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions bg1npc/phase1/dlg/x#faldorn.d
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Binary file modified bg1npc/phase1/itm/x#ajshld.itm
Binary file not shown.
Binary file modified bg1npc/phase1/itm/x#ajshld_ee.itm
Binary file not shown.
Binary file modified bg1npc/phase1/itm/x#cshaj.bam
Binary file not shown.
Binary file modified bg1npc/phase1/itm/x#ishaj.bam
Binary file not shown.
2 changes: 1 addition & 1 deletion bg1npc/phase1/tpa/bg1npc_phase1.tpa
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
SAY NAME2 @7
SAY UNIDENTIFIED_DESC @8
SAY DESC @9
PATCH_IF GAME_IS ~bgee bgt~ BEGIN
PATCH_IF GAME_IS ~bgee bgt eet~ BEGIN
WRITE_ASCII 0x44 ~GSHLD03~ #8 // ground icon
END
BUT_ONLY
Expand Down
11 changes: 5 additions & 6 deletions bg1npc/phase2/baf/p#fw1400.baf
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
IF %BGT_VAR%
Global("AnkhegCount","%FishingVillage%",0)
GlobalGT("HelpGerde","GLOBAL",1)
Global("X#GerdeAnkhegsCount","GLOBAL",1)
THEN
RESPONSE #100
SetGlobal("AnkhegCount","%FishingVillage%",1)
SetGlobal("SPRITE_IS_DEADANKHEG","GLOBAL",0)
SetGlobal("X#GerdeAnkhegsCount","GLOBAL",2)
END

IF %BGT_VAR%
InParty("faldorn")
!StateCheck("faldorn",CD_STATE_NOTVALID)
AreaCheck("%FishingVillage%")
Global("AnkhegCount","%FishingVillage%",1)
Global("X#GerdeAnkhegsCount","GLOBAL",2)
Global("X#FaldornAn10","%FishingVillage%",0)
NumDead("ankheg",10)
THEN
Expand All @@ -23,7 +22,7 @@ IF %BGT_VAR%
AreaCheck("%FishingVillage%")
InParty("faldorn")
!StateCheck("faldorn",CD_STATE_NOTVALID)
Global("AnkhegCount","%FishingVillage%",1)
Global("X#GerdeAnkhegsCount","GLOBAL",2)
Global("X#FaldornAn11","%FishingVillage%",0)
NumDead("ankheg",11)
THEN
Expand All @@ -34,7 +33,7 @@ END
IF %BGT_VAR%
InParty("faldorn")
AreaCheck("%FishingVillage%")
Global("AnkhegCount","%FishingVillage%",1)
Global("X#GerdeAnkhegsCount","GLOBAL",2)
Global("X#FaldornAn12","%FishingVillage%",0)
NumDead("ankheg",12)
THEN
Expand Down
8 changes: 0 additions & 8 deletions bg1npc/phase2/baf/x#anakh.baf

This file was deleted.

9 changes: 5 additions & 4 deletions bg1npc/phase2/baf/x#kiint2.baf
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,11 @@ Dialogue(Myself)
END

/* Kivan Ankhegs */
/* Kivan counts killed Ankhegs */
IF %BGT_VAR%
AreaCheck("%FishingVillage%")
Global("AnkhegCount","%FishingVillage%",1)
Global("P#KivanAnkheg","GLOBAL",0)
Global("X#GerdeAnkhegsCount","GLOBAL",2)
Global("P#KivanAnkheg","GLOBAL",1) //set in Gerde's interjection
NumDead("ankheg",10)
InParty(Myself)
!StateCheck(Myself,CD_STATE_NOTVALID)
Expand All @@ -203,12 +204,12 @@ CombatCounter(0)
!See([ENEMY])
THEN
RESPONSE #100
SetGlobal("P#KivanAnkheg","GLOBAL",1)
SetGlobal("P#KivanAnkheg","GLOBAL",2)
END

/* Initiate */
IF %BGT_VAR%
Global("P#KivanAnkheg","GLOBAL",1)
Global("P#KivanAnkheg","GLOBAL",2)
InParty(Myself)
!StateCheck(Myself,CD_STATE_NOTVALID)
InMyArea(Player1)
Expand Down
2 changes: 2 additions & 0 deletions bg1npc/phase2/dlg/gerde_ankhegs.d
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/* add tracking variable to Gerde because the original's game variable is too unreliable */
ADD_TRANS_ACTION GERDE BEGIN 0 END BEGIN END ~SetGlobal("X#GerdeAnkhegsCount","GLOBAL",1)~
4 changes: 2 additions & 2 deletions bg1npc/phase2/dlg/x#elint.d
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ EXIT

APPEND ~%tutu_var%BENTLY~

IF WEIGHT #-1 ~%BGT_VAR% InParty("eldoth") InMyArea("eldoth") !StateCheck("eldoth",CD_STATE_NOTVALID) Global("X#BentEld","GLOBAL",0)~ THEN BEGIN BentEld1.1
IF WEIGHT #-1 ~%BGT_VAR% See("ELDOTH") InParty("eldoth") !StateCheck("eldoth",CD_STATE_NOTVALID) Global("X#BentEld","GLOBAL",0)~ THEN BEGIN BentEld1.1
SAY @15
IF ~~ THEN DO ~SetGlobal("X#BentEld","GLOBAL",1)~ EXTERN ~%ELDOTH_JOINED%~
BentEld1.2
Expand All @@ -73,7 +73,7 @@ IF ~~ THEN DO ~StartStore("X#FRIED2",LastTalkedToBy(Myself))~
EXIT
END

IF WEIGHT #-1 ~%BGT_VAR% InParty("eldoth") InMyArea("eldoth") !StateCheck("eldoth",CD_STATE_NOTVALID) GlobalGT("X#BentEld","GLOBAL",0)~ THEN BEGIN BentEld1.9
IF WEIGHT #-1 ~%BGT_VAR% InParty("eldoth") See("ELDOTH") !StateCheck("eldoth",CD_STATE_NOTVALID) GlobalGT("X#BentEld","GLOBAL",0)~ THEN BEGIN BentEld1.9
SAY @21
IF ~~ THEN DO ~StartStore("X#FRIED2",LastTalkedToBy(Myself))~
EXIT
Expand Down
2 changes: 1 addition & 1 deletion bg1npc/phase2/dlg/x#garwyl.d
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ APPEND ~%GARRICK_JOINED%~

IF WEIGHT #-2 ~%BGT_VAR% Global("X#PostMyrChat","GLOBAL",1)~ THEN BEGIN PostMyrChat
SAY @25
IF ~~ THEN DO ~SetGlobal("X#PostMyrChat","GLOBAL",2)~ EXIT
IF ~~ THEN DO ~EraseJournalEntry(@26) SetGlobal("X#PostMyrChat","GLOBAL",2)~ EXIT
END

END
21 changes: 14 additions & 7 deletions bg1npc/phase2/dlg/x#halbaz.d
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,24 @@ SAY @0
= @1
IF ~!PartyHasItem("_MISC47") !PartyHasItem("MISC47")~ THEN REPLY @2 DO ~SetGlobal("X#HalbTalk","LOCALS",1)~ GOTO Upgrade2
IF ~OR(2) PartyHasItem("_MISC47") PartyHasItem("MISC47")~ THEN REPLY @2 DO ~SetGlobal("X#HalbTalk","LOCALS",1)~ GOTO Upgrade3
IF ~~ THEN REPLY @3 DO ~StartStore("%tutu_var%STO0703",Protagonist)~ EXIT
IF ~~ THEN REPLY @4 EXIT
IF ~~ THEN REPLY @3 DO ~SetGlobal("X#HalbTalk","LOCALS",1) StartStore("%tutu_var%STO0703",Protagonist)~ EXIT
IF ~~ THEN REPLY @4 DO ~SetGlobal("X#HalbTalk","LOCALS",1)~ EXIT
END

IF WEIGHT #-5 ~%BGT_VAR% PartyHasItem("X#GARCH") Global("X#HalbTalk","LOCALS",1)~ THEN BEGIN Upgrade7
SAY @5
IF ~OR(2) PartyHasItem("_MISC47") PartyHasItem("MISC47") PartyGoldGT(999)~ THEN REPLY @6 GOTO Upgrade6
IF ~~ THEN REPLY @7 DO ~StartStore("%tutu_var%STO0703",Protagonist)~ EXIT
IF ~~ THEN REPLY @8 EXIT
END //APPEND

EXTEND_BOTTOM ~%tutu_var%HALBAZ~ 0
IF ~OR(2) PartyHasItem("_MISC47") PartyHasItem("MISC47") PartyGoldGT(999)
PartyHasItem("X#GARCH") Global("X#HalbTalk","LOCALS",1)~ THEN REPLY @6 GOTO Upgrade6
END

EXTEND_BOTTOM ~%tutu_var%HALBAZ~ 1
IF ~OR(2) PartyHasItem("_MISC47") PartyHasItem("MISC47") PartyGoldGT(999)
PartyHasItem("X#GARCH") Global("X#HalbTalk","LOCALS",1)~ THEN REPLY @6 GOTO Upgrade6
END

APPEND ~%tutu_var%HALBAZ~

IF ~~ THEN BEGIN Upgrade2
SAY @9
IF ~~ THEN REPLY @10 GOTO Upgrade4
Expand Down
5 changes: 3 additions & 2 deletions bg1npc/phase2/dlg/x#ict3.d
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ END
/* passback not required - trans actions are journal related */
I_C_T3 ~%tutu_var%GERDE~ 0 X#GERDE0
== ~%CORAN_JOINED%~ IF ~InParty("coran") InMyArea("coran") !StateCheck("coran",CD_STATE_NOTVALID)~ THEN @222
== ~%KIVAN_JOINED%~ IF ~InParty("kivan") InMyArea("kivan") !StateCheck("kivan",CD_STATE_NOTVALID)~ THEN @223
== ~%KIVAN_JOINED%~ IF ~InParty("kivan") InMyArea("kivan") !StateCheck("kivan",CD_STATE_NOTVALID)~ THEN @223 DO ~SetGlobal("P#KivanAnkheg","GLOBAL",1)~
== ~%tutu_var%GERDE~ IF ~InParty("kivan") InMyArea("kivan") !StateCheck("kivan",CD_STATE_NOTVALID)~ THEN @224
== ~%FALDORN_JOINED%~ IF ~InParty("faldorn") InMyArea("faldorn") !StateCheck("faldorn",CD_STATE_NOTVALID)~ THEN @225
== ~%JAHEIRA_JOINED%~ IF ~InParty("jaheira") InMyArea("jaheira") !StateCheck("jaheira",CD_STATE_NOTVALID)~ THEN @226
Expand Down Expand Up @@ -1394,7 +1394,8 @@ END
I_C_T3 ~%tutu_var%MUTAMI~ 0 X#MUTAMI0
== ~%GARRICK_JOINED%~ IF ~InParty("garrick") InMyArea("garrick") !StateCheck("garrick",CD_STATE_NOTVALID)~ THEN @491
== ~%SHARTEEL_JOINED%~ IF ~InParty("sharteel") InMyArea("sharteel") !StateCheck("sharteel",CD_STATE_NOTVALID)~ THEN @493
== ~%KIVAN_JOINED%~ IF ~InParty("kivan") InMyArea("kivan") !StateCheck("kivan",CD_STATE_NOTVALID)~ THEN @492
== ~%KIVAN_JOINED%~ IF ~InParty("kivan") InMyArea("kivan") !StateCheck("kivan",CD_STATE_NOTVALID)
GlobalGT("X#KPD","GLOBAL",1)~ THEN @492
END

/* Noralee */
Expand Down
4 changes: 2 additions & 2 deletions bg1npc/phase2/dlg/x#kiint.d
Original file line number Diff line number Diff line change
Expand Up @@ -435,9 +435,9 @@ IF ~~ THEN DO ~SetGlobal("P#KivanBass","GLOBAL",2)~ EXIT
END

/* Kivan 10 Ankhegs */
IF WEIGHT #-2 ~%BGT_VAR% Global("P#KivanAnkheg","GLOBAL",1)~ THEN BEGIN KivanAnkheg2
IF WEIGHT #-2 ~%BGT_VAR% Global("P#KivanAnkheg","GLOBAL",2)~ THEN BEGIN KivanAnkheg2
SAY @129
IF ~~ THEN DO ~SetGlobal("P#KivanAnkheg","GLOBAL",2)~ EXIT
IF ~~ THEN DO ~SetGlobal("P#KivanAnkheg","GLOBAL",3)~ EXIT
END

END
2 changes: 1 addition & 1 deletion bg1npc/phase2/tpa/bg1npc_dyqst.tpa
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ COPY ~bg1npc/phase2/cre/x#mepht1.cre~ ~override~
SAY NAME1 @729 /* Smoke Mephit */
SAY NAME2 @729 /* Smoke Mephit */
WRITE_ASCII SCRIPT_DEFAULT ~x#mepsmo~ #8
END

COPY ~bg1npc/phase2/cre/x#tanari.cre~ ~override/x#tanari.cre~
SAY NAME1 @291
Expand All @@ -174,7 +175,6 @@ COPY ~bg1npc/phase2/cre/x#tanari.cre~ ~override/x#tanari.cre~
WRITE_EVALUATED_ASCII 0x2CC ~%DEST_RES%~ #8 // dialog
WRITE_BYTE 0x270 ~128~ // Allegiance = Neutral
WRITE_ASCII 0x280 ~aravaata~ #32 // death variable
END


/* Compile .bcs for X#WINSKI and X#TANARI and x#mepht1-5 */
Expand Down
4 changes: 4 additions & 0 deletions bg1npc/phase2/tpa/bg1npc_phase2.tpa
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ END
COMPILE EVALUATE_BUFFER ~bg1npc/Phase2/dlg/x#tranzig.d~ USING ~bg1npc/tra/%s/x#tranzig.tra~
END

/* add tracking variable for Gerde's Ankheg limit */
COMPILE EVALUATE_BUFFER ~bg1npc/Phase2/dlg/gerde_ankhegs.d~


/* Kivan's spear */
COPY ~bg1npc/phase2/itm/x#kispr.itm~ ~override~
SAY NAME1 @74
Expand Down
Loading

0 comments on commit bc105d1

Please sign in to comment.