From ad5d716e41be4e89ebf8b255ae55f99fe982b193 Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Wed, 24 Jan 2024 22:54:29 +0100
Subject: [PATCH] Fixed SF_NQ_G_07Mael_SC04_DijaamPr_0013F712 not matching
 source code

---
 .../sf_nq_g_07mael_sc04_dijaampr_0013f712.pex | Bin 1420 -> 1664 bytes
 .../sf_nq_g_07mael_sc04_dijaampr_0013f712.psc |  84 ++++++++----------
 2 files changed, 35 insertions(+), 49 deletions(-)

diff --git a/scripts/sf_nq_g_07mael_sc04_dijaampr_0013f712.pex b/scripts/sf_nq_g_07mael_sc04_dijaampr_0013f712.pex
index 95c4f6730fc9e3fda3a3bb2354c00179b79472e9..1d9d7ec6b197aa5410de8cbe631b95c8d0979575 100644
GIT binary patch
literal 1664
zcmZuw-Ez}L6h3QPv113*5)x9HrfO42_zSY*kdnKG*l90H0_wn}W|7wRg1jrFbv(QP
z@52LhrVrBLLAdHUD=StycxN=<`TO>q@2tPP{^xVG0u1mcK7ITb?)ih@`HSE*@DBgv
zA`bj#UN1P2Z#kcwr-A2n_6LWZ?p~6G(CkN%o~GF}cA+f_yf>4|g+sWL4FmN)7$MPw
zh_VogB1@FyL_;LPYa6G+_=Xz+%ct7t95x3jA5DZZ!2z@`amRy2pj*OE%Sq+HVL8w%
zRh03s&<eGRq>)<j7?#E|ii85k4}}tN?dWJONN~YZSVs{=F<CI2s*uVusLzw2_FQ9C
zoxl4nmOO*@OEDCwP@%}}Wu(J|S4h?Ng_$O#@HtOS7wShxMof}@aCm5RTG&0fuHU>B
zp-Bs-B60xE`>DuGVLyS|vDPuHVUPV{jlr3Yxq8_jz<R#Nzs9Ma4Pu^+6FrMW3eA)0
zB*|mYwAlkLm4P;H=4_^<8ojW$)G`qdp@CiFl12hn{e;hyKOOP(k1Q5_b)i4Nl5bM1
zfStiy8rO`uaZ?;MRT&z>4W}szV%*Gb9jDHBzB+$qG5_$pH2#=VZ%?n%WHV{Pu^=9q
zxw$N^(Uvw#L@0++M04VX60`Yh(yFhb9It3~EJjl0)?D%~tl?B=R%Ll1p6N*v3nQYd
z?h~0M*c`fB$FWq=IT@F0@`^2VU@f2IIMzDyvBVgB0a5WM`x{#L>={((Pe-6yfLZ|@
za<AIp62V&*)(L)ZVFR%IM?B<Orq8y8O@JEg;Mv7PZoH}v5AAsbd+-<!xmW13j~v$+
zv<c&{ask&ZV)$k74SY*p3f@3yQ|joYSPO4i&0Q3~32QcUY2hUII+?eydn7|EAG1}?
zabN?!gWEV1<!-_cu!S?#HyOCLW~0sEHiHdh_-R2>L8n8kKQDY_ZeKNjVQ`1Rro9%U
zcM&t#B9qZ)7j?Uwq1^6Hi3Szgg?n~5`(fD4eQ>^B_@G=^#hizEA%jQAlIu~$PWEhL
zxgMzheT<{`amfqK@(mU6P#IFFhI#o|UNKgOfj1YoLcT4BB>!Jhcac=3q-}@c6I&@?
rvRK!Cd5lImrvg1}<N#MxxxAxSG=lo}7#xsk_1(sY_f>tLl=%Mxp<Xn>

literal 1420
zcmZuwT~pIQ6unzo3N4=&5D+1N2nb^NaFF^|Xpsl`FpfTE)@0j;Nq0lCrNfWW8UKmD
z#9!f)<AZm18wfK^+RVB4o;~;6-Q@4rU%v-3KmafH<L4jPwCm3Km2>Kp4?j{CIQDV*
zz&Y`+DQ#ayPPx3hUq9U4+X-VA3N_CYoha@E7L2h3?{s}`K^fNKhQn{1CJMEcQ0$_R
zr-ecz)IcF@J9NsVEvaNMd@7_cuuzX^v(314-oXPtg5rH1*FF>u(uH!WaG1h-P;>?N
zeCZ2L0~l=ip2s-kY?pBcqm@c;Zs(RpFoUzQWB{kp;jUU1L%v6X?76^INA+ICk}WE&
zxa&)|#bS*7*b?8anJX<RFl1I7GS_eT%(G%W?GR^OGwh%(BcC^67%iaa7i?b;yv99K
z&c-ZgK)zBj;fUZ>*7UiFFfCa-+=Co-rHB+w#rrUBx<{<RBF0^oR1P3_(_yhp;<u2k
z3K76G4qQu)-nkF~<)3PGm@#MnxfO|SJ)m(b6kU&@!IMrqG&Lw_cAffM!Wf?BMVI3^
zSGvoj&E#<>LJR7Uo9yfaN_I%Q-0n1KbQTA!#&5+P6sv*Hy~}{!q4*ds>V)dmyQGoa
zORSa?unX&t_dP;>#MQPl%QfA4yF6_?Rs$hCI}E6lxE&spOj`B(;7hwjai-o!@O=)3
z@wFt7Q6Gf@0}05gXh`RB3QlM^2uPj9Tcz@VKTF@sumY=i_ZAV@(h$W7>}yz1@I9_B
z5*SffW&gpbMg*S(#$a4!RdE8LrsOfJYQyMk5}qXW5=>!o8dC#L3Cs|{=d|`dN??{i
z3FEm`7L86CL8Xv`d3Xj3@LVe_!V=D~4EY5DE9ip2JpM75N0C*X(9#)9=2W8>4>=XC
zJq};$wu{;fR@VtE60lTA)MEojNm(&N5F~D-WFXt0vzg`;`g2~TIfH3V22W)PwsF)9
q_A@@WQa-l`Y~TA_#iN>n*J``WMdop5aqIe;-$^$e>d$$T;`|32_72_v

diff --git a/source/scripts/sf_nq_g_07mael_sc04_dijaampr_0013f712.psc b/source/scripts/sf_nq_g_07mael_sc04_dijaampr_0013f712.psc
index bca4bea6..05970d9a 100644
--- a/source/scripts/sf_nq_g_07mael_sc04_dijaampr_0013f712.psc
+++ b/source/scripts/sf_nq_g_07mael_sc04_dijaampr_0013f712.psc
@@ -1,66 +1,52 @@
-;BEGIN FRAGMENT CODE - Do not edit anything between this and the end comment
-;NEXT FRAGMENT INDEX 13
-Scriptname SF_NQ_G_07Mael_SC04_DijaamPr_0013F712 Extends Scene Hidden
+ScriptName SF_NQ_G_07Mael_SC04_DijaamPr_0013F712 Extends Scene hidden
 
-;BEGIN FRAGMENT Fragment_8
-Function Fragment_8()
-;BEGIN CODE
-NQ_G_07.BlindPlayer()
-;END CODE
+;-- Variables ---------------------------------------
+
+;-- Properties --------------------------------------
+_00e_nq_g_07_functions Property NQ_G_07 Auto
+
+;-- Functions ---------------------------------------
+
+Function Fragment_5(ReferenceAlias akAlias)
+  ; Empty function
 EndFunction
-;END FRAGMENT
 
-;BEGIN FRAGMENT Fragment_9
-Function Fragment_9()
-;BEGIN CODE
-NQ_G_07.DijaamBloodSplattered()
-;END CODE
+; Skipped compiler generated GetState
+
+; Skipped compiler generated GotoState
+
+Function Fragment_10()
+  NQ_G_07.DijaamPlayHitShader()
 EndFunction
-;END FRAGMENT
 
-;BEGIN FRAGMENT Fragment_12
-Function Fragment_12()
-;BEGIN CODE
-GetOwningQuest().SetCurrentStageID(35)
-;END CODE
+Function Fragment_2()
+  NQ_G_07.SetupSC04Part2()
 EndFunction
-;END FRAGMENT
 
-;BEGIN FRAGMENT Fragment_4
-Function Fragment_4()
-;BEGIN CODE
-NQ_G_07.DijaamThrowFlashpowder(NQ_G_07._00E_NQ_G_07_OolanREF, false)
-NQ_G_07.DumpDijaam()
-NQ_G_07.OolanFaint()
-GetOwningQuest().SetCurrentStageID(40)
-;END CODE
+Function Fragment_9()
+  NQ_G_07.DijaamBloodSplattered()
 EndFunction
-;END FRAGMENT
 
-;BEGIN FRAGMENT Fragment_10
-Function Fragment_10()
-;BEGIN CODE
-NQ_G_07.DijaamPlayHitShader()
-;END CODE
+Function Fragment_12()
+  Self.GetOwningQuest().SetStage(35)
 EndFunction
-;END FRAGMENT
 
-;BEGIN FRAGMENT Fragment_7
 Function Fragment_7()
-;BEGIN CODE
-NQ_G_07.SpawnSugarIsleEnvoy()
-;END CODE
+  NQ_G_07.SpawnSugarIsleEnvoy()
 EndFunction
-;END FRAGMENT
 
-;BEGIN FRAGMENT Fragment_2
-Function Fragment_2()
-;BEGIN CODE
-NQ_G_07.SetupSC04Part2()
-;END CODE
+Function Fragment_14()
+  Self.GetOwningQuest().SetObjectiveCompleted(30, True)
+  Self.GetOwningQuest().SetObjectiveDisplayed(35, True, False)
 EndFunction
-;END FRAGMENT
 
-;END FRAGMENT CODE - Do not edit anything between this and the begin comment
+Function Fragment_4()
+  NQ_G_07.DijaamThrowFlashpowder(NQ_G_07._00E_NQ_G_07_OolanREF as ObjectReference, False)
+  NQ_G_07.DumpDijaam()
+  NQ_G_07.OolanFaint()
+  Self.GetOwningQuest().SetStage(40)
+EndFunction
 
-_00E_NQ_G_07_Functions Property NQ_G_07 Auto
+Function Fragment_8()
+  NQ_G_07.BlindPlayer()
+EndFunction