From 4a884b69b91666112f37e850f46e02dc1cd0a1b3 Mon Sep 17 00:00:00 2001 From: cmorganbg Date: Sun, 27 Nov 2011 10:08:29 -0600 Subject: [PATCH] Move Xan Slaver Quest dialog initiation to NPC script Removed x#wdow script and placed action into x#xqzan.baf to decrease the chances of it being interrupted. Reference post: http://forums.gibberlings3.net/index.php?showtopic=23112&st=0#entry192024 --- bg1npc.tp2 | 1 - bg1npc/phase2/baf/x#wdoe.baf | 9 --- bg1npc/phase2/baf/x#xqxan.baf | 138 +++++++++++++++++++--------------- 3 files changed, 76 insertions(+), 72 deletions(-) delete mode 100644 bg1npc/phase2/baf/x#wdoe.baf diff --git a/bg1npc.tp2 b/bg1npc.tp2 index 81fef6d6a..464af6232 100644 --- a/bg1npc.tp2 +++ b/bg1npc.tp2 @@ -3219,7 +3219,6 @@ BEGIN @1007 COMPILE EVALUATE_BUFFER ~BG1NPC/Phase2/baf/X#XQCUT.BAF~ COMPILE EVALUATE_BUFFER ~BG1NPC/Phase2/baf/X#SKODD.BAF~ - COMPILE EVALUATE_BUFFER ~BG1NPC/Phase2/baf/X#WDOE.BAF~ COMPILE EVALUATE_BUFFER ~BG1NPC/Phase2/dlg/X#XQXAN.D~ /* Garrick's Quest */ diff --git a/bg1npc/phase2/baf/x#wdoe.baf b/bg1npc/phase2/baf/x#wdoe.baf deleted file mode 100644 index 806a6b126..000000000 --- a/bg1npc/phase2/baf/x#wdoe.baf +++ /dev/null @@ -1,9 +0,0 @@ -IF %BGT_VAR% -See("xan") -Global("X#XQWDoeApproaches","GLOBAL",0) -THEN -RESPONSE #100 -SetGlobal("X#XQWDoeApproaches","GLOBAL",1) -MoveToObject("xan") -ActionOverride("xan",StartDialogueNoSet("xan")) -END diff --git a/bg1npc/phase2/baf/x#xqxan.baf b/bg1npc/phase2/baf/x#xqxan.baf index c5323d4f8..3f3ca754b 100644 --- a/bg1npc/phase2/baf/x#xqxan.baf +++ b/bg1npc/phase2/baf/x#xqxan.baf @@ -1,101 +1,115 @@ +/* Initiate */ +IF %BGT_VAR% + Global("X#XQWhiteDoeAppeared","GLOBAL",2) + InParty(Myself) + !StateCheck(Myself,CD_STATE_NOTVALID) + InMyArea(Player1) + !StateCheck(Player1,CD_STATE_NOTVALID) + CombatCounter(0) + !See([ENEMY]) +THEN + RESPONSE #100 + StartDialogueNoSet(Player1) +END + IF %BGT_VAR% -InParty("xan") -RealGlobalTimerExpired("X#XanGoodOutcomeTimer","GLOBAL") -Global("X#XQXanRewarded","GLOBAL",0) + InParty("xan") + RealGlobalTimerExpired("X#XanGoodOutcomeTimer","GLOBAL") + Global("X#XQXanRewarded","GLOBAL",0) THEN -RESPONSE #100 -SetGlobal("X#XQXanRewarded","GLOBAL",1) + RESPONSE #100 + SetGlobal("X#XQXanRewarded","GLOBAL",1) END /* Initiate */ IF %BGT_VAR% -Global("X#XQXanRewarded","GLOBAL",1) -InParty(Myself) -!StateCheck(Myself,CD_STATE_NOTVALID) -InMyArea(Player1) -!StateCheck(Player1,CD_STATE_NOTVALID) -CombatCounter(0) -!See([ENEMY]) + Global("X#XQXanRewarded","GLOBAL",1) + InParty(Myself) + !StateCheck(Myself,CD_STATE_NOTVALID) + InMyArea(Player1) + !StateCheck(Player1,CD_STATE_NOTVALID) + CombatCounter(0) + !See([ENEMY]) THEN -RESPONSE #100 -StartDialogueNoSet(Player1) + RESPONSE #100 + StartDialogueNoSet(Player1) END IF %BGT_VAR% -InParty("xan") -RealGlobalTimerExpired("X#XanBadOutcomeTimer","GLOBAL") -Global("X#XQXanPunished","GLOBAL",0) + InParty("xan") + RealGlobalTimerExpired("X#XanBadOutcomeTimer","GLOBAL") + Global("X#XQXanPunished","GLOBAL",0) THEN -RESPONSE #100 -SetGlobal("X#XQXanPunished","GLOBAL",1) + RESPONSE #100 + SetGlobal("X#XQXanPunished","GLOBAL",1) END /* Initiate */ IF %BGT_VAR% -Global("X#XQXanPunished","GLOBAL",1) -InParty(Myself) -!StateCheck(Myself,CD_STATE_NOTVALID) -InMyArea(Player1) -!StateCheck(Player1,CD_STATE_NOTVALID) -CombatCounter(0) -!See([ENEMY]) + Global("X#XQXanPunished","GLOBAL",1) + InParty(Myself) + !StateCheck(Myself,CD_STATE_NOTVALID) + InMyArea(Player1) + !StateCheck(Player1,CD_STATE_NOTVALID) + CombatCounter(0) + !See([ENEMY]) THEN -RESPONSE #100 -StartDialogueNoSet(Player1) + RESPONSE #100 + StartDialogueNoSet(Player1) END IF %BGT_VAR% -InParty("xan") -Global("X#XQXanPunished","GLOBAL",2) + InParty("xan") + Global("X#XQXanPunished","GLOBAL",2) THEN -RESPONSE #100 -SetGlobal("X#XQXanPunished","GLOBAL",3) + RESPONSE #100 + SetGlobal("X#XQXanPunished","GLOBAL",3) END /* Initiate */ IF %BGT_VAR% -Global("X#XQXanPunished","GLOBAL",3) -InParty(Myself) -!StateCheck(Myself,CD_STATE_NOTVALID) -InMyArea(Player1) -!StateCheck(Player1,CD_STATE_NOTVALID) -CombatCounter(0) -!See([ENEMY]) + Global("X#XQXanPunished","GLOBAL",3) + InParty(Myself) + !StateCheck(Myself,CD_STATE_NOTVALID) + InMyArea(Player1) + !StateCheck(Player1,CD_STATE_NOTVALID) + CombatCounter(0) + !See([ENEMY]) THEN -RESPONSE #100 -StartDialogueNoSet(Player1) + RESPONSE #100 + StartDialogueNoSet(Player1) END IF %BGT_VAR% -HPPercentLT("xan",50) -Global("X#XQXanFightsPC","GLOBAL",1) + HPPercentLT("xan",50) + Global("X#XQXanFightsPC","GLOBAL",1) THEN -RESPONSE #100 -SetGlobal("X#XQXanFightsPC","GLOBAL",2) + RESPONSE #100 + SetGlobal("X#XQXanFightsPC","GLOBAL",2) END /* Initiate */ IF %BGT_VAR% -Global("X#XQXanFightsPC","GLOBAL",2) -InParty(Myself) -!StateCheck(Myself,CD_STATE_NOTVALID) -InMyArea(Player1) -!StateCheck(Player1,CD_STATE_NOTVALID) -CombatCounter(0) -!See([ENEMY]) + Global("X#XQXanFightsPC","GLOBAL",2) + InParty(Myself) + !StateCheck(Myself,CD_STATE_NOTVALID) + InMyArea(Player1) + !StateCheck(Player1,CD_STATE_NOTVALID) + CombatCounter(0) + !See([ENEMY]) THEN -RESPONSE #100 -StartDialogueNoSet(Player1) + RESPONSE #100 + StartDialogueNoSet(Player1) END IF %BGT_VAR% -Global("X#XQFriendlyArmsMoved","GLOBAL",1) -AreaCheck("%FriendlyArmInn_L2%") + Global("X#XQFriendlyArmsMoved","GLOBAL",1) + AreaCheck("%FriendlyArmInn_L2%") THEN -RESPONSE #100 -CreateCreature("X#SIENE",[690.670],0) -CreateCreature("X#DIALA",[675.650],0) -CreateCreature("X#MINUW",[715.650],0) -SetGlobal("X#XQFriendlyArmsMoved","GLOBAL",2) -ActionOverride("X#Siene",StartDialogueNoSet(Player1)) + RESPONSE #100 + CreateCreature("X#SIENE",[690.670],0) + CreateCreature("X#DIALA",[675.650],0) + CreateCreature("X#MINUW",[715.650],0) + SetGlobal("X#XQFriendlyArmsMoved","GLOBAL",2) + ActionOverride("X#Siene",StartDialogueNoSet(Player1)) END