Skip to content

Commit

Permalink
Move Iron Throne Guard to separate component
Browse files Browse the repository at this point in the history
And fix dialog loop when "SearchIronThrone" is set
  • Loading branch information
Ychap committed Oct 7, 2024
1 parent 2bef046 commit ec415c2
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 31 deletions.
6 changes: 0 additions & 6 deletions JA#BGT_AdvPack/Arkhstaff/JA#IRONH.BAF

This file was deleted.

25 changes: 0 additions & 25 deletions JA#BGT_AdvPack/Arkhstaff/setup-Arkhstaff.tpa
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ COPY ~JA#BGT_AdvPack/Arkhstaff/JA#ARKHS.CRE~ ~override~
SAY NAME1 @2049
SAY NAME2 @2049

COPY ~JA#BGT_AdvPack/Arkhstaff/JA#IRONH.CRE~ ~override~

COPY_EXISTING ~THALDO.CRE~ ~override/JA#THALD.CRE~
LPF REMOVE_CRE_SCRIPT STR_VAR script_old = ~LEAVECH7~ END
LPF ADD_CRE_SCRIPT STR_VAR script_new = ~SHOUT~ END
Expand All @@ -61,9 +59,7 @@ COPY ~JA#BGT_AdvPack/Arkhstaff/JA#ARKHS.ITM~ ~override~
COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Arkhstaff/JA#ARKHS.BAF~
COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Arkhstaff/JA#C04DR.BAF~
COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Arkhstaff/JA#C04.BAF~
COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Arkhstaff/JA#IRONH.BAF~

EXTEND_TOP ~%BaldursGateDocks_BCS%.BCS~ ~JA#BGT_AdvPack/Arkhstaff/AR8100.BAF~ EVALUATE_BUFFER
EXTEND_TOP ~%BaldursGateDocks_OgreMagiHouse_L1_BCS%.BCS~ ~JA#BGT_AdvPack/Arkhstaff/AR8101.BAF~ EVALUATE_BUFFER
EXTEND_TOP ~%BaldursGateDocks_OgreMagiHouse_L2_BCS%.BCS~ ~JA#BGT_AdvPack/Arkhstaff/AR8102.BAF~ EVALUATE_BUFFER

Expand All @@ -86,7 +82,6 @@ COMPILE EVALUATE_BUFFER ~...inlined/thaldo_ee.d~ // Must be compiled before ja#t

COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Arkhstaff/ja#thaldo.d~ // Process COPY_TRANS THALDO 0
COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Arkhstaff/ja#arkhs.d~ // Creates CHAIN with JA#THALD.DLG
COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Arkhstaff/ja#ironh.d~
COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Arkhstaff/ja#husam.d~

ADD_JOURNAL @81 @1010 @1019 USING ~JA#BGT_AdvPack/languages/%s/ja#arkhs.tra~
Expand Down Expand Up @@ -191,26 +186,6 @@ COPY_EXISTING ~%BaldursGateDocks_OgreMagiHouse_L2%.are~ ~override~
BUT_ONLY

COPY_EXISTING ~%BaldursGateDocks%.ARE~ ~override~
LPF ALTER_AREA_DOOR
INT_VAR
flag_locked = 1
lock_difficulty = 100
STR_VAR
door_name = ~Door0616~ // Correct door in BGT, BGEE and EET
END
// add new actor
LPF fj_are_structure
INT_VAR
fj_loc_x = 397
fj_loc_y = 642
fj_dest_x = 397
fj_dest_y = 642
fj_orientation = 15
STR_VAR
fj_structure_type = actor
fj_name = ~Iron Throne Guard~
fj_cre_resref = ~JA#IRONH~
END
// add mapnote
LPF fj_are_structure
INT_VAR
Expand Down
File renamed without changes.
Binary file not shown.
File renamed without changes.
36 changes: 36 additions & 0 deletions JA#BGT_AdvPack/Iron_Throne/setup-Iron_Throne.tpa
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
//////////////////////
// Iron Throne Guard
//////////////////////


COPY ~JA#BGT_AdvPack/Iron_Throne/JA#IRONH.CRE~ ~override~


EXTEND_TOP ~%BaldursGateDocks_BCS%.BCS~ ~JA#BGT_AdvPack/Iron_Throne/AR8100.BAF~ EVALUATE_BUFFER


COMPILE EVALUATE_BUFFER ~JA#BGT_AdvPack/Iron_Throne/ja#ironh.d~


COPY_EXISTING ~%BaldursGateDocks%.ARE~ ~override~
LPF ALTER_AREA_DOOR
INT_VAR
flag_locked = 1
lock_difficulty = 100
STR_VAR
door_name = ~Door0616~ // Correct door name in BGT, BGEE and EET
END
// add new actor
LPF fj_are_structure
INT_VAR
fj_loc_x = 397
fj_loc_y = 642
fj_dest_x = 397
fj_dest_y = 642
fj_orientation = 15
STR_VAR
fj_structure_type = actor
fj_name = ~Iron Throne Guard~
fj_cre_resref = ~JA#IRONH~
END
BUT_ONLY
10 changes: 10 additions & 0 deletions JA#BGT_AdvPack/Setup-JA#BGT_AdvPack.tp2
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,16 @@ LABEL "JA#BGT_AdvPack-Ducal_Palace"
INCLUDE ~JA#BGT_AdvPack/Ducal_Palace/setup-Ducal_Palace.tpa~


//////////////////////
// Iron Throne Guard
//////////////////////

BEGIN ~Iron Throne Guard~ DESIGNATED 53
LABEL "JA#BGT_AdvPack-Iron_Throne"

INCLUDE ~JA#BGT_AdvPack/Iron_Throne/setup-Iron_Throne.tpa~


/////////////////////////////////////////////////////////
// Graphical improvements: Animated torches and candles
/////////////////////////////////////////////////////////
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Coded to be compatibile with BGEE, EET and BGT
50. Stationary Nashkel soldiers
51. Special keg in Elfsong Tavern
52. Ducal Palace
53. Iron Throne Guard

<ol start="100">
<li>Graphical improvements: Animated torches and candles</li>
Expand Down

0 comments on commit ec415c2

Please sign in to comment.