Added Dustil OnDeath script and new journal entries for his premature…

… death. For testing #4

CHANGELOG.md

@@ -171,6 +171,7 @@
 * Made changes to the exploding pillar scene in the Tomb of Ajunta Pall on Korriban to prevent AI and UI issues
 * Jumped the party for Yuthura's conversation in the Dreshdae cantina and forced companions to face her on their interjections
 * Edited Dustil's conversation in the Korriban Academy to jump the party and fix some facing issues with Carth and the player
+* Added a new OnDeath script for Dustil to account for killing him at different stages of Carth's personal quest
 
 ### Changes
 * Cleaned up changes.ini, removing extraneous editor data and orphaned entries (removed ~2,000 lines)

README.md

@@ -242,6 +242,7 @@ Given the complexity of this mod, a clean install of KOTOR is recommended. Howev
 * Fixed the position of the strongbox in the Taris Lower City apartments (reported by DarthParametric)
 * Hidden Beks didn’t react quickly to intruders (reported by DarthParametric)
 * It was possible to interact with a transformer in the Sith base on Taris—though it did nothing of particular interest
+* Killing Dustil before completing Carth's quest would leave its status unresolved (with additions by DarthParametric) [ISSUE #4](https://github.com/KOTORCommunityPatches/K1_Community_Patch/issues/4)
 * Pazaak player Kudos on Tatooine would only bet 50 credits instead of 500 for the final matches
 * Redros was slow to equip a weapon for the brawl after the swoop race (reported by DarthParametric)
 * Several aliens were very low-quality: [JC's Dense Aliens](https://deadlystream.com/files/file/1290-jcs-dense-aliens-for-k1/)

Source/cp_kor_dustil_d.nss

@@ -0,0 +1,44 @@
+////////////////////////////////////////////////////////////////////////////////
+/*	KOTOR Community Patch
+
+	Dustil's OnDeath script. Ensures Carth will realize Dustil is dead.
+	
+	Updated 2019-07-13 to add journal entry checks/updates for the "Finding
+	Dustil" quest to account for killing Dustil at various different stages.
+	
+	JC 2019-01-26                                                             */
+////////////////////////////////////////////////////////////////////////////////
+
+#include "k_inc_switch"
+
+void main() {
+
+	// Set Dustil's status to dead
+	SetGlobalNumber("KOR_DANEL", 5);
+
+	// Set Carth's conversations to "nothing more to talk about"
+	SetGlobalNumber("K_SWG_CARTH", 99);
+
+	// Jordo has told Carth that Dustil is on Korriban
+	if ((GetJournalEntry("kor35_findingdustil") == 10))
+		{
+			AddJournalQuestEntry("kor35_findingdustil", 50, FALSE);
+		}
+
+	// Dustil has been found and talked to in the Academy, and Carth
+	// is searching for proof to convince him of the Sith's true nature
+	if ((GetJournalEntry("kor35_findingdustil") == 20))
+		{
+			AddJournalQuestEntry("kor35_findingdustil", 60, FALSE);
+		}
+
+	// The datapad in Uthar's quarters talking about killing Dustil's
+	// girlfriend has been found, but hasn't been given to Dustil yet
+	if ((GetJournalEntry("kor35_findingdustil") == 25))
+		{
+			AddJournalQuestEntry("kor35_findingdustil", 70, FALSE);
+		}
+
+	//Carry out vanilla k_def_death01 function
+	ExecuteScript("k_ai_master", OBJECT_SELF, KOTOR_DEFAULT_EVENT_ON_DEATH);
+}

Tier Organization.md

@@ -75,6 +75,7 @@ These are fixes for other issues that were likely unintended. They don't break t
 * It was possible to repeatedly attempt to blackmail Roland Wann after the events of Hrakert Station for infinite DS points [ISSUE #106](https://github.com/KOTORCommunityPatches/K1_Community_Patch/issues/106)
 * Jolee's stunt double was briefly visible when he joined the party [ISSUE #122](https://github.com/KOTORCommunityPatches/K1_Community_Patch/issues/122)
 * Juhani in the Grove lacked a soundset (Suggested by JCarter426) [ISSUE #41](https://github.com/KOTORCommunityPatches/K1_Community_Patch/issues/41)
+* Killing Dustil before completing Carth's quest would leave its status unresolved (with additions by DarthParametric) [ISSUE #4](https://github.com/KOTORCommunityPatches/K1_Community_Patch/issues/4)
 * Malak's grunt sound didn't play in the Revelation cutscene: [KOTOR Bug Fix Attempt 1.1](http://deadlystream.com/forum/files/file/470-kotor-bug-fix-attempt/)
 * Manaan's Port Official had a gap along the grate in in front of his kiosk, along with some bad UVs around the edge [ISSUE #134](https://github.com/KOTORCommunityPatches/K1_Community_Patch/issues/134)
 * Mission has no clothing on when you meet Griff at the spaceport without her in your party

tslpatchdata/changes.ini

@@ -45,6 +45,9 @@ StrRef20=20
 StrRef21=21
 StrRef22=22
 StrRef23=23
+StrRef24=24
+StrRef25=25
+StrRef26=26
 
 [InstallList]
 install_folder0=modules
@@ -397,6 +400,7 @@ File268=k37_plc_obelisk.utp
 File269=kor37_therangen.utp
 File270=kor33_yuthura.dlg
 File271=k_hdustil_dialog.dlg
+File272=kor35_dustil.utc
 
 [CompileList]
 
@@ -897,6 +901,7 @@ Replace4=k35_vic_torture3.ncs
 Replace5=k35_vic_torture5.ncs
 Replace6=cp_k35_facedust.ncs
 Replace7=cp_k35_unlckdust.ncs
+Replace8=cp_kor_dustil_d.ncs
 [install_folder33]
 Replace0=k_kas_xorattack.ncs
 [install_folder34]
@@ -3480,6 +3485,9 @@ Path=Equip_ItemList\0
 Label=Dropable
 Value=0
 [global.jrl]
+Categories\10\EntryList\9\Text(strref)=38987
+Categories\10\EntryList\10\Text(strref)=38985
+Categories\10\EntryList\11\Text(strref)=38986
 AddField0=gff_global_EntryList_9_0
 AddField1=gff_global_EntryList_5_0
 AddField2=gff_global_EntryList_4_0
@@ -3494,9 +3502,9 @@ AddField10=gff_global_EntryList_3_1
 AddField11=gff_global_EntryList_8_0
 AddField12=Casusgff_global_EntryList_1_0
 AddField13=Casusgff_global_EntryList_2_0
-Categories\10\EntryList\9\Text(strref)=38987
-Categories\10\EntryList\10\Text(strref)=38985
-Categories\10\EntryList\11\Text(strref)=38986
+AddField14=Dustilgff_global_EntryList_14_0
+AddField15=Dustilgff_global_EntryList_15_0
+AddField16=Dustilgff_global_EntryList_16_0
 [gff_global_EntryList_9_0]
 FieldType=Struct
 Path=Categories\25\EntryList
@@ -3847,6 +3855,81 @@ StrRef=StrRef20
 FieldType=Float
 Label=XP_Percentage
 Value=0
+[Dustilgff_global_EntryList_14_0]
+FieldType=Struct
+Path=Categories\23\EntryList
+Label=
+TypeId=5
+AddField0=Dustilgff_global_ID_14
+AddField1=Dustilgff_global_End_14
+AddField2=Dustilgff_global_Text_14
+AddField3=Dustilgff_global_XP_Percentage_14
+[Dustilgff_global_ID_14]
+FieldType=DWORD
+Label=ID
+Value=50
+[Dustilgff_global_End_14]
+FieldType=Word
+Label=End
+Value=1
+[Dustilgff_global_Text_14]
+FieldType=ExoLocString
+Label=Text
+StrRef=StrRef24
+[Dustilgff_global_XP_Percentage_14]
+FieldType=Float
+Label=XP_Percentage
+Value=0
+[Dustilgff_global_EntryList_15_0]
+FieldType=Struct
+Path=Categories\23\EntryList
+Label=
+TypeId=6
+AddField0=Dustilgff_global_ID_15
+AddField1=Dustilgff_global_End_15
+AddField2=Dustilgff_global_Text_15
+AddField3=Dustilgff_global_XP_Percentage_15
+[Dustilgff_global_ID_15]
+FieldType=DWORD
+Label=ID
+Value=60
+[Dustilgff_global_End_15]
+FieldType=Word
+Label=End
+Value=1
+[Dustilgff_global_Text_15]
+FieldType=ExoLocString
+Label=Text
+StrRef=StrRef25
+[Dustilgff_global_XP_Percentage_15]
+FieldType=Float
+Label=XP_Percentage
+Value=0
+[Dustilgff_global_EntryList_16_0]
+FieldType=Struct
+Path=Categories\23\EntryList
+Label=
+TypeId=7
+AddField0=Dustilgff_global_ID_16
+AddField1=Dustilgff_global_End_16
+AddField2=Dustilgff_global_Text_16
+AddField3=Dustilgff_global_XP_Percentage_16
+[Dustilgff_global_ID_16]
+FieldType=DWORD
+Label=ID
+Value=70
+[Dustilgff_global_End_16]
+FieldType=Word
+Label=End
+Value=1
+[Dustilgff_global_Text_16]
+FieldType=ExoLocString
+Label=Text
+StrRef=StrRef26
+[Dustilgff_global_XP_Percentage_16]
+FieldType=Float
+Label=XP_Percentage
+Value=0
 [k_kor_alphashy.utc]
 !Destination=modules\korr_m36aa.mod
 Appearance_Type=282
@@ -9195,3 +9278,6 @@ EntryList\58\Script=cp_k35_facedust
 EntryList\62\Script=cp_k35_unlckdust
 ReplyList\72\Script=k_pkor_end_host
 ReplyList\87\Script=cp_k35_unlckdust
+[kor35_dustil.utc]
+!Destination=modules\korr_m35aa.mod
+ScriptDeath=cp_kor_dustil_d