Tweaked Master/Malak cutscene edit in Star Forge Deck 2. Fixes #173

KOTORCommunityPatches · Dec 20, 2023 · dad5e19 · dad5e19
1 parent 8a70259
commit dad5e19
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Source/k_psta_masterent.nss b/Source/k_psta_masterent.nss
@@ -10,10 +10,13 @@
 	Malak, which looked kind of weird. It prevents Malak being instantly refaced
 	on the subsequent line due to speaker/listener tags.
 	
+	Updated 2023-12-20 to walk the Sith directly to Malak, in combination with a
+	DLG listener and camera angle change.
+	
 	Issue #173: 
 	https://github.com/KOTORCommunityPatches/K1_Community_Patch/issues/173
 	
-	DP 2023-12-08																*/
+	DP 2023-12-08 / DP 2023-12-20												*/
 //////////////////////////////////////////////////////////////////////////////////
 
 #include "cp_inc_k1"
@@ -22,12 +25,11 @@ void main() {
 
 	object oMalak = GetObjectByTag("sta45b_malak", 0);
 	object oMaster = GetNearestObjectByTag("SithMaster", OBJECT_SELF, 1);
-	object oWP = GetObjectByTag("K_PSTA_SITH_WP", 0);
 
 	ActionPauseConversation();
 
-	AssignCommand(oMaster, ActionMoveToObject(oWP));
-	AssignCommand(oMaster, ActionDoCommand(CP_FaceNPC(oMaster, oMalak)));
+	AssignCommand(oMaster, SetFacingPoint(GetPosition(oMalak)));
+	AssignCommand(oMaster, ActionMoveToObject(oMalak));
 	AssignCommand(oMaster, ActionDoCommand(DelayCommand(0.5, CP_FaceNPC(oMalak, oMaster))));
 
 	ActionWait(4.3);

diff --git a/tslpatchdata/changes.ini b/tslpatchdata/changes.ini
@@ -819,6 +819,7 @@ File640=tat_m17ag_tat17_10czerk_01.dlg
 File641=korr_m39aa_kor39_starspeak.dlg
 File642=korr_m39aa_k39_plc_starmap.utp
 File643=kas_m25aa_kas25_comp_01.dlg
+File644=sta_m45ab_k_sta45_malak2.dlg
 
 [CompileList]
 
@@ -25785,3 +25786,7 @@ Useable=0
 !Destination=modules\kas_m25aa.mod
 !Filename=kas25_comp_01.dlg
 EntryList\55\Quest=
+[sta_m45ab_k_sta45_malak2.dlg]
+!Destination=modules\sta_m45ab.mod
+!Filename=k_sta45_malak2.dlg
+EntryList\1\Speaker=p_ksta_listener_2
diff --git a/tslpatchdata/k_psta_masterent.ncs b/tslpatchdata/k_psta_masterent.ncs