Merge pull request #8 from Austin-BG/main

Updated to v.14.3

BG1NPCSoA/BG1NPCSoA.tp2

@@ -3111,6 +3111,7 @@ COMPILE EVALUATE_BUFFER ~BG1NPCSoA/dialogues/MISC/KGSTO2sharteel.d~ USING ~BG1NP
 END
 
 COMPILE ~BG1NPCSoA/scripts/7xshar.BAF~
+// FOR v14.4 COMPILE ~BG1NPCSoA/scripts/7xsharD.BAF~
 
 ACTION_IF FILE_EXISTS_IN_GAME ~7XCRE1.cre~ BEGIN
   COPY_EXISTING ~7XCRE1.cre~ ~override~
@@ -10233,6 +10234,7 @@ EXTEND_TOP ~AR0400.bcs~ ~BG1NPCSoA/scripts/Ajantis/AR0400.baf~
 EXTEND_TOP ~AR1202.bcs~ ~BG1NPCSoA/scripts/Ajantis/AR1202.baf~
 EXTEND_TOP ~AR4000.bcs~ ~BG1NPCSoA/scripts/Ajantis/AR4000Ajan.baf~
 EXTEND_TOP ~AR4500.bcs~ ~BG1NPCSoA/scripts/Ajantis/AR4500Ajan.baf~
+EXTEND_TOP ~Imoen2.bcs~ ~BG1NPCSoA/scripts/Ajantis/Imoen2.baf~ 
 COMPILE ~BG1NPCSoA/scripts/Ajantis/7XAjan.baf~ EVALUATE_BUFFER
 COMPILE ~BG1NPCSoA/scripts/Ajantis/7XAjan25.baf~ EVALUATE_BUFFER
 

BG1NPCSoA/dialogues/7XAJAN.d

@@ -119,15 +119,17 @@ END
 BEGIN ~7XAJANB~
 
 CHAIN
-IF ~CombatCounter(0) !See([ENEMY]) InParty("imoen2")
-See("imoen2")!StateCheck("imoen2",CD_STATE_NOTVALID)!StateCheck("7XAJAN",CD_STATE_NOTVALID)InParty("7XAJAN")
-!StateCheck("imoen2",CD_STATE_NOTVALID)!Dead("imoen2")Global("Ajantis_ImoenBanter1","GLOBAL",0)~ THEN BIMOEN2 ajantisimoen1
+IF ~CombatCounter(0) !See([ENEMY]) 
+InParty("Imoen2") !StateCheck("Imoen2",CD_STATE_NOTVALID)
+See("Imoen2")
+InParty("7XAJAN")!StateCheck("7XAJAN",CD_STATE_NOTVALID)
+Global("Ajantis_ImoenBanter","GLOBAL",0)~ THEN BIMOEN2 ajantisimoen1
 @34
 =
 @35
 == 7XAJANB @36
 =
-@37 DO ~SetGlobal("Ajantis_ImoenBanter1","GLOBAL",1)~
+@37 DO ~SetGlobal("Ajantis_ImoenBanter","GLOBAL",1)~
 == BIMOEN2 @38
 == 7XAJANB @39
 == BIMOEN2 @40
@@ -1219,4 +1221,42 @@ CHAIN IF ~Global("AjantisQuest","GLOBAL",13)~ THEN 7xKatr 7xKatrinaAjantisFinal
 == IF_FILE_EXISTS 7XCoranJ IF ~InParty("7XCORAN")!StateCheck("7XCORAN",CD_STATE_NOTVALID)~ THEN @446
 == IF_FILE_EXISTS 7XGarJ IF ~InParty("7XGAR") !StateCheck("7XGAR",CD_STATE_NOTVALID)~ THEN @447
 == 7XAJANJ @428
+EXIT
+
+
+CHAIN IF WEIGHT #7 ~Global("ImoenAjantisThievesGuildTalk","AR0305",1)~ THEN IMOEN2J 7xImoenAjantisThievesGuild
+@450 DO ~SetGlobal("ImoenAjantisThievesGuildTalk","AR0305",2)~
+== 7XAJANJ @451
+== IMOEN2J @452
+== 7XAJANJ @453
+== IMOEN2J @454
+== 7XAJANJ @455
+== IMOEN2J @456
+== 7XAJANJ @457
+EXIT
+
+CHAIN
+IF ~CombatCounter(0) !See([ENEMY]) 
+InParty("Imoen2")!StateCheck("Imoen2",CD_STATE_NOTVALID)
+See("Imoen2")
+InParty("7XAJAN")!StateCheck("7XAJAN",CD_STATE_NOTVALID)
+Global("Ajantis_ImoenBanter","GLOBAL",1)~ THEN 7XAJANB ajantisimoen2
+@458
+DO ~SetGlobal("Ajantis_ImoenBanter","GLOBAL",2)~
+== BIMOEN2 @459
+== 7XAJANB @460
+== BIMOEN2 @461
+== 7XAJANB @462
+== BIMOEN2 @463
+== 7XAJANB @464
+== BIMOEN2 @465
+=@466
+=@467
+== 7XAJANB @468
+== BIMOEN2 @469
+== 7XAJANB @470
+== BIMOEN2 @471
+== 7XAJANB @472
+== BIMOEN2 @473
+== 7XAJANB @474
 EXIT

BG1NPCSoA/dialogues/7Xkaga.d

@@ -62,16 +62,16 @@ IF ~~ THEN BEGIN kagain-newshite2
 SAY @27
 =
 @28
-IF ~~ THEN REPLY @29 GOTO CRAZY1
-IF ~~ THEN REPLY @30 GOTO PAWNSHOP
+IF ~~ THEN REPLY @29 DO ~SetGlobal("7Xkaga","GLOBAL",1) SetGlobal("7XkagaJoin","AR0700",1)~ GOTO CRAZY1
+IF ~~ THEN REPLY @30 DO ~SetGlobal("7Xkaga","GLOBAL",1)~ GOTO PAWNSHOP
 IF ~~ THEN REPLY @11 DO ~SetGlobal("7Xkaga","GLOBAL",1)~ GOTO 7xStartStore
 IF ~~ THEN REPLY @31  DO ~SetGlobal("7Xkaga","GLOBAL",1)~ GOTO SHUTUP
 END
 
 IF ~Global("7Xkaga","GLOBAL",1)~ kagain2
 SAY @10
-IF ~~ THEN REPLY @29 GOTO CRAZY2
-IF ~~ THEN REPLY @30 GOTO PAWNSHOP
+IF ~~ THEN REPLY @29 DO ~SetGlobal("7Xkaga","GLOBAL",2) SetGlobal("7XkagaJoin","AR0700",2)~ GOTO CRAZY2
+IF ~~ THEN REPLY @30 DO ~SetGlobal("7Xkaga","GLOBAL",2)~ GOTO PAWNSHOP
 IF ~~ THEN REPLY @11 DO ~SetGlobal("7Xkaga","GLOBAL",2)~ GOTO 7xStartStore
 IF ~~ THEN REPLY @32  DO ~SetGlobal("7Xkaga","GLOBAL",2)~ GOTO SHUTUP
 END
@@ -83,8 +83,8 @@ SAY @33
 =
 @35
 IF ~~ THEN REPLY @30 GOTO PAWNSHOP
-IF ~~ THEN REPLY @11 DO ~SetGlobal("7Xkaga","GLOBAL",1)~ GOTO 7xStartStore
-IF ~~ THEN REPLY @36  DO ~SetGlobal("7Xkaga","GLOBAL",1)~ GOTO SHUTUP
+IF ~~ THEN REPLY @11 GOTO 7xStartStore
+IF ~~ THEN REPLY @36 GOTO SHUTUP
 END
 
 IF ~~ CRAZY2
@@ -94,24 +94,34 @@ SAY @37
 =
 @39
 IF ~~ THEN REPLY @30 GOTO PAWNSHOP
-IF ~~ THEN REPLY @11 DO ~SetGlobal("7Xkaga","GLOBAL",2)~ GOTO 7xStartStore
-IF ~~ THEN REPLY @36  DO ~SetGlobal("7Xkaga","GLOBAL",2)~ GOTO SHUTUP
+IF ~~ THEN REPLY @11 GOTO 7xStartStore
+IF ~~ THEN REPLY @36 GOTO SHUTUP
+END
+
+IF ~~ CRAZY3
+SAY @38
+=
+@39
+IF ~~ THEN REPLY @30 GOTO PAWNSHOP
+IF ~~ THEN REPLY @11 GOTO 7xStartStore
+IF ~~ THEN REPLY @36 GOTO SHUTUP
 END
 
 IF ~Global("7Xkaga","GLOBAL",2)~ kagain3
 SAY @40
 =
 @41
-IF ~~ THEN REPLY @29 GOTO CRAZY1
-IF ~~ THEN REPLY @30 GOTO PAWNSHOP
+IF ~~ THEN REPLY @29 DO ~SetGlobal("7Xkaga","GLOBAL",3) SetGlobal("7XkagaJoin","AR0700",3)~ GOTO CRAZY3
+IF ~~ THEN REPLY @30 DO ~SetGlobal("7Xkaga","GLOBAL",3)~ GOTO PAWNSHOP
 IF ~~ THEN REPLY @11 DO ~SetGlobal("7Xkaga","GLOBAL",3)~ GOTO 7xStartStore
 IF ~~ THEN REPLY @36  DO ~SetGlobal("7Xkaga","GLOBAL",3)~ GOTO SHUTUP
 END
 
 
 IF ~Global("7Xkaga","GLOBAL",3)~ kagain4
 SAY @42
-IF ~~ THEN REPLY @29 GOTO OKAY1
+IF ~!Global("7XkagaJoin","AR0700",3)~ THEN DO ~SetGlobal("7XkagaJoin","AR0700",3)~ REPLY @29 GOTO CRAZY3
+IF ~Global("7XkagaJoin","AR0700",3)~ THEN REPLY @29 GOTO OKAY1
 IF ~~ THEN REPLY @30 GOTO PAWNSHOP
 IF ~~ THEN REPLY @11 DO ~SetGlobal("7Xkaga","GLOBAL",1)~ GOTO 7xStartStore
 IF ~~ THEN REPLY @36  DO ~SetGlobal("7Xkaga","GLOBAL",1)~ GOTO SHUTUP
@@ -130,7 +140,7 @@ END
 
 IF ~~ THEN BEGIN PAWNSHOP
 SAY @48
-IF ~~ THEN DO ~SetGlobal("7Xkaga","GLOBAL",2)StartStore("bg1npc5",LastTalkedToBy())~ EXIT
+IF ~~ THEN DO ~StartStore("bg1npc5",LastTalkedToBy())~ EXIT
 END