Skip to content

Commit

Permalink
Ajantis Romance / SCS Wait at Inns Component
Browse files Browse the repository at this point in the history 
The Ajantis Romance alters AJANTP.DLG, which creates an incompatibility
with the SCS Wait at Inns component.

This edit adds a “wait at inns” dialog to the AJANTP state added by the
Ajantis Romance in BGEE, as suggested by Jastey.

http://forums.gibberlings3.net/index.php?showtopic=26491
  • Loading branch information
Bryan Dunne committed Jul 11, 2014
1 parent 1a85622 commit a2918fc
Show file tree
Hide file tree
Showing 6 changed files with 330 additions and 11 deletions.
18 changes: 7 additions & 11 deletions bg1npc.tp2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5320,19 +5320,15 @@ BEGIN @1016 /* The BG1 NPC Project: Ajantis Romance Core (teen content) */
COMPILE EVALUATE_BUFFER ~BG1NPC/Phase3/AJROM/dlg/x#ajantisBhaalLTs.D~
COMPILE EVALUATE_BUFFER ~BG1NPC/Phase3/AJROM/dlg/x#ajantisDreamLTs.D~

/* ToSC only: */
ACTION_IF GAME_IS ~tutu_totsc bgt bgee~ THEN BEGIN // if Tutu/TotSC/BGEE is installed
ACTION_IF GAME_IS ~tutu~ BEGIN // Tutu without TotSC
COMPILE EVALUATE_BUFFER ~BG1NPC/Phase3/AJROM/dlg/x#ajantisAddLTs_PR_noToSC.D~
END ELSE ACTION_IF GAME_IS ~bgee~ BEGIN // BGEE
COMPILE EVALUATE_BUFFER ~BG1NPC/Phase3/AJROM/dlg/x#ajantisAddLTs_PR_BGEE.D~
USING ~BG1NPC/TRA/%LANGUAGE%/x#ajantisAddLTs_PR.tra~
END ELSE BEGIN // Tutu+TotSC or BGT
COMPILE EVALUATE_BUFFER ~BG1NPC/Phase3/AJROM/dlg/x#ajantisAddLTs_PR.D~
END

ACTION_IF GAME_IS ~tutu~ THEN BEGIN
COMPILE EVALUATE_BUFFER ~BG1NPC/Phase3/AJROM/dlg/x#ajantisAddLTs_PR_noToSC.D~
END

ACTION_IF FILE_EXISTS_IN_GAME ~AR7200.are~ AND NOT FILE_EXISTS_IN_GAME ~ARW003.are~ THEN BEGIN
COMPILE EVALUATE_BUFFER ~BG1NPC/Phase3/AJROM/dlg/x#ajantisAddLTs_PR_noToSC.D~
END


/* scripts */
COMPILE EVALUATE_BUFFER ~BG1NPC/Phase3/AJROM/baf/X#AJDOUG.BAF~

Expand Down
290 changes: 290 additions & 0 deletions bg1npc/phase3/ajrom/dlg/x#ajantisaddlts_pr_bgee.d
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,290 @@
ADD_STATE_TRIGGER ~%AJANTIS_POST%~ 0 ~OR(3) !Global("X#AjantisRomanceMatch","GLOBAL",1) Global("X#AjantisRomanceActive","GLOBAL",0) Global("X#AjantisRomanceActive","GLOBAL",3)~

APPEND ~%AJANTIS_POST%~

IF ~%BGT_VAR% Global("%KICKED_OUT%","LOCALS",1) Global("X#AjantisRomanceMatch","GLOBAL",1) OR(2) Global("X#AjantisRomanceActive","GLOBAL",1) Global("X#AjantisRomanceActive","GLOBAL",2)~ THEN return_romance
SAY @71
IF ~~ THEN REPLY @72 GOTO return_romance_01
IF ~~ THEN REPLY @73 GOTO 1
IF ~~ THEN REPLY @75 GOTO wait_at_fai
IF ~Global("EnteredBeregost","GLOBAL",1)~ THEN REPLY @76 GOTO wait_at_juggler
IF ~GlobalGT("Chapter","GLOBAL",1)~ THEN REPLY @77 GOTO wait_at_nashkel
IF ~Global("EnteredBaldursGate","GLOBAL",1)~ THEN REPLY @78 GOTO wait_at_elfsong
END

IF ~~ THEN return_romance_01
SAY @74
IF ~~ THEN EXIT
END

IF ~~ THEN wait_at_fai
SAY @79
IF ~~ DO ~EscapeAreaMove("%FriendlyArmInn_L1%",766,966,S)~ EXIT
END

IF ~~ THEN wait_at_juggler
SAY @80
IF ~~ DO ~EscapeAreaMove("%Beregost_JovialJuggler_L1%",824,961,S)~ EXIT
END

IF ~~ THEN wait_at_nashkel
SAY @81
IF ~~ DO ~EscapeAreaMove("%Nashkel_Inn%",602,463,S)~ EXIT
END

IF ~~ THEN wait_at_elfsong
SAY @82
IF ~~ DO ~EscapeAreaMove("%EBaldursGate_ElfsongTavern_L1%",537,704,S)~ EXIT
END

END

I_C_T ~%tutu_scriptd%URLYLE1~ 39 X#AjantisDurlyle39
== ~%AJANTIS_JOINED%~ IF ~InParty("ajantis") InMyArea("ajantis") !StateCheck("ajantis",CD_STATE_NOTVALID) OR(2) Global("X#AjantisRomanceActive","GLOBAL",1) Global("X#AjantisRomanceActive","GLOBAL",2)~ THEN @0
END

/* kiss */
I_C_T ~%tutu_scriptd%URLYLE1~ 58 X#AjantisDurlyle58
== ~%AJANTIS_JOINED%~ IF ~InParty("ajantis") InMyArea("ajantis") !StateCheck("ajantis",CD_STATE_NOTVALID) OR(2) Global("X#AjantisRomanceActive","GLOBAL",1) Global("X#AjantisRomanceActive","GLOBAL",2)~ THEN @1
END

/* kiss */
I_C_T ~%tutu_scriptd%URLYLE1~ 59 X#AjantisDurlyle59
== ~%AJANTIS_JOINED%~ IF ~InParty("ajantis") InMyArea("ajantis") !StateCheck("ajantis",CD_STATE_NOTVALID) OR(2) Global("X#AjantisRomanceActive","GLOBAL",1) Global("X#AjantisRomanceActive","GLOBAL",2)~ THEN @1
END

ADD_TRANS_ACTION ~%tutu_scriptd%URLYLE1~ BEGIN 42 63 END BEGIN END ~SetGlobal("X#AjantisRomanceDurDirect","GLOBAL",1)~

ADD_TRANS_ACTION ~%tutu_scriptd%URLYLE1~ BEGIN 64 61 END BEGIN END ~SetGlobal("X#AjantisRomanceDurSweety","GLOBAL",1)~

APPEND ~%AJANTIS_JOINED%~

IF WEIGHT #-2 ~%BGT_VAR% Global("X#AjantisRomanceDurDirect","GLOBAL",2) Global("X#AjantisRomanceActive","GLOBAL",1)~ THEN durlyle_direct_flirt
SAY @2
= @3
IF ~~ THEN DO ~SetGlobal("X#AjantisRomanceActive","GLOBAL",3) SetGlobal("X#AjantisRomanceInsult","GLOBAL",1) SetGlobal("X#AjantisRomanceDurDirect","GLOBAL",3)~ EXIT
END

IF WEIGHT #-2 ~%BGT_VAR% Global("X#AjantisRomanceDurDirect","GLOBAL",2) Global("X#AjantisRomanceActive","GLOBAL",2)~ THEN durlyle_direct
SAY @4
++ @5 + durlyle_direct_01
++ @6 + durlyle_direct_02
++ @7 + durlyle_direct_03
+ ~!Global("X#AjantisRomanceIntimacy","GLOBAL",1)~ + @8 + durlyle_direct_04
+ ~Global("X#AjantisRomanceIntimacy","GLOBAL",1)~ + @8 + durlyle_direct_05
++ @9 + durlyle_direct_06
END

IF ~~ THEN durlyle_direct_01
SAY @10
IF ~~ THEN + durlyle_direct_07
END

IF ~~ THEN durlyle_direct_02
SAY @11
IF ~~ THEN + durlyle_direct_07
END

IF ~~ THEN durlyle_direct_03
SAY @12
IF ~~ THEN + durlyle_direct_07
END

IF ~~ THEN durlyle_direct_04
SAY @13
IF ~~ THEN + durlyle_direct_07
END

IF ~~ THEN durlyle_direct_05
SAY @14
IF ~~ THEN + durlyle_direct_07
END

IF ~~ THEN durlyle_direct_06
SAY @15
IF ~~ THEN + durlyle_direct_07
END

IF ~~ THEN durlyle_direct_07
SAY @16
IF ~~ THEN DO ~SetGlobal("X#AjantisRomanceActive","GLOBAL",3) SetGlobal("X#AjantisRomanceInsult","GLOBAL",1) SetGlobal("X#AjantisRomanceDurDirect","GLOBAL",3)~ EXIT
END

IF WEIGHT #-2 ~%BGT_VAR% Global("X#AjantisRomanceDurSweety","GLOBAL",2) Global("X#AjantisRomanceActive","GLOBAL",1)~ THEN durlyle_sweety_flirt
SAY @17
++ @18 + sweety_flirt_01
++ @19 + sweety_flirt_02
++ @20 + sweety_flirt_03
END

IF ~~ THEN sweety_flirt_01
SAY @21
IF ~~ THEN DO ~SetGlobal("X#AjantisRomanceDurSweety","GLOBAL",3)~ EXIT
END

IF ~~ THEN sweety_flirt_02
SAY @22
= @23
IF ~~ THEN DO ~SetGlobal("X#AjantisRomanceActive","GLOBAL",3) SetGlobal("X#AjantisRomanceOtherMan","GLOBAL",1) SetGlobal("X#AjantisRomanceDurSweety","GLOBAL",3)~ EXIT
END

IF ~~ THEN sweety_flirt_03
SAY @24
= @25
= @26
IF ~~ THEN DO ~SetGlobal("X#AjantisRomanceActive","GLOBAL",3) SetGlobal("X#AjantisRomanceInsult","GLOBAL",1) SetGlobal("X#AjantisRomanceDurSweety","GLOBAL",3)~ EXIT
END

IF WEIGHT #-2 ~%BGT_VAR% Global("X#AjantisRomanceDurSweety","GLOBAL",2) Global("X#AjantisRomanceActive","GLOBAL",2)~ THEN durlyle_sweety
SAY @27
++ @28 + durlyle_sweety_01
++ @29 + durlyle_sweety_02
++ @30 + durlyle_sweety_03
+ ~!Global("X#AjantisRomanceIntimacy","GLOBAL",1)~ + @31 + durlyle_sweety_04
+ ~Global("X#AjantisRomanceIntimacy","GLOBAL",1)~ + @31 + durlyle_sweety_05
END

IF ~~ THEN durlyle_sweety_01
SAY @32
IF ~~ THEN DO ~SetGlobal("X#AjantisRomanceDurSweety","GLOBAL",3)~ EXIT
END

IF ~~ THEN durlyle_sweety_02
SAY @33
++ @34 + durlyle_sweety_01
++ @35 + durlyle_sweety_06
END

IF ~~ THEN durlyle_sweety_03
SAY @36
++ @37 + durlyle_sweety_01
++ @35 + durlyle_sweety_06
END

IF ~~ THEN durlyle_sweety_04
SAY @38
IF ~~ THEN + durlyle_sweety_06
END

IF ~~ THEN durlyle_sweety_05
SAY @39
= @40
IF ~~ THEN + durlyle_sweety_06
END

IF ~~ THEN durlyle_sweety_06
SAY @41
IF ~~ THEN DO ~SetGlobal("X#AjantisRomanceActive","GLOBAL",3) SetGlobal("X#AjantisRomanceInsult","GLOBAL",1) SetGlobal("X#AjantisRomanceDurSweety","GLOBAL",3)~ EXIT
END

/* from LT 24: only for rep>= 16. If rep < 16 at LT 22, Ajantis gives hint. */
IF WEIGHT #-2 ~%BGT_VAR% Global("X#AjantisRomanceNeedMoreRep","GLOBAL",1)~ THEN rep_too_low
SAY @42
IF ~~ THEN DO ~SetGlobal("X#AjantisRomanceNeedMoreRep","GLOBAL",2)~ EXIT
END

/* for RomanceActive = 2: if rep < 16 */
IF WEIGHT #-2 ~%BGT_VAR% Global("X#AjantisRomanceLostRep","GLOBAL",1)~ THEN lost_rep
SAY @43
IF ~~ THEN DO ~SetGlobal("X#AjantisRomanceLostRep","GLOBAL",2)~ EXIT
END


//if PC made unfriendly decisions
//GlobalGT("X#AjantisRomanceBadDecision","GLOBAL",4)
IF WEIGHT #-2 ~%BGT_VAR% Global("X#AjantisRomanceTooManyBD","GLOBAL",1)~ THEN too_many_baddecisions
SAY @44
IF ~!Global("X#AjantisRomanceActive","GLOBAL",1)~ THEN DO ~SetGlobal("X#AjantisRomanceTooManyBD","GLOBAL",2)~ EXIT
IF ~Global("X#AjantisRomanceActive","GLOBAL",1)~ THEN DO ~SetGlobal("X#AjantisRomanceActive","GLOBAL",3) SetGlobal("X#AjantisRomanceInsult","GLOBAL",1) SetGlobal("X#AjantisRomanceTooManyBD","GLOBAL",2)~ EXIT
END

/* if PC made unfriendly decisions */
/* GlobalGT("X#AjantisRomanceBadDecision","GLOBAL",4) */
IF WEIGHT #-2 ~%BGT_VAR% Global("X#AjantisRomanceTooManyBD","GLOBAL",1)~ THEN too_many_baddecisions
SAY @44
IF ~!Global("X#AjantisRomanceActive","GLOBAL",1)~ THEN DO ~SetGlobal("X#AjantisRomanceTooManyBD","GLOBAL",2)~ EXIT
IF ~Global("X#AjantisRomanceActive","GLOBAL",1)~ THEN DO ~SetGlobal("X#AjantisRomanceActive","GLOBAL",3) SetGlobal("X#AjantisRomanceInsult","GLOBAL",1) SetGlobal("X#AjantisRomanceTooManyBD","GLOBAL",2)~ EXIT
END

//GlobalGT("X#AjantisRomanceBadDecision","GLOBAL",7)
IF WEIGHT #-2 ~%BGT_VAR% Global("X#AjantisRomanceTooManyBD","GLOBAL",3)~ THEN too_many_baddecisions2
SAY @45
IF ~~ THEN DO ~SetGlobal("X#AjantisRomanceTooManyBD","GLOBAL",4) LeaveParty() Enemy() SetGlobal("X#AjantisRomanceActive","GLOBAL",3)~ SOLVED_JOURNAL @46 EXIT
END


//if PC didn't talk about Gorion in first LT
IF WEIGHT #-2 ~%BGT_VAR% Global("X#AjantisRomanceNoGorion","GLOBAL",3)~ THEN gorion
SAY @47
++ @48 + gorion_01
++ @49 + gorion_02
++ @50 + gorion_03
++ @51 + gorion_04
++ @52 + gorion_07
++ @53 + gorion_09
++ @54 + gorion_08
END

IF ~~ THEN gorion_01
SAY @55
IF ~~ THEN + gorion_06
END

IF ~~ THEN gorion_02
SAY @56
++ @57 + gorion_06
++ @58 + gorion_05
++ @59 + gorion_05
END

IF ~~ THEN gorion_03
SAY @60
IF ~~ THEN + gorion_06
END

IF ~~ THEN gorion_04
SAY @61
IF ~~ THEN + gorion_06
END

IF ~~ THEN gorion_05
SAY @62
IF ~~ THEN + gorion_06
END

IF ~~ THEN gorion_06
SAY @63
IF ~~ THEN DO ~SetGlobal("X#AjantisRomanceNoGorion","GLOBAL",4)~ EXIT
END

IF ~~ THEN gorion_07
SAY @64
++ @48 + gorion_01
++ @49 + gorion_02
++ @50 + gorion_03
++ @65 + gorion_04
++ @53 + gorion_09
++ @66 + gorion_08
END

IF ~~ THEN gorion_08
SAY @67
IF ~~ THEN DO ~SetGlobal("X#AjantisRomanceActive","GLOBAL",3) SetGlobal("X#AjantisRomanceInsult","GLOBAL",1) SetGlobal("X#AjantisRomanceNoGorion","GLOBAL",4)~ EXIT
END

IF ~~ THEN gorion_09
SAY @68
IF ~~ THEN + gorion_06
END

IF ~Global("X#AjantisRomPCGirdle","GLOBAL",1) Global("X#AjantisRomanceActive","GLOBAL",1)~ THEN PC_helmet
SAY @69
IF ~~ THEN DO ~SetGlobal("X#AjantisRomPCGirdle","GLOBAL",2)~ EXIT
END

IF ~Global("X#AjantisRomPCGirdle","GLOBAL",1) Global("X#AjantisRomanceActive","GLOBAL",2)~ THEN PC_girdle
SAY @70
IF ~~ THEN DO ~SetGlobal("X#AjantisRomPCGirdle","GLOBAL",2)~ EXIT
END

END
9 changes: 9 additions & 0 deletions bg1npc/tra/english/x#ajantisaddlts_pr.tra
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,12 @@ Ajantis attacked me, saying he can't accept how I treat people. I had to kill hi
@72 = ~I am sorry, you will have to wait a bit longer, Ajantis.~
@73 = ~Yes, please do join.~
@74 = ~As you wish, <CHARNAME>. I shall wait.~
@75 = ~I am sorry, you will have to wait a bit longer, Ajantis. Until then, wait for me at the Friendly Arm Inn.~
@76 = ~I am sorry, you will have to wait a bit longer, Ajantis. Until then, wait for me at the Jovial Juggler in Beregost.~
@77 = ~I am sorry, you will have to wait a bit longer, Ajantis. Until then, wait for me at the Nashkel Inn.~
@78 = ~I am sorry, you will have to wait a bit longer, Ajantis. Until then, wait for me at the Elfsong Tavern in Baldur's Gate.~
@79 = ~As you wish, <CHARNAME>. I shall wait for you at the Friendly Arm Inn.~
@80 = ~As you wish, <CHARNAME>. I shall wait for you at the Jovial Juggler.~
@81 = ~As you wish, <CHARNAME>. I shall wait for you at the Nashkel Inn.~
@82 = ~As you wish, <CHARNAME>. I shall wait for you at the Elfsong Tavern.~

8 changes: 8 additions & 0 deletions bg1npc/tra/french/x#ajantisaddlts_pr.tra
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,11 @@ Ajantis m'a attaqu
@72 = ~Je suis d�sol�e, tu vas devoir attendre un peu plus longtemps, Ajantis.~
@73 = ~Oui, s'il te pla�t, rejoins-nous.~
@74 = ~Comme vous le d�sirez, <CHARNAME>. J'attendrai.~
@75 = ~Je suis d�sol�e, tu vas devoir attendre un peu plus longtemps, Ajantis. D'ici l�, attendez-moi � l'Auberge de Brasamical.~
@76 = ~Je suis d�sol�e, tu vas devoir attendre un peu plus longtemps, Ajantis. D'ici l�, attendez-moi � l'Auberge de la Jongleur Joviale � B�r�gost.~
@77 = ~Je suis d�sol�e, tu vas devoir attendre un peu plus longtemps, Ajantis. D'ici l�, attendez-moi � l'Auberge de Nashkel.~
@78 = ~Je suis d�sol�e, tu vas devoir attendre un peu plus longtemps, Ajantis. D'ici l�, attendez-moi � la Taverne du Chant de l'Elfe dans la Porte de Baldur.~
@79 = ~Comme vous le d�sirez, <CHARNAME>. J'attendrai � l'Auberge de Brasamical.~
@80 = ~Comme vous le d�sirez, <CHARNAME>. J'attendrai � l'Auberge de la Jongleur Joviale.~
@81 = ~Comme vous le d�sirez, <CHARNAME>. J'attendrai � l'Auberge de Nashkel.~
@82 = ~Comme vous le d�sirez, <CHARNAME>. J'attendrai � la Taverne du Chant de l'Elfe.~
8 changes: 8 additions & 0 deletions bg1npc/tra/polish/x#ajantisaddlts_pr.tra
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,11 @@ Ajantis zaatakowa
@72 = ~Przykro mi, b�dziesz musia� poczeka� troch� d�u�ej, Ajantis.~
@73 = ~Tak, prosz� przy��cz si�.~
@74 = ~Jak sobie �yczysz, <CHARNAME>. B�d� czeka�.~
@75 = ~Przykro mi, b�dziesz musia� poczeka� troch� d�u�ej, Ajantis. P�ki co, poczekaj na mnie w gospodzie Pod Pomocn� D�oni�.~
@76 = ~Przykro mi, b�dziesz musia� poczeka� troch� d�u�ej, Ajantis. P�ki co, poczekaj na mnie w "Jowialny Zonglerze" w Beregostu.~
@77 = ~Przykro mi, b�dziesz musia� poczeka� troch� d�u�ej, Ajantis. P�ki co, poczekaj na mnie w gospodzie w Nashkel.~
@78 = ~Przykro mi, b�dziesz musia� poczeka� troch� d�u�ej, Ajantis. P�ki co, poczekaj na mnie w tawern� "Elfia Pie��" w Wrotach Baldura.~
@79 = ~Jak sobie �yczysz, <CHARNAME>. B�d� czeka�a w gospodzie "Pod Pomocn� D�oni�".~
@80 = ~Jak sobie �yczysz, <CHARNAME>. B�d� czeka�a w gospodzie "Jowialny Zonglerze".~
@81 = ~Jak sobie �yczysz, <CHARNAME>. B�d� czeka�a w gospodzie w Nashkel.~
@82 = ~Jak sobie �yczysz, <CHARNAME>. B�d� czeka�a w tawern� "Elfia Pie��"~
8 changes: 8 additions & 0 deletions bg1npc/tra/spanish/x#ajantisaddlts_pr.tra
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,11 @@ Ajantis me atac
@72 = ~Lo siento, pero tendr�is que esperar un poco m�s, Ajantis.~
@73 = ~S�, por favor.~
@74 = ~Como dese�is, <CHARNAME>. Esperar�.~
@75 = ~Lo siento, pero tendr�is que esperar un poco m�s, Ajantis. Hasta entonces, esp�rame en el Mes�n del Brazo Amigo.~
@76 = ~Lo siento, pero tendr�is que esperar un poco m�s, Ajantis. Hasta entonces, esp�rame en Beregost en el Mes�n del Juglar Joviales.~
@77 = ~Lo siento, pero tendr�is que esperar un poco m�s, Ajantis. Hasta entonces, esp�rame en el Mes�n del Nashkel.~
@78 = ~Lo siento, pero tendr�is que esperar un poco m�s, Ajantis. Hasta entonces, esp�rame en la Puerta de Baldur en la Taberna la Canci�n del Elfo.~
@79 = ~Como dese�is, <CHARNAME>. Esperar� en el Mes�n del Brazo Amigo.~
@80 = ~Como dese�is, <CHARNAME>. Esperar� en el Mes�n del Juglar Joviales.~
@81 = ~Como dese�is, <CHARNAME>. Esperar� en el Mes�n del Nashkel.~
@82 = ~Como dese�is, <CHARNAME>. Esperar� en la Taberna la Canci�n del Elfo.~

0 comments on commit a2918fc

Please sign in to comment.