diff --git a/scripts/EnderalUpgradeAlias.pex b/scripts/EnderalUpgradeAlias.pex
index 452ca902..9870bba7 100644
Binary files a/scripts/EnderalUpgradeAlias.pex and b/scripts/EnderalUpgradeAlias.pex differ
diff --git a/scripts/_00E_AffinityControl.pex b/scripts/_00E_AffinityControl.pex
index 9495cea2..0c90c643 100644
Binary files a/scripts/_00E_AffinityControl.pex and b/scripts/_00E_AffinityControl.pex differ
diff --git a/scripts/_00_complexsetstageonread.pex b/scripts/_00_complexsetstageonread.pex
index d718914c..6b3dcf4b 100644
Binary files a/scripts/_00_complexsetstageonread.pex and b/scripts/_00_complexsetstageonread.pex differ
diff --git a/scripts/_00e_ark_nq_korflightactivatorscript.pex b/scripts/_00e_ark_nq_korflightactivatorscript.pex
index c703acf2..7aa20ba4 100644
Binary files a/scripts/_00e_ark_nq_korflightactivatorscript.pex and b/scripts/_00e_ark_nq_korflightactivatorscript.pex differ
diff --git a/scripts/_00e_ark_templedoorsc.pex b/scripts/_00e_ark_templedoorsc.pex
index ed8a2604..81199463 100644
Binary files a/scripts/_00e_ark_templedoorsc.pex and b/scripts/_00e_ark_templedoorsc.pex differ
diff --git a/scripts/_00e_ark_travelcrossroadssc.pex b/scripts/_00e_ark_travelcrossroadssc.pex
index dc853fd8..d7ccd0bb 100644
Binary files a/scripts/_00e_ark_travelcrossroadssc.pex and b/scripts/_00e_ark_travelcrossroadssc.pex differ
diff --git a/scripts/_00e_barddialoguefunctions.pex b/scripts/_00e_barddialoguefunctions.pex
index 3084bb57..a34b976a 100644
Binary files a/scripts/_00e_barddialoguefunctions.pex and b/scripts/_00e_barddialoguefunctions.pex differ
diff --git a/scripts/_00e_bedscript.pex b/scripts/_00e_bedscript.pex
index 0c25fc66..f8cf11ac 100644
Binary files a/scripts/_00e_bedscript.pex and b/scripts/_00e_bedscript.pex differ
diff --git a/scripts/_00e_bellhammersc.pex b/scripts/_00e_bellhammersc.pex
index f4c30f17..68fa11d1 100644
Binary files a/scripts/_00e_bellhammersc.pex and b/scripts/_00e_bellhammersc.pex differ
diff --git a/scripts/_00e_butcherofarkbookscript.pex b/scripts/_00e_butcherofarkbookscript.pex
index 27e48b72..6c649805 100644
Binary files a/scripts/_00e_butcherofarkbookscript.pex and b/scripts/_00e_butcherofarkbookscript.pex differ
diff --git a/scripts/_00e_caliafollowtriggerscript.pex b/scripts/_00e_caliafollowtriggerscript.pex
index 43c783db..57312883 100644
Binary files a/scripts/_00e_caliafollowtriggerscript.pex and b/scripts/_00e_caliafollowtriggerscript.pex differ
diff --git a/scripts/_00e_capitalcityualjaanvuulpotionsc.pex b/scripts/_00e_capitalcityualjaanvuulpotionsc.pex
index 7d362c6d..9a15d5b1 100644
Binary files a/scripts/_00e_capitalcityualjaanvuulpotionsc.pex and b/scripts/_00e_capitalcityualjaanvuulpotionsc.pex differ
diff --git a/scripts/_00e_chestanddoorlockscript.pex b/scripts/_00e_chestanddoorlockscript.pex
index f8b13979..091ae170 100644
Binary files a/scripts/_00e_chestanddoorlockscript.pex and b/scripts/_00e_chestanddoorlockscript.pex differ
diff --git a/scripts/_00e_class_openclassmenuscript.pex b/scripts/_00e_class_openclassmenuscript.pex
index c3584f50..3e524e8e 100644
Binary files a/scripts/_00e_class_openclassmenuscript.pex and b/scripts/_00e_class_openclassmenuscript.pex differ
diff --git a/scripts/_00e_complex_addsilencesc.pex b/scripts/_00e_complex_addsilencesc.pex
index 7559e2be..66f8863c 100644
Binary files a/scripts/_00e_complex_addsilencesc.pex and b/scripts/_00e_complex_addsilencesc.pex differ
diff --git a/scripts/_00e_complex_blockidlechattersc.pex b/scripts/_00e_complex_blockidlechattersc.pex
index c8655ca3..8d82ed3f 100644
Binary files a/scripts/_00e_complex_blockidlechattersc.pex and b/scripts/_00e_complex_blockidlechattersc.pex differ
diff --git a/scripts/_00e_complex_portnpcsforquestsc.pex b/scripts/_00e_complex_portnpcsforquestsc.pex
index fd106a61..c9846217 100644
Binary files a/scripts/_00e_complex_portnpcsforquestsc.pex and b/scripts/_00e_complex_portnpcsforquestsc.pex differ
diff --git a/scripts/_00e_complex_startscenesc.pex b/scripts/_00e_complex_startscenesc.pex
index cb02969c..d5f6c4a5 100644
Binary files a/scripts/_00e_complex_startscenesc.pex and b/scripts/_00e_complex_startscenesc.pex differ
diff --git a/scripts/_00e_complexscenetriggerscript.pex b/scripts/_00e_complexscenetriggerscript.pex
index 0f549d3d..5509d4e0 100644
Binary files a/scripts/_00e_complexscenetriggerscript.pex and b/scripts/_00e_complexscenetriggerscript.pex differ
diff --git a/scripts/_00e_complexsetstageonaliasdeath.pex b/scripts/_00e_complexsetstageonaliasdeath.pex
index 969a10f6..c392c921 100644
Binary files a/scripts/_00e_complexsetstageonaliasdeath.pex and b/scripts/_00e_complexsetstageonaliasdeath.pex differ
diff --git a/scripts/_00e_complexstartscenescript.pex b/scripts/_00e_complexstartscenescript.pex
index 3456bd24..b90e7c14 100644
Binary files a/scripts/_00e_complexstartscenescript.pex and b/scripts/_00e_complexstartscenescript.pex differ
diff --git a/scripts/_00e_cqc02_caliascuilasc.pex b/scripts/_00e_cqc02_caliascuilasc.pex
index c27e58cb..716f49dc 100644
Binary files a/scripts/_00e_cqc02_caliascuilasc.pex and b/scripts/_00e_cqc02_caliascuilasc.pex differ
diff --git a/scripts/_00e_cqc02_functions.pex b/scripts/_00e_cqc02_functions.pex
index 3b0cbf04..d4d235f0 100644
Binary files a/scripts/_00e_cqc02_functions.pex and b/scripts/_00e_cqc02_functions.pex differ
diff --git a/scripts/_00e_cqc04_addsilencesc.pex b/scripts/_00e_cqc04_addsilencesc.pex
index 83436b0a..33600d06 100644
Binary files a/scripts/_00e_cqc04_addsilencesc.pex and b/scripts/_00e_cqc04_addsilencesc.pex differ
diff --git a/scripts/_00e_cqc05_functions.pex b/scripts/_00e_cqc05_functions.pex
index ab384fa1..d2cbbe2a 100644
Binary files a/scripts/_00e_cqc05_functions.pex and b/scripts/_00e_cqc05_functions.pex differ
diff --git a/scripts/_00e_cqc05_losegamewhennearsc.pex b/scripts/_00e_cqc05_losegamewhennearsc.pex
index 3aa91ea6..59aa7bfe 100644
Binary files a/scripts/_00e_cqc05_losegamewhennearsc.pex and b/scripts/_00e_cqc05_losegamewhennearsc.pex differ
diff --git a/scripts/_00e_cqc06_getcaliasc.pex b/scripts/_00e_cqc06_getcaliasc.pex
index df724db2..7c2a478e 100644
Binary files a/scripts/_00e_cqc06_getcaliasc.pex and b/scripts/_00e_cqc06_getcaliasc.pex differ
diff --git a/scripts/_00e_cqc06_sc01_playerdancesc.pex b/scripts/_00e_cqc06_sc01_playerdancesc.pex
index a32761ed..c02814c0 100644
Binary files a/scripts/_00e_cqc06_sc01_playerdancesc.pex and b/scripts/_00e_cqc06_sc01_playerdancesc.pex differ
diff --git a/scripts/_00e_cqj01_dancingnomadsc.pex b/scripts/_00e_cqj01_dancingnomadsc.pex
index 7ff774dd..9363ad8e 100644
Binary files a/scripts/_00e_cqj01_dancingnomadsc.pex and b/scripts/_00e_cqj01_dancingnomadsc.pex differ
diff --git a/scripts/_00e_cqj02_getjesparsc.pex b/scripts/_00e_cqj02_getjesparsc.pex
index dadd0589..36e692d6 100644
Binary files a/scripts/_00e_cqj02_getjesparsc.pex and b/scripts/_00e_cqj02_getjesparsc.pex differ
diff --git a/scripts/_00e_cqj02_jespartowerfailsavesc.pex b/scripts/_00e_cqj02_jespartowerfailsavesc.pex
index 455b46a1..983f0bb4 100644
Binary files a/scripts/_00e_cqj02_jespartowerfailsavesc.pex and b/scripts/_00e_cqj02_jespartowerfailsavesc.pex differ
diff --git a/scripts/_00e_cqj02_playersc.pex b/scripts/_00e_cqj02_playersc.pex
index bb42d8ab..ba12246e 100644
Binary files a/scripts/_00e_cqj02_playersc.pex and b/scripts/_00e_cqj02_playersc.pex differ
diff --git a/scripts/_00e_cqj02_sc02_musiccontrolsc.pex b/scripts/_00e_cqj02_sc02_musiccontrolsc.pex
index e1aeb10e..8fc7333f 100644
Binary files a/scripts/_00e_cqj02_sc02_musiccontrolsc.pex and b/scripts/_00e_cqj02_sc02_musiccontrolsc.pex differ
diff --git a/scripts/_00e_cqj04_checktavernsc.pex b/scripts/_00e_cqj04_checktavernsc.pex
index dbb9801a..961ab370 100644
Binary files a/scripts/_00e_cqj04_checktavernsc.pex and b/scripts/_00e_cqj04_checktavernsc.pex differ
diff --git a/scripts/_00e_cqj04_functions.pex b/scripts/_00e_cqj04_functions.pex
index b794b9d3..c3a41b8d 100644
Binary files a/scripts/_00e_cqj04_functions.pex and b/scripts/_00e_cqj04_functions.pex differ
diff --git a/scripts/_00e_cqj05_functions.pex b/scripts/_00e_cqj05_functions.pex
index a97508f9..a4fdd7ef 100644
Binary files a/scripts/_00e_cqj05_functions.pex and b/scripts/_00e_cqj05_functions.pex differ
diff --git a/scripts/_00e_cqj06_enablejesparsc.pex b/scripts/_00e_cqj06_enablejesparsc.pex
index 4c70216a..3e8b456c 100644
Binary files a/scripts/_00e_cqj06_enablejesparsc.pex and b/scripts/_00e_cqj06_enablejesparsc.pex differ
diff --git a/scripts/_00e_cqj06_functions.pex b/scripts/_00e_cqj06_functions.pex
index ab33289e..284ad366 100644
Binary files a/scripts/_00e_cqj06_functions.pex and b/scripts/_00e_cqj06_functions.pex differ
diff --git a/scripts/_00e_debugsetstagetzrigger.pex b/scripts/_00e_debugsetstagetzrigger.pex
index e65705a7..0587c1a1 100644
Binary files a/scripts/_00e_debugsetstagetzrigger.pex and b/scripts/_00e_debugsetstagetzrigger.pex differ
diff --git a/scripts/_00e_dgintimidatealiasscript.pex b/scripts/_00e_dgintimidatealiasscript.pex
index a0163c2e..f42065c9 100644
Binary files a/scripts/_00e_dgintimidatealiasscript.pex and b/scripts/_00e_dgintimidatealiasscript.pex differ
diff --git a/scripts/_00e_dgintimidateplayerscript.pex b/scripts/_00e_dgintimidateplayerscript.pex
index f98b5b48..c7479ed0 100644
Binary files a/scripts/_00e_dgintimidateplayerscript.pex and b/scripts/_00e_dgintimidateplayerscript.pex differ
diff --git a/scripts/_00e_disablepcifscenerunning.pex b/scripts/_00e_disablepcifscenerunning.pex
index 2426c755..c622b8b0 100644
Binary files a/scripts/_00e_disablepcifscenerunning.pex and b/scripts/_00e_disablepcifscenerunning.pex differ
diff --git a/scripts/_00e_fs_cqt01_functions.pex b/scripts/_00e_fs_cqt01_functions.pex
index 0811ad92..bd585c54 100644
Binary files a/scripts/_00e_fs_cqt01_functions.pex and b/scripts/_00e_fs_cqt01_functions.pex differ
diff --git a/scripts/_00e_fs_environmentscene02trigger.pex b/scripts/_00e_fs_environmentscene02trigger.pex
index ef66d590..42684b34 100644
Binary files a/scripts/_00e_fs_environmentscene02trigger.pex and b/scripts/_00e_fs_environmentscene02trigger.pex differ
diff --git a/scripts/_00e_fs_mq18c_corpsesc.pex b/scripts/_00e_fs_mq18c_corpsesc.pex
index 6bf1bdee..6677c4d3 100644
Binary files a/scripts/_00e_fs_mq18c_corpsesc.pex and b/scripts/_00e_fs_mq18c_corpsesc.pex differ
diff --git a/scripts/_00e_fs_mq18c_functions.pex b/scripts/_00e_fs_mq18c_functions.pex
index 4225a230..45b1c567 100644
Binary files a/scripts/_00e_fs_mq18c_functions.pex and b/scripts/_00e_fs_mq18c_functions.pex differ
diff --git a/scripts/_00e_fs_nq01_functions.pex b/scripts/_00e_fs_nq01_functions.pex
index b9578f01..fdc1629a 100644
Binary files a/scripts/_00e_fs_nq01_functions.pex and b/scripts/_00e_fs_nq01_functions.pex differ
diff --git a/scripts/_00e_fs_nq01_sc02_failsavesc.pex b/scripts/_00e_fs_nq01_sc02_failsavesc.pex
index e894ad46..a05cb608 100644
Binary files a/scripts/_00e_fs_nq01_sc02_failsavesc.pex and b/scripts/_00e_fs_nq01_sc02_failsavesc.pex differ
diff --git a/scripts/_00e_fs_nq01_sc10_yuslanmessagesc.pex b/scripts/_00e_fs_nq01_sc10_yuslanmessagesc.pex
index 071a97f4..ccf49522 100644
Binary files a/scripts/_00e_fs_nq01_sc10_yuslanmessagesc.pex and b/scripts/_00e_fs_nq01_sc10_yuslanmessagesc.pex differ
diff --git a/scripts/_00e_fs_nq02_doorvisionscript.pex b/scripts/_00e_fs_nq02_doorvisionscript.pex
index ccdee5ef..e5ee3e25 100644
Binary files a/scripts/_00e_fs_nq02_doorvisionscript.pex and b/scripts/_00e_fs_nq02_doorvisionscript.pex differ
diff --git a/scripts/_00e_fs_nq02_entriggertravelscript.pex b/scripts/_00e_fs_nq02_entriggertravelscript.pex
index 5ca68ba1..457e66ae 100644
Binary files a/scripts/_00e_fs_nq02_entriggertravelscript.pex and b/scripts/_00e_fs_nq02_entriggertravelscript.pex differ
diff --git a/scripts/_00e_fs_nq02_functions.pex b/scripts/_00e_fs_nq02_functions.pex
index d1d6b3f6..bfe8949c 100644
Binary files a/scripts/_00e_fs_nq02_functions.pex and b/scripts/_00e_fs_nq02_functions.pex differ
diff --git a/scripts/_00e_fs_nq02_functions2.pex b/scripts/_00e_fs_nq02_functions2.pex
index 8d16b74b..1f813a23 100644
Binary files a/scripts/_00e_fs_nq02_functions2.pex and b/scripts/_00e_fs_nq02_functions2.pex differ
diff --git a/scripts/_00e_fs_nq02_lagerfeuerscript.pex b/scripts/_00e_fs_nq02_lagerfeuerscript.pex
index bdf23ac4..e8ca562f 100644
Binary files a/scripts/_00e_fs_nq02_lagerfeuerscript.pex and b/scripts/_00e_fs_nq02_lagerfeuerscript.pex differ
diff --git a/scripts/_00e_fs_nq02_museumnoscript.pex b/scripts/_00e_fs_nq02_museumnoscript.pex
index a421edae..b03bff7b 100644
Binary files a/scripts/_00e_fs_nq02_museumnoscript.pex and b/scripts/_00e_fs_nq02_museumnoscript.pex differ
diff --git a/scripts/_00e_fs_nq02_museumyesscript.pex b/scripts/_00e_fs_nq02_museumyesscript.pex
index 31752554..15a4dde6 100644
Binary files a/scripts/_00e_fs_nq02_museumyesscript.pex and b/scripts/_00e_fs_nq02_museumyesscript.pex differ
diff --git a/scripts/_00e_fs_nq02_passagierbuchscript.pex b/scripts/_00e_fs_nq02_passagierbuchscript.pex
index 29e103ba..25ce0721 100644
Binary files a/scripts/_00e_fs_nq02_passagierbuchscript.pex and b/scripts/_00e_fs_nq02_passagierbuchscript.pex differ
diff --git a/scripts/_00e_fs_nq02_phasmalistscript.pex b/scripts/_00e_fs_nq02_phasmalistscript.pex
index 19281525..205d83bc 100644
Binary files a/scripts/_00e_fs_nq02_phasmalistscript.pex and b/scripts/_00e_fs_nq02_phasmalistscript.pex differ
diff --git a/scripts/_00e_fs_nq02_schreinvisionscript.pex b/scripts/_00e_fs_nq02_schreinvisionscript.pex
index 812c908c..3f3edcab 100644
Binary files a/scripts/_00e_fs_nq02_schreinvisionscript.pex and b/scripts/_00e_fs_nq02_schreinvisionscript.pex differ
diff --git a/scripts/_00e_fs_nq03_functions.pex b/scripts/_00e_fs_nq03_functions.pex
index 822e93d2..653fe982 100644
Binary files a/scripts/_00e_fs_nq03_functions.pex and b/scripts/_00e_fs_nq03_functions.pex differ
diff --git a/scripts/_00e_fs_nq03_wordofthedeadscript.pex b/scripts/_00e_fs_nq03_wordofthedeadscript.pex
index a2f84dbb..2bb6dc61 100644
Binary files a/scripts/_00e_fs_nq03_wordofthedeadscript.pex and b/scripts/_00e_fs_nq03_wordofthedeadscript.pex differ
diff --git a/scripts/_00e_fs_nq05aushangscript.pex b/scripts/_00e_fs_nq05aushangscript.pex
index d07d327a..70eb1e04 100644
Binary files a/scripts/_00e_fs_nq05aushangscript.pex and b/scripts/_00e_fs_nq05aushangscript.pex differ
diff --git a/scripts/_00e_fs_nq06_functions.pex b/scripts/_00e_fs_nq06_functions.pex
index a65161ee..da2bf480 100644
Binary files a/scripts/_00e_fs_nq06_functions.pex and b/scripts/_00e_fs_nq06_functions.pex differ
diff --git a/scripts/_00e_fs_nq06_lighthouseletter.pex b/scripts/_00e_fs_nq06_lighthouseletter.pex
index 9defcb02..07d2aaea 100644
Binary files a/scripts/_00e_fs_nq06_lighthouseletter.pex and b/scripts/_00e_fs_nq06_lighthouseletter.pex differ
diff --git a/scripts/_00e_fs_nq07_aushangscript.pex b/scripts/_00e_fs_nq07_aushangscript.pex
index e1eeb749..62492f03 100644
Binary files a/scripts/_00e_fs_nq07_aushangscript.pex and b/scripts/_00e_fs_nq07_aushangscript.pex differ
diff --git a/scripts/_00e_fs_nq07_boneripperdeadscript.pex b/scripts/_00e_fs_nq07_boneripperdeadscript.pex
index 33616217..7c4e84df 100644
Binary files a/scripts/_00e_fs_nq07_boneripperdeadscript.pex and b/scripts/_00e_fs_nq07_boneripperdeadscript.pex differ
diff --git a/scripts/_00e_fs_nq07_dinneractivatorscript.pex b/scripts/_00e_fs_nq07_dinneractivatorscript.pex
index 6c7b3e5c..52d69470 100644
Binary files a/scripts/_00e_fs_nq07_dinneractivatorscript.pex and b/scripts/_00e_fs_nq07_dinneractivatorscript.pex differ
diff --git a/scripts/_00e_fs_nq07_erdhaufenscript.pex b/scripts/_00e_fs_nq07_erdhaufenscript.pex
index c690df4a..0778117a 100644
Binary files a/scripts/_00e_fs_nq07_erdhaufenscript.pex and b/scripts/_00e_fs_nq07_erdhaufenscript.pex differ
diff --git a/scripts/_00e_fs_nq07_functions.pex b/scripts/_00e_fs_nq07_functions.pex
index a66cc891..c685287b 100644
Binary files a/scripts/_00e_fs_nq07_functions.pex and b/scripts/_00e_fs_nq07_functions.pex differ
diff --git a/scripts/_00e_fs_nq07_ritualstuhlscript.pex b/scripts/_00e_fs_nq07_ritualstuhlscript.pex
index 0e9cdf23..07ded240 100644
Binary files a/scripts/_00e_fs_nq07_ritualstuhlscript.pex and b/scripts/_00e_fs_nq07_ritualstuhlscript.pex differ
diff --git a/scripts/_00e_fs_nq07_tavernbenchscript.pex b/scripts/_00e_fs_nq07_tavernbenchscript.pex
index 5b92981b..c930ccc1 100644
Binary files a/scripts/_00e_fs_nq07_tavernbenchscript.pex and b/scripts/_00e_fs_nq07_tavernbenchscript.pex differ
diff --git a/scripts/_00e_fs_nq09_functions.pex b/scripts/_00e_fs_nq09_functions.pex
index d9dc1c60..4539e5ab 100644
Binary files a/scripts/_00e_fs_nq09_functions.pex and b/scripts/_00e_fs_nq09_functions.pex differ
diff --git a/scripts/_00e_fs_nq10_miscscript.pex b/scripts/_00e_fs_nq10_miscscript.pex
index 912f5bc9..f066b49a 100644
Binary files a/scripts/_00e_fs_nq10_miscscript.pex and b/scripts/_00e_fs_nq10_miscscript.pex differ
diff --git a/scripts/_00e_fs_nq10_staticscript.pex b/scripts/_00e_fs_nq10_staticscript.pex
index bcb2665d..6174afd4 100644
Binary files a/scripts/_00e_fs_nq10_staticscript.pex and b/scripts/_00e_fs_nq10_staticscript.pex differ
diff --git a/scripts/_00e_fs_nq11_recipesc.pex b/scripts/_00e_fs_nq11_recipesc.pex
index 6965d98b..4a94c0e6 100644
Binary files a/scripts/_00e_fs_nq11_recipesc.pex and b/scripts/_00e_fs_nq11_recipesc.pex differ
diff --git a/scripts/_00e_fs_nqr01_startboxsc.pex b/scripts/_00e_fs_nqr01_startboxsc.pex
index ddd38509..b6132c00 100644
Binary files a/scripts/_00e_fs_nqr01_startboxsc.pex and b/scripts/_00e_fs_nqr01_startboxsc.pex differ
diff --git a/scripts/_00e_fs_nqr02_functions.pex b/scripts/_00e_fs_nqr02_functions.pex
index 86781311..61370c64 100644
Binary files a/scripts/_00e_fs_nqr02_functions.pex and b/scripts/_00e_fs_nqr02_functions.pex differ
diff --git a/scripts/_00e_fs_nqr02_portqaliansc.pex b/scripts/_00e_fs_nqr02_portqaliansc.pex
index dcd2d6c7..b1cef473 100644
Binary files a/scripts/_00e_fs_nqr02_portqaliansc.pex and b/scripts/_00e_fs_nqr02_portqaliansc.pex differ
diff --git a/scripts/_00e_fs_nqr03_functions.pex b/scripts/_00e_fs_nqr03_functions.pex
index 1645bd1a..3a5c6842 100644
Binary files a/scripts/_00e_fs_nqr03_functions.pex and b/scripts/_00e_fs_nqr03_functions.pex differ
diff --git a/scripts/_00e_fs_nqr03_heartsc.pex b/scripts/_00e_fs_nqr03_heartsc.pex
index 2d7ba8f6..af503dbc 100644
Binary files a/scripts/_00e_fs_nqr03_heartsc.pex and b/scripts/_00e_fs_nqr03_heartsc.pex differ
diff --git a/scripts/_00e_fs_nqr03_sisterpridetrigger.pex b/scripts/_00e_fs_nqr03_sisterpridetrigger.pex
index b2bb9c94..26ffd7fc 100644
Binary files a/scripts/_00e_fs_nqr03_sisterpridetrigger.pex and b/scripts/_00e_fs_nqr03_sisterpridetrigger.pex differ
diff --git a/scripts/_00e_fs_nqr03_tharaelfailsavesc.pex b/scripts/_00e_fs_nqr03_tharaelfailsavesc.pex
index 00089f6a..d4718e5a 100644
Binary files a/scripts/_00e_fs_nqr03_tharaelfailsavesc.pex and b/scripts/_00e_fs_nqr03_tharaelfailsavesc.pex differ
diff --git a/scripts/_00e_fs_nqr04_functions.pex b/scripts/_00e_fs_nqr04_functions.pex
index e087926b..dd85026e 100644
Binary files a/scripts/_00e_fs_nqr04_functions.pex and b/scripts/_00e_fs_nqr04_functions.pex differ
diff --git a/scripts/_00e_fs_nqr04_playerspawnmessengersc.pex b/scripts/_00e_fs_nqr04_playerspawnmessengersc.pex
index 5da5b4b0..a04a78f1 100644
Binary files a/scripts/_00e_fs_nqr04_playerspawnmessengersc.pex and b/scripts/_00e_fs_nqr04_playerspawnmessengersc.pex differ
diff --git a/scripts/_00e_fs_nqr04_sc04_tharaelsc.pex b/scripts/_00e_fs_nqr04_sc04_tharaelsc.pex
index 2ed53355..01ed6ed4 100644
Binary files a/scripts/_00e_fs_nqr04_sc04_tharaelsc.pex and b/scripts/_00e_fs_nqr04_sc04_tharaelsc.pex differ
diff --git a/scripts/_00e_fs_nqr04_tharaelaitrigger.pex b/scripts/_00e_fs_nqr04_tharaelaitrigger.pex
index fe9c3017..d5bfc577 100644
Binary files a/scripts/_00e_fs_nqr04_tharaelaitrigger.pex and b/scripts/_00e_fs_nqr04_tharaelaitrigger.pex differ
diff --git a/scripts/_00e_fs_nqr05_anistuckfixsc.pex b/scripts/_00e_fs_nqr05_anistuckfixsc.pex
index d5376047..8232df26 100644
Binary files a/scripts/_00e_fs_nqr05_anistuckfixsc.pex and b/scripts/_00e_fs_nqr05_anistuckfixsc.pex differ
diff --git a/scripts/_00e_fs_nqr05_bossfight_fathersc.pex b/scripts/_00e_fs_nqr05_bossfight_fathersc.pex
index 4caff0d1..9daa2961 100644
Binary files a/scripts/_00e_fs_nqr05_bossfight_fathersc.pex and b/scripts/_00e_fs_nqr05_bossfight_fathersc.pex differ
diff --git a/scripts/_00e_fs_nqr05_bossfight_tharaelsc.pex b/scripts/_00e_fs_nqr05_bossfight_tharaelsc.pex
index 52f699a9..bc58d55d 100644
Binary files a/scripts/_00e_fs_nqr05_bossfight_tharaelsc.pex and b/scripts/_00e_fs_nqr05_bossfight_tharaelsc.pex differ
diff --git a/scripts/_00e_fs_nqr05_fathermaskpickup.pex b/scripts/_00e_fs_nqr05_fathermaskpickup.pex
index fac1c762..9225574c 100644
Binary files a/scripts/_00e_fs_nqr05_fathermaskpickup.pex and b/scripts/_00e_fs_nqr05_fathermaskpickup.pex differ
diff --git a/scripts/_00e_fs_nqr05_functions.pex b/scripts/_00e_fs_nqr05_functions.pex
index 7d0250b7..1b8f47f7 100644
Binary files a/scripts/_00e_fs_nqr05_functions.pex and b/scripts/_00e_fs_nqr05_functions.pex differ
diff --git a/scripts/_00e_fs_nqr05_weathertriggersc.pex b/scripts/_00e_fs_nqr05_weathertriggersc.pex
index 8dc88726..7f8b7a61 100644
Binary files a/scripts/_00e_fs_nqr05_weathertriggersc.pex and b/scripts/_00e_fs_nqr05_weathertriggersc.pex differ
diff --git a/scripts/_00e_game_playerhouse_documentsc.pex b/scripts/_00e_game_playerhouse_documentsc.pex
index b291f81c..d4040ab4 100644
Binary files a/scripts/_00e_game_playerhouse_documentsc.pex and b/scripts/_00e_game_playerhouse_documentsc.pex differ
diff --git a/scripts/_00e_game_skillmenuleavesc.pex b/scripts/_00e_game_skillmenuleavesc.pex
index 93710665..c6eaa868 100644
Binary files a/scripts/_00e_game_skillmenuleavesc.pex and b/scripts/_00e_game_skillmenuleavesc.pex differ
diff --git a/scripts/_00e_gypsyminstrelscontrolscript.pex b/scripts/_00e_gypsyminstrelscontrolscript.pex
index a89b88f4..633dc7d7 100644
Binary files a/scripts/_00e_gypsyminstrelscontrolscript.pex and b/scripts/_00e_gypsyminstrelscontrolscript.pex differ
diff --git a/scripts/_00e_heroldscript.pex b/scripts/_00e_heroldscript.pex
index e2098399..6b74a36a 100644
Binary files a/scripts/_00e_heroldscript.pex and b/scripts/_00e_heroldscript.pex differ
diff --git a/scripts/_00e_losegamewhendetectedtrigger.pex b/scripts/_00e_losegamewhendetectedtrigger.pex
index 48d242ed..26e8d099 100644
Binary files a/scripts/_00e_losegamewhendetectedtrigger.pex and b/scripts/_00e_losegamewhendetectedtrigger.pex differ
diff --git a/scripts/_00e_modifyweathercomplexsc.pex b/scripts/_00e_modifyweathercomplexsc.pex
index d786846c..f1b63912 100644
Binary files a/scripts/_00e_modifyweathercomplexsc.pex and b/scripts/_00e_modifyweathercomplexsc.pex differ
diff --git a/scripts/_00e_mq00_trigbox00script.pex b/scripts/_00e_mq00_trigbox00script.pex
index 0d47d8de..956f1999 100644
Binary files a/scripts/_00e_mq00_trigbox00script.pex and b/scripts/_00e_mq00_trigbox00script.pex differ
diff --git a/scripts/_00e_mq00tempelkonstrukttriggbox.pex b/scripts/_00e_mq00tempelkonstrukttriggbox.pex
index 50ffd2a6..7c2c29ac 100644
Binary files a/scripts/_00e_mq00tempelkonstrukttriggbox.pex and b/scripts/_00e_mq00tempelkonstrukttriggbox.pex differ
diff --git a/scripts/_00e_mq00tempelkonstrukttriggboxb.pex b/scripts/_00e_mq00tempelkonstrukttriggboxb.pex
index cccfccf5..6ee81b25 100644
Binary files a/scripts/_00e_mq00tempelkonstrukttriggboxb.pex and b/scripts/_00e_mq00tempelkonstrukttriggboxb.pex differ
diff --git a/scripts/_00e_mq01_functions.pex b/scripts/_00e_mq01_functions.pex
index c6e692f4..f35288a0 100644
Binary files a/scripts/_00e_mq01_functions.pex and b/scripts/_00e_mq01_functions.pex differ
diff --git a/scripts/_00e_mq01_killerarrow02script.pex b/scripts/_00e_mq01_killerarrow02script.pex
index 19fb65f7..79770878 100644
Binary files a/scripts/_00e_mq01_killerarrow02script.pex and b/scripts/_00e_mq01_killerarrow02script.pex differ
diff --git a/scripts/_00e_mq01_playerknockoutscript.pex b/scripts/_00e_mq01_playerknockoutscript.pex
index 8ae900fe..7f4a6f5b 100644
Binary files a/scripts/_00e_mq01_playerknockoutscript.pex and b/scripts/_00e_mq01_playerknockoutscript.pex differ
diff --git a/scripts/_00e_mq01_setstageonactivatesit.pex b/scripts/_00e_mq01_setstageonactivatesit.pex
index 2d55bd2c..e68b8722 100644
Binary files a/scripts/_00e_mq01_setstageonactivatesit.pex and b/scripts/_00e_mq01_setstageonactivatesit.pex differ
diff --git a/scripts/_00e_mq01_triggerrangebox02.pex b/scripts/_00e_mq01_triggerrangebox02.pex
index 0d1a124d..648ba27b 100644
Binary files a/scripts/_00e_mq01_triggerrangebox02.pex and b/scripts/_00e_mq01_triggerrangebox02.pex differ
diff --git a/scripts/_00e_mq01_triggerrangeboxscript.pex b/scripts/_00e_mq01_triggerrangeboxscript.pex
index cca5cfc0..d8a2e77f 100644
Binary files a/scripts/_00e_mq01_triggerrangeboxscript.pex and b/scripts/_00e_mq01_triggerrangeboxscript.pex differ
diff --git a/scripts/_00e_mq01_updatestageonleavescript.pex b/scripts/_00e_mq01_updatestageonleavescript.pex
index 7976f3ce..cf672a21 100644
Binary files a/scripts/_00e_mq01_updatestageonleavescript.pex and b/scripts/_00e_mq01_updatestageonleavescript.pex differ
diff --git a/scripts/_00e_mq01b_changetrigboxscript.pex b/scripts/_00e_mq01b_changetrigboxscript.pex
index 91b2c11c..b4c9dc57 100644
Binary files a/scripts/_00e_mq01b_changetrigboxscript.pex and b/scripts/_00e_mq01b_changetrigboxscript.pex differ
diff --git a/scripts/_00e_mq02_d3_alfridbenchscript.pex b/scripts/_00e_mq02_d3_alfridbenchscript.pex
index ba6712ec..de47046c 100644
Binary files a/scripts/_00e_mq02_d3_alfridbenchscript.pex and b/scripts/_00e_mq02_d3_alfridbenchscript.pex differ
diff --git a/scripts/_00e_mq02_d7_followstartboxsc.pex b/scripts/_00e_mq02_d7_followstartboxsc.pex
index 1bf71163..98b926cc 100644
Binary files a/scripts/_00e_mq02_d7_followstartboxsc.pex and b/scripts/_00e_mq02_d7_followstartboxsc.pex differ
diff --git a/scripts/_00e_mq02_doorcrashfailsavesc.pex b/scripts/_00e_mq02_doorcrashfailsavesc.pex
index 2fdef306..558f6a3a 100644
Binary files a/scripts/_00e_mq02_doorcrashfailsavesc.pex and b/scripts/_00e_mq02_doorcrashfailsavesc.pex differ
diff --git a/scripts/_00e_mq02_functions.pex b/scripts/_00e_mq02_functions.pex
index d02f025e..44a0e40d 100644
Binary files a/scripts/_00e_mq02_functions.pex and b/scripts/_00e_mq02_functions.pex differ
diff --git a/scripts/_00e_mq02_secretleversscn.pex b/scripts/_00e_mq02_secretleversscn.pex
index b9d054d4..3ac141f9 100644
Binary files a/scripts/_00e_mq02_secretleversscn.pex and b/scripts/_00e_mq02_secretleversscn.pex differ
diff --git a/scripts/_00e_mq02_yerosbookscn.pex b/scripts/_00e_mq02_yerosbookscn.pex
index aa1323f0..6c067a39 100644
Binary files a/scripts/_00e_mq02_yerosbookscn.pex and b/scripts/_00e_mq02_yerosbookscn.pex differ
diff --git a/scripts/_00e_mq02_yeroscellarjesparfssc.pex b/scripts/_00e_mq02_yeroscellarjesparfssc.pex
index 489a7d70..4bcea0d5 100644
Binary files a/scripts/_00e_mq02_yeroscellarjesparfssc.pex and b/scripts/_00e_mq02_yeroscellarjesparfssc.pex differ
diff --git a/scripts/_00e_mq02arktrigger.pex b/scripts/_00e_mq02arktrigger.pex
index 14b47f7a..ce80b797 100644
Binary files a/scripts/_00e_mq02arktrigger.pex and b/scripts/_00e_mq02arktrigger.pex differ
diff --git a/scripts/_00e_mq02jesparfollowentrigger.pex b/scripts/_00e_mq02jesparfollowentrigger.pex
index 72577a3e..4316e096 100644
Binary files a/scripts/_00e_mq02jesparfollowentrigger.pex and b/scripts/_00e_mq02jesparfollowentrigger.pex differ
diff --git a/scripts/_00e_mq03_forschungsergebnissescn.pex b/scripts/_00e_mq03_forschungsergebnissescn.pex
index 4f9217ac..be5a7eef 100644
Binary files a/scripts/_00e_mq03_forschungsergebnissescn.pex and b/scripts/_00e_mq03_forschungsergebnissescn.pex differ
diff --git a/scripts/_00e_mq03_functions.pex b/scripts/_00e_mq03_functions.pex
index d18affbd..c3b8bf14 100644
Binary files a/scripts/_00e_mq03_functions.pex and b/scripts/_00e_mq03_functions.pex differ
diff --git a/scripts/_00e_mq03_jesparfailsavesc.pex b/scripts/_00e_mq03_jesparfailsavesc.pex
index e94546db..45f9e0af 100644
Binary files a/scripts/_00e_mq03_jesparfailsavesc.pex and b/scripts/_00e_mq03_jesparfailsavesc.pex differ
diff --git a/scripts/_00e_mq03ruinetriggerstartscene.pex b/scripts/_00e_mq03ruinetriggerstartscene.pex
index 3499e1fa..665c16fd 100644
Binary files a/scripts/_00e_mq03ruinetriggerstartscene.pex and b/scripts/_00e_mq03ruinetriggerstartscene.pex differ
diff --git a/scripts/_00e_mq03steinfragmentscn.pex b/scripts/_00e_mq03steinfragmentscn.pex
index 8866e357..4122f243 100644
Binary files a/scripts/_00e_mq03steinfragmentscn.pex and b/scripts/_00e_mq03steinfragmentscn.pex differ
diff --git a/scripts/_00e_mq03zauberbuchscn.pex b/scripts/_00e_mq03zauberbuchscn.pex
index 3f8242dc..61e56a1e 100644
Binary files a/scripts/_00e_mq03zauberbuchscn.pex and b/scripts/_00e_mq03zauberbuchscn.pex differ
diff --git a/scripts/_00e_mq04_firescript.pex b/scripts/_00e_mq04_firescript.pex
index 6d700cee..38dc6f29 100644
Binary files a/scripts/_00e_mq04_firescript.pex and b/scripts/_00e_mq04_firescript.pex differ
diff --git a/scripts/_00e_mq04_lishariliftscript.pex b/scripts/_00e_mq04_lishariliftscript.pex
index 1cc1a85c..6a740d4e 100644
Binary files a/scripts/_00e_mq04_lishariliftscript.pex and b/scripts/_00e_mq04_lishariliftscript.pex differ
diff --git a/scripts/_00e_mq04_lishariritualeffectscript.pex b/scripts/_00e_mq04_lishariritualeffectscript.pex
index 09477a61..78b23423 100644
Binary files a/scripts/_00e_mq04_lishariritualeffectscript.pex and b/scripts/_00e_mq04_lishariritualeffectscript.pex differ
diff --git a/scripts/_00e_mq04_veryuglylisharfailsafe.pex b/scripts/_00e_mq04_veryuglylisharfailsafe.pex
index 4570bd7a..1226c56b 100644
Binary files a/scripts/_00e_mq04_veryuglylisharfailsafe.pex and b/scripts/_00e_mq04_veryuglylisharfailsafe.pex differ
diff --git a/scripts/_00e_mq05_aixonattackscript.pex b/scripts/_00e_mq05_aixonattackscript.pex
index 38958401..c50daa3c 100644
Binary files a/scripts/_00e_mq05_aixonattackscript.pex and b/scripts/_00e_mq05_aixonattackscript.pex differ
diff --git a/scripts/_00e_mq05_functions.pex b/scripts/_00e_mq05_functions.pex
index fc62d8f5..53afda51 100644
Binary files a/scripts/_00e_mq05_functions.pex and b/scripts/_00e_mq05_functions.pex differ
diff --git a/scripts/_00e_mq05_killessentialoneffectstart.pex b/scripts/_00e_mq05_killessentialoneffectstart.pex
index e60c1a27..e66e5e3a 100644
Binary files a/scripts/_00e_mq05_killessentialoneffectstart.pex and b/scripts/_00e_mq05_killessentialoneffectstart.pex differ
diff --git a/scripts/_00e_mq05complexscenetriggerscript.pex b/scripts/_00e_mq05complexscenetriggerscript.pex
index 3600d927..a13aea3d 100644
Binary files a/scripts/_00e_mq05complexscenetriggerscript.pex and b/scripts/_00e_mq05complexscenetriggerscript.pex differ
diff --git a/scripts/_00e_mq05prologue_failsavesc.pex b/scripts/_00e_mq05prologue_failsavesc.pex
index ac150ddf..c1f5e0bc 100644
Binary files a/scripts/_00e_mq05prologue_failsavesc.pex and b/scripts/_00e_mq05prologue_failsavesc.pex differ
diff --git a/scripts/_00e_mq05prologue_functions.pex b/scripts/_00e_mq05prologue_functions.pex
index c0d13865..eb35c7a0 100644
Binary files a/scripts/_00e_mq05prologue_functions.pex and b/scripts/_00e_mq05prologue_functions.pex differ
diff --git a/scripts/_00e_mq06_caliaguidefailsavesc.pex b/scripts/_00e_mq06_caliaguidefailsavesc.pex
index c1e5f7ae..ab70a6bb 100644
Binary files a/scripts/_00e_mq06_caliaguidefailsavesc.pex and b/scripts/_00e_mq06_caliaguidefailsavesc.pex differ
diff --git a/scripts/_00e_mq06_chestscript.pex b/scripts/_00e_mq06_chestscript.pex
index 26e2a212..b399406f 100644
Binary files a/scripts/_00e_mq06_chestscript.pex and b/scripts/_00e_mq06_chestscript.pex differ
diff --git a/scripts/_00e_mq06_consecrationfailsavesc.pex b/scripts/_00e_mq06_consecrationfailsavesc.pex
index 2fc5ba32..2e6232db 100644
Binary files a/scripts/_00e_mq06_consecrationfailsavesc.pex and b/scripts/_00e_mq06_consecrationfailsavesc.pex differ
diff --git a/scripts/_00e_mq06_functions.pex b/scripts/_00e_mq06_functions.pex
index 4d551474..99b4c3a3 100644
Binary files a/scripts/_00e_mq06_functions.pex and b/scripts/_00e_mq06_functions.pex differ
diff --git a/scripts/_00e_mq06_weatherreleasescript.pex b/scripts/_00e_mq06_weatherreleasescript.pex
index 4fe7e548..9c7e8155 100644
Binary files a/scripts/_00e_mq06_weatherreleasescript.pex and b/scripts/_00e_mq06_weatherreleasescript.pex differ
diff --git a/scripts/_00e_mq06johannesultradebugscenestart.pex b/scripts/_00e_mq06johannesultradebugscenestart.pex
index cd67d210..550605af 100644
Binary files a/scripts/_00e_mq06johannesultradebugscenestart.pex and b/scripts/_00e_mq06johannesultradebugscenestart.pex differ
diff --git a/scripts/_00e_mq07_functions.pex b/scripts/_00e_mq07_functions.pex
index 183ecfe9..d8642e9e 100644
Binary files a/scripts/_00e_mq07_functions.pex and b/scripts/_00e_mq07_functions.pex differ
diff --git a/scripts/_00e_mq07a_chronikumbasementfailsc.pex b/scripts/_00e_mq07a_chronikumbasementfailsc.pex
index efe5379a..e94e36fd 100644
Binary files a/scripts/_00e_mq07a_chronikumbasementfailsc.pex and b/scripts/_00e_mq07a_chronikumbasementfailsc.pex differ
diff --git a/scripts/_00e_mq07a_doorbellsc.pex b/scripts/_00e_mq07a_doorbellsc.pex
index b57153e8..21367292 100644
Binary files a/scripts/_00e_mq07a_doorbellsc.pex and b/scripts/_00e_mq07a_doorbellsc.pex differ
diff --git a/scripts/_00e_mq07a_functions.pex b/scripts/_00e_mq07a_functions.pex
index 5acf0fe5..6f58d094 100644
Binary files a/scripts/_00e_mq07a_functions.pex and b/scripts/_00e_mq07a_functions.pex differ
diff --git a/scripts/_00e_mq07a_housedoorsc.pex b/scripts/_00e_mq07a_housedoorsc.pex
index 818689e3..98723d89 100644
Binary files a/scripts/_00e_mq07a_housedoorsc.pex and b/scripts/_00e_mq07a_housedoorsc.pex differ
diff --git a/scripts/_00e_mq07a_housedoortgbxsc.pex b/scripts/_00e_mq07a_housedoortgbxsc.pex
index 8f62f56d..c7bee45b 100644
Binary files a/scripts/_00e_mq07a_housedoortgbxsc.pex and b/scripts/_00e_mq07a_housedoortgbxsc.pex differ
diff --git a/scripts/_00e_mq07a_knockdoorspheresc.pex b/scripts/_00e_mq07a_knockdoorspheresc.pex
index 110cddbf..6af612fc 100644
Binary files a/scripts/_00e_mq07a_knockdoorspheresc.pex and b/scripts/_00e_mq07a_knockdoorspheresc.pex differ
diff --git a/scripts/_00e_mq07a_myradtowerfailsafesc.pex b/scripts/_00e_mq07a_myradtowerfailsafesc.pex
index ff03b19a..2a5f544a 100644
Binary files a/scripts/_00e_mq07a_myradtowerfailsafesc.pex and b/scripts/_00e_mq07a_myradtowerfailsafesc.pex differ
diff --git a/scripts/_00e_mq07a_riddlebooksc.pex b/scripts/_00e_mq07a_riddlebooksc.pex
index c876f3d3..73a1d7b7 100644
Binary files a/scripts/_00e_mq07a_riddlebooksc.pex and b/scripts/_00e_mq07a_riddlebooksc.pex differ
diff --git a/scripts/_00e_mq07a_riddlechain.pex b/scripts/_00e_mq07a_riddlechain.pex
index 493550cf..b8bc5d2c 100644
Binary files a/scripts/_00e_mq07a_riddlechain.pex and b/scripts/_00e_mq07a_riddlechain.pex differ
diff --git a/scripts/_00e_mq07a_sc14_sigilshardssc.pex b/scripts/_00e_mq07a_sc14_sigilshardssc.pex
index 0f953751..3c3d5244 100644
Binary files a/scripts/_00e_mq07a_sc14_sigilshardssc.pex and b/scripts/_00e_mq07a_sc14_sigilshardssc.pex differ
diff --git a/scripts/_00e_mq07a_sc4_doorsc.pex b/scripts/_00e_mq07a_sc4_doorsc.pex
index c62f0dcd..ae83cd8d 100644
Binary files a/scripts/_00e_mq07a_sc4_doorsc.pex and b/scripts/_00e_mq07a_sc4_doorsc.pex differ
diff --git a/scripts/_00e_mq07a_scrollsc.pex b/scripts/_00e_mq07a_scrollsc.pex
index 8dd3347f..a2460445 100644
Binary files a/scripts/_00e_mq07a_scrollsc.pex and b/scripts/_00e_mq07a_scrollsc.pex differ
diff --git a/scripts/_00e_mq07a_teleportpyreansc.pex b/scripts/_00e_mq07a_teleportpyreansc.pex
index 6d7c3c02..b415a0a9 100644
Binary files a/scripts/_00e_mq07a_teleportpyreansc.pex and b/scripts/_00e_mq07a_teleportpyreansc.pex differ
diff --git a/scripts/_00e_mq07a_visionedgesc.pex b/scripts/_00e_mq07a_visionedgesc.pex
index 9fa5e154..1f2fbff0 100644
Binary files a/scripts/_00e_mq07a_visionedgesc.pex and b/scripts/_00e_mq07a_visionedgesc.pex differ
diff --git a/scripts/_00e_mq07b_aftermath_playersc.pex b/scripts/_00e_mq07b_aftermath_playersc.pex
index 282d36aa..4ed4c235 100644
Binary files a/scripts/_00e_mq07b_aftermath_playersc.pex and b/scripts/_00e_mq07b_aftermath_playersc.pex differ
diff --git a/scripts/_00e_mq07b_beaconpartssc.pex b/scripts/_00e_mq07b_beaconpartssc.pex
index 22801930..edd1957a 100644
Binary files a/scripts/_00e_mq07b_beaconpartssc.pex and b/scripts/_00e_mq07b_beaconpartssc.pex differ
diff --git a/scripts/_00e_mq07b_bellscript.pex b/scripts/_00e_mq07b_bellscript.pex
index fd5efda3..f423d41d 100644
Binary files a/scripts/_00e_mq07b_bellscript.pex and b/scripts/_00e_mq07b_bellscript.pex differ
diff --git a/scripts/_00e_mq07b_burntcorpsesc.pex b/scripts/_00e_mq07b_burntcorpsesc.pex
index 18d04437..613498e9 100644
Binary files a/scripts/_00e_mq07b_burntcorpsesc.pex and b/scripts/_00e_mq07b_burntcorpsesc.pex differ
diff --git a/scripts/_00e_mq07b_questboxsc.pex b/scripts/_00e_mq07b_questboxsc.pex
index a1b00429..4173f5a5 100644
Binary files a/scripts/_00e_mq07b_questboxsc.pex and b/scripts/_00e_mq07b_questboxsc.pex differ
diff --git a/scripts/_00e_mq07b_questfunctions.pex b/scripts/_00e_mq07b_questfunctions.pex
index 38df601d..0f8b7b3f 100644
Binary files a/scripts/_00e_mq07b_questfunctions.pex and b/scripts/_00e_mq07b_questfunctions.pex differ
diff --git a/scripts/_00e_mq07b_sc02_failsave02sc.pex b/scripts/_00e_mq07b_sc02_failsave02sc.pex
index 54262bd9..1cd2d920 100644
Binary files a/scripts/_00e_mq07b_sc02_failsave02sc.pex and b/scripts/_00e_mq07b_sc02_failsave02sc.pex differ
diff --git a/scripts/_00e_mq07b_sc02_failsavesc.pex b/scripts/_00e_mq07b_sc02_failsavesc.pex
index 9271b673..4449b340 100644
Binary files a/scripts/_00e_mq07b_sc02_failsavesc.pex and b/scripts/_00e_mq07b_sc02_failsavesc.pex differ
diff --git a/scripts/_00e_mq07b_triggerboxmyradtower.pex b/scripts/_00e_mq07b_triggerboxmyradtower.pex
index 3f8e0526..538fc862 100644
Binary files a/scripts/_00e_mq07b_triggerboxmyradtower.pex and b/scripts/_00e_mq07b_triggerboxmyradtower.pex differ
diff --git a/scripts/_00e_mq07baftermath_function.pex b/scripts/_00e_mq07baftermath_function.pex
index 6bd2e576..e6fbb451 100644
Binary files a/scripts/_00e_mq07baftermath_function.pex and b/scripts/_00e_mq07baftermath_function.pex differ
diff --git a/scripts/_00e_mq07caliafollowentrigger.pex b/scripts/_00e_mq07caliafollowentrigger.pex
index 54e0f197..25155a51 100644
Binary files a/scripts/_00e_mq07caliafollowentrigger.pex and b/scripts/_00e_mq07caliafollowentrigger.pex differ
diff --git a/scripts/_00e_mq08_konstantinscn.pex b/scripts/_00e_mq08_konstantinscn.pex
index 54270d98..49ade4e6 100644
Binary files a/scripts/_00e_mq08_konstantinscn.pex and b/scripts/_00e_mq08_konstantinscn.pex differ
diff --git a/scripts/_00e_mq08_leverscn.pex b/scripts/_00e_mq08_leverscn.pex
index 17b7fb02..62964c9e 100644
Binary files a/scripts/_00e_mq08_leverscn.pex and b/scripts/_00e_mq08_leverscn.pex differ
diff --git a/scripts/_00e_mq08_questfunctions.pex b/scripts/_00e_mq08_questfunctions.pex
index 79971d92..113a74bd 100644
Binary files a/scripts/_00e_mq08_questfunctions.pex and b/scripts/_00e_mq08_questfunctions.pex differ
diff --git a/scripts/_00e_mq08altarscript.pex b/scripts/_00e_mq08altarscript.pex
index 47812746..37218212 100644
Binary files a/scripts/_00e_mq08altarscript.pex and b/scripts/_00e_mq08altarscript.pex differ
diff --git a/scripts/_00e_mq08aprologue_functions.pex b/scripts/_00e_mq08aprologue_functions.pex
index 9c063427..d1b7104f 100644
Binary files a/scripts/_00e_mq08aprologue_functions.pex and b/scripts/_00e_mq08aprologue_functions.pex differ
diff --git a/scripts/_00e_mq08jesparfollowentrigger.pex b/scripts/_00e_mq08jesparfollowentrigger.pex
index b911927a..d232584e 100644
Binary files a/scripts/_00e_mq08jesparfollowentrigger.pex and b/scripts/_00e_mq08jesparfollowentrigger.pex differ
diff --git a/scripts/_00e_mq08myradisflying.pex b/scripts/_00e_mq08myradisflying.pex
index 54ef3df4..32a59c34 100644
Binary files a/scripts/_00e_mq08myradisflying.pex and b/scripts/_00e_mq08myradisflying.pex differ
diff --git a/scripts/_00e_mq08prologue_tealorfailsavesc.pex b/scripts/_00e_mq08prologue_tealorfailsavesc.pex
index 71327587..3400d4a4 100644
Binary files a/scripts/_00e_mq08prologue_tealorfailsavesc.pex and b/scripts/_00e_mq08prologue_tealorfailsavesc.pex differ
diff --git a/scripts/_00e_mq08siglstonescript.pex b/scripts/_00e_mq08siglstonescript.pex
index cc7132ac..fc7ee94d 100644
Binary files a/scripts/_00e_mq08siglstonescript.pex and b/scripts/_00e_mq08siglstonescript.pex differ
diff --git a/scripts/_00e_mq08trainsoundactivator.pex b/scripts/_00e_mq08trainsoundactivator.pex
index 8a1d1666..3dfc0a10 100644
Binary files a/scripts/_00e_mq08trainsoundactivator.pex and b/scripts/_00e_mq08trainsoundactivator.pex differ
diff --git a/scripts/_00e_mq08triggerhouse.pex b/scripts/_00e_mq08triggerhouse.pex
index 1b879803..6cfc430f 100644
Binary files a/scripts/_00e_mq08triggerhouse.pex and b/scripts/_00e_mq08triggerhouse.pex differ
diff --git a/scripts/_00e_mq08triggertemplescene.pex b/scripts/_00e_mq08triggertemplescene.pex
index 83ed6e9d..9230d9c7 100644
Binary files a/scripts/_00e_mq08triggertemplescene.pex and b/scripts/_00e_mq08triggertemplescene.pex differ
diff --git a/scripts/_00e_mq09_questfunctions.pex b/scripts/_00e_mq09_questfunctions.pex
index 468471a1..9f0ecc96 100644
Binary files a/scripts/_00e_mq09_questfunctions.pex and b/scripts/_00e_mq09_questfunctions.pex differ
diff --git a/scripts/_00e_mq09a_failsavejesparsc.pex b/scripts/_00e_mq09a_failsavejesparsc.pex
index f804cb56..cc4f1be2 100644
Binary files a/scripts/_00e_mq09a_failsavejesparsc.pex and b/scripts/_00e_mq09a_failsavejesparsc.pex differ
diff --git a/scripts/_00e_mq09a_nebelhaimfailsavesc.pex b/scripts/_00e_mq09a_nebelhaimfailsavesc.pex
index 7e33aa36..724eaa83 100644
Binary files a/scripts/_00e_mq09a_nebelhaimfailsavesc.pex and b/scripts/_00e_mq09a_nebelhaimfailsavesc.pex differ
diff --git a/scripts/_00e_mq09a_templefailsavesc.pex b/scripts/_00e_mq09a_templefailsavesc.pex
index 43e06bc3..40e86165 100644
Binary files a/scripts/_00e_mq09a_templefailsavesc.pex and b/scripts/_00e_mq09a_templefailsavesc.pex differ
diff --git a/scripts/_00e_mq10_triggerboxcontrols.pex b/scripts/_00e_mq10_triggerboxcontrols.pex
index d9f9cfe5..2d7ce499 100644
Binary files a/scripts/_00e_mq10_triggerboxcontrols.pex and b/scripts/_00e_mq10_triggerboxcontrols.pex differ
diff --git a/scripts/_00e_mq10a_functions.pex b/scripts/_00e_mq10a_functions.pex
index 6276ac9b..e4b8f925 100644
Binary files a/scripts/_00e_mq10a_functions.pex and b/scripts/_00e_mq10a_functions.pex differ
diff --git a/scripts/_00e_mq10a_setupsc.pex b/scripts/_00e_mq10a_setupsc.pex
index ae9c8d94..c7cc933d 100644
Binary files a/scripts/_00e_mq10a_setupsc.pex and b/scripts/_00e_mq10a_setupsc.pex differ
diff --git a/scripts/_00e_mq10b_lisharitriggerbox.pex b/scripts/_00e_mq10b_lisharitriggerbox.pex
index 8eda3a1f..55ceea5f 100644
Binary files a/scripts/_00e_mq10b_lisharitriggerbox.pex and b/scripts/_00e_mq10b_lisharitriggerbox.pex differ
diff --git a/scripts/_00e_mq10b_questfunctions.pex b/scripts/_00e_mq10b_questfunctions.pex
index 58456832..4bdd5263 100644
Binary files a/scripts/_00e_mq10b_questfunctions.pex and b/scripts/_00e_mq10b_questfunctions.pex differ
diff --git a/scripts/_00e_mq10b_sc01_startfailsavesc.pex b/scripts/_00e_mq10b_sc01_startfailsavesc.pex
index 43964c77..5e7466ac 100644
Binary files a/scripts/_00e_mq10b_sc01_startfailsavesc.pex and b/scripts/_00e_mq10b_sc01_startfailsavesc.pex differ
diff --git a/scripts/_00e_mq10b_sc02_lisharifailsavesc.pex b/scripts/_00e_mq10b_sc02_lisharifailsavesc.pex
index 148623ec..2c688d58 100644
Binary files a/scripts/_00e_mq10b_sc02_lisharifailsavesc.pex and b/scripts/_00e_mq10b_sc02_lisharifailsavesc.pex differ
diff --git a/scripts/_00e_mq10bunlockdoorifscenerunning.pex b/scripts/_00e_mq10bunlockdoorifscenerunning.pex
index 9bfcfa12..800110dd 100644
Binary files a/scripts/_00e_mq10bunlockdoorifscenerunning.pex and b/scripts/_00e_mq10bunlockdoorifscenerunning.pex differ
diff --git a/scripts/_00e_mq11_critterobjectscn.pex b/scripts/_00e_mq11_critterobjectscn.pex
index 093776db..6f97e55f 100644
Binary files a/scripts/_00e_mq11_critterobjectscn.pex and b/scripts/_00e_mq11_critterobjectscn.pex differ
diff --git a/scripts/_00e_mq11a_barrelpilescript.pex b/scripts/_00e_mq11a_barrelpilescript.pex
index fe7893dc..bd298549 100644
Binary files a/scripts/_00e_mq11a_barrelpilescript.pex and b/scripts/_00e_mq11a_barrelpilescript.pex differ
diff --git a/scripts/_00e_mq11a_caliaaliasscript.pex b/scripts/_00e_mq11a_caliaaliasscript.pex
index 1205243e..58a6943b 100644
Binary files a/scripts/_00e_mq11a_caliaaliasscript.pex and b/scripts/_00e_mq11a_caliaaliasscript.pex differ
diff --git a/scripts/_00e_mq11a_caliacastlefailsavesc.pex b/scripts/_00e_mq11a_caliacastlefailsavesc.pex
index b18916f4..41f73472 100644
Binary files a/scripts/_00e_mq11a_caliacastlefailsavesc.pex and b/scripts/_00e_mq11a_caliacastlefailsavesc.pex differ
diff --git a/scripts/_00e_mq11a_caliaquarterdoorscript.pex b/scripts/_00e_mq11a_caliaquarterdoorscript.pex
index 67ead1a0..ba552106 100644
Binary files a/scripts/_00e_mq11a_caliaquarterdoorscript.pex and b/scripts/_00e_mq11a_caliaquarterdoorscript.pex differ
diff --git a/scripts/_00e_mq11a_caliasftoutsidefailsavesc.pex b/scripts/_00e_mq11a_caliasftoutsidefailsavesc.pex
index 6537f805..ec2e06c7 100644
Binary files a/scripts/_00e_mq11a_caliasftoutsidefailsavesc.pex and b/scripts/_00e_mq11a_caliasftoutsidefailsavesc.pex differ
diff --git a/scripts/_00e_mq11a_combattavernscript.pex b/scripts/_00e_mq11a_combattavernscript.pex
index 96feb4af..51715161 100644
Binary files a/scripts/_00e_mq11a_combattavernscript.pex and b/scripts/_00e_mq11a_combattavernscript.pex differ
diff --git a/scripts/_00e_mq11a_deaddraugrmotiontype.pex b/scripts/_00e_mq11a_deaddraugrmotiontype.pex
index 67892c8d..3a937aab 100644
Binary files a/scripts/_00e_mq11a_deaddraugrmotiontype.pex and b/scripts/_00e_mq11a_deaddraugrmotiontype.pex differ
diff --git a/scripts/_00e_mq11a_dissectingroomrenimatorsc.pex b/scripts/_00e_mq11a_dissectingroomrenimatorsc.pex
index 3ec32879..3ece9040 100644
Binary files a/scripts/_00e_mq11a_dissectingroomrenimatorsc.pex and b/scripts/_00e_mq11a_dissectingroomrenimatorsc.pex differ
diff --git a/scripts/_00e_mq11a_functions.pex b/scripts/_00e_mq11a_functions.pex
index ed3bce14..a1a8d084 100644
Binary files a/scripts/_00e_mq11a_functions.pex and b/scripts/_00e_mq11a_functions.pex differ
diff --git a/scripts/_00e_mq11a_gatetolibrarysc.pex b/scripts/_00e_mq11a_gatetolibrarysc.pex
index 347bd2c2..77b41bc2 100644
Binary files a/scripts/_00e_mq11a_gatetolibrarysc.pex and b/scripts/_00e_mq11a_gatetolibrarysc.pex differ
diff --git a/scripts/_00e_mq11a_knockdownboxsc.pex b/scripts/_00e_mq11a_knockdownboxsc.pex
index 35341869..ebf9857d 100644
Binary files a/scripts/_00e_mq11a_knockdownboxsc.pex and b/scripts/_00e_mq11a_knockdownboxsc.pex differ
diff --git a/scripts/_00e_mq11a_mayavisibilitysc.pex b/scripts/_00e_mq11a_mayavisibilitysc.pex
index 6764e9ac..96a47216 100644
Binary files a/scripts/_00e_mq11a_mayavisibilitysc.pex and b/scripts/_00e_mq11a_mayavisibilitysc.pex differ
diff --git a/scripts/_00e_mq11a_playeraliasscript.pex b/scripts/_00e_mq11a_playeraliasscript.pex
index 9e175ae7..debd620c 100644
Binary files a/scripts/_00e_mq11a_playeraliasscript.pex and b/scripts/_00e_mq11a_playeraliasscript.pex differ
diff --git a/scripts/_00e_mq11a_sc20_mainhallscript.pex b/scripts/_00e_mq11a_sc20_mainhallscript.pex
index 9c0abaf8..25042bab 100644
Binary files a/scripts/_00e_mq11a_sc20_mainhallscript.pex and b/scripts/_00e_mq11a_sc20_mainhallscript.pex differ
diff --git a/scripts/_00e_mq11a_sc20_sigilbox.pex b/scripts/_00e_mq11a_sc20_sigilbox.pex
index b02dfae6..d1a802c9 100644
Binary files a/scripts/_00e_mq11a_sc20_sigilbox.pex and b/scripts/_00e_mq11a_sc20_sigilbox.pex differ
diff --git a/scripts/_00e_mq11a_sc20_zombietriggerscript.pex b/scripts/_00e_mq11a_sc20_zombietriggerscript.pex
index 50d9debb..fc3643c6 100644
Binary files a/scripts/_00e_mq11a_sc20_zombietriggerscript.pex and b/scripts/_00e_mq11a_sc20_zombietriggerscript.pex differ
diff --git a/scripts/_00e_mq11a_sc22_brittlewallsc.pex b/scripts/_00e_mq11a_sc22_brittlewallsc.pex
index 11449e4f..4a44a627 100644
Binary files a/scripts/_00e_mq11a_sc22_brittlewallsc.pex and b/scripts/_00e_mq11a_sc22_brittlewallsc.pex differ
diff --git a/scripts/_00e_mq11a_sc25_blackstonescript.pex b/scripts/_00e_mq11a_sc25_blackstonescript.pex
index f048f022..5f768e90 100644
Binary files a/scripts/_00e_mq11a_sc25_blackstonescript.pex and b/scripts/_00e_mq11a_sc25_blackstonescript.pex differ
diff --git a/scripts/_00e_mq11a_sc25_veiledwomanspellsc.pex b/scripts/_00e_mq11a_sc25_veiledwomanspellsc.pex
index 1b7f1f20..cd4d35f2 100644
Binary files a/scripts/_00e_mq11a_sc25_veiledwomanspellsc.pex and b/scripts/_00e_mq11a_sc25_veiledwomanspellsc.pex differ
diff --git a/scripts/_00e_mq11b_dancingnomadfailsafesc.pex b/scripts/_00e_mq11b_dancingnomadfailsafesc.pex
index 57996218..dbb59f6e 100644
Binary files a/scripts/_00e_mq11b_dancingnomadfailsafesc.pex and b/scripts/_00e_mq11b_dancingnomadfailsafesc.pex differ
diff --git a/scripts/_00e_mq11b_door_crypt_sc.pex b/scripts/_00e_mq11b_door_crypt_sc.pex
index 177b7026..654ede06 100644
Binary files a/scripts/_00e_mq11b_door_crypt_sc.pex and b/scripts/_00e_mq11b_door_crypt_sc.pex differ
diff --git a/scripts/_00e_mq11b_questfunctions.pex b/scripts/_00e_mq11b_questfunctions.pex
index ec9bea69..10f4aec3 100644
Binary files a/scripts/_00e_mq11b_questfunctions.pex and b/scripts/_00e_mq11b_questfunctions.pex differ
diff --git a/scripts/_00e_mq11b_sc02_adilabarriersc.pex b/scripts/_00e_mq11b_sc02_adilabarriersc.pex
index 075c736b..afc62aea 100644
Binary files a/scripts/_00e_mq11b_sc02_adilabarriersc.pex and b/scripts/_00e_mq11b_sc02_adilabarriersc.pex differ
diff --git a/scripts/_00e_mq11b_sc03_interruptsc.pex b/scripts/_00e_mq11b_sc03_interruptsc.pex
index be12a459..44fe69c6 100644
Binary files a/scripts/_00e_mq11b_sc03_interruptsc.pex and b/scripts/_00e_mq11b_sc03_interruptsc.pex differ
diff --git a/scripts/_00e_mq11b_sc05_jesparsc.pex b/scripts/_00e_mq11b_sc05_jesparsc.pex
index c7a9898e..b1baacdb 100644
Binary files a/scripts/_00e_mq11b_sc05_jesparsc.pex and b/scripts/_00e_mq11b_sc05_jesparsc.pex differ
diff --git a/scripts/_00e_mq11badilascn.pex b/scripts/_00e_mq11badilascn.pex
index be089d5d..e9fe399f 100644
Binary files a/scripts/_00e_mq11badilascn.pex and b/scripts/_00e_mq11badilascn.pex differ
diff --git a/scripts/_00e_mq11bbookscn.pex b/scripts/_00e_mq11bbookscn.pex
index be123c1e..ff6d6c6b 100644
Binary files a/scripts/_00e_mq11bbookscn.pex and b/scripts/_00e_mq11bbookscn.pex differ
diff --git a/scripts/_00e_mq11bjesparfollowentrigger.pex b/scripts/_00e_mq11bjesparfollowentrigger.pex
index e2bb0a21..93bbbf59 100644
Binary files a/scripts/_00e_mq11bjesparfollowentrigger.pex and b/scripts/_00e_mq11bjesparfollowentrigger.pex differ
diff --git a/scripts/_00e_mq11c_blockdooractivation.pex b/scripts/_00e_mq11c_blockdooractivation.pex
index a03b597a..7bcf65e6 100644
Binary files a/scripts/_00e_mq11c_blockdooractivation.pex and b/scripts/_00e_mq11c_blockdooractivation.pex differ
diff --git a/scripts/_00e_mq11c_caveentrancedoorsc.pex b/scripts/_00e_mq11c_caveentrancedoorsc.pex
index d506ebb0..f6b5a122 100644
Binary files a/scripts/_00e_mq11c_caveentrancedoorsc.pex and b/scripts/_00e_mq11c_caveentrancedoorsc.pex differ
diff --git a/scripts/_00e_mq11c_d13_endtriggerboxsc.pex b/scripts/_00e_mq11c_d13_endtriggerboxsc.pex
index b9fdccb5..d925116a 100644
Binary files a/scripts/_00e_mq11c_d13_endtriggerboxsc.pex and b/scripts/_00e_mq11c_d13_endtriggerboxsc.pex differ
diff --git a/scripts/_00e_mq11c_dogminigamefailsc.pex b/scripts/_00e_mq11c_dogminigamefailsc.pex
index dd3aae17..cb4667b4 100644
Binary files a/scripts/_00e_mq11c_dogminigamefailsc.pex and b/scripts/_00e_mq11c_dogminigamefailsc.pex differ
diff --git a/scripts/_00e_mq11c_dropryneusnote.pex b/scripts/_00e_mq11c_dropryneusnote.pex
index e195829a..d2a1253c 100644
Binary files a/scripts/_00e_mq11c_dropryneusnote.pex and b/scripts/_00e_mq11c_dropryneusnote.pex differ
diff --git a/scripts/_00e_mq11c_entrymusicboxscript.pex b/scripts/_00e_mq11c_entrymusicboxscript.pex
index d2372bc6..e7b7f7e0 100644
Binary files a/scripts/_00e_mq11c_entrymusicboxscript.pex and b/scripts/_00e_mq11c_entrymusicboxscript.pex differ
diff --git a/scripts/_00e_mq11c_functions.pex b/scripts/_00e_mq11c_functions.pex
index 0ef6768f..409df0e1 100644
Binary files a/scripts/_00e_mq11c_functions.pex and b/scripts/_00e_mq11c_functions.pex differ
diff --git a/scripts/_00e_mq11c_getryneussc.pex b/scripts/_00e_mq11c_getryneussc.pex
index c3f50676..aa860f1c 100644
Binary files a/scripts/_00e_mq11c_getryneussc.pex and b/scripts/_00e_mq11c_getryneussc.pex differ
diff --git a/scripts/_00e_mq11c_horsescript.pex b/scripts/_00e_mq11c_horsescript.pex
index d5c5d595..2f5d5b48 100644
Binary files a/scripts/_00e_mq11c_horsescript.pex and b/scripts/_00e_mq11c_horsescript.pex differ
diff --git a/scripts/_00e_mq11c_invisibilitytriggersc.pex b/scripts/_00e_mq11c_invisibilitytriggersc.pex
index 56ab5d98..9b048456 100644
Binary files a/scripts/_00e_mq11c_invisibilitytriggersc.pex and b/scripts/_00e_mq11c_invisibilitytriggersc.pex differ
diff --git a/scripts/_00e_mq11c_kitchenexitdoor.pex b/scripts/_00e_mq11c_kitchenexitdoor.pex
index 7374549a..7cd0d641 100644
Binary files a/scripts/_00e_mq11c_kitchenexitdoor.pex and b/scripts/_00e_mq11c_kitchenexitdoor.pex differ
diff --git a/scripts/_00e_mq11c_minigameshootingbutton.pex b/scripts/_00e_mq11c_minigameshootingbutton.pex
index ab69e74d..b0e53988 100644
Binary files a/scripts/_00e_mq11c_minigameshootingbutton.pex and b/scripts/_00e_mq11c_minigameshootingbutton.pex differ
diff --git a/scripts/_00e_mq11c_minigameshootingsphere.pex b/scripts/_00e_mq11c_minigameshootingsphere.pex
index 2121ae9e..53e3d820 100644
Binary files a/scripts/_00e_mq11c_minigameshootingsphere.pex and b/scripts/_00e_mq11c_minigameshootingsphere.pex differ
diff --git a/scripts/_00e_mq11c_objectivefailsafe.pex b/scripts/_00e_mq11c_objectivefailsafe.pex
index a7c0e834..8f9d2910 100644
Binary files a/scripts/_00e_mq11c_objectivefailsafe.pex and b/scripts/_00e_mq11c_objectivefailsafe.pex differ
diff --git a/scripts/_00e_mq11c_objectiveswitchdalgeyss.pex b/scripts/_00e_mq11c_objectiveswitchdalgeyss.pex
index dfed5e30..cd84da40 100644
Binary files a/scripts/_00e_mq11c_objectiveswitchdalgeyss.pex and b/scripts/_00e_mq11c_objectiveswitchdalgeyss.pex differ
diff --git a/scripts/_00e_mq11c_oorbayabossfightscript.pex b/scripts/_00e_mq11c_oorbayabossfightscript.pex
index a64b95c3..1cd0c009 100644
Binary files a/scripts/_00e_mq11c_oorbayabossfightscript.pex and b/scripts/_00e_mq11c_oorbayabossfightscript.pex differ
diff --git a/scripts/_00e_mq11c_pickuparroworquiver.pex b/scripts/_00e_mq11c_pickuparroworquiver.pex
index 13dfa740..57347aa7 100644
Binary files a/scripts/_00e_mq11c_pickuparroworquiver.pex and b/scripts/_00e_mq11c_pickuparroworquiver.pex differ
diff --git a/scripts/_00e_mq11c_playeraliasscript.pex b/scripts/_00e_mq11c_playeraliasscript.pex
index 1f5afba5..4139a813 100644
Binary files a/scripts/_00e_mq11c_playeraliasscript.pex and b/scripts/_00e_mq11c_playeraliasscript.pex differ
diff --git a/scripts/_00e_mq11c_ryneusdogscript.pex b/scripts/_00e_mq11c_ryneusdogscript.pex
index d181813e..6931bac0 100644
Binary files a/scripts/_00e_mq11c_ryneusdogscript.pex and b/scripts/_00e_mq11c_ryneusdogscript.pex differ
diff --git a/scripts/_00e_mq11c_ryneusentryheadachesc.pex b/scripts/_00e_mq11c_ryneusentryheadachesc.pex
index fe622387..b69c6d4c 100644
Binary files a/scripts/_00e_mq11c_ryneusentryheadachesc.pex and b/scripts/_00e_mq11c_ryneusentryheadachesc.pex differ
diff --git a/scripts/_00e_mq11c_ryneusrealactivationscript.pex b/scripts/_00e_mq11c_ryneusrealactivationscript.pex
index 01fc74f6..6ed21f54 100644
Binary files a/scripts/_00e_mq11c_ryneusrealactivationscript.pex and b/scripts/_00e_mq11c_ryneusrealactivationscript.pex differ
diff --git a/scripts/_00e_mq11c_sc1_gtfofailsavesc.pex b/scripts/_00e_mq11c_sc1_gtfofailsavesc.pex
index 125694c2..89b2caee 100644
Binary files a/scripts/_00e_mq11c_sc1_gtfofailsavesc.pex and b/scripts/_00e_mq11c_sc1_gtfofailsavesc.pex differ
diff --git a/scripts/_00e_mq11c_silvergroveradiusboxscript.pex b/scripts/_00e_mq11c_silvergroveradiusboxscript.pex
index 79767dac..1f2baecd 100644
Binary files a/scripts/_00e_mq11c_silvergroveradiusboxscript.pex and b/scripts/_00e_mq11c_silvergroveradiusboxscript.pex differ
diff --git a/scripts/_00e_mq11c_stealthminigameresetbox.pex b/scripts/_00e_mq11c_stealthminigameresetbox.pex
index 90051e81..eb465b5f 100644
Binary files a/scripts/_00e_mq11c_stealthminigameresetbox.pex and b/scripts/_00e_mq11c_stealthminigameresetbox.pex differ
diff --git a/scripts/_00e_mq11c_thoughtmessagesc.pex b/scripts/_00e_mq11c_thoughtmessagesc.pex
index b8ab45a1..e9e5e410 100644
Binary files a/scripts/_00e_mq11c_thoughtmessagesc.pex and b/scripts/_00e_mq11c_thoughtmessagesc.pex differ
diff --git a/scripts/_00e_mq11c_wardenleverscript.pex b/scripts/_00e_mq11c_wardenleverscript.pex
index fc2d3a5c..390af385 100644
Binary files a/scripts/_00e_mq11c_wardenleverscript.pex and b/scripts/_00e_mq11c_wardenleverscript.pex differ
diff --git a/scripts/_00e_mq12a_functions.pex b/scripts/_00e_mq12a_functions.pex
index c299d125..c9c4aa83 100644
Binary files a/scripts/_00e_mq12a_functions.pex and b/scripts/_00e_mq12a_functions.pex differ
diff --git a/scripts/_00e_mq12b_functions.pex b/scripts/_00e_mq12b_functions.pex
index 79fb1140..cc46a986 100644
Binary files a/scripts/_00e_mq12b_functions.pex and b/scripts/_00e_mq12b_functions.pex differ
diff --git a/scripts/_00e_mq12b_gettealorsc.pex b/scripts/_00e_mq12b_gettealorsc.pex
index 96922289..19d74e03 100644
Binary files a/scripts/_00e_mq12b_gettealorsc.pex and b/scripts/_00e_mq12b_gettealorsc.pex differ
diff --git a/scripts/_00e_mq12b_infiltratorfailsavesc.pex b/scripts/_00e_mq12b_infiltratorfailsavesc.pex
index 6973b1a6..bf0fe1b0 100644
Binary files a/scripts/_00e_mq12b_infiltratorfailsavesc.pex and b/scripts/_00e_mq12b_infiltratorfailsavesc.pex differ
diff --git a/scripts/_00e_mq12b_sc02_failsavesc.pex b/scripts/_00e_mq12b_sc02_failsavesc.pex
index f38f683b..deda2ead 100644
Binary files a/scripts/_00e_mq12b_sc02_failsavesc.pex and b/scripts/_00e_mq12b_sc02_failsavesc.pex differ
diff --git a/scripts/_00e_mq12b_sc10_gearsc.pex b/scripts/_00e_mq12b_sc10_gearsc.pex
index f29f6385..3a06a77a 100644
Binary files a/scripts/_00e_mq12b_sc10_gearsc.pex and b/scripts/_00e_mq12b_sc10_gearsc.pex differ
diff --git a/scripts/_00e_mq12b_sc12_killtriggersc.pex b/scripts/_00e_mq12b_sc12_killtriggersc.pex
index d168b09e..a17d0819 100644
Binary files a/scripts/_00e_mq12b_sc12_killtriggersc.pex and b/scripts/_00e_mq12b_sc12_killtriggersc.pex differ
diff --git a/scripts/_00e_mq12b_sc15_startfailsavesc.pex b/scripts/_00e_mq12b_sc15_startfailsavesc.pex
index 2fdc1c27..1662caba 100644
Binary files a/scripts/_00e_mq12b_sc15_startfailsavesc.pex and b/scripts/_00e_mq12b_sc15_startfailsavesc.pex differ
diff --git a/scripts/_00e_mq12b_sc3_tealorfailsaveboxsc.pex b/scripts/_00e_mq12b_sc3_tealorfailsaveboxsc.pex
index 5d114e15..5bdb88e0 100644
Binary files a/scripts/_00e_mq12b_sc3_tealorfailsaveboxsc.pex and b/scripts/_00e_mq12b_sc3_tealorfailsaveboxsc.pex differ
diff --git a/scripts/_00e_mq12b_sc5_commandersilvassc.pex b/scripts/_00e_mq12b_sc5_commandersilvassc.pex
index d08b6ee3..367b8480 100644
Binary files a/scripts/_00e_mq12b_sc5_commandersilvassc.pex and b/scripts/_00e_mq12b_sc5_commandersilvassc.pex differ
diff --git a/scripts/_00e_mq12b_silencefailsavesc.pex b/scripts/_00e_mq12b_silencefailsavesc.pex
index aa18e1ad..aebffc03 100644
Binary files a/scripts/_00e_mq12b_silencefailsavesc.pex and b/scripts/_00e_mq12b_silencefailsavesc.pex differ
diff --git a/scripts/_00e_mq12b_tealorcombatsc.pex b/scripts/_00e_mq12b_tealorcombatsc.pex
index 6ad471b1..f6bbe285 100644
Binary files a/scripts/_00e_mq12b_tealorcombatsc.pex and b/scripts/_00e_mq12b_tealorcombatsc.pex differ
diff --git a/scripts/_00e_mq12c_anistuckfixsc.pex b/scripts/_00e_mq12c_anistuckfixsc.pex
index e7bdd0b1..0a234fdc 100644
Binary files a/scripts/_00e_mq12c_anistuckfixsc.pex and b/scripts/_00e_mq12c_anistuckfixsc.pex differ
diff --git a/scripts/_00e_mq12c_functions.pex b/scripts/_00e_mq12c_functions.pex
index d0a55043..9c02f9a8 100644
Binary files a/scripts/_00e_mq12c_functions.pex and b/scripts/_00e_mq12c_functions.pex differ
diff --git a/scripts/_00e_mq12c_sc2_bedsc.pex b/scripts/_00e_mq12c_sc2_bedsc.pex
index 5fda0dc2..ca91375e 100644
Binary files a/scripts/_00e_mq12c_sc2_bedsc.pex and b/scripts/_00e_mq12c_sc2_bedsc.pex differ
diff --git a/scripts/_00e_mq13_lootboreo.pex b/scripts/_00e_mq13_lootboreo.pex
index f873a80f..e6dede9f 100644
Binary files a/scripts/_00e_mq13_lootboreo.pex and b/scripts/_00e_mq13_lootboreo.pex differ
diff --git a/scripts/_00e_mq13a_functions.pex b/scripts/_00e_mq13a_functions.pex
index 751cd28c..8d2ed81f 100644
Binary files a/scripts/_00e_mq13a_functions.pex and b/scripts/_00e_mq13a_functions.pex differ
diff --git a/scripts/_00e_mq13a_sc04_cubesc.pex b/scripts/_00e_mq13a_sc04_cubesc.pex
index b8bbd9c8..bbc8cf41 100644
Binary files a/scripts/_00e_mq13a_sc04_cubesc.pex and b/scripts/_00e_mq13a_sc04_cubesc.pex differ
diff --git a/scripts/_00e_mq13a_sc07_starshipbedsc.pex b/scripts/_00e_mq13a_sc07_starshipbedsc.pex
index 0d1ce0c4..00bda330 100644
Binary files a/scripts/_00e_mq13a_sc07_starshipbedsc.pex and b/scripts/_00e_mq13a_sc07_starshipbedsc.pex differ
diff --git a/scripts/_00e_mq13a_sc1_startfailsavesc.pex b/scripts/_00e_mq13a_sc1_startfailsavesc.pex
index cd41ac97..5c1a65e2 100644
Binary files a/scripts/_00e_mq13a_sc1_startfailsavesc.pex and b/scripts/_00e_mq13a_sc1_startfailsavesc.pex differ
diff --git a/scripts/_00e_mq13b_functions.pex b/scripts/_00e_mq13b_functions.pex
index cd65414f..bb4470b9 100644
Binary files a/scripts/_00e_mq13b_functions.pex and b/scripts/_00e_mq13b_functions.pex differ
diff --git a/scripts/_00e_mq13b_sc08_elevatorsc.pex b/scripts/_00e_mq13b_sc08_elevatorsc.pex
index 93fac830..53d1d33f 100644
Binary files a/scripts/_00e_mq13b_sc08_elevatorsc.pex and b/scripts/_00e_mq13b_sc08_elevatorsc.pex differ
diff --git a/scripts/_00e_mq13b_sc08_searchtgbxsc.pex b/scripts/_00e_mq13b_sc08_searchtgbxsc.pex
index a39cb790..e6fe37da 100644
Binary files a/scripts/_00e_mq13b_sc08_searchtgbxsc.pex and b/scripts/_00e_mq13b_sc08_searchtgbxsc.pex differ
diff --git a/scripts/_00e_mq13b_sc09_chainsc.pex b/scripts/_00e_mq13b_sc09_chainsc.pex
index 0d626794..b38cc321 100644
Binary files a/scripts/_00e_mq13b_sc09_chainsc.pex and b/scripts/_00e_mq13b_sc09_chainsc.pex differ
diff --git a/scripts/_00e_mq13c_companionfailsavesc.pex b/scripts/_00e_mq13c_companionfailsavesc.pex
index 491b199d..c9655f09 100644
Binary files a/scripts/_00e_mq13c_companionfailsavesc.pex and b/scripts/_00e_mq13c_companionfailsavesc.pex differ
diff --git a/scripts/_00e_mq13c_functions.pex b/scripts/_00e_mq13c_functions.pex
index 4a4e05e6..b2c4fa7b 100644
Binary files a/scripts/_00e_mq13c_functions.pex and b/scripts/_00e_mq13c_functions.pex differ
diff --git a/scripts/_00e_mq13c_sc07_turretsc.pex b/scripts/_00e_mq13c_sc07_turretsc.pex
index 99f44276..59543c59 100644
Binary files a/scripts/_00e_mq13c_sc07_turretsc.pex and b/scripts/_00e_mq13c_sc07_turretsc.pex differ
diff --git a/scripts/_00e_mq13c_sc09_buttonsc.pex b/scripts/_00e_mq13c_sc09_buttonsc.pex
index f0a60906..ab7734c4 100644
Binary files a/scripts/_00e_mq13c_sc09_buttonsc.pex and b/scripts/_00e_mq13c_sc09_buttonsc.pex differ
diff --git a/scripts/_00e_mq13c_sureaidoorsc.pex b/scripts/_00e_mq13c_sureaidoorsc.pex
index 018f26ef..431e8bb5 100644
Binary files a/scripts/_00e_mq13c_sureaidoorsc.pex and b/scripts/_00e_mq13c_sureaidoorsc.pex differ
diff --git a/scripts/_00e_mq14_functions.pex b/scripts/_00e_mq14_functions.pex
index 73a30acb..e1910a47 100644
Binary files a/scripts/_00e_mq14_functions.pex and b/scripts/_00e_mq14_functions.pex differ
diff --git a/scripts/_00e_mq14_playersc.pex b/scripts/_00e_mq14_playersc.pex
index 7ebbb97a..f9502ce8 100644
Binary files a/scripts/_00e_mq14_playersc.pex and b/scripts/_00e_mq14_playersc.pex differ
diff --git a/scripts/_00e_mq14_reminderfailsavesc.pex b/scripts/_00e_mq14_reminderfailsavesc.pex
index a925e3fb..2661ad03 100644
Binary files a/scripts/_00e_mq14_reminderfailsavesc.pex and b/scripts/_00e_mq14_reminderfailsavesc.pex differ
diff --git a/scripts/_00e_mq15_functions.pex b/scripts/_00e_mq15_functions.pex
index 81d2e51f..2b459d16 100644
Binary files a/scripts/_00e_mq15_functions.pex and b/scripts/_00e_mq15_functions.pex differ
diff --git a/scripts/_00e_mq16_echo_cluesc.pex b/scripts/_00e_mq16_echo_cluesc.pex
index d9d9bad7..58116ac1 100644
Binary files a/scripts/_00e_mq16_echo_cluesc.pex and b/scripts/_00e_mq16_echo_cluesc.pex differ
diff --git a/scripts/_00e_mq16_failsavecavernsc.pex b/scripts/_00e_mq16_failsavecavernsc.pex
index bbf11994..7c2ab736 100644
Binary files a/scripts/_00e_mq16_failsavecavernsc.pex and b/scripts/_00e_mq16_failsavecavernsc.pex differ
diff --git a/scripts/_00e_mq16_functions.pex b/scripts/_00e_mq16_functions.pex
index bf19e793..c766a902 100644
Binary files a/scripts/_00e_mq16_functions.pex and b/scripts/_00e_mq16_functions.pex differ
diff --git a/scripts/_00e_mq16_sc06_hearthitboxsc.pex b/scripts/_00e_mq16_sc06_hearthitboxsc.pex
index 18afe0da..5c929085 100644
Binary files a/scripts/_00e_mq16_sc06_hearthitboxsc.pex and b/scripts/_00e_mq16_sc06_hearthitboxsc.pex differ
diff --git a/scripts/_00e_mq16_sc07_projectiletgbxsc.pex b/scripts/_00e_mq16_sc07_projectiletgbxsc.pex
index dd0e314d..39a94988 100644
Binary files a/scripts/_00e_mq16_sc07_projectiletgbxsc.pex and b/scripts/_00e_mq16_sc07_projectiletgbxsc.pex differ
diff --git a/scripts/_00e_mq16_sc14_tealorshocksc.pex b/scripts/_00e_mq16_sc14_tealorshocksc.pex
index 66b7dd47..e175bfdb 100644
Binary files a/scripts/_00e_mq16_sc14_tealorshocksc.pex and b/scripts/_00e_mq16_sc14_tealorshocksc.pex differ
diff --git a/scripts/_00e_mq16_telaoryuslanfailsavesc.pex b/scripts/_00e_mq16_telaoryuslanfailsavesc.pex
index 99c62393..7e20efc6 100644
Binary files a/scripts/_00e_mq16_telaoryuslanfailsavesc.pex and b/scripts/_00e_mq16_telaoryuslanfailsavesc.pex differ
diff --git a/scripts/_00e_mq17_blackguardianbuttonsc.pex b/scripts/_00e_mq17_blackguardianbuttonsc.pex
index d214d026..7df75767 100644
Binary files a/scripts/_00e_mq17_blackguardianbuttonsc.pex and b/scripts/_00e_mq17_blackguardianbuttonsc.pex differ
diff --git a/scripts/_00e_mq17_blackstonesc.pex b/scripts/_00e_mq17_blackstonesc.pex
index 856bc37c..0af0bb39 100644
Binary files a/scripts/_00e_mq17_blackstonesc.pex and b/scripts/_00e_mq17_blackstonesc.pex differ
diff --git a/scripts/_00e_mq17_functions.pex b/scripts/_00e_mq17_functions.pex
index 238770d1..af1de7a2 100644
Binary files a/scripts/_00e_mq17_functions.pex and b/scripts/_00e_mq17_functions.pex differ
diff --git a/scripts/_00e_mq17_generatorhitboxsc.pex b/scripts/_00e_mq17_generatorhitboxsc.pex
index b875a532..2807d87b 100644
Binary files a/scripts/_00e_mq17_generatorhitboxsc.pex and b/scripts/_00e_mq17_generatorhitboxsc.pex differ
diff --git a/scripts/_00e_mq17_portalsc.pex b/scripts/_00e_mq17_portalsc.pex
index 65797053..b6ba46ed 100644
Binary files a/scripts/_00e_mq17_portalsc.pex and b/scripts/_00e_mq17_portalsc.pex differ
diff --git a/scripts/_00e_mq17_premonitionthoughtmessagesc.pex b/scripts/_00e_mq17_premonitionthoughtmessagesc.pex
index 9a8ed2cd..4cfcd16b 100644
Binary files a/scripts/_00e_mq17_premonitionthoughtmessagesc.pex and b/scripts/_00e_mq17_premonitionthoughtmessagesc.pex differ
diff --git a/scripts/_00e_mq17_sc02_questtgbxsc.pex b/scripts/_00e_mq17_sc02_questtgbxsc.pex
index 1c7d992f..8ae80e14 100644
Binary files a/scripts/_00e_mq17_sc02_questtgbxsc.pex and b/scripts/_00e_mq17_sc02_questtgbxsc.pex differ
diff --git a/scripts/_00e_mq17_sc09_triggersc.pex b/scripts/_00e_mq17_sc09_triggersc.pex
index 2d58a102..e12fccc0 100644
Binary files a/scripts/_00e_mq17_sc09_triggersc.pex and b/scripts/_00e_mq17_sc09_triggersc.pex differ
diff --git a/scripts/_00e_mq17_sc10_capsulelaunchact.pex b/scripts/_00e_mq17_sc10_capsulelaunchact.pex
index 452dbe94..469fd46b 100644
Binary files a/scripts/_00e_mq17_sc10_capsulelaunchact.pex and b/scripts/_00e_mq17_sc10_capsulelaunchact.pex differ
diff --git a/scripts/_00e_mq17_temple_blockdoorsc.pex b/scripts/_00e_mq17_temple_blockdoorsc.pex
index 417c5af1..d1dcced6 100644
Binary files a/scripts/_00e_mq17_temple_blockdoorsc.pex and b/scripts/_00e_mq17_temple_blockdoorsc.pex differ
diff --git a/scripts/_00e_mq18a_functions.pex b/scripts/_00e_mq18a_functions.pex
index 3a85a96e..1f004977 100644
Binary files a/scripts/_00e_mq18a_functions.pex and b/scripts/_00e_mq18a_functions.pex differ
diff --git a/scripts/_00e_mq18b_showthoughtmessagesc.pex b/scripts/_00e_mq18b_showthoughtmessagesc.pex
index ae83f440..f4e50ee5 100644
Binary files a/scripts/_00e_mq18b_showthoughtmessagesc.pex and b/scripts/_00e_mq18b_showthoughtmessagesc.pex differ
diff --git a/scripts/_00e_mq1c_ketarondoorscript.pex b/scripts/_00e_mq1c_ketarondoorscript.pex
index af890da1..5c72104f 100644
Binary files a/scripts/_00e_mq1c_ketarondoorscript.pex and b/scripts/_00e_mq1c_ketarondoorscript.pex differ
diff --git a/scripts/_00e_mqp01_functions.pex b/scripts/_00e_mqp01_functions.pex
index 3218a100..502534d5 100644
Binary files a/scripts/_00e_mqp01_functions.pex and b/scripts/_00e_mqp01_functions.pex differ
diff --git a/scripts/_00e_mqp01_playertranslationscript.pex b/scripts/_00e_mqp01_playertranslationscript.pex
index 6931c9ad..d7325012 100644
Binary files a/scripts/_00e_mqp01_playertranslationscript.pex and b/scripts/_00e_mqp01_playertranslationscript.pex differ
diff --git a/scripts/_00e_mqp01_startsc.pex b/scripts/_00e_mqp01_startsc.pex
index f57f83ae..7555044b 100644
Binary files a/scripts/_00e_mqp01_startsc.pex and b/scripts/_00e_mqp01_startsc.pex differ
diff --git a/scripts/_00e_mqp02_functions.pex b/scripts/_00e_mqp02_functions.pex
index f1ee7ee5..e8697e5a 100644
Binary files a/scripts/_00e_mqp02_functions.pex and b/scripts/_00e_mqp02_functions.pex differ
diff --git a/scripts/_00e_mqp02_lanternscript.pex b/scripts/_00e_mqp02_lanternscript.pex
index c12b6305..8662dfcc 100644
Binary files a/scripts/_00e_mqp02_lanternscript.pex and b/scripts/_00e_mqp02_lanternscript.pex differ
diff --git a/scripts/_00e_mqp02_playerknockoutscript.pex b/scripts/_00e_mqp02_playerknockoutscript.pex
index c9490112..7c2a5452 100644
Binary files a/scripts/_00e_mqp02_playerknockoutscript.pex and b/scripts/_00e_mqp02_playerknockoutscript.pex differ
diff --git a/scripts/_00e_mqp02_playintrolauncherscript.pex b/scripts/_00e_mqp02_playintrolauncherscript.pex
index a00331dd..c9152d3b 100644
Binary files a/scripts/_00e_mqp02_playintrolauncherscript.pex and b/scripts/_00e_mqp02_playintrolauncherscript.pex differ
diff --git a/scripts/_00e_mqp02_siriusriqdeathscript.pex b/scripts/_00e_mqp02_siriusriqdeathscript.pex
index 2cdacdc1..33d44850 100644
Binary files a/scripts/_00e_mqp02_siriusriqdeathscript.pex and b/scripts/_00e_mqp02_siriusriqdeathscript.pex differ
diff --git a/scripts/_00e_mqp03_akropolissetstageonlea.pex b/scripts/_00e_mqp03_akropolissetstageonlea.pex
index d0b159a7..fd47b6dc 100644
Binary files a/scripts/_00e_mqp03_akropolissetstageonlea.pex and b/scripts/_00e_mqp03_akropolissetstageonlea.pex differ
diff --git a/scripts/_00e_mqp03_exitdoorscript.pex b/scripts/_00e_mqp03_exitdoorscript.pex
index f0455cfe..5cbf219a 100644
Binary files a/scripts/_00e_mqp03_exitdoorscript.pex and b/scripts/_00e_mqp03_exitdoorscript.pex differ
diff --git a/scripts/_00e_mqp03_functions.pex b/scripts/_00e_mqp03_functions.pex
index c18bcc26..21be82d6 100644
Binary files a/scripts/_00e_mqp03_functions.pex and b/scripts/_00e_mqp03_functions.pex differ
diff --git a/scripts/_00e_myradsystem02.pex b/scripts/_00e_myradsystem02.pex
index ecc56297..7877608b 100644
Binary files a/scripts/_00e_myradsystem02.pex and b/scripts/_00e_myradsystem02.pex differ
diff --git a/scripts/_00e_nq02_newhorizons_library.pex b/scripts/_00e_nq02_newhorizons_library.pex
index 2bcbcc99..31218d08 100644
Binary files a/scripts/_00e_nq02_newhorizons_library.pex and b/scripts/_00e_nq02_newhorizons_library.pex differ
diff --git a/scripts/_00e_nq03_functions.pex b/scripts/_00e_nq03_functions.pex
index 89517be1..5bfb2b43 100644
Binary files a/scripts/_00e_nq03_functions.pex and b/scripts/_00e_nq03_functions.pex differ
diff --git a/scripts/_00e_nq03_potionsc.pex b/scripts/_00e_nq03_potionsc.pex
index 04165073..73937d50 100644
Binary files a/scripts/_00e_nq03_potionsc.pex and b/scripts/_00e_nq03_potionsc.pex differ
diff --git a/scripts/_00e_nq03_skullspheresc.pex b/scripts/_00e_nq03_skullspheresc.pex
index 02032eff..33eb695c 100644
Binary files a/scripts/_00e_nq03_skullspheresc.pex and b/scripts/_00e_nq03_skullspheresc.pex differ
diff --git a/scripts/_00e_nq05mapscript.pex b/scripts/_00e_nq05mapscript.pex
index 1b83c7f0..ae72ad66 100644
Binary files a/scripts/_00e_nq05mapscript.pex and b/scripts/_00e_nq05mapscript.pex differ
diff --git a/scripts/_00e_nq05meadbarrelscn.pex b/scripts/_00e_nq05meadbarrelscn.pex
index 1ae05449..13654893 100644
Binary files a/scripts/_00e_nq05meadbarrelscn.pex and b/scripts/_00e_nq05meadbarrelscn.pex differ
diff --git a/scripts/_00e_nq05secrettrigzonescript.pex b/scripts/_00e_nq05secrettrigzonescript.pex
index c70e8385..7fda0db1 100644
Binary files a/scripts/_00e_nq05secrettrigzonescript.pex and b/scripts/_00e_nq05secrettrigzonescript.pex differ
diff --git a/scripts/_00e_nq06_portyrintosc.pex b/scripts/_00e_nq06_portyrintosc.pex
index 58ea0c0d..fd6a7b40 100644
Binary files a/scripts/_00e_nq06_portyrintosc.pex and b/scripts/_00e_nq06_portyrintosc.pex differ
diff --git a/scripts/_00e_nq06triggerscn.pex b/scripts/_00e_nq06triggerscn.pex
index 5b1b408a..ab0c1828 100644
Binary files a/scripts/_00e_nq06triggerscn.pex and b/scripts/_00e_nq06triggerscn.pex differ
diff --git a/scripts/_00e_nq07_functions.pex b/scripts/_00e_nq07_functions.pex
index 1958c290..ca626fd4 100644
Binary files a/scripts/_00e_nq07_functions.pex and b/scripts/_00e_nq07_functions.pex differ
diff --git a/scripts/_00e_nq07_notesc.pex b/scripts/_00e_nq07_notesc.pex
index fbe76567..3d3ffd2b 100644
Binary files a/scripts/_00e_nq07_notesc.pex and b/scripts/_00e_nq07_notesc.pex differ
diff --git a/scripts/_00e_nq09_casketscript.pex b/scripts/_00e_nq09_casketscript.pex
index 5fd92d0f..1ea2166e 100644
Binary files a/scripts/_00e_nq09_casketscript.pex and b/scripts/_00e_nq09_casketscript.pex differ
diff --git a/scripts/_00e_nq09_deamontrigboxscript.pex b/scripts/_00e_nq09_deamontrigboxscript.pex
index 614a4a5c..10fa1cca 100644
Binary files a/scripts/_00e_nq09_deamontrigboxscript.pex and b/scripts/_00e_nq09_deamontrigboxscript.pex differ
diff --git a/scripts/_00e_nq09_oldnotescript.pex b/scripts/_00e_nq09_oldnotescript.pex
index b19589d0..9ddd6117 100644
Binary files a/scripts/_00e_nq09_oldnotescript.pex and b/scripts/_00e_nq09_oldnotescript.pex differ
diff --git a/scripts/_00e_nq09_tabletscript.pex b/scripts/_00e_nq09_tabletscript.pex
index 6180be55..ce85287c 100644
Binary files a/scripts/_00e_nq09_tabletscript.pex and b/scripts/_00e_nq09_tabletscript.pex differ
diff --git a/scripts/_00e_nq09container.pex b/scripts/_00e_nq09container.pex
index e62b72be..493fa5a6 100644
Binary files a/scripts/_00e_nq09container.pex and b/scripts/_00e_nq09container.pex differ
diff --git a/scripts/_00e_nq10_elfrideactivator.pex b/scripts/_00e_nq10_elfrideactivator.pex
index 06c72aa5..8be8a194 100644
Binary files a/scripts/_00e_nq10_elfrideactivator.pex and b/scripts/_00e_nq10_elfrideactivator.pex differ
diff --git a/scripts/_00e_nq11_laute.pex b/scripts/_00e_nq11_laute.pex
index 332adb16..d358d5b2 100644
Binary files a/scripts/_00e_nq11_laute.pex and b/scripts/_00e_nq11_laute.pex differ
diff --git a/scripts/_00e_nq11book.pex b/scripts/_00e_nq11book.pex
index 097ad71b..5e0c56ec 100644
Binary files a/scripts/_00e_nq11book.pex and b/scripts/_00e_nq11book.pex differ
diff --git a/scripts/_00e_nq11inschrift.pex b/scripts/_00e_nq11inschrift.pex
index 8706dff0..2f797e44 100644
Binary files a/scripts/_00e_nq11inschrift.pex and b/scripts/_00e_nq11inschrift.pex differ
diff --git a/scripts/_00e_nq12_failsavesc.pex b/scripts/_00e_nq12_failsavesc.pex
index 6916001e..2b8487cc 100644
Binary files a/scripts/_00e_nq12_failsavesc.pex and b/scripts/_00e_nq12_failsavesc.pex differ
diff --git a/scripts/_00e_nq12_silathoughtspheresc.pex b/scripts/_00e_nq12_silathoughtspheresc.pex
index 7f2e5ba0..219d3fed 100644
Binary files a/scripts/_00e_nq12_silathoughtspheresc.pex and b/scripts/_00e_nq12_silathoughtspheresc.pex differ
diff --git a/scripts/_00e_nq12functions.pex b/scripts/_00e_nq12functions.pex
index 08d32ba3..68e830d5 100644
Binary files a/scripts/_00e_nq12functions.pex and b/scripts/_00e_nq12functions.pex differ
diff --git a/scripts/_00e_nq12scenetrigger.pex b/scripts/_00e_nq12scenetrigger.pex
index db591a93..4b74158e 100644
Binary files a/scripts/_00e_nq12scenetrigger.pex and b/scripts/_00e_nq12scenetrigger.pex differ
diff --git a/scripts/_00e_nq13_book.pex b/scripts/_00e_nq13_book.pex
index 8c683d4d..d7545124 100644
Binary files a/scripts/_00e_nq13_book.pex and b/scripts/_00e_nq13_book.pex differ
diff --git a/scripts/_00e_nq13keyscript.pex b/scripts/_00e_nq13keyscript.pex
index 5205fada..825e6eb8 100644
Binary files a/scripts/_00e_nq13keyscript.pex and b/scripts/_00e_nq13keyscript.pex differ
diff --git a/scripts/_00e_nq13mushroomcontainer.pex b/scripts/_00e_nq13mushroomcontainer.pex
index ed8f8f8a..736141da 100644
Binary files a/scripts/_00e_nq13mushroomcontainer.pex and b/scripts/_00e_nq13mushroomcontainer.pex differ
diff --git a/scripts/_00e_nq13starttrigger.pex b/scripts/_00e_nq13starttrigger.pex
index 7c8d2ff7..0e2da3e6 100644
Binary files a/scripts/_00e_nq13starttrigger.pex and b/scripts/_00e_nq13starttrigger.pex differ
diff --git a/scripts/_00e_nq14_ulvarscn.pex b/scripts/_00e_nq14_ulvarscn.pex
index 21d4159c..6c7904c9 100644
Binary files a/scripts/_00e_nq14_ulvarscn.pex and b/scripts/_00e_nq14_ulvarscn.pex differ
diff --git a/scripts/_00e_nq15_sc05_failsafe.pex b/scripts/_00e_nq15_sc05_failsafe.pex
index a4f8130d..7c995d28 100644
Binary files a/scripts/_00e_nq15_sc05_failsafe.pex and b/scripts/_00e_nq15_sc05_failsafe.pex differ
diff --git a/scripts/_00e_nq15functions.pex b/scripts/_00e_nq15functions.pex
index e2fba743..8a3fef42 100644
Binary files a/scripts/_00e_nq15functions.pex and b/scripts/_00e_nq15functions.pex differ
diff --git a/scripts/_00e_nq15trigboxhouse.pex b/scripts/_00e_nq15trigboxhouse.pex
index 726988a3..ecb6a423 100644
Binary files a/scripts/_00e_nq15trigboxhouse.pex and b/scripts/_00e_nq15trigboxhouse.pex differ
diff --git a/scripts/_00e_nq16ausgangscript.pex b/scripts/_00e_nq16ausgangscript.pex
index 31cb7f38..9ca2efb2 100644
Binary files a/scripts/_00e_nq16ausgangscript.pex and b/scripts/_00e_nq16ausgangscript.pex differ
diff --git a/scripts/_00e_nq16note.pex b/scripts/_00e_nq16note.pex
index 66ac5bbf..37f84f12 100644
Binary files a/scripts/_00e_nq16note.pex and b/scripts/_00e_nq16note.pex differ
diff --git a/scripts/_00e_nq18ausgangscript.pex b/scripts/_00e_nq18ausgangscript.pex
index 2ad1a641..98180212 100644
Binary files a/scripts/_00e_nq18ausgangscript.pex and b/scripts/_00e_nq18ausgangscript.pex differ
diff --git a/scripts/_00e_nq19_notesc.pex b/scripts/_00e_nq19_notesc.pex
index 6fad039c..1e9d79bf 100644
Binary files a/scripts/_00e_nq19_notesc.pex and b/scripts/_00e_nq19_notesc.pex differ
diff --git a/scripts/_00e_nq21_notescript.pex b/scripts/_00e_nq21_notescript.pex
index c1e453bd..f386070a 100644
Binary files a/scripts/_00e_nq21_notescript.pex and b/scripts/_00e_nq21_notescript.pex differ
diff --git a/scripts/_00e_nq22_pagesc.pex b/scripts/_00e_nq22_pagesc.pex
index 515341bf..ab8012dd 100644
Binary files a/scripts/_00e_nq22_pagesc.pex and b/scripts/_00e_nq22_pagesc.pex differ
diff --git a/scripts/_00e_nq23_functions.pex b/scripts/_00e_nq23_functions.pex
index b0800a5b..73d6c10a 100644
Binary files a/scripts/_00e_nq23_functions.pex and b/scripts/_00e_nq23_functions.pex differ
diff --git a/scripts/_00e_nq23_triggerboxobjectiveupdate.pex b/scripts/_00e_nq23_triggerboxobjectiveupdate.pex
index b0759c8a..a116fa2b 100644
Binary files a/scripts/_00e_nq23_triggerboxobjectiveupdate.pex and b/scripts/_00e_nq23_triggerboxobjectiveupdate.pex differ
diff --git a/scripts/_00e_nq23_triggerboxpahtirafailsafe.pex b/scripts/_00e_nq23_triggerboxpahtirafailsafe.pex
index 54d32281..3367ca09 100644
Binary files a/scripts/_00e_nq23_triggerboxpahtirafailsafe.pex and b/scripts/_00e_nq23_triggerboxpahtirafailsafe.pex differ
diff --git a/scripts/_00e_nq23cagedoor.pex b/scripts/_00e_nq23cagedoor.pex
index 754b1689..9eeb7e92 100644
Binary files a/scripts/_00e_nq23cagedoor.pex and b/scripts/_00e_nq23cagedoor.pex differ
diff --git a/scripts/_00e_nq24_leveledlistcheck.pex b/scripts/_00e_nq24_leveledlistcheck.pex
index 2eacf035..62a90a70 100644
Binary files a/scripts/_00e_nq24_leveledlistcheck.pex and b/scripts/_00e_nq24_leveledlistcheck.pex differ
diff --git a/scripts/_00e_nq26_leverscn.pex b/scripts/_00e_nq26_leverscn.pex
index 5c2c48ce..fd86e9ef 100644
Binary files a/scripts/_00e_nq26_leverscn.pex and b/scripts/_00e_nq26_leverscn.pex differ
diff --git a/scripts/_00e_nq26_pahtirafailsavebox.pex b/scripts/_00e_nq26_pahtirafailsavebox.pex
index 8919efa7..2cab5cb8 100644
Binary files a/scripts/_00e_nq26_pahtirafailsavebox.pex and b/scripts/_00e_nq26_pahtirafailsavebox.pex differ
diff --git a/scripts/_00e_nq26_pathiraportfailsavesc.pex b/scripts/_00e_nq26_pathiraportfailsavesc.pex
index d89d0dec..b604c58b 100644
Binary files a/scripts/_00e_nq26_pathiraportfailsavesc.pex and b/scripts/_00e_nq26_pathiraportfailsavesc.pex differ
diff --git a/scripts/_00e_nq26_pathirastuckscenefailsavesc.pex b/scripts/_00e_nq26_pathirastuckscenefailsavesc.pex
index 6bdaf3f0..cd392e28 100644
Binary files a/scripts/_00e_nq26_pathirastuckscenefailsavesc.pex and b/scripts/_00e_nq26_pathirastuckscenefailsavesc.pex differ
diff --git a/scripts/_00e_nq26_playeraliasscript.pex b/scripts/_00e_nq26_playeraliasscript.pex
index 0af63280..0fed3318 100644
Binary files a/scripts/_00e_nq26_playeraliasscript.pex and b/scripts/_00e_nq26_playeraliasscript.pex differ
diff --git a/scripts/_00e_nq29_ashwidowsc.pex b/scripts/_00e_nq29_ashwidowsc.pex
index d3b5cf19..9f3fd5e3 100644
Binary files a/scripts/_00e_nq29_ashwidowsc.pex and b/scripts/_00e_nq29_ashwidowsc.pex differ
diff --git a/scripts/_00e_nq29_boss_ashwidowsc.pex b/scripts/_00e_nq29_boss_ashwidowsc.pex
index 2f2151af..9604c371 100644
Binary files a/scripts/_00e_nq29_boss_ashwidowsc.pex and b/scripts/_00e_nq29_boss_ashwidowsc.pex differ
diff --git a/scripts/_00e_nq29_boss_blindminersc.pex b/scripts/_00e_nq29_boss_blindminersc.pex
index 287c652b..3c1e4289 100644
Binary files a/scripts/_00e_nq29_boss_blindminersc.pex and b/scripts/_00e_nq29_boss_blindminersc.pex differ
diff --git a/scripts/_00e_nq29_boss_werewolf_sc.pex b/scripts/_00e_nq29_boss_werewolf_sc.pex
index e0040c1d..251f4610 100644
Binary files a/scripts/_00e_nq29_boss_werewolf_sc.pex and b/scripts/_00e_nq29_boss_werewolf_sc.pex differ
diff --git a/scripts/_00e_nq29_bosssteelwatchersc.pex b/scripts/_00e_nq29_bosssteelwatchersc.pex
index 98323d30..83b57724 100644
Binary files a/scripts/_00e_nq29_bosssteelwatchersc.pex and b/scripts/_00e_nq29_bosssteelwatchersc.pex differ
diff --git a/scripts/_00e_nq32_startboxsc.pex b/scripts/_00e_nq32_startboxsc.pex
index 6ca2cfe2..38c452d3 100644
Binary files a/scripts/_00e_nq32_startboxsc.pex and b/scripts/_00e_nq32_startboxsc.pex differ
diff --git a/scripts/_00e_nq33_functions.pex b/scripts/_00e_nq33_functions.pex
index 3a86543e..a7304f9c 100644
Binary files a/scripts/_00e_nq33_functions.pex and b/scripts/_00e_nq33_functions.pex differ
diff --git a/scripts/_00e_nq34_book.pex b/scripts/_00e_nq34_book.pex
index 27eb747a..8ce51d7f 100644
Binary files a/scripts/_00e_nq34_book.pex and b/scripts/_00e_nq34_book.pex differ
diff --git a/scripts/_00e_nq34_failsavesc.pex b/scripts/_00e_nq34_failsavesc.pex
index bb0f33e7..0f3fe939 100644
Binary files a/scripts/_00e_nq34_failsavesc.pex and b/scripts/_00e_nq34_failsavesc.pex differ
diff --git a/scripts/_00e_nq34_startsc.pex b/scripts/_00e_nq34_startsc.pex
index 985fe6e0..f8695911 100644
Binary files a/scripts/_00e_nq34_startsc.pex and b/scripts/_00e_nq34_startsc.pex differ
diff --git a/scripts/_00e_nq36_functions.pex b/scripts/_00e_nq36_functions.pex
index 11a0884d..5647c934 100644
Binary files a/scripts/_00e_nq36_functions.pex and b/scripts/_00e_nq36_functions.pex differ
diff --git a/scripts/_00e_nq_bounty01_boardscript.pex b/scripts/_00e_nq_bounty01_boardscript.pex
index c82bcb05..2a443540 100644
Binary files a/scripts/_00e_nq_bounty01_boardscript.pex and b/scripts/_00e_nq_bounty01_boardscript.pex differ
diff --git a/scripts/_00e_nq_bounty01_targetscript.pex b/scripts/_00e_nq_bounty01_targetscript.pex
index 3f28fb8f..db84db75 100644
Binary files a/scripts/_00e_nq_bounty01_targetscript.pex and b/scripts/_00e_nq_bounty01_targetscript.pex differ
diff --git a/scripts/_00e_nq_g_01_functions.pex b/scripts/_00e_nq_g_01_functions.pex
index 48e982a2..4741dbfe 100644
Binary files a/scripts/_00e_nq_g_01_functions.pex and b/scripts/_00e_nq_g_01_functions.pex differ
diff --git a/scripts/_00e_nq_g_02_displaymushroomobjective.pex b/scripts/_00e_nq_g_02_displaymushroomobjective.pex
index ec17675d..9654c165 100644
Binary files a/scripts/_00e_nq_g_02_displaymushroomobjective.pex and b/scripts/_00e_nq_g_02_displaymushroomobjective.pex differ
diff --git a/scripts/_00e_nq_g_02_functions.pex b/scripts/_00e_nq_g_02_functions.pex
index 2dd68d53..f571c96e 100644
Binary files a/scripts/_00e_nq_g_02_functions.pex and b/scripts/_00e_nq_g_02_functions.pex differ
diff --git a/scripts/_00e_nq_g_02_mushroomonhit.pex b/scripts/_00e_nq_g_02_mushroomonhit.pex
index 13fb888d..2d26dc34 100644
Binary files a/scripts/_00e_nq_g_02_mushroomonhit.pex and b/scripts/_00e_nq_g_02_mushroomonhit.pex differ
diff --git a/scripts/_00e_nq_g_02_trapdoorstartscene.pex b/scripts/_00e_nq_g_02_trapdoorstartscene.pex
index 4c5a0f6c..2dcd59a5 100644
Binary files a/scripts/_00e_nq_g_02_trapdoorstartscene.pex and b/scripts/_00e_nq_g_02_trapdoorstartscene.pex differ
diff --git a/scripts/_00e_nq_g_03_functions.pex b/scripts/_00e_nq_g_03_functions.pex
index 77d0b65e..515e3f4f 100644
Binary files a/scripts/_00e_nq_g_03_functions.pex and b/scripts/_00e_nq_g_03_functions.pex differ
diff --git a/scripts/_00e_nq_g_03_petrifiedcombatsc.pex b/scripts/_00e_nq_g_03_petrifiedcombatsc.pex
index 8f2df286..bea92800 100644
Binary files a/scripts/_00e_nq_g_03_petrifiedcombatsc.pex and b/scripts/_00e_nq_g_03_petrifiedcombatsc.pex differ
diff --git a/scripts/_00e_nq_g_05_functions.pex b/scripts/_00e_nq_g_05_functions.pex
index 868a1745..2a17adf0 100644
Binary files a/scripts/_00e_nq_g_05_functions.pex and b/scripts/_00e_nq_g_05_functions.pex differ
diff --git a/scripts/_00e_nq_g_06_debugbox.pex b/scripts/_00e_nq_g_06_debugbox.pex
index f5e6aade..9b6de009 100644
Binary files a/scripts/_00e_nq_g_06_debugbox.pex and b/scripts/_00e_nq_g_06_debugbox.pex differ
diff --git a/scripts/_00e_nq_g_06_functions.pex b/scripts/_00e_nq_g_06_functions.pex
index adc278ef..d865bb4a 100644
Binary files a/scripts/_00e_nq_g_06_functions.pex and b/scripts/_00e_nq_g_06_functions.pex differ
diff --git a/scripts/_00e_nq_g_06_playerlocationchanged.pex b/scripts/_00e_nq_g_06_playerlocationchanged.pex
index 8f6ebfa1..fda2f8c5 100644
Binary files a/scripts/_00e_nq_g_06_playerlocationchanged.pex and b/scripts/_00e_nq_g_06_playerlocationchanged.pex differ
diff --git a/scripts/_00e_nq_g_07_brief_setstageonread.pex b/scripts/_00e_nq_g_07_brief_setstageonread.pex
index 709f3f3e..eda97c1b 100644
Binary files a/scripts/_00e_nq_g_07_brief_setstageonread.pex and b/scripts/_00e_nq_g_07_brief_setstageonread.pex differ
diff --git a/scripts/_00e_nq_g_07_functions.pex b/scripts/_00e_nq_g_07_functions.pex
index 0edef744..c44a1254 100644
Binary files a/scripts/_00e_nq_g_07_functions.pex and b/scripts/_00e_nq_g_07_functions.pex differ
diff --git a/scripts/_00e_nq_g_07_letterpickup.pex b/scripts/_00e_nq_g_07_letterpickup.pex
index bd5125c1..2612f7df 100644
Binary files a/scripts/_00e_nq_g_07_letterpickup.pex and b/scripts/_00e_nq_g_07_letterpickup.pex differ
diff --git a/scripts/_00e_nq_g_07_shacklekeypickup.pex b/scripts/_00e_nq_g_07_shacklekeypickup.pex
index c77b7b66..60d766c2 100644
Binary files a/scripts/_00e_nq_g_07_shacklekeypickup.pex and b/scripts/_00e_nq_g_07_shacklekeypickup.pex differ
diff --git a/scripts/_00e_nq_g_07dijaam_trapdoorsc.pex b/scripts/_00e_nq_g_07dijaam_trapdoorsc.pex
index 3d6f43d1..d6cd0aea 100644
Binary files a/scripts/_00e_nq_g_07dijaam_trapdoorsc.pex and b/scripts/_00e_nq_g_07dijaam_trapdoorsc.pex differ
diff --git a/scripts/_00e_nq_g_07mael_setstageoncast.pex b/scripts/_00e_nq_g_07mael_setstageoncast.pex
index 23846b44..8a988a3d 100644
Binary files a/scripts/_00e_nq_g_07mael_setstageoncast.pex and b/scripts/_00e_nq_g_07mael_setstageoncast.pex differ
diff --git a/scripts/_00e_nqaltyogoshventilscn.pex b/scripts/_00e_nqaltyogoshventilscn.pex
index 9e02bb28..b55fed7d 100644
Binary files a/scripts/_00e_nqaltyogoshventilscn.pex and b/scripts/_00e_nqaltyogoshventilscn.pex differ
diff --git a/scripts/_00e_nqg02_doorsc.pex b/scripts/_00e_nqg02_doorsc.pex
index 6ce2f2a5..5944a728 100644
Binary files a/scripts/_00e_nqg02_doorsc.pex and b/scripts/_00e_nqg02_doorsc.pex differ
diff --git a/scripts/_00e_nqg05_trapdoorfailsavesc.pex b/scripts/_00e_nqg05_trapdoorfailsavesc.pex
index 7952269a..fe1f2f00 100644
Binary files a/scripts/_00e_nqg05_trapdoorfailsavesc.pex and b/scripts/_00e_nqg05_trapdoorfailsavesc.pex differ
diff --git a/scripts/_00e_nqg07_dijaamescapesc.pex b/scripts/_00e_nqg07_dijaamescapesc.pex
index 64a5f4b9..8c59c361 100644
Binary files a/scripts/_00e_nqg07_dijaamescapesc.pex and b/scripts/_00e_nqg07_dijaamescapesc.pex differ
diff --git a/scripts/_00e_nqg07_dijaamscenesc.pex b/scripts/_00e_nqg07_dijaamscenesc.pex
index f868a638..fe37126d 100644
Binary files a/scripts/_00e_nqg07_dijaamscenesc.pex and b/scripts/_00e_nqg07_dijaamscenesc.pex differ
diff --git a/scripts/_00e_nqg07_maelfailsavesc.pex b/scripts/_00e_nqg07_maelfailsavesc.pex
index 4de959f2..eb9d154e 100644
Binary files a/scripts/_00e_nqg07_maelfailsavesc.pex and b/scripts/_00e_nqg07_maelfailsavesc.pex differ
diff --git a/scripts/_00e_nqg07_movedijaamtoplayersc.pex b/scripts/_00e_nqg07_movedijaamtoplayersc.pex
index b1a47d23..b159f84e 100644
Binary files a/scripts/_00e_nqg07_movedijaamtoplayersc.pex and b/scripts/_00e_nqg07_movedijaamtoplayersc.pex differ
diff --git a/scripts/_00e_nqg07dijaam_scenefailsavetgbx.pex b/scripts/_00e_nqg07dijaam_scenefailsavetgbx.pex
index 947e2031..8c409874 100644
Binary files a/scripts/_00e_nqg07dijaam_scenefailsavetgbx.pex and b/scripts/_00e_nqg07dijaam_scenefailsavetgbx.pex differ
diff --git a/scripts/_00e_nqr01_functions.pex b/scripts/_00e_nqr01_functions.pex
index 8c90d609..24ad3dc3 100644
Binary files a/scripts/_00e_nqr01_functions.pex and b/scripts/_00e_nqr01_functions.pex differ
diff --git a/scripts/_00e_oldsherath_zucombatscript.pex b/scripts/_00e_oldsherath_zucombatscript.pex
index e9790e76..bd09fa39 100644
Binary files a/scripts/_00e_oldsherath_zucombatscript.pex and b/scripts/_00e_oldsherath_zucombatscript.pex differ
diff --git a/scripts/_00e_p02_combattutorialscript.pex b/scripts/_00e_p02_combattutorialscript.pex
index a492442b..be127b71 100644
Binary files a/scripts/_00e_p02_combattutorialscript.pex and b/scripts/_00e_p02_combattutorialscript.pex differ
diff --git a/scripts/_00e_p02_veiledwomanspelllaunchers.pex b/scripts/_00e_p02_veiledwomanspelllaunchers.pex
deleted file mode 100644
index aa68fb6e..00000000
Binary files a/scripts/_00e_p02_veiledwomanspelllaunchers.pex and /dev/null differ
diff --git a/scripts/_00e_phasmalist_soul.pex b/scripts/_00e_phasmalist_soul.pex
index b01275e6..cf91fa07 100644
Binary files a/scripts/_00e_phasmalist_soul.pex and b/scripts/_00e_phasmalist_soul.pex differ
diff --git a/scripts/_00e_playercontrolsswitchactivation.pex b/scripts/_00e_playercontrolsswitchactivation.pex
index f0213545..ae8bb3f8 100644
Binary files a/scripts/_00e_playercontrolsswitchactivation.pex and b/scripts/_00e_playercontrolsswitchactivation.pex differ
diff --git a/scripts/_00e_portnpctoplayerfailsavesc.pex b/scripts/_00e_portnpctoplayerfailsavesc.pex
index ea173467..8058936f 100644
Binary files a/scripts/_00e_portnpctoplayerfailsavesc.pex and b/scripts/_00e_portnpctoplayerfailsavesc.pex differ
diff --git a/scripts/_00e_queststarttrigger.pex b/scripts/_00e_queststarttrigger.pex
index 47194d42..bcd7e72c 100644
Binary files a/scripts/_00e_queststarttrigger.pex and b/scripts/_00e_queststarttrigger.pex differ
diff --git a/scripts/_00e_questupdateontriggercomplex.pex b/scripts/_00e_questupdateontriggercomplex.pex
index 8e8ba80d..75f83a27 100644
Binary files a/scripts/_00e_questupdateontriggercomplex.pex and b/scripts/_00e_questupdateontriggercomplex.pex differ
diff --git a/scripts/_00e_scenestartscript.pex b/scripts/_00e_scenestartscript.pex
index d3c36f3f..d014ecf9 100644
Binary files a/scripts/_00e_scenestartscript.pex and b/scripts/_00e_scenestartscript.pex differ
diff --git a/scripts/_00e_setstageonactivate.pex b/scripts/_00e_setstageonactivate.pex
index 48c9f783..b3a10d8a 100644
Binary files a/scripts/_00e_setstageonactivate.pex and b/scripts/_00e_setstageonactivate.pex differ
diff --git a/scripts/_00e_setstageondeath.pex b/scripts/_00e_setstageondeath.pex
index 2c2145fd..b38dafc8 100644
Binary files a/scripts/_00e_setstageondeath.pex and b/scripts/_00e_setstageondeath.pex differ
diff --git a/scripts/_00e_setstageondropitem.pex b/scripts/_00e_setstageondropitem.pex
index 86a87cc4..31f201ca 100644
Binary files a/scripts/_00e_setstageondropitem.pex and b/scripts/_00e_setstageondropitem.pex differ
diff --git a/scripts/_00e_setstageonopen.pex b/scripts/_00e_setstageonopen.pex
index 9d0b310f..d2c50edd 100644
Binary files a/scripts/_00e_setstageonopen.pex and b/scripts/_00e_setstageonopen.pex differ
diff --git a/scripts/_00e_setstageonpickup.pex b/scripts/_00e_setstageonpickup.pex
index aec93e6c..4bcfe18f 100644
Binary files a/scripts/_00e_setstageonpickup.pex and b/scripts/_00e_setstageonpickup.pex differ
diff --git a/scripts/_00e_setstageonread.pex b/scripts/_00e_setstageonread.pex
index 91294edd..b64d5865 100644
Binary files a/scripts/_00e_setstageonread.pex and b/scripts/_00e_setstageonread.pex differ
diff --git a/scripts/_00e_setstageonreadwithrequiredstage.pex b/scripts/_00e_setstageonreadwithrequiredstage.pex
index ef4e4da2..1b720db3 100644
Binary files a/scripts/_00e_setstageonreadwithrequiredstage.pex and b/scripts/_00e_setstageonreadwithrequiredstage.pex differ
diff --git a/scripts/_00e_setstageontriggerenter.pex b/scripts/_00e_setstageontriggerenter.pex
index 49b62a32..5ab8becb 100644
Binary files a/scripts/_00e_setstageontriggerenter.pex and b/scripts/_00e_setstageontriggerenter.pex differ
diff --git a/scripts/_00e_stagetriggerboxscn.pex b/scripts/_00e_stagetriggerboxscn.pex
index 1502da28..7c1c9a4b 100644
Binary files a/scripts/_00e_stagetriggerboxscn.pex and b/scripts/_00e_stagetriggerboxscn.pex differ
diff --git a/scripts/_00e_startquestandsetstage.pex b/scripts/_00e_startquestandsetstage.pex
index 2657fdad..6678c67b 100644
Binary files a/scripts/_00e_startquestandsetstage.pex and b/scripts/_00e_startquestandsetstage.pex differ
diff --git a/scripts/_00e_startscenetrigger.pex b/scripts/_00e_startscenetrigger.pex
index 876c3d5e..a2bbbf00 100644
Binary files a/scripts/_00e_startscenetrigger.pex and b/scripts/_00e_startscenetrigger.pex differ
diff --git a/scripts/_00e_suntemple_weathercontrolsc.pex b/scripts/_00e_suntemple_weathercontrolsc.pex
index 00bf01f8..516098a5 100644
Binary files a/scripts/_00e_suntemple_weathercontrolsc.pex and b/scripts/_00e_suntemple_weathercontrolsc.pex differ
diff --git a/scripts/_00e_teleport_suntempleme.pex b/scripts/_00e_teleport_suntempleme.pex
index 3c6b91da..2ca47bfa 100644
Binary files a/scripts/_00e_teleport_suntempleme.pex and b/scripts/_00e_teleport_suntempleme.pex differ
diff --git a/scripts/_00e_testbossfightsc.pex b/scripts/_00e_testbossfightsc.pex
index 325dc978..7edd7de7 100644
Binary files a/scripts/_00e_testbossfightsc.pex and b/scripts/_00e_testbossfightsc.pex differ
diff --git a/scripts/_00e_testquest_functions.pex b/scripts/_00e_testquest_functions.pex
index 6bb6614c..89618d52 100644
Binary files a/scripts/_00e_testquest_functions.pex and b/scripts/_00e_testquest_functions.pex differ
diff --git a/scripts/_00e_theriantrophist_playeraswerewolf.pex b/scripts/_00e_theriantrophist_playeraswerewolf.pex
index b95e1765..c4013891 100644
Binary files a/scripts/_00e_theriantrophist_playeraswerewolf.pex and b/scripts/_00e_theriantrophist_playeraswerewolf.pex differ
diff --git a/scripts/_00e_theriantrophist_wolfformsc.pex b/scripts/_00e_theriantrophist_wolfformsc.pex
index 24879839..02cafb96 100644
Binary files a/scripts/_00e_theriantrophist_wolfformsc.pex and b/scripts/_00e_theriantrophist_wolfformsc.pex differ
diff --git a/scripts/_00e_triggerboxsaynotincombatscript.pex b/scripts/_00e_triggerboxsaynotincombatscript.pex
index 4ddf2cbd..73f11316 100644
Binary files a/scripts/_00e_triggerboxsaynotincombatscript.pex and b/scripts/_00e_triggerboxsaynotincombatscript.pex differ
diff --git a/scripts/_00e_visionhomesc.pex b/scripts/_00e_visionhomesc.pex
index 464c9cd3..7566a649 100644
Binary files a/scripts/_00e_visionhomesc.pex and b/scripts/_00e_visionhomesc.pex differ
diff --git a/scripts/_00e_weathercontrolquestscript.pex b/scripts/_00e_weathercontrolquestscript.pex
index 9db0cbb7..ba4ae3db 100644
Binary files a/scripts/_00e_weathercontrolquestscript.pex and b/scripts/_00e_weathercontrolquestscript.pex differ
diff --git a/scripts/_00e_z_conversations_tealorandjoreksc.pex b/scripts/_00e_z_conversations_tealorandjoreksc.pex
index fba78b0c..89a06eb6 100644
Binary files a/scripts/_00e_z_conversations_tealorandjoreksc.pex and b/scripts/_00e_z_conversations_tealorandjoreksc.pex differ
diff --git a/scripts/_fs_phasmalist_controlquest.pex b/scripts/_fs_phasmalist_controlquest.pex
index 2d173908..88b654f7 100644
Binary files a/scripts/_fs_phasmalist_controlquest.pex and b/scripts/_fs_phasmalist_controlquest.pex differ
diff --git a/scripts/defaultfakenpcloadtrig.pex b/scripts/defaultfakenpcloadtrig.pex
index c6248eb9..8c7f99c0 100644
Binary files a/scripts/defaultfakenpcloadtrig.pex and b/scripts/defaultfakenpcloadtrig.pex differ
diff --git a/scripts/defaultfireweaponscript.pex b/scripts/defaultfireweaponscript.pex
index c46a227d..1862e535 100644
Binary files a/scripts/defaultfireweaponscript.pex and b/scripts/defaultfireweaponscript.pex differ
diff --git a/scripts/defaultsetstageonenter.pex b/scripts/defaultsetstageonenter.pex
index 5182cb44..3a9be5e8 100644
Binary files a/scripts/defaultsetstageonenter.pex and b/scripts/defaultsetstageonenter.pex differ
diff --git a/scripts/defaultsetstagetrigscript.pex b/scripts/defaultsetstagetrigscript.pex
index 258f7d13..59a1d271 100644
Binary files a/scripts/defaultsetstagetrigscript.pex and b/scripts/defaultsetstagetrigscript.pex differ
diff --git a/scripts/dragontowerwallscript.pex b/scripts/dragontowerwallscript.pex
index 343f0992..e3b5cab2 100644
Binary files a/scripts/dragontowerwallscript.pex and b/scripts/dragontowerwallscript.pex differ
diff --git a/scripts/dunarcherpressureplatescript.pex b/scripts/dunarcherpressureplatescript.pex
index 7680018d..5a852283 100644
Binary files a/scripts/dunarcherpressureplatescript.pex and b/scripts/dunarcherpressureplatescript.pex differ
diff --git a/scripts/fs_nq05_chairscript.pex b/scripts/fs_nq05_chairscript.pex
index 512d241a..21c2d9a3 100644
Binary files a/scripts/fs_nq05_chairscript.pex and b/scripts/fs_nq05_chairscript.pex differ
diff --git a/scripts/fs_nq05_mirelldeadscript.pex b/scripts/fs_nq05_mirelldeadscript.pex
index 6afa87cc..1f1281bb 100644
Binary files a/scripts/fs_nq05_mirelldeadscript.pex and b/scripts/fs_nq05_mirelldeadscript.pex differ
diff --git a/scripts/fs_nq05_tochterdeadscript.pex b/scripts/fs_nq05_tochterdeadscript.pex
index 8df8bb98..ad738f80 100644
Binary files a/scripts/fs_nq05_tochterdeadscript.pex and b/scripts/fs_nq05_tochterdeadscript.pex differ
diff --git a/scripts/fs_nqr05_bossfightabnormalitysc.pex b/scripts/fs_nqr05_bossfightabnormalitysc.pex
index 5a06412f..59705d48 100644
Binary files a/scripts/fs_nqr05_bossfightabnormalitysc.pex and b/scripts/fs_nqr05_bossfightabnormalitysc.pex differ
diff --git a/scripts/headchopblockhookupscript.pex b/scripts/headchopblockhookupscript.pex
index cdc3b48b..fe926dd8 100644
Binary files a/scripts/headchopblockhookupscript.pex and b/scripts/headchopblockhookupscript.pex differ
diff --git a/scripts/mg08paralysiseffectscript.pex b/scripts/mg08paralysiseffectscript.pex
index d060f480..89d98177 100644
Binary files a/scripts/mg08paralysiseffectscript.pex and b/scripts/mg08paralysiseffectscript.pex differ
diff --git a/scripts/mq03_functions.pex b/scripts/mq03_functions.pex
index f192f400..5266f9df 100644
Binary files a/scripts/mq03_functions.pex and b/scripts/mq03_functions.pex differ
diff --git a/scripts/mqgreybeardabsorbscript.pex b/scripts/mqgreybeardabsorbscript.pex
index 6d6f94a9..8fa11f67 100644
Binary files a/scripts/mqgreybeardabsorbscript.pex and b/scripts/mqgreybeardabsorbscript.pex differ
diff --git a/scripts/pf__0007b8f7.pex b/scripts/pf__0007b8f7.pex
index d07eadc9..b6396726 100644
Binary files a/scripts/pf__0007b8f7.pex and b/scripts/pf__0007b8f7.pex differ
diff --git a/scripts/pf__000812ba.pex b/scripts/pf__000812ba.pex
index 4b0f3022..f9b13025 100644
Binary files a/scripts/pf__000812ba.pex and b/scripts/pf__000812ba.pex differ
diff --git a/scripts/pf__000812c2.pex b/scripts/pf__000812c2.pex
index 6101e9cc..af0cbf0e 100644
Binary files a/scripts/pf__000812c2.pex and b/scripts/pf__000812c2.pex differ
diff --git a/scripts/pf__00e_fs_nq07_aarostravelb_0101ecdc.pex b/scripts/pf__00e_fs_nq07_aarostravelb_0101ecdc.pex
index d18c7392..63e644e5 100644
Binary files a/scripts/pf__00e_fs_nq07_aarostravelb_0101ecdc.pex and b/scripts/pf__00e_fs_nq07_aarostravelb_0101ecdc.pex differ
diff --git a/scripts/pf__00e_fs_nq07_aarostravelt_02004392.pex b/scripts/pf__00e_fs_nq07_aarostravelt_02004392.pex
index cb5a48e3..f57be5ca 100644
Binary files a/scripts/pf__00e_fs_nq07_aarostravelt_02004392.pex and b/scripts/pf__00e_fs_nq07_aarostravelt_02004392.pex differ
diff --git a/scripts/pf__0200576c.pex b/scripts/pf__0200576c.pex
index 13079b34..d6148c57 100644
Binary files a/scripts/pf__0200576c.pex and b/scripts/pf__0200576c.pex differ
diff --git a/scripts/pf_mq03_sc3_traveloutsidemag_0014156f.pex b/scripts/pf_mq03_sc3_traveloutsidemag_0014156f.pex
index b1a35929..ee811af9 100644
Binary files a/scripts/pf_mq03_sc3_traveloutsidemag_0014156f.pex and b/scripts/pf_mq03_sc3_traveloutsidemag_0014156f.pex differ
diff --git a/scripts/pf_mq05_sc14_playerwalktomar_0009cfe3.pex b/scripts/pf_mq05_sc14_playerwalktomar_0009cfe3.pex
index a005e63a..6427d22e 100644
Binary files a/scripts/pf_mq05_sc14_playerwalktomar_0009cfe3.pex and b/scripts/pf_mq05_sc14_playerwalktomar_0009cfe3.pex differ
diff --git a/scripts/pf_mq05_sc6_dunwarfireslight_00097c31.pex b/scripts/pf_mq05_sc6_dunwarfireslight_00097c31.pex
index 6ad542f6..acfdee82 100644
Binary files a/scripts/pf_mq05_sc6_dunwarfireslight_00097c31.pex and b/scripts/pf_mq05_sc6_dunwarfireslight_00097c31.pex differ
diff --git a/scripts/pf_mq05_sc7_escortpackage_00097d04.pex b/scripts/pf_mq05_sc7_escortpackage_00097d04.pex
index a6bfd0d5..ccba2be9 100644
Binary files a/scripts/pf_mq05_sc7_escortpackage_00097d04.pex and b/scripts/pf_mq05_sc7_escortpackage_00097d04.pex differ
diff --git a/scripts/pf_mq09amlaplacesilverplate_000eb3d9.pex b/scripts/pf_mq09amlaplacesilverplate_000eb3d9.pex
index 3dfa7c32..8bb2b59a 100644
Binary files a/scripts/pf_mq09amlaplacesilverplate_000eb3d9.pex and b/scripts/pf_mq09amlaplacesilverplate_000eb3d9.pex differ
diff --git a/scripts/pf_mq09samaelgoestoplayer_000eb3cb.pex b/scripts/pf_mq09samaelgoestoplayer_000eb3cb.pex
index ed9cd9d7..828adda4 100644
Binary files a/scripts/pf_mq09samaelgoestoplayer_000eb3cb.pex and b/scripts/pf_mq09samaelgoestoplayer_000eb3cb.pex differ
diff --git a/scripts/pf_mq11badilacastspell_00117944.pex b/scripts/pf_mq11badilacastspell_00117944.pex
index 0e170ebb..0e3eadcd 100644
Binary files a/scripts/pf_mq11badilacastspell_00117944.pex and b/scripts/pf_mq11badilacastspell_00117944.pex differ
diff --git a/scripts/pf_mq11c_d11_ryneuswalktoeas_00092a71.pex b/scripts/pf_mq11c_d11_ryneuswalktoeas_00092a71.pex
index c32bf331..6a765b10 100644
Binary files a/scripts/pf_mq11c_d11_ryneuswalktoeas_00092a71.pex and b/scripts/pf_mq11c_d11_ryneuswalktoeas_00092a71.pex differ
diff --git a/scripts/pf_mq11c_sc2_wifewalktomarke_0008d961.pex b/scripts/pf_mq11c_sc2_wifewalktomarke_0008d961.pex
index 4fabdf6b..222f6e9b 100644
Binary files a/scripts/pf_mq11c_sc2_wifewalktomarke_0008d961.pex and b/scripts/pf_mq11c_sc2_wifewalktomarke_0008d961.pex differ
diff --git a/scripts/pf_mq11c_sc4_dogchase_00090468.pex b/scripts/pf_mq11c_sc4_dogchase_00090468.pex
index 39e63172..a1977553 100644
Binary files a/scripts/pf_mq11c_sc4_dogchase_00090468.pex and b/scripts/pf_mq11c_sc4_dogchase_00090468.pex differ
diff --git a/scripts/pf_mq11c_sc4_ryneuswalktodoo_00090932.pex b/scripts/pf_mq11c_sc4_ryneuswalktodoo_00090932.pex
index b62d6fce..c7256537 100644
Binary files a/scripts/pf_mq11c_sc4_ryneuswalktodoo_00090932.pex and b/scripts/pf_mq11c_sc4_ryneuswalktodoo_00090932.pex differ
diff --git a/scripts/pf_mqp02_sc3_sebaldwalkupsta_0007741b.pex b/scripts/pf_mqp02_sc3_sebaldwalkupsta_0007741b.pex
index ee33a5c9..6281ecf9 100644
Binary files a/scripts/pf_mqp02_sc3_sebaldwalkupsta_0007741b.pex and b/scripts/pf_mqp02_sc3_sebaldwalkupsta_0007741b.pex differ
diff --git a/scripts/pf_websitlinkedref_00044ea0.pex b/scripts/pf_websitlinkedref_00044ea0.pex
index 95d3ea57..d2f34388 100644
Binary files a/scripts/pf_websitlinkedref_00044ea0.pex and b/scripts/pf_websitlinkedref_00044ea0.pex differ
diff --git a/scripts/qf_dgintimidatequest_0011a493.pex b/scripts/qf_dgintimidatequest_0011a493.pex
index b806b992..5f76c1a3 100644
Binary files a/scripts/qf_dgintimidatequest_0011a493.pex and b/scripts/qf_dgintimidatequest_0011a493.pex differ
diff --git a/scripts/qf_mq06_0002eba4.pex b/scripts/qf_mq06_0002eba4.pex
index 72e29e1b..61443668 100644
Binary files a/scripts/qf_mq06_0002eba4.pex and b/scripts/qf_mq06_0002eba4.pex differ
diff --git a/scripts/qf_mq08_intothedeep_0002eba6.pex b/scripts/qf_mq08_intothedeep_0002eba6.pex
index 6c25d94d..0b8ad809 100644
Binary files a/scripts/qf_mq08_intothedeep_0002eba6.pex and b/scripts/qf_mq08_intothedeep_0002eba6.pex differ
diff --git a/scripts/qf_mq101_0003372b.pex b/scripts/qf_mq101_0003372b.pex
index 2662a7a4..81291755 100644
Binary files a/scripts/qf_mq101_0003372b.pex and b/scripts/qf_mq101_0003372b.pex differ
diff --git a/scripts/qf_mq10b_001080b2.pex b/scripts/qf_mq10b_001080b2.pex
index 0564c95c..fea88ac8 100644
Binary files a/scripts/qf_mq10b_001080b2.pex and b/scripts/qf_mq10b_001080b2.pex differ
diff --git a/scripts/qf_mq11a_0002eba9.pex b/scripts/qf_mq11a_0002eba9.pex
index 047e9f23..32af1555 100644
Binary files a/scripts/qf_mq11a_0002eba9.pex and b/scripts/qf_mq11a_0002eba9.pex differ
diff --git a/scripts/qf_mq11b_0002ebab.pex b/scripts/qf_mq11b_0002ebab.pex
index 66253637..0394847a 100644
Binary files a/scripts/qf_mq11b_0002ebab.pex and b/scripts/qf_mq11b_0002ebab.pex differ
diff --git a/scripts/qf_mq11c_asonginthesilence_0002ebaa.pex b/scripts/qf_mq11c_asonginthesilence_0002ebaa.pex
index a66c6477..58fd27a6 100644
Binary files a/scripts/qf_mq11c_asonginthesilence_0002ebaa.pex and b/scripts/qf_mq11c_asonginthesilence_0002ebaa.pex differ
diff --git a/scripts/qf_mq12a_0011b063.pex b/scripts/qf_mq12a_0011b063.pex
index 88f5f6de..674de4f1 100644
Binary files a/scripts/qf_mq12a_0011b063.pex and b/scripts/qf_mq12a_0011b063.pex differ
diff --git a/scripts/qf_mqp03_0007b1e5.pex b/scripts/qf_mqp03_0007b1e5.pex
index db8d69fd..8055983f 100644
Binary files a/scripts/qf_mqp03_0007b1e5.pex and b/scripts/qf_mqp03_0007b1e5.pex differ
diff --git a/scripts/qf_nq15_00125367.pex b/scripts/qf_nq15_00125367.pex
index 24d1cc97..b49c86df 100644
Binary files a/scripts/qf_nq15_00125367.pex and b/scripts/qf_nq15_00125367.pex differ
diff --git a/scripts/qf_nq27_00149517.pex b/scripts/qf_nq27_00149517.pex
index cf69d04e..437a553b 100644
Binary files a/scripts/qf_nq27_00149517.pex and b/scripts/qf_nq27_00149517.pex differ
diff --git a/scripts/qf_nq_g_07_0013c2e4.pex b/scripts/qf_nq_g_07_0013c2e4.pex
index ee015227..c45b2834 100644
Binary files a/scripts/qf_nq_g_07_0013c2e4.pex and b/scripts/qf_nq_g_07_0013c2e4.pex differ
diff --git a/scripts/qf_nq_g_07dijaam_0013fa27.pex b/scripts/qf_nq_g_07dijaam_0013fa27.pex
index 3847ece7..448f519a 100644
Binary files a/scripts/qf_nq_g_07dijaam_0013fa27.pex and b/scripts/qf_nq_g_07dijaam_0013fa27.pex differ
diff --git a/scripts/sf__00e_mq02_thevoidpuzzle_00074b00.pex b/scripts/sf__00e_mq02_thevoidpuzzle_00074b00.pex
index fa4355c5..f564a6d5 100644
Binary files a/scripts/sf__00e_mq02_thevoidpuzzle_00074b00.pex and b/scripts/sf__00e_mq02_thevoidpuzzle_00074b00.pex differ
diff --git a/scripts/sf__00e_mq03_pathofhopescene_00032e83.pex b/scripts/sf__00e_mq03_pathofhopescene_00032e83.pex
index e1c24d3e..e1af13fa 100644
Binary files a/scripts/sf__00e_mq03_pathofhopescene_00032e83.pex and b/scripts/sf__00e_mq03_pathofhopescene_00032e83.pex differ
diff --git a/scripts/sf__00e_mq03_pathofhopescene_0007c97a.pex b/scripts/sf__00e_mq03_pathofhopescene_0007c97a.pex
index 6a704499..c4250bda 100644
Binary files a/scripts/sf__00e_mq03_pathofhopescene_0007c97a.pex and b/scripts/sf__00e_mq03_pathofhopescene_0007c97a.pex differ
diff --git a/scripts/sf_bardaudiencescene01_00149596.pex b/scripts/sf_bardaudiencescene01_00149596.pex
index f2c86eb7..ef63e24f 100644
Binary files a/scripts/sf_bardaudiencescene01_00149596.pex and b/scripts/sf_bardaudiencescene01_00149596.pex differ
diff --git a/scripts/sf_bardaudiencescene02_00149597.pex b/scripts/sf_bardaudiencescene02_00149597.pex
index ce8a1e36..f259c5e6 100644
Binary files a/scripts/sf_bardaudiencescene02_00149597.pex and b/scripts/sf_bardaudiencescene02_00149597.pex differ
diff --git a/scripts/sf_cqc01_sc01_caliacuratoriu_0013d0d9.pex b/scripts/sf_cqc01_sc01_caliacuratoriu_0013d0d9.pex
index a5fda932..e54ccc5f 100644
Binary files a/scripts/sf_cqc01_sc01_caliacuratoriu_0013d0d9.pex and b/scripts/sf_cqc01_sc01_caliacuratoriu_0013d0d9.pex differ
diff --git a/scripts/sf_cqc05_sc01_caliaromance01_00140073.pex b/scripts/sf_cqc05_sc01_caliaromance01_00140073.pex
index 93eee897..14baa193 100644
Binary files a/scripts/sf_cqc05_sc01_caliaromance01_00140073.pex and b/scripts/sf_cqc05_sc01_caliaromance01_00140073.pex differ
diff --git a/scripts/sf_cqc06_sc02_room_001417b9.pex b/scripts/sf_cqc06_sc02_room_001417b9.pex
index d21289c3..80f2dfb3 100644
Binary files a/scripts/sf_cqc06_sc02_room_001417b9.pex and b/scripts/sf_cqc06_sc02_room_001417b9.pex differ
diff --git a/scripts/sf_cqj02_sc03_lysia_02_0013c96b.pex b/scripts/sf_cqj02_sc03_lysia_02_0013c96b.pex
index 57d106d6..e9ce48d8 100644
Binary files a/scripts/sf_cqj02_sc03_lysia_02_0013c96b.pex and b/scripts/sf_cqj02_sc03_lysia_02_0013c96b.pex differ
diff --git a/scripts/sf_environmentscene02_magist_0014861a.pex b/scripts/sf_environmentscene02_magist_0014861a.pex
index 49169df1..a39c5d13 100644
Binary files a/scripts/sf_environmentscene02_magist_0014861a.pex and b/scripts/sf_environmentscene02_magist_0014861a.pex differ
diff --git a/scripts/sf_environmentscene03_interl_0014862d.pex b/scripts/sf_environmentscene03_interl_0014862d.pex
index fb817d93..7e21c150 100644
Binary files a/scripts/sf_environmentscene03_interl_0014862d.pex and b/scripts/sf_environmentscene03_interl_0014862d.pex differ
diff --git a/scripts/sf_environmentscene03_interl_0014862e.pex b/scripts/sf_environmentscene03_interl_0014862e.pex
index 9dc3e46f..d512f57b 100644
Binary files a/scripts/sf_environmentscene03_interl_0014862e.pex and b/scripts/sf_environmentscene03_interl_0014862e.pex differ
diff --git a/scripts/sf_environmentscene03_sc_0014862a.pex b/scripts/sf_environmentscene03_sc_0014862a.pex
index 35b82e4c..eeadd4c5 100644
Binary files a/scripts/sf_environmentscene03_sc_0014862a.pex and b/scripts/sf_environmentscene03_sc_0014862a.pex differ
diff --git a/scripts/sf_environmentscene04_sc01_0014864a.pex b/scripts/sf_environmentscene04_sc01_0014864a.pex
index 4b109a28..a1872298 100644
Binary files a/scripts/sf_environmentscene04_sc01_0014864a.pex and b/scripts/sf_environmentscene04_sc01_0014864a.pex differ
diff --git a/scripts/sf_environmentscene05_sc_0014ce42.pex b/scripts/sf_environmentscene05_sc_0014ce42.pex
index 787f14ca..14fdcdba 100644
Binary files a/scripts/sf_environmentscene05_sc_0014ce42.pex and b/scripts/sf_environmentscene05_sc_0014ce42.pex differ
diff --git a/scripts/sf_fs_cqt01_sc01_tharaelmemo_0101ebaa.pex b/scripts/sf_fs_cqt01_sc01_tharaelmemo_0101ebaa.pex
index d2bf752f..592ac696 100644
Binary files a/scripts/sf_fs_cqt01_sc01_tharaelmemo_0101ebaa.pex and b/scripts/sf_fs_cqt01_sc01_tharaelmemo_0101ebaa.pex differ
diff --git a/scripts/sf_fs_cqt01_sc01_tharaelmemo_0200f75c.pex b/scripts/sf_fs_cqt01_sc01_tharaelmemo_0200f75c.pex
index 2d5bec71..4d608c51 100644
Binary files a/scripts/sf_fs_cqt01_sc01_tharaelmemo_0200f75c.pex and b/scripts/sf_fs_cqt01_sc01_tharaelmemo_0200f75c.pex differ
diff --git a/scripts/sf_fs_environmentscene01_sce_0102e14b.pex b/scripts/sf_fs_environmentscene01_sce_0102e14b.pex
index 8f4a9c9b..9ce330e2 100644
Binary files a/scripts/sf_fs_environmentscene01_sce_0102e14b.pex and b/scripts/sf_fs_environmentscene01_sce_0102e14b.pex differ
diff --git a/scripts/sf_fs_environmentscene02_sce_0202e311.pex b/scripts/sf_fs_environmentscene02_sce_0202e311.pex
index f7be14e4..09f694b5 100644
Binary files a/scripts/sf_fs_environmentscene02_sce_0202e311.pex and b/scripts/sf_fs_environmentscene02_sce_0202e311.pex differ
diff --git a/scripts/sf_fs_environmentscene04_sce_0102e997.pex b/scripts/sf_fs_environmentscene04_sce_0102e997.pex
index b192e440..ce9f472c 100644
Binary files a/scripts/sf_fs_environmentscene04_sce_0102e997.pex and b/scripts/sf_fs_environmentscene04_sce_0102e997.pex differ
diff --git a/scripts/sf_fs_environmentscene06_sce_0102ef8a.pex b/scripts/sf_fs_environmentscene06_sce_0102ef8a.pex
index 9862cdca..72836acb 100644
Binary files a/scripts/sf_fs_environmentscene06_sce_0102ef8a.pex and b/scripts/sf_fs_environmentscene06_sce_0102ef8a.pex differ
diff --git a/scripts/sf_fs_mq18c_sc01_qyrasc_0101bea6.pex b/scripts/sf_fs_mq18c_sc01_qyrasc_0101bea6.pex
index 50e5e961..91fbe8c2 100644
Binary files a/scripts/sf_fs_mq18c_sc01_qyrasc_0101bea6.pex and b/scripts/sf_fs_mq18c_sc01_qyrasc_0101bea6.pex differ
diff --git a/scripts/sf_fs_nq01_sc01_expositionin_0004415d.pex b/scripts/sf_fs_nq01_sc01_expositionin_0004415d.pex
index 22336b50..321f13fc 100644
Binary files a/scripts/sf_fs_nq01_sc01_expositionin_0004415d.pex and b/scripts/sf_fs_nq01_sc01_expositionin_0004415d.pex differ
diff --git a/scripts/sf_fs_nq01_sc07_worldwalker__01007ee9.pex b/scripts/sf_fs_nq01_sc07_worldwalker__01007ee9.pex
index 6485a416..df3ee5cd 100644
Binary files a/scripts/sf_fs_nq01_sc07_worldwalker__01007ee9.pex and b/scripts/sf_fs_nq01_sc07_worldwalker__01007ee9.pex differ
diff --git a/scripts/sf_fs_nq01_sc08_qyra_01_0100a69f.pex b/scripts/sf_fs_nq01_sc08_qyra_01_0100a69f.pex
index 91e5836e..2056e256 100644
Binary files a/scripts/sf_fs_nq01_sc08_qyra_01_0100a69f.pex and b/scripts/sf_fs_nq01_sc08_qyra_01_0100a69f.pex differ
diff --git a/scripts/sf_fs_nq01_sc10_qyra_secrete_0100f745.pex b/scripts/sf_fs_nq01_sc10_qyra_secrete_0100f745.pex
index 6543aed7..86e3b205 100644
Binary files a/scripts/sf_fs_nq01_sc10_qyra_secrete_0100f745.pex and b/scripts/sf_fs_nq01_sc10_qyra_secrete_0100f745.pex differ
diff --git a/scripts/sf_fs_nq02_sc06_mitdunkan_01028e82.pex b/scripts/sf_fs_nq02_sc06_mitdunkan_01028e82.pex
index 6798e180..b928448e 100644
Binary files a/scripts/sf_fs_nq02_sc06_mitdunkan_01028e82.pex and b/scripts/sf_fs_nq02_sc06_mitdunkan_01028e82.pex differ
diff --git a/scripts/sf_fs_nq02_sc06_mitdunkan_02007f64.pex b/scripts/sf_fs_nq02_sc06_mitdunkan_02007f64.pex
index 55042842..b2de8ccd 100644
Binary files a/scripts/sf_fs_nq02_sc06_mitdunkan_02007f64.pex and b/scripts/sf_fs_nq02_sc06_mitdunkan_02007f64.pex differ
diff --git a/scripts/sf_fs_nq02_sc06_ohnedunkan_01028e81.pex b/scripts/sf_fs_nq02_sc06_ohnedunkan_01028e81.pex
index 4b813356..3b0d0285 100644
Binary files a/scripts/sf_fs_nq02_sc06_ohnedunkan_01028e81.pex and b/scripts/sf_fs_nq02_sc06_ohnedunkan_01028e81.pex differ
diff --git a/scripts/sf_fs_nq02_sc06_ohnedunkan_02007f63.pex b/scripts/sf_fs_nq02_sc06_ohnedunkan_02007f63.pex
index c41b2612..c167f442 100644
Binary files a/scripts/sf_fs_nq02_sc06_ohnedunkan_02007f63.pex and b/scripts/sf_fs_nq02_sc06_ohnedunkan_02007f63.pex differ
diff --git a/scripts/sf_fs_nq02_sc07_keller_01028e89.pex b/scripts/sf_fs_nq02_sc07_keller_01028e89.pex
index e2e7f6d4..7fa73917 100644
Binary files a/scripts/sf_fs_nq02_sc07_keller_01028e89.pex and b/scripts/sf_fs_nq02_sc07_keller_01028e89.pex differ
diff --git a/scripts/sf_fs_nq02_sc09_aftervision_01028f7c.pex b/scripts/sf_fs_nq02_sc09_aftervision_01028f7c.pex
index 3eabd909..19b2a816 100644
Binary files a/scripts/sf_fs_nq02_sc09_aftervision_01028f7c.pex and b/scripts/sf_fs_nq02_sc09_aftervision_01028f7c.pex differ
diff --git a/scripts/sf_fs_nq02_sc14_well_010298f7.pex b/scripts/sf_fs_nq02_sc14_well_010298f7.pex
index 3af0b802..5e1d551d 100644
Binary files a/scripts/sf_fs_nq02_sc14_well_010298f7.pex and b/scripts/sf_fs_nq02_sc14_well_010298f7.pex differ
diff --git a/scripts/sf_fs_nq02_sc14_well_02006b69.pex b/scripts/sf_fs_nq02_sc14_well_02006b69.pex
index 68863656..ae7cfde9 100644
Binary files a/scripts/sf_fs_nq02_sc14_well_02006b69.pex and b/scripts/sf_fs_nq02_sc14_well_02006b69.pex differ
diff --git a/scripts/sf_fs_nq02_sc16_duenenhaim_01029938.pex b/scripts/sf_fs_nq02_sc16_duenenhaim_01029938.pex
index 0af6168e..294dc074 100644
Binary files a/scripts/sf_fs_nq02_sc16_duenenhaim_01029938.pex and b/scripts/sf_fs_nq02_sc16_duenenhaim_01029938.pex differ
diff --git a/scripts/sf_fs_nq02_sc16_duenenhaim_0200e2ca.pex b/scripts/sf_fs_nq02_sc16_duenenhaim_0200e2ca.pex
index b85d9b5f..a6c7a888 100644
Binary files a/scripts/sf_fs_nq02_sc16_duenenhaim_0200e2ca.pex and b/scripts/sf_fs_nq02_sc16_duenenhaim_0200e2ca.pex differ
diff --git a/scripts/sf_fs_nq02_sc17_ishmartep_01029955.pex b/scripts/sf_fs_nq02_sc17_ishmartep_01029955.pex
index 656b5058..744f950a 100644
Binary files a/scripts/sf_fs_nq02_sc17_ishmartep_01029955.pex and b/scripts/sf_fs_nq02_sc17_ishmartep_01029955.pex differ
diff --git a/scripts/sf_fs_nq02_sc17_ishmartep_02010aca.pex b/scripts/sf_fs_nq02_sc17_ishmartep_02010aca.pex
index 7d273131..761b1ee2 100644
Binary files a/scripts/sf_fs_nq02_sc17_ishmartep_02010aca.pex and b/scripts/sf_fs_nq02_sc17_ishmartep_02010aca.pex differ
diff --git a/scripts/sf_fs_nq02_sc18_vision_01029957.pex b/scripts/sf_fs_nq02_sc18_vision_01029957.pex
index 73a052e7..adb1c62f 100644
Binary files a/scripts/sf_fs_nq02_sc18_vision_01029957.pex and b/scripts/sf_fs_nq02_sc18_vision_01029957.pex differ
diff --git a/scripts/sf_fs_nq02_sc19_aftervision_01029b23.pex b/scripts/sf_fs_nq02_sc19_aftervision_01029b23.pex
index 4db2d641..a4e7a938 100644
Binary files a/scripts/sf_fs_nq02_sc19_aftervision_01029b23.pex and b/scripts/sf_fs_nq02_sc19_aftervision_01029b23.pex differ
diff --git a/scripts/sf_fs_nq02_sc19_aftervision_02011e00.pex b/scripts/sf_fs_nq02_sc19_aftervision_02011e00.pex
index ef577925..d0c660e2 100644
Binary files a/scripts/sf_fs_nq02_sc19_aftervision_02011e00.pex and b/scripts/sf_fs_nq02_sc19_aftervision_02011e00.pex differ
diff --git a/scripts/sf_fs_nq02_sc21_epilog_01029b5c.pex b/scripts/sf_fs_nq02_sc21_epilog_01029b5c.pex
index b9be4093..65e120a5 100644
Binary files a/scripts/sf_fs_nq02_sc21_epilog_01029b5c.pex and b/scripts/sf_fs_nq02_sc21_epilog_01029b5c.pex differ
diff --git a/scripts/sf_fs_nq02_sc21_epilog_020159d3.pex b/scripts/sf_fs_nq02_sc21_epilog_020159d3.pex
index 2658d6d6..6a8b5ccf 100644
Binary files a/scripts/sf_fs_nq02_sc21_epilog_020159d3.pex and b/scripts/sf_fs_nq02_sc21_epilog_020159d3.pex differ
diff --git a/scripts/sf_fs_nq03_sc02_prevision_0102aa42.pex b/scripts/sf_fs_nq03_sc02_prevision_0102aa42.pex
index 7c07d59c..dc64ad4a 100644
Binary files a/scripts/sf_fs_nq03_sc02_prevision_0102aa42.pex and b/scripts/sf_fs_nq03_sc02_prevision_0102aa42.pex differ
diff --git a/scripts/sf_fs_nq03_sc13_commenthideo_0102ae12.pex b/scripts/sf_fs_nq03_sc13_commenthideo_0102ae12.pex
index 6f017d04..27502867 100644
Binary files a/scripts/sf_fs_nq03_sc13_commenthideo_0102ae12.pex and b/scripts/sf_fs_nq03_sc13_commenthideo_0102ae12.pex differ
diff --git a/scripts/sf_fs_nq03_sc17_commentlette_0102b3c6.pex b/scripts/sf_fs_nq03_sc17_commentlette_0102b3c6.pex
index 4aea7661..9b1fcc5e 100644
Binary files a/scripts/sf_fs_nq03_sc17_commentlette_0102b3c6.pex and b/scripts/sf_fs_nq03_sc17_commentlette_0102b3c6.pex differ
diff --git a/scripts/sf_fs_nq03_sc18_tavernforceg_0102b8eb.pex b/scripts/sf_fs_nq03_sc18_tavernforceg_0102b8eb.pex
index 3e1fce27..796348c7 100644
Binary files a/scripts/sf_fs_nq03_sc18_tavernforceg_0102b8eb.pex and b/scripts/sf_fs_nq03_sc18_tavernforceg_0102b8eb.pex differ
diff --git a/scripts/sf_fs_nq03_sc19_garrecappear_0102b8f4.pex b/scripts/sf_fs_nq03_sc19_garrecappear_0102b8f4.pex
index 3eef652d..76f0fc5c 100644
Binary files a/scripts/sf_fs_nq03_sc19_garrecappear_0102b8f4.pex and b/scripts/sf_fs_nq03_sc19_garrecappear_0102b8f4.pex differ
diff --git a/scripts/sf_fs_nq03_sc20_taverntalk_0102b901.pex b/scripts/sf_fs_nq03_sc20_taverntalk_0102b901.pex
index 84773a75..686bc499 100644
Binary files a/scripts/sf_fs_nq03_sc20_taverntalk_0102b901.pex and b/scripts/sf_fs_nq03_sc20_taverntalk_0102b901.pex differ
diff --git a/scripts/sf_fs_nq03_sc21_lisharimurde_0102b915.pex b/scripts/sf_fs_nq03_sc21_lisharimurde_0102b915.pex
index a4fd6d0f..6e9fcda6 100644
Binary files a/scripts/sf_fs_nq03_sc21_lisharimurde_0102b915.pex and b/scripts/sf_fs_nq03_sc21_lisharimurde_0102b915.pex differ
diff --git a/scripts/sf_fs_nq03_sc22_epilog_0102b921.pex b/scripts/sf_fs_nq03_sc22_epilog_0102b921.pex
index 3dd14ed7..fb122158 100644
Binary files a/scripts/sf_fs_nq03_sc22_epilog_0102b921.pex and b/scripts/sf_fs_nq03_sc22_epilog_0102b921.pex differ
diff --git a/scripts/sf_fs_nq07_sc01_tavern_0101ecd9.pex b/scripts/sf_fs_nq07_sc01_tavern_0101ecd9.pex
index 794aadb1..f520a95e 100644
Binary files a/scripts/sf_fs_nq07_sc01_tavern_0101ecd9.pex and b/scripts/sf_fs_nq07_sc01_tavern_0101ecd9.pex differ
diff --git a/scripts/sf_fs_nq07_sc05_manfredseele_01024b61.pex b/scripts/sf_fs_nq07_sc05_manfredseele_01024b61.pex
index 9cd037fe..e408dd45 100644
Binary files a/scripts/sf_fs_nq07_sc05_manfredseele_01024b61.pex and b/scripts/sf_fs_nq07_sc05_manfredseele_01024b61.pex differ
diff --git a/scripts/sf_fs_nqr02_sc02_meetingqali_0101c6c5.pex b/scripts/sf_fs_nqr02_sc02_meetingqali_0101c6c5.pex
index 9684cae9..bb291d3d 100644
Binary files a/scripts/sf_fs_nqr02_sc02_meetingqali_0101c6c5.pex and b/scripts/sf_fs_nqr02_sc02_meetingqali_0101c6c5.pex differ
diff --git a/scripts/sf_fs_nqr02_sc03_qalianleads_0101c6dc.pex b/scripts/sf_fs_nqr02_sc03_qalianleads_0101c6dc.pex
index ffec9cdd..f708f253 100644
Binary files a/scripts/sf_fs_nqr02_sc03_qalianleads_0101c6dc.pex and b/scripts/sf_fs_nqr02_sc03_qalianleads_0101c6dc.pex differ
diff --git a/scripts/sf_fs_nqr02_sc04_tarpit_0101c6f2.pex b/scripts/sf_fs_nqr02_sc04_tarpit_0101c6f2.pex
index 1d4d5a8a..bcbab9f4 100644
Binary files a/scripts/sf_fs_nqr02_sc04_tarpit_0101c6f2.pex and b/scripts/sf_fs_nqr02_sc04_tarpit_0101c6f2.pex differ
diff --git a/scripts/sf_fs_nqr02_sc05_corpsedisco_0101c709.pex b/scripts/sf_fs_nqr02_sc05_corpsedisco_0101c709.pex
index c2de3dba..52d2d442 100644
Binary files a/scripts/sf_fs_nqr02_sc05_corpsedisco_0101c709.pex and b/scripts/sf_fs_nqr02_sc05_corpsedisco_0101c709.pex differ
diff --git a/scripts/sf_fs_nqr02_sc06_qalianconfr_0101c72e.pex b/scripts/sf_fs_nqr02_sc06_qalianconfr_0101c72e.pex
index 251f0d41..75e3ccd5 100644
Binary files a/scripts/sf_fs_nqr02_sc06_qalianconfr_0101c72e.pex and b/scripts/sf_fs_nqr02_sc06_qalianconfr_0101c72e.pex differ
diff --git a/scripts/sf_fs_nqr03_sc02_templescene_0101c90c.pex b/scripts/sf_fs_nqr03_sc02_templescene_0101c90c.pex
index b761dd3d..d4dfe447 100644
Binary files a/scripts/sf_fs_nqr03_sc02_templescene_0101c90c.pex and b/scripts/sf_fs_nqr03_sc02_templescene_0101c90c.pex differ
diff --git a/scripts/sf_fs_nqr03_sc02_templescene_0200301d.pex b/scripts/sf_fs_nqr03_sc02_templescene_0200301d.pex
index b528eba3..7026348b 100644
Binary files a/scripts/sf_fs_nqr03_sc02_templescene_0200301d.pex and b/scripts/sf_fs_nqr03_sc02_templescene_0200301d.pex differ
diff --git a/scripts/sf_fs_nqr03_sc04_templescene_0101cae1.pex b/scripts/sf_fs_nqr03_sc04_templescene_0101cae1.pex
index 9343125e..67416ded 100644
Binary files a/scripts/sf_fs_nqr03_sc04_templescene_0101cae1.pex and b/scripts/sf_fs_nqr03_sc04_templescene_0101cae1.pex differ
diff --git a/scripts/sf_fs_nqr03_sc04_templescene_0200bc5c.pex b/scripts/sf_fs_nqr03_sc04_templescene_0200bc5c.pex
index dc114133..89aa6a37 100644
Binary files a/scripts/sf_fs_nqr03_sc04_templescene_0200bc5c.pex and b/scripts/sf_fs_nqr03_sc04_templescene_0200bc5c.pex differ
diff --git a/scripts/sf_fs_nqr04_sc02_tharaelzork_0101e8af.pex b/scripts/sf_fs_nqr04_sc02_tharaelzork_0101e8af.pex
index bdd3553a..ff570b78 100644
Binary files a/scripts/sf_fs_nqr04_sc02_tharaelzork_0101e8af.pex and b/scripts/sf_fs_nqr04_sc02_tharaelzork_0101e8af.pex differ
diff --git a/scripts/sf_fs_nqr04_sc03_tharaelorph_0101eb2c.pex b/scripts/sf_fs_nqr04_sc03_tharaelorph_0101eb2c.pex
index 1c0e5375..a55f16c3 100644
Binary files a/scripts/sf_fs_nqr04_sc03_tharaelorph_0101eb2c.pex and b/scripts/sf_fs_nqr04_sc03_tharaelorph_0101eb2c.pex differ
diff --git a/scripts/sf_fs_nqr04_sc03_tharaelorph_02007f46.pex b/scripts/sf_fs_nqr04_sc03_tharaelorph_02007f46.pex
index 6ed4ae02..0af59bdc 100644
Binary files a/scripts/sf_fs_nqr04_sc03_tharaelorph_02007f46.pex and b/scripts/sf_fs_nqr04_sc03_tharaelorph_02007f46.pex differ
diff --git a/scripts/sf_fs_nqr04_sc04_tharaelseiz_0101eb92.pex b/scripts/sf_fs_nqr04_sc04_tharaelseiz_0101eb92.pex
index cd529bc3..d56e33c3 100644
Binary files a/scripts/sf_fs_nqr04_sc04_tharaelseiz_0101eb92.pex and b/scripts/sf_fs_nqr04_sc04_tharaelseiz_0101eb92.pex differ
diff --git a/scripts/sf_fs_nqr04_sc05_tharaelwalk_0101eba6.pex b/scripts/sf_fs_nqr04_sc05_tharaelwalk_0101eba6.pex
index 49ea09db..dd622e4b 100644
Binary files a/scripts/sf_fs_nqr04_sc05_tharaelwalk_0101eba6.pex and b/scripts/sf_fs_nqr04_sc05_tharaelwalk_0101eba6.pex differ
diff --git a/scripts/sf_fs_nqr04_sc05_tharaelwalk_0200f74d.pex b/scripts/sf_fs_nqr04_sc05_tharaelwalk_0200f74d.pex
index 219d377b..eb9e2fb4 100644
Binary files a/scripts/sf_fs_nqr04_sc05_tharaelwalk_0200f74d.pex and b/scripts/sf_fs_nqr04_sc05_tharaelwalk_0200f74d.pex differ
diff --git a/scripts/sf_fs_nqr05_sc01_dream_0101efa4.pex b/scripts/sf_fs_nqr05_sc01_dream_0101efa4.pex
index a5ebcd35..d266b486 100644
Binary files a/scripts/sf_fs_nqr05_sc01_dream_0101efa4.pex and b/scripts/sf_fs_nqr05_sc01_dream_0101efa4.pex differ
diff --git a/scripts/sf_fs_nqr05_sc02_father_0101f00b.pex b/scripts/sf_fs_nqr05_sc02_father_0101f00b.pex
index 1ae8cdc6..e67fac7b 100644
Binary files a/scripts/sf_fs_nqr05_sc02_father_0101f00b.pex and b/scripts/sf_fs_nqr05_sc02_father_0101f00b.pex differ
diff --git a/scripts/sf_fs_nqr05_sc03_tharaelprep_0101f126.pex b/scripts/sf_fs_nqr05_sc03_tharaelprep_0101f126.pex
index d5447187..08ce8ac8 100644
Binary files a/scripts/sf_fs_nqr05_sc03_tharaelprep_0101f126.pex and b/scripts/sf_fs_nqr05_sc03_tharaelprep_0101f126.pex differ
diff --git a/scripts/sf_fs_nqr05_sc04_gatescene_0101f229.pex b/scripts/sf_fs_nqr05_sc04_gatescene_0101f229.pex
index 531e60a7..dfa4ca22 100644
Binary files a/scripts/sf_fs_nqr05_sc04_gatescene_0101f229.pex and b/scripts/sf_fs_nqr05_sc04_gatescene_0101f229.pex differ
diff --git a/scripts/sf_fs_nqr05_sc05_zaraah_0101f23a.pex b/scripts/sf_fs_nqr05_sc05_zaraah_0101f23a.pex
index ff886c57..de5cbe6d 100644
Binary files a/scripts/sf_fs_nqr05_sc05_zaraah_0101f23a.pex and b/scripts/sf_fs_nqr05_sc05_zaraah_0101f23a.pex differ
diff --git a/scripts/sf_fs_nqr05_sc06_fatherarriv_0101f27a.pex b/scripts/sf_fs_nqr05_sc06_fatherarriv_0101f27a.pex
index 901b5bd3..9d3f5f14 100644
Binary files a/scripts/sf_fs_nqr05_sc06_fatherarriv_0101f27a.pex and b/scripts/sf_fs_nqr05_sc06_fatherarriv_0101f27a.pex differ
diff --git a/scripts/sf_fs_nqr05_sc07_fatherplann_0101fdec.pex b/scripts/sf_fs_nqr05_sc07_fatherplann_0101fdec.pex
index aceeb2bf..d6ee1466 100644
Binary files a/scripts/sf_fs_nqr05_sc07_fatherplann_0101fdec.pex and b/scripts/sf_fs_nqr05_sc07_fatherplann_0101fdec.pex differ
diff --git a/scripts/sf_fs_nqr05_sc08_preparation_0101fe00.pex b/scripts/sf_fs_nqr05_sc08_preparation_0101fe00.pex
index d7c5ce10..ced51478 100644
Binary files a/scripts/sf_fs_nqr05_sc08_preparation_0101fe00.pex and b/scripts/sf_fs_nqr05_sc08_preparation_0101fe00.pex differ
diff --git a/scripts/sf_fs_nqr05_sc09_enterscene_0101fe3f.pex b/scripts/sf_fs_nqr05_sc09_enterscene_0101fe3f.pex
index b6fcf9f8..4c2b8272 100644
Binary files a/scripts/sf_fs_nqr05_sc09_enterscene_0101fe3f.pex and b/scripts/sf_fs_nqr05_sc09_enterscene_0101fe3f.pex differ
diff --git a/scripts/sf_fs_nqr05_sc11_entrancesce_010240a7.pex b/scripts/sf_fs_nqr05_sc11_entrancesce_010240a7.pex
index d2ad3dbc..3460130d 100644
Binary files a/scripts/sf_fs_nqr05_sc11_entrancesce_010240a7.pex and b/scripts/sf_fs_nqr05_sc11_entrancesce_010240a7.pex differ
diff --git a/scripts/sf_fs_nqr05_sc12_temple_01_01024145.pex b/scripts/sf_fs_nqr05_sc12_temple_01_01024145.pex
index 72556639..c0c9adeb 100644
Binary files a/scripts/sf_fs_nqr05_sc12_temple_01_01024145.pex and b/scripts/sf_fs_nqr05_sc12_temple_01_01024145.pex differ
diff --git a/scripts/sf_fs_nqr05_sc13_temple_02_01024158.pex b/scripts/sf_fs_nqr05_sc13_temple_02_01024158.pex
index 85d22719..8bf9f9c2 100644
Binary files a/scripts/sf_fs_nqr05_sc13_temple_02_01024158.pex and b/scripts/sf_fs_nqr05_sc13_temple_02_01024158.pex differ
diff --git a/scripts/sf_fs_nqr05_sc14_temple_03_01024bf7.pex b/scripts/sf_fs_nqr05_sc14_temple_03_01024bf7.pex
index 0798a87e..34231e56 100644
Binary files a/scripts/sf_fs_nqr05_sc14_temple_03_01024bf7.pex and b/scripts/sf_fs_nqr05_sc14_temple_03_01024bf7.pex differ
diff --git a/scripts/sf_fs_nqr05_sc15_temple_04_01024c09.pex b/scripts/sf_fs_nqr05_sc15_temple_04_01024c09.pex
index 99624819..33c81225 100644
Binary files a/scripts/sf_fs_nqr05_sc15_temple_04_01024c09.pex and b/scripts/sf_fs_nqr05_sc15_temple_04_01024c09.pex differ
diff --git a/scripts/sf_fs_nqr05_sc16_temple_05_01024c1a.pex b/scripts/sf_fs_nqr05_sc16_temple_05_01024c1a.pex
index 9b6b317e..d8704d29 100644
Binary files a/scripts/sf_fs_nqr05_sc16_temple_05_01024c1a.pex and b/scripts/sf_fs_nqr05_sc16_temple_05_01024c1a.pex differ
diff --git a/scripts/sf_fs_nqr05_sc17_afterbossfi_01029a2d.pex b/scripts/sf_fs_nqr05_sc17_afterbossfi_01029a2d.pex
index 83b5f086..26648854 100644
Binary files a/scripts/sf_fs_nqr05_sc17_afterbossfi_01029a2d.pex and b/scripts/sf_fs_nqr05_sc17_afterbossfi_01029a2d.pex differ
diff --git a/scripts/sf_fs_nqr05_sc18a_mistrusthi_0102a05f.pex b/scripts/sf_fs_nqr05_sc18a_mistrusthi_0102a05f.pex
index bfdc009b..c16e3b8a 100644
Binary files a/scripts/sf_fs_nqr05_sc18a_mistrusthi_0102a05f.pex and b/scripts/sf_fs_nqr05_sc18a_mistrusthi_0102a05f.pex differ
diff --git a/scripts/sf_fs_nqr05_sc18b_mistrustlo_0102a060.pex b/scripts/sf_fs_nqr05_sc18b_mistrustlo_0102a060.pex
index e4b4a165..a038c51c 100644
Binary files a/scripts/sf_fs_nqr05_sc18b_mistrustlo_0102a060.pex and b/scripts/sf_fs_nqr05_sc18b_mistrustlo_0102a060.pex differ
diff --git a/scripts/sf_fs_nqr05_sc19_fatherstory_0102a070.pex b/scripts/sf_fs_nqr05_sc19_fatherstory_0102a070.pex
index 63122027..8f7f1600 100644
Binary files a/scripts/sf_fs_nqr05_sc19_fatherstory_0102a070.pex and b/scripts/sf_fs_nqr05_sc19_fatherstory_0102a070.pex differ
diff --git a/scripts/sf_fs_nqr05_sc19_fatherstory_02011a0f.pex b/scripts/sf_fs_nqr05_sc19_fatherstory_02011a0f.pex
index b1dbddd2..37c1a064 100644
Binary files a/scripts/sf_fs_nqr05_sc19_fatherstory_02011a0f.pex and b/scripts/sf_fs_nqr05_sc19_fatherstory_02011a0f.pex differ
diff --git a/scripts/sf_fs_nqr_sq_01_scene_01_0102e6ed.pex b/scripts/sf_fs_nqr_sq_01_scene_01_0102e6ed.pex
index b5f78b85..99020ae1 100644
Binary files a/scripts/sf_fs_nqr_sq_01_scene_01_0102e6ed.pex and b/scripts/sf_fs_nqr_sq_01_scene_01_0102e6ed.pex differ
diff --git a/scripts/sf_mq01_sc2_carbosstairs_0012d953.pex b/scripts/sf_mq01_sc2_carbosstairs_0012d953.pex
index d9372a96..259345ab 100644
Binary files a/scripts/sf_mq01_sc2_carbosstairs_0012d953.pex and b/scripts/sf_mq01_sc2_carbosstairs_0012d953.pex differ
diff --git a/scripts/sf_mq01_unchartedland_bandit_000824a4.pex b/scripts/sf_mq01_unchartedland_bandit_000824a4.pex
index 54070338..c4d6340c 100644
Binary files a/scripts/sf_mq01_unchartedland_bandit_000824a4.pex and b/scripts/sf_mq01_unchartedland_bandit_000824a4.pex differ
diff --git a/scripts/sf_mq02_sc1_jespardialogeint_000c5658.pex b/scripts/sf_mq02_sc1_jespardialogeint_000c5658.pex
index 7a6963c2..5862cded 100644
Binary files a/scripts/sf_mq02_sc1_jespardialogeint_000c5658.pex and b/scripts/sf_mq02_sc1_jespardialogeint_000c5658.pex differ
diff --git a/scripts/sf_mq03_sc2_playermeetskonst_000cc95f.pex b/scripts/sf_mq03_sc2_playermeetskonst_000cc95f.pex
index 8748075f..6e113c41 100644
Binary files a/scripts/sf_mq03_sc2_playermeetskonst_000cc95f.pex and b/scripts/sf_mq03_sc2_playermeetskonst_000cc95f.pex differ
diff --git a/scripts/sf_mq03_sc3_playermeetskonst_000cc957.pex b/scripts/sf_mq03_sc3_playermeetskonst_000cc957.pex
index 206af77b..62c2391b 100644
Binary files a/scripts/sf_mq03_sc3_playermeetskonst_000cc957.pex and b/scripts/sf_mq03_sc3_playermeetskonst_000cc957.pex differ
diff --git a/scripts/sf_mq04_sc1_lishariappears_0009fcc0.pex b/scripts/sf_mq04_sc1_lishariappears_0009fcc0.pex
index b6e37fd6..3671d239 100644
Binary files a/scripts/sf_mq04_sc1_lishariappears_0009fcc0.pex and b/scripts/sf_mq04_sc1_lishariappears_0009fcc0.pex differ
diff --git a/scripts/sf_mq05prologue_sc2_000ce2dd.pex b/scripts/sf_mq05prologue_sc2_000ce2dd.pex
index 1cbe84d5..4d0a4380 100644
Binary files a/scripts/sf_mq05prologue_sc2_000ce2dd.pex and b/scripts/sf_mq05prologue_sc2_000ce2dd.pex differ
diff --git a/scripts/sf_mq06_sc2_playerwakesupdup_000d8e9e.pex b/scripts/sf_mq06_sc2_playerwakesupdup_000d8e9e.pex
index 2a719b4a..534ed94a 100644
Binary files a/scripts/sf_mq06_sc2_playerwakesupdup_000d8e9e.pex and b/scripts/sf_mq06_sc2_playerwakesupdup_000d8e9e.pex differ
diff --git a/scripts/sf_mq06_sc3_caliashowsplayer_000d8ec4.pex b/scripts/sf_mq06_sc3_caliashowsplayer_000d8ec4.pex
index ad76c8fa..4a5f5715 100644
Binary files a/scripts/sf_mq06_sc3_caliashowsplayer_000d8ec4.pex and b/scripts/sf_mq06_sc3_caliashowsplayer_000d8ec4.pex differ
diff --git a/scripts/sf_mq06_sc5_ritualscene_000fe207.pex b/scripts/sf_mq06_sc5_ritualscene_000fe207.pex
index 897dad30..14e6c945 100644
Binary files a/scripts/sf_mq06_sc5_ritualscene_000fe207.pex and b/scripts/sf_mq06_sc5_ritualscene_000fe207.pex differ
diff --git a/scripts/sf_mq07a_sc10_magekillspyrea_0010a6f1.pex b/scripts/sf_mq07a_sc10_magekillspyrea_0010a6f1.pex
index 0a9b9914..1fb87729 100644
Binary files a/scripts/sf_mq07a_sc10_magekillspyrea_0010a6f1.pex and b/scripts/sf_mq07a_sc10_magekillspyrea_0010a6f1.pex differ
diff --git a/scripts/sf_mq07a_sc12_jesparfinaldia_0010a751.pex b/scripts/sf_mq07a_sc12_jesparfinaldia_0010a751.pex
index f12d6fdd..d18dd08f 100644
Binary files a/scripts/sf_mq07a_sc12_jesparfinaldia_0010a751.pex and b/scripts/sf_mq07a_sc12_jesparfinaldia_0010a751.pex differ
diff --git a/scripts/sf_mq07a_sc14_sigilstoneacti_0010a76f.pex b/scripts/sf_mq07a_sc14_sigilstoneacti_0010a76f.pex
index c04a7f54..3e9bd670 100644
Binary files a/scripts/sf_mq07a_sc14_sigilstoneacti_0010a76f.pex and b/scripts/sf_mq07a_sc14_sigilstoneacti_0010a76f.pex differ
diff --git a/scripts/sf_mq07a_sc1_explanationinch_001065b8.pex b/scripts/sf_mq07a_sc1_explanationinch_001065b8.pex
index 3ece447e..9d66fcbd 100644
Binary files a/scripts/sf_mq07a_sc1_explanationinch_001065b8.pex and b/scripts/sf_mq07a_sc1_explanationinch_001065b8.pex differ
diff --git a/scripts/sf_mq07a_sc6_doorstep_001067ca.pex b/scripts/sf_mq07a_sc6_doorstep_001067ca.pex
index 017be043..67601bd0 100644
Binary files a/scripts/sf_mq07a_sc6_doorstep_001067ca.pex and b/scripts/sf_mq07a_sc6_doorstep_001067ca.pex differ
diff --git a/scripts/sf_mq07a_sc8_playerreadscrol_0010a69c.pex b/scripts/sf_mq07a_sc8_playerreadscrol_0010a69c.pex
index 45256ac3..63a59e9b 100644
Binary files a/scripts/sf_mq07a_sc8_playerreadscrol_0010a69c.pex and b/scripts/sf_mq07a_sc8_playerreadscrol_0010a69c.pex differ
diff --git a/scripts/sf_mq07a_sc9_battle_0010a6ae.pex b/scripts/sf_mq07a_sc9_battle_0010a6ae.pex
index 0fb6de08..653c9924 100644
Binary files a/scripts/sf_mq07a_sc9_battle_0010a6ae.pex and b/scripts/sf_mq07a_sc9_battle_0010a6ae.pex differ
diff --git a/scripts/sf_mq07b_deusexmachina_karek_000a94e0.pex b/scripts/sf_mq07b_deusexmachina_karek_000a94e0.pex
index a524ad34..e3da4e6b 100644
Binary files a/scripts/sf_mq07b_deusexmachina_karek_000a94e0.pex and b/scripts/sf_mq07b_deusexmachina_karek_000a94e0.pex differ
diff --git a/scripts/sf_mq07b_deusexmachina_scene_000a91eb.pex b/scripts/sf_mq07b_deusexmachina_scene_000a91eb.pex
index 364fe7b3..9a60e0f7 100644
Binary files a/scripts/sf_mq07b_deusexmachina_scene_000a91eb.pex and b/scripts/sf_mq07b_deusexmachina_scene_000a91eb.pex differ
diff --git a/scripts/sf_mq07b_deusexmachina_scene_000a9aba.pex b/scripts/sf_mq07b_deusexmachina_scene_000a9aba.pex
index 875c2700..3570b492 100644
Binary files a/scripts/sf_mq07b_deusexmachina_scene_000a9aba.pex and b/scripts/sf_mq07b_deusexmachina_scene_000a9aba.pex differ
diff --git a/scripts/sf_mq08_intothedeep_gototrai_000d0edc.pex b/scripts/sf_mq08_intothedeep_gototrai_000d0edc.pex
index bd7248f1..2ba66526 100644
Binary files a/scripts/sf_mq08_intothedeep_gototrai_000d0edc.pex and b/scripts/sf_mq08_intothedeep_gototrai_000d0edc.pex differ
diff --git a/scripts/sf_mq08_intothedeep_gototrai_000e1a12.pex b/scripts/sf_mq08_intothedeep_gototrai_000e1a12.pex
index d0950bf5..88f49e0a 100644
Binary files a/scripts/sf_mq08_intothedeep_gototrai_000e1a12.pex and b/scripts/sf_mq08_intothedeep_gototrai_000e1a12.pex differ
diff --git a/scripts/sf_mq08_intothedeep_gototrai_000ea944.pex b/scripts/sf_mq08_intothedeep_gototrai_000ea944.pex
index 90593360..047e65cf 100644
Binary files a/scripts/sf_mq08_intothedeep_gototrai_000ea944.pex and b/scripts/sf_mq08_intothedeep_gototrai_000ea944.pex differ
diff --git a/scripts/sf_mq08_intothedeep_nebelhai_000a85bf.pex b/scripts/sf_mq08_intothedeep_nebelhai_000a85bf.pex
index 3c579ee9..c11081d6 100644
Binary files a/scripts/sf_mq08_intothedeep_nebelhai_000a85bf.pex and b/scripts/sf_mq08_intothedeep_nebelhai_000a85bf.pex differ
diff --git a/scripts/sf_mq08_intothedeep_scenetem_000d0eaa.pex b/scripts/sf_mq08_intothedeep_scenetem_000d0eaa.pex
index 942e0ecc..e6eee4fb 100644
Binary files a/scripts/sf_mq08_intothedeep_scenetem_000d0eaa.pex and b/scripts/sf_mq08_intothedeep_scenetem_000d0eaa.pex differ
diff --git a/scripts/sf_mq08prologue_sc1_discussi_0010d1a1.pex b/scripts/sf_mq08prologue_sc1_discussi_0010d1a1.pex
index 69abaccd..0fc15f39 100644
Binary files a/scripts/sf_mq08prologue_sc1_discussi_0010d1a1.pex and b/scripts/sf_mq08prologue_sc1_discussi_0010d1a1.pex differ
diff --git a/scripts/sf_mq09_d1_sceneisle_000ea957.pex b/scripts/sf_mq09_d1_sceneisle_000ea957.pex
index 4778db82..16674c5e 100644
Binary files a/scripts/sf_mq09_d1_sceneisle_000ea957.pex and b/scripts/sf_mq09_d1_sceneisle_000ea957.pex differ
diff --git a/scripts/sf_mq09_d3_hohescene_000eaa5f.pex b/scripts/sf_mq09_d3_hohescene_000eaa5f.pex
index 550b1f2d..96f71337 100644
Binary files a/scripts/sf_mq09_d3_hohescene_000eaa5f.pex and b/scripts/sf_mq09_d3_hohescene_000eaa5f.pex differ
diff --git a/scripts/sf_mq09_d4_taranorscene_000eac86.pex b/scripts/sf_mq09_d4_taranorscene_000eac86.pex
index 0c13ab11..1f20952f 100644
Binary files a/scripts/sf_mq09_d4_taranorscene_000eac86.pex and b/scripts/sf_mq09_d4_taranorscene_000eac86.pex differ
diff --git a/scripts/sf_mq09_d6_scene_000eac9d.pex b/scripts/sf_mq09_d6_scene_000eac9d.pex
index 2c225c3d..85c379df 100644
Binary files a/scripts/sf_mq09_d6_scene_000eac9d.pex and b/scripts/sf_mq09_d6_scene_000eac9d.pex differ
diff --git a/scripts/sf_mq10b_sc2_temple_001080c3.pex b/scripts/sf_mq10b_sc2_temple_001080c3.pex
index f937838a..059767fe 100644
Binary files a/scripts/sf_mq10b_sc2_temple_001080c3.pex and b/scripts/sf_mq10b_sc2_temple_001080c3.pex differ
diff --git a/scripts/sf_mq10b_sc3_lisharidead_0010bbbb.pex b/scripts/sf_mq10b_sc3_lisharidead_0010bbbb.pex
index 890fe400..41f951ef 100644
Binary files a/scripts/sf_mq10b_sc3_lisharidead_0010bbbb.pex and b/scripts/sf_mq10b_sc3_lisharidead_0010bbbb.pex differ
diff --git a/scripts/sf_mq10b_sc4_tealor_0010bbba.pex b/scripts/sf_mq10b_sc4_tealor_0010bbba.pex
index 857ad5e4..7e5f3c66 100644
Binary files a/scripts/sf_mq10b_sc4_tealor_0010bbba.pex and b/scripts/sf_mq10b_sc4_tealor_0010bbba.pex differ
diff --git a/scripts/sf_mq11a_sc05_calianorthwind_000de74c.pex b/scripts/sf_mq11a_sc05_calianorthwind_000de74c.pex
index a0a68ba4..3bb62d27 100644
Binary files a/scripts/sf_mq11a_sc05_calianorthwind_000de74c.pex and b/scripts/sf_mq11a_sc05_calianorthwind_000de74c.pex differ
diff --git a/scripts/sf_mq11a_sc20_libraryscene_000eaeb0.pex b/scripts/sf_mq11a_sc20_libraryscene_000eaeb0.pex
index 19322951..22afa57e 100644
Binary files a/scripts/sf_mq11a_sc20_libraryscene_000eaeb0.pex and b/scripts/sf_mq11a_sc20_libraryscene_000eaeb0.pex differ
diff --git a/scripts/sf_mq11a_sc2_caliafrostcliff_000dd756.pex b/scripts/sf_mq11a_sc2_caliafrostcliff_000dd756.pex
index 4ed27e25..27cad651 100644
Binary files a/scripts/sf_mq11a_sc2_caliafrostcliff_000dd756.pex and b/scripts/sf_mq11a_sc2_caliafrostcliff_000dd756.pex differ
diff --git a/scripts/sf_mq11b_s1_house_00110655.pex b/scripts/sf_mq11b_s1_house_00110655.pex
index cc5e47f6..4660bd54 100644
Binary files a/scripts/sf_mq11b_s1_house_00110655.pex and b/scripts/sf_mq11b_s1_house_00110655.pex differ
diff --git a/scripts/sf_mq11b_sc03_interrupt_00145912.pex b/scripts/sf_mq11b_sc03_interrupt_00145912.pex
index b982435d..02910d59 100644
Binary files a/scripts/sf_mq11b_sc03_interrupt_00145912.pex and b/scripts/sf_mq11b_sc03_interrupt_00145912.pex differ
diff --git a/scripts/sf_mq11b_sc04_adilacombat_001458fe.pex b/scripts/sf_mq11b_sc04_adilacombat_001458fe.pex
index 3acba697..5e2b34c4 100644
Binary files a/scripts/sf_mq11b_sc04_adilacombat_001458fe.pex and b/scripts/sf_mq11b_sc04_adilacombat_001458fe.pex differ
diff --git a/scripts/sf_mq11b_sc06_jesparfinal_0014590e.pex b/scripts/sf_mq11b_sc06_jesparfinal_0014590e.pex
index 59301dc6..d0259a2e 100644
Binary files a/scripts/sf_mq11b_sc06_jesparfinal_0014590e.pex and b/scripts/sf_mq11b_sc06_jesparfinal_0014590e.pex differ
diff --git a/scripts/sf_mq11b_sc2_00117933.pex b/scripts/sf_mq11b_sc2_00117933.pex
index 5cdd273d..9e494587 100644
Binary files a/scripts/sf_mq11b_sc2_00117933.pex and b/scripts/sf_mq11b_sc2_00117933.pex differ
diff --git a/scripts/sf_mq11c_sc10_ryneustransfor_00092a97.pex b/scripts/sf_mq11c_sc10_ryneustransfor_00092a97.pex
index 8f1d4a82..56d7a45c 100644
Binary files a/scripts/sf_mq11c_sc10_ryneustransfor_00092a97.pex and b/scripts/sf_mq11c_sc10_ryneustransfor_00092a97.pex differ
diff --git a/scripts/sf_mq11c_sc3_wardenclosesgat_0008e875.pex b/scripts/sf_mq11c_sc3_wardenclosesgat_0008e875.pex
index 16e10b20..2897c74c 100644
Binary files a/scripts/sf_mq11c_sc3_wardenclosesgat_0008e875.pex and b/scripts/sf_mq11c_sc3_wardenclosesgat_0008e875.pex differ
diff --git a/scripts/sf_mq11c_sc4_dogstealspuppet_0008f72e.pex b/scripts/sf_mq11c_sc4_dogstealspuppet_0008f72e.pex
index 659014cf..f2f14e47 100644
Binary files a/scripts/sf_mq11c_sc4_dogstealspuppet_0008f72e.pex and b/scripts/sf_mq11c_sc4_dogstealspuppet_0008f72e.pex differ
diff --git a/scripts/sf_mq12a_sc3_insert3rdstone_0011b08c.pex b/scripts/sf_mq12a_sc3_insert3rdstone_0011b08c.pex
index bb758e7b..eea55268 100644
Binary files a/scripts/sf_mq12a_sc3_insert3rdstone_0011b08c.pex and b/scripts/sf_mq12a_sc3_insert3rdstone_0011b08c.pex differ
diff --git a/scripts/sf_mq12b_sc10_playerrepairsm_001291c3.pex b/scripts/sf_mq12b_sc10_playerrepairsm_001291c3.pex
index 91abb53a..be7ca06b 100644
Binary files a/scripts/sf_mq12b_sc10_playerrepairsm_001291c3.pex and b/scripts/sf_mq12b_sc10_playerrepairsm_001291c3.pex differ
diff --git a/scripts/sf_mq12b_sc11_harborgatescen_0012ee7b.pex b/scripts/sf_mq12b_sc11_harborgatescen_0012ee7b.pex
index cef20e0a..a4e8d162 100644
Binary files a/scripts/sf_mq12b_sc11_harborgatescen_0012ee7b.pex and b/scripts/sf_mq12b_sc11_harborgatescen_0012ee7b.pex differ
diff --git a/scripts/sf_mq12b_sc13_templescene_00133d20.pex b/scripts/sf_mq12b_sc13_templescene_00133d20.pex
index 56600e9c..328f4320 100644
Binary files a/scripts/sf_mq12b_sc13_templescene_00133d20.pex and b/scripts/sf_mq12b_sc13_templescene_00133d20.pex differ
diff --git a/scripts/sf_mq12b_sc14_templescene02_00133d31.pex b/scripts/sf_mq12b_sc14_templescene02_00133d31.pex
index ecf24d3d..c73a2327 100644
Binary files a/scripts/sf_mq12b_sc14_templescene02_00133d31.pex and b/scripts/sf_mq12b_sc14_templescene02_00133d31.pex differ
diff --git a/scripts/sf_mq12b_sc1_lexilexplains_0011b0a2.pex b/scripts/sf_mq12b_sc1_lexilexplains_0011b0a2.pex
index fbd1d036..bfb9ce09 100644
Binary files a/scripts/sf_mq12b_sc1_lexilexplains_0011b0a2.pex and b/scripts/sf_mq12b_sc1_lexilexplains_0011b0a2.pex differ
diff --git a/scripts/sf_mq12b_sc2_attack_0011b0ab.pex b/scripts/sf_mq12b_sc2_attack_0011b0ab.pex
index baf37e96..c10dca3a 100644
Binary files a/scripts/sf_mq12b_sc2_attack_0011b0ab.pex and b/scripts/sf_mq12b_sc2_attack_0011b0ab.pex differ
diff --git a/scripts/sf_mq12b_sc4_tealortraveltom_0011b0f9.pex b/scripts/sf_mq12b_sc4_tealortraveltom_0011b0f9.pex
index 0712c872..901ce29c 100644
Binary files a/scripts/sf_mq12b_sc4_tealortraveltom_0011b0f9.pex and b/scripts/sf_mq12b_sc4_tealortraveltom_0011b0f9.pex differ
diff --git a/scripts/sf_mq12b_sc5_tealorlowerdist_0011b190.pex b/scripts/sf_mq12b_sc5_tealorlowerdist_0011b190.pex
index b03fc168..3848e8b1 100644
Binary files a/scripts/sf_mq12b_sc5_tealorlowerdist_0011b190.pex and b/scripts/sf_mq12b_sc5_tealorlowerdist_0011b190.pex differ
diff --git a/scripts/sf_mq12b_sc7_gatediscussion_001294c1.pex b/scripts/sf_mq12b_sc7_gatediscussion_001294c1.pex
index 483b3341..13a7f5f1 100644
Binary files a/scripts/sf_mq12b_sc7_gatediscussion_001294c1.pex and b/scripts/sf_mq12b_sc7_gatediscussion_001294c1.pex differ
diff --git a/scripts/sf_mq12c_sc02_dreamgotosleep_00134594.pex b/scripts/sf_mq12c_sc02_dreamgotosleep_00134594.pex
index d20fb6a1..fcadad34 100644
Binary files a/scripts/sf_mq12c_sc02_dreamgotosleep_00134594.pex and b/scripts/sf_mq12c_sc02_dreamgotosleep_00134594.pex differ
diff --git a/scripts/sf_mq12c_sc03_dream_00134595.pex b/scripts/sf_mq12c_sc03_dream_00134595.pex
index bb295c60..217aa825 100644
Binary files a/scripts/sf_mq12c_sc03_dream_00134595.pex and b/scripts/sf_mq12c_sc03_dream_00134595.pex differ
diff --git a/scripts/sf_mq13b_sc01_arrival_01_00137f92.pex b/scripts/sf_mq13b_sc01_arrival_01_00137f92.pex
index 4cf00252..da7e7267 100644
Binary files a/scripts/sf_mq13b_sc01_arrival_01_00137f92.pex and b/scripts/sf_mq13b_sc01_arrival_01_00137f92.pex differ
diff --git a/scripts/sf_mq13b_sc03_walktocitadel_00137fcd.pex b/scripts/sf_mq13b_sc03_walktocitadel_00137fcd.pex
index e70c5956..63eac18e 100644
Binary files a/scripts/sf_mq13b_sc03_walktocitadel_00137fcd.pex and b/scripts/sf_mq13b_sc03_walktocitadel_00137fcd.pex differ
diff --git a/scripts/sf_mq13b_sc04_citadelgate_00137fda.pex b/scripts/sf_mq13b_sc04_citadelgate_00137fda.pex
index 84c29b98..54fd0cdc 100644
Binary files a/scripts/sf_mq13b_sc04_citadelgate_00137fda.pex and b/scripts/sf_mq13b_sc04_citadelgate_00137fda.pex differ
diff --git a/scripts/sf_mq13b_sc05_searchforsidee_00137fe7.pex b/scripts/sf_mq13b_sc05_searchforsidee_00137fe7.pex
index 864848e8..4ca3abeb 100644
Binary files a/scripts/sf_mq13b_sc05_searchforsidee_00137fe7.pex and b/scripts/sf_mq13b_sc05_searchforsidee_00137fe7.pex differ
diff --git a/scripts/sf_mq13b_sc06_expeditionplan_00137ffd.pex b/scripts/sf_mq13b_sc06_expeditionplan_00137ffd.pex
index 58aea783..91fc36d5 100644
Binary files a/scripts/sf_mq13b_sc06_expeditionplan_00137ffd.pex and b/scripts/sf_mq13b_sc06_expeditionplan_00137ffd.pex differ
diff --git a/scripts/sf_mq13b_sc07_nexustower_01_00138005.pex b/scripts/sf_mq13b_sc07_nexustower_01_00138005.pex
index f4464521..5311e193 100644
Binary files a/scripts/sf_mq13b_sc07_nexustower_01_00138005.pex and b/scripts/sf_mq13b_sc07_nexustower_01_00138005.pex differ
diff --git a/scripts/sf_mq13b_sc08_nexustower_02_00138006.pex b/scripts/sf_mq13b_sc08_nexustower_02_00138006.pex
index 155030b1..88a606a8 100644
Binary files a/scripts/sf_mq13b_sc08_nexustower_02_00138006.pex and b/scripts/sf_mq13b_sc08_nexustower_02_00138006.pex differ
diff --git a/scripts/sf_mq13b_sc09_nexustower_03_00138007.pex b/scripts/sf_mq13b_sc09_nexustower_03_00138007.pex
index 25bd1e06..fb3c470b 100644
Binary files a/scripts/sf_mq13b_sc09_nexustower_03_00138007.pex and b/scripts/sf_mq13b_sc09_nexustower_03_00138007.pex differ
diff --git a/scripts/sf_mq13b_sc10_nexustower_04_00138064.pex b/scripts/sf_mq13b_sc10_nexustower_04_00138064.pex
index e4ca7086..3f739289 100644
Binary files a/scripts/sf_mq13b_sc10_nexustower_04_00138064.pex and b/scripts/sf_mq13b_sc10_nexustower_04_00138064.pex differ
diff --git a/scripts/sf_mq13b_sc11_nexustower_05_0013808a.pex b/scripts/sf_mq13b_sc11_nexustower_05_0013808a.pex
index af0257a9..e9285449 100644
Binary files a/scripts/sf_mq13b_sc11_nexustower_05_0013808a.pex and b/scripts/sf_mq13b_sc11_nexustower_05_0013808a.pex differ
diff --git a/scripts/sf_mq13c_sc01_moveelevatorup_0013b5e5.pex b/scripts/sf_mq13c_sc01_moveelevatorup_0013b5e5.pex
index 7453e145..53761fea 100644
Binary files a/scripts/sf_mq13c_sc01_moveelevatorup_0013b5e5.pex and b/scripts/sf_mq13c_sc01_moveelevatorup_0013b5e5.pex differ
diff --git a/scripts/sf_mq13c_sc02_kurmaireappear_0013b5e4.pex b/scripts/sf_mq13c_sc02_kurmaireappear_0013b5e4.pex
index 6fbd2410..22cecd75 100644
Binary files a/scripts/sf_mq13c_sc02_kurmaireappear_0013b5e4.pex and b/scripts/sf_mq13c_sc02_kurmaireappear_0013b5e4.pex differ
diff --git a/scripts/sf_mq13c_sc03_steelbirdattac_0013b5e3.pex b/scripts/sf_mq13c_sc03_steelbirdattac_0013b5e3.pex
index 323dff06..491ea67c 100644
Binary files a/scripts/sf_mq13c_sc03_steelbirdattac_0013b5e3.pex and b/scripts/sf_mq13c_sc03_steelbirdattac_0013b5e3.pex differ
diff --git a/scripts/sf_mq13c_sc04_centurionattac_0013b5e2.pex b/scripts/sf_mq13c_sc04_centurionattac_0013b5e2.pex
index dd0433b2..0c801884 100644
Binary files a/scripts/sf_mq13c_sc04_centurionattac_0013b5e2.pex and b/scripts/sf_mq13c_sc04_centurionattac_0013b5e2.pex differ
diff --git a/scripts/sf_mq13c_sc08_traveltobridge_0013b5de.pex b/scripts/sf_mq13c_sc08_traveltobridge_0013b5de.pex
index bf259bb9..5ae94660 100644
Binary files a/scripts/sf_mq13c_sc08_traveltobridge_0013b5de.pex and b/scripts/sf_mq13c_sc08_traveltobridge_0013b5de.pex differ
diff --git a/scripts/sf_mq14_sc03_explanation_00141d24.pex b/scripts/sf_mq14_sc03_explanation_00141d24.pex
index b4c757af..054683af 100644
Binary files a/scripts/sf_mq14_sc03_explanation_00141d24.pex and b/scripts/sf_mq14_sc03_explanation_00141d24.pex differ
diff --git a/scripts/sf_mq14_sc04_novicescene_00141d61.pex b/scripts/sf_mq14_sc04_novicescene_00141d61.pex
index 31e5fee2..40e04837 100644
Binary files a/scripts/sf_mq14_sc04_novicescene_00141d61.pex and b/scripts/sf_mq14_sc04_novicescene_00141d61.pex differ
diff --git a/scripts/sf_mq14_sc05_tealor_00141d94.pex b/scripts/sf_mq14_sc05_tealor_00141d94.pex
index 53448429..e8a3cb86 100644
Binary files a/scripts/sf_mq14_sc05_tealor_00141d94.pex and b/scripts/sf_mq14_sc05_tealor_00141d94.pex differ
diff --git a/scripts/sf_mq14_sc07_planning_0014342f.pex b/scripts/sf_mq14_sc07_planning_0014342f.pex
index 8230d557..282c60f2 100644
Binary files a/scripts/sf_mq14_sc07_planning_0014342f.pex and b/scripts/sf_mq14_sc07_planning_0014342f.pex differ
diff --git a/scripts/sf_mq15_sc03_forbiddenroom_001448dc.pex b/scripts/sf_mq15_sc03_forbiddenroom_001448dc.pex
index ee77fe6f..078f1b2a 100644
Binary files a/scripts/sf_mq15_sc03_forbiddenroom_001448dc.pex and b/scripts/sf_mq15_sc03_forbiddenroom_001448dc.pex differ
diff --git a/scripts/sf_mq15_sc04_traveltotunnels_001448f7.pex b/scripts/sf_mq15_sc04_traveltotunnels_001448f7.pex
index 4797a336..48425e62 100644
Binary files a/scripts/sf_mq15_sc04_traveltotunnels_001448f7.pex and b/scripts/sf_mq15_sc04_traveltotunnels_001448f7.pex differ
diff --git a/scripts/sf_mq15_sc06_yuslandissolve_001458ba.pex b/scripts/sf_mq15_sc06_yuslandissolve_001458ba.pex
index 7861c0be..0c5b61ea 100644
Binary files a/scripts/sf_mq15_sc06_yuslandissolve_001458ba.pex and b/scripts/sf_mq15_sc06_yuslandissolve_001458ba.pex differ
diff --git a/scripts/sf_mq16_sc01_journey_01_00147116.pex b/scripts/sf_mq16_sc01_journey_01_00147116.pex
index 1a3a3272..f8b6a1c4 100644
Binary files a/scripts/sf_mq16_sc01_journey_01_00147116.pex and b/scripts/sf_mq16_sc01_journey_01_00147116.pex differ
diff --git a/scripts/sf_mq16_sc02_journey_02_00147139.pex b/scripts/sf_mq16_sc02_journey_02_00147139.pex
index 0e182d9b..b84d2eb0 100644
Binary files a/scripts/sf_mq16_sc02_journey_02_00147139.pex and b/scripts/sf_mq16_sc02_journey_02_00147139.pex differ
diff --git a/scripts/sf_mq16_sc03_journey_03_00147148.pex b/scripts/sf_mq16_sc03_journey_03_00147148.pex
index 752abf6b..c7ef73c6 100644
Binary files a/scripts/sf_mq16_sc03_journey_03_00147148.pex and b/scripts/sf_mq16_sc03_journey_03_00147148.pex differ
diff --git a/scripts/sf_mq16_sc04_journey_04_00147193.pex b/scripts/sf_mq16_sc04_journey_04_00147193.pex
index 38d67c03..9ae99e2d 100644
Binary files a/scripts/sf_mq16_sc04_journey_04_00147193.pex and b/scripts/sf_mq16_sc04_journey_04_00147193.pex differ
diff --git a/scripts/sf_mq16_sc05_highones_001471e0.pex b/scripts/sf_mq16_sc05_highones_001471e0.pex
index f95ef84b..366fd81c 100644
Binary files a/scripts/sf_mq16_sc05_highones_001471e0.pex and b/scripts/sf_mq16_sc05_highones_001471e0.pex differ
diff --git a/scripts/sf_mq16_sc06_assault_001484d8.pex b/scripts/sf_mq16_sc06_assault_001484d8.pex
index 35af094f..1788957e 100644
Binary files a/scripts/sf_mq16_sc06_assault_001484d8.pex and b/scripts/sf_mq16_sc06_assault_001484d8.pex differ
diff --git a/scripts/sf_mq16_sc07_dragonattack_00148523.pex b/scripts/sf_mq16_sc07_dragonattack_00148523.pex
index 6890b189..de992444 100644
Binary files a/scripts/sf_mq16_sc07_dragonattack_00148523.pex and b/scripts/sf_mq16_sc07_dragonattack_00148523.pex differ
diff --git a/scripts/sf_mq16_sc08_temple_01_00148572.pex b/scripts/sf_mq16_sc08_temple_01_00148572.pex
index bb75d964..10ccee39 100644
Binary files a/scripts/sf_mq16_sc08_temple_01_00148572.pex and b/scripts/sf_mq16_sc08_temple_01_00148572.pex differ
diff --git a/scripts/sf_mq16_sc10_temple_03_001485f2.pex b/scripts/sf_mq16_sc10_temple_03_001485f2.pex
index 2c35af6a..fb864801 100644
Binary files a/scripts/sf_mq16_sc10_temple_03_001485f2.pex and b/scripts/sf_mq16_sc10_temple_03_001485f2.pex differ
diff --git a/scripts/sf_mq16_sc12_numinos_001486a5.pex b/scripts/sf_mq16_sc12_numinos_001486a5.pex
index b0c66fbe..cee65df6 100644
Binary files a/scripts/sf_mq16_sc12_numinos_001486a5.pex and b/scripts/sf_mq16_sc12_numinos_001486a5.pex differ
diff --git a/scripts/sf_mq16_sc14_temple_001486e8.pex b/scripts/sf_mq16_sc14_temple_001486e8.pex
index f9f58244..e7f13921 100644
Binary files a/scripts/sf_mq16_sc14_temple_001486e8.pex and b/scripts/sf_mq16_sc14_temple_001486e8.pex differ
diff --git a/scripts/sf_mq17_sc05_blackguardian_0_001496ad.pex b/scripts/sf_mq17_sc05_blackguardian_0_001496ad.pex
index fa87b4c9..ff00e160 100644
Binary files a/scripts/sf_mq17_sc05_blackguardian_0_001496ad.pex and b/scripts/sf_mq17_sc05_blackguardian_0_001496ad.pex differ
diff --git a/scripts/sf_mq17_sc06_blackguardiantr_001496bb.pex b/scripts/sf_mq17_sc06_blackguardiantr_001496bb.pex
index 3328e74e..95dea088 100644
Binary files a/scripts/sf_mq17_sc06_blackguardiantr_001496bb.pex and b/scripts/sf_mq17_sc06_blackguardiantr_001496bb.pex differ
diff --git a/scripts/sf_mq17_sc07_blackguardianfi_001496ec.pex b/scripts/sf_mq17_sc07_blackguardianfi_001496ec.pex
index b3357d50..a860f2e0 100644
Binary files a/scripts/sf_mq17_sc07_blackguardianfi_001496ec.pex and b/scripts/sf_mq17_sc07_blackguardianfi_001496ec.pex differ
diff --git a/scripts/sf_mq17_sc08_precleansing_0014bd7e.pex b/scripts/sf_mq17_sc08_precleansing_0014bd7e.pex
index 7635c890..6458b7ca 100644
Binary files a/scripts/sf_mq17_sc08_precleansing_0014bd7e.pex and b/scripts/sf_mq17_sc08_precleansing_0014bd7e.pex differ
diff --git a/scripts/sf_mq17_sc10_launchsequence_0014bebe.pex b/scripts/sf_mq17_sc10_launchsequence_0014bebe.pex
index 3c107670..ac5a4581 100644
Binary files a/scripts/sf_mq17_sc10_launchsequence_0014bebe.pex and b/scripts/sf_mq17_sc10_launchsequence_0014bebe.pex differ
diff --git a/scripts/sf_mq18a_sc02_starcity_0014bfdc.pex b/scripts/sf_mq18a_sc02_starcity_0014bfdc.pex
index 6587f2ad..9f8d4a2a 100644
Binary files a/scripts/sf_mq18a_sc02_starcity_0014bfdc.pex and b/scripts/sf_mq18a_sc02_starcity_0014bfdc.pex differ
diff --git a/scripts/sf_mq_p02_anewlife_execution_0007bb8d.pex b/scripts/sf_mq_p02_anewlife_execution_0007bb8d.pex
index f3e10394..d18fad97 100644
Binary files a/scripts/sf_mq_p02_anewlife_execution_0007bb8d.pex and b/scripts/sf_mq_p02_anewlife_execution_0007bb8d.pex differ
diff --git a/scripts/sf_mqp02_sc3_riqandsebald02_000775fc.pex b/scripts/sf_mqp02_sc3_riqandsebald02_000775fc.pex
index a8211886..a5fa047a 100644
Binary files a/scripts/sf_mqp02_sc3_riqandsebald02_000775fc.pex and b/scripts/sf_mqp02_sc3_riqandsebald02_000775fc.pex differ
diff --git a/scripts/sf_nq06_sc1_0012790d.pex b/scripts/sf_nq06_sc1_0012790d.pex
index 2896c0c1..ee20c823 100644
Binary files a/scripts/sf_nq06_sc1_0012790d.pex and b/scripts/sf_nq06_sc1_0012790d.pex differ
diff --git a/scripts/sf_nq10_elfride_scene01_000f8579.pex b/scripts/sf_nq10_elfride_scene01_000f8579.pex
index 37c1069b..38b73249 100644
Binary files a/scripts/sf_nq10_elfride_scene01_000f8579.pex and b/scripts/sf_nq10_elfride_scene01_000f8579.pex differ
diff --git a/scripts/sf_nq11_sc1_00119bd9.pex b/scripts/sf_nq11_sc1_00119bd9.pex
index fce4ac66..71ba70c1 100644
Binary files a/scripts/sf_nq11_sc1_00119bd9.pex and b/scripts/sf_nq11_sc1_00119bd9.pex differ
diff --git a/scripts/sf_nq12_sc1_00119bda.pex b/scripts/sf_nq12_sc1_00119bda.pex
index 29eb8cfd..bb8f1c68 100644
Binary files a/scripts/sf_nq12_sc1_00119bda.pex and b/scripts/sf_nq12_sc1_00119bda.pex differ
diff --git a/scripts/sf_nq12_sc2combat_0011a81d.pex b/scripts/sf_nq12_sc2combat_0011a81d.pex
index f56d9caa..51e8b49b 100644
Binary files a/scripts/sf_nq12_sc2combat_0011a81d.pex and b/scripts/sf_nq12_sc2combat_0011a81d.pex differ
diff --git a/scripts/sf_nq12_sc3milbertdeath_0011a841.pex b/scripts/sf_nq12_sc3milbertdeath_0011a841.pex
index 39afd854..73ce2e7c 100644
Binary files a/scripts/sf_nq12_sc3milbertdeath_0011a841.pex and b/scripts/sf_nq12_sc3milbertdeath_0011a841.pex differ
diff --git a/scripts/sf_nq14_sc1_fightsc_0003ac67.pex b/scripts/sf_nq14_sc1_fightsc_0003ac67.pex
index ccf135af..5130dbb7 100644
Binary files a/scripts/sf_nq14_sc1_fightsc_0003ac67.pex and b/scripts/sf_nq14_sc1_fightsc_0003ac67.pex differ
diff --git a/scripts/sf_nq15_sc0_001256f5.pex b/scripts/sf_nq15_sc0_001256f5.pex
index 90ac67ec..baecb1c2 100644
Binary files a/scripts/sf_nq15_sc0_001256f5.pex and b/scripts/sf_nq15_sc0_001256f5.pex differ
diff --git a/scripts/sf_nq15_sc1_001256ff.pex b/scripts/sf_nq15_sc1_001256ff.pex
index 8fcc768c..3a002a44 100644
Binary files a/scripts/sf_nq15_sc1_001256ff.pex and b/scripts/sf_nq15_sc1_001256ff.pex differ
diff --git a/scripts/sf_nq15_sc2_00125a80.pex b/scripts/sf_nq15_sc2_00125a80.pex
index cb9c4ca1..07d8c487 100644
Binary files a/scripts/sf_nq15_sc2_00125a80.pex and b/scripts/sf_nq15_sc2_00125a80.pex differ
diff --git a/scripts/sf_nq15_sc3hinweis1_00125a91.pex b/scripts/sf_nq15_sc3hinweis1_00125a91.pex
index c622debc..baab892d 100644
Binary files a/scripts/sf_nq15_sc3hinweis1_00125a91.pex and b/scripts/sf_nq15_sc3hinweis1_00125a91.pex differ
diff --git a/scripts/sf_nq15_sc3hinweis2_00125a92.pex b/scripts/sf_nq15_sc3hinweis2_00125a92.pex
index 20a0e438..3be9cd57 100644
Binary files a/scripts/sf_nq15_sc3hinweis2_00125a92.pex and b/scripts/sf_nq15_sc3hinweis2_00125a92.pex differ
diff --git a/scripts/sf_nq15_sc3hinweis3_00125a95.pex b/scripts/sf_nq15_sc3hinweis3_00125a95.pex
index 85dda993..6c53c205 100644
Binary files a/scripts/sf_nq15_sc3hinweis3_00125a95.pex and b/scripts/sf_nq15_sc3hinweis3_00125a95.pex differ
diff --git a/scripts/sf_nq15_sc4_001276ea.pex b/scripts/sf_nq15_sc4_001276ea.pex
index a82b60df..3abd62e6 100644
Binary files a/scripts/sf_nq15_sc4_001276ea.pex and b/scripts/sf_nq15_sc4_001276ea.pex differ
diff --git a/scripts/sf_nq15_sc5_001276fb.pex b/scripts/sf_nq15_sc5_001276fb.pex
index fd5fa5cb..f3471551 100644
Binary files a/scripts/sf_nq15_sc5_001276fb.pex and b/scripts/sf_nq15_sc5_001276fb.pex differ
diff --git a/scripts/sf_nq17_sc1_001290d9.pex b/scripts/sf_nq17_sc1_001290d9.pex
index 530a7573..412bc6f7 100644
Binary files a/scripts/sf_nq17_sc1_001290d9.pex and b/scripts/sf_nq17_sc1_001290d9.pex differ
diff --git a/scripts/sf_nq17_sc2_0012dad9.pex b/scripts/sf_nq17_sc2_0012dad9.pex
index 4c19b777..e317b01e 100644
Binary files a/scripts/sf_nq17_sc2_0012dad9.pex and b/scripts/sf_nq17_sc2_0012dad9.pex differ
diff --git a/scripts/sf_nq17_sc3_0012dadb.pex b/scripts/sf_nq17_sc3_0012dadb.pex
index b4629b0c..5c6e5859 100644
Binary files a/scripts/sf_nq17_sc3_0012dadb.pex and b/scripts/sf_nq17_sc3_0012dadb.pex differ
diff --git a/scripts/sf_nq21_sc1_0014c0e4.pex b/scripts/sf_nq21_sc1_0014c0e4.pex
index 88106482..48d346de 100644
Binary files a/scripts/sf_nq21_sc1_0014c0e4.pex and b/scripts/sf_nq21_sc1_0014c0e4.pex differ
diff --git a/scripts/sf_nq22_s1_ishyianbattle_00132d82.pex b/scripts/sf_nq22_s1_ishyianbattle_00132d82.pex
index bd5a7388..7f5d28ce 100644
Binary files a/scripts/sf_nq22_s1_ishyianbattle_00132d82.pex and b/scripts/sf_nq22_s1_ishyianbattle_00132d82.pex differ
diff --git a/scripts/sf_nq23_sc1_0013378e.pex b/scripts/sf_nq23_sc1_0013378e.pex
index 6f3ac2f5..19062058 100644
Binary files a/scripts/sf_nq23_sc1_0013378e.pex and b/scripts/sf_nq23_sc1_0013378e.pex differ
diff --git a/scripts/sf_nq23_sc2_00135771.pex b/scripts/sf_nq23_sc2_00135771.pex
index 7c4bb04e..edbecd59 100644
Binary files a/scripts/sf_nq23_sc2_00135771.pex and b/scripts/sf_nq23_sc2_00135771.pex differ
diff --git a/scripts/sf_nq23_sc3_00134e0a.pex b/scripts/sf_nq23_sc3_00134e0a.pex
index 8b708036..05626b81 100644
Binary files a/scripts/sf_nq23_sc3_00134e0a.pex and b/scripts/sf_nq23_sc3_00134e0a.pex differ
diff --git a/scripts/sf_nq26_sc1_0014871a.pex b/scripts/sf_nq26_sc1_0014871a.pex
index f7a8542b..7a4a2ccc 100644
Binary files a/scripts/sf_nq26_sc1_0014871a.pex and b/scripts/sf_nq26_sc1_0014871a.pex differ
diff --git a/scripts/sf_nq26_sc2_00149823.pex b/scripts/sf_nq26_sc2_00149823.pex
index 0e873313..c5106667 100644
Binary files a/scripts/sf_nq26_sc2_00149823.pex and b/scripts/sf_nq26_sc2_00149823.pex differ
diff --git a/scripts/sf_nq26_sc3_0014b5be.pex b/scripts/sf_nq26_sc3_0014b5be.pex
index 083b6ee0..557715cb 100644
Binary files a/scripts/sf_nq26_sc3_0014b5be.pex and b/scripts/sf_nq26_sc3_0014b5be.pex differ
diff --git a/scripts/sf_nq26_sc4_0014b748.pex b/scripts/sf_nq26_sc4_0014b748.pex
index c2b92a19..4b8a028b 100644
Binary files a/scripts/sf_nq26_sc4_0014b748.pex and b/scripts/sf_nq26_sc4_0014b748.pex differ
diff --git a/scripts/sf_nq34_sc01_examinecorpse_00020a13.pex b/scripts/sf_nq34_sc01_examinecorpse_00020a13.pex
index 91102ad4..507feb69 100644
Binary files a/scripts/sf_nq34_sc01_examinecorpse_00020a13.pex and b/scripts/sf_nq34_sc01_examinecorpse_00020a13.pex differ
diff --git a/scripts/sf_nq_g_04_sc02_duulfight_00139db9.pex b/scripts/sf_nq_g_04_sc02_duulfight_00139db9.pex
index 6a93caff..ad4bc331 100644
Binary files a/scripts/sf_nq_g_04_sc02_duulfight_00139db9.pex and b/scripts/sf_nq_g_04_sc02_duulfight_00139db9.pex differ
diff --git a/scripts/sf_nq_g_04_sc03_dijaamencoun_00139dc2.pex b/scripts/sf_nq_g_04_sc03_dijaamencoun_00139dc2.pex
index 589dcdc3..f6d97bb4 100644
Binary files a/scripts/sf_nq_g_04_sc03_dijaamencoun_00139dc2.pex and b/scripts/sf_nq_g_04_sc03_dijaamencoun_00139dc2.pex differ
diff --git a/scripts/sf_nq_g_05_sc01_messengerarr_0013b709.pex b/scripts/sf_nq_g_05_sc01_messengerarr_0013b709.pex
index ba3a4cd6..ad63244d 100644
Binary files a/scripts/sf_nq_g_05_sc01_messengerarr_0013b709.pex and b/scripts/sf_nq_g_05_sc01_messengerarr_0013b709.pex differ
diff --git a/scripts/sf_nq_g_05_sc03_dijaamtalk_0013c3f8.pex b/scripts/sf_nq_g_05_sc03_dijaamtalk_0013c3f8.pex
index 3ec4e90a..c992ecc3 100644
Binary files a/scripts/sf_nq_g_05_sc03_dijaamtalk_0013c3f8.pex and b/scripts/sf_nq_g_05_sc03_dijaamtalk_0013c3f8.pex differ
diff --git a/scripts/sf_nq_g_06_sc02_dijaamtalkat_0013cfc1.pex b/scripts/sf_nq_g_06_sc02_dijaamtalkat_0013cfc1.pex
index 25d91faf..3b73c6d7 100644
Binary files a/scripts/sf_nq_g_06_sc02_dijaamtalkat_0013cfc1.pex and b/scripts/sf_nq_g_06_sc02_dijaamtalkat_0013cfc1.pex differ
diff --git a/scripts/sf_nq_g_06_sc04_protektorkic_0013cfdd.pex b/scripts/sf_nq_g_06_sc04_protektorkic_0013cfdd.pex
index 2355418b..5080a02a 100644
Binary files a/scripts/sf_nq_g_06_sc04_protektorkic_0013cfdd.pex and b/scripts/sf_nq_g_06_sc04_protektorkic_0013cfdd.pex differ
diff --git a/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.pex b/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.pex
index 425b9b31..8ce5134e 100644
Binary files a/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.pex and b/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.pex differ
diff --git a/scripts/sf_nq_g_07dijaam_sc04_dijaam_00147064.pex b/scripts/sf_nq_g_07dijaam_sc04_dijaam_00147064.pex
index 94136585..9f6c5bb4 100644
Binary files a/scripts/sf_nq_g_07dijaam_sc04_dijaam_00147064.pex and b/scripts/sf_nq_g_07dijaam_sc04_dijaam_00147064.pex differ
diff --git a/scripts/sf_nq_g_07dijaam_sc05_theate_0013fa43.pex b/scripts/sf_nq_g_07dijaam_sc05_theate_0013fa43.pex
index 8475cd42..9c24995d 100644
Binary files a/scripts/sf_nq_g_07dijaam_sc05_theate_0013fa43.pex and b/scripts/sf_nq_g_07dijaam_sc05_theate_0013fa43.pex differ
diff --git a/scripts/sf_nq_g_07dijaam_sc07_dijaam_00147066.pex b/scripts/sf_nq_g_07dijaam_sc07_dijaam_00147066.pex
index ea2dea5b..d021bf41 100644
Binary files a/scripts/sf_nq_g_07dijaam_sc07_dijaam_00147066.pex and b/scripts/sf_nq_g_07dijaam_sc07_dijaam_00147066.pex differ
diff --git a/scripts/sf_nq_g_07dijaam_sc08_houseo_00147067.pex b/scripts/sf_nq_g_07dijaam_sc08_houseo_00147067.pex
index 79f2cda0..1bd9226c 100644
Binary files a/scripts/sf_nq_g_07dijaam_sc08_houseo_00147067.pex and b/scripts/sf_nq_g_07dijaam_sc08_houseo_00147067.pex differ
diff --git a/scripts/sf_nq_g_07mael_sc01_maelmiss_0013f6f3.pex b/scripts/sf_nq_g_07mael_sc01_maelmiss_0013f6f3.pex
index 9ee50921..cf676e7c 100644
Binary files a/scripts/sf_nq_g_07mael_sc01_maelmiss_0013f6f3.pex and b/scripts/sf_nq_g_07mael_sc01_maelmiss_0013f6f3.pex differ
diff --git a/scripts/sf_nq_g_07mael_sc02_escalati_0013f705.pex b/scripts/sf_nq_g_07mael_sc02_escalati_0013f705.pex
index 2a982aa4..e11ab405 100644
Binary files a/scripts/sf_nq_g_07mael_sc02_escalati_0013f705.pex and b/scripts/sf_nq_g_07mael_sc02_escalati_0013f705.pex differ
diff --git a/scripts/sf_nq_g_07mael_sc03_maeldisa_0013f706.pex b/scripts/sf_nq_g_07mael_sc03_maeldisa_0013f706.pex
index 5599b016..d948fa7d 100644
Binary files a/scripts/sf_nq_g_07mael_sc03_maeldisa_0013f706.pex and b/scripts/sf_nq_g_07mael_sc03_maeldisa_0013f706.pex differ
diff --git a/scripts/sf_nq_g_07mael_sc04_dijaampr_0013f712.pex b/scripts/sf_nq_g_07mael_sc04_dijaampr_0013f712.pex
index b4d28259..95c4f673 100644
Binary files a/scripts/sf_nq_g_07mael_sc04_dijaampr_0013f712.pex and b/scripts/sf_nq_g_07mael_sc04_dijaampr_0013f712.pex differ
diff --git a/scripts/sf_nq_g_07mael_sc05_theaterf_0013f9c6.pex b/scripts/sf_nq_g_07mael_sc05_theaterf_0013f9c6.pex
index e54e5696..0fedd248 100644
Binary files a/scripts/sf_nq_g_07mael_sc05_theaterf_0013f9c6.pex and b/scripts/sf_nq_g_07mael_sc05_theaterf_0013f9c6.pex differ
diff --git a/scripts/sf_nq_g_07mael_sc06_maeltalk_0013f9ed.pex b/scripts/sf_nq_g_07mael_sc06_maeltalk_0013f9ed.pex
index 6757cd3c..e187f386 100644
Binary files a/scripts/sf_nq_g_07mael_sc06_maeltalk_0013f9ed.pex and b/scripts/sf_nq_g_07mael_sc06_maeltalk_0013f9ed.pex differ
diff --git a/scripts/sf_nq_g_07mael_sc07_houseofa_00147069.pex b/scripts/sf_nq_g_07mael_sc07_houseofa_00147069.pex
index be225ca1..de302e5f 100644
Binary files a/scripts/sf_nq_g_07mael_sc07_houseofa_00147069.pex and b/scripts/sf_nq_g_07mael_sc07_houseofa_00147069.pex differ
diff --git a/scripts/sf_nqr01_sc04_tharael_0013eb49.pex b/scripts/sf_nqr01_sc04_tharael_0013eb49.pex
index 3ede08af..595732ef 100644
Binary files a/scripts/sf_nqr01_sc04_tharael_0013eb49.pex and b/scripts/sf_nqr01_sc04_tharael_0013eb49.pex differ
diff --git a/scripts/sf_z_conversations_tealorand_001489a4.pex b/scripts/sf_z_conversations_tealorand_001489a4.pex
index ab0050c2..5a3be029 100644
Binary files a/scripts/sf_z_conversations_tealorand_001489a4.pex and b/scripts/sf_z_conversations_tealorand_001489a4.pex differ
diff --git a/scripts/sf_z_conversations_tealorand_001489aa.pex b/scripts/sf_z_conversations_tealorand_001489aa.pex
index 4de0bfcc..1056e93e 100644
Binary files a/scripts/sf_z_conversations_tealorand_001489aa.pex and b/scripts/sf_z_conversations_tealorand_001489aa.pex differ
diff --git a/scripts/tif__00020969.pex b/scripts/tif__00020969.pex
index 49b63799..2f11ffd7 100644
Binary files a/scripts/tif__00020969.pex and b/scripts/tif__00020969.pex differ
diff --git a/scripts/tif__0002096b.pex b/scripts/tif__0002096b.pex
index 157b3c81..d617786e 100644
Binary files a/scripts/tif__0002096b.pex and b/scripts/tif__0002096b.pex differ
diff --git a/scripts/tif__000209de.pex b/scripts/tif__000209de.pex
index 12a39fc1..cdc69c7b 100644
Binary files a/scripts/tif__000209de.pex and b/scripts/tif__000209de.pex differ
diff --git a/scripts/tif__000209df.pex b/scripts/tif__000209df.pex
index 1e0dc1f3..fabcda1a 100644
Binary files a/scripts/tif__000209df.pex and b/scripts/tif__000209df.pex differ
diff --git a/scripts/tif__000209fe.pex b/scripts/tif__000209fe.pex
index 53ee1c39..27da9866 100644
Binary files a/scripts/tif__000209fe.pex and b/scripts/tif__000209fe.pex differ
diff --git a/scripts/tif__00020a3b.pex b/scripts/tif__00020a3b.pex
index a5b46689..27a2768a 100644
Binary files a/scripts/tif__00020a3b.pex and b/scripts/tif__00020a3b.pex differ
diff --git a/scripts/tif__00020a74.pex b/scripts/tif__00020a74.pex
index 840100c7..0770da73 100644
Binary files a/scripts/tif__00020a74.pex and b/scripts/tif__00020a74.pex differ
diff --git a/scripts/tif__00020a75.pex b/scripts/tif__00020a75.pex
index ed61d962..32be87e1 100644
Binary files a/scripts/tif__00020a75.pex and b/scripts/tif__00020a75.pex differ
diff --git a/scripts/tif__00020a76.pex b/scripts/tif__00020a76.pex
index d3aeea5d..f3ca3381 100644
Binary files a/scripts/tif__00020a76.pex and b/scripts/tif__00020a76.pex differ
diff --git a/scripts/tif__00020aea.pex b/scripts/tif__00020aea.pex
index 1dfe26a8..d31455b9 100644
Binary files a/scripts/tif__00020aea.pex and b/scripts/tif__00020aea.pex differ
diff --git a/scripts/tif__00020af0.pex b/scripts/tif__00020af0.pex
index f95f3184..2d0edb6d 100644
Binary files a/scripts/tif__00020af0.pex and b/scripts/tif__00020af0.pex differ
diff --git a/scripts/tif__00023094.pex b/scripts/tif__00023094.pex
index 35571818..28a7424c 100644
Binary files a/scripts/tif__00023094.pex and b/scripts/tif__00023094.pex differ
diff --git a/scripts/tif__00023152.pex b/scripts/tif__00023152.pex
index ff36ce0e..c861aca2 100644
Binary files a/scripts/tif__00023152.pex and b/scripts/tif__00023152.pex differ
diff --git a/scripts/tif__00023153.pex b/scripts/tif__00023153.pex
index 497cb679..482b3739 100644
Binary files a/scripts/tif__00023153.pex and b/scripts/tif__00023153.pex differ
diff --git a/scripts/tif__00023154.pex b/scripts/tif__00023154.pex
index f7402418..a4572cf3 100644
Binary files a/scripts/tif__00023154.pex and b/scripts/tif__00023154.pex differ
diff --git a/scripts/tif__0002365e.pex b/scripts/tif__0002365e.pex
index 741c2da5..e30ce9f3 100644
Binary files a/scripts/tif__0002365e.pex and b/scripts/tif__0002365e.pex differ
diff --git a/scripts/tif__00034daf.pex b/scripts/tif__00034daf.pex
index f70adbf0..47bb9819 100644
Binary files a/scripts/tif__00034daf.pex and b/scripts/tif__00034daf.pex differ
diff --git a/scripts/tif__00037f4c.pex b/scripts/tif__00037f4c.pex
index 71cdd8b9..f04e2482 100644
Binary files a/scripts/tif__00037f4c.pex and b/scripts/tif__00037f4c.pex differ
diff --git a/scripts/tif__00038710.pex b/scripts/tif__00038710.pex
index fa47fbf8..176e69f5 100644
Binary files a/scripts/tif__00038710.pex and b/scripts/tif__00038710.pex differ
diff --git a/scripts/tif__0003b813.pex b/scripts/tif__0003b813.pex
index aed7c60e..409d3d49 100644
Binary files a/scripts/tif__0003b813.pex and b/scripts/tif__0003b813.pex differ
diff --git a/scripts/tif__0003db06.pex b/scripts/tif__0003db06.pex
index a352da6e..35521659 100644
Binary files a/scripts/tif__0003db06.pex and b/scripts/tif__0003db06.pex differ
diff --git a/scripts/tif__00043b1b.pex b/scripts/tif__00043b1b.pex
index 2084040b..ad78438c 100644
Binary files a/scripts/tif__00043b1b.pex and b/scripts/tif__00043b1b.pex differ
diff --git a/scripts/tif__00043b44.pex b/scripts/tif__00043b44.pex
index 15e4e5f2..a5fa866a 100644
Binary files a/scripts/tif__00043b44.pex and b/scripts/tif__00043b44.pex differ
diff --git a/scripts/tif__00043b55.pex b/scripts/tif__00043b55.pex
index dea15dff..e28c939e 100644
Binary files a/scripts/tif__00043b55.pex and b/scripts/tif__00043b55.pex differ
diff --git a/scripts/tif__00043b9f.pex b/scripts/tif__00043b9f.pex
index d8c33dee..bc9950ca 100644
Binary files a/scripts/tif__00043b9f.pex and b/scripts/tif__00043b9f.pex differ
diff --git a/scripts/tif__00043ba0.pex b/scripts/tif__00043ba0.pex
index a48f8bb3..33311c69 100644
Binary files a/scripts/tif__00043ba0.pex and b/scripts/tif__00043ba0.pex differ
diff --git a/scripts/tif__00043ba1.pex b/scripts/tif__00043ba1.pex
index a923f075..95cb6ffc 100644
Binary files a/scripts/tif__00043ba1.pex and b/scripts/tif__00043ba1.pex differ
diff --git a/scripts/tif__0004416b.pex b/scripts/tif__0004416b.pex
index 451bbafd..beba811e 100644
Binary files a/scripts/tif__0004416b.pex and b/scripts/tif__0004416b.pex differ
diff --git a/scripts/tif__00044773.pex b/scripts/tif__00044773.pex
index 84b1011b..1933c79e 100644
Binary files a/scripts/tif__00044773.pex and b/scripts/tif__00044773.pex differ
diff --git a/scripts/tif__0004477a.pex b/scripts/tif__0004477a.pex
index c5aafb5f..f044a32e 100644
Binary files a/scripts/tif__0004477a.pex and b/scripts/tif__0004477a.pex differ
diff --git a/scripts/tif__00046de1.pex b/scripts/tif__00046de1.pex
index edeecab5..51941097 100644
Binary files a/scripts/tif__00046de1.pex and b/scripts/tif__00046de1.pex differ
diff --git a/scripts/tif__00046eb3.pex b/scripts/tif__00046eb3.pex
index ac1c7c7f..8fc73e85 100644
Binary files a/scripts/tif__00046eb3.pex and b/scripts/tif__00046eb3.pex differ
diff --git a/scripts/tif__00047c12.pex b/scripts/tif__00047c12.pex
index edbd1811..842c5000 100644
Binary files a/scripts/tif__00047c12.pex and b/scripts/tif__00047c12.pex differ
diff --git a/scripts/tif__0005bb4d.pex b/scripts/tif__0005bb4d.pex
index f28c2e35..ae42eae2 100644
Binary files a/scripts/tif__0005bb4d.pex and b/scripts/tif__0005bb4d.pex differ
diff --git a/scripts/tif__00069ca7.pex b/scripts/tif__00069ca7.pex
index 2e269bd0..b3afe5b3 100644
Binary files a/scripts/tif__00069ca7.pex and b/scripts/tif__00069ca7.pex differ
diff --git a/scripts/tif__00069caa.pex b/scripts/tif__00069caa.pex
index f0a779df..4eb5e189 100644
Binary files a/scripts/tif__00069caa.pex and b/scripts/tif__00069caa.pex differ
diff --git a/scripts/tif__0007079d.pex b/scripts/tif__0007079d.pex
index 34c0e4dc..e77e7fd2 100644
Binary files a/scripts/tif__0007079d.pex and b/scripts/tif__0007079d.pex differ
diff --git a/scripts/tif__0007079e.pex b/scripts/tif__0007079e.pex
index ff65da71..612abf0b 100644
Binary files a/scripts/tif__0007079e.pex and b/scripts/tif__0007079e.pex differ
diff --git a/scripts/tif__000707a0.pex b/scripts/tif__000707a0.pex
index edf124d1..1d4bf876 100644
Binary files a/scripts/tif__000707a0.pex and b/scripts/tif__000707a0.pex differ
diff --git a/scripts/tif__000707a3.pex b/scripts/tif__000707a3.pex
index 9dc97fb0..ca3240c5 100644
Binary files a/scripts/tif__000707a3.pex and b/scripts/tif__000707a3.pex differ
diff --git a/scripts/tif__000707a4.pex b/scripts/tif__000707a4.pex
index b44ee0b6..fca9f86f 100644
Binary files a/scripts/tif__000707a4.pex and b/scripts/tif__000707a4.pex differ
diff --git a/scripts/tif__000707a9.pex b/scripts/tif__000707a9.pex
index 3a60f6ce..94302271 100644
Binary files a/scripts/tif__000707a9.pex and b/scripts/tif__000707a9.pex differ
diff --git a/scripts/tif__000707ab.pex b/scripts/tif__000707ab.pex
index 928ec29c..012d6e5c 100644
Binary files a/scripts/tif__000707ab.pex and b/scripts/tif__000707ab.pex differ
diff --git a/scripts/tif__00074ab8.pex b/scripts/tif__00074ab8.pex
index 8d3b5246..db3563f3 100644
Binary files a/scripts/tif__00074ab8.pex and b/scripts/tif__00074ab8.pex differ
diff --git a/scripts/tif__00074abe.pex b/scripts/tif__00074abe.pex
index 8bf0fd92..d162d7d2 100644
Binary files a/scripts/tif__00074abe.pex and b/scripts/tif__00074abe.pex differ
diff --git a/scripts/tif__00074ac4.pex b/scripts/tif__00074ac4.pex
index 0d07416a..b2860448 100644
Binary files a/scripts/tif__00074ac4.pex and b/scripts/tif__00074ac4.pex differ
diff --git a/scripts/tif__00074ac6.pex b/scripts/tif__00074ac6.pex
index c0b00353..d1f54f23 100644
Binary files a/scripts/tif__00074ac6.pex and b/scripts/tif__00074ac6.pex differ
diff --git a/scripts/tif__00074acb.pex b/scripts/tif__00074acb.pex
index 7885ebbb..a1ca8311 100644
Binary files a/scripts/tif__00074acb.pex and b/scripts/tif__00074acb.pex differ
diff --git a/scripts/tif__00074ada.pex b/scripts/tif__00074ada.pex
index 6411ffcb..b758bfa1 100644
Binary files a/scripts/tif__00074ada.pex and b/scripts/tif__00074ada.pex differ
diff --git a/scripts/tif__00074aec.pex b/scripts/tif__00074aec.pex
index 1c138d5d..be091a3b 100644
Binary files a/scripts/tif__00074aec.pex and b/scripts/tif__00074aec.pex differ
diff --git a/scripts/tif__00074aef.pex b/scripts/tif__00074aef.pex
index f22099cd..dcd707fd 100644
Binary files a/scripts/tif__00074aef.pex and b/scripts/tif__00074aef.pex differ
diff --git a/scripts/tif__000753be.pex b/scripts/tif__000753be.pex
index 6fd0e7a5..93033993 100644
Binary files a/scripts/tif__000753be.pex and b/scripts/tif__000753be.pex differ
diff --git a/scripts/tif__000753bf.pex b/scripts/tif__000753bf.pex
index ce584df3..fa7cfc0a 100644
Binary files a/scripts/tif__000753bf.pex and b/scripts/tif__000753bf.pex differ
diff --git a/scripts/tif__000753c5.pex b/scripts/tif__000753c5.pex
index f7467966..fc99851d 100644
Binary files a/scripts/tif__000753c5.pex and b/scripts/tif__000753c5.pex differ
diff --git a/scripts/tif__000753d5.pex b/scripts/tif__000753d5.pex
index 6c08bc6c..39616ffa 100644
Binary files a/scripts/tif__000753d5.pex and b/scripts/tif__000753d5.pex differ
diff --git a/scripts/tif__0007733c.pex b/scripts/tif__0007733c.pex
index e89505ab..b8d5edf1 100644
Binary files a/scripts/tif__0007733c.pex and b/scripts/tif__0007733c.pex differ
diff --git a/scripts/tif__00077341.pex b/scripts/tif__00077341.pex
index d2bbd7e6..25857570 100644
Binary files a/scripts/tif__00077341.pex and b/scripts/tif__00077341.pex differ
diff --git a/scripts/tif__00077347.pex b/scripts/tif__00077347.pex
index c0af7709..94008905 100644
Binary files a/scripts/tif__00077347.pex and b/scripts/tif__00077347.pex differ
diff --git a/scripts/tif__0007734f.pex b/scripts/tif__0007734f.pex
index 372325a2..a7ded277 100644
Binary files a/scripts/tif__0007734f.pex and b/scripts/tif__0007734f.pex differ
diff --git a/scripts/tif__00077350.pex b/scripts/tif__00077350.pex
index 9fc51404..839ec438 100644
Binary files a/scripts/tif__00077350.pex and b/scripts/tif__00077350.pex differ
diff --git a/scripts/tif__0007b855.pex b/scripts/tif__0007b855.pex
index 1181a54e..2d2881f6 100644
Binary files a/scripts/tif__0007b855.pex and b/scripts/tif__0007b855.pex differ
diff --git a/scripts/tif__0007b856.pex b/scripts/tif__0007b856.pex
index 6b3b4f28..3feb9f7c 100644
Binary files a/scripts/tif__0007b856.pex and b/scripts/tif__0007b856.pex differ
diff --git a/scripts/tif__0007b858.pex b/scripts/tif__0007b858.pex
index 1704e025..89f5568d 100644
Binary files a/scripts/tif__0007b858.pex and b/scripts/tif__0007b858.pex differ
diff --git a/scripts/tif__0007b859.pex b/scripts/tif__0007b859.pex
index 65bf8a34..1479eaf0 100644
Binary files a/scripts/tif__0007b859.pex and b/scripts/tif__0007b859.pex differ
diff --git a/scripts/tif__0007b85b.pex b/scripts/tif__0007b85b.pex
index f9f1fb9e..69f63c70 100644
Binary files a/scripts/tif__0007b85b.pex and b/scripts/tif__0007b85b.pex differ
diff --git a/scripts/tif__0007b85d.pex b/scripts/tif__0007b85d.pex
index 920f1f4c..ba5e3b37 100644
Binary files a/scripts/tif__0007b85d.pex and b/scripts/tif__0007b85d.pex differ
diff --git a/scripts/tif__0007b861.pex b/scripts/tif__0007b861.pex
index 92622429..9731a67d 100644
Binary files a/scripts/tif__0007b861.pex and b/scripts/tif__0007b861.pex differ
diff --git a/scripts/tif__0007b86c.pex b/scripts/tif__0007b86c.pex
index d5fc1364..229400cd 100644
Binary files a/scripts/tif__0007b86c.pex and b/scripts/tif__0007b86c.pex differ
diff --git a/scripts/tif__0007b86e.pex b/scripts/tif__0007b86e.pex
index c1fe6a0d..9d9edba4 100644
Binary files a/scripts/tif__0007b86e.pex and b/scripts/tif__0007b86e.pex differ
diff --git a/scripts/tif__0007b86f.pex b/scripts/tif__0007b86f.pex
index cff64bf5..720d43b2 100644
Binary files a/scripts/tif__0007b86f.pex and b/scripts/tif__0007b86f.pex differ
diff --git a/scripts/tif__0007b872.pex b/scripts/tif__0007b872.pex
index 2464b5b3..dafe0ec8 100644
Binary files a/scripts/tif__0007b872.pex and b/scripts/tif__0007b872.pex differ
diff --git a/scripts/tif__0007bbe9.pex b/scripts/tif__0007bbe9.pex
index 2c8ce986..b8b31fd6 100644
Binary files a/scripts/tif__0007bbe9.pex and b/scripts/tif__0007bbe9.pex differ
diff --git a/scripts/tif__0007bbf8.pex b/scripts/tif__0007bbf8.pex
index 9bfbf662..c6072ae2 100644
Binary files a/scripts/tif__0007bbf8.pex and b/scripts/tif__0007bbf8.pex differ
diff --git a/scripts/tif__0007bbf9.pex b/scripts/tif__0007bbf9.pex
index 8541d265..8e303037 100644
Binary files a/scripts/tif__0007bbf9.pex and b/scripts/tif__0007bbf9.pex differ
diff --git a/scripts/tif__0007bbfa.pex b/scripts/tif__0007bbfa.pex
index 7b6496db..06ec38c9 100644
Binary files a/scripts/tif__0007bbfa.pex and b/scripts/tif__0007bbfa.pex differ
diff --git a/scripts/tif__0008125f.pex b/scripts/tif__0008125f.pex
index 4ad690fc..9610d2be 100644
Binary files a/scripts/tif__0008125f.pex and b/scripts/tif__0008125f.pex differ
diff --git a/scripts/tif__00081260.pex b/scripts/tif__00081260.pex
index 40643bdc..1f44a61d 100644
Binary files a/scripts/tif__00081260.pex and b/scripts/tif__00081260.pex differ
diff --git a/scripts/tif__00081262.pex b/scripts/tif__00081262.pex
index d31277de..b4291197 100644
Binary files a/scripts/tif__00081262.pex and b/scripts/tif__00081262.pex differ
diff --git a/scripts/tif__00081263.pex b/scripts/tif__00081263.pex
index a304087a..67c88d15 100644
Binary files a/scripts/tif__00081263.pex and b/scripts/tif__00081263.pex differ
diff --git a/scripts/tif__00081275.pex b/scripts/tif__00081275.pex
index 537b2bec..82bcddc0 100644
Binary files a/scripts/tif__00081275.pex and b/scripts/tif__00081275.pex differ
diff --git a/scripts/tif__0008127a.pex b/scripts/tif__0008127a.pex
index 79b7783c..9122b1c6 100644
Binary files a/scripts/tif__0008127a.pex and b/scripts/tif__0008127a.pex differ
diff --git a/scripts/tif__00082405.pex b/scripts/tif__00082405.pex
index 98bc6747..965c95d7 100644
Binary files a/scripts/tif__00082405.pex and b/scripts/tif__00082405.pex differ
diff --git a/scripts/tif__00082408.pex b/scripts/tif__00082408.pex
index 2f658829..f031e8b6 100644
Binary files a/scripts/tif__00082408.pex and b/scripts/tif__00082408.pex differ
diff --git a/scripts/tif__0008240c.pex b/scripts/tif__0008240c.pex
index 5e7419cb..c392fa4d 100644
Binary files a/scripts/tif__0008240c.pex and b/scripts/tif__0008240c.pex differ
diff --git a/scripts/tif__00082411.pex b/scripts/tif__00082411.pex
index 19f224e2..4ea81def 100644
Binary files a/scripts/tif__00082411.pex and b/scripts/tif__00082411.pex differ
diff --git a/scripts/tif__0008592c.pex b/scripts/tif__0008592c.pex
index 7c385828..3e1fdbf1 100644
Binary files a/scripts/tif__0008592c.pex and b/scripts/tif__0008592c.pex differ
diff --git a/scripts/tif__00085930.pex b/scripts/tif__00085930.pex
index 9db0e5a8..48c3492b 100644
Binary files a/scripts/tif__00085930.pex and b/scripts/tif__00085930.pex differ
diff --git a/scripts/tif__00085931.pex b/scripts/tif__00085931.pex
index 09e9e331..a9143383 100644
Binary files a/scripts/tif__00085931.pex and b/scripts/tif__00085931.pex differ
diff --git a/scripts/tif__00085a6a.pex b/scripts/tif__00085a6a.pex
index a919c954..526fe093 100644
Binary files a/scripts/tif__00085a6a.pex and b/scripts/tif__00085a6a.pex differ
diff --git a/scripts/tif__0008665f.pex b/scripts/tif__0008665f.pex
index 53c2e008..6f9e47fd 100644
Binary files a/scripts/tif__0008665f.pex and b/scripts/tif__0008665f.pex differ
diff --git a/scripts/tif__00086664.pex b/scripts/tif__00086664.pex
index 3637b926..7616c183 100644
Binary files a/scripts/tif__00086664.pex and b/scripts/tif__00086664.pex differ
diff --git a/scripts/tif__00086666.pex b/scripts/tif__00086666.pex
index a764001b..64516244 100644
Binary files a/scripts/tif__00086666.pex and b/scripts/tif__00086666.pex differ
diff --git a/scripts/tif__00088cd8.pex b/scripts/tif__00088cd8.pex
index 54e047e7..ff0ee624 100644
Binary files a/scripts/tif__00088cd8.pex and b/scripts/tif__00088cd8.pex differ
diff --git a/scripts/tif__00088cd9.pex b/scripts/tif__00088cd9.pex
index 3b254a34..d767381b 100644
Binary files a/scripts/tif__00088cd9.pex and b/scripts/tif__00088cd9.pex differ
diff --git a/scripts/tif__000890d8.pex b/scripts/tif__000890d8.pex
index e1ebe772..f0c9a4ad 100644
Binary files a/scripts/tif__000890d8.pex and b/scripts/tif__000890d8.pex differ
diff --git a/scripts/tif__000890da.pex b/scripts/tif__000890da.pex
index 15e8bb4a..fd4ffc52 100644
Binary files a/scripts/tif__000890da.pex and b/scripts/tif__000890da.pex differ
diff --git a/scripts/tif__000890dd.pex b/scripts/tif__000890dd.pex
index 6ed76698..dd394e54 100644
Binary files a/scripts/tif__000890dd.pex and b/scripts/tif__000890dd.pex differ
diff --git a/scripts/tif__000890de.pex b/scripts/tif__000890de.pex
index 464be264..c40359ae 100644
Binary files a/scripts/tif__000890de.pex and b/scripts/tif__000890de.pex differ
diff --git a/scripts/tif__0008b2aa.pex b/scripts/tif__0008b2aa.pex
index a205e2b7..6c7529c0 100644
Binary files a/scripts/tif__0008b2aa.pex and b/scripts/tif__0008b2aa.pex differ
diff --git a/scripts/tif__0008b2ac.pex b/scripts/tif__0008b2ac.pex
index 7fa16412..50fda8a2 100644
Binary files a/scripts/tif__0008b2ac.pex and b/scripts/tif__0008b2ac.pex differ
diff --git a/scripts/tif__0008b2ad.pex b/scripts/tif__0008b2ad.pex
index 8826dfdb..0c89ade2 100644
Binary files a/scripts/tif__0008b2ad.pex and b/scripts/tif__0008b2ad.pex differ
diff --git a/scripts/tif__0008b2ae.pex b/scripts/tif__0008b2ae.pex
index f55b19da..50dfa692 100644
Binary files a/scripts/tif__0008b2ae.pex and b/scripts/tif__0008b2ae.pex differ
diff --git a/scripts/tif__0008b2af.pex b/scripts/tif__0008b2af.pex
index 8b1c2797..1ec9d861 100644
Binary files a/scripts/tif__0008b2af.pex and b/scripts/tif__0008b2af.pex differ
diff --git a/scripts/tif__0008d8ed.pex b/scripts/tif__0008d8ed.pex
index 4ae76bc8..c02576c9 100644
Binary files a/scripts/tif__0008d8ed.pex and b/scripts/tif__0008d8ed.pex differ
diff --git a/scripts/tif__0008d8ef.pex b/scripts/tif__0008d8ef.pex
index 3de081c7..2f06f8d7 100644
Binary files a/scripts/tif__0008d8ef.pex and b/scripts/tif__0008d8ef.pex differ
diff --git a/scripts/tif__0008d8f3.pex b/scripts/tif__0008d8f3.pex
index fe56212b..ebbf2b89 100644
Binary files a/scripts/tif__0008d8f3.pex and b/scripts/tif__0008d8f3.pex differ
diff --git a/scripts/tif__0008d8f7.pex b/scripts/tif__0008d8f7.pex
index 7900039b..c8acbcf3 100644
Binary files a/scripts/tif__0008d8f7.pex and b/scripts/tif__0008d8f7.pex differ
diff --git a/scripts/tif__0008e82f.pex b/scripts/tif__0008e82f.pex
index 7efb66e2..3e5255e2 100644
Binary files a/scripts/tif__0008e82f.pex and b/scripts/tif__0008e82f.pex differ
diff --git a/scripts/tif__0008e833.pex b/scripts/tif__0008e833.pex
index 7a7db0a3..38137890 100644
Binary files a/scripts/tif__0008e833.pex and b/scripts/tif__0008e833.pex differ
diff --git a/scripts/tif__0008e917.pex b/scripts/tif__0008e917.pex
index 034bc6c4..d5651710 100644
Binary files a/scripts/tif__0008e917.pex and b/scripts/tif__0008e917.pex differ
diff --git a/scripts/tif__0008f70f.pex b/scripts/tif__0008f70f.pex
index c3d7460d..ffa16b4f 100644
Binary files a/scripts/tif__0008f70f.pex and b/scripts/tif__0008f70f.pex differ
diff --git a/scripts/tif__0009042f.pex b/scripts/tif__0009042f.pex
index 7ac4aa8f..34ff8def 100644
Binary files a/scripts/tif__0009042f.pex and b/scripts/tif__0009042f.pex differ
diff --git a/scripts/tif__00090904.pex b/scripts/tif__00090904.pex
index fa1eb51b..7f976fbf 100644
Binary files a/scripts/tif__00090904.pex and b/scripts/tif__00090904.pex differ
diff --git a/scripts/tif__0009090e.pex b/scripts/tif__0009090e.pex
index ee0b805e..04eb5c71 100644
Binary files a/scripts/tif__0009090e.pex and b/scripts/tif__0009090e.pex differ
diff --git a/scripts/tif__00090912.pex b/scripts/tif__00090912.pex
index d4a712be..2d4c09bd 100644
Binary files a/scripts/tif__00090912.pex and b/scripts/tif__00090912.pex differ
diff --git a/scripts/tif__00090956.pex b/scripts/tif__00090956.pex
index 2477146d..ef68d0d3 100644
Binary files a/scripts/tif__00090956.pex and b/scripts/tif__00090956.pex differ
diff --git a/scripts/tif__00090957.pex b/scripts/tif__00090957.pex
index e0cc63e5..c25fb118 100644
Binary files a/scripts/tif__00090957.pex and b/scripts/tif__00090957.pex differ
diff --git a/scripts/tif__00090b7d.pex b/scripts/tif__00090b7d.pex
index 9f2a0b04..8274fbfd 100644
Binary files a/scripts/tif__00090b7d.pex and b/scripts/tif__00090b7d.pex differ
diff --git a/scripts/tif__00090b8a.pex b/scripts/tif__00090b8a.pex
index 1e356e70..0954250b 100644
Binary files a/scripts/tif__00090b8a.pex and b/scripts/tif__00090b8a.pex differ
diff --git a/scripts/tif__00090b8e.pex b/scripts/tif__00090b8e.pex
index 37c240ca..a9065837 100644
Binary files a/scripts/tif__00090b8e.pex and b/scripts/tif__00090b8e.pex differ
diff --git a/scripts/tif__00092a21.pex b/scripts/tif__00092a21.pex
index 7a542b1f..af921423 100644
Binary files a/scripts/tif__00092a21.pex and b/scripts/tif__00092a21.pex differ
diff --git a/scripts/tif__00092a25.pex b/scripts/tif__00092a25.pex
index 925d3918..718c0d54 100644
Binary files a/scripts/tif__00092a25.pex and b/scripts/tif__00092a25.pex differ
diff --git a/scripts/tif__00092a29.pex b/scripts/tif__00092a29.pex
index c116b668..d2c2a06f 100644
Binary files a/scripts/tif__00092a29.pex and b/scripts/tif__00092a29.pex differ
diff --git a/scripts/tif__00092a2c.pex b/scripts/tif__00092a2c.pex
index 1ead308f..6e32437a 100644
Binary files a/scripts/tif__00092a2c.pex and b/scripts/tif__00092a2c.pex differ
diff --git a/scripts/tif__00092a30.pex b/scripts/tif__00092a30.pex
index 08e43845..ad0a7fe1 100644
Binary files a/scripts/tif__00092a30.pex and b/scripts/tif__00092a30.pex differ
diff --git a/scripts/tif__00092a35.pex b/scripts/tif__00092a35.pex
index 60fe185b..ae121354 100644
Binary files a/scripts/tif__00092a35.pex and b/scripts/tif__00092a35.pex differ
diff --git a/scripts/tif__00095194.pex b/scripts/tif__00095194.pex
index daa40a13..ec3228cf 100644
Binary files a/scripts/tif__00095194.pex and b/scripts/tif__00095194.pex differ
diff --git a/scripts/tif__0009519c.pex b/scripts/tif__0009519c.pex
index 7966f600..b8288517 100644
Binary files a/scripts/tif__0009519c.pex and b/scripts/tif__0009519c.pex differ
diff --git a/scripts/tif__000951a0.pex b/scripts/tif__000951a0.pex
index 5f2cb4fd..9173ee6c 100644
Binary files a/scripts/tif__000951a0.pex and b/scripts/tif__000951a0.pex differ
diff --git a/scripts/tif__000951a3.pex b/scripts/tif__000951a3.pex
index 49e0258d..e7e14b1e 100644
Binary files a/scripts/tif__000951a3.pex and b/scripts/tif__000951a3.pex differ
diff --git a/scripts/tif__000951ad.pex b/scripts/tif__000951ad.pex
index 53a14270..d6f21cbd 100644
Binary files a/scripts/tif__000951ad.pex and b/scripts/tif__000951ad.pex differ
diff --git a/scripts/tif__000951b9.pex b/scripts/tif__000951b9.pex
index 35c77f67..f02ab775 100644
Binary files a/scripts/tif__000951b9.pex and b/scripts/tif__000951b9.pex differ
diff --git a/scripts/tif__000951cd.pex b/scripts/tif__000951cd.pex
index 0f44be48..596b4176 100644
Binary files a/scripts/tif__000951cd.pex and b/scripts/tif__000951cd.pex differ
diff --git a/scripts/tif__000951cf.pex b/scripts/tif__000951cf.pex
index ffda8c1f..8f64db6e 100644
Binary files a/scripts/tif__000951cf.pex and b/scripts/tif__000951cf.pex differ
diff --git a/scripts/tif__00096390.pex b/scripts/tif__00096390.pex
index cec348d9..f143e47c 100644
Binary files a/scripts/tif__00096390.pex and b/scripts/tif__00096390.pex differ
diff --git a/scripts/tif__00096391.pex b/scripts/tif__00096391.pex
index 08dcdbff..c195afb7 100644
Binary files a/scripts/tif__00096391.pex and b/scripts/tif__00096391.pex differ
diff --git a/scripts/tif__00096392.pex b/scripts/tif__00096392.pex
index e47789a7..ba6d9265 100644
Binary files a/scripts/tif__00096392.pex and b/scripts/tif__00096392.pex differ
diff --git a/scripts/tif__000967da.pex b/scripts/tif__000967da.pex
index 16a54710..1b34b232 100644
Binary files a/scripts/tif__000967da.pex and b/scripts/tif__000967da.pex differ
diff --git a/scripts/tif__000967dc.pex b/scripts/tif__000967dc.pex
index 2b50f593..3d678ffb 100644
Binary files a/scripts/tif__000967dc.pex and b/scripts/tif__000967dc.pex differ
diff --git a/scripts/tif__000967dd.pex b/scripts/tif__000967dd.pex
index 439f01a8..4daf80b1 100644
Binary files a/scripts/tif__000967dd.pex and b/scripts/tif__000967dd.pex differ
diff --git a/scripts/tif__000967de.pex b/scripts/tif__000967de.pex
index b148beea..1845a70e 100644
Binary files a/scripts/tif__000967de.pex and b/scripts/tif__000967de.pex differ
diff --git a/scripts/tif__000967e0.pex b/scripts/tif__000967e0.pex
index 7331f6fc..6849ca9f 100644
Binary files a/scripts/tif__000967e0.pex and b/scripts/tif__000967e0.pex differ
diff --git a/scripts/tif__00096c61.pex b/scripts/tif__00096c61.pex
index fcfeb80f..3d66ba42 100644
Binary files a/scripts/tif__00096c61.pex and b/scripts/tif__00096c61.pex differ
diff --git a/scripts/tif__00097cff.pex b/scripts/tif__00097cff.pex
index 81b28908..71156b02 100644
Binary files a/scripts/tif__00097cff.pex and b/scripts/tif__00097cff.pex differ
diff --git a/scripts/tif__0009855f.pex b/scripts/tif__0009855f.pex
index e05d17ce..061e138f 100644
Binary files a/scripts/tif__0009855f.pex and b/scripts/tif__0009855f.pex differ
diff --git a/scripts/tif__00098560.pex b/scripts/tif__00098560.pex
index 356ce959..90211573 100644
Binary files a/scripts/tif__00098560.pex and b/scripts/tif__00098560.pex differ
diff --git a/scripts/tif__0009aa06.pex b/scripts/tif__0009aa06.pex
index b387a7c3..648fedae 100644
Binary files a/scripts/tif__0009aa06.pex and b/scripts/tif__0009aa06.pex differ
diff --git a/scripts/tif__0009b69d.pex b/scripts/tif__0009b69d.pex
index fd9e4502..364fdc6e 100644
Binary files a/scripts/tif__0009b69d.pex and b/scripts/tif__0009b69d.pex differ
diff --git a/scripts/tif__0009b6bf.pex b/scripts/tif__0009b6bf.pex
index 8ea7bb3d..47c0e6ad 100644
Binary files a/scripts/tif__0009b6bf.pex and b/scripts/tif__0009b6bf.pex differ
diff --git a/scripts/tif__0009b6c4.pex b/scripts/tif__0009b6c4.pex
index f639ff80..7798f197 100644
Binary files a/scripts/tif__0009b6c4.pex and b/scripts/tif__0009b6c4.pex differ
diff --git a/scripts/tif__0009b6c8.pex b/scripts/tif__0009b6c8.pex
index af5016a8..9607c764 100644
Binary files a/scripts/tif__0009b6c8.pex and b/scripts/tif__0009b6c8.pex differ
diff --git a/scripts/tif__0009cfc5.pex b/scripts/tif__0009cfc5.pex
index af1ba62b..8583fadb 100644
Binary files a/scripts/tif__0009cfc5.pex and b/scripts/tif__0009cfc5.pex differ
diff --git a/scripts/tif__0009cfca.pex b/scripts/tif__0009cfca.pex
index c0bc800d..74ad40b9 100644
Binary files a/scripts/tif__0009cfca.pex and b/scripts/tif__0009cfca.pex differ
diff --git a/scripts/tif__0009fce5.pex b/scripts/tif__0009fce5.pex
index bb897848..d0a92892 100644
Binary files a/scripts/tif__0009fce5.pex and b/scripts/tif__0009fce5.pex differ
diff --git a/scripts/tif__000a5811.pex b/scripts/tif__000a5811.pex
index 8969a1e4..6b5575ba 100644
Binary files a/scripts/tif__000a5811.pex and b/scripts/tif__000a5811.pex differ
diff --git a/scripts/tif__000a5812.pex b/scripts/tif__000a5812.pex
index e8558f8c..8337b2c4 100644
Binary files a/scripts/tif__000a5812.pex and b/scripts/tif__000a5812.pex differ
diff --git a/scripts/tif__000a5813.pex b/scripts/tif__000a5813.pex
index 63b01240..bc165329 100644
Binary files a/scripts/tif__000a5813.pex and b/scripts/tif__000a5813.pex differ
diff --git a/scripts/tif__000a5817.pex b/scripts/tif__000a5817.pex
index 65483084..4b30602f 100644
Binary files a/scripts/tif__000a5817.pex and b/scripts/tif__000a5817.pex differ
diff --git a/scripts/tif__000a7049.pex b/scripts/tif__000a7049.pex
index 8481adaf..93c83699 100644
Binary files a/scripts/tif__000a7049.pex and b/scripts/tif__000a7049.pex differ
diff --git a/scripts/tif__000a7050.pex b/scripts/tif__000a7050.pex
index a7e4637d..522bcdf9 100644
Binary files a/scripts/tif__000a7050.pex and b/scripts/tif__000a7050.pex differ
diff --git a/scripts/tif__000a7fa3.pex b/scripts/tif__000a7fa3.pex
index 821add36..7a99d7b8 100644
Binary files a/scripts/tif__000a7fa3.pex and b/scripts/tif__000a7fa3.pex differ
diff --git a/scripts/tif__000a8355.pex b/scripts/tif__000a8355.pex
index 550e431e..195f3714 100644
Binary files a/scripts/tif__000a8355.pex and b/scripts/tif__000a8355.pex differ
diff --git a/scripts/tif__000a8359.pex b/scripts/tif__000a8359.pex
index c247762e..ed72eeb0 100644
Binary files a/scripts/tif__000a8359.pex and b/scripts/tif__000a8359.pex differ
diff --git a/scripts/tif__000a836e.pex b/scripts/tif__000a836e.pex
index 7b6c9246..fa88fbd2 100644
Binary files a/scripts/tif__000a836e.pex and b/scripts/tif__000a836e.pex differ
diff --git a/scripts/tif__000a8370.pex b/scripts/tif__000a8370.pex
index e1bcf702..bb517470 100644
Binary files a/scripts/tif__000a8370.pex and b/scripts/tif__000a8370.pex differ
diff --git a/scripts/tif__000a8372.pex b/scripts/tif__000a8372.pex
index 46036364..52b586c0 100644
Binary files a/scripts/tif__000a8372.pex and b/scripts/tif__000a8372.pex differ
diff --git a/scripts/tif__000a8375.pex b/scripts/tif__000a8375.pex
index e4fe8fe3..525e58fb 100644
Binary files a/scripts/tif__000a8375.pex and b/scripts/tif__000a8375.pex differ
diff --git a/scripts/tif__000a8378.pex b/scripts/tif__000a8378.pex
index 48ea695c..69e197ed 100644
Binary files a/scripts/tif__000a8378.pex and b/scripts/tif__000a8378.pex differ
diff --git a/scripts/tif__000a8386.pex b/scripts/tif__000a8386.pex
index 10bccfb4..6e54e887 100644
Binary files a/scripts/tif__000a8386.pex and b/scripts/tif__000a8386.pex differ
diff --git a/scripts/tif__000a8395.pex b/scripts/tif__000a8395.pex
index 7695ee3f..55b7c8a2 100644
Binary files a/scripts/tif__000a8395.pex and b/scripts/tif__000a8395.pex differ
diff --git a/scripts/tif__000a8396.pex b/scripts/tif__000a8396.pex
index e948ab58..17f0fcc5 100644
Binary files a/scripts/tif__000a8396.pex and b/scripts/tif__000a8396.pex differ
diff --git a/scripts/tif__000ac7bc.pex b/scripts/tif__000ac7bc.pex
index 3a94c208..d6b19821 100644
Binary files a/scripts/tif__000ac7bc.pex and b/scripts/tif__000ac7bc.pex differ
diff --git a/scripts/tif__000ace1c.pex b/scripts/tif__000ace1c.pex
index 91576e13..49988f3f 100644
Binary files a/scripts/tif__000ace1c.pex and b/scripts/tif__000ace1c.pex differ
diff --git a/scripts/tif__000b35c0.pex b/scripts/tif__000b35c0.pex
index a3aef466..c490500f 100644
Binary files a/scripts/tif__000b35c0.pex and b/scripts/tif__000b35c0.pex differ
diff --git a/scripts/tif__000c3fe0.pex b/scripts/tif__000c3fe0.pex
index 75ac49ae..b1e34eba 100644
Binary files a/scripts/tif__000c3fe0.pex and b/scripts/tif__000c3fe0.pex differ
diff --git a/scripts/tif__000c3fe4.pex b/scripts/tif__000c3fe4.pex
index 8ba8a351..93ca5503 100644
Binary files a/scripts/tif__000c3fe4.pex and b/scripts/tif__000c3fe4.pex differ
diff --git a/scripts/tif__000c55d4.pex b/scripts/tif__000c55d4.pex
index 05768a4c..596bde48 100644
Binary files a/scripts/tif__000c55d4.pex and b/scripts/tif__000c55d4.pex differ
diff --git a/scripts/tif__000c55da.pex b/scripts/tif__000c55da.pex
index 6c8d3999..16797c15 100644
Binary files a/scripts/tif__000c55da.pex and b/scripts/tif__000c55da.pex differ
diff --git a/scripts/tif__000c55e0.pex b/scripts/tif__000c55e0.pex
index 3633af97..cd5bfe29 100644
Binary files a/scripts/tif__000c55e0.pex and b/scripts/tif__000c55e0.pex differ
diff --git a/scripts/tif__000c6570.pex b/scripts/tif__000c6570.pex
index 12fed685..ac118837 100644
Binary files a/scripts/tif__000c6570.pex and b/scripts/tif__000c6570.pex differ
diff --git a/scripts/tif__000c6571.pex b/scripts/tif__000c6571.pex
index 2b35183e..d4001c8f 100644
Binary files a/scripts/tif__000c6571.pex and b/scripts/tif__000c6571.pex differ
diff --git a/scripts/tif__000c6578.pex b/scripts/tif__000c6578.pex
index 3234db7f..32b55b84 100644
Binary files a/scripts/tif__000c6578.pex and b/scripts/tif__000c6578.pex differ
diff --git a/scripts/tif__000c6583.pex b/scripts/tif__000c6583.pex
index 9d53144a..44977400 100644
Binary files a/scripts/tif__000c6583.pex and b/scripts/tif__000c6583.pex differ
diff --git a/scripts/tif__000c6589.pex b/scripts/tif__000c6589.pex
index c9714821..2a402167 100644
Binary files a/scripts/tif__000c6589.pex and b/scripts/tif__000c6589.pex differ
diff --git a/scripts/tif__000c669a.pex b/scripts/tif__000c669a.pex
index c8fae152..32816af8 100644
Binary files a/scripts/tif__000c669a.pex and b/scripts/tif__000c669a.pex differ
diff --git a/scripts/tif__000c669e.pex b/scripts/tif__000c669e.pex
index 7067cc70..cc2e35fb 100644
Binary files a/scripts/tif__000c669e.pex and b/scripts/tif__000c669e.pex differ
diff --git a/scripts/tif__000c66a2.pex b/scripts/tif__000c66a2.pex
index e30ecd34..8ef2723e 100644
Binary files a/scripts/tif__000c66a2.pex and b/scripts/tif__000c66a2.pex differ
diff --git a/scripts/tif__000c66a3.pex b/scripts/tif__000c66a3.pex
index 7890084b..83c796f0 100644
Binary files a/scripts/tif__000c66a3.pex and b/scripts/tif__000c66a3.pex differ
diff --git a/scripts/tif__000c66a5.pex b/scripts/tif__000c66a5.pex
index ca5899ec..3ccb1887 100644
Binary files a/scripts/tif__000c66a5.pex and b/scripts/tif__000c66a5.pex differ
diff --git a/scripts/tif__000c66a7.pex b/scripts/tif__000c66a7.pex
index f5c632ed..6e23fd8b 100644
Binary files a/scripts/tif__000c66a7.pex and b/scripts/tif__000c66a7.pex differ
diff --git a/scripts/tif__000c66a8.pex b/scripts/tif__000c66a8.pex
index e2575191..f1e2fcfb 100644
Binary files a/scripts/tif__000c66a8.pex and b/scripts/tif__000c66a8.pex differ
diff --git a/scripts/tif__000c66b7.pex b/scripts/tif__000c66b7.pex
index 462495e7..e844c130 100644
Binary files a/scripts/tif__000c66b7.pex and b/scripts/tif__000c66b7.pex differ
diff --git a/scripts/tif__000c66b8.pex b/scripts/tif__000c66b8.pex
index 89df6372..511e5b7e 100644
Binary files a/scripts/tif__000c66b8.pex and b/scripts/tif__000c66b8.pex differ
diff --git a/scripts/tif__000c66bf.pex b/scripts/tif__000c66bf.pex
index ffa4ed78..bdcf8af4 100644
Binary files a/scripts/tif__000c66bf.pex and b/scripts/tif__000c66bf.pex differ
diff --git a/scripts/tif__000c66c0.pex b/scripts/tif__000c66c0.pex
index 33559631..99e4cb43 100644
Binary files a/scripts/tif__000c66c0.pex and b/scripts/tif__000c66c0.pex differ
diff --git a/scripts/tif__000cad6b.pex b/scripts/tif__000cad6b.pex
index ba678946..99732abd 100644
Binary files a/scripts/tif__000cad6b.pex and b/scripts/tif__000cad6b.pex differ
diff --git a/scripts/tif__000cc885.pex b/scripts/tif__000cc885.pex
index f932ecc7..7e75259f 100644
Binary files a/scripts/tif__000cc885.pex and b/scripts/tif__000cc885.pex differ
diff --git a/scripts/tif__000cc88a.pex b/scripts/tif__000cc88a.pex
index 4de6f230..0fdb606d 100644
Binary files a/scripts/tif__000cc88a.pex and b/scripts/tif__000cc88a.pex differ
diff --git a/scripts/tif__000ce01a.pex b/scripts/tif__000ce01a.pex
index 53b78c3c..df09b809 100644
Binary files a/scripts/tif__000ce01a.pex and b/scripts/tif__000ce01a.pex differ
diff --git a/scripts/tif__000ce01b.pex b/scripts/tif__000ce01b.pex
index e5c547f3..3e7ccabb 100644
Binary files a/scripts/tif__000ce01b.pex and b/scripts/tif__000ce01b.pex differ
diff --git a/scripts/tif__000ce023.pex b/scripts/tif__000ce023.pex
index 14e6c3b5..136838c5 100644
Binary files a/scripts/tif__000ce023.pex and b/scripts/tif__000ce023.pex differ
diff --git a/scripts/tif__000ce024.pex b/scripts/tif__000ce024.pex
index a85590aa..69567bd8 100644
Binary files a/scripts/tif__000ce024.pex and b/scripts/tif__000ce024.pex differ
diff --git a/scripts/tif__000ce02d.pex b/scripts/tif__000ce02d.pex
index 0691ba5c..6e9a6c78 100644
Binary files a/scripts/tif__000ce02d.pex and b/scripts/tif__000ce02d.pex differ
diff --git a/scripts/tif__000ce0dd.pex b/scripts/tif__000ce0dd.pex
index 4dcc4f71..92f087c1 100644
Binary files a/scripts/tif__000ce0dd.pex and b/scripts/tif__000ce0dd.pex differ
diff --git a/scripts/tif__000ce0e0.pex b/scripts/tif__000ce0e0.pex
index 7185ec1b..9179c545 100644
Binary files a/scripts/tif__000ce0e0.pex and b/scripts/tif__000ce0e0.pex differ
diff --git a/scripts/tif__000ce0e1.pex b/scripts/tif__000ce0e1.pex
index edf1413e..d517ffd2 100644
Binary files a/scripts/tif__000ce0e1.pex and b/scripts/tif__000ce0e1.pex differ
diff --git a/scripts/tif__000ce0e4.pex b/scripts/tif__000ce0e4.pex
index c5fe6533..6526801d 100644
Binary files a/scripts/tif__000ce0e4.pex and b/scripts/tif__000ce0e4.pex differ
diff --git a/scripts/tif__000ce0e6.pex b/scripts/tif__000ce0e6.pex
index a52e2efe..3665505b 100644
Binary files a/scripts/tif__000ce0e6.pex and b/scripts/tif__000ce0e6.pex differ
diff --git a/scripts/tif__000ce0f8.pex b/scripts/tif__000ce0f8.pex
index de00d58a..133ee829 100644
Binary files a/scripts/tif__000ce0f8.pex and b/scripts/tif__000ce0f8.pex differ
diff --git a/scripts/tif__000ce0fa.pex b/scripts/tif__000ce0fa.pex
index d4cf0ad0..a1ac3997 100644
Binary files a/scripts/tif__000ce0fa.pex and b/scripts/tif__000ce0fa.pex differ
diff --git a/scripts/tif__000ce114.pex b/scripts/tif__000ce114.pex
index ae18d8f4..32e63d6e 100644
Binary files a/scripts/tif__000ce114.pex and b/scripts/tif__000ce114.pex differ
diff --git a/scripts/tif__000ce11e.pex b/scripts/tif__000ce11e.pex
index 4a8c074f..7ad59c4d 100644
Binary files a/scripts/tif__000ce11e.pex and b/scripts/tif__000ce11e.pex differ
diff --git a/scripts/tif__000ce11f.pex b/scripts/tif__000ce11f.pex
index aee3e7c0..dea94167 100644
Binary files a/scripts/tif__000ce11f.pex and b/scripts/tif__000ce11f.pex differ
diff --git a/scripts/tif__000ce307.pex b/scripts/tif__000ce307.pex
index a48591c2..4932e626 100644
Binary files a/scripts/tif__000ce307.pex and b/scripts/tif__000ce307.pex differ
diff --git a/scripts/tif__000d03f6.pex b/scripts/tif__000d03f6.pex
index 896f48f1..a993a1d2 100644
Binary files a/scripts/tif__000d03f6.pex and b/scripts/tif__000d03f6.pex differ
diff --git a/scripts/tif__000d03fd.pex b/scripts/tif__000d03fd.pex
index f7721b8c..2c93a724 100644
Binary files a/scripts/tif__000d03fd.pex and b/scripts/tif__000d03fd.pex differ
diff --git a/scripts/tif__000d03fe.pex b/scripts/tif__000d03fe.pex
index 1f87c721..1b9953ff 100644
Binary files a/scripts/tif__000d03fe.pex and b/scripts/tif__000d03fe.pex differ
diff --git a/scripts/tif__000d0404.pex b/scripts/tif__000d0404.pex
index bcfcb577..e7a37f79 100644
Binary files a/scripts/tif__000d0404.pex and b/scripts/tif__000d0404.pex differ
diff --git a/scripts/tif__000d0406.pex b/scripts/tif__000d0406.pex
index 27365fe5..46b1a6db 100644
Binary files a/scripts/tif__000d0406.pex and b/scripts/tif__000d0406.pex differ
diff --git a/scripts/tif__000d22cb.pex b/scripts/tif__000d22cb.pex
index 71abfe85..8e224182 100644
Binary files a/scripts/tif__000d22cb.pex and b/scripts/tif__000d22cb.pex differ
diff --git a/scripts/tif__000d8e45.pex b/scripts/tif__000d8e45.pex
index 5e33e8ce..edeb225f 100644
Binary files a/scripts/tif__000d8e45.pex and b/scripts/tif__000d8e45.pex differ
diff --git a/scripts/tif__000d8e4a.pex b/scripts/tif__000d8e4a.pex
index f61cbcb7..222b7831 100644
Binary files a/scripts/tif__000d8e4a.pex and b/scripts/tif__000d8e4a.pex differ
diff --git a/scripts/tif__000d8e52.pex b/scripts/tif__000d8e52.pex
index 7ec4bea3..6e93cb53 100644
Binary files a/scripts/tif__000d8e52.pex and b/scripts/tif__000d8e52.pex differ
diff --git a/scripts/tif__000d8e55.pex b/scripts/tif__000d8e55.pex
index fdc9ff37..5c089c40 100644
Binary files a/scripts/tif__000d8e55.pex and b/scripts/tif__000d8e55.pex differ
diff --git a/scripts/tif__000d8e5b.pex b/scripts/tif__000d8e5b.pex
index 9931c962..250bc8d4 100644
Binary files a/scripts/tif__000d8e5b.pex and b/scripts/tif__000d8e5b.pex differ
diff --git a/scripts/tif__000d8e5e.pex b/scripts/tif__000d8e5e.pex
index ee232647..4ae3d066 100644
Binary files a/scripts/tif__000d8e5e.pex and b/scripts/tif__000d8e5e.pex differ
diff --git a/scripts/tif__000d8e65.pex b/scripts/tif__000d8e65.pex
index b5e90bac..c3136757 100644
Binary files a/scripts/tif__000d8e65.pex and b/scripts/tif__000d8e65.pex differ
diff --git a/scripts/tif__000d9b37.pex b/scripts/tif__000d9b37.pex
index 3cc2d1c8..4801491d 100644
Binary files a/scripts/tif__000d9b37.pex and b/scripts/tif__000d9b37.pex differ
diff --git a/scripts/tif__000d9b47.pex b/scripts/tif__000d9b47.pex
index c29a19a0..607518f2 100644
Binary files a/scripts/tif__000d9b47.pex and b/scripts/tif__000d9b47.pex differ
diff --git a/scripts/tif__000d9b4c.pex b/scripts/tif__000d9b4c.pex
index e236e80a..cffae015 100644
Binary files a/scripts/tif__000d9b4c.pex and b/scripts/tif__000d9b4c.pex differ
diff --git a/scripts/tif__000dd6da.pex b/scripts/tif__000dd6da.pex
index 7732e3d0..b490afd3 100644
Binary files a/scripts/tif__000dd6da.pex and b/scripts/tif__000dd6da.pex differ
diff --git a/scripts/tif__000dd6dc.pex b/scripts/tif__000dd6dc.pex
index 109d7e33..f66053c5 100644
Binary files a/scripts/tif__000dd6dc.pex and b/scripts/tif__000dd6dc.pex differ
diff --git a/scripts/tif__000dd6e1.pex b/scripts/tif__000dd6e1.pex
index 9497e2d4..0e1d37fe 100644
Binary files a/scripts/tif__000dd6e1.pex and b/scripts/tif__000dd6e1.pex differ
diff --git a/scripts/tif__000dd6e9.pex b/scripts/tif__000dd6e9.pex
index 657d3a51..c2ddae3b 100644
Binary files a/scripts/tif__000dd6e9.pex and b/scripts/tif__000dd6e9.pex differ
diff --git a/scripts/tif__000dd6ee.pex b/scripts/tif__000dd6ee.pex
index ca07dbfa..7e3c6c68 100644
Binary files a/scripts/tif__000dd6ee.pex and b/scripts/tif__000dd6ee.pex differ
diff --git a/scripts/tif__000dd6f7.pex b/scripts/tif__000dd6f7.pex
index d4070f31..782a4864 100644
Binary files a/scripts/tif__000dd6f7.pex and b/scripts/tif__000dd6f7.pex differ
diff --git a/scripts/tif__000dd6f8.pex b/scripts/tif__000dd6f8.pex
index 67b62620..1948cc35 100644
Binary files a/scripts/tif__000dd6f8.pex and b/scripts/tif__000dd6f8.pex differ
diff --git a/scripts/tif__000de6fe.pex b/scripts/tif__000de6fe.pex
index 4293a95f..cef2968d 100644
Binary files a/scripts/tif__000de6fe.pex and b/scripts/tif__000de6fe.pex differ
diff --git a/scripts/tif__000e03cd.pex b/scripts/tif__000e03cd.pex
index 00fc835e..2631e15b 100644
Binary files a/scripts/tif__000e03cd.pex and b/scripts/tif__000e03cd.pex differ
diff --git a/scripts/tif__000e041b.pex b/scripts/tif__000e041b.pex
index d1691f8c..9a2dcca0 100644
Binary files a/scripts/tif__000e041b.pex and b/scripts/tif__000e041b.pex differ
diff --git a/scripts/tif__000e0420.pex b/scripts/tif__000e0420.pex
index 92c09417..8649536e 100644
Binary files a/scripts/tif__000e0420.pex and b/scripts/tif__000e0420.pex differ
diff --git a/scripts/tif__000e0424.pex b/scripts/tif__000e0424.pex
index 495eb450..df998b19 100644
Binary files a/scripts/tif__000e0424.pex and b/scripts/tif__000e0424.pex differ
diff --git a/scripts/tif__000e0427.pex b/scripts/tif__000e0427.pex
index 5dc8b000..b880f7fe 100644
Binary files a/scripts/tif__000e0427.pex and b/scripts/tif__000e0427.pex differ
diff --git a/scripts/tif__000e42bb.pex b/scripts/tif__000e42bb.pex
index d5a2c155..57fb04ba 100644
Binary files a/scripts/tif__000e42bb.pex and b/scripts/tif__000e42bb.pex differ
diff --git a/scripts/tif__000e42bc.pex b/scripts/tif__000e42bc.pex
index 37975b6a..3383ce9e 100644
Binary files a/scripts/tif__000e42bc.pex and b/scripts/tif__000e42bc.pex differ
diff --git a/scripts/tif__000e42cc.pex b/scripts/tif__000e42cc.pex
index b14b70f1..3266bf5b 100644
Binary files a/scripts/tif__000e42cc.pex and b/scripts/tif__000e42cc.pex differ
diff --git a/scripts/tif__000e42cd.pex b/scripts/tif__000e42cd.pex
index e8321260..f8faf968 100644
Binary files a/scripts/tif__000e42cd.pex and b/scripts/tif__000e42cd.pex differ
diff --git a/scripts/tif__000e42ce.pex b/scripts/tif__000e42ce.pex
index 38955ab2..189c0f96 100644
Binary files a/scripts/tif__000e42ce.pex and b/scripts/tif__000e42ce.pex differ
diff --git a/scripts/tif__000e486e.pex b/scripts/tif__000e486e.pex
index eb6b48e0..688a4568 100644
Binary files a/scripts/tif__000e486e.pex and b/scripts/tif__000e486e.pex differ
diff --git a/scripts/tif__000e4874.pex b/scripts/tif__000e4874.pex
index b3a8d41b..52240540 100644
Binary files a/scripts/tif__000e4874.pex and b/scripts/tif__000e4874.pex differ
diff --git a/scripts/tif__000e487b.pex b/scripts/tif__000e487b.pex
index 6ee2ecdf..deaa14ed 100644
Binary files a/scripts/tif__000e487b.pex and b/scripts/tif__000e487b.pex differ
diff --git a/scripts/tif__000e487d.pex b/scripts/tif__000e487d.pex
index 66c6ece8..3dcc0ea6 100644
Binary files a/scripts/tif__000e487d.pex and b/scripts/tif__000e487d.pex differ
diff --git a/scripts/tif__000e4884.pex b/scripts/tif__000e4884.pex
index fa5bb8d6..ba1070f1 100644
Binary files a/scripts/tif__000e4884.pex and b/scripts/tif__000e4884.pex differ
diff --git a/scripts/tif__000e99ed.pex b/scripts/tif__000e99ed.pex
index 32add24b..50c4c4ea 100644
Binary files a/scripts/tif__000e99ed.pex and b/scripts/tif__000e99ed.pex differ
diff --git a/scripts/tif__000e99f0.pex b/scripts/tif__000e99f0.pex
index 5f41259c..f0e74e18 100644
Binary files a/scripts/tif__000e99f0.pex and b/scripts/tif__000e99f0.pex differ
diff --git a/scripts/tif__000ea938.pex b/scripts/tif__000ea938.pex
index bef49694..1e051aa3 100644
Binary files a/scripts/tif__000ea938.pex and b/scripts/tif__000ea938.pex differ
diff --git a/scripts/tif__000ea939.pex b/scripts/tif__000ea939.pex
index adfe03e2..74ae1eec 100644
Binary files a/scripts/tif__000ea939.pex and b/scripts/tif__000ea939.pex differ
diff --git a/scripts/tif__000ea943.pex b/scripts/tif__000ea943.pex
index 8dc90f34..37e4f99b 100644
Binary files a/scripts/tif__000ea943.pex and b/scripts/tif__000ea943.pex differ
diff --git a/scripts/tif__000ea966.pex b/scripts/tif__000ea966.pex
index f7a37c6c..c9476423 100644
Binary files a/scripts/tif__000ea966.pex and b/scripts/tif__000ea966.pex differ
diff --git a/scripts/tif__000ea967.pex b/scripts/tif__000ea967.pex
index 73ecc5d5..9320dc7f 100644
Binary files a/scripts/tif__000ea967.pex and b/scripts/tif__000ea967.pex differ
diff --git a/scripts/tif__000eaa86.pex b/scripts/tif__000eaa86.pex
index d745b29b..264b5502 100644
Binary files a/scripts/tif__000eaa86.pex and b/scripts/tif__000eaa86.pex differ
diff --git a/scripts/tif__000eabf4.pex b/scripts/tif__000eabf4.pex
index 84d8db38..8db01fa6 100644
Binary files a/scripts/tif__000eabf4.pex and b/scripts/tif__000eabf4.pex differ
diff --git a/scripts/tif__000eabf8.pex b/scripts/tif__000eabf8.pex
index fe94d467..b4a06050 100644
Binary files a/scripts/tif__000eabf8.pex and b/scripts/tif__000eabf8.pex differ
diff --git a/scripts/tif__000eac01.pex b/scripts/tif__000eac01.pex
index 40b81979..b230aad1 100644
Binary files a/scripts/tif__000eac01.pex and b/scripts/tif__000eac01.pex differ
diff --git a/scripts/tif__000eacf6.pex b/scripts/tif__000eacf6.pex
index e324bce7..7b082cfd 100644
Binary files a/scripts/tif__000eacf6.pex and b/scripts/tif__000eacf6.pex differ
diff --git a/scripts/tif__000eacfb.pex b/scripts/tif__000eacfb.pex
index cecc6d95..b33b1bcc 100644
Binary files a/scripts/tif__000eacfb.pex and b/scripts/tif__000eacfb.pex differ
diff --git a/scripts/tif__000eacfe.pex b/scripts/tif__000eacfe.pex
index a71289ad..aed6ca69 100644
Binary files a/scripts/tif__000eacfe.pex and b/scripts/tif__000eacfe.pex differ
diff --git a/scripts/tif__000ead01.pex b/scripts/tif__000ead01.pex
index 519e7036..7435adc5 100644
Binary files a/scripts/tif__000ead01.pex and b/scripts/tif__000ead01.pex differ
diff --git a/scripts/tif__000ead07.pex b/scripts/tif__000ead07.pex
index 7ba826a0..711ca5e7 100644
Binary files a/scripts/tif__000ead07.pex and b/scripts/tif__000ead07.pex differ
diff --git a/scripts/tif__000ead1a.pex b/scripts/tif__000ead1a.pex
index 5dd2d0f0..c60081ce 100644
Binary files a/scripts/tif__000ead1a.pex and b/scripts/tif__000ead1a.pex differ
diff --git a/scripts/tif__000ead2c.pex b/scripts/tif__000ead2c.pex
index a03ba4a6..784841f8 100644
Binary files a/scripts/tif__000ead2c.pex and b/scripts/tif__000ead2c.pex differ
diff --git a/scripts/tif__000ead36.pex b/scripts/tif__000ead36.pex
index 96c3359a..cd048a35 100644
Binary files a/scripts/tif__000ead36.pex and b/scripts/tif__000ead36.pex differ
diff --git a/scripts/tif__000ead3f.pex b/scripts/tif__000ead3f.pex
index f69d35a1..90dd4f00 100644
Binary files a/scripts/tif__000ead3f.pex and b/scripts/tif__000ead3f.pex differ
diff --git a/scripts/tif__000eb3b4.pex b/scripts/tif__000eb3b4.pex
index 3dd93e6f..6648421a 100644
Binary files a/scripts/tif__000eb3b4.pex and b/scripts/tif__000eb3b4.pex differ
diff --git a/scripts/tif__000f7668.pex b/scripts/tif__000f7668.pex
index c2b09adb..ecc4dbb8 100644
Binary files a/scripts/tif__000f7668.pex and b/scripts/tif__000f7668.pex differ
diff --git a/scripts/tif__000f766d.pex b/scripts/tif__000f766d.pex
index 3db59b8a..ba2eee4f 100644
Binary files a/scripts/tif__000f766d.pex and b/scripts/tif__000f766d.pex differ
diff --git a/scripts/tif__000f7670.pex b/scripts/tif__000f7670.pex
index 7876fc91..d51b6b7e 100644
Binary files a/scripts/tif__000f7670.pex and b/scripts/tif__000f7670.pex differ
diff --git a/scripts/tif__000f7688.pex b/scripts/tif__000f7688.pex
index e0f8c2de..e885c96e 100644
Binary files a/scripts/tif__000f7688.pex and b/scripts/tif__000f7688.pex differ
diff --git a/scripts/tif__000fe127.pex b/scripts/tif__000fe127.pex
index 8bbd2287..471ce77b 100644
Binary files a/scripts/tif__000fe127.pex and b/scripts/tif__000fe127.pex differ
diff --git a/scripts/tif__000fe12c.pex b/scripts/tif__000fe12c.pex
index 68bfc4dd..24243c6d 100644
Binary files a/scripts/tif__000fe12c.pex and b/scripts/tif__000fe12c.pex differ
diff --git a/scripts/tif__00102980.pex b/scripts/tif__00102980.pex
index 4b9d95bf..9c1631f8 100644
Binary files a/scripts/tif__00102980.pex and b/scripts/tif__00102980.pex differ
diff --git a/scripts/tif__00102981.pex b/scripts/tif__00102981.pex
index b521adfb..18fd2822 100644
Binary files a/scripts/tif__00102981.pex and b/scripts/tif__00102981.pex differ
diff --git a/scripts/tif__00102992.pex b/scripts/tif__00102992.pex
index ceb0e87a..c995318c 100644
Binary files a/scripts/tif__00102992.pex and b/scripts/tif__00102992.pex differ
diff --git a/scripts/tif__00102997.pex b/scripts/tif__00102997.pex
index 3fdba108..86daf34c 100644
Binary files a/scripts/tif__00102997.pex and b/scripts/tif__00102997.pex differ
diff --git a/scripts/tif__00103599.pex b/scripts/tif__00103599.pex
index 9f930757..ccd0403c 100644
Binary files a/scripts/tif__00103599.pex and b/scripts/tif__00103599.pex differ
diff --git a/scripts/tif__001035a8.pex b/scripts/tif__001035a8.pex
index 76e1cc9e..916eed13 100644
Binary files a/scripts/tif__001035a8.pex and b/scripts/tif__001035a8.pex differ
diff --git a/scripts/tif__0010644f.pex b/scripts/tif__0010644f.pex
index 0e6aa842..73b8e3ab 100644
Binary files a/scripts/tif__0010644f.pex and b/scripts/tif__0010644f.pex differ
diff --git a/scripts/tif__00106453.pex b/scripts/tif__00106453.pex
index 84e16603..04dc13ed 100644
Binary files a/scripts/tif__00106453.pex and b/scripts/tif__00106453.pex differ
diff --git a/scripts/tif__00106455.pex b/scripts/tif__00106455.pex
index af33f082..7ba1b17f 100644
Binary files a/scripts/tif__00106455.pex and b/scripts/tif__00106455.pex differ
diff --git a/scripts/tif__0010646b.pex b/scripts/tif__0010646b.pex
index a1f21067..9ecdb207 100644
Binary files a/scripts/tif__0010646b.pex and b/scripts/tif__0010646b.pex differ
diff --git a/scripts/tif__0010646f.pex b/scripts/tif__0010646f.pex
index 0856569a..4381988e 100644
Binary files a/scripts/tif__0010646f.pex and b/scripts/tif__0010646f.pex differ
diff --git a/scripts/tif__0010647e.pex b/scripts/tif__0010647e.pex
index fb424d62..e17dc923 100644
Binary files a/scripts/tif__0010647e.pex and b/scripts/tif__0010647e.pex differ
diff --git a/scripts/tif__00106485.pex b/scripts/tif__00106485.pex
index dca365c6..0df9c2d1 100644
Binary files a/scripts/tif__00106485.pex and b/scripts/tif__00106485.pex differ
diff --git a/scripts/tif__0010648e.pex b/scripts/tif__0010648e.pex
index 468ded0c..66234186 100644
Binary files a/scripts/tif__0010648e.pex and b/scripts/tif__0010648e.pex differ
diff --git a/scripts/tif__00106496.pex b/scripts/tif__00106496.pex
index e7e9c8ba..fb53be9f 100644
Binary files a/scripts/tif__00106496.pex and b/scripts/tif__00106496.pex differ
diff --git a/scripts/tif__001064a2.pex b/scripts/tif__001064a2.pex
index b5697731..c06af2fd 100644
Binary files a/scripts/tif__001064a2.pex and b/scripts/tif__001064a2.pex differ
diff --git a/scripts/tif__001064a8.pex b/scripts/tif__001064a8.pex
index 7fee8af9..6dd04725 100644
Binary files a/scripts/tif__001064a8.pex and b/scripts/tif__001064a8.pex differ
diff --git a/scripts/tif__001064ab.pex b/scripts/tif__001064ab.pex
index 06e75c4b..e0a93958 100644
Binary files a/scripts/tif__001064ab.pex and b/scripts/tif__001064ab.pex differ
diff --git a/scripts/tif__001064c1.pex b/scripts/tif__001064c1.pex
index 1991a8c5..eb681e29 100644
Binary files a/scripts/tif__001064c1.pex and b/scripts/tif__001064c1.pex differ
diff --git a/scripts/tif__00107f5b.pex b/scripts/tif__00107f5b.pex
index b9ac8d93..1357af50 100644
Binary files a/scripts/tif__00107f5b.pex and b/scripts/tif__00107f5b.pex differ
diff --git a/scripts/tif__00107f5d.pex b/scripts/tif__00107f5d.pex
index 2813352d..579b5e07 100644
Binary files a/scripts/tif__00107f5d.pex and b/scripts/tif__00107f5d.pex differ
diff --git a/scripts/tif__00107f61.pex b/scripts/tif__00107f61.pex
index 62d9f2b6..343dc814 100644
Binary files a/scripts/tif__00107f61.pex and b/scripts/tif__00107f61.pex differ
diff --git a/scripts/tif__00107f66.pex b/scripts/tif__00107f66.pex
index 7c298612..37c5bc77 100644
Binary files a/scripts/tif__00107f66.pex and b/scripts/tif__00107f66.pex differ
diff --git a/scripts/tif__00107f6b.pex b/scripts/tif__00107f6b.pex
index 8fd6838e..60b2cdb7 100644
Binary files a/scripts/tif__00107f6b.pex and b/scripts/tif__00107f6b.pex differ
diff --git a/scripts/tif__00107f74.pex b/scripts/tif__00107f74.pex
index db3f140e..fec7898d 100644
Binary files a/scripts/tif__00107f74.pex and b/scripts/tif__00107f74.pex differ
diff --git a/scripts/tif__00107f83.pex b/scripts/tif__00107f83.pex
index abd14975..89fcf3e3 100644
Binary files a/scripts/tif__00107f83.pex and b/scripts/tif__00107f83.pex differ
diff --git a/scripts/tif__0010a61d.pex b/scripts/tif__0010a61d.pex
index f4338153..1a501508 100644
Binary files a/scripts/tif__0010a61d.pex and b/scripts/tif__0010a61d.pex differ
diff --git a/scripts/tif__0010a61e.pex b/scripts/tif__0010a61e.pex
index 3bafbc5f..144457e0 100644
Binary files a/scripts/tif__0010a61e.pex and b/scripts/tif__0010a61e.pex differ
diff --git a/scripts/tif__0010a62a.pex b/scripts/tif__0010a62a.pex
index 25a12d35..8c32a7c7 100644
Binary files a/scripts/tif__0010a62a.pex and b/scripts/tif__0010a62a.pex differ
diff --git a/scripts/tif__0010a634.pex b/scripts/tif__0010a634.pex
index 75f56b43..ea7f7f52 100644
Binary files a/scripts/tif__0010a634.pex and b/scripts/tif__0010a634.pex differ
diff --git a/scripts/tif__0010a635.pex b/scripts/tif__0010a635.pex
index 2abe7107..26cf627d 100644
Binary files a/scripts/tif__0010a635.pex and b/scripts/tif__0010a635.pex differ
diff --git a/scripts/tif__0010a643.pex b/scripts/tif__0010a643.pex
index 3c525e08..cd051931 100644
Binary files a/scripts/tif__0010a643.pex and b/scripts/tif__0010a643.pex differ
diff --git a/scripts/tif__0010a64f.pex b/scripts/tif__0010a64f.pex
index e98f0f1e..80d49ff9 100644
Binary files a/scripts/tif__0010a64f.pex and b/scripts/tif__0010a64f.pex differ
diff --git a/scripts/tif__0010a65b.pex b/scripts/tif__0010a65b.pex
index 81377c66..9a43bbcb 100644
Binary files a/scripts/tif__0010a65b.pex and b/scripts/tif__0010a65b.pex differ
diff --git a/scripts/tif__0010a65c.pex b/scripts/tif__0010a65c.pex
index b6f80d86..82efffd2 100644
Binary files a/scripts/tif__0010a65c.pex and b/scripts/tif__0010a65c.pex differ
diff --git a/scripts/tif__0010a661.pex b/scripts/tif__0010a661.pex
index 96c9f8b2..bc1b8a1d 100644
Binary files a/scripts/tif__0010a661.pex and b/scripts/tif__0010a661.pex differ
diff --git a/scripts/tif__0010a82c.pex b/scripts/tif__0010a82c.pex
index 00d5d1f6..9cddfe2c 100644
Binary files a/scripts/tif__0010a82c.pex and b/scripts/tif__0010a82c.pex differ
diff --git a/scripts/tif__0010a82f.pex b/scripts/tif__0010a82f.pex
index 1d8eb278..bee29b35 100644
Binary files a/scripts/tif__0010a82f.pex and b/scripts/tif__0010a82f.pex differ
diff --git a/scripts/tif__0010a83c.pex b/scripts/tif__0010a83c.pex
index ba012f55..bfa65306 100644
Binary files a/scripts/tif__0010a83c.pex and b/scripts/tif__0010a83c.pex differ
diff --git a/scripts/tif__0010a83e.pex b/scripts/tif__0010a83e.pex
index 917e2428..f216702a 100644
Binary files a/scripts/tif__0010a83e.pex and b/scripts/tif__0010a83e.pex differ
diff --git a/scripts/tif__0010a842.pex b/scripts/tif__0010a842.pex
index ecd286db..6b93de12 100644
Binary files a/scripts/tif__0010a842.pex and b/scripts/tif__0010a842.pex differ
diff --git a/scripts/tif__0010a843.pex b/scripts/tif__0010a843.pex
index 61df73f4..6d6d342e 100644
Binary files a/scripts/tif__0010a843.pex and b/scripts/tif__0010a843.pex differ
diff --git a/scripts/tif__0010a852.pex b/scripts/tif__0010a852.pex
index 48e1cb3b..50f72930 100644
Binary files a/scripts/tif__0010a852.pex and b/scripts/tif__0010a852.pex differ
diff --git a/scripts/tif__0010a859.pex b/scripts/tif__0010a859.pex
index 2c166d6a..318badc2 100644
Binary files a/scripts/tif__0010a859.pex and b/scripts/tif__0010a859.pex differ
diff --git a/scripts/tif__0010a85c.pex b/scripts/tif__0010a85c.pex
index 0beed254..90dc1319 100644
Binary files a/scripts/tif__0010a85c.pex and b/scripts/tif__0010a85c.pex differ
diff --git a/scripts/tif__0010d158.pex b/scripts/tif__0010d158.pex
index 0e959389..b64515fd 100644
Binary files a/scripts/tif__0010d158.pex and b/scripts/tif__0010d158.pex differ
diff --git a/scripts/tif__0010d15b.pex b/scripts/tif__0010d15b.pex
index 806a9796..c2ed2489 100644
Binary files a/scripts/tif__0010d15b.pex and b/scripts/tif__0010d15b.pex differ
diff --git a/scripts/tif__0010d163.pex b/scripts/tif__0010d163.pex
index bac5d226..e5b0429f 100644
Binary files a/scripts/tif__0010d163.pex and b/scripts/tif__0010d163.pex differ
diff --git a/scripts/tif__0010d168.pex b/scripts/tif__0010d168.pex
index 3470fdb5..0a402e4f 100644
Binary files a/scripts/tif__0010d168.pex and b/scripts/tif__0010d168.pex differ
diff --git a/scripts/tif__0010d170.pex b/scripts/tif__0010d170.pex
index 39f8a062..1b85e485 100644
Binary files a/scripts/tif__0010d170.pex and b/scripts/tif__0010d170.pex differ
diff --git a/scripts/tif__0010d171.pex b/scripts/tif__0010d171.pex
index 1a599457..f04e4cee 100644
Binary files a/scripts/tif__0010d171.pex and b/scripts/tif__0010d171.pex differ
diff --git a/scripts/tif__0010d191.pex b/scripts/tif__0010d191.pex
index f066c6df..3c4ec007 100644
Binary files a/scripts/tif__0010d191.pex and b/scripts/tif__0010d191.pex differ
diff --git a/scripts/tif__0010e666.pex b/scripts/tif__0010e666.pex
index ab7b5962..1b4140fd 100644
Binary files a/scripts/tif__0010e666.pex and b/scripts/tif__0010e666.pex differ
diff --git a/scripts/tif__0010e66a.pex b/scripts/tif__0010e66a.pex
index 13ffbe50..10c6e1e3 100644
Binary files a/scripts/tif__0010e66a.pex and b/scripts/tif__0010e66a.pex differ
diff --git a/scripts/tif__0010e66b.pex b/scripts/tif__0010e66b.pex
index 7a49b2c2..c4095a5f 100644
Binary files a/scripts/tif__0010e66b.pex and b/scripts/tif__0010e66b.pex differ
diff --git a/scripts/tif__0010ff4c.pex b/scripts/tif__0010ff4c.pex
index d9f04355..d2fb27f5 100644
Binary files a/scripts/tif__0010ff4c.pex and b/scripts/tif__0010ff4c.pex differ
diff --git a/scripts/tif__0010ff5f.pex b/scripts/tif__0010ff5f.pex
index c0ee25ca..4fc1bade 100644
Binary files a/scripts/tif__0010ff5f.pex and b/scripts/tif__0010ff5f.pex differ
diff --git a/scripts/tif__00111e14.pex b/scripts/tif__00111e14.pex
index b9b54b14..7de58238 100644
Binary files a/scripts/tif__00111e14.pex and b/scripts/tif__00111e14.pex differ
diff --git a/scripts/tif__0011264e.pex b/scripts/tif__0011264e.pex
index caff0fca..751f56ce 100644
Binary files a/scripts/tif__0011264e.pex and b/scripts/tif__0011264e.pex differ
diff --git a/scripts/tif__0011265c.pex b/scripts/tif__0011265c.pex
index 809ca36d..787047b3 100644
Binary files a/scripts/tif__0011265c.pex and b/scripts/tif__0011265c.pex differ
diff --git a/scripts/tif__001178d9.pex b/scripts/tif__001178d9.pex
index 86f2b09c..0c75e4ff 100644
Binary files a/scripts/tif__001178d9.pex and b/scripts/tif__001178d9.pex differ
diff --git a/scripts/tif__001178dd.pex b/scripts/tif__001178dd.pex
index 34bf82ae..8a26c5f1 100644
Binary files a/scripts/tif__001178dd.pex and b/scripts/tif__001178dd.pex differ
diff --git a/scripts/tif__001178e8.pex b/scripts/tif__001178e8.pex
index 54272053..a3589dc9 100644
Binary files a/scripts/tif__001178e8.pex and b/scripts/tif__001178e8.pex differ
diff --git a/scripts/tif__001178ed.pex b/scripts/tif__001178ed.pex
index cb3e283f..c3009ea9 100644
Binary files a/scripts/tif__001178ed.pex and b/scripts/tif__001178ed.pex differ
diff --git a/scripts/tif__001178f3.pex b/scripts/tif__001178f3.pex
index 7a18ac42..9e09efdb 100644
Binary files a/scripts/tif__001178f3.pex and b/scripts/tif__001178f3.pex differ
diff --git a/scripts/tif__00117903.pex b/scripts/tif__00117903.pex
index e82777ae..4da8f6ac 100644
Binary files a/scripts/tif__00117903.pex and b/scripts/tif__00117903.pex differ
diff --git a/scripts/tif__00117904.pex b/scripts/tif__00117904.pex
index a456eb91..de09769c 100644
Binary files a/scripts/tif__00117904.pex and b/scripts/tif__00117904.pex differ
diff --git a/scripts/tif__00117908.pex b/scripts/tif__00117908.pex
index ae4191c9..a1916246 100644
Binary files a/scripts/tif__00117908.pex and b/scripts/tif__00117908.pex differ
diff --git a/scripts/tif__00118452.pex b/scripts/tif__00118452.pex
index d241b62b..3462efb5 100644
Binary files a/scripts/tif__00118452.pex and b/scripts/tif__00118452.pex differ
diff --git a/scripts/tif__00119ac6.pex b/scripts/tif__00119ac6.pex
index 3f01563a..f50254e7 100644
Binary files a/scripts/tif__00119ac6.pex and b/scripts/tif__00119ac6.pex differ
diff --git a/scripts/tif__00119b5f.pex b/scripts/tif__00119b5f.pex
index ba85bdbe..13278f87 100644
Binary files a/scripts/tif__00119b5f.pex and b/scripts/tif__00119b5f.pex differ
diff --git a/scripts/tif__00119b65.pex b/scripts/tif__00119b65.pex
index 04307610..1b13ae7e 100644
Binary files a/scripts/tif__00119b65.pex and b/scripts/tif__00119b65.pex differ
diff --git a/scripts/tif__00119b67.pex b/scripts/tif__00119b67.pex
index a5ee8b85..adb268a8 100644
Binary files a/scripts/tif__00119b67.pex and b/scripts/tif__00119b67.pex differ
diff --git a/scripts/tif__00119b69.pex b/scripts/tif__00119b69.pex
index 99b16ce6..46279bb4 100644
Binary files a/scripts/tif__00119b69.pex and b/scripts/tif__00119b69.pex differ
diff --git a/scripts/tif__00119b74.pex b/scripts/tif__00119b74.pex
index c0f562a5..9ce652ee 100644
Binary files a/scripts/tif__00119b74.pex and b/scripts/tif__00119b74.pex differ
diff --git a/scripts/tif__00119b7d.pex b/scripts/tif__00119b7d.pex
index 91f3d7ed..0c9a8a86 100644
Binary files a/scripts/tif__00119b7d.pex and b/scripts/tif__00119b7d.pex differ
diff --git a/scripts/tif__00119b7e.pex b/scripts/tif__00119b7e.pex
index bc56fbb0..638bef65 100644
Binary files a/scripts/tif__00119b7e.pex and b/scripts/tif__00119b7e.pex differ
diff --git a/scripts/tif__00119b85.pex b/scripts/tif__00119b85.pex
index 4d3205ce..8497cf44 100644
Binary files a/scripts/tif__00119b85.pex and b/scripts/tif__00119b85.pex differ
diff --git a/scripts/tif__00119b8b.pex b/scripts/tif__00119b8b.pex
index c90123c3..939808a5 100644
Binary files a/scripts/tif__00119b8b.pex and b/scripts/tif__00119b8b.pex differ
diff --git a/scripts/tif__00119ba6.pex b/scripts/tif__00119ba6.pex
index 9596eb8e..665d9e79 100644
Binary files a/scripts/tif__00119ba6.pex and b/scripts/tif__00119ba6.pex differ
diff --git a/scripts/tif__00119bac.pex b/scripts/tif__00119bac.pex
index ea7bc1ff..5eefc03b 100644
Binary files a/scripts/tif__00119bac.pex and b/scripts/tif__00119bac.pex differ
diff --git a/scripts/tif__00119bb1.pex b/scripts/tif__00119bb1.pex
index 2312c462..45c114c3 100644
Binary files a/scripts/tif__00119bb1.pex and b/scripts/tif__00119bb1.pex differ
diff --git a/scripts/tif__00119bb3.pex b/scripts/tif__00119bb3.pex
index acee47e4..61d9f0cc 100644
Binary files a/scripts/tif__00119bb3.pex and b/scripts/tif__00119bb3.pex differ
diff --git a/scripts/tif__00119bb9.pex b/scripts/tif__00119bb9.pex
index cc4d2d80..1e9efd48 100644
Binary files a/scripts/tif__00119bb9.pex and b/scripts/tif__00119bb9.pex differ
diff --git a/scripts/tif__00119bbe.pex b/scripts/tif__00119bbe.pex
index 47f088e7..117b06e2 100644
Binary files a/scripts/tif__00119bbe.pex and b/scripts/tif__00119bbe.pex differ
diff --git a/scripts/tif__0011a5fa.pex b/scripts/tif__0011a5fa.pex
index e55ae559..274144d3 100644
Binary files a/scripts/tif__0011a5fa.pex and b/scripts/tif__0011a5fa.pex differ
diff --git a/scripts/tif__0011a5fb.pex b/scripts/tif__0011a5fb.pex
index 7874e690..8aace353 100644
Binary files a/scripts/tif__0011a5fb.pex and b/scripts/tif__0011a5fb.pex differ
diff --git a/scripts/tif__0011a602.pex b/scripts/tif__0011a602.pex
index 45384f40..58e6ef68 100644
Binary files a/scripts/tif__0011a602.pex and b/scripts/tif__0011a602.pex differ
diff --git a/scripts/tif__0011a603.pex b/scripts/tif__0011a603.pex
index f4f60220..cc556f57 100644
Binary files a/scripts/tif__0011a603.pex and b/scripts/tif__0011a603.pex differ
diff --git a/scripts/tif__0011a60a.pex b/scripts/tif__0011a60a.pex
index b6eb5db4..579bac94 100644
Binary files a/scripts/tif__0011a60a.pex and b/scripts/tif__0011a60a.pex differ
diff --git a/scripts/tif__0011a632.pex b/scripts/tif__0011a632.pex
index 3f51763e..56fdad42 100644
Binary files a/scripts/tif__0011a632.pex and b/scripts/tif__0011a632.pex differ
diff --git a/scripts/tif__0011a633.pex b/scripts/tif__0011a633.pex
index b89544e8..3ef28676 100644
Binary files a/scripts/tif__0011a633.pex and b/scripts/tif__0011a633.pex differ
diff --git a/scripts/tif__0011b03c.pex b/scripts/tif__0011b03c.pex
index e19aa69d..c205cb02 100644
Binary files a/scripts/tif__0011b03c.pex and b/scripts/tif__0011b03c.pex differ
diff --git a/scripts/tif__0011b042.pex b/scripts/tif__0011b042.pex
index 41e557da..201455ae 100644
Binary files a/scripts/tif__0011b042.pex and b/scripts/tif__0011b042.pex differ
diff --git a/scripts/tif__0011b044.pex b/scripts/tif__0011b044.pex
index c857662e..e6355796 100644
Binary files a/scripts/tif__0011b044.pex and b/scripts/tif__0011b044.pex differ
diff --git a/scripts/tif__0011b045.pex b/scripts/tif__0011b045.pex
index e88aaa7a..c5b00df6 100644
Binary files a/scripts/tif__0011b045.pex and b/scripts/tif__0011b045.pex differ
diff --git a/scripts/tif__0011b046.pex b/scripts/tif__0011b046.pex
index fb514abb..a9404ab3 100644
Binary files a/scripts/tif__0011b046.pex and b/scripts/tif__0011b046.pex differ
diff --git a/scripts/tif__0011b05b.pex b/scripts/tif__0011b05b.pex
index 0ee6129e..b32ad2ce 100644
Binary files a/scripts/tif__0011b05b.pex and b/scripts/tif__0011b05b.pex differ
diff --git a/scripts/tif__0011b1fb.pex b/scripts/tif__0011b1fb.pex
index ac3e22b6..674ef111 100644
Binary files a/scripts/tif__0011b1fb.pex and b/scripts/tif__0011b1fb.pex differ
diff --git a/scripts/tif__0011b1fd.pex b/scripts/tif__0011b1fd.pex
index a01785f2..0fd36ab2 100644
Binary files a/scripts/tif__0011b1fd.pex and b/scripts/tif__0011b1fd.pex differ
diff --git a/scripts/tif__0011b1ff.pex b/scripts/tif__0011b1ff.pex
index 32fcc36d..e2a41dd0 100644
Binary files a/scripts/tif__0011b1ff.pex and b/scripts/tif__0011b1ff.pex differ
diff --git a/scripts/tif__0011b204.pex b/scripts/tif__0011b204.pex
index c780fdcf..c5c0c76b 100644
Binary files a/scripts/tif__0011b204.pex and b/scripts/tif__0011b204.pex differ
diff --git a/scripts/tif__0011b205.pex b/scripts/tif__0011b205.pex
index bcc08004..d774006a 100644
Binary files a/scripts/tif__0011b205.pex and b/scripts/tif__0011b205.pex differ
diff --git a/scripts/tif__0011b209.pex b/scripts/tif__0011b209.pex
index 6fc373d7..87772099 100644
Binary files a/scripts/tif__0011b209.pex and b/scripts/tif__0011b209.pex differ
diff --git a/scripts/tif__0011b20c.pex b/scripts/tif__0011b20c.pex
index 5511b79b..ef7fe3b6 100644
Binary files a/scripts/tif__0011b20c.pex and b/scripts/tif__0011b20c.pex differ
diff --git a/scripts/tif__0011b20d.pex b/scripts/tif__0011b20d.pex
index c8c260c9..dd9f2b11 100644
Binary files a/scripts/tif__0011b20d.pex and b/scripts/tif__0011b20d.pex differ
diff --git a/scripts/tif__00125161.pex b/scripts/tif__00125161.pex
index 2ae6930f..74f926ea 100644
Binary files a/scripts/tif__00125161.pex and b/scripts/tif__00125161.pex differ
diff --git a/scripts/tif__00125162.pex b/scripts/tif__00125162.pex
index 5059709a..d1484f5c 100644
Binary files a/scripts/tif__00125162.pex and b/scripts/tif__00125162.pex differ
diff --git a/scripts/tif__00125164.pex b/scripts/tif__00125164.pex
index 90225a97..c9bd22d0 100644
Binary files a/scripts/tif__00125164.pex and b/scripts/tif__00125164.pex differ
diff --git a/scripts/tif__00125187.pex b/scripts/tif__00125187.pex
index b2aa9139..3253c209 100644
Binary files a/scripts/tif__00125187.pex and b/scripts/tif__00125187.pex differ
diff --git a/scripts/tif__0012518b.pex b/scripts/tif__0012518b.pex
index d0b6ebe9..258ae203 100644
Binary files a/scripts/tif__0012518b.pex and b/scripts/tif__0012518b.pex differ
diff --git a/scripts/tif__0012518e.pex b/scripts/tif__0012518e.pex
index 9640d88d..fbdbc55f 100644
Binary files a/scripts/tif__0012518e.pex and b/scripts/tif__0012518e.pex differ
diff --git a/scripts/tif__00125190.pex b/scripts/tif__00125190.pex
index 6c842481..dfa891c6 100644
Binary files a/scripts/tif__00125190.pex and b/scripts/tif__00125190.pex differ
diff --git a/scripts/tif__001251a6.pex b/scripts/tif__001251a6.pex
index 763eb309..242fb2fb 100644
Binary files a/scripts/tif__001251a6.pex and b/scripts/tif__001251a6.pex differ
diff --git a/scripts/tif__001251a8.pex b/scripts/tif__001251a8.pex
index 2011ee11..49cd6220 100644
Binary files a/scripts/tif__001251a8.pex and b/scripts/tif__001251a8.pex differ
diff --git a/scripts/tif__001251ac.pex b/scripts/tif__001251ac.pex
index 8863247e..771b5258 100644
Binary files a/scripts/tif__001251ac.pex and b/scripts/tif__001251ac.pex differ
diff --git a/scripts/tif__001251ae.pex b/scripts/tif__001251ae.pex
index f8280adb..08616afd 100644
Binary files a/scripts/tif__001251ae.pex and b/scripts/tif__001251ae.pex differ
diff --git a/scripts/tif__0012753a.pex b/scripts/tif__0012753a.pex
index 051b8e09..2d58f4c5 100644
Binary files a/scripts/tif__0012753a.pex and b/scripts/tif__0012753a.pex differ
diff --git a/scripts/tif__00127542.pex b/scripts/tif__00127542.pex
index 3ca5085a..689e0835 100644
Binary files a/scripts/tif__00127542.pex and b/scripts/tif__00127542.pex differ
diff --git a/scripts/tif__00127546.pex b/scripts/tif__00127546.pex
index a6409697..e3e9813a 100644
Binary files a/scripts/tif__00127546.pex and b/scripts/tif__00127546.pex differ
diff --git a/scripts/tif__00127558.pex b/scripts/tif__00127558.pex
index 13f32f61..0d85c7a1 100644
Binary files a/scripts/tif__00127558.pex and b/scripts/tif__00127558.pex differ
diff --git a/scripts/tif__00127864.pex b/scripts/tif__00127864.pex
index da19c4e8..612ecf38 100644
Binary files a/scripts/tif__00127864.pex and b/scripts/tif__00127864.pex differ
diff --git a/scripts/tif__00127869.pex b/scripts/tif__00127869.pex
index 3ec89e75..ce4e3634 100644
Binary files a/scripts/tif__00127869.pex and b/scripts/tif__00127869.pex differ
diff --git a/scripts/tif__0012786f.pex b/scripts/tif__0012786f.pex
index c9e4fec6..f7eedbfd 100644
Binary files a/scripts/tif__0012786f.pex and b/scripts/tif__0012786f.pex differ
diff --git a/scripts/tif__00127872.pex b/scripts/tif__00127872.pex
index de3c11a9..c180914c 100644
Binary files a/scripts/tif__00127872.pex and b/scripts/tif__00127872.pex differ
diff --git a/scripts/tif__0012787f.pex b/scripts/tif__0012787f.pex
index 831796c5..0a16f22b 100644
Binary files a/scripts/tif__0012787f.pex and b/scripts/tif__0012787f.pex differ
diff --git a/scripts/tif__00129063.pex b/scripts/tif__00129063.pex
index 0276bf8e..019ecc22 100644
Binary files a/scripts/tif__00129063.pex and b/scripts/tif__00129063.pex differ
diff --git a/scripts/tif__00129067.pex b/scripts/tif__00129067.pex
index a810bab0..fe3af1da 100644
Binary files a/scripts/tif__00129067.pex and b/scripts/tif__00129067.pex differ
diff --git a/scripts/tif__00129073.pex b/scripts/tif__00129073.pex
index eeaf2a2f..ad344c40 100644
Binary files a/scripts/tif__00129073.pex and b/scripts/tif__00129073.pex differ
diff --git a/scripts/tif__00129076.pex b/scripts/tif__00129076.pex
index d9594192..8b4e8524 100644
Binary files a/scripts/tif__00129076.pex and b/scripts/tif__00129076.pex differ
diff --git a/scripts/tif__00129078.pex b/scripts/tif__00129078.pex
index 414b0c07..d6986dd7 100644
Binary files a/scripts/tif__00129078.pex and b/scripts/tif__00129078.pex differ
diff --git a/scripts/tif__00129079.pex b/scripts/tif__00129079.pex
index 4ec7a509..d35cebf4 100644
Binary files a/scripts/tif__00129079.pex and b/scripts/tif__00129079.pex differ
diff --git a/scripts/tif__0012918f.pex b/scripts/tif__0012918f.pex
index 92c552ac..b2e55346 100644
Binary files a/scripts/tif__0012918f.pex and b/scripts/tif__0012918f.pex differ
diff --git a/scripts/tif__0012919b.pex b/scripts/tif__0012919b.pex
index e913f1d0..7bbff68b 100644
Binary files a/scripts/tif__0012919b.pex and b/scripts/tif__0012919b.pex differ
diff --git a/scripts/tif__00129585.pex b/scripts/tif__00129585.pex
index 1c1b4a52..f13281ce 100644
Binary files a/scripts/tif__00129585.pex and b/scripts/tif__00129585.pex differ
diff --git a/scripts/tif__00129586.pex b/scripts/tif__00129586.pex
index 65de33c2..5d9d4577 100644
Binary files a/scripts/tif__00129586.pex and b/scripts/tif__00129586.pex differ
diff --git a/scripts/tif__0012959a.pex b/scripts/tif__0012959a.pex
index f4856606..ab137594 100644
Binary files a/scripts/tif__0012959a.pex and b/scripts/tif__0012959a.pex differ
diff --git a/scripts/tif__001295b2.pex b/scripts/tif__001295b2.pex
index 5747e0e5..0987846f 100644
Binary files a/scripts/tif__001295b2.pex and b/scripts/tif__001295b2.pex differ
diff --git a/scripts/tif__001295b3.pex b/scripts/tif__001295b3.pex
index 0206e6be..3f8c8222 100644
Binary files a/scripts/tif__001295b3.pex and b/scripts/tif__001295b3.pex differ
diff --git a/scripts/tif__0012d916.pex b/scripts/tif__0012d916.pex
index cfecf7dc..df434c77 100644
Binary files a/scripts/tif__0012d916.pex and b/scripts/tif__0012d916.pex differ
diff --git a/scripts/tif__0012d91a.pex b/scripts/tif__0012d91a.pex
index 05dea4a3..9d277632 100644
Binary files a/scripts/tif__0012d91a.pex and b/scripts/tif__0012d91a.pex differ
diff --git a/scripts/tif__0012d91c.pex b/scripts/tif__0012d91c.pex
index c8c5bc41..7d8f1a39 100644
Binary files a/scripts/tif__0012d91c.pex and b/scripts/tif__0012d91c.pex differ
diff --git a/scripts/tif__0012d931.pex b/scripts/tif__0012d931.pex
index 7f01c419..50e466ef 100644
Binary files a/scripts/tif__0012d931.pex and b/scripts/tif__0012d931.pex differ
diff --git a/scripts/tif__0012d935.pex b/scripts/tif__0012d935.pex
index 119b0d3b..bbfb79ff 100644
Binary files a/scripts/tif__0012d935.pex and b/scripts/tif__0012d935.pex differ
diff --git a/scripts/tif__0012d939.pex b/scripts/tif__0012d939.pex
index c6f5f64a..dc82b844 100644
Binary files a/scripts/tif__0012d939.pex and b/scripts/tif__0012d939.pex differ
diff --git a/scripts/tif__0012d990.pex b/scripts/tif__0012d990.pex
index 8458a355..f1f7d534 100644
Binary files a/scripts/tif__0012d990.pex and b/scripts/tif__0012d990.pex differ
diff --git a/scripts/tif__0012d999.pex b/scripts/tif__0012d999.pex
index fc3633b5..57bb0697 100644
Binary files a/scripts/tif__0012d999.pex and b/scripts/tif__0012d999.pex differ
diff --git a/scripts/tif__0012d99c.pex b/scripts/tif__0012d99c.pex
index 383e4366..c769dae1 100644
Binary files a/scripts/tif__0012d99c.pex and b/scripts/tif__0012d99c.pex differ
diff --git a/scripts/tif__0012d9a1.pex b/scripts/tif__0012d9a1.pex
index 10c043eb..630d2685 100644
Binary files a/scripts/tif__0012d9a1.pex and b/scripts/tif__0012d9a1.pex differ
diff --git a/scripts/tif__0012d9a2.pex b/scripts/tif__0012d9a2.pex
index 4cba798a..fdf5f8eb 100644
Binary files a/scripts/tif__0012d9a2.pex and b/scripts/tif__0012d9a2.pex differ
diff --git a/scripts/tif__0012d9a3.pex b/scripts/tif__0012d9a3.pex
index f907edbb..9997ed76 100644
Binary files a/scripts/tif__0012d9a3.pex and b/scripts/tif__0012d9a3.pex differ
diff --git a/scripts/tif__0012d9ac.pex b/scripts/tif__0012d9ac.pex
index d18dcc13..4d4fe5a9 100644
Binary files a/scripts/tif__0012d9ac.pex and b/scripts/tif__0012d9ac.pex differ
diff --git a/scripts/tif__0012e0a3.pex b/scripts/tif__0012e0a3.pex
index 4287f6cd..231e4c97 100644
Binary files a/scripts/tif__0012e0a3.pex and b/scripts/tif__0012e0a3.pex differ
diff --git a/scripts/tif__0012e0a4.pex b/scripts/tif__0012e0a4.pex
index 13095f0a..3b4c0e6d 100644
Binary files a/scripts/tif__0012e0a4.pex and b/scripts/tif__0012e0a4.pex differ
diff --git a/scripts/tif__0012e0a7.pex b/scripts/tif__0012e0a7.pex
index 16250e30..7bc22064 100644
Binary files a/scripts/tif__0012e0a7.pex and b/scripts/tif__0012e0a7.pex differ
diff --git a/scripts/tif__0012e0fc.pex b/scripts/tif__0012e0fc.pex
index 3a9342f4..a179362d 100644
Binary files a/scripts/tif__0012e0fc.pex and b/scripts/tif__0012e0fc.pex differ
diff --git a/scripts/tif__0012e0ff.pex b/scripts/tif__0012e0ff.pex
index 75a5742b..076fef71 100644
Binary files a/scripts/tif__0012e0ff.pex and b/scripts/tif__0012e0ff.pex differ
diff --git a/scripts/tif__0012e102.pex b/scripts/tif__0012e102.pex
index d7889d79..1c4c8282 100644
Binary files a/scripts/tif__0012e102.pex and b/scripts/tif__0012e102.pex differ
diff --git a/scripts/tif__0012e103.pex b/scripts/tif__0012e103.pex
index 3bec3ed4..9034ebce 100644
Binary files a/scripts/tif__0012e103.pex and b/scripts/tif__0012e103.pex differ
diff --git a/scripts/tif__0012e106.pex b/scripts/tif__0012e106.pex
index 6c34e569..385dcc20 100644
Binary files a/scripts/tif__0012e106.pex and b/scripts/tif__0012e106.pex differ
diff --git a/scripts/tif__0012e109.pex b/scripts/tif__0012e109.pex
index c9482fb6..6a1636cb 100644
Binary files a/scripts/tif__0012e109.pex and b/scripts/tif__0012e109.pex differ
diff --git a/scripts/tif__0012e10f.pex b/scripts/tif__0012e10f.pex
index d39da479..bbcd05e8 100644
Binary files a/scripts/tif__0012e10f.pex and b/scripts/tif__0012e10f.pex differ
diff --git a/scripts/tif__0012e112.pex b/scripts/tif__0012e112.pex
index e4fe0250..de964123 100644
Binary files a/scripts/tif__0012e112.pex and b/scripts/tif__0012e112.pex differ
diff --git a/scripts/tif__0012e113.pex b/scripts/tif__0012e113.pex
index 5f00f07b..ae73bf3d 100644
Binary files a/scripts/tif__0012e113.pex and b/scripts/tif__0012e113.pex differ
diff --git a/scripts/tif__0012e114.pex b/scripts/tif__0012e114.pex
index 797ff00f..ab10c4f1 100644
Binary files a/scripts/tif__0012e114.pex and b/scripts/tif__0012e114.pex differ
diff --git a/scripts/tif__0012e118.pex b/scripts/tif__0012e118.pex
index 0092b48b..64aeeee2 100644
Binary files a/scripts/tif__0012e118.pex and b/scripts/tif__0012e118.pex differ
diff --git a/scripts/tif__0012e11f.pex b/scripts/tif__0012e11f.pex
index aebe53cc..3cf1dc8a 100644
Binary files a/scripts/tif__0012e11f.pex and b/scripts/tif__0012e11f.pex differ
diff --git a/scripts/tif__0012e120.pex b/scripts/tif__0012e120.pex
index 659c84f7..ddd114b6 100644
Binary files a/scripts/tif__0012e120.pex and b/scripts/tif__0012e120.pex differ
diff --git a/scripts/tif__0012e121.pex b/scripts/tif__0012e121.pex
index 42f9c0cd..38f65733 100644
Binary files a/scripts/tif__0012e121.pex and b/scripts/tif__0012e121.pex differ
diff --git a/scripts/tif__0012e122.pex b/scripts/tif__0012e122.pex
index b62d21db..4fe704f8 100644
Binary files a/scripts/tif__0012e122.pex and b/scripts/tif__0012e122.pex differ
diff --git a/scripts/tif__0012e430.pex b/scripts/tif__0012e430.pex
index e9558b9d..24ce7634 100644
Binary files a/scripts/tif__0012e430.pex and b/scripts/tif__0012e430.pex differ
diff --git a/scripts/tif__0012ee6a.pex b/scripts/tif__0012ee6a.pex
index c8372c30..8b989b1c 100644
Binary files a/scripts/tif__0012ee6a.pex and b/scripts/tif__0012ee6a.pex differ
diff --git a/scripts/tif__00132d62.pex b/scripts/tif__00132d62.pex
index 25df9f8a..b15b66ee 100644
Binary files a/scripts/tif__00132d62.pex and b/scripts/tif__00132d62.pex differ
diff --git a/scripts/tif__00132e01.pex b/scripts/tif__00132e01.pex
index dbc8abcb..09bbe109 100644
Binary files a/scripts/tif__00132e01.pex and b/scripts/tif__00132e01.pex differ
diff --git a/scripts/tif__00132e02.pex b/scripts/tif__00132e02.pex
index ca127353..141ae0ec 100644
Binary files a/scripts/tif__00132e02.pex and b/scripts/tif__00132e02.pex differ
diff --git a/scripts/tif__00132e1c.pex b/scripts/tif__00132e1c.pex
index 8faa5df2..506c6873 100644
Binary files a/scripts/tif__00132e1c.pex and b/scripts/tif__00132e1c.pex differ
diff --git a/scripts/tif__001338b4.pex b/scripts/tif__001338b4.pex
index 4f30a14e..b0c607fd 100644
Binary files a/scripts/tif__001338b4.pex and b/scripts/tif__001338b4.pex differ
diff --git a/scripts/tif__001338b9.pex b/scripts/tif__001338b9.pex
index 2bdbb66e..3e40d011 100644
Binary files a/scripts/tif__001338b9.pex and b/scripts/tif__001338b9.pex differ
diff --git a/scripts/tif__001338ec.pex b/scripts/tif__001338ec.pex
index c5e4dfa0..64f714fe 100644
Binary files a/scripts/tif__001338ec.pex and b/scripts/tif__001338ec.pex differ
diff --git a/scripts/tif__001338f1.pex b/scripts/tif__001338f1.pex
index d63c607d..1bb3672e 100644
Binary files a/scripts/tif__001338f1.pex and b/scripts/tif__001338f1.pex differ
diff --git a/scripts/tif__00134484.pex b/scripts/tif__00134484.pex
index bc0f83f7..a57521dc 100644
Binary files a/scripts/tif__00134484.pex and b/scripts/tif__00134484.pex differ
diff --git a/scripts/tif__00134485.pex b/scripts/tif__00134485.pex
index b47c4d91..0ede6dca 100644
Binary files a/scripts/tif__00134485.pex and b/scripts/tif__00134485.pex differ
diff --git a/scripts/tif__0013453c.pex b/scripts/tif__0013453c.pex
index 100d8b7d..0772df95 100644
Binary files a/scripts/tif__0013453c.pex and b/scripts/tif__0013453c.pex differ
diff --git a/scripts/tif__0013453d.pex b/scripts/tif__0013453d.pex
index e6d96d29..860e8b04 100644
Binary files a/scripts/tif__0013453d.pex and b/scripts/tif__0013453d.pex differ
diff --git a/scripts/tif__0013455d.pex b/scripts/tif__0013455d.pex
index 2c4d0183..b4df98b8 100644
Binary files a/scripts/tif__0013455d.pex and b/scripts/tif__0013455d.pex differ
diff --git a/scripts/tif__00134569.pex b/scripts/tif__00134569.pex
index 62d38b34..4c4b345b 100644
Binary files a/scripts/tif__00134569.pex and b/scripts/tif__00134569.pex differ
diff --git a/scripts/tif__0013456a.pex b/scripts/tif__0013456a.pex
index 811eaacb..88c37c0d 100644
Binary files a/scripts/tif__0013456a.pex and b/scripts/tif__0013456a.pex differ
diff --git a/scripts/tif__0013456b.pex b/scripts/tif__0013456b.pex
index b1c1bc91..6bb6e0b7 100644
Binary files a/scripts/tif__0013456b.pex and b/scripts/tif__0013456b.pex differ
diff --git a/scripts/tif__0013456c.pex b/scripts/tif__0013456c.pex
index e24e7d1a..45ee4686 100644
Binary files a/scripts/tif__0013456c.pex and b/scripts/tif__0013456c.pex differ
diff --git a/scripts/tif__00134574.pex b/scripts/tif__00134574.pex
index 8e443309..b85f8056 100644
Binary files a/scripts/tif__00134574.pex and b/scripts/tif__00134574.pex differ
diff --git a/scripts/tif__00134575.pex b/scripts/tif__00134575.pex
index 5626d7b0..a69db739 100644
Binary files a/scripts/tif__00134575.pex and b/scripts/tif__00134575.pex differ
diff --git a/scripts/tif__00134576.pex b/scripts/tif__00134576.pex
index 822cab26..484dea82 100644
Binary files a/scripts/tif__00134576.pex and b/scripts/tif__00134576.pex differ
diff --git a/scripts/tif__00134577.pex b/scripts/tif__00134577.pex
index 244110c4..ac583809 100644
Binary files a/scripts/tif__00134577.pex and b/scripts/tif__00134577.pex differ
diff --git a/scripts/tif__001346d6.pex b/scripts/tif__001346d6.pex
index 7b63ae93..f0a38181 100644
Binary files a/scripts/tif__001346d6.pex and b/scripts/tif__001346d6.pex differ
diff --git a/scripts/tif__001346d9.pex b/scripts/tif__001346d9.pex
index 43aba01c..40f5d4a7 100644
Binary files a/scripts/tif__001346d9.pex and b/scripts/tif__001346d9.pex differ
diff --git a/scripts/tif__001346db.pex b/scripts/tif__001346db.pex
index 610a0bcf..d4604d4b 100644
Binary files a/scripts/tif__001346db.pex and b/scripts/tif__001346db.pex differ
diff --git a/scripts/tif__001346e8.pex b/scripts/tif__001346e8.pex
index 06e9d4e3..c0ef5dd8 100644
Binary files a/scripts/tif__001346e8.pex and b/scripts/tif__001346e8.pex differ
diff --git a/scripts/tif__00136cc1.pex b/scripts/tif__00136cc1.pex
index c405d63a..65bd3ec3 100644
Binary files a/scripts/tif__00136cc1.pex and b/scripts/tif__00136cc1.pex differ
diff --git a/scripts/tif__00136cd2.pex b/scripts/tif__00136cd2.pex
index 8e9e5a3f..801dd986 100644
Binary files a/scripts/tif__00136cd2.pex and b/scripts/tif__00136cd2.pex differ
diff --git a/scripts/tif__00136cd3.pex b/scripts/tif__00136cd3.pex
index 38b079e9..b26b067d 100644
Binary files a/scripts/tif__00136cd3.pex and b/scripts/tif__00136cd3.pex differ
diff --git a/scripts/tif__00136cd5.pex b/scripts/tif__00136cd5.pex
index 9959c0c5..53a2b7b4 100644
Binary files a/scripts/tif__00136cd5.pex and b/scripts/tif__00136cd5.pex differ
diff --git a/scripts/tif__00136ce9.pex b/scripts/tif__00136ce9.pex
index 16f81fe1..42e29f68 100644
Binary files a/scripts/tif__00136ce9.pex and b/scripts/tif__00136ce9.pex differ
diff --git a/scripts/tif__00136cec.pex b/scripts/tif__00136cec.pex
index 22f6ccbd..37cc97e8 100644
Binary files a/scripts/tif__00136cec.pex and b/scripts/tif__00136cec.pex differ
diff --git a/scripts/tif__00137113.pex b/scripts/tif__00137113.pex
index 088613ef..af9d98f7 100644
Binary files a/scripts/tif__00137113.pex and b/scripts/tif__00137113.pex differ
diff --git a/scripts/tif__0013711e.pex b/scripts/tif__0013711e.pex
index 25641117..a65d8405 100644
Binary files a/scripts/tif__0013711e.pex and b/scripts/tif__0013711e.pex differ
diff --git a/scripts/tif__00137123.pex b/scripts/tif__00137123.pex
index e3a8c87e..f47a46a4 100644
Binary files a/scripts/tif__00137123.pex and b/scripts/tif__00137123.pex differ
diff --git a/scripts/tif__0013712f.pex b/scripts/tif__0013712f.pex
index 18838e6b..69a63bbd 100644
Binary files a/scripts/tif__0013712f.pex and b/scripts/tif__0013712f.pex differ
diff --git a/scripts/tif__00137134.pex b/scripts/tif__00137134.pex
index 01c695ac..84888324 100644
Binary files a/scripts/tif__00137134.pex and b/scripts/tif__00137134.pex differ
diff --git a/scripts/tif__0013713a.pex b/scripts/tif__0013713a.pex
index 62348767..50aeeb7e 100644
Binary files a/scripts/tif__0013713a.pex and b/scripts/tif__0013713a.pex differ
diff --git a/scripts/tif__0013713b.pex b/scripts/tif__0013713b.pex
index 3cf87376..d1e7d88b 100644
Binary files a/scripts/tif__0013713b.pex and b/scripts/tif__0013713b.pex differ
diff --git a/scripts/tif__00137140.pex b/scripts/tif__00137140.pex
index fcedd832..67527ad1 100644
Binary files a/scripts/tif__00137140.pex and b/scripts/tif__00137140.pex differ
diff --git a/scripts/tif__00137144.pex b/scripts/tif__00137144.pex
index 848bdbb0..4cba0d73 100644
Binary files a/scripts/tif__00137144.pex and b/scripts/tif__00137144.pex differ
diff --git a/scripts/tif__0013714e.pex b/scripts/tif__0013714e.pex
index 2fc16f81..92ca15ae 100644
Binary files a/scripts/tif__0013714e.pex and b/scripts/tif__0013714e.pex differ
diff --git a/scripts/tif__0013714f.pex b/scripts/tif__0013714f.pex
index dd6b1fb1..4477fd47 100644
Binary files a/scripts/tif__0013714f.pex and b/scripts/tif__0013714f.pex differ
diff --git a/scripts/tif__00137151.pex b/scripts/tif__00137151.pex
index 774c7be8..65993dea 100644
Binary files a/scripts/tif__00137151.pex and b/scripts/tif__00137151.pex differ
diff --git a/scripts/tif__00137152.pex b/scripts/tif__00137152.pex
index a5d2572b..66e1050c 100644
Binary files a/scripts/tif__00137152.pex and b/scripts/tif__00137152.pex differ
diff --git a/scripts/tif__0013715e.pex b/scripts/tif__0013715e.pex
index 46509274..3aa008ba 100644
Binary files a/scripts/tif__0013715e.pex and b/scripts/tif__0013715e.pex differ
diff --git a/scripts/tif__00137167.pex b/scripts/tif__00137167.pex
index 571817f3..c008d531 100644
Binary files a/scripts/tif__00137167.pex and b/scripts/tif__00137167.pex differ
diff --git a/scripts/tif__0013716a.pex b/scripts/tif__0013716a.pex
index 2dd62e4b..069768d4 100644
Binary files a/scripts/tif__0013716a.pex and b/scripts/tif__0013716a.pex differ
diff --git a/scripts/tif__0013716d.pex b/scripts/tif__0013716d.pex
index d94417aa..938f7103 100644
Binary files a/scripts/tif__0013716d.pex and b/scripts/tif__0013716d.pex differ
diff --git a/scripts/tif__00137174.pex b/scripts/tif__00137174.pex
index 4ea13fb1..caf7b3dd 100644
Binary files a/scripts/tif__00137174.pex and b/scripts/tif__00137174.pex differ
diff --git a/scripts/tif__0013717d.pex b/scripts/tif__0013717d.pex
index 4e20c993..32c50d6c 100644
Binary files a/scripts/tif__0013717d.pex and b/scripts/tif__0013717d.pex differ
diff --git a/scripts/tif__001378e8.pex b/scripts/tif__001378e8.pex
index 8b7c7a8c..c7c77275 100644
Binary files a/scripts/tif__001378e8.pex and b/scripts/tif__001378e8.pex differ
diff --git a/scripts/tif__001378f1.pex b/scripts/tif__001378f1.pex
index eb0a9c52..a34d5edf 100644
Binary files a/scripts/tif__001378f1.pex and b/scripts/tif__001378f1.pex differ
diff --git a/scripts/tif__001378f6.pex b/scripts/tif__001378f6.pex
index 0fe05511..40466067 100644
Binary files a/scripts/tif__001378f6.pex and b/scripts/tif__001378f6.pex differ
diff --git a/scripts/tif__00137eeb.pex b/scripts/tif__00137eeb.pex
index 99dbfaca..8026e1a6 100644
Binary files a/scripts/tif__00137eeb.pex and b/scripts/tif__00137eeb.pex differ
diff --git a/scripts/tif__00137eef.pex b/scripts/tif__00137eef.pex
index 641cb219..c080d214 100644
Binary files a/scripts/tif__00137eef.pex and b/scripts/tif__00137eef.pex differ
diff --git a/scripts/tif__00137ef8.pex b/scripts/tif__00137ef8.pex
index 3aa787f0..cf8fb752 100644
Binary files a/scripts/tif__00137ef8.pex and b/scripts/tif__00137ef8.pex differ
diff --git a/scripts/tif__00137eff.pex b/scripts/tif__00137eff.pex
index 6677bd5c..45e4dfb5 100644
Binary files a/scripts/tif__00137eff.pex and b/scripts/tif__00137eff.pex differ
diff --git a/scripts/tif__00137f00.pex b/scripts/tif__00137f00.pex
index 38832ad3..047d6d37 100644
Binary files a/scripts/tif__00137f00.pex and b/scripts/tif__00137f00.pex differ
diff --git a/scripts/tif__00137f0c.pex b/scripts/tif__00137f0c.pex
index aafdc24d..c36d4e4e 100644
Binary files a/scripts/tif__00137f0c.pex and b/scripts/tif__00137f0c.pex differ
diff --git a/scripts/tif__00137f0e.pex b/scripts/tif__00137f0e.pex
index 5f78e06a..f620c706 100644
Binary files a/scripts/tif__00137f0e.pex and b/scripts/tif__00137f0e.pex differ
diff --git a/scripts/tif__00137f18.pex b/scripts/tif__00137f18.pex
index 2588f8a4..60f5dbae 100644
Binary files a/scripts/tif__00137f18.pex and b/scripts/tif__00137f18.pex differ
diff --git a/scripts/tif__00137f47.pex b/scripts/tif__00137f47.pex
index ac3f9835..aa90c0bc 100644
Binary files a/scripts/tif__00137f47.pex and b/scripts/tif__00137f47.pex differ
diff --git a/scripts/tif__00137f5b.pex b/scripts/tif__00137f5b.pex
index fa5f27bb..22b8df5f 100644
Binary files a/scripts/tif__00137f5b.pex and b/scripts/tif__00137f5b.pex differ
diff --git a/scripts/tif__00137f5e.pex b/scripts/tif__00137f5e.pex
index 72b7a9f1..9ff184b0 100644
Binary files a/scripts/tif__00137f5e.pex and b/scripts/tif__00137f5e.pex differ
diff --git a/scripts/tif__00137f6b.pex b/scripts/tif__00137f6b.pex
index 0cce0f51..30cfc9c7 100644
Binary files a/scripts/tif__00137f6b.pex and b/scripts/tif__00137f6b.pex differ
diff --git a/scripts/tif__00137f6c.pex b/scripts/tif__00137f6c.pex
index b533d04f..36a7aded 100644
Binary files a/scripts/tif__00137f6c.pex and b/scripts/tif__00137f6c.pex differ
diff --git a/scripts/tif__00137f6d.pex b/scripts/tif__00137f6d.pex
index 93223d86..a0bf508c 100644
Binary files a/scripts/tif__00137f6d.pex and b/scripts/tif__00137f6d.pex differ
diff --git a/scripts/tif__00137f7d.pex b/scripts/tif__00137f7d.pex
index d5c4f56e..e37572db 100644
Binary files a/scripts/tif__00137f7d.pex and b/scripts/tif__00137f7d.pex differ
diff --git a/scripts/tif__00137f80.pex b/scripts/tif__00137f80.pex
index 7e952a19..0b546ccc 100644
Binary files a/scripts/tif__00137f80.pex and b/scripts/tif__00137f80.pex differ
diff --git a/scripts/tif__001380cd.pex b/scripts/tif__001380cd.pex
index 9a9a54b8..5f2eaf3b 100644
Binary files a/scripts/tif__001380cd.pex and b/scripts/tif__001380cd.pex differ
diff --git a/scripts/tif__001380e3.pex b/scripts/tif__001380e3.pex
index 21e0c78d..ad76ce75 100644
Binary files a/scripts/tif__001380e3.pex and b/scripts/tif__001380e3.pex differ
diff --git a/scripts/tif__00139cfd.pex b/scripts/tif__00139cfd.pex
index bb281966..cd8f8eff 100644
Binary files a/scripts/tif__00139cfd.pex and b/scripts/tif__00139cfd.pex differ
diff --git a/scripts/tif__00139d02.pex b/scripts/tif__00139d02.pex
index bf7cc36e..7af40ec3 100644
Binary files a/scripts/tif__00139d02.pex and b/scripts/tif__00139d02.pex differ
diff --git a/scripts/tif__00139d08.pex b/scripts/tif__00139d08.pex
index da761806..9a5c637a 100644
Binary files a/scripts/tif__00139d08.pex and b/scripts/tif__00139d08.pex differ
diff --git a/scripts/tif__00139d0c.pex b/scripts/tif__00139d0c.pex
index bc11a39d..ff2533d4 100644
Binary files a/scripts/tif__00139d0c.pex and b/scripts/tif__00139d0c.pex differ
diff --git a/scripts/tif__00139d17.pex b/scripts/tif__00139d17.pex
index d88b3c86..97946544 100644
Binary files a/scripts/tif__00139d17.pex and b/scripts/tif__00139d17.pex differ
diff --git a/scripts/tif__00139d30.pex b/scripts/tif__00139d30.pex
index 8bff1a38..bae1b6a9 100644
Binary files a/scripts/tif__00139d30.pex and b/scripts/tif__00139d30.pex differ
diff --git a/scripts/tif__00139d36.pex b/scripts/tif__00139d36.pex
index dedf57b3..9b3be350 100644
Binary files a/scripts/tif__00139d36.pex and b/scripts/tif__00139d36.pex differ
diff --git a/scripts/tif__00139d3a.pex b/scripts/tif__00139d3a.pex
index 2525f9f4..e202a485 100644
Binary files a/scripts/tif__00139d3a.pex and b/scripts/tif__00139d3a.pex differ
diff --git a/scripts/tif__00139d43.pex b/scripts/tif__00139d43.pex
index 6090efe7..c6d9447d 100644
Binary files a/scripts/tif__00139d43.pex and b/scripts/tif__00139d43.pex differ
diff --git a/scripts/tif__00139d45.pex b/scripts/tif__00139d45.pex
index 9079a114..ba946b9f 100644
Binary files a/scripts/tif__00139d45.pex and b/scripts/tif__00139d45.pex differ
diff --git a/scripts/tif__00139d46.pex b/scripts/tif__00139d46.pex
index 7bc3db8a..10a311de 100644
Binary files a/scripts/tif__00139d46.pex and b/scripts/tif__00139d46.pex differ
diff --git a/scripts/tif__00139d4a.pex b/scripts/tif__00139d4a.pex
index b377a169..46c68bff 100644
Binary files a/scripts/tif__00139d4a.pex and b/scripts/tif__00139d4a.pex differ
diff --git a/scripts/tif__00139d50.pex b/scripts/tif__00139d50.pex
index 07700527..798a1989 100644
Binary files a/scripts/tif__00139d50.pex and b/scripts/tif__00139d50.pex differ
diff --git a/scripts/tif__00139d52.pex b/scripts/tif__00139d52.pex
index c1218feb..c7a204ff 100644
Binary files a/scripts/tif__00139d52.pex and b/scripts/tif__00139d52.pex differ
diff --git a/scripts/tif__00139d53.pex b/scripts/tif__00139d53.pex
index 4c7d9689..d0e4a167 100644
Binary files a/scripts/tif__00139d53.pex and b/scripts/tif__00139d53.pex differ
diff --git a/scripts/tif__00139d58.pex b/scripts/tif__00139d58.pex
index a2e7736d..0a502d56 100644
Binary files a/scripts/tif__00139d58.pex and b/scripts/tif__00139d58.pex differ
diff --git a/scripts/tif__00139d63.pex b/scripts/tif__00139d63.pex
index eec1df17..5b09d755 100644
Binary files a/scripts/tif__00139d63.pex and b/scripts/tif__00139d63.pex differ
diff --git a/scripts/tif__00139d64.pex b/scripts/tif__00139d64.pex
index 1ba764f7..8b310938 100644
Binary files a/scripts/tif__00139d64.pex and b/scripts/tif__00139d64.pex differ
diff --git a/scripts/tif__00139d6f.pex b/scripts/tif__00139d6f.pex
index aa69cbfb..17729109 100644
Binary files a/scripts/tif__00139d6f.pex and b/scripts/tif__00139d6f.pex differ
diff --git a/scripts/tif__00139d76.pex b/scripts/tif__00139d76.pex
index a9e92703..e924d14d 100644
Binary files a/scripts/tif__00139d76.pex and b/scripts/tif__00139d76.pex differ
diff --git a/scripts/tif__00139d85.pex b/scripts/tif__00139d85.pex
index e00e82ae..8ea4e417 100644
Binary files a/scripts/tif__00139d85.pex and b/scripts/tif__00139d85.pex differ
diff --git a/scripts/tif__00139e19.pex b/scripts/tif__00139e19.pex
index 9375f450..04832b5c 100644
Binary files a/scripts/tif__00139e19.pex and b/scripts/tif__00139e19.pex differ
diff --git a/scripts/tif__00139e24.pex b/scripts/tif__00139e24.pex
index bb576118..0becb6b3 100644
Binary files a/scripts/tif__00139e24.pex and b/scripts/tif__00139e24.pex differ
diff --git a/scripts/tif__00139e44.pex b/scripts/tif__00139e44.pex
index 0afac340..06535529 100644
Binary files a/scripts/tif__00139e44.pex and b/scripts/tif__00139e44.pex differ
diff --git a/scripts/tif__00139e45.pex b/scripts/tif__00139e45.pex
index 30a24047..fa33f7fd 100644
Binary files a/scripts/tif__00139e45.pex and b/scripts/tif__00139e45.pex differ
diff --git a/scripts/tif__00139f04.pex b/scripts/tif__00139f04.pex
index b964e598..9192d5b3 100644
Binary files a/scripts/tif__00139f04.pex and b/scripts/tif__00139f04.pex differ
diff --git a/scripts/tif__00139f4e.pex b/scripts/tif__00139f4e.pex
index 3b3a4c23..bae20e2e 100644
Binary files a/scripts/tif__00139f4e.pex and b/scripts/tif__00139f4e.pex differ
diff --git a/scripts/tif__00139f4f.pex b/scripts/tif__00139f4f.pex
index 80661cec..2f3e765b 100644
Binary files a/scripts/tif__00139f4f.pex and b/scripts/tif__00139f4f.pex differ
diff --git a/scripts/tif__00139f53.pex b/scripts/tif__00139f53.pex
index 7e218368..c69c2335 100644
Binary files a/scripts/tif__00139f53.pex and b/scripts/tif__00139f53.pex differ
diff --git a/scripts/tif__00139f5c.pex b/scripts/tif__00139f5c.pex
index d70a9153..dcfe7ad5 100644
Binary files a/scripts/tif__00139f5c.pex and b/scripts/tif__00139f5c.pex differ
diff --git a/scripts/tif__00139f6b.pex b/scripts/tif__00139f6b.pex
index 90ae7f28..5eade670 100644
Binary files a/scripts/tif__00139f6b.pex and b/scripts/tif__00139f6b.pex differ
diff --git a/scripts/tif__00139f75.pex b/scripts/tif__00139f75.pex
index e77ee3ed..4862d239 100644
Binary files a/scripts/tif__00139f75.pex and b/scripts/tif__00139f75.pex differ
diff --git a/scripts/tif__00139f76.pex b/scripts/tif__00139f76.pex
index 23363764..8e17defe 100644
Binary files a/scripts/tif__00139f76.pex and b/scripts/tif__00139f76.pex differ
diff --git a/scripts/tif__00139f77.pex b/scripts/tif__00139f77.pex
index aace6483..f6442523 100644
Binary files a/scripts/tif__00139f77.pex and b/scripts/tif__00139f77.pex differ
diff --git a/scripts/tif__00139f93.pex b/scripts/tif__00139f93.pex
index 87f8780b..1996ff0c 100644
Binary files a/scripts/tif__00139f93.pex and b/scripts/tif__00139f93.pex differ
diff --git a/scripts/tif__00139f94.pex b/scripts/tif__00139f94.pex
index 1a3aa3eb..e5614c22 100644
Binary files a/scripts/tif__00139f94.pex and b/scripts/tif__00139f94.pex differ
diff --git a/scripts/tif__00139f99.pex b/scripts/tif__00139f99.pex
index 30c863fd..d97615e8 100644
Binary files a/scripts/tif__00139f99.pex and b/scripts/tif__00139f99.pex differ
diff --git a/scripts/tif__00139f9a.pex b/scripts/tif__00139f9a.pex
index 0419287c..1bf69f94 100644
Binary files a/scripts/tif__00139f9a.pex and b/scripts/tif__00139f9a.pex differ
diff --git a/scripts/tif__00139fa5.pex b/scripts/tif__00139fa5.pex
index bfe2faf0..ff4414d7 100644
Binary files a/scripts/tif__00139fa5.pex and b/scripts/tif__00139fa5.pex differ
diff --git a/scripts/tif__00139fa6.pex b/scripts/tif__00139fa6.pex
index 0fee1a33..5d3abb61 100644
Binary files a/scripts/tif__00139fa6.pex and b/scripts/tif__00139fa6.pex differ
diff --git a/scripts/tif__00139fa9.pex b/scripts/tif__00139fa9.pex
index 83ee2379..259323ae 100644
Binary files a/scripts/tif__00139fa9.pex and b/scripts/tif__00139fa9.pex differ
diff --git a/scripts/tif__00139faa.pex b/scripts/tif__00139faa.pex
index 58f8b7b6..1885b2ff 100644
Binary files a/scripts/tif__00139faa.pex and b/scripts/tif__00139faa.pex differ
diff --git a/scripts/tif__00139faf.pex b/scripts/tif__00139faf.pex
index 46828344..0e371860 100644
Binary files a/scripts/tif__00139faf.pex and b/scripts/tif__00139faf.pex differ
diff --git a/scripts/tif__00139fb7.pex b/scripts/tif__00139fb7.pex
index 5dca1c73..6e48dae5 100644
Binary files a/scripts/tif__00139fb7.pex and b/scripts/tif__00139fb7.pex differ
diff --git a/scripts/tif__00139fb8.pex b/scripts/tif__00139fb8.pex
index 2ce36660..24a79746 100644
Binary files a/scripts/tif__00139fb8.pex and b/scripts/tif__00139fb8.pex differ
diff --git a/scripts/tif__00139fbf.pex b/scripts/tif__00139fbf.pex
index 38a0d0d6..02d62bae 100644
Binary files a/scripts/tif__00139fbf.pex and b/scripts/tif__00139fbf.pex differ
diff --git a/scripts/tif__00139fc0.pex b/scripts/tif__00139fc0.pex
index 0737a425..f87011e0 100644
Binary files a/scripts/tif__00139fc0.pex and b/scripts/tif__00139fc0.pex differ
diff --git a/scripts/tif__00139fc5.pex b/scripts/tif__00139fc5.pex
index b27a1070..c785fb90 100644
Binary files a/scripts/tif__00139fc5.pex and b/scripts/tif__00139fc5.pex differ
diff --git a/scripts/tif__00139fc6.pex b/scripts/tif__00139fc6.pex
index 4032df24..1e8023d7 100644
Binary files a/scripts/tif__00139fc6.pex and b/scripts/tif__00139fc6.pex differ
diff --git a/scripts/tif__0013c1e3.pex b/scripts/tif__0013c1e3.pex
index 3ce18a03..d8adfd86 100644
Binary files a/scripts/tif__0013c1e3.pex and b/scripts/tif__0013c1e3.pex differ
diff --git a/scripts/tif__0013c1e6.pex b/scripts/tif__0013c1e6.pex
index 2ce251b3..575e9c1c 100644
Binary files a/scripts/tif__0013c1e6.pex and b/scripts/tif__0013c1e6.pex differ
diff --git a/scripts/tif__0013c1e8.pex b/scripts/tif__0013c1e8.pex
index 02b80599..88a9b3e8 100644
Binary files a/scripts/tif__0013c1e8.pex and b/scripts/tif__0013c1e8.pex differ
diff --git a/scripts/tif__0013c1ee.pex b/scripts/tif__0013c1ee.pex
index 8fc3ab8b..2ff01974 100644
Binary files a/scripts/tif__0013c1ee.pex and b/scripts/tif__0013c1ee.pex differ
diff --git a/scripts/tif__0013c1f2.pex b/scripts/tif__0013c1f2.pex
index 395cf2c3..3a0cd01a 100644
Binary files a/scripts/tif__0013c1f2.pex and b/scripts/tif__0013c1f2.pex differ
diff --git a/scripts/tif__0013c334.pex b/scripts/tif__0013c334.pex
index 301c9b1b..4f56c077 100644
Binary files a/scripts/tif__0013c334.pex and b/scripts/tif__0013c334.pex differ
diff --git a/scripts/tif__0013c343.pex b/scripts/tif__0013c343.pex
index 6cb52aff..60c12b4d 100644
Binary files a/scripts/tif__0013c343.pex and b/scripts/tif__0013c343.pex differ
diff --git a/scripts/tif__0013c3ad.pex b/scripts/tif__0013c3ad.pex
index e77e0d0f..1ba836a2 100644
Binary files a/scripts/tif__0013c3ad.pex and b/scripts/tif__0013c3ad.pex differ
diff --git a/scripts/tif__0013c3b8.pex b/scripts/tif__0013c3b8.pex
index 1b09a010..4aa5b49a 100644
Binary files a/scripts/tif__0013c3b8.pex and b/scripts/tif__0013c3b8.pex differ
diff --git a/scripts/tif__0013c3be.pex b/scripts/tif__0013c3be.pex
index c6bd6a3e..3085ce51 100644
Binary files a/scripts/tif__0013c3be.pex and b/scripts/tif__0013c3be.pex differ
diff --git a/scripts/tif__0013c3c2.pex b/scripts/tif__0013c3c2.pex
index 409e2667..553a7f4a 100644
Binary files a/scripts/tif__0013c3c2.pex and b/scripts/tif__0013c3c2.pex differ
diff --git a/scripts/tif__0013c3c7.pex b/scripts/tif__0013c3c7.pex
index 518f397b..924213f7 100644
Binary files a/scripts/tif__0013c3c7.pex and b/scripts/tif__0013c3c7.pex differ
diff --git a/scripts/tif__0013c3c8.pex b/scripts/tif__0013c3c8.pex
index 9fa16020..d7be6d59 100644
Binary files a/scripts/tif__0013c3c8.pex and b/scripts/tif__0013c3c8.pex differ
diff --git a/scripts/tif__0013c3e8.pex b/scripts/tif__0013c3e8.pex
index 2370c939..3d35931e 100644
Binary files a/scripts/tif__0013c3e8.pex and b/scripts/tif__0013c3e8.pex differ
diff --git a/scripts/tif__0013c3eb.pex b/scripts/tif__0013c3eb.pex
index e42c8efb..8e00bda8 100644
Binary files a/scripts/tif__0013c3eb.pex and b/scripts/tif__0013c3eb.pex differ
diff --git a/scripts/tif__0013c8ec.pex b/scripts/tif__0013c8ec.pex
index e88d34a6..816e596b 100644
Binary files a/scripts/tif__0013c8ec.pex and b/scripts/tif__0013c8ec.pex differ
diff --git a/scripts/tif__0013c8ee.pex b/scripts/tif__0013c8ee.pex
index c53a844f..d1333454 100644
Binary files a/scripts/tif__0013c8ee.pex and b/scripts/tif__0013c8ee.pex differ
diff --git a/scripts/tif__0013c8f3.pex b/scripts/tif__0013c8f3.pex
index 363d4526..37432ed5 100644
Binary files a/scripts/tif__0013c8f3.pex and b/scripts/tif__0013c8f3.pex differ
diff --git a/scripts/tif__0013c8f5.pex b/scripts/tif__0013c8f5.pex
index 9840dd33..3fc92e17 100644
Binary files a/scripts/tif__0013c8f5.pex and b/scripts/tif__0013c8f5.pex differ
diff --git a/scripts/tif__0013c90a.pex b/scripts/tif__0013c90a.pex
index 3a2f4ee9..1a09925a 100644
Binary files a/scripts/tif__0013c90a.pex and b/scripts/tif__0013c90a.pex differ
diff --git a/scripts/tif__0013c90c.pex b/scripts/tif__0013c90c.pex
index 2ce3adab..617350a7 100644
Binary files a/scripts/tif__0013c90c.pex and b/scripts/tif__0013c90c.pex differ
diff --git a/scripts/tif__0013c918.pex b/scripts/tif__0013c918.pex
index b5afe0b7..156c7538 100644
Binary files a/scripts/tif__0013c918.pex and b/scripts/tif__0013c918.pex differ
diff --git a/scripts/tif__0013c91c.pex b/scripts/tif__0013c91c.pex
index 11a7249d..b7437653 100644
Binary files a/scripts/tif__0013c91c.pex and b/scripts/tif__0013c91c.pex differ
diff --git a/scripts/tif__0013c921.pex b/scripts/tif__0013c921.pex
index 937ae1dd..249f7017 100644
Binary files a/scripts/tif__0013c921.pex and b/scripts/tif__0013c921.pex differ
diff --git a/scripts/tif__0013c923.pex b/scripts/tif__0013c923.pex
index 783ae6c2..d873ba37 100644
Binary files a/scripts/tif__0013c923.pex and b/scripts/tif__0013c923.pex differ
diff --git a/scripts/tif__0013c931.pex b/scripts/tif__0013c931.pex
index 946f55f0..a10bc6ac 100644
Binary files a/scripts/tif__0013c931.pex and b/scripts/tif__0013c931.pex differ
diff --git a/scripts/tif__0013c932.pex b/scripts/tif__0013c932.pex
index 2c749efa..74d65f38 100644
Binary files a/scripts/tif__0013c932.pex and b/scripts/tif__0013c932.pex differ
diff --git a/scripts/tif__0013cec1.pex b/scripts/tif__0013cec1.pex
index ba58f032..9894d197 100644
Binary files a/scripts/tif__0013cec1.pex and b/scripts/tif__0013cec1.pex differ
diff --git a/scripts/tif__0013cec6.pex b/scripts/tif__0013cec6.pex
index 6c662b1c..13fa8104 100644
Binary files a/scripts/tif__0013cec6.pex and b/scripts/tif__0013cec6.pex differ
diff --git a/scripts/tif__0013cecb.pex b/scripts/tif__0013cecb.pex
index d26242e6..a25b5b34 100644
Binary files a/scripts/tif__0013cecb.pex and b/scripts/tif__0013cecb.pex differ
diff --git a/scripts/tif__0013cecd.pex b/scripts/tif__0013cecd.pex
index 066d0de1..90e92f22 100644
Binary files a/scripts/tif__0013cecd.pex and b/scripts/tif__0013cecd.pex differ
diff --git a/scripts/tif__0013cee2.pex b/scripts/tif__0013cee2.pex
index e2bb5a6c..a0363bf5 100644
Binary files a/scripts/tif__0013cee2.pex and b/scripts/tif__0013cee2.pex differ
diff --git a/scripts/tif__0013cee9.pex b/scripts/tif__0013cee9.pex
index 05f2528e..6ecc0388 100644
Binary files a/scripts/tif__0013cee9.pex and b/scripts/tif__0013cee9.pex differ
diff --git a/scripts/tif__0013ceeb.pex b/scripts/tif__0013ceeb.pex
index 03d892d6..66fcea22 100644
Binary files a/scripts/tif__0013ceeb.pex and b/scripts/tif__0013ceeb.pex differ
diff --git a/scripts/tif__0013cf71.pex b/scripts/tif__0013cf71.pex
index 7d031906..184381d7 100644
Binary files a/scripts/tif__0013cf71.pex and b/scripts/tif__0013cf71.pex differ
diff --git a/scripts/tif__0013cf75.pex b/scripts/tif__0013cf75.pex
index bc147dde..a81ae490 100644
Binary files a/scripts/tif__0013cf75.pex and b/scripts/tif__0013cf75.pex differ
diff --git a/scripts/tif__0013cfa5.pex b/scripts/tif__0013cfa5.pex
index 2d28f315..de7fc97a 100644
Binary files a/scripts/tif__0013cfa5.pex and b/scripts/tif__0013cfa5.pex differ
diff --git a/scripts/tif__0013cfab.pex b/scripts/tif__0013cfab.pex
index 906f558f..e64b7f81 100644
Binary files a/scripts/tif__0013cfab.pex and b/scripts/tif__0013cfab.pex differ
diff --git a/scripts/tif__0013cfb1.pex b/scripts/tif__0013cfb1.pex
index 6905cc2e..97f2e4cc 100644
Binary files a/scripts/tif__0013cfb1.pex and b/scripts/tif__0013cfb1.pex differ
diff --git a/scripts/tif__0013cfb2.pex b/scripts/tif__0013cfb2.pex
index efacbb44..ea75cd05 100644
Binary files a/scripts/tif__0013cfb2.pex and b/scripts/tif__0013cfb2.pex differ
diff --git a/scripts/tif__0013cfb5.pex b/scripts/tif__0013cfb5.pex
index 31630696..1c91415a 100644
Binary files a/scripts/tif__0013cfb5.pex and b/scripts/tif__0013cfb5.pex differ
diff --git a/scripts/tif__0013cfb6.pex b/scripts/tif__0013cfb6.pex
index bed6c620..55adfa25 100644
Binary files a/scripts/tif__0013cfb6.pex and b/scripts/tif__0013cfb6.pex differ
diff --git a/scripts/tif__0013d048.pex b/scripts/tif__0013d048.pex
index 4fec5429..ce9c7d7b 100644
Binary files a/scripts/tif__0013d048.pex and b/scripts/tif__0013d048.pex differ
diff --git a/scripts/tif__0013d04c.pex b/scripts/tif__0013d04c.pex
index 3c2711f5..e0807e64 100644
Binary files a/scripts/tif__0013d04c.pex and b/scripts/tif__0013d04c.pex differ
diff --git a/scripts/tif__0013d04f.pex b/scripts/tif__0013d04f.pex
index 47ab385c..fb817532 100644
Binary files a/scripts/tif__0013d04f.pex and b/scripts/tif__0013d04f.pex differ
diff --git a/scripts/tif__0013d053.pex b/scripts/tif__0013d053.pex
index 94a6c41a..eaa11eaa 100644
Binary files a/scripts/tif__0013d053.pex and b/scripts/tif__0013d053.pex differ
diff --git a/scripts/tif__0013d054.pex b/scripts/tif__0013d054.pex
index 29043eb1..fb5cebe1 100644
Binary files a/scripts/tif__0013d054.pex and b/scripts/tif__0013d054.pex differ
diff --git a/scripts/tif__0013d05f.pex b/scripts/tif__0013d05f.pex
index 02f00a0f..06cb5d0a 100644
Binary files a/scripts/tif__0013d05f.pex and b/scripts/tif__0013d05f.pex differ
diff --git a/scripts/tif__0013d07d.pex b/scripts/tif__0013d07d.pex
index 81b387a5..830b7b2e 100644
Binary files a/scripts/tif__0013d07d.pex and b/scripts/tif__0013d07d.pex differ
diff --git a/scripts/tif__0013d083.pex b/scripts/tif__0013d083.pex
index b85c7501..b79cdb64 100644
Binary files a/scripts/tif__0013d083.pex and b/scripts/tif__0013d083.pex differ
diff --git a/scripts/tif__0013d085.pex b/scripts/tif__0013d085.pex
index 45ffea66..e10d72de 100644
Binary files a/scripts/tif__0013d085.pex and b/scripts/tif__0013d085.pex differ
diff --git a/scripts/tif__0013e86d.pex b/scripts/tif__0013e86d.pex
index f57c7ae5..21b16f68 100644
Binary files a/scripts/tif__0013e86d.pex and b/scripts/tif__0013e86d.pex differ
diff --git a/scripts/tif__0013e86f.pex b/scripts/tif__0013e86f.pex
index 6040eb12..e6a08d53 100644
Binary files a/scripts/tif__0013e86f.pex and b/scripts/tif__0013e86f.pex differ
diff --git a/scripts/tif__0013e875.pex b/scripts/tif__0013e875.pex
index 70562839..8384001f 100644
Binary files a/scripts/tif__0013e875.pex and b/scripts/tif__0013e875.pex differ
diff --git a/scripts/tif__0013e879.pex b/scripts/tif__0013e879.pex
index 78bac04c..a28f2791 100644
Binary files a/scripts/tif__0013e879.pex and b/scripts/tif__0013e879.pex differ
diff --git a/scripts/tif__0013e881.pex b/scripts/tif__0013e881.pex
index ff5e858c..ec86557b 100644
Binary files a/scripts/tif__0013e881.pex and b/scripts/tif__0013e881.pex differ
diff --git a/scripts/tif__0013e885.pex b/scripts/tif__0013e885.pex
index b37bf773..2948fac4 100644
Binary files a/scripts/tif__0013e885.pex and b/scripts/tif__0013e885.pex differ
diff --git a/scripts/tif__0013e8f6.pex b/scripts/tif__0013e8f6.pex
index bae8e28e..e9f8e142 100644
Binary files a/scripts/tif__0013e8f6.pex and b/scripts/tif__0013e8f6.pex differ
diff --git a/scripts/tif__0013e8f8.pex b/scripts/tif__0013e8f8.pex
index c20d841e..a2253cf1 100644
Binary files a/scripts/tif__0013e8f8.pex and b/scripts/tif__0013e8f8.pex differ
diff --git a/scripts/tif__0013e8fc.pex b/scripts/tif__0013e8fc.pex
index dc8925d2..1b9df2c1 100644
Binary files a/scripts/tif__0013e8fc.pex and b/scripts/tif__0013e8fc.pex differ
diff --git a/scripts/tif__0013e912.pex b/scripts/tif__0013e912.pex
index 786d8465..47fc48f2 100644
Binary files a/scripts/tif__0013e912.pex and b/scripts/tif__0013e912.pex differ
diff --git a/scripts/tif__0013e91b.pex b/scripts/tif__0013e91b.pex
index e3e13fb8..7b6d8b53 100644
Binary files a/scripts/tif__0013e91b.pex and b/scripts/tif__0013e91b.pex differ
diff --git a/scripts/tif__0013e92c.pex b/scripts/tif__0013e92c.pex
index d19b5d86..f33c0b28 100644
Binary files a/scripts/tif__0013e92c.pex and b/scripts/tif__0013e92c.pex differ
diff --git a/scripts/tif__0013e92e.pex b/scripts/tif__0013e92e.pex
index 1c108513..2ace1015 100644
Binary files a/scripts/tif__0013e92e.pex and b/scripts/tif__0013e92e.pex differ
diff --git a/scripts/tif__0013e989.pex b/scripts/tif__0013e989.pex
index ee3fafff..cf0c2c94 100644
Binary files a/scripts/tif__0013e989.pex and b/scripts/tif__0013e989.pex differ
diff --git a/scripts/tif__0013e98e.pex b/scripts/tif__0013e98e.pex
index 46137d03..6a035ab2 100644
Binary files a/scripts/tif__0013e98e.pex and b/scripts/tif__0013e98e.pex differ
diff --git a/scripts/tif__0013e992.pex b/scripts/tif__0013e992.pex
index c4254509..3b52fbd8 100644
Binary files a/scripts/tif__0013e992.pex and b/scripts/tif__0013e992.pex differ
diff --git a/scripts/tif__0013e998.pex b/scripts/tif__0013e998.pex
index a05ad173..c03e6d2d 100644
Binary files a/scripts/tif__0013e998.pex and b/scripts/tif__0013e998.pex differ
diff --git a/scripts/tif__0013e99e.pex b/scripts/tif__0013e99e.pex
index bf759c87..4f50e53a 100644
Binary files a/scripts/tif__0013e99e.pex and b/scripts/tif__0013e99e.pex differ
diff --git a/scripts/tif__0013e9a3.pex b/scripts/tif__0013e9a3.pex
index b22d7b95..cae170b4 100644
Binary files a/scripts/tif__0013e9a3.pex and b/scripts/tif__0013e9a3.pex differ
diff --git a/scripts/tif__0013e9ae.pex b/scripts/tif__0013e9ae.pex
index 33740fdb..81befad1 100644
Binary files a/scripts/tif__0013e9ae.pex and b/scripts/tif__0013e9ae.pex differ
diff --git a/scripts/tif__0013e9f3.pex b/scripts/tif__0013e9f3.pex
index e2278181..ba17e74f 100644
Binary files a/scripts/tif__0013e9f3.pex and b/scripts/tif__0013e9f3.pex differ
diff --git a/scripts/tif__0013e9f7.pex b/scripts/tif__0013e9f7.pex
index 41542d32..343e2492 100644
Binary files a/scripts/tif__0013e9f7.pex and b/scripts/tif__0013e9f7.pex differ
diff --git a/scripts/tif__0013ea9b.pex b/scripts/tif__0013ea9b.pex
index 8fdddce6..3b92a77a 100644
Binary files a/scripts/tif__0013ea9b.pex and b/scripts/tif__0013ea9b.pex differ
diff --git a/scripts/tif__0013ea9f.pex b/scripts/tif__0013ea9f.pex
index eb2c1ac4..6697da18 100644
Binary files a/scripts/tif__0013ea9f.pex and b/scripts/tif__0013ea9f.pex differ
diff --git a/scripts/tif__0013eabe.pex b/scripts/tif__0013eabe.pex
index b7e946c9..138a63b2 100644
Binary files a/scripts/tif__0013eabe.pex and b/scripts/tif__0013eabe.pex differ
diff --git a/scripts/tif__0013eabf.pex b/scripts/tif__0013eabf.pex
index 1d138b99..a1729236 100644
Binary files a/scripts/tif__0013eabf.pex and b/scripts/tif__0013eabf.pex differ
diff --git a/scripts/tif__0013ead3.pex b/scripts/tif__0013ead3.pex
index b3be14f8..9f9cc1be 100644
Binary files a/scripts/tif__0013ead3.pex and b/scripts/tif__0013ead3.pex differ
diff --git a/scripts/tif__0013eada.pex b/scripts/tif__0013eada.pex
index db6b43a4..171fe9f1 100644
Binary files a/scripts/tif__0013eada.pex and b/scripts/tif__0013eada.pex differ
diff --git a/scripts/tif__0013eae3.pex b/scripts/tif__0013eae3.pex
index 27156a9f..7204fc4e 100644
Binary files a/scripts/tif__0013eae3.pex and b/scripts/tif__0013eae3.pex differ
diff --git a/scripts/tif__0013eae6.pex b/scripts/tif__0013eae6.pex
index d1080f2a..f92d3896 100644
Binary files a/scripts/tif__0013eae6.pex and b/scripts/tif__0013eae6.pex differ
diff --git a/scripts/tif__0013eaed.pex b/scripts/tif__0013eaed.pex
index f74898d5..b822c019 100644
Binary files a/scripts/tif__0013eaed.pex and b/scripts/tif__0013eaed.pex differ
diff --git a/scripts/tif__0013eaf5.pex b/scripts/tif__0013eaf5.pex
index 398f68f5..d7fcf466 100644
Binary files a/scripts/tif__0013eaf5.pex and b/scripts/tif__0013eaf5.pex differ
diff --git a/scripts/tif__0013eaf6.pex b/scripts/tif__0013eaf6.pex
index f1f6210e..170e798a 100644
Binary files a/scripts/tif__0013eaf6.pex and b/scripts/tif__0013eaf6.pex differ
diff --git a/scripts/tif__0013eb04.pex b/scripts/tif__0013eb04.pex
index 5f4065b7..245c084b 100644
Binary files a/scripts/tif__0013eb04.pex and b/scripts/tif__0013eb04.pex differ
diff --git a/scripts/tif__0013f5a5.pex b/scripts/tif__0013f5a5.pex
index c0114240..65919a06 100644
Binary files a/scripts/tif__0013f5a5.pex and b/scripts/tif__0013f5a5.pex differ
diff --git a/scripts/tif__0013f650.pex b/scripts/tif__0013f650.pex
index 5c5527bb..17876be0 100644
Binary files a/scripts/tif__0013f650.pex and b/scripts/tif__0013f650.pex differ
diff --git a/scripts/tif__0013f651.pex b/scripts/tif__0013f651.pex
index 5fd90b76..ea5f90ce 100644
Binary files a/scripts/tif__0013f651.pex and b/scripts/tif__0013f651.pex differ
diff --git a/scripts/tif__0013f652.pex b/scripts/tif__0013f652.pex
index 21443ad1..1f6a2bc4 100644
Binary files a/scripts/tif__0013f652.pex and b/scripts/tif__0013f652.pex differ
diff --git a/scripts/tif__0013f653.pex b/scripts/tif__0013f653.pex
index f9a861bd..a5fcb93d 100644
Binary files a/scripts/tif__0013f653.pex and b/scripts/tif__0013f653.pex differ
diff --git a/scripts/tif__0013f65a.pex b/scripts/tif__0013f65a.pex
index 74492ee3..061793ce 100644
Binary files a/scripts/tif__0013f65a.pex and b/scripts/tif__0013f65a.pex differ
diff --git a/scripts/tif__0013f65b.pex b/scripts/tif__0013f65b.pex
index ed696d39..edfec43b 100644
Binary files a/scripts/tif__0013f65b.pex and b/scripts/tif__0013f65b.pex differ
diff --git a/scripts/tif__0013f65c.pex b/scripts/tif__0013f65c.pex
index 3d08eb90..ca29bd0a 100644
Binary files a/scripts/tif__0013f65c.pex and b/scripts/tif__0013f65c.pex differ
diff --git a/scripts/tif__0013f676.pex b/scripts/tif__0013f676.pex
index b982897f..b5c4279f 100644
Binary files a/scripts/tif__0013f676.pex and b/scripts/tif__0013f676.pex differ
diff --git a/scripts/tif__0013f67a.pex b/scripts/tif__0013f67a.pex
index f2dcd570..602e4529 100644
Binary files a/scripts/tif__0013f67a.pex and b/scripts/tif__0013f67a.pex differ
diff --git a/scripts/tif__0013f689.pex b/scripts/tif__0013f689.pex
index 90b068d5..9fc16f77 100644
Binary files a/scripts/tif__0013f689.pex and b/scripts/tif__0013f689.pex differ
diff --git a/scripts/tif__0013f691.pex b/scripts/tif__0013f691.pex
index feb84b59..5ea6e6cb 100644
Binary files a/scripts/tif__0013f691.pex and b/scripts/tif__0013f691.pex differ
diff --git a/scripts/tif__0013f693.pex b/scripts/tif__0013f693.pex
index fd55f3ca..cb9e47ad 100644
Binary files a/scripts/tif__0013f693.pex and b/scripts/tif__0013f693.pex differ
diff --git a/scripts/tif__0013f698.pex b/scripts/tif__0013f698.pex
index b00ad0f8..fefd682f 100644
Binary files a/scripts/tif__0013f698.pex and b/scripts/tif__0013f698.pex differ
diff --git a/scripts/tif__0013f6a3.pex b/scripts/tif__0013f6a3.pex
index be69493d..6d24827e 100644
Binary files a/scripts/tif__0013f6a3.pex and b/scripts/tif__0013f6a3.pex differ
diff --git a/scripts/tif__0013f6a5.pex b/scripts/tif__0013f6a5.pex
index 47302b99..e87b6f19 100644
Binary files a/scripts/tif__0013f6a5.pex and b/scripts/tif__0013f6a5.pex differ
diff --git a/scripts/tif__0013f6ac.pex b/scripts/tif__0013f6ac.pex
index add4b227..6cbabd20 100644
Binary files a/scripts/tif__0013f6ac.pex and b/scripts/tif__0013f6ac.pex differ
diff --git a/scripts/tif__0013f6b1.pex b/scripts/tif__0013f6b1.pex
index fa4c9870..f972a0d0 100644
Binary files a/scripts/tif__0013f6b1.pex and b/scripts/tif__0013f6b1.pex differ
diff --git a/scripts/tif__0013f6b2.pex b/scripts/tif__0013f6b2.pex
index 27df4bed..c39b10a6 100644
Binary files a/scripts/tif__0013f6b2.pex and b/scripts/tif__0013f6b2.pex differ
diff --git a/scripts/tif__0013f6b6.pex b/scripts/tif__0013f6b6.pex
index 6e7c25c7..c16e025a 100644
Binary files a/scripts/tif__0013f6b6.pex and b/scripts/tif__0013f6b6.pex differ
diff --git a/scripts/tif__0013f6b7.pex b/scripts/tif__0013f6b7.pex
index 3e85f1dc..2cc1782b 100644
Binary files a/scripts/tif__0013f6b7.pex and b/scripts/tif__0013f6b7.pex differ
diff --git a/scripts/tif__0013f6bf.pex b/scripts/tif__0013f6bf.pex
index 9950f737..2942e057 100644
Binary files a/scripts/tif__0013f6bf.pex and b/scripts/tif__0013f6bf.pex differ
diff --git a/scripts/tif__0013f6c5.pex b/scripts/tif__0013f6c5.pex
index cdf0ab17..4a160fb0 100644
Binary files a/scripts/tif__0013f6c5.pex and b/scripts/tif__0013f6c5.pex differ
diff --git a/scripts/tif__0013f6c6.pex b/scripts/tif__0013f6c6.pex
index 426237db..c637974b 100644
Binary files a/scripts/tif__0013f6c6.pex and b/scripts/tif__0013f6c6.pex differ
diff --git a/scripts/tif__0013f6c9.pex b/scripts/tif__0013f6c9.pex
index b3b949e0..da9e7541 100644
Binary files a/scripts/tif__0013f6c9.pex and b/scripts/tif__0013f6c9.pex differ
diff --git a/scripts/tif__0013f6cb.pex b/scripts/tif__0013f6cb.pex
index 17ae5e7e..4147d0fb 100644
Binary files a/scripts/tif__0013f6cb.pex and b/scripts/tif__0013f6cb.pex differ
diff --git a/scripts/tif__0013f6cc.pex b/scripts/tif__0013f6cc.pex
index a8c3c4e7..ae774266 100644
Binary files a/scripts/tif__0013f6cc.pex and b/scripts/tif__0013f6cc.pex differ
diff --git a/scripts/tif__0013f6ce.pex b/scripts/tif__0013f6ce.pex
index 48b4e476..e0eb8eec 100644
Binary files a/scripts/tif__0013f6ce.pex and b/scripts/tif__0013f6ce.pex differ
diff --git a/scripts/tif__0013f6d2.pex b/scripts/tif__0013f6d2.pex
index 6cee4334..f634091f 100644
Binary files a/scripts/tif__0013f6d2.pex and b/scripts/tif__0013f6d2.pex differ
diff --git a/scripts/tif__0013f6d3.pex b/scripts/tif__0013f6d3.pex
index cc6461d3..f456f4b3 100644
Binary files a/scripts/tif__0013f6d3.pex and b/scripts/tif__0013f6d3.pex differ
diff --git a/scripts/tif__0013f6d4.pex b/scripts/tif__0013f6d4.pex
index 1260ef2a..6757c40a 100644
Binary files a/scripts/tif__0013f6d4.pex and b/scripts/tif__0013f6d4.pex differ
diff --git a/scripts/tif__0013f6da.pex b/scripts/tif__0013f6da.pex
index d36fa361..8f044568 100644
Binary files a/scripts/tif__0013f6da.pex and b/scripts/tif__0013f6da.pex differ
diff --git a/scripts/tif__0013f6dd.pex b/scripts/tif__0013f6dd.pex
index 4d2fe0a8..6638bb0f 100644
Binary files a/scripts/tif__0013f6dd.pex and b/scripts/tif__0013f6dd.pex differ
diff --git a/scripts/tif__0013f6de.pex b/scripts/tif__0013f6de.pex
index 250125c7..87478848 100644
Binary files a/scripts/tif__0013f6de.pex and b/scripts/tif__0013f6de.pex differ
diff --git a/scripts/tif__0013f6e3.pex b/scripts/tif__0013f6e3.pex
index 104a098c..15890761 100644
Binary files a/scripts/tif__0013f6e3.pex and b/scripts/tif__0013f6e3.pex differ
diff --git a/scripts/tif__0013f6ef.pex b/scripts/tif__0013f6ef.pex
index 1262f68f..f16912b4 100644
Binary files a/scripts/tif__0013f6ef.pex and b/scripts/tif__0013f6ef.pex differ
diff --git a/scripts/tif__0013f6f0.pex b/scripts/tif__0013f6f0.pex
index c64bac94..52acb956 100644
Binary files a/scripts/tif__0013f6f0.pex and b/scripts/tif__0013f6f0.pex differ
diff --git a/scripts/tif__0013fa68.pex b/scripts/tif__0013fa68.pex
index 8c799177..d04c73e1 100644
Binary files a/scripts/tif__0013fa68.pex and b/scripts/tif__0013fa68.pex differ
diff --git a/scripts/tif__0013fa6a.pex b/scripts/tif__0013fa6a.pex
index 4e325f8e..80bd3182 100644
Binary files a/scripts/tif__0013fa6a.pex and b/scripts/tif__0013fa6a.pex differ
diff --git a/scripts/tif__0013fa6d.pex b/scripts/tif__0013fa6d.pex
index dde22732..d0739015 100644
Binary files a/scripts/tif__0013fa6d.pex and b/scripts/tif__0013fa6d.pex differ
diff --git a/scripts/tif__0013fa71.pex b/scripts/tif__0013fa71.pex
index a004270c..239958c1 100644
Binary files a/scripts/tif__0013fa71.pex and b/scripts/tif__0013fa71.pex differ
diff --git a/scripts/tif__0013fa89.pex b/scripts/tif__0013fa89.pex
index 29c22f62..d7151595 100644
Binary files a/scripts/tif__0013fa89.pex and b/scripts/tif__0013fa89.pex differ
diff --git a/scripts/tif__0013fa8c.pex b/scripts/tif__0013fa8c.pex
index e0339aae..0b4bd0e8 100644
Binary files a/scripts/tif__0013fa8c.pex and b/scripts/tif__0013fa8c.pex differ
diff --git a/scripts/tif__00140027.pex b/scripts/tif__00140027.pex
index f0f517d6..36540c9b 100644
Binary files a/scripts/tif__00140027.pex and b/scripts/tif__00140027.pex differ
diff --git a/scripts/tif__0014002c.pex b/scripts/tif__0014002c.pex
index d7ab46fc..028ff59f 100644
Binary files a/scripts/tif__0014002c.pex and b/scripts/tif__0014002c.pex differ
diff --git a/scripts/tif__00140037.pex b/scripts/tif__00140037.pex
index 530ccf64..f72223f2 100644
Binary files a/scripts/tif__00140037.pex and b/scripts/tif__00140037.pex differ
diff --git a/scripts/tif__0014003a.pex b/scripts/tif__0014003a.pex
index 2567cc3b..1d6ec202 100644
Binary files a/scripts/tif__0014003a.pex and b/scripts/tif__0014003a.pex differ
diff --git a/scripts/tif__0014003f.pex b/scripts/tif__0014003f.pex
index c4dc694f..8c833436 100644
Binary files a/scripts/tif__0014003f.pex and b/scripts/tif__0014003f.pex differ
diff --git a/scripts/tif__00140040.pex b/scripts/tif__00140040.pex
index 10a9aa20..b5e6b0a4 100644
Binary files a/scripts/tif__00140040.pex and b/scripts/tif__00140040.pex differ
diff --git a/scripts/tif__00140045.pex b/scripts/tif__00140045.pex
index 8a4bab60..2cd58329 100644
Binary files a/scripts/tif__00140045.pex and b/scripts/tif__00140045.pex differ
diff --git a/scripts/tif__00140048.pex b/scripts/tif__00140048.pex
index b9535de3..57ff4a3d 100644
Binary files a/scripts/tif__00140048.pex and b/scripts/tif__00140048.pex differ
diff --git a/scripts/tif__00140049.pex b/scripts/tif__00140049.pex
index abbb6e83..e5ea993b 100644
Binary files a/scripts/tif__00140049.pex and b/scripts/tif__00140049.pex differ
diff --git a/scripts/tif__00140055.pex b/scripts/tif__00140055.pex
index 815e7f21..5c01ba3d 100644
Binary files a/scripts/tif__00140055.pex and b/scripts/tif__00140055.pex differ
diff --git a/scripts/tif__0014005b.pex b/scripts/tif__0014005b.pex
index af0f1f10..ab0938fe 100644
Binary files a/scripts/tif__0014005b.pex and b/scripts/tif__0014005b.pex differ
diff --git a/scripts/tif__00141740.pex b/scripts/tif__00141740.pex
index ff1dfcc5..3d626a99 100644
Binary files a/scripts/tif__00141740.pex and b/scripts/tif__00141740.pex differ
diff --git a/scripts/tif__00141747.pex b/scripts/tif__00141747.pex
index 758c7126..87979531 100644
Binary files a/scripts/tif__00141747.pex and b/scripts/tif__00141747.pex differ
diff --git a/scripts/tif__00141748.pex b/scripts/tif__00141748.pex
index a987196c..e69d352b 100644
Binary files a/scripts/tif__00141748.pex and b/scripts/tif__00141748.pex differ
diff --git a/scripts/tif__00141752.pex b/scripts/tif__00141752.pex
index 81ad7723..ace5cdef 100644
Binary files a/scripts/tif__00141752.pex and b/scripts/tif__00141752.pex differ
diff --git a/scripts/tif__00141753.pex b/scripts/tif__00141753.pex
index 90a7c3d5..400245f9 100644
Binary files a/scripts/tif__00141753.pex and b/scripts/tif__00141753.pex differ
diff --git a/scripts/tif__001417cc.pex b/scripts/tif__001417cc.pex
index 13dfb7ca..bfe16d1b 100644
Binary files a/scripts/tif__001417cc.pex and b/scripts/tif__001417cc.pex differ
diff --git a/scripts/tif__00141c01.pex b/scripts/tif__00141c01.pex
index af62a3f5..f90942b1 100644
Binary files a/scripts/tif__00141c01.pex and b/scripts/tif__00141c01.pex differ
diff --git a/scripts/tif__00141c02.pex b/scripts/tif__00141c02.pex
index 0639232a..ce11776d 100644
Binary files a/scripts/tif__00141c02.pex and b/scripts/tif__00141c02.pex differ
diff --git a/scripts/tif__00141cbe.pex b/scripts/tif__00141cbe.pex
index 08c8a374..1259c115 100644
Binary files a/scripts/tif__00141cbe.pex and b/scripts/tif__00141cbe.pex differ
diff --git a/scripts/tif__00141cd1.pex b/scripts/tif__00141cd1.pex
index 4fd4ceaf..ad0c83ad 100644
Binary files a/scripts/tif__00141cd1.pex and b/scripts/tif__00141cd1.pex differ
diff --git a/scripts/tif__00141cd3.pex b/scripts/tif__00141cd3.pex
index 2141d467..e9983b1a 100644
Binary files a/scripts/tif__00141cd3.pex and b/scripts/tif__00141cd3.pex differ
diff --git a/scripts/tif__00141cd4.pex b/scripts/tif__00141cd4.pex
index 2f3beac2..e8d480a2 100644
Binary files a/scripts/tif__00141cd4.pex and b/scripts/tif__00141cd4.pex differ
diff --git a/scripts/tif__00141cd5.pex b/scripts/tif__00141cd5.pex
index 5acdae43..24c28134 100644
Binary files a/scripts/tif__00141cd5.pex and b/scripts/tif__00141cd5.pex differ
diff --git a/scripts/tif__00141cd6.pex b/scripts/tif__00141cd6.pex
index 052d2bfa..24250220 100644
Binary files a/scripts/tif__00141cd6.pex and b/scripts/tif__00141cd6.pex differ
diff --git a/scripts/tif__00141cdd.pex b/scripts/tif__00141cdd.pex
index 0f7f3444..ec34d89d 100644
Binary files a/scripts/tif__00141cdd.pex and b/scripts/tif__00141cdd.pex differ
diff --git a/scripts/tif__00141ce0.pex b/scripts/tif__00141ce0.pex
index a4464c5f..11a9ca62 100644
Binary files a/scripts/tif__00141ce0.pex and b/scripts/tif__00141ce0.pex differ
diff --git a/scripts/tif__00141ce3.pex b/scripts/tif__00141ce3.pex
index 40143ef3..f1c61d4e 100644
Binary files a/scripts/tif__00141ce3.pex and b/scripts/tif__00141ce3.pex differ
diff --git a/scripts/tif__00141ce9.pex b/scripts/tif__00141ce9.pex
index 32824c2f..f067abe5 100644
Binary files a/scripts/tif__00141ce9.pex and b/scripts/tif__00141ce9.pex differ
diff --git a/scripts/tif__00141cea.pex b/scripts/tif__00141cea.pex
index 264b6956..d784b47a 100644
Binary files a/scripts/tif__00141cea.pex and b/scripts/tif__00141cea.pex differ
diff --git a/scripts/tif__00141cf4.pex b/scripts/tif__00141cf4.pex
index 3de2763b..7c591c5f 100644
Binary files a/scripts/tif__00141cf4.pex and b/scripts/tif__00141cf4.pex differ
diff --git a/scripts/tif__00141cf6.pex b/scripts/tif__00141cf6.pex
index d12b4280..8dd2a473 100644
Binary files a/scripts/tif__00141cf6.pex and b/scripts/tif__00141cf6.pex differ
diff --git a/scripts/tif__00141d06.pex b/scripts/tif__00141d06.pex
index 6bbb9b8b..d96e26f8 100644
Binary files a/scripts/tif__00141d06.pex and b/scripts/tif__00141d06.pex differ
diff --git a/scripts/tif__001433ba.pex b/scripts/tif__001433ba.pex
index 6758d701..49240010 100644
Binary files a/scripts/tif__001433ba.pex and b/scripts/tif__001433ba.pex differ
diff --git a/scripts/tif__001433be.pex b/scripts/tif__001433be.pex
index b9cbea0b..585cbed7 100644
Binary files a/scripts/tif__001433be.pex and b/scripts/tif__001433be.pex differ
diff --git a/scripts/tif__00144720.pex b/scripts/tif__00144720.pex
index b6c6c0f2..3f3e1793 100644
Binary files a/scripts/tif__00144720.pex and b/scripts/tif__00144720.pex differ
diff --git a/scripts/tif__0014489d.pex b/scripts/tif__0014489d.pex
index cf35e0db..c5f588fb 100644
Binary files a/scripts/tif__0014489d.pex and b/scripts/tif__0014489d.pex differ
diff --git a/scripts/tif__001448a5.pex b/scripts/tif__001448a5.pex
index 2d27e6d1..0026de8b 100644
Binary files a/scripts/tif__001448a5.pex and b/scripts/tif__001448a5.pex differ
diff --git a/scripts/tif__00146664.pex b/scripts/tif__00146664.pex
index 95e3419c..174d1a56 100644
Binary files a/scripts/tif__00146664.pex and b/scripts/tif__00146664.pex differ
diff --git a/scripts/tif__00146665.pex b/scripts/tif__00146665.pex
index 5b1e8c11..dd476981 100644
Binary files a/scripts/tif__00146665.pex and b/scripts/tif__00146665.pex differ
diff --git a/scripts/tif__00146f09.pex b/scripts/tif__00146f09.pex
index 9ceeb75b..beae837d 100644
Binary files a/scripts/tif__00146f09.pex and b/scripts/tif__00146f09.pex differ
diff --git a/scripts/tif__00146f0b.pex b/scripts/tif__00146f0b.pex
index 5d6fdb37..b1754b21 100644
Binary files a/scripts/tif__00146f0b.pex and b/scripts/tif__00146f0b.pex differ
diff --git a/scripts/tif__00146f0c.pex b/scripts/tif__00146f0c.pex
index 536772a9..ddcb2704 100644
Binary files a/scripts/tif__00146f0c.pex and b/scripts/tif__00146f0c.pex differ
diff --git a/scripts/tif__00146f0d.pex b/scripts/tif__00146f0d.pex
index d8713c3c..71e4c964 100644
Binary files a/scripts/tif__00146f0d.pex and b/scripts/tif__00146f0d.pex differ
diff --git a/scripts/tif__00146f15.pex b/scripts/tif__00146f15.pex
index ac4b5740..c35fd0c8 100644
Binary files a/scripts/tif__00146f15.pex and b/scripts/tif__00146f15.pex differ
diff --git a/scripts/tif__00146f20.pex b/scripts/tif__00146f20.pex
index cc781a03..8a2dc968 100644
Binary files a/scripts/tif__00146f20.pex and b/scripts/tif__00146f20.pex differ
diff --git a/scripts/tif__00146f21.pex b/scripts/tif__00146f21.pex
index eae58a65..de64b230 100644
Binary files a/scripts/tif__00146f21.pex and b/scripts/tif__00146f21.pex differ
diff --git a/scripts/tif__00146f29.pex b/scripts/tif__00146f29.pex
index cf7098fa..a1f8c0cc 100644
Binary files a/scripts/tif__00146f29.pex and b/scripts/tif__00146f29.pex differ
diff --git a/scripts/tif__00146f36.pex b/scripts/tif__00146f36.pex
index 6542428c..692f8901 100644
Binary files a/scripts/tif__00146f36.pex and b/scripts/tif__00146f36.pex differ
diff --git a/scripts/tif__00146f3d.pex b/scripts/tif__00146f3d.pex
index 7771655d..ee83b07f 100644
Binary files a/scripts/tif__00146f3d.pex and b/scripts/tif__00146f3d.pex differ
diff --git a/scripts/tif__00146f3e.pex b/scripts/tif__00146f3e.pex
index a4f2f6ad..8e9967ff 100644
Binary files a/scripts/tif__00146f3e.pex and b/scripts/tif__00146f3e.pex differ
diff --git a/scripts/tif__00146f3f.pex b/scripts/tif__00146f3f.pex
index 37daf056..b4dac83c 100644
Binary files a/scripts/tif__00146f3f.pex and b/scripts/tif__00146f3f.pex differ
diff --git a/scripts/tif__00146f44.pex b/scripts/tif__00146f44.pex
index c76b89b9..90b9c6c6 100644
Binary files a/scripts/tif__00146f44.pex and b/scripts/tif__00146f44.pex differ
diff --git a/scripts/tif__00146f54.pex b/scripts/tif__00146f54.pex
index 8d21d566..14e416ed 100644
Binary files a/scripts/tif__00146f54.pex and b/scripts/tif__00146f54.pex differ
diff --git a/scripts/tif__00146f5b.pex b/scripts/tif__00146f5b.pex
index eb7e65b6..cb72488c 100644
Binary files a/scripts/tif__00146f5b.pex and b/scripts/tif__00146f5b.pex differ
diff --git a/scripts/tif__00146f60.pex b/scripts/tif__00146f60.pex
index 563af37f..b41bc9fd 100644
Binary files a/scripts/tif__00146f60.pex and b/scripts/tif__00146f60.pex differ
diff --git a/scripts/tif__00146f61.pex b/scripts/tif__00146f61.pex
index 30e8f14c..0074e81b 100644
Binary files a/scripts/tif__00146f61.pex and b/scripts/tif__00146f61.pex differ
diff --git a/scripts/tif__00146f65.pex b/scripts/tif__00146f65.pex
index 2162ccce..e774c325 100644
Binary files a/scripts/tif__00146f65.pex and b/scripts/tif__00146f65.pex differ
diff --git a/scripts/tif__00146f6e.pex b/scripts/tif__00146f6e.pex
index cc609be6..5dec50f6 100644
Binary files a/scripts/tif__00146f6e.pex and b/scripts/tif__00146f6e.pex differ
diff --git a/scripts/tif__00146f75.pex b/scripts/tif__00146f75.pex
index 431c846a..4460fa36 100644
Binary files a/scripts/tif__00146f75.pex and b/scripts/tif__00146f75.pex differ
diff --git a/scripts/tif__00146f76.pex b/scripts/tif__00146f76.pex
index e0d50ed0..d6d9f082 100644
Binary files a/scripts/tif__00146f76.pex and b/scripts/tif__00146f76.pex differ
diff --git a/scripts/tif__00146f7b.pex b/scripts/tif__00146f7b.pex
index 808b3872..87ee72a4 100644
Binary files a/scripts/tif__00146f7b.pex and b/scripts/tif__00146f7b.pex differ
diff --git a/scripts/tif__00146f8c.pex b/scripts/tif__00146f8c.pex
index d28d141a..2e84d4d6 100644
Binary files a/scripts/tif__00146f8c.pex and b/scripts/tif__00146f8c.pex differ
diff --git a/scripts/tif__00146f94.pex b/scripts/tif__00146f94.pex
index c6cee682..b5a2d4b7 100644
Binary files a/scripts/tif__00146f94.pex and b/scripts/tif__00146f94.pex differ
diff --git a/scripts/tif__00146f9b.pex b/scripts/tif__00146f9b.pex
index 8d3623c5..1652a235 100644
Binary files a/scripts/tif__00146f9b.pex and b/scripts/tif__00146f9b.pex differ
diff --git a/scripts/tif__00146fa0.pex b/scripts/tif__00146fa0.pex
index 855bc615..d575efb1 100644
Binary files a/scripts/tif__00146fa0.pex and b/scripts/tif__00146fa0.pex differ
diff --git a/scripts/tif__00146fac.pex b/scripts/tif__00146fac.pex
index dd643432..a888a211 100644
Binary files a/scripts/tif__00146fac.pex and b/scripts/tif__00146fac.pex differ
diff --git a/scripts/tif__00146fad.pex b/scripts/tif__00146fad.pex
index 5a26b835..477a4c11 100644
Binary files a/scripts/tif__00146fad.pex and b/scripts/tif__00146fad.pex differ
diff --git a/scripts/tif__00147108.pex b/scripts/tif__00147108.pex
index a28e1ddc..a0091bdc 100644
Binary files a/scripts/tif__00147108.pex and b/scripts/tif__00147108.pex differ
diff --git a/scripts/tif__0014710a.pex b/scripts/tif__0014710a.pex
index de0892fb..55530f20 100644
Binary files a/scripts/tif__0014710a.pex and b/scripts/tif__0014710a.pex differ
diff --git a/scripts/tif__00148429.pex b/scripts/tif__00148429.pex
index b0aed90b..46efa2ba 100644
Binary files a/scripts/tif__00148429.pex and b/scripts/tif__00148429.pex differ
diff --git a/scripts/tif__00148443.pex b/scripts/tif__00148443.pex
index a0e9ba2d..4a626c50 100644
Binary files a/scripts/tif__00148443.pex and b/scripts/tif__00148443.pex differ
diff --git a/scripts/tif__0014848c.pex b/scripts/tif__0014848c.pex
index 2860126f..197e1f15 100644
Binary files a/scripts/tif__0014848c.pex and b/scripts/tif__0014848c.pex differ
diff --git a/scripts/tif__0014848d.pex b/scripts/tif__0014848d.pex
index 4feb8615..8cd87a8a 100644
Binary files a/scripts/tif__0014848d.pex and b/scripts/tif__0014848d.pex differ
diff --git a/scripts/tif__0014849f.pex b/scripts/tif__0014849f.pex
index bf53058b..9a68f89d 100644
Binary files a/scripts/tif__0014849f.pex and b/scripts/tif__0014849f.pex differ
diff --git a/scripts/tif__001484a3.pex b/scripts/tif__001484a3.pex
index 98381957..a7c9a4a3 100644
Binary files a/scripts/tif__001484a3.pex and b/scripts/tif__001484a3.pex differ
diff --git a/scripts/tif__001484b4.pex b/scripts/tif__001484b4.pex
index d716197a..2b3804c1 100644
Binary files a/scripts/tif__001484b4.pex and b/scripts/tif__001484b4.pex differ
diff --git a/scripts/tif__001484c4.pex b/scripts/tif__001484c4.pex
index 80c8baef..1fb2b399 100644
Binary files a/scripts/tif__001484c4.pex and b/scripts/tif__001484c4.pex differ
diff --git a/scripts/tif__00148713.pex b/scripts/tif__00148713.pex
index 7168507b..4040ce88 100644
Binary files a/scripts/tif__00148713.pex and b/scripts/tif__00148713.pex differ
diff --git a/scripts/tif__00148715.pex b/scripts/tif__00148715.pex
index 73462929..c53c6857 100644
Binary files a/scripts/tif__00148715.pex and b/scripts/tif__00148715.pex differ
diff --git a/scripts/tif__001488e0.pex b/scripts/tif__001488e0.pex
index 1f4c842e..25fef8c1 100644
Binary files a/scripts/tif__001488e0.pex and b/scripts/tif__001488e0.pex differ
diff --git a/scripts/tif__001488e1.pex b/scripts/tif__001488e1.pex
index d257e8e4..70968c8a 100644
Binary files a/scripts/tif__001488e1.pex and b/scripts/tif__001488e1.pex differ
diff --git a/scripts/tif__001488ef.pex b/scripts/tif__001488ef.pex
index 5b60579c..045d4904 100644
Binary files a/scripts/tif__001488ef.pex and b/scripts/tif__001488ef.pex differ
diff --git a/scripts/tif__001488f0.pex b/scripts/tif__001488f0.pex
index f353b45b..d0553fac 100644
Binary files a/scripts/tif__001488f0.pex and b/scripts/tif__001488f0.pex differ
diff --git a/scripts/tif__00149509.pex b/scripts/tif__00149509.pex
index 16028b3f..462d315e 100644
Binary files a/scripts/tif__00149509.pex and b/scripts/tif__00149509.pex differ
diff --git a/scripts/tif__0014950d.pex b/scripts/tif__0014950d.pex
index 4eaccbe7..2dac123a 100644
Binary files a/scripts/tif__0014950d.pex and b/scripts/tif__0014950d.pex differ
diff --git a/scripts/tif__00149514.pex b/scripts/tif__00149514.pex
index 9c6538c6..0de67a8e 100644
Binary files a/scripts/tif__00149514.pex and b/scripts/tif__00149514.pex differ
diff --git a/scripts/tif__00149616.pex b/scripts/tif__00149616.pex
index 4c817352..f08415ee 100644
Binary files a/scripts/tif__00149616.pex and b/scripts/tif__00149616.pex differ
diff --git a/scripts/tif__00149636.pex b/scripts/tif__00149636.pex
index 04adb6da..a4b7e383 100644
Binary files a/scripts/tif__00149636.pex and b/scripts/tif__00149636.pex differ
diff --git a/scripts/tif__0014964c.pex b/scripts/tif__0014964c.pex
index ff854fe1..dcdd1839 100644
Binary files a/scripts/tif__0014964c.pex and b/scripts/tif__0014964c.pex differ
diff --git a/scripts/tif__0014964d.pex b/scripts/tif__0014964d.pex
index cb2afe53..72cbe6ce 100644
Binary files a/scripts/tif__0014964d.pex and b/scripts/tif__0014964d.pex differ
diff --git a/scripts/tif__0014964e.pex b/scripts/tif__0014964e.pex
index 33cb9e5c..2b1bcd55 100644
Binary files a/scripts/tif__0014964e.pex and b/scripts/tif__0014964e.pex differ
diff --git a/scripts/tif__00149773.pex b/scripts/tif__00149773.pex
index 065c0d41..d1b6c5a4 100644
Binary files a/scripts/tif__00149773.pex and b/scripts/tif__00149773.pex differ
diff --git a/scripts/tif__0014b5b5.pex b/scripts/tif__0014b5b5.pex
index e3be6f90..856673a8 100644
Binary files a/scripts/tif__0014b5b5.pex and b/scripts/tif__0014b5b5.pex differ
diff --git a/scripts/tif__0014bc58.pex b/scripts/tif__0014bc58.pex
index 49427d9f..9321d45f 100644
Binary files a/scripts/tif__0014bc58.pex and b/scripts/tif__0014bc58.pex differ
diff --git a/scripts/tif__0014bc5e.pex b/scripts/tif__0014bc5e.pex
index 1dedd355..b3df731f 100644
Binary files a/scripts/tif__0014bc5e.pex and b/scripts/tif__0014bc5e.pex differ
diff --git a/scripts/tif__0014bc5f.pex b/scripts/tif__0014bc5f.pex
index 52c56edb..4870ec8e 100644
Binary files a/scripts/tif__0014bc5f.pex and b/scripts/tif__0014bc5f.pex differ
diff --git a/scripts/tif__0014bc8f.pex b/scripts/tif__0014bc8f.pex
index b8f5aa96..14a8701c 100644
Binary files a/scripts/tif__0014bc8f.pex and b/scripts/tif__0014bc8f.pex differ
diff --git a/scripts/tif__0014bc90.pex b/scripts/tif__0014bc90.pex
index dc19c336..e5b222ab 100644
Binary files a/scripts/tif__0014bc90.pex and b/scripts/tif__0014bc90.pex differ
diff --git a/scripts/tif__0014bc9f.pex b/scripts/tif__0014bc9f.pex
index 8fbebbf7..794acc62 100644
Binary files a/scripts/tif__0014bc9f.pex and b/scripts/tif__0014bc9f.pex differ
diff --git a/scripts/tif__0014bca1.pex b/scripts/tif__0014bca1.pex
index 010ce63c..fc345757 100644
Binary files a/scripts/tif__0014bca1.pex and b/scripts/tif__0014bca1.pex differ
diff --git a/scripts/tif__0014bca5.pex b/scripts/tif__0014bca5.pex
index af876040..22daff92 100644
Binary files a/scripts/tif__0014bca5.pex and b/scripts/tif__0014bca5.pex differ
diff --git a/scripts/tif__0014bca6.pex b/scripts/tif__0014bca6.pex
index b70960d1..2f2013d6 100644
Binary files a/scripts/tif__0014bca6.pex and b/scripts/tif__0014bca6.pex differ
diff --git a/scripts/tif__0014bcaa.pex b/scripts/tif__0014bcaa.pex
index 0c4717a7..2334af0b 100644
Binary files a/scripts/tif__0014bcaa.pex and b/scripts/tif__0014bcaa.pex differ
diff --git a/scripts/tif__0014bcab.pex b/scripts/tif__0014bcab.pex
index 0ae4e0c4..55dff8fc 100644
Binary files a/scripts/tif__0014bcab.pex and b/scripts/tif__0014bcab.pex differ
diff --git a/scripts/tif__0014bcb0.pex b/scripts/tif__0014bcb0.pex
index 769e8161..ebfe8708 100644
Binary files a/scripts/tif__0014bcb0.pex and b/scripts/tif__0014bcb0.pex differ
diff --git a/scripts/tif__0014bcb1.pex b/scripts/tif__0014bcb1.pex
index 25b5233c..4f920c4c 100644
Binary files a/scripts/tif__0014bcb1.pex and b/scripts/tif__0014bcb1.pex differ
diff --git a/scripts/tif__0014bcb3.pex b/scripts/tif__0014bcb3.pex
index a784df60..d4e2f5ba 100644
Binary files a/scripts/tif__0014bcb3.pex and b/scripts/tif__0014bcb3.pex differ
diff --git a/scripts/tif__0014bcc6.pex b/scripts/tif__0014bcc6.pex
index cde57770..f58c48f8 100644
Binary files a/scripts/tif__0014bcc6.pex and b/scripts/tif__0014bcc6.pex differ
diff --git a/scripts/tif__0014bcc7.pex b/scripts/tif__0014bcc7.pex
index 95e974ec..804311c6 100644
Binary files a/scripts/tif__0014bcc7.pex and b/scripts/tif__0014bcc7.pex differ
diff --git a/scripts/tif__0014bcc8.pex b/scripts/tif__0014bcc8.pex
index 450869d9..ee1775b0 100644
Binary files a/scripts/tif__0014bcc8.pex and b/scripts/tif__0014bcc8.pex differ
diff --git a/scripts/tif__0014bcc9.pex b/scripts/tif__0014bcc9.pex
index 915f1cfd..ac8a4c9c 100644
Binary files a/scripts/tif__0014bcc9.pex and b/scripts/tif__0014bcc9.pex differ
diff --git a/scripts/tif__0014c102.pex b/scripts/tif__0014c102.pex
index 3a4b30cc..fd0d52c6 100644
Binary files a/scripts/tif__0014c102.pex and b/scripts/tif__0014c102.pex differ
diff --git a/scripts/tif__0014c104.pex b/scripts/tif__0014c104.pex
index 7a42d30e..d9f22e4a 100644
Binary files a/scripts/tif__0014c104.pex and b/scripts/tif__0014c104.pex differ
diff --git a/scripts/tif__0014c10a.pex b/scripts/tif__0014c10a.pex
index 38b0619d..8bc6452f 100644
Binary files a/scripts/tif__0014c10a.pex and b/scripts/tif__0014c10a.pex differ
diff --git a/scripts/tif__0014caf7.pex b/scripts/tif__0014caf7.pex
index 91de0933..6cd243de 100644
Binary files a/scripts/tif__0014caf7.pex and b/scripts/tif__0014caf7.pex differ
diff --git a/scripts/tif__0014db17.pex b/scripts/tif__0014db17.pex
index 79cdb41e..5bf26824 100644
Binary files a/scripts/tif__0014db17.pex and b/scripts/tif__0014db17.pex differ
diff --git a/scripts/tif__0014f504.pex b/scripts/tif__0014f504.pex
index 8535d164..5e00f6b2 100644
Binary files a/scripts/tif__0014f504.pex and b/scripts/tif__0014f504.pex differ
diff --git a/scripts/tif__0014f505.pex b/scripts/tif__0014f505.pex
index 35c78431..927c257b 100644
Binary files a/scripts/tif__0014f505.pex and b/scripts/tif__0014f505.pex differ
diff --git a/scripts/tif__0014f6c0.pex b/scripts/tif__0014f6c0.pex
index 97a71eb3..e85ee236 100644
Binary files a/scripts/tif__0014f6c0.pex and b/scripts/tif__0014f6c0.pex differ
diff --git a/scripts/tif__0014f6c1.pex b/scripts/tif__0014f6c1.pex
index ab3444e0..3a158d2f 100644
Binary files a/scripts/tif__0014f6c1.pex and b/scripts/tif__0014f6c1.pex differ
diff --git a/scripts/tif__0014f6c3.pex b/scripts/tif__0014f6c3.pex
index d018ff5a..2b4a1a51 100644
Binary files a/scripts/tif__0014f6c3.pex and b/scripts/tif__0014f6c3.pex differ
diff --git a/scripts/tif__0014f6c5.pex b/scripts/tif__0014f6c5.pex
index 43171992..1907dbac 100644
Binary files a/scripts/tif__0014f6c5.pex and b/scripts/tif__0014f6c5.pex differ
diff --git a/scripts/tif__0014f6c8.pex b/scripts/tif__0014f6c8.pex
index 09ca1e8d..134c7d89 100644
Binary files a/scripts/tif__0014f6c8.pex and b/scripts/tif__0014f6c8.pex differ
diff --git a/scripts/tif__0014f6ca.pex b/scripts/tif__0014f6ca.pex
index 3ab1240b..f103030c 100644
Binary files a/scripts/tif__0014f6ca.pex and b/scripts/tif__0014f6ca.pex differ
diff --git a/scripts/tif__0014f6cb.pex b/scripts/tif__0014f6cb.pex
index a25db6f5..86d1433c 100644
Binary files a/scripts/tif__0014f6cb.pex and b/scripts/tif__0014f6cb.pex differ
diff --git a/scripts/tif__0014fffd.pex b/scripts/tif__0014fffd.pex
index 6367b868..111a688d 100644
Binary files a/scripts/tif__0014fffd.pex and b/scripts/tif__0014fffd.pex differ
diff --git a/scripts/tif__00150005.pex b/scripts/tif__00150005.pex
index 0a53b7ec..97890995 100644
Binary files a/scripts/tif__00150005.pex and b/scripts/tif__00150005.pex differ
diff --git a/scripts/tif__00150008.pex b/scripts/tif__00150008.pex
index 2af3a8be..05f552bf 100644
Binary files a/scripts/tif__00150008.pex and b/scripts/tif__00150008.pex differ
diff --git a/scripts/tif__0015011b.pex b/scripts/tif__0015011b.pex
index 1c33c63c..47871648 100644
Binary files a/scripts/tif__0015011b.pex and b/scripts/tif__0015011b.pex differ
diff --git a/scripts/tif__0015011e.pex b/scripts/tif__0015011e.pex
index 62632bfc..7fb07bbd 100644
Binary files a/scripts/tif__0015011e.pex and b/scripts/tif__0015011e.pex differ
diff --git a/scripts/tif__00153b41.pex b/scripts/tif__00153b41.pex
index 1e36a660..3455ceb9 100644
Binary files a/scripts/tif__00153b41.pex and b/scripts/tif__00153b41.pex differ
diff --git a/scripts/tif__0100572f.pex b/scripts/tif__0100572f.pex
index a07171ad..31700605 100644
Binary files a/scripts/tif__0100572f.pex and b/scripts/tif__0100572f.pex differ
diff --git a/scripts/tif__01007ee8.pex b/scripts/tif__01007ee8.pex
index 6fca4b36..409788aa 100644
Binary files a/scripts/tif__01007ee8.pex and b/scripts/tif__01007ee8.pex differ
diff --git a/scripts/tif__0100cee9.pex b/scripts/tif__0100cee9.pex
index 4f901426..f58b0430 100644
Binary files a/scripts/tif__0100cee9.pex and b/scripts/tif__0100cee9.pex differ
diff --git a/scripts/tif__0100e356.pex b/scripts/tif__0100e356.pex
index b426caf0..6ef88e64 100644
Binary files a/scripts/tif__0100e356.pex and b/scripts/tif__0100e356.pex differ
diff --git a/scripts/tif__0100e35e.pex b/scripts/tif__0100e35e.pex
index 8fa73b2b..90a668b5 100644
Binary files a/scripts/tif__0100e35e.pex and b/scripts/tif__0100e35e.pex differ
diff --git a/scripts/tif__010132fa.pex b/scripts/tif__010132fa.pex
index ad43134d..9c415d55 100644
Binary files a/scripts/tif__010132fa.pex and b/scripts/tif__010132fa.pex differ
diff --git a/scripts/tif__01013320.pex b/scripts/tif__01013320.pex
index 01d581e5..6c6ce1bd 100644
Binary files a/scripts/tif__01013320.pex and b/scripts/tif__01013320.pex differ
diff --git a/scripts/tif__01013322.pex b/scripts/tif__01013322.pex
index 99233025..1e54c41e 100644
Binary files a/scripts/tif__01013322.pex and b/scripts/tif__01013322.pex differ
diff --git a/scripts/tif__01013326.pex b/scripts/tif__01013326.pex
index 9d22c51a..c60633d7 100644
Binary files a/scripts/tif__01013326.pex and b/scripts/tif__01013326.pex differ
diff --git a/scripts/tif__01016eaf.pex b/scripts/tif__01016eaf.pex
index 4f0b2965..6c82299a 100644
Binary files a/scripts/tif__01016eaf.pex and b/scripts/tif__01016eaf.pex differ
diff --git a/scripts/tif__0101beb7.pex b/scripts/tif__0101beb7.pex
index 716633d7..b1132be2 100644
Binary files a/scripts/tif__0101beb7.pex and b/scripts/tif__0101beb7.pex differ
diff --git a/scripts/tif__0101c59f.pex b/scripts/tif__0101c59f.pex
index 416fa95b..27e78690 100644
Binary files a/scripts/tif__0101c59f.pex and b/scripts/tif__0101c59f.pex differ
diff --git a/scripts/tif__0101c5b0.pex b/scripts/tif__0101c5b0.pex
index 73723ba1..56111498 100644
Binary files a/scripts/tif__0101c5b0.pex and b/scripts/tif__0101c5b0.pex differ
diff --git a/scripts/tif__0101c5b2.pex b/scripts/tif__0101c5b2.pex
index 416ac0e1..0cd412c5 100644
Binary files a/scripts/tif__0101c5b2.pex and b/scripts/tif__0101c5b2.pex differ
diff --git a/scripts/tif__0101c5b3.pex b/scripts/tif__0101c5b3.pex
index eeca3514..a89d79de 100644
Binary files a/scripts/tif__0101c5b3.pex and b/scripts/tif__0101c5b3.pex differ
diff --git a/scripts/tif__0101c5c6.pex b/scripts/tif__0101c5c6.pex
index f753ee0c..ede8f1de 100644
Binary files a/scripts/tif__0101c5c6.pex and b/scripts/tif__0101c5c6.pex differ
diff --git a/scripts/tif__0101c5cc.pex b/scripts/tif__0101c5cc.pex
index 6c98c8ea..2ddfa82e 100644
Binary files a/scripts/tif__0101c5cc.pex and b/scripts/tif__0101c5cc.pex differ
diff --git a/scripts/tif__0101c5d4.pex b/scripts/tif__0101c5d4.pex
index 1fa875d3..2bca2b30 100644
Binary files a/scripts/tif__0101c5d4.pex and b/scripts/tif__0101c5d4.pex differ
diff --git a/scripts/tif__0101c60a.pex b/scripts/tif__0101c60a.pex
index a9ac8952..587e3209 100644
Binary files a/scripts/tif__0101c60a.pex and b/scripts/tif__0101c60a.pex differ
diff --git a/scripts/tif__0101c60b.pex b/scripts/tif__0101c60b.pex
index 574bb982..a92a9deb 100644
Binary files a/scripts/tif__0101c60b.pex and b/scripts/tif__0101c60b.pex differ
diff --git a/scripts/tif__0101c60e.pex b/scripts/tif__0101c60e.pex
index c985be5e..9898a714 100644
Binary files a/scripts/tif__0101c60e.pex and b/scripts/tif__0101c60e.pex differ
diff --git a/scripts/tif__0101c61c.pex b/scripts/tif__0101c61c.pex
index e2ab31d7..49fab648 100644
Binary files a/scripts/tif__0101c61c.pex and b/scripts/tif__0101c61c.pex differ
diff --git a/scripts/tif__0101c793.pex b/scripts/tif__0101c793.pex
index 0e8ea952..c165c4b6 100644
Binary files a/scripts/tif__0101c793.pex and b/scripts/tif__0101c793.pex differ
diff --git a/scripts/tif__0101c794.pex b/scripts/tif__0101c794.pex
index aa40141a..87afbbdb 100644
Binary files a/scripts/tif__0101c794.pex and b/scripts/tif__0101c794.pex differ
diff --git a/scripts/tif__0101c795.pex b/scripts/tif__0101c795.pex
index cfcdda03..ee9cfb55 100644
Binary files a/scripts/tif__0101c795.pex and b/scripts/tif__0101c795.pex differ
diff --git a/scripts/tif__0101c79c.pex b/scripts/tif__0101c79c.pex
index c8475e14..2be34c9d 100644
Binary files a/scripts/tif__0101c79c.pex and b/scripts/tif__0101c79c.pex differ
diff --git a/scripts/tif__0101c79d.pex b/scripts/tif__0101c79d.pex
index 3259f7e9..cc1aebc9 100644
Binary files a/scripts/tif__0101c79d.pex and b/scripts/tif__0101c79d.pex differ
diff --git a/scripts/tif__0101c7a1.pex b/scripts/tif__0101c7a1.pex
index 76e46fa0..38a7aa77 100644
Binary files a/scripts/tif__0101c7a1.pex and b/scripts/tif__0101c7a1.pex differ
diff --git a/scripts/tif__0101c7aa.pex b/scripts/tif__0101c7aa.pex
index 324d80ab..59dd9508 100644
Binary files a/scripts/tif__0101c7aa.pex and b/scripts/tif__0101c7aa.pex differ
diff --git a/scripts/tif__0101c7ab.pex b/scripts/tif__0101c7ab.pex
index a60735b8..fd51b1d0 100644
Binary files a/scripts/tif__0101c7ab.pex and b/scripts/tif__0101c7ab.pex differ
diff --git a/scripts/tif__0101c7b2.pex b/scripts/tif__0101c7b2.pex
index dd295c57..3b362f0a 100644
Binary files a/scripts/tif__0101c7b2.pex and b/scripts/tif__0101c7b2.pex differ
diff --git a/scripts/tif__0101c8ae.pex b/scripts/tif__0101c8ae.pex
index 7ccc8045..5f98e806 100644
Binary files a/scripts/tif__0101c8ae.pex and b/scripts/tif__0101c8ae.pex differ
diff --git a/scripts/tif__0101c8df.pex b/scripts/tif__0101c8df.pex
index 9e954ebb..4dd155e8 100644
Binary files a/scripts/tif__0101c8df.pex and b/scripts/tif__0101c8df.pex differ
diff --git a/scripts/tif__0101c8e9.pex b/scripts/tif__0101c8e9.pex
index 36c66735..6d826fbf 100644
Binary files a/scripts/tif__0101c8e9.pex and b/scripts/tif__0101c8e9.pex differ
diff --git a/scripts/tif__0101c9bf.pex b/scripts/tif__0101c9bf.pex
index 15594d74..b3f61f09 100644
Binary files a/scripts/tif__0101c9bf.pex and b/scripts/tif__0101c9bf.pex differ
diff --git a/scripts/tif__0101c9c7.pex b/scripts/tif__0101c9c7.pex
index fd46d18b..f6873ba5 100644
Binary files a/scripts/tif__0101c9c7.pex and b/scripts/tif__0101c9c7.pex differ
diff --git a/scripts/tif__0101c9cc.pex b/scripts/tif__0101c9cc.pex
index cd8c0a64..4820fc88 100644
Binary files a/scripts/tif__0101c9cc.pex and b/scripts/tif__0101c9cc.pex differ
diff --git a/scripts/tif__0101c9d5.pex b/scripts/tif__0101c9d5.pex
index 52a91589..eb58a389 100644
Binary files a/scripts/tif__0101c9d5.pex and b/scripts/tif__0101c9d5.pex differ
diff --git a/scripts/tif__0101c9df.pex b/scripts/tif__0101c9df.pex
index 55425e34..c95b1e35 100644
Binary files a/scripts/tif__0101c9df.pex and b/scripts/tif__0101c9df.pex differ
diff --git a/scripts/tif__0101c9ec.pex b/scripts/tif__0101c9ec.pex
index 8566baa6..8e6464fd 100644
Binary files a/scripts/tif__0101c9ec.pex and b/scripts/tif__0101c9ec.pex differ
diff --git a/scripts/tif__0101c9ef.pex b/scripts/tif__0101c9ef.pex
index e20582be..ea2a0007 100644
Binary files a/scripts/tif__0101c9ef.pex and b/scripts/tif__0101c9ef.pex differ
diff --git a/scripts/tif__0101c9f2.pex b/scripts/tif__0101c9f2.pex
index 2442b628..a1bd08e0 100644
Binary files a/scripts/tif__0101c9f2.pex and b/scripts/tif__0101c9f2.pex differ
diff --git a/scripts/tif__0101c9f3.pex b/scripts/tif__0101c9f3.pex
index 0d7acb09..ab7e6d61 100644
Binary files a/scripts/tif__0101c9f3.pex and b/scripts/tif__0101c9f3.pex differ
diff --git a/scripts/tif__0101ca78.pex b/scripts/tif__0101ca78.pex
index 8881d46d..0f67006f 100644
Binary files a/scripts/tif__0101ca78.pex and b/scripts/tif__0101ca78.pex differ
diff --git a/scripts/tif__0101ca7b.pex b/scripts/tif__0101ca7b.pex
index c14b7623..ac29fa6d 100644
Binary files a/scripts/tif__0101ca7b.pex and b/scripts/tif__0101ca7b.pex differ
diff --git a/scripts/tif__0101ca8a.pex b/scripts/tif__0101ca8a.pex
index ac4d5c73..8daf0c5d 100644
Binary files a/scripts/tif__0101ca8a.pex and b/scripts/tif__0101ca8a.pex differ
diff --git a/scripts/tif__0101ca90.pex b/scripts/tif__0101ca90.pex
index 11d8f6a6..42a9131a 100644
Binary files a/scripts/tif__0101ca90.pex and b/scripts/tif__0101ca90.pex differ
diff --git a/scripts/tif__0101ca93.pex b/scripts/tif__0101ca93.pex
index 505157f7..68a062a6 100644
Binary files a/scripts/tif__0101ca93.pex and b/scripts/tif__0101ca93.pex differ
diff --git a/scripts/tif__0101caaf.pex b/scripts/tif__0101caaf.pex
index 939ad78a..7cc24a7c 100644
Binary files a/scripts/tif__0101caaf.pex and b/scripts/tif__0101caaf.pex differ
diff --git a/scripts/tif__0101cab1.pex b/scripts/tif__0101cab1.pex
index 68a3c1e8..e63d378b 100644
Binary files a/scripts/tif__0101cab1.pex and b/scripts/tif__0101cab1.pex differ
diff --git a/scripts/tif__0101cab2.pex b/scripts/tif__0101cab2.pex
index 1bafff7a..0d7c8c7e 100644
Binary files a/scripts/tif__0101cab2.pex and b/scripts/tif__0101cab2.pex differ
diff --git a/scripts/tif__0101cab3.pex b/scripts/tif__0101cab3.pex
index 46778980..4f0f51ff 100644
Binary files a/scripts/tif__0101cab3.pex and b/scripts/tif__0101cab3.pex differ
diff --git a/scripts/tif__0101cab4.pex b/scripts/tif__0101cab4.pex
index d3e1c6af..f1230a66 100644
Binary files a/scripts/tif__0101cab4.pex and b/scripts/tif__0101cab4.pex differ
diff --git a/scripts/tif__0101cab5.pex b/scripts/tif__0101cab5.pex
index 8ca7127e..a7d8f52f 100644
Binary files a/scripts/tif__0101cab5.pex and b/scripts/tif__0101cab5.pex differ
diff --git a/scripts/tif__0101cab6.pex b/scripts/tif__0101cab6.pex
index 0414adc8..9d169733 100644
Binary files a/scripts/tif__0101cab6.pex and b/scripts/tif__0101cab6.pex differ
diff --git a/scripts/tif__0101e848.pex b/scripts/tif__0101e848.pex
index 59e396d8..46cc5ca1 100644
Binary files a/scripts/tif__0101e848.pex and b/scripts/tif__0101e848.pex differ
diff --git a/scripts/tif__0101e84d.pex b/scripts/tif__0101e84d.pex
index 64901102..2224b807 100644
Binary files a/scripts/tif__0101e84d.pex and b/scripts/tif__0101e84d.pex differ
diff --git a/scripts/tif__0101e853.pex b/scripts/tif__0101e853.pex
index 74de0112..1fff3565 100644
Binary files a/scripts/tif__0101e853.pex and b/scripts/tif__0101e853.pex differ
diff --git a/scripts/tif__0101e859.pex b/scripts/tif__0101e859.pex
index 944faa50..63083e86 100644
Binary files a/scripts/tif__0101e859.pex and b/scripts/tif__0101e859.pex differ
diff --git a/scripts/tif__0101e922.pex b/scripts/tif__0101e922.pex
index 28878e1b..75e84cf1 100644
Binary files a/scripts/tif__0101e922.pex and b/scripts/tif__0101e922.pex differ
diff --git a/scripts/tif__0101eabd.pex b/scripts/tif__0101eabd.pex
index 9ec34ea3..f0afe820 100644
Binary files a/scripts/tif__0101eabd.pex and b/scripts/tif__0101eabd.pex differ
diff --git a/scripts/tif__0101eac6.pex b/scripts/tif__0101eac6.pex
index 84b29d56..39bb6b18 100644
Binary files a/scripts/tif__0101eac6.pex and b/scripts/tif__0101eac6.pex differ
diff --git a/scripts/tif__0101eac8.pex b/scripts/tif__0101eac8.pex
index c9c76bd2..86ccb1c2 100644
Binary files a/scripts/tif__0101eac8.pex and b/scripts/tif__0101eac8.pex differ
diff --git a/scripts/tif__0101ead1.pex b/scripts/tif__0101ead1.pex
index 7dc13562..88669886 100644
Binary files a/scripts/tif__0101ead1.pex and b/scripts/tif__0101ead1.pex differ
diff --git a/scripts/tif__0101ead3.pex b/scripts/tif__0101ead3.pex
index b5007046..32e2be4e 100644
Binary files a/scripts/tif__0101ead3.pex and b/scripts/tif__0101ead3.pex differ
diff --git a/scripts/tif__0101eae1.pex b/scripts/tif__0101eae1.pex
index d59dfb52..855ee742 100644
Binary files a/scripts/tif__0101eae1.pex and b/scripts/tif__0101eae1.pex differ
diff --git a/scripts/tif__0101eae3.pex b/scripts/tif__0101eae3.pex
index 97e0da73..f794ad12 100644
Binary files a/scripts/tif__0101eae3.pex and b/scripts/tif__0101eae3.pex differ
diff --git a/scripts/tif__0101eae7.pex b/scripts/tif__0101eae7.pex
index bb41e057..3c95b7de 100644
Binary files a/scripts/tif__0101eae7.pex and b/scripts/tif__0101eae7.pex differ
diff --git a/scripts/tif__0101eaf4.pex b/scripts/tif__0101eaf4.pex
index f8c21bdc..38e2df4e 100644
Binary files a/scripts/tif__0101eaf4.pex and b/scripts/tif__0101eaf4.pex differ
diff --git a/scripts/tif__0101eaf8.pex b/scripts/tif__0101eaf8.pex
index 9a5f3eb0..210c80f6 100644
Binary files a/scripts/tif__0101eaf8.pex and b/scripts/tif__0101eaf8.pex differ
diff --git a/scripts/tif__0101eb05.pex b/scripts/tif__0101eb05.pex
index c51f94d9..a98ec93b 100644
Binary files a/scripts/tif__0101eb05.pex and b/scripts/tif__0101eb05.pex differ
diff --git a/scripts/tif__0101eb06.pex b/scripts/tif__0101eb06.pex
index 71125d0e..c29cf252 100644
Binary files a/scripts/tif__0101eb06.pex and b/scripts/tif__0101eb06.pex differ
diff --git a/scripts/tif__0101eb0d.pex b/scripts/tif__0101eb0d.pex
index 20029306..da0d6a28 100644
Binary files a/scripts/tif__0101eb0d.pex and b/scripts/tif__0101eb0d.pex differ
diff --git a/scripts/tif__0101ecb5.pex b/scripts/tif__0101ecb5.pex
index a3dc0731..e419bca5 100644
Binary files a/scripts/tif__0101ecb5.pex and b/scripts/tif__0101ecb5.pex differ
diff --git a/scripts/tif__0101ecbe.pex b/scripts/tif__0101ecbe.pex
index 657cc4b6..487315cf 100644
Binary files a/scripts/tif__0101ecbe.pex and b/scripts/tif__0101ecbe.pex differ
diff --git a/scripts/tif__0101ecc0.pex b/scripts/tif__0101ecc0.pex
index 0340851f..eb7270b4 100644
Binary files a/scripts/tif__0101ecc0.pex and b/scripts/tif__0101ecc0.pex differ
diff --git a/scripts/tif__0101ecc1.pex b/scripts/tif__0101ecc1.pex
index 0b5ef048..e973087e 100644
Binary files a/scripts/tif__0101ecc1.pex and b/scripts/tif__0101ecc1.pex differ
diff --git a/scripts/tif__0101ecc5.pex b/scripts/tif__0101ecc5.pex
index 92f02701..2691991f 100644
Binary files a/scripts/tif__0101ecc5.pex and b/scripts/tif__0101ecc5.pex differ
diff --git a/scripts/tif__0101ecd1.pex b/scripts/tif__0101ecd1.pex
index ac95fcab..285c442f 100644
Binary files a/scripts/tif__0101ecd1.pex and b/scripts/tif__0101ecd1.pex differ
diff --git a/scripts/tif__0101ecd2.pex b/scripts/tif__0101ecd2.pex
index fb8b22d9..03c4bdf1 100644
Binary files a/scripts/tif__0101ecd2.pex and b/scripts/tif__0101ecd2.pex differ
diff --git a/scripts/tif__0101ecd4.pex b/scripts/tif__0101ecd4.pex
index ec9c18d9..65fd2fbe 100644
Binary files a/scripts/tif__0101ecd4.pex and b/scripts/tif__0101ecd4.pex differ
diff --git a/scripts/tif__0101ecd5.pex b/scripts/tif__0101ecd5.pex
index 3ff6906d..ac1837aa 100644
Binary files a/scripts/tif__0101ecd5.pex and b/scripts/tif__0101ecd5.pex differ
diff --git a/scripts/tif__0101ed98.pex b/scripts/tif__0101ed98.pex
index 855a8d88..6115fc72 100644
Binary files a/scripts/tif__0101ed98.pex and b/scripts/tif__0101ed98.pex differ
diff --git a/scripts/tif__0101ed9d.pex b/scripts/tif__0101ed9d.pex
index d361b4b5..43ef5696 100644
Binary files a/scripts/tif__0101ed9d.pex and b/scripts/tif__0101ed9d.pex differ
diff --git a/scripts/tif__0101eff5.pex b/scripts/tif__0101eff5.pex
index 4d5307f3..79a0f58a 100644
Binary files a/scripts/tif__0101eff5.pex and b/scripts/tif__0101eff5.pex differ
diff --git a/scripts/tif__0101f0b2.pex b/scripts/tif__0101f0b2.pex
index 270538ee..00843019 100644
Binary files a/scripts/tif__0101f0b2.pex and b/scripts/tif__0101f0b2.pex differ
diff --git a/scripts/tif__0101f0bb.pex b/scripts/tif__0101f0bb.pex
index 0f7192b0..0ecfa513 100644
Binary files a/scripts/tif__0101f0bb.pex and b/scripts/tif__0101f0bb.pex differ
diff --git a/scripts/tif__0101f123.pex b/scripts/tif__0101f123.pex
index 27855fcc..f701c902 100644
Binary files a/scripts/tif__0101f123.pex and b/scripts/tif__0101f123.pex differ
diff --git a/scripts/tif__0101f1f3.pex b/scripts/tif__0101f1f3.pex
index 5f4755df..a28ae622 100644
Binary files a/scripts/tif__0101f1f3.pex and b/scripts/tif__0101f1f3.pex differ
diff --git a/scripts/tif__0101f1fe.pex b/scripts/tif__0101f1fe.pex
index d76751fb..4a99d24c 100644
Binary files a/scripts/tif__0101f1fe.pex and b/scripts/tif__0101f1fe.pex differ
diff --git a/scripts/tif__0101f214.pex b/scripts/tif__0101f214.pex
index c62e36c7..96b02872 100644
Binary files a/scripts/tif__0101f214.pex and b/scripts/tif__0101f214.pex differ
diff --git a/scripts/tif__0101f216.pex b/scripts/tif__0101f216.pex
index e494a074..7dfb33c8 100644
Binary files a/scripts/tif__0101f216.pex and b/scripts/tif__0101f216.pex differ
diff --git a/scripts/tif__0101f21f.pex b/scripts/tif__0101f21f.pex
index 4aef8b7a..dc959be3 100644
Binary files a/scripts/tif__0101f21f.pex and b/scripts/tif__0101f21f.pex differ
diff --git a/scripts/tif__01024121.pex b/scripts/tif__01024121.pex
index cfef6002..7e590819 100644
Binary files a/scripts/tif__01024121.pex and b/scripts/tif__01024121.pex differ
diff --git a/scripts/tif__0102413a.pex b/scripts/tif__0102413a.pex
index 78fbb7ea..eaca4688 100644
Binary files a/scripts/tif__0102413a.pex and b/scripts/tif__0102413a.pex differ
diff --git a/scripts/tif__0102413b.pex b/scripts/tif__0102413b.pex
index b59e227a..e1b577c2 100644
Binary files a/scripts/tif__0102413b.pex and b/scripts/tif__0102413b.pex differ
diff --git a/scripts/tif__01024a1b.pex b/scripts/tif__01024a1b.pex
index 383a8d04..bb89ee8c 100644
Binary files a/scripts/tif__01024a1b.pex and b/scripts/tif__01024a1b.pex differ
diff --git a/scripts/tif__01024a1c.pex b/scripts/tif__01024a1c.pex
index 21e9cb1e..7b6323fb 100644
Binary files a/scripts/tif__01024a1c.pex and b/scripts/tif__01024a1c.pex differ
diff --git a/scripts/tif__01024a24.pex b/scripts/tif__01024a24.pex
index 43e8a8a5..81492d2f 100644
Binary files a/scripts/tif__01024a24.pex and b/scripts/tif__01024a24.pex differ
diff --git a/scripts/tif__01024a2a.pex b/scripts/tif__01024a2a.pex
index b86b588d..7f5a4921 100644
Binary files a/scripts/tif__01024a2a.pex and b/scripts/tif__01024a2a.pex differ
diff --git a/scripts/tif__01024a31.pex b/scripts/tif__01024a31.pex
index fca3d55e..edb86c69 100644
Binary files a/scripts/tif__01024a31.pex and b/scripts/tif__01024a31.pex differ
diff --git a/scripts/tif__01024a36.pex b/scripts/tif__01024a36.pex
index 01ed69bd..c5f28447 100644
Binary files a/scripts/tif__01024a36.pex and b/scripts/tif__01024a36.pex differ
diff --git a/scripts/tif__01024a39.pex b/scripts/tif__01024a39.pex
index 775d58de..6e1cbb39 100644
Binary files a/scripts/tif__01024a39.pex and b/scripts/tif__01024a39.pex differ
diff --git a/scripts/tif__01024a3a.pex b/scripts/tif__01024a3a.pex
index bef7e6ae..a47c603e 100644
Binary files a/scripts/tif__01024a3a.pex and b/scripts/tif__01024a3a.pex differ
diff --git a/scripts/tif__01024a3c.pex b/scripts/tif__01024a3c.pex
index 5f218a5a..0f3b5cf5 100644
Binary files a/scripts/tif__01024a3c.pex and b/scripts/tif__01024a3c.pex differ
diff --git a/scripts/tif__01024a47.pex b/scripts/tif__01024a47.pex
index 9ce68fc8..55d60308 100644
Binary files a/scripts/tif__01024a47.pex and b/scripts/tif__01024a47.pex differ
diff --git a/scripts/tif__01024a49.pex b/scripts/tif__01024a49.pex
index 304ef4b2..e97bd188 100644
Binary files a/scripts/tif__01024a49.pex and b/scripts/tif__01024a49.pex differ
diff --git a/scripts/tif__01024a4d.pex b/scripts/tif__01024a4d.pex
index fd1fd769..88033890 100644
Binary files a/scripts/tif__01024a4d.pex and b/scripts/tif__01024a4d.pex differ
diff --git a/scripts/tif__01024a4e.pex b/scripts/tif__01024a4e.pex
index fe22b2cc..a84ba607 100644
Binary files a/scripts/tif__01024a4e.pex and b/scripts/tif__01024a4e.pex differ
diff --git a/scripts/tif__01024a54.pex b/scripts/tif__01024a54.pex
index c3a34539..36b5af17 100644
Binary files a/scripts/tif__01024a54.pex and b/scripts/tif__01024a54.pex differ
diff --git a/scripts/tif__01024a55.pex b/scripts/tif__01024a55.pex
index 08e8d690..540355d1 100644
Binary files a/scripts/tif__01024a55.pex and b/scripts/tif__01024a55.pex differ
diff --git a/scripts/tif__01024a56.pex b/scripts/tif__01024a56.pex
index 9eb08785..cd848c45 100644
Binary files a/scripts/tif__01024a56.pex and b/scripts/tif__01024a56.pex differ
diff --git a/scripts/tif__01024a5b.pex b/scripts/tif__01024a5b.pex
index bc6a734a..fe6ad87e 100644
Binary files a/scripts/tif__01024a5b.pex and b/scripts/tif__01024a5b.pex differ
diff --git a/scripts/tif__01024a6b.pex b/scripts/tif__01024a6b.pex
index b1e2f8a4..29c87e6e 100644
Binary files a/scripts/tif__01024a6b.pex and b/scripts/tif__01024a6b.pex differ
diff --git a/scripts/tif__01024a73.pex b/scripts/tif__01024a73.pex
index cd45feb9..b074e6bd 100644
Binary files a/scripts/tif__01024a73.pex and b/scripts/tif__01024a73.pex differ
diff --git a/scripts/tif__01024a74.pex b/scripts/tif__01024a74.pex
index 8e2f7dfb..80202cf7 100644
Binary files a/scripts/tif__01024a74.pex and b/scripts/tif__01024a74.pex differ
diff --git a/scripts/tif__01024bab.pex b/scripts/tif__01024bab.pex
index 1b6a39bd..0643b1a4 100644
Binary files a/scripts/tif__01024bab.pex and b/scripts/tif__01024bab.pex differ
diff --git a/scripts/tif__01024bb2.pex b/scripts/tif__01024bb2.pex
index 34ffcb46..04ae27ce 100644
Binary files a/scripts/tif__01024bb2.pex and b/scripts/tif__01024bb2.pex differ
diff --git a/scripts/tif__01024bc7.pex b/scripts/tif__01024bc7.pex
index a2b248cc..fc83f7a9 100644
Binary files a/scripts/tif__01024bc7.pex and b/scripts/tif__01024bc7.pex differ
diff --git a/scripts/tif__01025174.pex b/scripts/tif__01025174.pex
index 4b4465cf..77592879 100644
Binary files a/scripts/tif__01025174.pex and b/scripts/tif__01025174.pex differ
diff --git a/scripts/tif__0102523c.pex b/scripts/tif__0102523c.pex
index c23f9bd5..09b1e3a9 100644
Binary files a/scripts/tif__0102523c.pex and b/scripts/tif__0102523c.pex differ
diff --git a/scripts/tif__01025241.pex b/scripts/tif__01025241.pex
index 8fa63790..94616403 100644
Binary files a/scripts/tif__01025241.pex and b/scripts/tif__01025241.pex differ
diff --git a/scripts/tif__01025243.pex b/scripts/tif__01025243.pex
index 003610d5..26ff5a7e 100644
Binary files a/scripts/tif__01025243.pex and b/scripts/tif__01025243.pex differ
diff --git a/scripts/tif__01025248.pex b/scripts/tif__01025248.pex
index 2a30df94..2854b206 100644
Binary files a/scripts/tif__01025248.pex and b/scripts/tif__01025248.pex differ
diff --git a/scripts/tif__01025249.pex b/scripts/tif__01025249.pex
index 6d8b046d..6a95b0e9 100644
Binary files a/scripts/tif__01025249.pex and b/scripts/tif__01025249.pex differ
diff --git a/scripts/tif__0102524a.pex b/scripts/tif__0102524a.pex
index 87ffad8b..f51c407b 100644
Binary files a/scripts/tif__0102524a.pex and b/scripts/tif__0102524a.pex differ
diff --git a/scripts/tif__0102524c.pex b/scripts/tif__0102524c.pex
index 8a2accd6..870351bf 100644
Binary files a/scripts/tif__0102524c.pex and b/scripts/tif__0102524c.pex differ
diff --git a/scripts/tif__0102524d.pex b/scripts/tif__0102524d.pex
index e31b223e..ac7b0e73 100644
Binary files a/scripts/tif__0102524d.pex and b/scripts/tif__0102524d.pex differ
diff --git a/scripts/tif__0102524f.pex b/scripts/tif__0102524f.pex
index 395e3ab5..16aa087b 100644
Binary files a/scripts/tif__0102524f.pex and b/scripts/tif__0102524f.pex differ
diff --git a/scripts/tif__01025253.pex b/scripts/tif__01025253.pex
index 29db2497..98c1543e 100644
Binary files a/scripts/tif__01025253.pex and b/scripts/tif__01025253.pex differ
diff --git a/scripts/tif__01025255.pex b/scripts/tif__01025255.pex
index c7e08ff8..6da038a9 100644
Binary files a/scripts/tif__01025255.pex and b/scripts/tif__01025255.pex differ
diff --git a/scripts/tif__01025258.pex b/scripts/tif__01025258.pex
index 2c89f030..1876140e 100644
Binary files a/scripts/tif__01025258.pex and b/scripts/tif__01025258.pex differ
diff --git a/scripts/tif__0102527e.pex b/scripts/tif__0102527e.pex
index d5782736..29b166ae 100644
Binary files a/scripts/tif__0102527e.pex and b/scripts/tif__0102527e.pex differ
diff --git a/scripts/tif__0102527f.pex b/scripts/tif__0102527f.pex
index 7b899187..a61d7c28 100644
Binary files a/scripts/tif__0102527f.pex and b/scripts/tif__0102527f.pex differ
diff --git a/scripts/tif__0102528d.pex b/scripts/tif__0102528d.pex
index 82761cc0..091c895a 100644
Binary files a/scripts/tif__0102528d.pex and b/scripts/tif__0102528d.pex differ
diff --git a/scripts/tif__0102528e.pex b/scripts/tif__0102528e.pex
index 3bef6e9d..79fd638d 100644
Binary files a/scripts/tif__0102528e.pex and b/scripts/tif__0102528e.pex differ
diff --git a/scripts/tif__0102528f.pex b/scripts/tif__0102528f.pex
index 8618e845..8fc3cfbe 100644
Binary files a/scripts/tif__0102528f.pex and b/scripts/tif__0102528f.pex differ
diff --git a/scripts/tif__01025292.pex b/scripts/tif__01025292.pex
index 07ff1a8f..7157ed94 100644
Binary files a/scripts/tif__01025292.pex and b/scripts/tif__01025292.pex differ
diff --git a/scripts/tif__01025298.pex b/scripts/tif__01025298.pex
index b9753d3e..ef745473 100644
Binary files a/scripts/tif__01025298.pex and b/scripts/tif__01025298.pex differ
diff --git a/scripts/tif__01028e45.pex b/scripts/tif__01028e45.pex
index 44f38fd4..b800cce4 100644
Binary files a/scripts/tif__01028e45.pex and b/scripts/tif__01028e45.pex differ
diff --git a/scripts/tif__01028e46.pex b/scripts/tif__01028e46.pex
index 07710163..4cb69cba 100644
Binary files a/scripts/tif__01028e46.pex and b/scripts/tif__01028e46.pex differ
diff --git a/scripts/tif__01028e4b.pex b/scripts/tif__01028e4b.pex
index 8bbf35f0..198b257d 100644
Binary files a/scripts/tif__01028e4b.pex and b/scripts/tif__01028e4b.pex differ
diff --git a/scripts/tif__01028e4d.pex b/scripts/tif__01028e4d.pex
index f9d8274d..0b807d5f 100644
Binary files a/scripts/tif__01028e4d.pex and b/scripts/tif__01028e4d.pex differ
diff --git a/scripts/tif__01028e55.pex b/scripts/tif__01028e55.pex
index bb1470ab..d5fd9e2d 100644
Binary files a/scripts/tif__01028e55.pex and b/scripts/tif__01028e55.pex differ
diff --git a/scripts/tif__01028e5b.pex b/scripts/tif__01028e5b.pex
index 7dac8ab0..9424d62a 100644
Binary files a/scripts/tif__01028e5b.pex and b/scripts/tif__01028e5b.pex differ
diff --git a/scripts/tif__01028e60.pex b/scripts/tif__01028e60.pex
index eff3156a..006e7fe3 100644
Binary files a/scripts/tif__01028e60.pex and b/scripts/tif__01028e60.pex differ
diff --git a/scripts/tif__01028ef6.pex b/scripts/tif__01028ef6.pex
index 667d90c9..9b116360 100644
Binary files a/scripts/tif__01028ef6.pex and b/scripts/tif__01028ef6.pex differ
diff --git a/scripts/tif__01028ef9.pex b/scripts/tif__01028ef9.pex
index 6d8c0bca..9a4ca11a 100644
Binary files a/scripts/tif__01028ef9.pex and b/scripts/tif__01028ef9.pex differ
diff --git a/scripts/tif__01028f06.pex b/scripts/tif__01028f06.pex
index 647385b2..e43d87b0 100644
Binary files a/scripts/tif__01028f06.pex and b/scripts/tif__01028f06.pex differ
diff --git a/scripts/tif__01028f07.pex b/scripts/tif__01028f07.pex
index c9c0e1ca..a542b3fd 100644
Binary files a/scripts/tif__01028f07.pex and b/scripts/tif__01028f07.pex differ
diff --git a/scripts/tif__01028f0f.pex b/scripts/tif__01028f0f.pex
index b07fa338..c0513526 100644
Binary files a/scripts/tif__01028f0f.pex and b/scripts/tif__01028f0f.pex differ
diff --git a/scripts/tif__01028f14.pex b/scripts/tif__01028f14.pex
index bc42ba2e..22f4ec10 100644
Binary files a/scripts/tif__01028f14.pex and b/scripts/tif__01028f14.pex differ
diff --git a/scripts/tif__01028f1a.pex b/scripts/tif__01028f1a.pex
index b65171d8..e276c72f 100644
Binary files a/scripts/tif__01028f1a.pex and b/scripts/tif__01028f1a.pex differ
diff --git a/scripts/tif__01028f1c.pex b/scripts/tif__01028f1c.pex
index fe3f2d45..7d4d2fcc 100644
Binary files a/scripts/tif__01028f1c.pex and b/scripts/tif__01028f1c.pex differ
diff --git a/scripts/tif__01028f1e.pex b/scripts/tif__01028f1e.pex
index 6000afbb..2a524322 100644
Binary files a/scripts/tif__01028f1e.pex and b/scripts/tif__01028f1e.pex differ
diff --git a/scripts/tif__01028f21.pex b/scripts/tif__01028f21.pex
index 1bdb2946..65aaacfe 100644
Binary files a/scripts/tif__01028f21.pex and b/scripts/tif__01028f21.pex differ
diff --git a/scripts/tif__01028f2a.pex b/scripts/tif__01028f2a.pex
index 1d1188a3..f57bf281 100644
Binary files a/scripts/tif__01028f2a.pex and b/scripts/tif__01028f2a.pex differ
diff --git a/scripts/tif__01028f2e.pex b/scripts/tif__01028f2e.pex
index bcb6c7e3..ac7cab7c 100644
Binary files a/scripts/tif__01028f2e.pex and b/scripts/tif__01028f2e.pex differ
diff --git a/scripts/tif__01028f33.pex b/scripts/tif__01028f33.pex
index 9f11841b..379df002 100644
Binary files a/scripts/tif__01028f33.pex and b/scripts/tif__01028f33.pex differ
diff --git a/scripts/tif__01028f34.pex b/scripts/tif__01028f34.pex
index 46cd01ff..6d5a6eb6 100644
Binary files a/scripts/tif__01028f34.pex and b/scripts/tif__01028f34.pex differ
diff --git a/scripts/tif__01028f3f.pex b/scripts/tif__01028f3f.pex
index 8d5c9aea..46335a07 100644
Binary files a/scripts/tif__01028f3f.pex and b/scripts/tif__01028f3f.pex differ
diff --git a/scripts/tif__01028f45.pex b/scripts/tif__01028f45.pex
index 5acb6e7b..86a79bed 100644
Binary files a/scripts/tif__01028f45.pex and b/scripts/tif__01028f45.pex differ
diff --git a/scripts/tif__01028f46.pex b/scripts/tif__01028f46.pex
index 440eae57..f0d138be 100644
Binary files a/scripts/tif__01028f46.pex and b/scripts/tif__01028f46.pex differ
diff --git a/scripts/tif__01028f4a.pex b/scripts/tif__01028f4a.pex
index 265e6e94..a65d9d7c 100644
Binary files a/scripts/tif__01028f4a.pex and b/scripts/tif__01028f4a.pex differ
diff --git a/scripts/tif__01028f50.pex b/scripts/tif__01028f50.pex
index 3ea7467a..69655171 100644
Binary files a/scripts/tif__01028f50.pex and b/scripts/tif__01028f50.pex differ
diff --git a/scripts/tif__01028f51.pex b/scripts/tif__01028f51.pex
index 767903e8..c2190fc7 100644
Binary files a/scripts/tif__01028f51.pex and b/scripts/tif__01028f51.pex differ
diff --git a/scripts/tif__01028f53.pex b/scripts/tif__01028f53.pex
index e1ae40dc..3ed08067 100644
Binary files a/scripts/tif__01028f53.pex and b/scripts/tif__01028f53.pex differ
diff --git a/scripts/tif__01028f54.pex b/scripts/tif__01028f54.pex
index 3d7132d8..a47e9de3 100644
Binary files a/scripts/tif__01028f54.pex and b/scripts/tif__01028f54.pex differ
diff --git a/scripts/tif__01028f55.pex b/scripts/tif__01028f55.pex
index d514e08a..fd0010e6 100644
Binary files a/scripts/tif__01028f55.pex and b/scripts/tif__01028f55.pex differ
diff --git a/scripts/tif__01028f56.pex b/scripts/tif__01028f56.pex
index 638e471c..b0161912 100644
Binary files a/scripts/tif__01028f56.pex and b/scripts/tif__01028f56.pex differ
diff --git a/scripts/tif__01028f57.pex b/scripts/tif__01028f57.pex
index 44d60a4f..66ae161c 100644
Binary files a/scripts/tif__01028f57.pex and b/scripts/tif__01028f57.pex differ
diff --git a/scripts/tif__0102988a.pex b/scripts/tif__0102988a.pex
index a5ec373c..f0b3cf4d 100644
Binary files a/scripts/tif__0102988a.pex and b/scripts/tif__0102988a.pex differ
diff --git a/scripts/tif__0102988f.pex b/scripts/tif__0102988f.pex
index 47e6cad6..3909b2d1 100644
Binary files a/scripts/tif__0102988f.pex and b/scripts/tif__0102988f.pex differ
diff --git a/scripts/tif__01029893.pex b/scripts/tif__01029893.pex
index 37c7d449..161412bd 100644
Binary files a/scripts/tif__01029893.pex and b/scripts/tif__01029893.pex differ
diff --git a/scripts/tif__01029894.pex b/scripts/tif__01029894.pex
index 2d199f78..1107215f 100644
Binary files a/scripts/tif__01029894.pex and b/scripts/tif__01029894.pex differ
diff --git a/scripts/tif__01029895.pex b/scripts/tif__01029895.pex
index eeeca6fd..88da2229 100644
Binary files a/scripts/tif__01029895.pex and b/scripts/tif__01029895.pex differ
diff --git a/scripts/tif__01029896.pex b/scripts/tif__01029896.pex
index 59dc92e6..55bafda3 100644
Binary files a/scripts/tif__01029896.pex and b/scripts/tif__01029896.pex differ
diff --git a/scripts/tif__01029898.pex b/scripts/tif__01029898.pex
index 7e4d179a..e7e283a2 100644
Binary files a/scripts/tif__01029898.pex and b/scripts/tif__01029898.pex differ
diff --git a/scripts/tif__010298a2.pex b/scripts/tif__010298a2.pex
index 42b612c9..f07814f6 100644
Binary files a/scripts/tif__010298a2.pex and b/scripts/tif__010298a2.pex differ
diff --git a/scripts/tif__010298ad.pex b/scripts/tif__010298ad.pex
index d3158d9f..1508fb3e 100644
Binary files a/scripts/tif__010298ad.pex and b/scripts/tif__010298ad.pex differ
diff --git a/scripts/tif__010298b2.pex b/scripts/tif__010298b2.pex
index cb229556..dab7ee82 100644
Binary files a/scripts/tif__010298b2.pex and b/scripts/tif__010298b2.pex differ
diff --git a/scripts/tif__010298b6.pex b/scripts/tif__010298b6.pex
index 6e39bd7a..e0e0a8a7 100644
Binary files a/scripts/tif__010298b6.pex and b/scripts/tif__010298b6.pex differ
diff --git a/scripts/tif__010298b7.pex b/scripts/tif__010298b7.pex
index 5e4b1b9c..58baf48b 100644
Binary files a/scripts/tif__010298b7.pex and b/scripts/tif__010298b7.pex differ
diff --git a/scripts/tif__010298bb.pex b/scripts/tif__010298bb.pex
index 1790b9e8..57cc4ff7 100644
Binary files a/scripts/tif__010298bb.pex and b/scripts/tif__010298bb.pex differ
diff --git a/scripts/tif__010298be.pex b/scripts/tif__010298be.pex
index 90dd6b68..66a376d5 100644
Binary files a/scripts/tif__010298be.pex and b/scripts/tif__010298be.pex differ
diff --git a/scripts/tif__010298bf.pex b/scripts/tif__010298bf.pex
index 4e45bf6b..cda03a63 100644
Binary files a/scripts/tif__010298bf.pex and b/scripts/tif__010298bf.pex differ
diff --git a/scripts/tif__010298c0.pex b/scripts/tif__010298c0.pex
index a31a507f..2cd4574a 100644
Binary files a/scripts/tif__010298c0.pex and b/scripts/tif__010298c0.pex differ
diff --git a/scripts/tif__010298c1.pex b/scripts/tif__010298c1.pex
index bd496bb2..d882870d 100644
Binary files a/scripts/tif__010298c1.pex and b/scripts/tif__010298c1.pex differ
diff --git a/scripts/tif__010298c9.pex b/scripts/tif__010298c9.pex
index 3be9bd00..5cce4c52 100644
Binary files a/scripts/tif__010298c9.pex and b/scripts/tif__010298c9.pex differ
diff --git a/scripts/tif__010298cb.pex b/scripts/tif__010298cb.pex
index 4e30a8c3..2e1b075e 100644
Binary files a/scripts/tif__010298cb.pex and b/scripts/tif__010298cb.pex differ
diff --git a/scripts/tif__010298cc.pex b/scripts/tif__010298cc.pex
index d7ad369f..0dd7cbb7 100644
Binary files a/scripts/tif__010298cc.pex and b/scripts/tif__010298cc.pex differ
diff --git a/scripts/tif__01029a19.pex b/scripts/tif__01029a19.pex
index a9c727da..cbb15439 100644
Binary files a/scripts/tif__01029a19.pex and b/scripts/tif__01029a19.pex differ
diff --git a/scripts/tif__01029a21.pex b/scripts/tif__01029a21.pex
index 82af9839..fabcab1c 100644
Binary files a/scripts/tif__01029a21.pex and b/scripts/tif__01029a21.pex differ
diff --git a/scripts/tif__01029a8f.pex b/scripts/tif__01029a8f.pex
index 127cc14d..982ef6c8 100644
Binary files a/scripts/tif__01029a8f.pex and b/scripts/tif__01029a8f.pex differ
diff --git a/scripts/tif__01029a94.pex b/scripts/tif__01029a94.pex
index 46d0a330..e44866f5 100644
Binary files a/scripts/tif__01029a94.pex and b/scripts/tif__01029a94.pex differ
diff --git a/scripts/tif__01029a97.pex b/scripts/tif__01029a97.pex
index 9d52c2a5..62a33c4d 100644
Binary files a/scripts/tif__01029a97.pex and b/scripts/tif__01029a97.pex differ
diff --git a/scripts/tif__01029aa8.pex b/scripts/tif__01029aa8.pex
index 53d4cbbb..d4eed509 100644
Binary files a/scripts/tif__01029aa8.pex and b/scripts/tif__01029aa8.pex differ
diff --git a/scripts/tif__01029aaf.pex b/scripts/tif__01029aaf.pex
index d7fa97de..35a51132 100644
Binary files a/scripts/tif__01029aaf.pex and b/scripts/tif__01029aaf.pex differ
diff --git a/scripts/tif__01029ab5.pex b/scripts/tif__01029ab5.pex
index dff0c801..859e5a04 100644
Binary files a/scripts/tif__01029ab5.pex and b/scripts/tif__01029ab5.pex differ
diff --git a/scripts/tif__01029ab7.pex b/scripts/tif__01029ab7.pex
index 61dea80d..63d973d0 100644
Binary files a/scripts/tif__01029ab7.pex and b/scripts/tif__01029ab7.pex differ
diff --git a/scripts/tif__01029ab9.pex b/scripts/tif__01029ab9.pex
index 6d3700ca..1577f771 100644
Binary files a/scripts/tif__01029ab9.pex and b/scripts/tif__01029ab9.pex differ
diff --git a/scripts/tif__01029abe.pex b/scripts/tif__01029abe.pex
index c9c84988..aec11368 100644
Binary files a/scripts/tif__01029abe.pex and b/scripts/tif__01029abe.pex differ
diff --git a/scripts/tif__01029ac4.pex b/scripts/tif__01029ac4.pex
index 609935d7..90015517 100644
Binary files a/scripts/tif__01029ac4.pex and b/scripts/tif__01029ac4.pex differ
diff --git a/scripts/tif__01029ac6.pex b/scripts/tif__01029ac6.pex
index 76a9ad1f..d2f76514 100644
Binary files a/scripts/tif__01029ac6.pex and b/scripts/tif__01029ac6.pex differ
diff --git a/scripts/tif__01029acd.pex b/scripts/tif__01029acd.pex
index 5e98f107..83362d8c 100644
Binary files a/scripts/tif__01029acd.pex and b/scripts/tif__01029acd.pex differ
diff --git a/scripts/tif__01029adc.pex b/scripts/tif__01029adc.pex
index 4d910910..6cbc8d70 100644
Binary files a/scripts/tif__01029adc.pex and b/scripts/tif__01029adc.pex differ
diff --git a/scripts/tif__0102a006.pex b/scripts/tif__0102a006.pex
index 149a63ce..de349d4d 100644
Binary files a/scripts/tif__0102a006.pex and b/scripts/tif__0102a006.pex differ
diff --git a/scripts/tif__0102a011.pex b/scripts/tif__0102a011.pex
index 7d3f1768..5f15df31 100644
Binary files a/scripts/tif__0102a011.pex and b/scripts/tif__0102a011.pex differ
diff --git a/scripts/tif__0102a013.pex b/scripts/tif__0102a013.pex
index 592ac06b..09171c67 100644
Binary files a/scripts/tif__0102a013.pex and b/scripts/tif__0102a013.pex differ
diff --git a/scripts/tif__0102a017.pex b/scripts/tif__0102a017.pex
index 499ad605..0df8b861 100644
Binary files a/scripts/tif__0102a017.pex and b/scripts/tif__0102a017.pex differ
diff --git a/scripts/tif__0102a033.pex b/scripts/tif__0102a033.pex
index 99da38a2..433bbc7a 100644
Binary files a/scripts/tif__0102a033.pex and b/scripts/tif__0102a033.pex differ
diff --git a/scripts/tif__0102a038.pex b/scripts/tif__0102a038.pex
index 8439206c..237b7bd7 100644
Binary files a/scripts/tif__0102a038.pex and b/scripts/tif__0102a038.pex differ
diff --git a/scripts/tif__0102a039.pex b/scripts/tif__0102a039.pex
index 60ff003c..e0944375 100644
Binary files a/scripts/tif__0102a039.pex and b/scripts/tif__0102a039.pex differ
diff --git a/scripts/tif__0102a03e.pex b/scripts/tif__0102a03e.pex
index fabb03ce..4c19df8a 100644
Binary files a/scripts/tif__0102a03e.pex and b/scripts/tif__0102a03e.pex differ
diff --git a/scripts/tif__0102a03f.pex b/scripts/tif__0102a03f.pex
index 1b3acf08..ca46fcaf 100644
Binary files a/scripts/tif__0102a03f.pex and b/scripts/tif__0102a03f.pex differ
diff --git a/scripts/tif__0102a420.pex b/scripts/tif__0102a420.pex
index e6fc81a4..e6fb6b4c 100644
Binary files a/scripts/tif__0102a420.pex and b/scripts/tif__0102a420.pex differ
diff --git a/scripts/tif__0102a42d.pex b/scripts/tif__0102a42d.pex
index 7e0fdb75..c423add9 100644
Binary files a/scripts/tif__0102a42d.pex and b/scripts/tif__0102a42d.pex differ
diff --git a/scripts/tif__0102a465.pex b/scripts/tif__0102a465.pex
index 622f5b4a..1399b6b4 100644
Binary files a/scripts/tif__0102a465.pex and b/scripts/tif__0102a465.pex differ
diff --git a/scripts/tif__0102a486.pex b/scripts/tif__0102a486.pex
index 96288c81..e4585582 100644
Binary files a/scripts/tif__0102a486.pex and b/scripts/tif__0102a486.pex differ
diff --git a/scripts/tif__0102a488.pex b/scripts/tif__0102a488.pex
index c0060b20..3afaead2 100644
Binary files a/scripts/tif__0102a488.pex and b/scripts/tif__0102a488.pex differ
diff --git a/scripts/tif__0102a48f.pex b/scripts/tif__0102a48f.pex
index b5685784..421e35c4 100644
Binary files a/scripts/tif__0102a48f.pex and b/scripts/tif__0102a48f.pex differ
diff --git a/scripts/tif__0102a4e8.pex b/scripts/tif__0102a4e8.pex
index 37f1fd95..288d8fe5 100644
Binary files a/scripts/tif__0102a4e8.pex and b/scripts/tif__0102a4e8.pex differ
diff --git a/scripts/tif__0102a502.pex b/scripts/tif__0102a502.pex
index 7079a1f4..9c59267e 100644
Binary files a/scripts/tif__0102a502.pex and b/scripts/tif__0102a502.pex differ
diff --git a/scripts/tif__0102a508.pex b/scripts/tif__0102a508.pex
index 7ddb315d..8256f967 100644
Binary files a/scripts/tif__0102a508.pex and b/scripts/tif__0102a508.pex differ
diff --git a/scripts/tif__0102a625.pex b/scripts/tif__0102a625.pex
index 9cd7cb2d..18b48bb3 100644
Binary files a/scripts/tif__0102a625.pex and b/scripts/tif__0102a625.pex differ
diff --git a/scripts/tif__0102a656.pex b/scripts/tif__0102a656.pex
index d323f94d..26efdb8b 100644
Binary files a/scripts/tif__0102a656.pex and b/scripts/tif__0102a656.pex differ
diff --git a/scripts/tif__0102a668.pex b/scripts/tif__0102a668.pex
index 59ac7b94..1174e68c 100644
Binary files a/scripts/tif__0102a668.pex and b/scripts/tif__0102a668.pex differ
diff --git a/scripts/tif__0102a669.pex b/scripts/tif__0102a669.pex
index e5d5fa61..1ebce2de 100644
Binary files a/scripts/tif__0102a669.pex and b/scripts/tif__0102a669.pex differ
diff --git a/scripts/tif__0102a66f.pex b/scripts/tif__0102a66f.pex
index a08f4c76..524d3c42 100644
Binary files a/scripts/tif__0102a66f.pex and b/scripts/tif__0102a66f.pex differ
diff --git a/scripts/tif__0102a671.pex b/scripts/tif__0102a671.pex
index 9dc7b4ae..52199af7 100644
Binary files a/scripts/tif__0102a671.pex and b/scripts/tif__0102a671.pex differ
diff --git a/scripts/tif__0102a90a.pex b/scripts/tif__0102a90a.pex
index 207b2f81..91bbffb6 100644
Binary files a/scripts/tif__0102a90a.pex and b/scripts/tif__0102a90a.pex differ
diff --git a/scripts/tif__0102a90b.pex b/scripts/tif__0102a90b.pex
index f128c8d5..374e631b 100644
Binary files a/scripts/tif__0102a90b.pex and b/scripts/tif__0102a90b.pex differ
diff --git a/scripts/tif__0102a9f3.pex b/scripts/tif__0102a9f3.pex
index 86ec9b7f..36092114 100644
Binary files a/scripts/tif__0102a9f3.pex and b/scripts/tif__0102a9f3.pex differ
diff --git a/scripts/tif__0102aa09.pex b/scripts/tif__0102aa09.pex
index 6ef5db41..5f6f41d4 100644
Binary files a/scripts/tif__0102aa09.pex and b/scripts/tif__0102aa09.pex differ
diff --git a/scripts/tif__0102aa0d.pex b/scripts/tif__0102aa0d.pex
index c5162513..0d7eb56c 100644
Binary files a/scripts/tif__0102aa0d.pex and b/scripts/tif__0102aa0d.pex differ
diff --git a/scripts/tif__0102aa0e.pex b/scripts/tif__0102aa0e.pex
index 5fa9cd26..062d9bf4 100644
Binary files a/scripts/tif__0102aa0e.pex and b/scripts/tif__0102aa0e.pex differ
diff --git a/scripts/tif__0102aa13.pex b/scripts/tif__0102aa13.pex
index 01ee21f6..1dbf6b55 100644
Binary files a/scripts/tif__0102aa13.pex and b/scripts/tif__0102aa13.pex differ
diff --git a/scripts/tif__0102aa16.pex b/scripts/tif__0102aa16.pex
index cd6baa30..c205a120 100644
Binary files a/scripts/tif__0102aa16.pex and b/scripts/tif__0102aa16.pex differ
diff --git a/scripts/tif__0102aa17.pex b/scripts/tif__0102aa17.pex
index 0ab9995b..4c42b3d7 100644
Binary files a/scripts/tif__0102aa17.pex and b/scripts/tif__0102aa17.pex differ
diff --git a/scripts/tif__0102b405.pex b/scripts/tif__0102b405.pex
index 1d9ca1a3..1e96703a 100644
Binary files a/scripts/tif__0102b405.pex and b/scripts/tif__0102b405.pex differ
diff --git a/scripts/tif__0102b40f.pex b/scripts/tif__0102b40f.pex
index 6e6be8d3..40608e30 100644
Binary files a/scripts/tif__0102b40f.pex and b/scripts/tif__0102b40f.pex differ
diff --git a/scripts/tif__0102b42d.pex b/scripts/tif__0102b42d.pex
index 8b676c9c..2fef7a17 100644
Binary files a/scripts/tif__0102b42d.pex and b/scripts/tif__0102b42d.pex differ
diff --git a/scripts/tif__0102b433.pex b/scripts/tif__0102b433.pex
index 3720e3ee..6cbd581a 100644
Binary files a/scripts/tif__0102b433.pex and b/scripts/tif__0102b433.pex differ
diff --git a/scripts/tif__0102b434.pex b/scripts/tif__0102b434.pex
index b5769b6b..eeaf7008 100644
Binary files a/scripts/tif__0102b434.pex and b/scripts/tif__0102b434.pex differ
diff --git a/scripts/tif__0102b4b9.pex b/scripts/tif__0102b4b9.pex
index 971a469c..52a09149 100644
Binary files a/scripts/tif__0102b4b9.pex and b/scripts/tif__0102b4b9.pex differ
diff --git a/scripts/tif__0102b4de.pex b/scripts/tif__0102b4de.pex
index a1df0ee3..f4ee2a3a 100644
Binary files a/scripts/tif__0102b4de.pex and b/scripts/tif__0102b4de.pex differ
diff --git a/scripts/tif__0102b95d.pex b/scripts/tif__0102b95d.pex
index 536c4485..7cc8c567 100644
Binary files a/scripts/tif__0102b95d.pex and b/scripts/tif__0102b95d.pex differ
diff --git a/scripts/tif__0102b976.pex b/scripts/tif__0102b976.pex
index ecb182de..79cd9d58 100644
Binary files a/scripts/tif__0102b976.pex and b/scripts/tif__0102b976.pex differ
diff --git a/scripts/tif__0102b977.pex b/scripts/tif__0102b977.pex
index b51989d9..22230133 100644
Binary files a/scripts/tif__0102b977.pex and b/scripts/tif__0102b977.pex differ
diff --git a/scripts/tif__0102b978.pex b/scripts/tif__0102b978.pex
index 70230ebc..c3f50ffe 100644
Binary files a/scripts/tif__0102b978.pex and b/scripts/tif__0102b978.pex differ
diff --git a/scripts/tif__0102b979.pex b/scripts/tif__0102b979.pex
index 186e1e78..d509d07c 100644
Binary files a/scripts/tif__0102b979.pex and b/scripts/tif__0102b979.pex differ
diff --git a/scripts/tif__0102b97a.pex b/scripts/tif__0102b97a.pex
index 710e7d32..aa2d4505 100644
Binary files a/scripts/tif__0102b97a.pex and b/scripts/tif__0102b97a.pex differ
diff --git a/scripts/tif__0102b97b.pex b/scripts/tif__0102b97b.pex
index c2deb65f..134986f7 100644
Binary files a/scripts/tif__0102b97b.pex and b/scripts/tif__0102b97b.pex differ
diff --git a/scripts/tif__0102b97c.pex b/scripts/tif__0102b97c.pex
index 35969acd..eda45f44 100644
Binary files a/scripts/tif__0102b97c.pex and b/scripts/tif__0102b97c.pex differ
diff --git a/scripts/tif__0102b97d.pex b/scripts/tif__0102b97d.pex
index 07d90430..60354e60 100644
Binary files a/scripts/tif__0102b97d.pex and b/scripts/tif__0102b97d.pex differ
diff --git a/scripts/tif__0102b97e.pex b/scripts/tif__0102b97e.pex
index 638f0680..6a504fdc 100644
Binary files a/scripts/tif__0102b97e.pex and b/scripts/tif__0102b97e.pex differ
diff --git a/scripts/tif__0102b97f.pex b/scripts/tif__0102b97f.pex
index d5cf78d3..6d9aa5cc 100644
Binary files a/scripts/tif__0102b97f.pex and b/scripts/tif__0102b97f.pex differ
diff --git a/scripts/tif__0102b980.pex b/scripts/tif__0102b980.pex
index 392e163c..b8c853b8 100644
Binary files a/scripts/tif__0102b980.pex and b/scripts/tif__0102b980.pex differ
diff --git a/scripts/tif__0102c5c4.pex b/scripts/tif__0102c5c4.pex
index 114184c8..4f7689bd 100644
Binary files a/scripts/tif__0102c5c4.pex and b/scripts/tif__0102c5c4.pex differ
diff --git a/scripts/tif__0102c5c9.pex b/scripts/tif__0102c5c9.pex
index 3c78db08..99aac3d1 100644
Binary files a/scripts/tif__0102c5c9.pex and b/scripts/tif__0102c5c9.pex differ
diff --git a/scripts/tif__0102e1ea.pex b/scripts/tif__0102e1ea.pex
index 2de04e1f..1028951d 100644
Binary files a/scripts/tif__0102e1ea.pex and b/scripts/tif__0102e1ea.pex differ
diff --git a/scripts/tif__0102e600.pex b/scripts/tif__0102e600.pex
index 432fff9c..6ce4806d 100644
Binary files a/scripts/tif__0102e600.pex and b/scripts/tif__0102e600.pex differ
diff --git a/scripts/tif__0102e605.pex b/scripts/tif__0102e605.pex
index 24587487..285cf028 100644
Binary files a/scripts/tif__0102e605.pex and b/scripts/tif__0102e605.pex differ
diff --git a/scripts/tif__0102e607.pex b/scripts/tif__0102e607.pex
index 48df2c50..0dde71a6 100644
Binary files a/scripts/tif__0102e607.pex and b/scripts/tif__0102e607.pex differ
diff --git a/scripts/tif__0102e616.pex b/scripts/tif__0102e616.pex
index c5058368..42923db8 100644
Binary files a/scripts/tif__0102e616.pex and b/scripts/tif__0102e616.pex differ
diff --git a/scripts/tif__0102e617.pex b/scripts/tif__0102e617.pex
index c1984939..71d8a093 100644
Binary files a/scripts/tif__0102e617.pex and b/scripts/tif__0102e617.pex differ
diff --git a/scripts/tif__0102e633.pex b/scripts/tif__0102e633.pex
index 1790452f..d98b1d74 100644
Binary files a/scripts/tif__0102e633.pex and b/scripts/tif__0102e633.pex differ
diff --git a/scripts/tif__0102e634.pex b/scripts/tif__0102e634.pex
index 1d8292b4..3f00de3a 100644
Binary files a/scripts/tif__0102e634.pex and b/scripts/tif__0102e634.pex differ
diff --git a/scripts/tif__0102e635.pex b/scripts/tif__0102e635.pex
index 65551f6a..43235e08 100644
Binary files a/scripts/tif__0102e635.pex and b/scripts/tif__0102e635.pex differ
diff --git a/scripts/tif__0102e650.pex b/scripts/tif__0102e650.pex
index 13ba221b..3fab951f 100644
Binary files a/scripts/tif__0102e650.pex and b/scripts/tif__0102e650.pex differ
diff --git a/scripts/tif__0102e651.pex b/scripts/tif__0102e651.pex
index 3645ceee..0b11970a 100644
Binary files a/scripts/tif__0102e651.pex and b/scripts/tif__0102e651.pex differ
diff --git a/scripts/tif__0102e658.pex b/scripts/tif__0102e658.pex
index 30954756..4b16186e 100644
Binary files a/scripts/tif__0102e658.pex and b/scripts/tif__0102e658.pex differ
diff --git a/scripts/tif__0102e65a.pex b/scripts/tif__0102e65a.pex
index 5759b49e..103094a4 100644
Binary files a/scripts/tif__0102e65a.pex and b/scripts/tif__0102e65a.pex differ
diff --git a/scripts/tif__0102ee99.pex b/scripts/tif__0102ee99.pex
index d2a4db23..1e11bd12 100644
Binary files a/scripts/tif__0102ee99.pex and b/scripts/tif__0102ee99.pex differ
diff --git a/scripts/tif__02001bfe.pex b/scripts/tif__02001bfe.pex
index 0bff0887..40ccab15 100644
Binary files a/scripts/tif__02001bfe.pex and b/scripts/tif__02001bfe.pex differ
diff --git a/scripts/tif__0200301b.pex b/scripts/tif__0200301b.pex
index 387b75be..204a034f 100644
Binary files a/scripts/tif__0200301b.pex and b/scripts/tif__0200301b.pex differ
diff --git a/scripts/tif__020030b3.pex b/scripts/tif__020030b3.pex
index 9697acad..aad3ec76 100644
Binary files a/scripts/tif__020030b3.pex and b/scripts/tif__020030b3.pex differ
diff --git a/scripts/tif__02004390.pex b/scripts/tif__02004390.pex
index 539451d6..03f53cba 100644
Binary files a/scripts/tif__02004390.pex and b/scripts/tif__02004390.pex differ
diff --git a/scripts/tif__02004391.pex b/scripts/tif__02004391.pex
index 67bd77f7..c5ec110f 100644
Binary files a/scripts/tif__02004391.pex and b/scripts/tif__02004391.pex differ
diff --git a/scripts/tif__0200439d.pex b/scripts/tif__0200439d.pex
index dbdf3b67..4b8b623f 100644
Binary files a/scripts/tif__0200439d.pex and b/scripts/tif__0200439d.pex differ
diff --git a/scripts/tif__02004a52.pex b/scripts/tif__02004a52.pex
index 7ad47026..7c207b3b 100644
Binary files a/scripts/tif__02004a52.pex and b/scripts/tif__02004a52.pex differ
diff --git a/scripts/tif__02004a54.pex b/scripts/tif__02004a54.pex
index 7db7575d..abcd7ecd 100644
Binary files a/scripts/tif__02004a54.pex and b/scripts/tif__02004a54.pex differ
diff --git a/scripts/tif__020056de.pex b/scripts/tif__020056de.pex
index 93e9b45b..d1ef9fa7 100644
Binary files a/scripts/tif__020056de.pex and b/scripts/tif__020056de.pex differ
diff --git a/scripts/tif__02005702.pex b/scripts/tif__02005702.pex
index 67276939..b56ea88b 100644
Binary files a/scripts/tif__02005702.pex and b/scripts/tif__02005702.pex differ
diff --git a/scripts/tif__0200574e.pex b/scripts/tif__0200574e.pex
index 9ebb061d..28dd3ab5 100644
Binary files a/scripts/tif__0200574e.pex and b/scripts/tif__0200574e.pex differ
diff --git a/scripts/tif__0200576b.pex b/scripts/tif__0200576b.pex
index ce1bfdbf..49b7d7ad 100644
Binary files a/scripts/tif__0200576b.pex and b/scripts/tif__0200576b.pex differ
diff --git a/scripts/tif__0200576e.pex b/scripts/tif__0200576e.pex
index d3f3bc9f..263fef80 100644
Binary files a/scripts/tif__0200576e.pex and b/scripts/tif__0200576e.pex differ
diff --git a/scripts/tif__02005777.pex b/scripts/tif__02005777.pex
index 93810181..2512cce2 100644
Binary files a/scripts/tif__02005777.pex and b/scripts/tif__02005777.pex differ
diff --git a/scripts/tif__02005778.pex b/scripts/tif__02005778.pex
index 922b8735..45e1d92c 100644
Binary files a/scripts/tif__02005778.pex and b/scripts/tif__02005778.pex differ
diff --git a/scripts/tif__02005789.pex b/scripts/tif__02005789.pex
index 8fe77561..02404ac8 100644
Binary files a/scripts/tif__02005789.pex and b/scripts/tif__02005789.pex differ
diff --git a/scripts/tif__0200578b.pex b/scripts/tif__0200578b.pex
index 206a2f45..0e4ca6c1 100644
Binary files a/scripts/tif__0200578b.pex and b/scripts/tif__0200578b.pex differ
diff --git a/scripts/tif__02005792.pex b/scripts/tif__02005792.pex
index aa526588..fee5239f 100644
Binary files a/scripts/tif__02005792.pex and b/scripts/tif__02005792.pex differ
diff --git a/scripts/tif__0200579c.pex b/scripts/tif__0200579c.pex
index 4393b045..1b86d00d 100644
Binary files a/scripts/tif__0200579c.pex and b/scripts/tif__0200579c.pex differ
diff --git a/scripts/tif__020057a1.pex b/scripts/tif__020057a1.pex
index 21803f28..8988ca30 100644
Binary files a/scripts/tif__020057a1.pex and b/scripts/tif__020057a1.pex differ
diff --git a/scripts/tif__020057ae.pex b/scripts/tif__020057ae.pex
index 68db078a..00cdc9f7 100644
Binary files a/scripts/tif__020057ae.pex and b/scripts/tif__020057ae.pex differ
diff --git a/scripts/tif__020057c2.pex b/scripts/tif__020057c2.pex
index 341b45a2..ce13655e 100644
Binary files a/scripts/tif__020057c2.pex and b/scripts/tif__020057c2.pex differ
diff --git a/scripts/tif__02006b65.pex b/scripts/tif__02006b65.pex
index 3ef208ca..215dbce4 100644
Binary files a/scripts/tif__02006b65.pex and b/scripts/tif__02006b65.pex differ
diff --git a/scripts/tif__02006b67.pex b/scripts/tif__02006b67.pex
index 26a00c0b..074d549e 100644
Binary files a/scripts/tif__02006b67.pex and b/scripts/tif__02006b67.pex differ
diff --git a/scripts/tif__02006b6e.pex b/scripts/tif__02006b6e.pex
index 2ff0fc34..abc60703 100644
Binary files a/scripts/tif__02006b6e.pex and b/scripts/tif__02006b6e.pex differ
diff --git a/scripts/tif__02006b77.pex b/scripts/tif__02006b77.pex
index c6cdb425..dd2c1ba0 100644
Binary files a/scripts/tif__02006b77.pex and b/scripts/tif__02006b77.pex differ
diff --git a/scripts/tif__02006b7f.pex b/scripts/tif__02006b7f.pex
index f865f819..44a55a73 100644
Binary files a/scripts/tif__02006b7f.pex and b/scripts/tif__02006b7f.pex differ
diff --git a/scripts/tif__02006b89.pex b/scripts/tif__02006b89.pex
index e738545b..db118aad 100644
Binary files a/scripts/tif__02006b89.pex and b/scripts/tif__02006b89.pex differ
diff --git a/scripts/tif__02006b8a.pex b/scripts/tif__02006b8a.pex
index 75c95f93..2bb16384 100644
Binary files a/scripts/tif__02006b8a.pex and b/scripts/tif__02006b8a.pex differ
diff --git a/scripts/tif__02006bad.pex b/scripts/tif__02006bad.pex
index 5c742a14..af9445c2 100644
Binary files a/scripts/tif__02006bad.pex and b/scripts/tif__02006bad.pex differ
diff --git a/scripts/tif__02006bc7.pex b/scripts/tif__02006bc7.pex
index d3e73077..4b043298 100644
Binary files a/scripts/tif__02006bc7.pex and b/scripts/tif__02006bc7.pex differ
diff --git a/scripts/tif__02006bde.pex b/scripts/tif__02006bde.pex
index 0d052db4..37e48494 100644
Binary files a/scripts/tif__02006bde.pex and b/scripts/tif__02006bde.pex differ
diff --git a/scripts/tif__02006be6.pex b/scripts/tif__02006be6.pex
index 67add011..676df50a 100644
Binary files a/scripts/tif__02006be6.pex and b/scripts/tif__02006be6.pex differ
diff --git a/scripts/tif__02006be8.pex b/scripts/tif__02006be8.pex
index 4541c3d8..920e7c5a 100644
Binary files a/scripts/tif__02006be8.pex and b/scripts/tif__02006be8.pex differ
diff --git a/scripts/tif__02006bf4.pex b/scripts/tif__02006bf4.pex
index cb424d5d..c33da135 100644
Binary files a/scripts/tif__02006bf4.pex and b/scripts/tif__02006bf4.pex differ
diff --git a/scripts/tif__02006bf5.pex b/scripts/tif__02006bf5.pex
index a50950e9..8f1a69e2 100644
Binary files a/scripts/tif__02006bf5.pex and b/scripts/tif__02006bf5.pex differ
diff --git a/scripts/tif__02007f36.pex b/scripts/tif__02007f36.pex
index 0ae9c3bb..e4475620 100644
Binary files a/scripts/tif__02007f36.pex and b/scripts/tif__02007f36.pex differ
diff --git a/scripts/tif__02007f37.pex b/scripts/tif__02007f37.pex
index a6984ecf..b41ebf56 100644
Binary files a/scripts/tif__02007f37.pex and b/scripts/tif__02007f37.pex differ
diff --git a/scripts/tif__02007f42.pex b/scripts/tif__02007f42.pex
index dccd1f53..ec0764d4 100644
Binary files a/scripts/tif__02007f42.pex and b/scripts/tif__02007f42.pex differ
diff --git a/scripts/tif__02007f5a.pex b/scripts/tif__02007f5a.pex
index d53b8b53..7a5cc29c 100644
Binary files a/scripts/tif__02007f5a.pex and b/scripts/tif__02007f5a.pex differ
diff --git a/scripts/tif__02007f63.pex b/scripts/tif__02007f63.pex
index 8dc20bef..06efdc03 100644
Binary files a/scripts/tif__02007f63.pex and b/scripts/tif__02007f63.pex differ
diff --git a/scripts/tif__02007f7c.pex b/scripts/tif__02007f7c.pex
index 0d3d4661..3af4546a 100644
Binary files a/scripts/tif__02007f7c.pex and b/scripts/tif__02007f7c.pex differ
diff --git a/scripts/tif__02007f80.pex b/scripts/tif__02007f80.pex
index 230bc08b..6ebcd965 100644
Binary files a/scripts/tif__02007f80.pex and b/scripts/tif__02007f80.pex differ
diff --git a/scripts/tif__02007fdd.pex b/scripts/tif__02007fdd.pex
index d9582fa3..75cc9823 100644
Binary files a/scripts/tif__02007fdd.pex and b/scripts/tif__02007fdd.pex differ
diff --git a/scripts/tif__0200931e.pex b/scripts/tif__0200931e.pex
index 5cf4fddc..a0dcfe67 100644
Binary files a/scripts/tif__0200931e.pex and b/scripts/tif__0200931e.pex differ
diff --git a/scripts/tif__02009322.pex b/scripts/tif__02009322.pex
index bbdc14f8..bd0fefb4 100644
Binary files a/scripts/tif__02009322.pex and b/scripts/tif__02009322.pex differ
diff --git a/scripts/tif__0200932b.pex b/scripts/tif__0200932b.pex
index db213757..8afcd413 100644
Binary files a/scripts/tif__0200932b.pex and b/scripts/tif__0200932b.pex differ
diff --git a/scripts/tif__02009330.pex b/scripts/tif__02009330.pex
index bb89c96e..fb0a97b9 100644
Binary files a/scripts/tif__02009330.pex and b/scripts/tif__02009330.pex differ
diff --git a/scripts/tif__0200933c.pex b/scripts/tif__0200933c.pex
index f8fc5044..62f8a93b 100644
Binary files a/scripts/tif__0200933c.pex and b/scripts/tif__0200933c.pex differ
diff --git a/scripts/tif__02009365.pex b/scripts/tif__02009365.pex
index 03808539..8ab09cc9 100644
Binary files a/scripts/tif__02009365.pex and b/scripts/tif__02009365.pex differ
diff --git a/scripts/tif__020093b5.pex b/scripts/tif__020093b5.pex
index cc929edd..498d0c7a 100644
Binary files a/scripts/tif__020093b5.pex and b/scripts/tif__020093b5.pex differ
diff --git a/scripts/tif__0200a6ec.pex b/scripts/tif__0200a6ec.pex
index 16f63c85..2544027a 100644
Binary files a/scripts/tif__0200a6ec.pex and b/scripts/tif__0200a6ec.pex differ
diff --git a/scripts/tif__0200a797.pex b/scripts/tif__0200a797.pex
index cb850a50..c5af86ad 100644
Binary files a/scripts/tif__0200a797.pex and b/scripts/tif__0200a797.pex differ
diff --git a/scripts/tif__0200baec.pex b/scripts/tif__0200baec.pex
index ea6b7749..80d06913 100644
Binary files a/scripts/tif__0200baec.pex and b/scripts/tif__0200baec.pex differ
diff --git a/scripts/tif__0200bafd.pex b/scripts/tif__0200bafd.pex
index 12edc615..9e28c90f 100644
Binary files a/scripts/tif__0200bafd.pex and b/scripts/tif__0200bafd.pex differ
diff --git a/scripts/tif__0200bb02.pex b/scripts/tif__0200bb02.pex
index 4c2ffa28..33f808a6 100644
Binary files a/scripts/tif__0200bb02.pex and b/scripts/tif__0200bb02.pex differ
diff --git a/scripts/tif__0200bb0a.pex b/scripts/tif__0200bb0a.pex
index 9c329d24..dc773fa9 100644
Binary files a/scripts/tif__0200bb0a.pex and b/scripts/tif__0200bb0a.pex differ
diff --git a/scripts/tif__0200bb19.pex b/scripts/tif__0200bb19.pex
index 96ce6946..a8b05ae7 100644
Binary files a/scripts/tif__0200bb19.pex and b/scripts/tif__0200bb19.pex differ
diff --git a/scripts/tif__0200bb1e.pex b/scripts/tif__0200bb1e.pex
index 3756cd37..daf7bbbb 100644
Binary files a/scripts/tif__0200bb1e.pex and b/scripts/tif__0200bb1e.pex differ
diff --git a/scripts/tif__0200bb21.pex b/scripts/tif__0200bb21.pex
index d10099b4..b4deddc9 100644
Binary files a/scripts/tif__0200bb21.pex and b/scripts/tif__0200bb21.pex differ
diff --git a/scripts/tif__0200bb23.pex b/scripts/tif__0200bb23.pex
index 1a8f7f75..21da075c 100644
Binary files a/scripts/tif__0200bb23.pex and b/scripts/tif__0200bb23.pex differ
diff --git a/scripts/tif__0200bb25.pex b/scripts/tif__0200bb25.pex
index af4a1ea6..78025758 100644
Binary files a/scripts/tif__0200bb25.pex and b/scripts/tif__0200bb25.pex differ
diff --git a/scripts/tif__0200bb26.pex b/scripts/tif__0200bb26.pex
index 43e2efca..e587aeb4 100644
Binary files a/scripts/tif__0200bb26.pex and b/scripts/tif__0200bb26.pex differ
diff --git a/scripts/tif__0200bc4e.pex b/scripts/tif__0200bc4e.pex
index daf6bb06..23d6c267 100644
Binary files a/scripts/tif__0200bc4e.pex and b/scripts/tif__0200bc4e.pex differ
diff --git a/scripts/tif__0200bc4f.pex b/scripts/tif__0200bc4f.pex
index 0a92e8af..e501e04f 100644
Binary files a/scripts/tif__0200bc4f.pex and b/scripts/tif__0200bc4f.pex differ
diff --git a/scripts/tif__0200bc50.pex b/scripts/tif__0200bc50.pex
index 9e23a178..7dbbff36 100644
Binary files a/scripts/tif__0200bc50.pex and b/scripts/tif__0200bc50.pex differ
diff --git a/scripts/tif__0200bc51.pex b/scripts/tif__0200bc51.pex
index 248eb2be..1bf15dac 100644
Binary files a/scripts/tif__0200bc51.pex and b/scripts/tif__0200bc51.pex differ
diff --git a/scripts/tif__0200bc52.pex b/scripts/tif__0200bc52.pex
index 9185f9ee..6ea8cc77 100644
Binary files a/scripts/tif__0200bc52.pex and b/scripts/tif__0200bc52.pex differ
diff --git a/scripts/tif__0200bc53.pex b/scripts/tif__0200bc53.pex
index ed4119a6..e4ea7802 100644
Binary files a/scripts/tif__0200bc53.pex and b/scripts/tif__0200bc53.pex differ
diff --git a/scripts/tif__0200bc75.pex b/scripts/tif__0200bc75.pex
index ed6d8751..23e5b82f 100644
Binary files a/scripts/tif__0200bc75.pex and b/scripts/tif__0200bc75.pex differ
diff --git a/scripts/tif__0200bc81.pex b/scripts/tif__0200bc81.pex
index 61d597b0..7cd06736 100644
Binary files a/scripts/tif__0200bc81.pex and b/scripts/tif__0200bc81.pex differ
diff --git a/scripts/tif__0200bc88.pex b/scripts/tif__0200bc88.pex
index f8d6e361..d8f11ce3 100644
Binary files a/scripts/tif__0200bc88.pex and b/scripts/tif__0200bc88.pex differ
diff --git a/scripts/tif__0200ce53.pex b/scripts/tif__0200ce53.pex
index 3233619b..c1d0df36 100644
Binary files a/scripts/tif__0200ce53.pex and b/scripts/tif__0200ce53.pex differ
diff --git a/scripts/tif__0200ce87.pex b/scripts/tif__0200ce87.pex
index c548015c..6854bfd9 100644
Binary files a/scripts/tif__0200ce87.pex and b/scripts/tif__0200ce87.pex differ
diff --git a/scripts/tif__0200cf0d.pex b/scripts/tif__0200cf0d.pex
index 110f098f..f0c3716d 100644
Binary files a/scripts/tif__0200cf0d.pex and b/scripts/tif__0200cf0d.pex differ
diff --git a/scripts/tif__0200cf13.pex b/scripts/tif__0200cf13.pex
index d3305ec2..1ee6db57 100644
Binary files a/scripts/tif__0200cf13.pex and b/scripts/tif__0200cf13.pex differ
diff --git a/scripts/tif__0200cf17.pex b/scripts/tif__0200cf17.pex
index 6a76c0bc..73b08c27 100644
Binary files a/scripts/tif__0200cf17.pex and b/scripts/tif__0200cf17.pex differ
diff --git a/scripts/tif__0200cf43.pex b/scripts/tif__0200cf43.pex
index 1e5e79d4..96f0f24d 100644
Binary files a/scripts/tif__0200cf43.pex and b/scripts/tif__0200cf43.pex differ
diff --git a/scripts/tif__0200cf50.pex b/scripts/tif__0200cf50.pex
index 3897d091..b5bd9b9c 100644
Binary files a/scripts/tif__0200cf50.pex and b/scripts/tif__0200cf50.pex differ
diff --git a/scripts/tif__0200cf5b.pex b/scripts/tif__0200cf5b.pex
index 89be3e76..fdcf55e9 100644
Binary files a/scripts/tif__0200cf5b.pex and b/scripts/tif__0200cf5b.pex differ
diff --git a/scripts/tif__0200cf5d.pex b/scripts/tif__0200cf5d.pex
index 8ad3b98d..402a20c2 100644
Binary files a/scripts/tif__0200cf5d.pex and b/scripts/tif__0200cf5d.pex differ
diff --git a/scripts/tif__0200cf5e.pex b/scripts/tif__0200cf5e.pex
index 61e18c42..0b36a3bf 100644
Binary files a/scripts/tif__0200cf5e.pex and b/scripts/tif__0200cf5e.pex differ
diff --git a/scripts/tif__0200e2ee.pex b/scripts/tif__0200e2ee.pex
index b3fbd86f..058bd969 100644
Binary files a/scripts/tif__0200e2ee.pex and b/scripts/tif__0200e2ee.pex differ
diff --git a/scripts/tif__0200e2ef.pex b/scripts/tif__0200e2ef.pex
index f628ffa3..10e57661 100644
Binary files a/scripts/tif__0200e2ef.pex and b/scripts/tif__0200e2ef.pex differ
diff --git a/scripts/tif__0200e2f0.pex b/scripts/tif__0200e2f0.pex
index f9b18943..27cbaef9 100644
Binary files a/scripts/tif__0200e2f0.pex and b/scripts/tif__0200e2f0.pex differ
diff --git a/scripts/tif__0200f6b1.pex b/scripts/tif__0200f6b1.pex
index e444d55d..27fe2d06 100644
Binary files a/scripts/tif__0200f6b1.pex and b/scripts/tif__0200f6b1.pex differ
diff --git a/scripts/tif__0200f6bc.pex b/scripts/tif__0200f6bc.pex
index b0b191bb..d69b8bc8 100644
Binary files a/scripts/tif__0200f6bc.pex and b/scripts/tif__0200f6bc.pex differ
diff --git a/scripts/tif__0200f6bd.pex b/scripts/tif__0200f6bd.pex
index ebb14bba..2c399b79 100644
Binary files a/scripts/tif__0200f6bd.pex and b/scripts/tif__0200f6bd.pex differ
diff --git a/scripts/tif__0200f6be.pex b/scripts/tif__0200f6be.pex
index 8d9c1422..53776318 100644
Binary files a/scripts/tif__0200f6be.pex and b/scripts/tif__0200f6be.pex differ
diff --git a/scripts/tif__0200f6c0.pex b/scripts/tif__0200f6c0.pex
index ede6cb81..be6ec5ec 100644
Binary files a/scripts/tif__0200f6c0.pex and b/scripts/tif__0200f6c0.pex differ
diff --git a/scripts/tif__0200f6cd.pex b/scripts/tif__0200f6cd.pex
index a983f7a5..4c6f83ed 100644
Binary files a/scripts/tif__0200f6cd.pex and b/scripts/tif__0200f6cd.pex differ
diff --git a/scripts/tif__0200f6ea.pex b/scripts/tif__0200f6ea.pex
index b762ec39..4f82dd35 100644
Binary files a/scripts/tif__0200f6ea.pex and b/scripts/tif__0200f6ea.pex differ
diff --git a/scripts/tif__0200f738.pex b/scripts/tif__0200f738.pex
index dfbe6360..50b02c89 100644
Binary files a/scripts/tif__0200f738.pex and b/scripts/tif__0200f738.pex differ
diff --git a/scripts/tif__0200f749.pex b/scripts/tif__0200f749.pex
index 216fb93f..9d213e6f 100644
Binary files a/scripts/tif__0200f749.pex and b/scripts/tif__0200f749.pex differ
diff --git a/scripts/tif__0200f74c.pex b/scripts/tif__0200f74c.pex
index 4efd224c..409efc19 100644
Binary files a/scripts/tif__0200f74c.pex and b/scripts/tif__0200f74c.pex differ
diff --git a/scripts/tif__0200f752.pex b/scripts/tif__0200f752.pex
index 216010d6..7823b730 100644
Binary files a/scripts/tif__0200f752.pex and b/scripts/tif__0200f752.pex differ
diff --git a/scripts/tif__0200f75b.pex b/scripts/tif__0200f75b.pex
index 9ae8ddd8..a8b282ca 100644
Binary files a/scripts/tif__0200f75b.pex and b/scripts/tif__0200f75b.pex differ
diff --git a/scripts/tif__0200f774.pex b/scripts/tif__0200f774.pex
index 168e30c6..292216eb 100644
Binary files a/scripts/tif__0200f774.pex and b/scripts/tif__0200f774.pex differ
diff --git a/scripts/tif__0200f77a.pex b/scripts/tif__0200f77a.pex
index 25aec0ce..ec5e7eef 100644
Binary files a/scripts/tif__0200f77a.pex and b/scripts/tif__0200f77a.pex differ
diff --git a/scripts/tif__0200f77d.pex b/scripts/tif__0200f77d.pex
index 3eccd9a4..e3ec222b 100644
Binary files a/scripts/tif__0200f77d.pex and b/scripts/tif__0200f77d.pex differ
diff --git a/scripts/tif__0200f7ab.pex b/scripts/tif__0200f7ab.pex
index 6f447b4f..2f57dfcf 100644
Binary files a/scripts/tif__0200f7ab.pex and b/scripts/tif__0200f7ab.pex differ
diff --git a/scripts/tif__0200f7ad.pex b/scripts/tif__0200f7ad.pex
index 8a0eed2e..8488a502 100644
Binary files a/scripts/tif__0200f7ad.pex and b/scripts/tif__0200f7ad.pex differ
diff --git a/scripts/tif__0200f7c7.pex b/scripts/tif__0200f7c7.pex
index 80958454..f11a4434 100644
Binary files a/scripts/tif__0200f7c7.pex and b/scripts/tif__0200f7c7.pex differ
diff --git a/scripts/tif__02010a72.pex b/scripts/tif__02010a72.pex
index 6e3a8123..9982d790 100644
Binary files a/scripts/tif__02010a72.pex and b/scripts/tif__02010a72.pex differ
diff --git a/scripts/tif__02010a77.pex b/scripts/tif__02010a77.pex
index 1edcb191..5cf6b0ee 100644
Binary files a/scripts/tif__02010a77.pex and b/scripts/tif__02010a77.pex differ
diff --git a/scripts/tif__02010ad2.pex b/scripts/tif__02010ad2.pex
index b658ae89..4fbe5075 100644
Binary files a/scripts/tif__02010ad2.pex and b/scripts/tif__02010ad2.pex differ
diff --git a/scripts/tif__02010ada.pex b/scripts/tif__02010ada.pex
index fde1caee..399607fa 100644
Binary files a/scripts/tif__02010ada.pex and b/scripts/tif__02010ada.pex differ
diff --git a/scripts/tif__02010b58.pex b/scripts/tif__02010b58.pex
index a3ff1d23..087d6df2 100644
Binary files a/scripts/tif__02010b58.pex and b/scripts/tif__02010b58.pex differ
diff --git a/scripts/tif__02010c07.pex b/scripts/tif__02010c07.pex
index eb00e074..96d87a61 100644
Binary files a/scripts/tif__02010c07.pex and b/scripts/tif__02010c07.pex differ
diff --git a/scripts/tif__02010c1d.pex b/scripts/tif__02010c1d.pex
index 3cdea0d6..13c542bd 100644
Binary files a/scripts/tif__02010c1d.pex and b/scripts/tif__02010c1d.pex differ
diff --git a/scripts/tif__02010c1f.pex b/scripts/tif__02010c1f.pex
index 62da72cc..1f641a27 100644
Binary files a/scripts/tif__02010c1f.pex and b/scripts/tif__02010c1f.pex differ
diff --git a/scripts/tif__02011a0e.pex b/scripts/tif__02011a0e.pex
index 0315361e..6d37152b 100644
Binary files a/scripts/tif__02011a0e.pex and b/scripts/tif__02011a0e.pex differ
diff --git a/scripts/tif__02011dd9.pex b/scripts/tif__02011dd9.pex
index 79bb34c0..0386001d 100644
Binary files a/scripts/tif__02011dd9.pex and b/scripts/tif__02011dd9.pex differ
diff --git a/scripts/tif__02011ddb.pex b/scripts/tif__02011ddb.pex
index 40b93e9c..2cb1e795 100644
Binary files a/scripts/tif__02011ddb.pex and b/scripts/tif__02011ddb.pex differ
diff --git a/scripts/tif__02011deb.pex b/scripts/tif__02011deb.pex
index 677eac51..caac910e 100644
Binary files a/scripts/tif__02011deb.pex and b/scripts/tif__02011deb.pex differ
diff --git a/scripts/tif__02011dff.pex b/scripts/tif__02011dff.pex
index a238276a..e1723dd2 100644
Binary files a/scripts/tif__02011dff.pex and b/scripts/tif__02011dff.pex differ
diff --git a/scripts/tif__02011ec4.pex b/scripts/tif__02011ec4.pex
index 51b301e2..345d1d66 100644
Binary files a/scripts/tif__02011ec4.pex and b/scripts/tif__02011ec4.pex differ
diff --git a/scripts/tif__02011ec7.pex b/scripts/tif__02011ec7.pex
index a78b2ef3..c114977d 100644
Binary files a/scripts/tif__02011ec7.pex and b/scripts/tif__02011ec7.pex differ
diff --git a/scripts/tif__02011ed7.pex b/scripts/tif__02011ed7.pex
index c9f70bae..089d6113 100644
Binary files a/scripts/tif__02011ed7.pex and b/scripts/tif__02011ed7.pex differ
diff --git a/scripts/tif__02011ee2.pex b/scripts/tif__02011ee2.pex
index b599f5e9..ec00116a 100644
Binary files a/scripts/tif__02011ee2.pex and b/scripts/tif__02011ee2.pex differ
diff --git a/scripts/tif__02011ee7.pex b/scripts/tif__02011ee7.pex
index 7c30b06e..36f0a2ca 100644
Binary files a/scripts/tif__02011ee7.pex and b/scripts/tif__02011ee7.pex differ
diff --git a/scripts/tif__02012841.pex b/scripts/tif__02012841.pex
index 6ce300ab..648f5edc 100644
Binary files a/scripts/tif__02012841.pex and b/scripts/tif__02012841.pex differ
diff --git a/scripts/tif__020131da.pex b/scripts/tif__020131da.pex
index 901cd864..bed005ae 100644
Binary files a/scripts/tif__020131da.pex and b/scripts/tif__020131da.pex differ
diff --git a/scripts/tif__020131f3.pex b/scripts/tif__020131f3.pex
index 91828d42..6896e20b 100644
Binary files a/scripts/tif__020131f3.pex and b/scripts/tif__020131f3.pex differ
diff --git a/scripts/tif__02013c20.pex b/scripts/tif__02013c20.pex
index 95174ec0..f2b446ed 100644
Binary files a/scripts/tif__02013c20.pex and b/scripts/tif__02013c20.pex differ
diff --git a/scripts/tif__02013c24.pex b/scripts/tif__02013c24.pex
index f63d7a44..2c5224f5 100644
Binary files a/scripts/tif__02013c24.pex and b/scripts/tif__02013c24.pex differ
diff --git a/scripts/tif__02013c2c.pex b/scripts/tif__02013c2c.pex
index 6f629e08..17fdca84 100644
Binary files a/scripts/tif__02013c2c.pex and b/scripts/tif__02013c2c.pex differ
diff --git a/scripts/tif__02013c34.pex b/scripts/tif__02013c34.pex
index d39d9685..128f6e48 100644
Binary files a/scripts/tif__02013c34.pex and b/scripts/tif__02013c34.pex differ
diff --git a/scripts/tif__02013c3e.pex b/scripts/tif__02013c3e.pex
index 0459d659..519450e9 100644
Binary files a/scripts/tif__02013c3e.pex and b/scripts/tif__02013c3e.pex differ
diff --git a/scripts/tif__020159e9.pex b/scripts/tif__020159e9.pex
index 7cce27dd..463e1e62 100644
Binary files a/scripts/tif__020159e9.pex and b/scripts/tif__020159e9.pex differ
diff --git a/scripts/tif__02015a1a.pex b/scripts/tif__02015a1a.pex
index 803d9177..fdcb340d 100644
Binary files a/scripts/tif__02015a1a.pex and b/scripts/tif__02015a1a.pex differ
diff --git a/scripts/tif__02016dd7.pex b/scripts/tif__02016dd7.pex
index d517216c..97a2e941 100644
Binary files a/scripts/tif__02016dd7.pex and b/scripts/tif__02016dd7.pex differ
diff --git a/scripts/tif__020177ed.pex b/scripts/tif__020177ed.pex
index 67c4a6cf..21d63791 100644
Binary files a/scripts/tif__020177ed.pex and b/scripts/tif__020177ed.pex differ
diff --git a/scripts/tif__020181d0.pex b/scripts/tif__020181d0.pex
index 51dfcf32..aed09abd 100644
Binary files a/scripts/tif__020181d0.pex and b/scripts/tif__020181d0.pex differ
diff --git a/scripts/tif__020181d1.pex b/scripts/tif__020181d1.pex
index 69f60234..c22b46be 100644
Binary files a/scripts/tif__020181d1.pex and b/scripts/tif__020181d1.pex differ
diff --git a/scripts/tif__020195ec.pex b/scripts/tif__020195ec.pex
index 90cd86a3..8bd403fa 100644
Binary files a/scripts/tif__020195ec.pex and b/scripts/tif__020195ec.pex differ
diff --git a/scripts/tif__020195ee.pex b/scripts/tif__020195ee.pex
index b7428623..a7229c75 100644
Binary files a/scripts/tif__020195ee.pex and b/scripts/tif__020195ee.pex differ
diff --git a/scripts/tif__02019faf.pex b/scripts/tif__02019faf.pex
index 860ee083..8b584837 100644
Binary files a/scripts/tif__02019faf.pex and b/scripts/tif__02019faf.pex differ
diff --git a/scripts/tif__02019fb2.pex b/scripts/tif__02019fb2.pex
index 18a3ffbe..c74e6770 100644
Binary files a/scripts/tif__02019fb2.pex and b/scripts/tif__02019fb2.pex differ
diff --git a/scripts/tif__0201a9ca.pex b/scripts/tif__0201a9ca.pex
index c0333a5a..137c94d1 100644
Binary files a/scripts/tif__0201a9ca.pex and b/scripts/tif__0201a9ca.pex differ
diff --git a/scripts/tif__0201a9cc.pex b/scripts/tif__0201a9cc.pex
index 111e0909..b3c0dce7 100644
Binary files a/scripts/tif__0201a9cc.pex and b/scripts/tif__0201a9cc.pex differ
diff --git a/scripts/tif__0201a9eb.pex b/scripts/tif__0201a9eb.pex
index 47c63206..7608b463 100644
Binary files a/scripts/tif__0201a9eb.pex and b/scripts/tif__0201a9eb.pex differ
diff --git a/scripts/tif__0201a9f0.pex b/scripts/tif__0201a9f0.pex
index 5183a980..af77a6b2 100644
Binary files a/scripts/tif__0201a9f0.pex and b/scripts/tif__0201a9f0.pex differ
diff --git a/scripts/tif__0201db37.pex b/scripts/tif__0201db37.pex
index 342f8cf3..f4ff39f6 100644
Binary files a/scripts/tif__0201db37.pex and b/scripts/tif__0201db37.pex differ
diff --git a/scripts/tif__0201db3f.pex b/scripts/tif__0201db3f.pex
index 6e06b7b3..eb60f89f 100644
Binary files a/scripts/tif__0201db3f.pex and b/scripts/tif__0201db3f.pex differ
diff --git a/scripts/tif__0201f9a8.pex b/scripts/tif__0201f9a8.pex
index 127146e3..8b780bc6 100644
Binary files a/scripts/tif__0201f9a8.pex and b/scripts/tif__0201f9a8.pex differ
diff --git a/scripts/tif__0201f9c9.pex b/scripts/tif__0201f9c9.pex
index 0685796b..4e6b067e 100644
Binary files a/scripts/tif__0201f9c9.pex and b/scripts/tif__0201f9c9.pex differ
diff --git a/scripts/tif__0201f9d5.pex b/scripts/tif__0201f9d5.pex
index b312c641..aebfc957 100644
Binary files a/scripts/tif__0201f9d5.pex and b/scripts/tif__0201f9d5.pex differ
diff --git a/scripts/webdestructiblescript.pex b/scripts/webdestructiblescript.pex
index 8588f75b..323d26a6 100644
Binary files a/scripts/webdestructiblescript.pex and b/scripts/webdestructiblescript.pex differ
diff --git a/source/scripts/EnderalUpgradeAlias.psc b/source/scripts/EnderalUpgradeAlias.psc
index 81208b24..a400ee21 100644
--- a/source/scripts/EnderalUpgradeAlias.psc
+++ b/source/scripts/EnderalUpgradeAlias.psc
@@ -7,7 +7,7 @@ float fPatchVersion
 Event OnInit()
 
 	; MQP01
-	if (Game.GetForm(0x46F1A) as Quest).GetStageDone(10)
+	if (Game.GetForm(0x46F1A) as Quest).IsStageDone(10)
 	
 		While Utility.IsInMenuMode()
 			Utility.WaitMenuMode(0.1)
diff --git a/source/scripts/_00E_AffinityControl.psc b/source/scripts/_00E_AffinityControl.psc
index 7548ce34..82356f97 100644
--- a/source/scripts/_00E_AffinityControl.psc
+++ b/source/scripts/_00E_AffinityControl.psc
@@ -388,7 +388,7 @@ Function GetPlayerClass()
             _00E_Game_sUnlockedAffinity.Show()
             UIQuestCompleteM.Play(PlayerREF)
             _00E_EPHandler.GiveEP(450)
-            NQ31.SetStage(10)
+            NQ31.SetCurrentStageID(10)
         EndIf
     EndIf
 
diff --git a/source/scripts/_00_complexsetstageonread.psc b/source/scripts/_00_complexsetstageonread.psc
index 6d57cd60..a1d2b4e1 100644
--- a/source/scripts/_00_complexsetstageonread.psc
+++ b/source/scripts/_00_complexsetstageonread.psc
@@ -5,7 +5,7 @@ Event OnRead()
 	if !bDone
 		
 		If bSetStage
-			__Config_QuestToSet.SetStage(__Config_iStageToSet)
+			__Config_QuestToSet.SetCurrentStageID(__Config_iStageToSet)
 		EndIf
 		
 		If bDisplayObjective && !__Config_QuestToSet.IsObjectiveCompleted(__Config_iDisplayObjectiveIndex)
diff --git a/source/scripts/_00e_ark_nq_korflightactivatorscript.psc b/source/scripts/_00e_ark_nq_korflightactivatorscript.psc
index bb5df07c..05411af0 100644
--- a/source/scripts/_00e_ark_nq_korflightactivatorscript.psc
+++ b/source/scripts/_00e_ark_nq_korflightactivatorscript.psc
@@ -22,7 +22,7 @@ FadeToBlackHoldIMod.Apply()
 PlayerREF.MoveTo(LandingMarkerKor)
 ;Myrad.MoveTo(LandingMarkerKor)
 GameHour.SetValue(19.4)
-Ark_NQ_IsleOfKor.SetStage(20)
+Ark_NQ_IsleOfKor.SetCurrentStageID(20)
 FadeToBlackHoldImod.Remove()
 ;FadeToBlackBackImod.Apply()
 ;Myrad.PlayIdleWithTarget(GroundDismount, PlayerREF)
diff --git a/source/scripts/_00e_ark_templedoorsc.psc b/source/scripts/_00e_ark_templedoorsc.psc
index a8529bc7..dfa8719f 100644
--- a/source/scripts/_00e_ark_templedoorsc.psc
+++ b/source/scripts/_00e_ark_templedoorsc.psc
@@ -15,7 +15,7 @@ Event OnActivate(ObjectReference akActionRef)
 
 	If Self.IsActivationBlocked()
 		if akActionRef == PlayerREF
-			if MQ03.GetStage() >= 10
+			if MQ03.GetCurrentStageID() >= 10
 				Self.BlockActivation(False)
 				Self.Activate(PlayerREF, true)
 			Else
diff --git a/source/scripts/_00e_ark_travelcrossroadssc.psc b/source/scripts/_00e_ark_travelcrossroadssc.psc
index be605d89..5c1b0d2f 100644
--- a/source/scripts/_00e_ark_travelcrossroadssc.psc
+++ b/source/scripts/_00e_ark_travelcrossroadssc.psc
@@ -8,10 +8,10 @@ import UIExtensions
 
 Event OnActivate(ObjectReference akActionRef)
     if akActionRef == PlayerREF
-        if MQ14.GetStage() < 20 && MQ03.GetStage() > 0 && !(MQ12b.GetStage() >= 15 && MQ12c.GetStage() < 5) && (_00E_TeleportGlobal.GetValueInt() == 0)
+        if MQ14.GetCurrentStageID() < 20 && MQ03.GetCurrentStageID() > 0 && !(MQ12b.GetCurrentStageID() >= 15 && MQ12c.GetCurrentStageID() < 5) && (_00E_TeleportGlobal.GetValueInt() == 0)
             Game.RequestAutoSave()
             ShowTravelMenu()  
-        Elseif MQ12b.GetStage() == 10
+        Elseif MQ12b.GetCurrentStageID() == 10
             ShowMQ12bTravelMenu()
         Else
             _00E_FastTravel_Ark_CantTravelRightNow.Show()
@@ -92,7 +92,7 @@ Function ShowTravelMenu()
 	EndIf
 
 	If !((iListButton == 5 || iListButton == 6) || (iListButton == 4 || iListButton == 5))
-		If MQ04.GetStage() > 5 && !(MQ04.IsCompleted()) && !(MQ04.IsObjectiveCompleted(25))
+		If MQ04.GetCurrentStageID() > 5 && !(MQ04.IsCompleted()) && !(MQ04.IsObjectiveCompleted(25))
 			_00E_EPHandler.GiveEP(100)
 			MQ04.SetObjectiveCompleted(25)
 		EndIf
diff --git a/source/scripts/_00e_barddialoguefunctions.psc b/source/scripts/_00e_barddialoguefunctions.psc
index 75ce4484..c3b3ece3 100644
--- a/source/scripts/_00e_barddialoguefunctions.psc
+++ b/source/scripts/_00e_barddialoguefunctions.psc
@@ -80,7 +80,7 @@ Function PrepareAudience(Int iAudienceInitialStage) ; A song is about to start,
 			EndIf
 
 			If iAudienceInitialStage > 0
-				BardAudience.SetStage(iAudienceInitialStage)
+				BardAudience.SetCurrentStageID(iAudienceInitialStage)
 			EndIf
 		EndIf
 	EndIf
@@ -99,9 +99,9 @@ Function CheerAudience() ; When a song ends normally, time for the audience to c
 	SendModEvent("BardSongApplaud")
 
 	If IsQuestAudienceLocation() &&  BardAudience.IsRunning()
-		Int iCurrentAudienceStage = BardAudience.GetStage()
+		Int iCurrentAudienceStage = BardAudience.GetCurrentStageID()
 		If iCurrentAudienceStage >= 10 && iCurrentAudienceStage <= 20
-			BardAudience.SetStage(100)
+			BardAudience.SetCurrentStageID(100)
 			bQuestAudienceCheering = True
 		EndIf
 	EndIf
@@ -114,7 +114,7 @@ Function OnSongEnd() ; When a song ends normally or is interrupted. Called from
 		akBard.PlayIdle(IdleStop)
 	EndIf
 	SendModEvent("BardSongEnded")
-	If bSongHasQuestAudience == False && BardAudience.IsRunning() && BardAudience.GetStage() < 100
+	If bSongHasQuestAudience == False && BardAudience.IsRunning() && BardAudience.GetCurrentStageID() < 100
 		BardAudience.Stop()
 	EndIf
 	If akBard
diff --git a/source/scripts/_00e_bedscript.psc b/source/scripts/_00e_bedscript.psc
index 49074464..3efaee0e 100644
--- a/source/scripts/_00e_bedscript.psc
+++ b/source/scripts/_00e_bedscript.psc
@@ -11,7 +11,7 @@ Event OnActivate(ObjectReference akActionRef)
     If akActionRef == PlayerREF && _00E_PlayerhousingMaster.ReferenceCanBeActivated(Self) && bActivationBlocked == False
     	bActivationBlocked = True
 
-        If MQ14.GetStage() < 20
+        If MQ14.GetCurrentStageID() < 20
             Game.SetInChargen(False, False, False)
             Self.Activate(PlayerREF, True)
             Game.SetInChargen(False, True, False)
diff --git a/source/scripts/_00e_bellhammersc.psc b/source/scripts/_00e_bellhammersc.psc
index 897a8393..82b28ec2 100644
--- a/source/scripts/_00e_bellhammersc.psc
+++ b/source/scripts/_00e_bellhammersc.psc
@@ -3,8 +3,8 @@ Scriptname _00E_BellhammerSC extends ObjectReference
 Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer)
 
   If akNewContainer == PlayerREF
-  	if MQ07b.GetStage() < 51 
-		MQ07b.SetStage(51)
+  	if MQ07b.GetCurrentStageID() < 51 
+		MQ07b.SetCurrentStageID(51)
 	EndIf
   EndIf
   
diff --git a/source/scripts/_00e_butcherofarkbookscript.psc b/source/scripts/_00e_butcherofarkbookscript.psc
index 96448576..7a6d2c02 100644
--- a/source/scripts/_00e_butcherofarkbookscript.psc
+++ b/source/scripts/_00e_butcherofarkbookscript.psc
@@ -2,8 +2,8 @@ Scriptname _00E_ButcherOfArkBookScript extends ObjectReference
 
 Event OnRead()
 
-	if NQ25.GetStage() < 5
-		NQ25.SetStage(5)
+	if NQ25.GetCurrentStageID() < 5
+		NQ25.SetCurrentStageID(5)
 	endif
 	
 	if ThisPart.GetValueInt() == 0
@@ -17,7 +17,7 @@ Event OnRead()
 				NQ25.SetObjectiveDisplayed(10, 0, 0)
 				NQ25.SetObjectiveDisplayed(20, 1, 1)
 				NQ25.SetObjectiveCompleted(20)
-				NQ25.SetStage(10)
+				NQ25.SetCurrentStageID(10)
 			endif
 		else
 			if _00E_NQ25_BooksRead.GetValueInt() < 10
diff --git a/source/scripts/_00e_caliafollowtriggerscript.psc b/source/scripts/_00e_caliafollowtriggerscript.psc
index 44f76815..e4246157 100644
--- a/source/scripts/_00e_caliafollowtriggerscript.psc
+++ b/source/scripts/_00e_caliafollowtriggerscript.psc
@@ -26,7 +26,7 @@ EndEvent
 
 Function SendEnterEvent()
 
-	If (CurrentQuest.GetStage() >= ValidStageMin ) && (CurrentQuest.GetStage() < ValidStageMax ) 
+	If (CurrentQuest.GetCurrentStageID() >= ValidStageMin ) && (CurrentQuest.GetCurrentStageID() < ValidStageMax ) 
 
 		bool bWasZero 
 
@@ -72,7 +72,7 @@ EndFunction
 
 Function SendExitEvent()
 
-	If (CurrentQuest.GetStage() >= ValidStageMin ) && (CurrentQuest.GetStage() < ValidStageMax ) 
+	If (CurrentQuest.GetCurrentStageID() >= ValidStageMin ) && (CurrentQuest.GetCurrentStageID() < ValidStageMax ) 
 
 		If InTrigger == True
 			TravelStateVariable.Mod(-1)
diff --git a/source/scripts/_00e_capitalcityualjaanvuulpotionsc.psc b/source/scripts/_00e_capitalcityualjaanvuulpotionsc.psc
index 880f7924..f4e7bf9a 100644
--- a/source/scripts/_00e_capitalcityualjaanvuulpotionsc.psc
+++ b/source/scripts/_00e_capitalcityualjaanvuulpotionsc.psc
@@ -16,7 +16,7 @@ Event OnSleepStart(float afSleepStartTime, float afDesiredSleepEndTime)
     ; Dispel this effect when two days are passed (and the player
     ; goes to sleep -- for technical reasons).
 
-    if NQ33.GetStage() >= 5
+    if NQ33.GetCurrentStageID() >= 5
         UnregisterForSleep()
         Dispel()
     endif
diff --git a/source/scripts/_00e_chestanddoorlockscript.psc b/source/scripts/_00e_chestanddoorlockscript.psc
index 29d81187..08af98b7 100644
--- a/source/scripts/_00e_chestanddoorlockscript.psc
+++ b/source/scripts/_00e_chestanddoorlockscript.psc
@@ -120,7 +120,7 @@ EndFunction
 
 Bool Function _IsInSiege()
 	Quest qSiegeQuest = Game.GetForm(0x0002EBAD) as Quest
-	Int siegeStage = qSiegeQuest.GetStage()
+	Int siegeStage = qSiegeQuest.GetCurrentStageID()
 	Return (siegeStage >= 5 && siegeStage <= 125)
 EndFunction
 
diff --git a/source/scripts/_00e_class_openclassmenuscript.psc b/source/scripts/_00e_class_openclassmenuscript.psc
index a6bff738..1178bd9f 100644
--- a/source/scripts/_00e_class_openclassmenuscript.psc
+++ b/source/scripts/_00e_class_openclassmenuscript.psc
@@ -15,13 +15,13 @@ Event OnEffectStart(Actor TheTarget, Actor TheCaster)
 	
 	Bool bDoSettleDownWait = True
 
-	If (MQP03.GetStage() <= 15) && (MQP03.IsRunning())
+	If (MQP03.GetCurrentStageID() <= 15) && (MQP03.IsRunning())
 	
 		_00E_Class_MenuIMODIntro.Apply()
 		Wait(0.5)
 		PlayerREF.MoveTo(MQP03_PlayerStartMarker)
 		PlayerREF.SetAlpha(1.0)
-		MQP03.SetStage(20)
+		MQP03.SetCurrentStageID(20)
 		
 	Else
 	
diff --git a/source/scripts/_00e_complex_addsilencesc.psc b/source/scripts/_00e_complex_addsilencesc.psc
index 07b2ff9d..40a8413c 100644
--- a/source/scripts/_00e_complex_addsilencesc.psc
+++ b/source/scripts/_00e_complex_addsilencesc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_Complex_AddSilenceSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	If akActionRef == PlayerREF
-		If (__Config_QuestToSet.GetStage() >= __Config_iMinStage) && (__Config_QuestToSet.GetStage() <= __Config_iMaxStage) 
+		If (__Config_QuestToSet.GetCurrentStageID() >= __Config_iMinStage) && (__Config_QuestToSet.GetCurrentStageID() <= __Config_iMaxStage) 
 			_00E_SilenceLongTransitionHighPriority.Add()
 		EndIf
 	EndIf
diff --git a/source/scripts/_00e_complex_blockidlechattersc.psc b/source/scripts/_00e_complex_blockidlechattersc.psc
index 6f5f3588..29850746 100644
--- a/source/scripts/_00e_complex_blockidlechattersc.psc
+++ b/source/scripts/_00e_complex_blockidlechattersc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_Complex_BlockIdleChatterSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == PlayerREF
-		if (__Config_QuestToSet.GetStage() >= 5) && (__Config_QuestToSet.GetStage() < __Config_iMaxStage)
+		if (__Config_QuestToSet.GetCurrentStageID() >= 5) && (__Config_QuestToSet.GetCurrentStageID() < __Config_iMaxStage)
 			AllowIdleChatter.SetValue(0)
 		EndIf
 	EndIf
diff --git a/source/scripts/_00e_complex_portnpcsforquestsc.psc b/source/scripts/_00e_complex_portnpcsforquestsc.psc
index 7b5160fc..c7beaf64 100644
--- a/source/scripts/_00e_complex_portnpcsforquestsc.psc
+++ b/source/scripts/_00e_complex_portnpcsforquestsc.psc
@@ -8,7 +8,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == PlayerREF && !bDone
 	
-		if QuestToSet.GetStage() >= iStageMin && QuestToSet.GetStage() <= iStageMax
+		if QuestToSet.GetCurrentStageID() >= iStageMin && QuestToSet.GetCurrentStageID() <= iStageMax
 		
 			bDone = True
 			Actor01Ref.MoveTo(PlayerREF)
diff --git a/source/scripts/_00e_complex_startscenesc.psc b/source/scripts/_00e_complex_startscenesc.psc
index cd8106e0..cac0ed13 100644
--- a/source/scripts/_00e_complex_startscenesc.psc
+++ b/source/scripts/_00e_complex_startscenesc.psc
@@ -4,7 +4,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	If akActionRef == PlayerREF
 		If __Config_bStageRequired
-			If __Config_ParentQuest.GetStage() == __Config_iSceneStage
+			If __Config_ParentQuest.GetCurrentStageID() == __Config_iSceneStage
 				__Config_SceneToPlay.ForceStart()
 				If __Config_DeleteAfterTrigger
 					Self.Delete()
diff --git a/source/scripts/_00e_complexscenetriggerscript.psc b/source/scripts/_00e_complexscenetriggerscript.psc
index 22c0316c..af707a40 100644
--- a/source/scripts/_00e_complexscenetriggerscript.psc
+++ b/source/scripts/_00e_complexscenetriggerscript.psc
@@ -8,7 +8,7 @@ Auto State WaitingForTrigger
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    if ((QueststageForStart == QuestForScene.GetStage()) && !Done) || (!Done && !Config_StageRequired)
+    if ((QueststageForStart == QuestForScene.GetCurrentStageID()) && !Done) || (!Done && !Config_StageRequired)
         
         if Config_NotTriggeredByPlayer == True
             if akActionRef == TriggerActor
diff --git a/source/scripts/_00e_complexsetstageonaliasdeath.psc b/source/scripts/_00e_complexsetstageonaliasdeath.psc
index 0f328867..d2eb31fc 100644
--- a/source/scripts/_00e_complexsetstageonaliasdeath.psc
+++ b/source/scripts/_00e_complexsetstageonaliasdeath.psc
@@ -1,8 +1,8 @@
 Scriptname _00E_ComplexSetStageOnAliasDeath extends ReferenceAlias  
 
 Event OnDeath(Actor akKiller)
-	if (questToSet.getStage() == requiredStage)
-		questToSet.setStage(desiredStage)
+	if (questToSet.GetCurrentStageID() == requiredStage)
+		questToSet.SetCurrentStageID(desiredStage)
 	Endif
 Endevent
 
diff --git a/source/scripts/_00e_complexstartscenescript.psc b/source/scripts/_00e_complexstartscenescript.psc
index c367c2ee..69fa78f6 100644
--- a/source/scripts/_00e_complexstartscenescript.psc
+++ b/source/scripts/_00e_complexstartscenescript.psc
@@ -4,7 +4,7 @@ Scriptname _00E_ComplexStartSceneScript extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-if (akActionRef == Game.GetPlayer()) && (ParentQuest.GetStage() == StageRequiredToStartScene)
+if (akActionRef == Game.GetPlayer()) && (ParentQuest.GetCurrentStageID() == StageRequiredToStartScene)
 	if Repeatable == False
 		if Done == False
 			SceneToStart.ForceStart()
diff --git a/source/scripts/_00e_cqc02_caliascuilasc.psc b/source/scripts/_00e_cqc02_caliascuilasc.psc
index 66d774a2..2bae2fde 100644
--- a/source/scripts/_00e_cqc02_caliascuilasc.psc
+++ b/source/scripts/_00e_cqc02_caliascuilasc.psc
@@ -4,7 +4,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	If akActionRef == PlayerREF && (_00E_MC_CaliaRef.GetParentCell() != SuntempleTraining) 
 		
-		if !bDone && (CQC02.GetStage() >= 10 && CQC02.GetStage() <= 15) && CQC02_SC01_CaliaTowerScene01.IsPlaying()
+		if !bDone && (CQC02.GetCurrentStageID() >= 10 && CQC02.GetCurrentStageID() <= 15) && CQC02_SC01_CaliaTowerScene01.IsPlaying()
 		
 			bDone = True
 			_00E_MC_CaliaRef.MoveTo(CQC02_MarkerREF)
diff --git a/source/scripts/_00e_cqc02_functions.psc b/source/scripts/_00e_cqc02_functions.psc
index 3cccc740..63b99c64 100644
--- a/source/scripts/_00e_cqc02_functions.psc
+++ b/source/scripts/_00e_cqc02_functions.psc
@@ -24,7 +24,7 @@ Function MoveCaliaAndPlayer()
 	_00E_MC_CaliaREF.MoveTo(CQC02_MarkerREF)
 	PlayerREF.MoveTo(CQC02_SC01_PlayerMarkerREF)
 	
-	SetStage(15)
+	SetCurrentStageID(15)
 	
 EndFunction
 
diff --git a/source/scripts/_00e_cqc04_addsilencesc.psc b/source/scripts/_00e_cqc04_addsilencesc.psc
index 2304cf24..9486caca 100644
--- a/source/scripts/_00e_cqc04_addsilencesc.psc
+++ b/source/scripts/_00e_cqc04_addsilencesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_CQC04_AddSilenceSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If (CQC04.GetStage() < 15) && (akActionRef == Game.GetPlayer()) && CQC04.IsRunning()
+	If (CQC04.GetCurrentStageID() < 15) && (akActionRef == Game.GetPlayer()) && CQC04.IsRunning()
 		AllowIdleChatter.SetValue(0)
 		_00E_SilenceTransitionHighPriority.Add()
 	EndIf
diff --git a/source/scripts/_00e_cqc05_functions.psc b/source/scripts/_00e_cqc05_functions.psc
index 8c32b970..22d23105 100644
--- a/source/scripts/_00e_cqc05_functions.psc
+++ b/source/scripts/_00e_cqc05_functions.psc
@@ -242,8 +242,8 @@ Function Reequip()
 	_00E_MC_CaliaREF.SetOutfit(_00E_MC_Calia_Outfit)
 	_00E_MC_CaliaREF.AddItem(_01E_20Huetergrossschwert)
 	_00E_MC_CaliaREF.EquipItem(_01E_20Huetergrossschwert)
-	SetStage(55)
-	MQ13a.SetStage(80)
+	SetCurrentStageID(55)
+	MQ13a.SetCurrentStageID(80)
 	
 EndFunction
 
diff --git a/source/scripts/_00e_cqc05_losegamewhennearsc.psc b/source/scripts/_00e_cqc05_losegamewhennearsc.psc
index bd7e504e..7cad01f4 100644
--- a/source/scripts/_00e_cqc05_losegamewhennearsc.psc
+++ b/source/scripts/_00e_cqc05_losegamewhennearsc.psc
@@ -7,7 +7,7 @@ Scriptname _00E_CQC05_LoseGameWhenNearSC extends ObjectReference
 
 Event OnUpdate()
 
-	If CQC05.GetStage() < 35
+	If CQC05.GetCurrentStageID() < 35
 
 		if PlayerREF.GetDistance(_00E_SC_KurmaiREF) <= 1300
 			Game.QuitToMainMenu()
diff --git a/source/scripts/_00e_cqc06_getcaliasc.psc b/source/scripts/_00e_cqc06_getcaliasc.psc
index e772c9ce..d377ac4a 100644
--- a/source/scripts/_00e_cqc06_getcaliasc.psc
+++ b/source/scripts/_00e_cqc06_getcaliasc.psc
@@ -28,17 +28,17 @@ Function CheckForCalia()
 
 ; Enabling Calia and set stage.
 
-	If !bDone && CQC06.GetStage() == 5
+	If !bDone && CQC06.GetCurrentStageID() == 5
 		If (GameHour.GetValue() < 18) && (GameHour.GetValue() > 4)
 			_00E_CQC06_sComeBackLater.Show()
 		Else
-			CQC06.SetStage(10)
+			CQC06.SetCurrentStageID(10)
 			bDone = True
 		EndIf
 	EndIf
 
 	; Making sure that the scene is actually running.
-	If (CQC06.GetStage() >= 10 || bDone) && CQC06.GetStage() < 25
+	If (CQC06.GetCurrentStageID() >= 10 || bDone) && CQC06.GetCurrentStageID() < 25
 		If !CQC06.IsCompleted() && !CQC06_SC01_CaliaGoToTavern.IsPlaying()
 			CQC06_SC01_CaliaGoToTavern.ForceStart()
 		EndIf
diff --git a/source/scripts/_00e_cqc06_sc01_playerdancesc.psc b/source/scripts/_00e_cqc06_sc01_playerdancesc.psc
index da1a0834..1f29fb89 100644
--- a/source/scripts/_00e_cqc06_sc01_playerdancesc.psc
+++ b/source/scripts/_00e_cqc06_sc01_playerdancesc.psc
@@ -6,7 +6,7 @@ Scriptname _00E_CQC06_SC01_PlayerDanceSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if CQC06.GetStage() == 20 && akActionRef == PlayerREF
+	if CQC06.GetCurrentStageID() == 20 && akActionRef == PlayerREF
 		CQC06.StartPlayerDance()
 	EndIf
 
diff --git a/source/scripts/_00e_cqj01_dancingnomadsc.psc b/source/scripts/_00e_cqj01_dancingnomadsc.psc
index 8b41532a..58e88058 100644
--- a/source/scripts/_00e_cqj01_dancingnomadsc.psc
+++ b/source/scripts/_00e_cqj01_dancingnomadsc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_CQJ01_DancingNomadSC extends ObjectReference
 
 Event OnTriggerEnter (ObjectReference akActionREF)
 
-	If akActionREF == PlayerREF && (CQJ01.GetStage() >= 10) && !(CQJ01.IsCompleted())
+	If akActionREF == PlayerREF && (CQJ01.GetCurrentStageID() >= 10) && !(CQJ01.IsCompleted())
 		If !CQJ01_SC01_DancingNomadScene.IsPlaying()
 			CQJ01.EnableAcquaintanceAndStartSC01()
 		EndIf
@@ -14,7 +14,7 @@ EndEvent
 
 Event OnTriggerLeave(ObjectReference akActionRef)
 
-	If (akActionREF == PlayerREF) && (CQJ01.GetStage() >= 10) && !(CQJ01.IsCompleted())
+	If (akActionREF == PlayerREF) && (CQJ01.GetCurrentStageID() >= 10) && !(CQJ01.IsCompleted())
 		If CQJ01_SC01_DancingNomadScene.IsPlaying()
 			CQJ01_SC01_DancingNomadScene.Stop()
 		EndIf
diff --git a/source/scripts/_00e_cqj02_getjesparsc.psc b/source/scripts/_00e_cqj02_getjesparsc.psc
index c7e70535..4c081935 100644
--- a/source/scripts/_00e_cqj02_getjesparsc.psc
+++ b/source/scripts/_00e_cqj02_getjesparsc.psc
@@ -6,10 +6,10 @@ Scriptname _00E_CQJ02_GetJesparSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If akActionRef == PlayerREF && !bDone && CQJ02.GetStage() == 10
+	If akActionRef == PlayerREF && !bDone && CQJ02.GetCurrentStageID() == 10
 		If (GameHour.GetValue() < 18) && (GameHour.GetValue() > 5)
 			_00E_CQJ02_sComeBackLater.Show()
-		ElseIf (MQ07a.IsRunning() && (MQ07a.GetStage() >= 30)) && !(MQ07a.IsCompleted())
+		ElseIf (MQ07a.IsRunning() && (MQ07a.GetCurrentStageID() >= 30)) && !(MQ07a.IsCompleted())
 			_00E_CQJ02_sPlayerHasToFinishMQ07a.Show()
 		Else
 			CQJ02.EnableJesparAndStartSC02()
diff --git a/source/scripts/_00e_cqj02_jespartowerfailsavesc.psc b/source/scripts/_00e_cqj02_jespartowerfailsavesc.psc
index 2e1c947c..e85f6804 100644
--- a/source/scripts/_00e_cqj02_jespartowerfailsavesc.psc
+++ b/source/scripts/_00e_cqj02_jespartowerfailsavesc.psc
@@ -10,7 +10,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 			CQJ02 = Game.GetFormFromFile(0x0013C942, "Skyrim.esm") as _00E_CQJ02_Functions
 		EndIf
 	
-		If CQJ02.GetStage() == 15 && CQJ02.IsRunning()
+		If CQJ02.GetCurrentStageID() == 15 && CQJ02.IsRunning()
 		
 			bDone = True
 			
diff --git a/source/scripts/_00e_cqj02_playersc.psc b/source/scripts/_00e_cqj02_playersc.psc
index d5896667..768bfec3 100644
--- a/source/scripts/_00e_cqj02_playersc.psc
+++ b/source/scripts/_00e_cqj02_playersc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_CQJ02_PlayerSC Extends ReferenceAlias
 
 Event OnInit()
 
-	If CQJ02.GetStage() == 5 && !bDone
+	If CQJ02.GetCurrentStageID() == 5 && !bDone
 		Actor Player = Game.GetPlayer()
 		If (Player.GetCurrentLocation() == CapitalCityLocation || Player.GetCurrentLocation() == _00E_SuntempleLocation) && (!Player.GetWorldspace() != Akropolis && !(Player.IsInInterior()))
 			CQJ02.SpawnMessengerKid()
@@ -14,7 +14,7 @@ EndEvent
 
 Event OnLocationChange(Location akOldLoc, Location akNewLoc)
 
-	If CQJ02.GetStage() == 5 && !bDone
+	If CQJ02.GetCurrentStageID() == 5 && !bDone
 		Actor Player = Game.GetPlayer()
 		If (akNewLoc == CapitalCityLocation || akNewLoc == _00E_SuntempleLocation) && (Player.GetWorldspace() != Akropolis && !(Player.IsInInterior()))
 			CQJ02.SpawnMessengerKid()
diff --git a/source/scripts/_00e_cqj02_sc02_musiccontrolsc.psc b/source/scripts/_00e_cqj02_sc02_musiccontrolsc.psc
index 458822c4..a7ba41c6 100644
--- a/source/scripts/_00e_cqj02_sc02_musiccontrolsc.psc
+++ b/source/scripts/_00e_cqj02_sc02_musiccontrolsc.psc
@@ -6,7 +6,7 @@ Scriptname _00E_CQJ02_SC02_MusicControlSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if akActionRef == PlayerREF && (CQJ02.GetStage() >= 15 && !CQJ02.IsCompleted())
+	if akActionRef == PlayerREF && (CQJ02.GetCurrentStageID() >= 15 && !CQJ02.IsCompleted())
 		_00E_SilenceTransitionLowPriority02.Add()
 	EndIf
 
@@ -15,7 +15,7 @@ EndEvent
 
 Event OnTriggerLeave(ObjectReference akActionRef)
 
-	if akActionRef == PlayerREF && (CQJ02.GetStage() >= 15 && !CQJ02.IsCompleted())
+	if akActionRef == PlayerREF && (CQJ02.GetCurrentStageID() >= 15 && !CQJ02.IsCompleted())
 		_00E_SilenceTransitionLowPriority02.Remove()
 	ElseIf akActionRef == PlayerREF && CQJ02.IsCompleted()
 		_00E_SilenceTransitionLowPriority02.Remove()
diff --git a/source/scripts/_00e_cqj04_checktavernsc.psc b/source/scripts/_00e_cqj04_checktavernsc.psc
index 1950ac15..1dacbcd4 100644
--- a/source/scripts/_00e_cqj04_checktavernsc.psc
+++ b/source/scripts/_00e_cqj04_checktavernsc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_CQJ04_CheckTavernSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	If akActionRef == PlayerREF	&& !bDone
-		if CQJ04.GetStage() == 10
+		if CQJ04.GetCurrentStageID() == 10
 			Utility.Wait(6)
 			if bIsFalseDog
 				CQJ04.bCheckedFalseDog = True
diff --git a/source/scripts/_00e_cqj04_functions.psc b/source/scripts/_00e_cqj04_functions.psc
index af71e2bd..b66b1443 100644
--- a/source/scripts/_00e_cqj04_functions.psc
+++ b/source/scripts/_00e_cqj04_functions.psc
@@ -44,7 +44,7 @@ Function TeleportJespar()
 
 	CQJ04_SC01_Leandra001.SetOutfit(_00E_UCProstituteOutfit)
 
-	If GetStage() == 30
+	If GetCurrentStageID() == 30
 		_00E_PlayerFunctions.GetTeleportControl().TeleportNPC(_00E_MC_JesparREF, _00E_NPCDumpMarker)
 	Else
 		; Do Nothing
@@ -52,7 +52,7 @@ Function TeleportJespar()
 	
 	_00E_EPHandler.GiveEP(__iRewardEXP)
 	
-	Self.SetStage(35)
+	Self.SetCurrentStageID(35)
 	
 EndFunction
 
diff --git a/source/scripts/_00e_cqj05_functions.psc b/source/scripts/_00e_cqj05_functions.psc
index e89b1b22..f1cacdd8 100644
--- a/source/scripts/_00e_cqj05_functions.psc
+++ b/source/scripts/_00e_cqj05_functions.psc
@@ -139,8 +139,8 @@ Function Reequip()
 	FadeToBlackAndBackIMOD.Apply()
 	Utility.Wait(3)
 	_00E_MC_JesparREF.SetOutfit(_00E_MC_JesparOutfit)
-	SetStage(20)
-	MQ13a.SetStage(80)
+	SetCurrentStageID(20)
+	MQ13a.SetCurrentStageID(80)
 	
 EndFunction
 
diff --git a/source/scripts/_00e_cqj06_enablejesparsc.psc b/source/scripts/_00e_cqj06_enablejesparsc.psc
index fdc02dc7..b12c322e 100644
--- a/source/scripts/_00e_cqj06_enablejesparsc.psc
+++ b/source/scripts/_00e_cqj06_enablejesparsc.psc
@@ -3,11 +3,11 @@ Scriptname _00E_CQJ06_EnableJesparSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	If akActionRef == PlayerREF && !bDone
-		If CQJ06.GetStage() == 5
+		If CQJ06.GetCurrentStageID() == 5
 			if ((GameHour.GetValue() < 19) && (GameHour.GetValue() > 4))
 				_00E_CQJ06_sComeBackLater.Show()
 			Else
-				CQJ06.SetStage(10)
+				CQJ06.SetCurrentStageID(10)
 				CQJ06.SetUp()
 				bDone = True
 			EndIf
diff --git a/source/scripts/_00e_cqj06_functions.psc b/source/scripts/_00e_cqj06_functions.psc
index f2142655..9a80b1b5 100644
--- a/source/scripts/_00e_cqj06_functions.psc
+++ b/source/scripts/_00e_cqj06_functions.psc
@@ -45,7 +45,7 @@ Function FadeOut()
 	_00E_Func_AIWalk.PlayerAIWalk()
 	CloseDoor()
 	Game.ForceThirdPerson()
-	SetStage(25)
+	SetCurrentStageID(25)
 	
 EndFunction
 
diff --git a/source/scripts/_00e_debugsetstagetzrigger.psc b/source/scripts/_00e_debugsetstagetzrigger.psc
index e158c712..5ca3551a 100644
--- a/source/scripts/_00e_debugsetstagetzrigger.psc
+++ b/source/scripts/_00e_debugsetstagetzrigger.psc
@@ -4,7 +4,7 @@ Scriptname _00E_DebugSetStageTZrigger extends ObjectReference
 Event OnTriggerEnter (ObjectReference akActionRef)
 
 	if akActionRef == Game.GetPlayer() && !Done
-		Mq11a.SetStage(Stage)
+		Mq11a.SetCurrentStageID(Stage)
 		GlobalToSet.SetValue(GlobalValue)
 		Done = True
 	EndIf
diff --git a/source/scripts/_00e_dgintimidatealiasscript.psc b/source/scripts/_00e_dgintimidatealiasscript.psc
index 8ff4dd69..e4e0ae4b 100644
--- a/source/scripts/_00e_dgintimidatealiasscript.psc
+++ b/source/scripts/_00e_dgintimidatealiasscript.psc
@@ -9,14 +9,14 @@ Faction Property DGIntimidateFaction Auto
 
 Event OnUpdate()
 	actor pActor = self.GetActorReference()
-	if pActor.IsInCombat() == 0  && pActor.IsBleedingOut() == 0 && GetOwningQuest().GetStage() <= 15 ;&& GetOwningQuest().GetStage() < 15
-		GetOwningQuest().SetStage(200)
+	if pActor.IsInCombat() == 0  && pActor.IsBleedingOut() == 0 && GetOwningQuest().GetCurrentStageID() <= 15 ;&& GetOwningQuest().GetCurrentStageID() < 15
+		GetOwningQuest().SetCurrentStageID(200)
 	endIf
 EndEvent
 
 Event OnEnterBleedout()
 
-	GetOwningQuest().SetStage(15)
+	GetOwningQuest().SetCurrentStageID(15)
 	self.GetActorReference().EvaluatePackage()
 	Utility.Wait(3)
 	self.GetActorReference().StopCombat()
@@ -25,7 +25,7 @@ EndEvent
 
 Event OnMagicEffectApply(ObjectReference akCaster, MagicEffect akEffect)
 	if akCaster == game.GetPlayer() && akEffect.IsEffectFlagSet(0x00000001) ; Hit by player with a hostile ME
-		GetOwningQuest().SetStage(150)
+		GetOwningQuest().SetCurrentStageID(150)
 	endIf
 EndEvent
 
@@ -39,9 +39,9 @@ Event OnHit(ObjectReference akAggressor, Form akWeapon, Projectile akProjectile,
 			pActor.StopCombat()
 			pActor.SendAssaultAlarm()
 			pActor.StartCombat(pPlayer)
-			GetOwningQuest().SetStage(150)
+			GetOwningQuest().SetCurrentStageID(150)
 		endIf
 	else
-		GetOwningQuest().SetStage(150)
+		GetOwningQuest().SetCurrentStageID(150)
 	endIf
 EndEvent
diff --git a/source/scripts/_00e_dgintimidateplayerscript.psc b/source/scripts/_00e_dgintimidateplayerscript.psc
index 2513797e..c815a87b 100644
--- a/source/scripts/_00e_dgintimidateplayerscript.psc
+++ b/source/scripts/_00e_dgintimidateplayerscript.psc
@@ -5,29 +5,29 @@ import game
 Event OnHit(ObjectReference akAggressor, Form akWeapon, Projectile akProjectile, bool abPowerAttack, bool abSneakAttack, bool abBashAttack, bool abHitBlocked)
 	; if the player is hit with any weapon other than hands, or by anyone but the brawlers
 	if akAggressor != Opponent.GetRef() && akAggressor != OpponentFriend.GetRef()
-		GetOwningQuest().SetStage(200)
+		GetOwningQuest().SetCurrentStageID(200)
 	endif
 endEvent
 
 Event OnMagicEffectApply(ObjectReference akCaster, MagicEffect akEffect)
 	; if player is hit with any magic effect (not by himself)
 	if akCaster != GetPlayer()
-		GetOwningQuest().SetStage(150)
+		GetOwningQuest().SetCurrentStageID(150)
 	endif
 endEvent
 
 Event OnEnterBleedout()
 ; 	Debug.Trace("player enters bleedout")
 	GetPlayer().SetNoBleedoutRecovery(false)
-	GetOwningQuest().SetStage(180)
+	GetOwningQuest().SetCurrentStageID(180)
 	Utility.Wait(7)
-	GetOwningQuest().SetStage(200)
+	GetOwningQuest().SetCurrentStageID(200)
 EndEvent
 
 Event OnLocationChange(Location akOldLoc, Location akNewLoc)
 	if GetPlayer().IsInLocation(Opponent.GetActorReference().GetCurrentLocation()) == False
 		; Debug.Trace(self + "Player has left opponent's location, shutting down")
-    	GetOwningQuest().SetStage(200)
+    	GetOwningQuest().SetCurrentStageID(200)
  	endIf
 endEvent
 
@@ -44,9 +44,9 @@ Event OnPlayerLoadGame()
 	If curScriptVersion < LATEST_SCRIPT_VERSION
 		curScriptVersion = LATEST_SCRIPT_VERSION
 
-		Int curStage = GetOwningQuest().GetStage()
+		Int curStage = GetOwningQuest().GetCurrentStageID()
 		If curStage >= 150 && curStage < 200 ; Terminate the quest if it's stuck
-			GetOwningQuest().SetStage(200)
+			GetOwningQuest().SetCurrentStageID(200)
 		EndIf
 	EndIf
 EndEvent
diff --git a/source/scripts/_00e_disablepcifscenerunning.psc b/source/scripts/_00e_disablepcifscenerunning.psc
index bed1e454..ec0a80b8 100644
--- a/source/scripts/_00e_disablepcifscenerunning.psc
+++ b/source/scripts/_00e_disablepcifscenerunning.psc
@@ -6,7 +6,7 @@ Scriptname _00E_DisablePCIfSceneRunning extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if (akActionRef == PlayerREF) && (QuestToSet.GetStage() == StageRequired)
+	if (akActionRef == PlayerREF) && (QuestToSet.GetCurrentStageID() == StageRequired)
 		if !SceneRequired.IsActionComplete(SceneAction)
 			Game.DisablePlayerControls()
 			RegisterForSingleUpdate(0.5)
diff --git a/source/scripts/_00e_fs_cqt01_functions.psc b/source/scripts/_00e_fs_cqt01_functions.psc
index ad1c78e0..d60cb4c4 100644
--- a/source/scripts/_00e_fs_cqt01_functions.psc
+++ b/source/scripts/_00e_fs_cqt01_functions.psc
@@ -37,7 +37,7 @@ Function FinishUp()
 	_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
 	_00E_EPHandler.GiveEP(iRewardEXP)
 	FS_CQT01.CompleteAllObjectives()
-	FS_NQR04.SetStage(85)
+	FS_NQR04.SetCurrentStageID(85)
 
 
 EndFunction
@@ -48,7 +48,7 @@ Function FailQuest()
 	_00E_PlayerFunctions.GetSoundControl().RemoveSilence()
 	_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
 	FS_CQT01.FailAllObjectives()
-	FS_NQR04.SetStage(85)
+	FS_NQR04.SetCurrentStageID(85)
 
 EndFunction
 
diff --git a/source/scripts/_00e_fs_environmentscene02trigger.psc b/source/scripts/_00e_fs_environmentscene02trigger.psc
index 474754df..e658a519 100644
--- a/source/scripts/_00e_fs_environmentscene02trigger.psc
+++ b/source/scripts/_00e_fs_environmentscene02trigger.psc
@@ -1,11 +1,11 @@
 Scriptname _00E_FS_EnvironmentScene02Trigger extends ObjectReference
 
 Event OnTriggerEnter (ObjectReference akActionREF)
-	If akActionRef == PlayerREF && FS_EnvironmentScene02.GetStage() == 0
-		Int CQJ04Stage = CQJ04.GetStage()
+	If akActionRef == PlayerREF && FS_EnvironmentScene02.GetCurrentStageID() == 0
+		Int CQJ04Stage = CQJ04.GetCurrentStageID()
 		If (CQJ04Stage < 10 || CQJ04Stage >= 35) && (CQJ04_SC01_JesparInRedLantern.IsPlaying() == False) && AllowIdleChatter.GetValue() > 0 && (bDone == False)
 			bDone = True
-			FS_EnvironmentScene02.SetStage(5)
+			FS_EnvironmentScene02.SetCurrentStageID(5)
 			Self.Disable()
 			Self.Delete()
 		EndIf
diff --git a/source/scripts/_00e_fs_mq18c_corpsesc.psc b/source/scripts/_00e_fs_mq18c_corpsesc.psc
index 8183b8a6..c4ee6d7d 100644
--- a/source/scripts/_00e_fs_mq18c_corpsesc.psc
+++ b/source/scripts/_00e_fs_mq18c_corpsesc.psc
@@ -8,9 +8,9 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if FS_MQ18c.GetStage() == 5 && akActionRef == Game.GetPlayer()
+	if FS_MQ18c.GetCurrentStageID() == 5 && akActionRef == Game.GetPlayer()
 	
-		FS_MQ18c.SetStage(10)
+		FS_MQ18c.SetCurrentStageID(10)
 
 	EndIf
 	
diff --git a/source/scripts/_00e_fs_mq18c_functions.psc b/source/scripts/_00e_fs_mq18c_functions.psc
index c16f9d98..d6e1f091 100644
--- a/source/scripts/_00e_fs_mq18c_functions.psc
+++ b/source/scripts/_00e_fs_mq18c_functions.psc
@@ -164,7 +164,7 @@ Function FadeBack()
 	Utility.wait(0.1)
 	Game.EnablePlayerControls()
 	FS_MQ18c_SC01_BedMarkerREF.BlockActivation(true)
-	SetStage(16)
+	SetCurrentStageID(16)
 	
 EndFunction
 
diff --git a/source/scripts/_00e_fs_nq01_functions.psc b/source/scripts/_00e_fs_nq01_functions.psc
index 572d9cea..c328d133 100644
--- a/source/scripts/_00e_fs_nq01_functions.psc
+++ b/source/scripts/_00e_fs_nq01_functions.psc
@@ -6,13 +6,13 @@ Scriptname _00E_FS_NQ01_Functions extends Quest Conditional
 
 Event OnUpdateGameTime()
 
-	If GetStage() == 75
+	If GetCurrentStageID() == 75
 	
-		SetStage(80)
+		SetCurrentStageID(80)
 		
-	Elseif GetStage() == 150
+	Elseif GetCurrentStageID() == 150
 		
-		SetStage(155)
+		SetCurrentStageID(155)
 	
 	EndIf
 
@@ -20,9 +20,9 @@ EndEvent
 
 Event OnUpdate()
 
-	if GetStage() < 115
+	if GetCurrentStageID() < 115
 
-		SetStage(115)
+		SetCurrentStageID(115)
 		
 	EndIf
 
@@ -166,7 +166,7 @@ EndFunction
 
 Function CleanUpSC03()
 
-	SetStage(50)
+	SetCurrentStageID(50)
 
 EndFunction
 
@@ -281,7 +281,7 @@ Function StopSC04()
 	MAGIllusionReleaseSound.Play(PlayerREF)
 	SC04_PlayerCopy.Delete()
 	FS_NQ01_SC04_ArcherREF.Delete()
-	SetStage(60)
+	SetCurrentStageID(60)
 	
 EndFunction
 
@@ -317,7 +317,7 @@ Function StopSC05()
 	FS_NQ01_YuslanREF.RemoveFromFaction(IgnoreInCombatFaction)
 	FS_NQ01_YuslanREF.SetHeadTracking(True)
 	FS_NQ01_SC05_Lishari_REF.Disable()
-	SetStage(70)
+	SetCurrentStageID(70)
 
 EndFunction
 
@@ -544,7 +544,7 @@ EndFunction
 
 Function UpdateObjectives02()
 
-	If GetStage() < 120
+	If GetCurrentStageID() < 120
 
 		_00E_FS_NQ01_EventualityShiftIMOD.Apply()
 		MAGIllusionReleaseSound.Play(PlayerREF)
@@ -639,7 +639,7 @@ Function ShowCarryMessage()
 		FadeToBlackIMOD.Apply()
 		Utility.Wait(2.7)
 		FadeToBlackHoldIMOD.ApplyCrossFade(afFadeDuration = 0.3)
-		SetStage(140)
+		SetCurrentStageID(140)
 		
 	Else
 	
diff --git a/source/scripts/_00e_fs_nq01_sc02_failsavesc.psc b/source/scripts/_00e_fs_nq01_sc02_failsavesc.psc
index 16300d8d..1035c580 100644
--- a/source/scripts/_00e_fs_nq01_sc02_failsavesc.psc
+++ b/source/scripts/_00e_fs_nq01_sc02_failsavesc.psc
@@ -6,7 +6,7 @@ Scriptname _00E_FS_NQ01_SC02_FailsaveSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if akActionRef == PlayerREF && !bDone && FS_NQ01.GetStage() == 30
+	if akActionRef == PlayerREF && !bDone && FS_NQ01.GetCurrentStageID() == 30
 		
 		If FS_NQ01.FS_NQ01_YuslanREF.GetParentCell() != ThalgardOrdensklosterL1		
 		
diff --git a/source/scripts/_00e_fs_nq01_sc10_yuslanmessagesc.psc b/source/scripts/_00e_fs_nq01_sc10_yuslanmessagesc.psc
index cdd68e34..5c03b53c 100644
--- a/source/scripts/_00e_fs_nq01_sc10_yuslanmessagesc.psc
+++ b/source/scripts/_00e_fs_nq01_sc10_yuslanmessagesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_FS_NQ01_SC10_YuslanMessageSC extends ReferenceAlias
 
 Event OnActivate(ObjectReference akActionRef)
 
-	If Self.GetActorReference().IsDead() && FS_NQ01.GetStage() == 130
+	If Self.GetActorReference().IsDead() && FS_NQ01.GetCurrentStageID() == 130
 		FS_NQ01.ShowCarryMessage()
 	EndIf
 
diff --git a/source/scripts/_00e_fs_nq02_doorvisionscript.psc b/source/scripts/_00e_fs_nq02_doorvisionscript.psc
index 860d1129..ce57309a 100644
--- a/source/scripts/_00e_fs_nq02_doorvisionscript.psc
+++ b/source/scripts/_00e_fs_nq02_doorvisionscript.psc
@@ -1,8 +1,8 @@
 Scriptname _00E_FS_NQ02_DoorVisionScript extends ObjectReference  
 
 Event OnActivate(ObjectReference akActionRef)
-	if (FS_NQ02.GetStage() == 220 && akActionRef == PlayerREF)
-	FS_NQ02.SetStage(230)		
+	if (FS_NQ02.GetCurrentStageID() == 220 && akActionRef == PlayerREF)
+	FS_NQ02.SetCurrentStageID(230)		
 	self.Disable()
 	Endif
 EndEvent
diff --git a/source/scripts/_00e_fs_nq02_entriggertravelscript.psc b/source/scripts/_00e_fs_nq02_entriggertravelscript.psc
index 6578487f..5bf20ada 100644
--- a/source/scripts/_00e_fs_nq02_entriggertravelscript.psc
+++ b/source/scripts/_00e_fs_nq02_entriggertravelscript.psc
@@ -21,7 +21,7 @@ EndEvent
 
 Function ProcessEnterEvent()
 	
-	if (FS_NQ02.GetStage() >= startstage) && (FS_NQ02.GetStage() <= endstage)
+	if (FS_NQ02.GetCurrentStageID() >= startstage) && (FS_NQ02.GetCurrentStageID() <= endstage)
 		if _00E_FS_NQ02_TravelState.GetValue() == 0
 			_00E_FS_NQ02_EsmeEntriggerFollowNotif.Show()
 			_00E_FS_NQ02_TravelState.SetValue(1)
@@ -39,7 +39,7 @@ EndFunction
 
 Function ProcessLeaveEvent()
 
-	if (FS_NQ02.GetStage() >= startstage) && (FS_NQ02.GetStage() <= endstage) 
+	if (FS_NQ02.GetCurrentStageID() >= startstage) && (FS_NQ02.GetCurrentStageID() <= endstage) 
 		
 		if PlayerREF.IsInLocation(_00E_FS_NQ02_Locations) == 1
 			if _00E_FS_NQ02_TravelState.GetValue() == 0
diff --git a/source/scripts/_00e_fs_nq02_functions.psc b/source/scripts/_00e_fs_nq02_functions.psc
index 40446a74..6a2524f2 100644
--- a/source/scripts/_00e_fs_nq02_functions.psc
+++ b/source/scripts/_00e_fs_nq02_functions.psc
@@ -42,7 +42,7 @@ Function GivePlayerGewuerzwein()
 	FadeToBlackControl.FadeToBlack()
 	FadeToBlackControl.FadeToBlackBack()
 	PlayerREF.AddItem(FoodSolitudeSpicedWine, 1)
-	SetStage(90)
+	SetCurrentStageID(90)
 
 EndFunction
 
@@ -56,7 +56,7 @@ Function InventarCheckForBook()
 		PlayerREF.RemoveItem(_00E_FS_NQ02_Passagierbuch, 1, true)
 		_00E_FS_NQ02_Passagierbuch_EntryREF.Enable()
 		PlayerREF.AddItem(_00E_FS_NQ02_Passagierbuch_EntryREF, 1, true)
-		SetStage(110)
+		SetCurrentStageID(110)
 	Else
 		_00E_FS_NQ02_PassagierbuchREF.Disable()
 		_00E_FS_NQ02_Passagierbuch_EntryREF.Enable()
@@ -76,11 +76,11 @@ EndFunction
 ; called from _00E_PlayerSetUpScript on patch 1.6.0.0
 Function UpdatePassengerBook()
 
-	If GetStage() >= 5
+	If GetCurrentStageID() >= 5
 		Passagierbuch_Entry.ForceRefTo(_00E_FS_NQ02_Passagierbuch_EntryREF as ObjectReference)
 	EndIf
 		
-	If GetStage() >= 90 && GetStage() <= 130
+	If GetCurrentStageID() >= 90 && GetCurrentStageID() <= 130
 		If PlayerREF.GetItemCount(_00E_FS_NQ02_Passagierbuch) >= 1
 			PlayerREF.RemoveItem(_00E_FS_NQ02_Passagierbuch, 1, true)
 			_00E_FS_NQ02_Passagierbuch_EntryREF.Enable()
@@ -702,7 +702,7 @@ EndFunction
 Event OnUpdateGameTime() ; because of how we registered, this event occurs every 30 minutes of game time    
 
 	If (GameDaysPassed.GetValue() + 1 >= GameDay)
-		SetStage(GetStage()+10)
+		SetCurrentStageID(GetCurrentStageID()+10)
 		UnregisterForUpdateGameTime()
 	EndIf
 
@@ -1085,7 +1085,7 @@ Function FinishGameAndClearUp()
 	totalplayer = 0
 	totalenemy = 0
     
-	SetStage(GetStage()+5)
+	SetCurrentStageID(GetCurrentStageID()+5)
 	PlayerREF.MoveTo(_00E_FS_NQ02_PlayerChairREF)
 
 	EnablePlayerControls()
diff --git a/source/scripts/_00e_fs_nq02_functions2.psc b/source/scripts/_00e_fs_nq02_functions2.psc
index d3207ed6..c211bb1f 100644
--- a/source/scripts/_00e_fs_nq02_functions2.psc
+++ b/source/scripts/_00e_fs_nq02_functions2.psc
@@ -313,9 +313,9 @@ Function SC19DisableEsme()
 	_00E_SilenceLongTransitionHighPriority.Remove()
 	_00E_FS_NQ02_Music_Theme.Remove()
 	if SympathyEsme.GetValue() >= 0
-		SetStage(960)
+		SetCurrentStageID(960)
 	else
-		SetStage(1060)
+		SetCurrentStageID(1060)
 		_00E_EPHandler.GiveEP(3000)
 	endif
 
@@ -362,7 +362,7 @@ Function MoveToEpilogPosition()
 	Game.ForceThirdPerson()
 	FadeToBlackControl.FadeToBlackBack()
 	DisablePlayerControls()
-	SetStage(1005)
+	SetCurrentStageID(1005)
 
 EndFunction
 
@@ -378,7 +378,7 @@ Function EndEpilog()
 	FadeToBlackControl.FadeToBlackBack()
 	Weather.ReleaseOverride()
 	_00E_EPHandler.GiveEP(3500)
-	Setstage(1030)
+	SetCurrentStageID(1030)
 	
 	Steam.UnlockAchievement("END_ESME_01")
 
@@ -396,7 +396,7 @@ EndFunction
 
 Event OnUpdateGameTime() ; because of how we registered, this event occurs every 30 minutes of game time    
 	if (GameDaysPassed.GetValue() + 1 >= GameDay)
-		SetStage(GetStage()+5)
+		SetCurrentStageID(GetCurrentStageID()+5)
 		UnregisterForUpdateGameTime()
 	Endif
 EndEvent
diff --git a/source/scripts/_00e_fs_nq02_lagerfeuerscript.psc b/source/scripts/_00e_fs_nq02_lagerfeuerscript.psc
index 08946f7c..d6c567c2 100644
--- a/source/scripts/_00e_fs_nq02_lagerfeuerscript.psc
+++ b/source/scripts/_00e_fs_nq02_lagerfeuerscript.psc
@@ -3,11 +3,11 @@ Scriptname _00E_FS_NQ02_LagerfeuerScript extends ObjectReference
 Import Utility
 
 Event OnActivate(ObjectReference akActionRef)
-	if akActionRef == PlayerREF && FS_NQ02.GetStage() == 70
+	if akActionRef == PlayerREF && FS_NQ02.GetCurrentStageID() == 70
 		GoToState("DoNothing")
 		_00E_FadeToBlackControl FadeToBlackControl = _00E_PlayerFunctions.GetFadeToBlackControl()
 		FadeToBlackControl.FadeToBlack()
-		FS_NQ02.SetStage(80)
+		FS_NQ02.SetCurrentStageID(80)
 		wait(0.1)
 		_00E_FS_NQ02_EsmeREF.MoveTo(_00E_FS_NQ02_SC02_EsmeMarker2)
 		PlayerREF.MoveTo(_00E_FS_NQ02_SC02_PlayerMarker)
diff --git a/source/scripts/_00e_fs_nq02_museumnoscript.psc b/source/scripts/_00e_fs_nq02_museumnoscript.psc
index 1d39166e..12369bdd 100644
--- a/source/scripts/_00e_fs_nq02_museumnoscript.psc
+++ b/source/scripts/_00e_fs_nq02_museumnoscript.psc
@@ -1,7 +1,7 @@
 Scriptname _00E_FS_NQ02_MuseumNoScript extends ObjectReference  
 
 Event OnActivate(ObjectReference akActionRef)
-	if (FS_NQ02.GetStage() == 460 && akActionRef == PlayerREF)
+	if (FS_NQ02.GetCurrentStageID() == 460 && akActionRef == PlayerREF)
 		int iButton = Messagebox.Show()
 	
 		if iButton == 0
diff --git a/source/scripts/_00e_fs_nq02_museumyesscript.psc b/source/scripts/_00e_fs_nq02_museumyesscript.psc
index c9617dd8..2ce594f8 100644
--- a/source/scripts/_00e_fs_nq02_museumyesscript.psc
+++ b/source/scripts/_00e_fs_nq02_museumyesscript.psc
@@ -1,7 +1,7 @@
 Scriptname _00E_FS_NQ02_MuseumYesScript extends ObjectReference  
 
 Event OnActivate(ObjectReference akActionRef)
-	if (FS_NQ02.GetStage() == 460 && akActionRef == PlayerREF)
+	if (FS_NQ02.GetCurrentStageID() == 460 && akActionRef == PlayerREF)
 		int iButton = Messagebox.Show()
 	
 		if iButton == 0
diff --git a/source/scripts/_00e_fs_nq02_passagierbuchscript.psc b/source/scripts/_00e_fs_nq02_passagierbuchscript.psc
index dba595ce..129164cb 100644
--- a/source/scripts/_00e_fs_nq02_passagierbuchscript.psc
+++ b/source/scripts/_00e_fs_nq02_passagierbuchscript.psc
@@ -2,10 +2,10 @@ Scriptname _00E_FS_NQ02_PassagierbuchScript extends ObjectReference
 
 Event OnRead()
 
-	If FS_NQ02.GetStage() == 90
-		FS_NQ02.SetStage(100)
-	ElseIf FS_NQ02.GetStage() == 110
-		FS_NQ02.SetStage(120)
+	If FS_NQ02.GetCurrentStageID() == 90
+		FS_NQ02.SetCurrentStageID(100)
+	ElseIf FS_NQ02.GetCurrentStageID() == 110
+		FS_NQ02.SetCurrentStageID(120)
 	EndIf
 
 EndEvent
diff --git a/source/scripts/_00e_fs_nq02_phasmalistscript.psc b/source/scripts/_00e_fs_nq02_phasmalistscript.psc
index 454f690b..2a9d559c 100644
--- a/source/scripts/_00e_fs_nq02_phasmalistscript.psc
+++ b/source/scripts/_00e_fs_nq02_phasmalistscript.psc
@@ -15,7 +15,7 @@ EndEvent
 Event OnDeath(Actor akKiller)
 
 	self.PlaceAtMe(_00E_FS_NQ02_Phasmalist_EnterWorldExp)
-	FS_NQ02.SetStage(FS_NQ02.GetStage()+10)
+	FS_NQ02.SetCurrentStageID(FS_NQ02.GetCurrentStageID()+10)
 	Utility.Wait(0.25)
 	self.disable()
 
diff --git a/source/scripts/_00e_fs_nq02_schreinvisionscript.psc b/source/scripts/_00e_fs_nq02_schreinvisionscript.psc
index cf154cde..bcc291fa 100644
--- a/source/scripts/_00e_fs_nq02_schreinvisionscript.psc
+++ b/source/scripts/_00e_fs_nq02_schreinvisionscript.psc
@@ -1,11 +1,11 @@
 Scriptname _00E_FS_NQ02_SchreinVisionScript extends ObjectReference  
 
 Event OnActivate(ObjectReference akActionRef)
-	if (FS_NQ02.GetStage() == 330 && akActionRef == PlayerREF)
-	FS_NQ02.SetStage(340)		
+	if (FS_NQ02.GetCurrentStageID() == 330 && akActionRef == PlayerREF)
+	FS_NQ02.SetCurrentStageID(340)		
 	self.Disable()
-	elseif (FS_NQ02.GetStage() == 860 && akActionRef == PlayerREF)
-	FS_NQ02.SetStage(870)		
+	elseif (FS_NQ02.GetCurrentStageID() == 860 && akActionRef == PlayerREF)
+	FS_NQ02.SetCurrentStageID(870)		
 	self.Disable()
 	else
 	Endif
diff --git a/source/scripts/_00e_fs_nq03_functions.psc b/source/scripts/_00e_fs_nq03_functions.psc
index a42a07b8..1f9e723a 100644
--- a/source/scripts/_00e_fs_nq03_functions.psc
+++ b/source/scripts/_00e_fs_nq03_functions.psc
@@ -47,7 +47,7 @@ Function PrepareSC02()
 	_00E_FS_NQ03_SC02_StorageDoor.Lock(255)
 	wait(0.1)
 	FS_NQ03_SC02_PreVision.ForceStart()
-	SetStage(70)
+	SetCurrentStageID(70)
 
 EndFunction
 
@@ -112,7 +112,7 @@ Function PortPlayerIntoMemory()
 	FadeToBlackHoldImod.Remove()
 	_00E_MQ07a_VisionIMOD.ApplyCrossFade(2)
 	Game.RequestAutoSave()
-	SetStage(100)
+	SetCurrentStageID(100)
 	
 EndFunction
 
@@ -212,7 +212,7 @@ Function FoundSecret()
 	UpdateCurrentInstanceGlobal(_00E_FS_NQ03_SecretCounterVar)
 	wait(0.1)
 	SetObjectiveDisplayed(60, true, true)
-	SetStage(180)
+	SetCurrentStageID(180)
 	_00E_FS_NQ03_HideoutLetterBlanko.Disable()
 	_00E_FS_NQ03_HideoutLetter.Enable()
 	else
@@ -435,7 +435,7 @@ Function SetUpEpilogTalk()
 
 	_00E_FS_NQ03_SC02_StorageDoor.Lock(false)
 	Game.EnablePlayerControls()
-	SetStage(260)
+	SetCurrentStageID(260)
 	GetFadeToBlackControl().FadeToBlackBack()
 
 EndFunction
@@ -466,7 +466,7 @@ EndFunction
 
 Event OnUpdateGameTime() ; because of how we registered, this event occurs every 30 minutes of game time    
 	if (GameDaysPassed.GetValue() + 1 >= GameDay)
-		SetStage(20)
+		SetCurrentStageID(20)
 		UnregisterForUpdateGameTime()
 	Endif
 EndEvent
diff --git a/source/scripts/_00e_fs_nq03_wordofthedeadscript.psc b/source/scripts/_00e_fs_nq03_wordofthedeadscript.psc
index 2325ee89..0b95fa97 100644
--- a/source/scripts/_00e_fs_nq03_wordofthedeadscript.psc
+++ b/source/scripts/_00e_fs_nq03_wordofthedeadscript.psc
@@ -2,14 +2,14 @@ Scriptname _00E_FS_NQ03_WordOfTheDeadScript extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-if FS_NQ03.GetStage() == 80
+if FS_NQ03.GetCurrentStageID() == 80
 
 	int iButton = _00E_FS_NQ03_WordOfTheDeadMSG.Show()
 	
 	if iButton == 1
 		Return
 	Else
-		FS_NQ03.SetStage(90)
+		FS_NQ03.SetCurrentStageID(90)
 		Self.PlayGamebryoAnimation("Open")
 	EndIf
 
diff --git a/source/scripts/_00e_fs_nq05aushangscript.psc b/source/scripts/_00e_fs_nq05aushangscript.psc
index d981dd2d..55b3c32a 100644
--- a/source/scripts/_00e_fs_nq05aushangscript.psc
+++ b/source/scripts/_00e_fs_nq05aushangscript.psc
@@ -1,9 +1,9 @@
 Scriptname _00E_FS_NQ05AushangScript extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
-	if (FS_NQ05.GetStage() == 0 || FS_NQ05.GetStage() == 1) && akActionRef == PlayerREF
+	if (FS_NQ05.GetCurrentStageID() == 0 || FS_NQ05.GetCurrentStageID() == 1) && akActionRef == PlayerREF
 		FS_NQ05AushangMessage.Show()
-		FS_NQ05.SetStage(5)
+		FS_NQ05.SetCurrentStageID(5)
 		Disable()
 		OtherPosting.Disable()
 	Endif
diff --git a/source/scripts/_00e_fs_nq06_functions.psc b/source/scripts/_00e_fs_nq06_functions.psc
index 7e2c9593..41d5f7c9 100644
--- a/source/scripts/_00e_fs_nq06_functions.psc
+++ b/source/scripts/_00e_fs_nq06_functions.psc
@@ -29,7 +29,7 @@ Function SetupSC01()
 	_00E_FS_NQ06_OldWomanREF.MoveTo(_00E_FS_NQ06_OldWomanStandMarker)
 	_00E_FS_NQ06_GuardREF.MoveTo(_00E_FS_NQ06_GuardStandMarker)
 	wait(1)
-	SetStage(10)
+	SetCurrentStageID(10)
  
 EndFunction
 
@@ -109,7 +109,7 @@ Function EndDariusInJail()
 	_00E_FS_NQ06_GuardREF.MoveTo(_00E_FS_NQ06_GuardStandMarker)
 	_00E_FS_NQ06_GuardREF.EvaluatePackage()
 	GetFadeToBlackControl().FadeToBlackBack()
-	SetStage(130)
+	SetCurrentStageID(130)
 
 EndFunction
 
@@ -130,7 +130,7 @@ Function EndKarymeaInJail()
 	_00E_FS_NQ06_KarymeaREF.EvaluatePackage()
 	_00E_FS_NQ06_KarymeaREF.BlockActivation(true)
 	GetFadeToBlackControl().FadeToBlackBack()
-	SetStage(160)
+	SetCurrentStageID(160)
 
 EndFunction
 
diff --git a/source/scripts/_00e_fs_nq06_lighthouseletter.psc b/source/scripts/_00e_fs_nq06_lighthouseletter.psc
index df79203d..aa37b011 100644
--- a/source/scripts/_00e_fs_nq06_lighthouseletter.psc
+++ b/source/scripts/_00e_fs_nq06_lighthouseletter.psc
@@ -5,9 +5,9 @@ bool bDone = false
 
 Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer)
 	
-	If (bDone == false && akNewContainer == Game.GetPlayer() && (FS_NQ06.GetStage() == 50 || FS_NQ06.GetStage() == 55))
+	If (bDone == false && akNewContainer == Game.GetPlayer() && (FS_NQ06.GetCurrentStageID() == 50 || FS_NQ06.GetCurrentStageID() == 55))
 		bDone = true
-		FS_NQ06.SetStage(60)
+		FS_NQ06.SetCurrentStageID(60)
 	EndIf
 
 Endevent
\ No newline at end of file
diff --git a/source/scripts/_00e_fs_nq07_aushangscript.psc b/source/scripts/_00e_fs_nq07_aushangscript.psc
index 558f896c..185d47c1 100644
--- a/source/scripts/_00e_fs_nq07_aushangscript.psc
+++ b/source/scripts/_00e_fs_nq07_aushangscript.psc
@@ -1,15 +1,15 @@
 Scriptname _00E_FS_NQ07_AushangScript extends ObjectReference  
 
 Event OnActivate(ObjectReference akActionRef)
-	if (FS_NQ07.GetStage() == 0 && akActionRef == PlayerREF)
+	if (FS_NQ07.GetCurrentStageID() == 0 && akActionRef == PlayerREF)
 		_00E_FS_NQ07_AushangMessage.Show()
-		FS_NQ07.SetStage(10)
+		FS_NQ07.SetCurrentStageID(10)
 		Disable()
 	Endif
 EndEvent
 
 Event OnUnload()
-	if FS_NQ07.GetStage() >= 5
+	if FS_NQ07.GetCurrentStageID() >= 5
 		Disable()
 	EndIf
 EndEvent
diff --git a/source/scripts/_00e_fs_nq07_boneripperdeadscript.psc b/source/scripts/_00e_fs_nq07_boneripperdeadscript.psc
index 205ad125..084f544b 100644
--- a/source/scripts/_00e_fs_nq07_boneripperdeadscript.psc
+++ b/source/scripts/_00e_fs_nq07_boneripperdeadscript.psc
@@ -4,6 +4,6 @@ Quest Property FS_NQ07 Auto
 
 Event OnDeath(Actor akKiller)
 
-	FS_NQ07.SetStage(100)
+	FS_NQ07.SetCurrentStageID(100)
 
 EndEvent
diff --git a/source/scripts/_00e_fs_nq07_dinneractivatorscript.psc b/source/scripts/_00e_fs_nq07_dinneractivatorscript.psc
index 521f6c9a..62cc01a6 100644
--- a/source/scripts/_00e_fs_nq07_dinneractivatorscript.psc
+++ b/source/scripts/_00e_fs_nq07_dinneractivatorscript.psc
@@ -2,8 +2,8 @@ Scriptname _00E_FS_NQ07_DinnerActivatorScript extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if(FS_NQ07.GetStage() == 370 && akActionRef == PlayerREF && PlayerREF.GetItemCount(DalSarkerHoneywine) >= 2 && PlayerREF.GetItemCount(FoodChickenCooked) >= 2 && PlayerREF.GetItemCount(FoodCabbagePotatoSoup) >= 2 && FS_NQ07.IsObjectiveCompleted(140) == 1 && FS_NQ07.IsObjectiveCompleted(150) == 1)
-		FS_NQ07.SetStage(380)
+	if(FS_NQ07.GetCurrentStageID() == 370 && akActionRef == PlayerREF && PlayerREF.GetItemCount(DalSarkerHoneywine) >= 2 && PlayerREF.GetItemCount(FoodChickenCooked) >= 2 && PlayerREF.GetItemCount(FoodCabbagePotatoSoup) >= 2 && FS_NQ07.IsObjectiveCompleted(140) == 1 && FS_NQ07.IsObjectiveCompleted(150) == 1)
+		FS_NQ07.SetCurrentStageID(380)
 		PlayerREF.RemoveItem(DalSarkerHoneywine, 2)
 		PlayerREF.RemoveItem(FoodChickenCooked, 2)
 		PlayerREF.RemoveItem(FoodCabbagePotatoSoup, 2)
diff --git a/source/scripts/_00e_fs_nq07_erdhaufenscript.psc b/source/scripts/_00e_fs_nq07_erdhaufenscript.psc
index 11c2b6ad..76d20752 100644
--- a/source/scripts/_00e_fs_nq07_erdhaufenscript.psc
+++ b/source/scripts/_00e_fs_nq07_erdhaufenscript.psc
@@ -10,8 +10,8 @@ Endevent
   
 Event OnMenuClose(String menuName)
  
-	if FS_NQ07.GetStage() == 310
-	FS_NQ07.SetStage(320)
+	if FS_NQ07.GetCurrentStageID() == 310
+	FS_NQ07.SetCurrentStageID(320)
 	endif
 	UnregisterForMenu("ContainerMenu")
 
diff --git a/source/scripts/_00e_fs_nq07_functions.psc b/source/scripts/_00e_fs_nq07_functions.psc
index 5efa766a..80728d73 100644
--- a/source/scripts/_00e_fs_nq07_functions.psc
+++ b/source/scripts/_00e_fs_nq07_functions.psc
@@ -370,7 +370,7 @@ Function EndBossfight()
 	if !_00E_FS_NQ07_Draugr003.IsDead()
 	_00E_FS_NQ07_Draugr003.kill()
 	endif
-	SetStage(300)
+	SetCurrentStageID(300)
 
 EndFunction
 
diff --git a/source/scripts/_00e_fs_nq07_ritualstuhlscript.psc b/source/scripts/_00e_fs_nq07_ritualstuhlscript.psc
index 2dba1b8e..9b56f466 100644
--- a/source/scripts/_00e_fs_nq07_ritualstuhlscript.psc
+++ b/source/scripts/_00e_fs_nq07_ritualstuhlscript.psc
@@ -1,8 +1,8 @@
 Scriptname _00E_FS_NQ07_RitualStuhlScript extends ObjectReference  
 
 Event OnActivate(ObjectReference akActionRef)
-	if (FS_NQ07.GetStage() == 140 && akActionRef == PlayerREF)
-		FS_NQ07.SetStage(150)
+	if (FS_NQ07.GetCurrentStageID() == 140 && akActionRef == PlayerREF)
+		FS_NQ07.SetCurrentStageID(150)
 	Endif
 EndEvent
 
diff --git a/source/scripts/_00e_fs_nq07_tavernbenchscript.psc b/source/scripts/_00e_fs_nq07_tavernbenchscript.psc
index 2ae8c37d..4829231e 100644
--- a/source/scripts/_00e_fs_nq07_tavernbenchscript.psc
+++ b/source/scripts/_00e_fs_nq07_tavernbenchscript.psc
@@ -1,8 +1,8 @@
 Scriptname _00E_FS_NQ07_TavernBenchScript extends ObjectReference  
 
 Event OnActivate(ObjectReference akActionRef)
-	if (FS_NQ07.GetStage() == 30 && akActionRef == PlayerREF)
-		FS_NQ07.SetStage(35)
+	if (FS_NQ07.GetCurrentStageID() == 30 && akActionRef == PlayerREF)
+		FS_NQ07.SetCurrentStageID(35)
 	Endif
 EndEvent
 
diff --git a/source/scripts/_00e_fs_nq09_functions.psc b/source/scripts/_00e_fs_nq09_functions.psc
index b8578001..fed4e377 100644
--- a/source/scripts/_00e_fs_nq09_functions.psc
+++ b/source/scripts/_00e_fs_nq09_functions.psc
@@ -13,7 +13,7 @@ Function UpdateSoulCount()
 	if CurrentCount == 20
 		Self.SetObjectiveCompleted(5, 1)
 		_00E_EPHandler.GiveEP(50)
-		Self.SetStage(10)
+		Self.SetCurrentStageID(10)
 	ElseIf CurrentCount < 20
 		Self.SetObjectiveCompleted(5,0)
 		Self.SetObjectiveDisplayed(5, True, True)
diff --git a/source/scripts/_00e_fs_nq10_miscscript.psc b/source/scripts/_00e_fs_nq10_miscscript.psc
index 9088998a..201027b0 100644
--- a/source/scripts/_00e_fs_nq10_miscscript.psc
+++ b/source/scripts/_00e_fs_nq10_miscscript.psc
@@ -3,10 +3,10 @@ Scriptname _00E_FS_NQ10_MiscScript extends ObjectReference
 Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer)
 
 	If akNewContainer == PlayerREF
-		If FS_NQ10.GetStage() == 0
-			FS_NQ10.SetStage(5)
-		ElseIf FS_NQ10.GetStage() == 10
-			FS_NQ10.SetStage(20)
+		If FS_NQ10.GetCurrentStageID() == 0
+			FS_NQ10.SetCurrentStageID(5)
+		ElseIf FS_NQ10.GetCurrentStageID() == 10
+			FS_NQ10.SetCurrentStageID(20)
 		EndIf
 
 		FS_NQ10.ModObjectiveGlobal(1, _00E_FS_NQ10_MiscCountGlobal, 5, 9, true)
diff --git a/source/scripts/_00e_fs_nq10_staticscript.psc b/source/scripts/_00e_fs_nq10_staticscript.psc
index 743fb3c6..9d0e023d 100644
--- a/source/scripts/_00e_fs_nq10_staticscript.psc
+++ b/source/scripts/_00e_fs_nq10_staticscript.psc
@@ -5,20 +5,20 @@ Event OnActivate(ObjectReference akActionRef)
 	If akActionRef == PlayerREF && !Self.IsActivationBlocked()
 		
 		Self.BlockActivation(true)
-		int iCurrentStage = FS_NQ10.GetStage()
+		int iCurrentStage = FS_NQ10.GetCurrentStageID()
 		If iCurrentStage == 0
-			FS_NQ10.SetStage(10)
+			FS_NQ10.SetCurrentStageID(10)
 			FS_NQ10.SetObjectiveDisplayed(5)
 			FS_NQ10.SetObjectiveDisplayed(10)
 		ElseIf iCurrentStage == 5
-			FS_NQ10.SetStage(15)
+			FS_NQ10.SetCurrentStageID(15)
 			FS_NQ10.SetObjectiveDisplayed(10)
 		EndIf
 		
 		TryToEnableStatics()
 		
 		If _00E_FS_NQ10_StaticCountGlobal.GetValue() == 9
-			FS_NQ10.SetStage(30)
+			FS_NQ10.SetCurrentStageID(30)
 		EndIf
 		Self.BlockActivation(False)
 
diff --git a/source/scripts/_00e_fs_nq11_recipesc.psc b/source/scripts/_00e_fs_nq11_recipesc.psc
index a58b1211..cd14b7a9 100644
--- a/source/scripts/_00e_fs_nq11_recipesc.psc
+++ b/source/scripts/_00e_fs_nq11_recipesc.psc
@@ -13,9 +13,9 @@ EndEvent
 
 Event OnRead()
 	
-	If !bDone && FS_NQ11.GetStage() == 5
+	If !bDone && FS_NQ11.GetCurrentStageID() == 5
 		bDone = true
-		FS_NQ11.SetStage(10)
+		FS_NQ11.SetCurrentStageID(10)
 		FS_NQ11.SetObjectiveCompleted(7)
 		FS_NQ11.SetObjectiveDisplayed(10)
 	EndIf
diff --git a/source/scripts/_00e_fs_nqr01_startboxsc.psc b/source/scripts/_00e_fs_nqr01_startboxsc.psc
index 956a88e0..6d420067 100644
--- a/source/scripts/_00e_fs_nqr01_startboxsc.psc
+++ b/source/scripts/_00e_fs_nqr01_startboxsc.psc
@@ -4,10 +4,10 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if !bDone
 	
-		if FS_NQR01.GetStage() < 1
+		if FS_NQR01.GetCurrentStageID() < 1
 		
 			bDone = True
-			FS_NQR01.SetStage(1)
+			FS_NQR01.SetCurrentStageID(1)
 		
 		EndIf
 		
diff --git a/source/scripts/_00e_fs_nqr02_functions.psc b/source/scripts/_00e_fs_nqr02_functions.psc
index 67de79d6..661640b3 100644
--- a/source/scripts/_00e_fs_nqr02_functions.psc
+++ b/source/scripts/_00e_fs_nqr02_functions.psc
@@ -187,15 +187,15 @@ Function FinishUp()
 	_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
 	AllowIdleChatter.SetValue(1)
 	_00E_EPHandler.GiveEP(__Config_iRewardEXP)
-	FS_NQR03.SetStage(5)
+	FS_NQR03.SetCurrentStageID(5)
 	Self.CompleteQuest()
 	_00E_PlayerFunctions.GetTeleportControl().TeleportNPC(FS_NQR02_TharaelREF, _00E_NPCDumpMarker)
 	FS_NQR02_TharaelREF.Disable()
 	FS_NQR02_DummyToDisableREF.Enable()
 	FS_NQR02_IAmInTheWayDogREF.Enable()
 	FS_NQR02_SC03_DisableMarker.Enable()
-	FS_TharaelDialogue.SetStage(5)
-	FS_EnvironmentScene04.SetStage(5)
+	FS_TharaelDialogue.SetCurrentStageID(5)
+	FS_EnvironmentScene04.SetCurrentStageID(5)
 	
 	If _00E_FS_NQR02_SparedQalian.GetValueInt() == 0
 		Steam.UnlockAchievement("END_QALIAN_01")
diff --git a/source/scripts/_00e_fs_nqr02_portqaliansc.psc b/source/scripts/_00e_fs_nqr02_portqaliansc.psc
index 265dbf54..1e903d68 100644
--- a/source/scripts/_00e_fs_nqr02_portqaliansc.psc
+++ b/source/scripts/_00e_fs_nqr02_portqaliansc.psc
@@ -9,7 +9,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == PlayerREF && !bDone
 	
-		if FS_NQR02.GetStage() >= 45 && FS_NQR02.GetStage() <= 60
+		if FS_NQR02.GetCurrentStageID() >= 45 && FS_NQR02.GetCurrentStageID() <= 60
 		
 			bDone = True
 			FS_NQR02_TharaelREF.MoveTo(PlayerREF)
diff --git a/source/scripts/_00e_fs_nqr03_functions.psc b/source/scripts/_00e_fs_nqr03_functions.psc
index 5d384e3d..3a39a6e6 100644
--- a/source/scripts/_00e_fs_nqr03_functions.psc
+++ b/source/scripts/_00e_fs_nqr03_functions.psc
@@ -8,7 +8,7 @@ Import Utility
 
 Event OnUpdateGameTime()
 
-	SetStage(10)
+	SetCurrentStageID(10)
 
 EndEvent
 
@@ -95,7 +95,7 @@ EndFunction
 Function TeleportBrotherGalang()
 
 	_00E_PlayerFunctions.GetTeleportControl().TeleportNPC(FS_NQR03_LethoREF, FS_NQR03_BrotherGriefMarkerREF)
-	SetStage(20)
+	SetCurrentStageID(20)
 	SetObjectiveCompleted(10)
 	SetObjectiveDisplayed(15)
 	
@@ -109,7 +109,7 @@ EndFunction
 
 Function RemovePages()
 
-	FS_NQR_SQ_01.SetStage(5)
+	FS_NQR_SQ_01.SetCurrentStageID(5)
 
 	if PlayerREF.GetItemCount(_00E_FS_NQR02_MissingPages) >= 1
 		PlayerREF.RemoveItem(_00E_FS_NQR02_MissingPages, 1)
@@ -159,7 +159,7 @@ Function TeleportPlayer()
 	FS_NQR03_BrotherGreedREF.EvaluatePackage()
 	_00E_PlayerFunctions.GetTeleportControl().TeleportPlayer(FS_NQR03_DarkValleyMarkerREF)
 	
-	SetStage(75)
+	SetCurrentStageID(75)
 	RegisterForSingleUpdate(2)
 	
 EndFunction
@@ -185,11 +185,11 @@ Function UpdateObjectives_03()
 	SetObjectiveCompleted(30)
 	FS_NQR03_SisterPrideREF.SetGhost(False)
 
-	if GetStage() == 90
+	if GetCurrentStageID() == 90
 	
 		SetObjectiveDisplayed(40)
 		
-	Elseif GetStage() == 95
+	Elseif GetCurrentStageID() == 95
 	
 		SetObjectiveDisplayed(40)
 		SetObjectiveDisplayed(45)
@@ -228,7 +228,7 @@ EndFunction
 
 Function UpdateStageAndObjectivesGivenHeart()
 	
-	SetStage(100)
+	SetCurrentStageID(100)
 	
 	if IsObjectiveDisplayed(45) && !IsObjectiveDisplayed(40)
 		SetObjectiveCompleted(45)
@@ -284,7 +284,7 @@ Function FinishUp()
 	FS_NQR03_TharaelREF.Disable()
 	FS_NQR03_SphereREF.Enable()
 	_00E_EPHandler.GiveEP(iRewardEXP)
-	FS_NQR04.SetStage(5)
+	FS_NQR04.SetCurrentStageID(5)
 
 EndFunction
 
diff --git a/source/scripts/_00e_fs_nqr03_heartsc.psc b/source/scripts/_00e_fs_nqr03_heartsc.psc
index a80b3bc1..18c17011 100644
--- a/source/scripts/_00e_fs_nqr03_heartsc.psc
+++ b/source/scripts/_00e_fs_nqr03_heartsc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_FS_NQR03_HeartSC extends ObjectReference
 
 Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer)
 
-	If FS_NQR03.GetStage() >= 90 && FS_NQR03.GetStage() <= 95
+	If FS_NQR03.GetCurrentStageID() >= 90 && FS_NQR03.GetCurrentStageID() <= 95
 		If akNewContainer == PlayerREF && !bDone
 			bDone = True	
 			If bIsNessahsHeart
diff --git a/source/scripts/_00e_fs_nqr03_sisterpridetrigger.psc b/source/scripts/_00e_fs_nqr03_sisterpridetrigger.psc
index a77590f5..e553ed4d 100644
--- a/source/scripts/_00e_fs_nqr03_sisterpridetrigger.psc
+++ b/source/scripts/_00e_fs_nqr03_sisterpridetrigger.psc
@@ -2,10 +2,10 @@ scriptname _00E_FS_NQR03_SisterPrideTrigger extends objectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If akActionRef == PlayerREF && FS_NQR03.GetStage() == 80 && !bDone
+	If akActionRef == PlayerREF && FS_NQR03.GetCurrentStageID() == 80 && !bDone
 		FS_NQR03.SetObjectiveDisplayed(25, true, true)
 		EnableSisterPride()
-	ElseIf akActionRef == PlayerREF && FS_NQR03.GetStage() == 85 && !bDone
+	ElseIf akActionRef == PlayerREF && FS_NQR03.GetCurrentStageID() == 85 && !bDone
 		EnableSisterPride()
 	EndIf
 
diff --git a/source/scripts/_00e_fs_nqr03_tharaelfailsavesc.psc b/source/scripts/_00e_fs_nqr03_tharaelfailsavesc.psc
index ae5d69eb..fd16d150 100644
--- a/source/scripts/_00e_fs_nqr03_tharaelfailsavesc.psc
+++ b/source/scripts/_00e_fs_nqr03_tharaelfailsavesc.psc
@@ -8,7 +8,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == PlayerREF && !bDone
 	
-		If FS_NQR03.GetStage() == 10
+		If FS_NQR03.GetCurrentStageID() == 10
 	
 			bDone = True
 			FS_NQR03.TharaelFailsave()		
diff --git a/source/scripts/_00e_fs_nqr04_functions.psc b/source/scripts/_00e_fs_nqr04_functions.psc
index 76dc115b..3e3346c5 100644
--- a/source/scripts/_00e_fs_nqr04_functions.psc
+++ b/source/scripts/_00e_fs_nqr04_functions.psc
@@ -9,7 +9,7 @@ Import Utility
 Event OnUpdate()
 
 	; spawns in the messenger kid that gives the player the quest
-	If PlayerREF.GetCurrentLocation() == _00E_UEMAsterLocation && Self.GetStage() == 5 && (akMessengerKid.GetParentCell() != PlayerREF.GetParentCell())
+	If PlayerREF.GetCurrentLocation() == _00E_UEMAsterLocation && Self.GetCurrentStageID() == 5 && (akMessengerKid.GetParentCell() != PlayerREF.GetParentCell())
 
 		akMessengerKid = SC01_MessengerKid.GetActorReference()
 	
@@ -282,7 +282,7 @@ EndFunction
 
 Function StartCompanionQuest()
 	; gets called from dialogue option, starts the character quest
-	FS_CQT01.SetStage(5)
+	FS_CQT01.SetCurrentStageID(5)
 
 EndFunction
 
@@ -291,7 +291,7 @@ Function FinishUp()
 	; complete the quest and start the last rhalata quest
 	If !FS_CQT01.IsCompleted()
 		; stage 100 now also displays a message why the quest was failed (low sympathy)
-		FS_CQT01.SetStage(100)
+		FS_CQT01.SetCurrentStageID(100)
 	EndIf
 
 	CompleteAllObjectives()
@@ -302,7 +302,7 @@ Function FinishUp()
 	_00E_PlayerFunctions.GetSoundControl().RemoveSilence()
 	_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
 	FS_NQR04_SC05_TharaelWalkAway.ForceStart()
-	FS_NQR05.setStage(5)
+	FS_NQR05.SetCurrentStageID(5)
 	
 EndFunction
 
diff --git a/source/scripts/_00e_fs_nqr04_playerspawnmessengersc.psc b/source/scripts/_00e_fs_nqr04_playerspawnmessengersc.psc
index 352bc90a..0e6a8762 100644
--- a/source/scripts/_00e_fs_nqr04_playerspawnmessengersc.psc
+++ b/source/scripts/_00e_fs_nqr04_playerspawnmessengersc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_FS_NQR04_PlayerSpawnMessengerSC extends ReferenceAlias
 
 Event OnInit()
 
-	If FS_NQR04.GetStage() == 5 && !bDone
+	If FS_NQR04.GetCurrentStageID() == 5 && !bDone
 
 		If (PlayerREF.GetCurrentLocation() == _00E_UEMAsterLocation)
 			FS_NQR04.SpawnMessengerKid()
@@ -14,7 +14,7 @@ EndEvent
 
 Event OnLocationChange(Location akOldLoc, Location akNewLoc)
 
-	If FS_NQR04.GetStage() == 5 
+	If FS_NQR04.GetCurrentStageID() == 5 
 
 		If akNewLoc == _00E_UEMAsterLocation
 			FS_NQR04.SpawnMessengerKid()
diff --git a/source/scripts/_00e_fs_nqr04_sc04_tharaelsc.psc b/source/scripts/_00e_fs_nqr04_sc04_tharaelsc.psc
index 928ad7cb..502f3b4d 100644
--- a/source/scripts/_00e_fs_nqr04_sc04_tharaelsc.psc
+++ b/source/scripts/_00e_fs_nqr04_sc04_tharaelsc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_FS_NQR04_SC04_TharaelSC extends ReferenceAlias
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if FS_NQR04.GetStage() == 60
+	if FS_NQR04.GetCurrentStageID() == 60
 	
 		_00E_FS_NQR04_SC04_TharaelMSG.Show()
 	
diff --git a/source/scripts/_00e_fs_nqr04_tharaelaitrigger.psc b/source/scripts/_00e_fs_nqr04_tharaelaitrigger.psc
index f8194eaf..b083aa6f 100644
--- a/source/scripts/_00e_fs_nqr04_tharaelaitrigger.psc
+++ b/source/scripts/_00e_fs_nqr04_tharaelaitrigger.psc
@@ -1,7 +1,7 @@
 scriptname _00E_FS_NQR04_TharaelAITrigger extends ObjectReference 
 {This script makes sure that Tharael is no longer allied to the player if they decide to leave}
 Event OnTriggerEnter(ObjectReference akActionRef)
-	If akActionRef == Game.GetPlayer() && FS_NQR04.GetStage() >= 30 && FS_NQR04.GetStage() < 35
+	If akActionRef == Game.GetPlayer() && FS_NQR04.GetCurrentStageID() >= 30 && FS_NQR04.GetCurrentStageID() < 35
 		_00E_Func_SetNPCAsCompanion.SetNPCAsCompanion(_00E_FS_NQR04_TharaelREF, True, 550, 500, 100)
 	EndIf
 EndEvent
diff --git a/source/scripts/_00e_fs_nqr05_anistuckfixsc.psc b/source/scripts/_00e_fs_nqr05_anistuckfixsc.psc
index 0539cd22..45923dec 100644
--- a/source/scripts/_00e_fs_nqr05_anistuckfixsc.psc
+++ b/source/scripts/_00e_fs_nqr05_anistuckfixsc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_FS_NQR05_AniStuckFixSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 	
-	If (FS_NQR05.GetStage() >= 25 && FS_NQR05.GetStage() <= 40) && akActionRef == PlayerREF && PlayerREF.IsWeaponDrawn()
+	If (FS_NQR05.GetCurrentStageID() >= 25 && FS_NQR05.GetCurrentStageID() <= 40) && akActionRef == PlayerREF && PlayerREF.IsWeaponDrawn()
 		PlayerREF.AddItem(GasTrapDummy, 1, 1)
 		PlayerREF.EquipItem(GasTrapDummy, 0, 1)
 		Utility.Wait(1)
diff --git a/source/scripts/_00e_fs_nqr05_bossfight_fathersc.psc b/source/scripts/_00e_fs_nqr05_bossfight_fathersc.psc
index 317db8bc..16e425e0 100644
--- a/source/scripts/_00e_fs_nqr05_bossfight_fathersc.psc
+++ b/source/scripts/_00e_fs_nqr05_bossfight_fathersc.psc
@@ -6,7 +6,7 @@ Scriptname _00E_FS_NQR05_Bossfight_FatherSC extends ReferenceAlias Conditional
 
 Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile, bool abPowerAttack, bool abSneakAttack, bool abBashAttack, bool abHitBlocked)
 
-	If !bIsEnemy && FS_NQR05.GetStage() == 320
+	If !bIsEnemy && FS_NQR05.GetCurrentStageID() == 320
 
 		If !bSideChosen && akAggressor == PlayerREF && (FS_NQR05_SidedWithTharael.GetValueInt() == 0 && FS_NQR05_SidedWithFather.GetValueInt() == 0) 
 			SideAgainstFather()
@@ -18,7 +18,7 @@ EndEvent
 
 Event OnUpdate()
 	
-	If FS_NQR05.GetStage() == 320
+	If FS_NQR05.GetCurrentStageID() == 320
 		If !bAttemptingToFloat && !FS_NQR05_FatherREF.IsDead() && _00E_FS_NQR05_TeleportationOngoing.GetValueInt() == 0 && FS_NQR05_SidedWithTharael.GetValueInt() == 1
 
 			CastSpecialAttack()
@@ -37,7 +37,7 @@ Event OnDying(Actor akKiller)
 	Self.GetReference().BlockActivation(True)
 	FS_NQR05.FS_NQR05_SC19_02_Cinematic.Stop()
 	FS_NQR05.StopMusic()
-	FS_NQR05.SetStage(325)
+	FS_NQR05.SetCurrentStageID(325)
 	
 EndEvent
 
@@ -54,7 +54,7 @@ Function SideAgainstFather()
 	FS_NQR05_SidedWithTharael.SetValueInt(1)
 	FS_NQR05_SidedWithFather.SetValueInt(0)
 	FS_NQR05.SideWithCharacter(FS_NQR05_TharaelREF)
-	If FS_NQR05.GetStage() < 325
+	If FS_NQR05.GetCurrentStageID() < 325
 		RegisterForSpecialAttack(5.0)
 	EndIf
 
@@ -198,7 +198,7 @@ Function EndSpecialAttack()
 	
 	GhostRedFXShader.Stop(FS_NQR05_FatherREF)
 	
-	If FS_NQR05.GetStage() < 325
+	If FS_NQR05.GetCurrentStageID() < 325
 		RegisterForSpecialAttack(35)
 	EndIf
 	
diff --git a/source/scripts/_00e_fs_nqr05_bossfight_tharaelsc.psc b/source/scripts/_00e_fs_nqr05_bossfight_tharaelsc.psc
index 56a31487..0aac5496 100644
--- a/source/scripts/_00e_fs_nqr05_bossfight_tharaelsc.psc
+++ b/source/scripts/_00e_fs_nqr05_bossfight_tharaelsc.psc
@@ -14,7 +14,7 @@ EndEvent
 
 Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile, bool abPowerAttack, bool abSneakAttack, bool abBashAttack, bool abHitBlocked)
 
-	If FS_NQR05.GetStage() == 320
+	If FS_NQR05.GetCurrentStageID() == 320
 	
 		If !bIsEnemy && FS_NQR05_SidedWithTharael.GetValueInt() == 0 && FS_NQR05_SidedWithFather.GetValueInt() == 0
 
@@ -42,7 +42,7 @@ EndEvent
 
 Event OnDeath(Actor akKiller)
 
-	FS_NQR05.SetStage(325)
+	FS_NQR05.SetCurrentStageID(325)
 	
 EndEvent
 
@@ -59,7 +59,7 @@ Function SideAgainstTharael()
 	FS_NQR05_SidedWithTharael.SetValueInt(0)
 	FS_NQR05_SidedWithFather.SetValueInt(1)
 	FS_NQR05.SideWithCharacter(FS_NQR05_FatherREF)
-	If FS_NQR05.GetStage() < 325 ; just in case the player one-shots Tharaêl
+	If FS_NQR05.GetCurrentStageID() < 325 ; just in case the player one-shots Tharaêl
 		RegisterForSpecialAttack(20.0)
 	EndIf
 
@@ -249,7 +249,7 @@ Function StopSpecialAttack()
 	FS_NQR05_TharaelREF.EvaluatePackage()
 	FS_NQR05_TharaelREF.StartCombat(PlayerREF)
 	FS_NQR05_TharaelREF.SetGhost(False)
-	If FS_NQR05.GetStage() < 325	
+	If FS_NQR05.GetCurrentStageID() < 325	
 		RegisterForSpecialAttack(30.0)
 	EndIf
 	Father.TeleportBack()
diff --git a/source/scripts/_00e_fs_nqr05_fathermaskpickup.psc b/source/scripts/_00e_fs_nqr05_fathermaskpickup.psc
index c0afbd43..83388017 100644
--- a/source/scripts/_00e_fs_nqr05_fathermaskpickup.psc
+++ b/source/scripts/_00e_fs_nqr05_fathermaskpickup.psc
@@ -18,7 +18,7 @@ Event OnActivate(ObjectReference akActivator)
 	endif
 	
 	Self.delete()
-	FS_NQR05.setStage(335)
+	FS_NQR05.SetCurrentStageID(335)
 	
 Endevent
 
diff --git a/source/scripts/_00e_fs_nqr05_functions.psc b/source/scripts/_00e_fs_nqr05_functions.psc
index 7db24212..9392663e 100644
--- a/source/scripts/_00e_fs_nqr05_functions.psc
+++ b/source/scripts/_00e_fs_nqr05_functions.psc
@@ -10,18 +10,18 @@ int iTimer
 bool bSlowMoActive
 
 Event OnSleepStop(bool abInterrupted)
-	;If !(MQ09.GetStage() >= 5) && !(MQ09.GetStage() < 80) ; awakening in train in MQ09, awakening after 2nd Dream on the boat in MQ10a/b?, 3rd Dream in MQ12c Dream after siege, awakening in FS_MQ18c, in MQ06 in the curarium
-		SetStage(10)
+	;If !(MQ09.GetCurrentStageID() >= 5) && !(MQ09.GetCurrentStageID() < 80) ; awakening in train in MQ09, awakening after 2nd Dream on the boat in MQ10a/b?, 3rd Dream in MQ12c Dream after siege, awakening in FS_MQ18c, in MQ06 in the curarium
+		SetCurrentStageID(10)
 	;EndIf
 endEvent
 
 Event OnUpdate()
 
-	If GetStage() == 215
+	If GetCurrentStageID() == 215
 	
 		ShootArrow()
 	
-	ElseIf GetStage() == 320
+	ElseIf GetCurrentStageID() == 320
 
 		If iTimer < 0 && !bSlowMoActive
 			iTimer += 1
@@ -333,7 +333,7 @@ Function OpenPortal()
 	FS_NQR05_FatherPortal_Outside_REF.PlayGamebryoAnimation("AnimIdle02")
 	; initiating player AI walk without locking vision controls
 	_00E_Func_AIWalk.PlayerAIWalk(false)
-	SetStage(125)
+	SetCurrentStageID(125)
 	
 EndFunction
 
@@ -404,7 +404,7 @@ Function StartSC07()
 
 	; Called in Phase 10, SC06
 	; creates the copy of the father, needs to enabled before being moved to the marker
-	SetStage(130)
+	SetCurrentStageID(130)
 	FS_NQR05_SC07_FatherREF.Enable()
 	FS_NQR05_SC07_FatherREF.SetAlpha(0.0)
 	FS_NQR05_SC07_FatherREF.MoveTo(FS_NQR05_SC08_FatherArrivalMarker)
@@ -473,7 +473,7 @@ Function EnableWaitMarker()
 	Game.EnablePlayerControls()
 	FS_NQR05_SC11_PlayerDoorREF.BlockActivation(True)
 	FS_NQR05_SC10_SisterLustGroup.ForceStart()
-	SetStage(145)
+	SetCurrentStageID(145)
 	
 EndFunction
 
@@ -669,7 +669,7 @@ Function KillZarah()
 	FS_NQR05_ZaraahREF.Kill(FS_NQR05_TharaelREF)
 	_00E_BloodyFXShader.Play(FS_NQR05_ZaraahREF)
 	FS_NQR05_ZaraahREF.DamageActorValue("Health", 10000)
-	SetStage(220)
+	SetCurrentStageID(220)
 
 EndFunction
 
@@ -713,7 +713,7 @@ Function HeartAbsorbZaraah()
 	; enables Zar'Ahs soul for the Phasmalist
 	(FS_NQR05_ZaraahSoulREF as _00E_Phasmalist_Soul).updateCanSee(true)
 	FS_NQR05_ElkREF.Disable()
-	SetStage(225)
+	SetCurrentStageID(225)
 
 EndFunction
 
@@ -905,7 +905,7 @@ Function StartFightReal()
 	FXExplosionCatapultNearM.Play(PlayerREF)
 	FS_NQR05_BattleLinkerREF.Enable()
 	FS_NQR05_BossfightFireParent.Enable()
-	SetStage(251)
+	SetCurrentStageID(251)
 	FS_NQR05_Abnormality.RegisterCombatStart()
 
 EndFunction
@@ -970,7 +970,7 @@ Function PlaceRune()
 	FadeToBlackBackIMOD.ApplyCrossFade()
 	Wait(2)
 	ActivateRune()
-	SetStage(261)
+	SetCurrentStageID(261)
 	
 Endfunction
 
@@ -1506,7 +1506,7 @@ Function stunPlayer()
 	_00E_NPCKillBodyfall.Play(PlayerREF)
 	
 	Wait(6.0)
-	SetStage(330)
+	SetCurrentStageID(330)
 	
 Endfunction
 
@@ -1520,8 +1520,8 @@ EndFunction
 Function AssumeOwnership()
 	
 	; add the horsefute to the player by starting the quest when interacting with the gift of the father
-	If NQ06_Freda.GetStage() < 5
-		NQ06_Freda.SetStage(5)
+	If NQ06_Freda.GetCurrentStageID() < 5
+		NQ06_Freda.SetCurrentStageID(5)
 	EndIf
 	
 	NQ06.AddHorseFlute()
@@ -1701,7 +1701,7 @@ EndFunction
 
 Function Continue()
 
-	Self.SetStage(350)
+	Self.SetCurrentStageID(350)
 	_00E_BloodyFXShader.Play(FS_NQR05_TharaelREF)
 	FS_NQR05_SC21_LethoStitched.EnableAI(False)
 	WakeUp()
@@ -1740,7 +1740,7 @@ Function KillTharael()
 	FS_NQR05_TharaelREF.Disable()
 	FS_NQR05_TharaelCorpseREF.Enable()
 	Wait(5)
-	SetStage(370)
+	SetCurrentStageID(370)
 	FS_NQR05_SC21_CollisionREF.Enable()
 	_00E_Func_AIWalk.PlayerAIWalkStop()
 	
diff --git a/source/scripts/_00e_fs_nqr05_weathertriggersc.psc b/source/scripts/_00e_fs_nqr05_weathertriggersc.psc
index 7074c923..e844737e 100644
--- a/source/scripts/_00e_fs_nqr05_weathertriggersc.psc
+++ b/source/scripts/_00e_fs_nqr05_weathertriggersc.psc
@@ -8,7 +8,7 @@ Scriptname _00E_FS_NQR05_WeatherTriggerSC extends ObjectReference
 Event OnTriggerEnter (ObjectReference akActionREF)
 
 	if akActionREF == PlayerREF	
-		if (FS_NQR05.GetStage() >= 65) && (FS_NQR05.GetStage() <= 180)
+		if (FS_NQR05.GetCurrentStageID() >= 65) && (FS_NQR05.GetCurrentStageID() <= 180)
 			_00E_FS_NQR05_SiteWeather.SetActive(True)
 		EndIf
 	EndIf
diff --git a/source/scripts/_00e_game_playerhouse_documentsc.psc b/source/scripts/_00e_game_playerhouse_documentsc.psc
index d2aaaec5..3511d9a3 100644
--- a/source/scripts/_00e_game_playerhouse_documentsc.psc
+++ b/source/scripts/_00e_game_playerhouse_documentsc.psc
@@ -29,11 +29,11 @@ Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldCo
 	
 	If !NQ24.IsCompleted()
 		If !NQ24.IsRunning()
-			NQ24.SetStage(5)
+			NQ24.SetCurrentStageID(5)
 			Utility.Wait(2)
-			NQ24.SetStage(10)
+			NQ24.SetCurrentStageID(10)
 		Else
-			NQ24.SetStage(10)
+			NQ24.SetCurrentStageID(10)
 		EndIf
 	EndIf
 	
diff --git a/source/scripts/_00e_game_skillmenuleavesc.psc b/source/scripts/_00e_game_skillmenuleavesc.psc
index ebeedfec..61334da7 100644
--- a/source/scripts/_00e_game_skillmenuleavesc.psc
+++ b/source/scripts/_00e_game_skillmenuleavesc.psc
@@ -26,7 +26,7 @@ EndEvent
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If akActionRef == PlayerREF && MQP03.GetStage() >= 15
+	If akActionRef == PlayerREF && MQP03.GetCurrentStageID() >= 15
 		iMappedKeyCode = Input.GetMappedKey("Shout")
 		RegisterForKey(iMappedKeyCode)
 		Game.RequestAutoSave()
diff --git a/source/scripts/_00e_gypsyminstrelscontrolscript.psc b/source/scripts/_00e_gypsyminstrelscontrolscript.psc
index f5fbe094..9038a0cc 100644
--- a/source/scripts/_00e_gypsyminstrelscontrolscript.psc
+++ b/source/scripts/_00e_gypsyminstrelscontrolscript.psc
@@ -68,10 +68,10 @@ Function UpdateWaypoint()
 	EndWhile
 	WaypointUpdateLocked = True
 
-	If MQ14.GetStage() >= 40
+	If MQ14.GetCurrentStageID() >= 40
 		; When we reach the endgame in MQ14, the schedule does not matter anymore
 		SetNewWaypoint(WAYPOINT_SANDBOX_INN, True, -1.0)
-	ElseIf MQ12b.GetStage() >= 45 && MQ12c_Debris_Level_02_Linker.IsDisabled()
+	ElseIf MQ12b.GetCurrentStageID() >= 45 && MQ12c_Debris_Level_02_Linker.IsDisabled()
 		; When the siege of Ark starts, force the minstrels to the inn and keep them there while the streets are cleaned up from debris and bodies.
 		Float nextUpdateTime = TIME_PERFORMANCE_START - GameHour.GetValue()
 		If nextUpdateTime < 0.0
diff --git a/source/scripts/_00e_heroldscript.psc b/source/scripts/_00e_heroldscript.psc
index e83d562c..afac814e 100644
--- a/source/scripts/_00e_heroldscript.psc
+++ b/source/scripts/_00e_heroldscript.psc
@@ -85,8 +85,8 @@ Function _TryPlayNextHeroldScene()
 			; ArkGenericDialogue start failsafe?
 			If DoOnce == False 
 				DoOnce = True
-				If ArkGenericDialogue.GetStage() < 5
-					ArkGenericDialogue.SetStage(5)
+				If ArkGenericDialogue.GetCurrentStageID() < 5
+					ArkGenericDialogue.SetCurrentStageID(5)
 					Utility.Wait(1.0) ; Warm up ArkGenericDialogue
 				EndIf
 			EndIf
@@ -94,13 +94,13 @@ Function _TryPlayNextHeroldScene()
 			; Try start new scene
 			Int iNewScene = 0
 
-			If MQ12b.GetStage() >= 10
+			If MQ12b.GetCurrentStageID() >= 10
 				If bSiegeScenePlayed == False
 					iNewScene = 4
 				Else
 					iNewScene = GetNextHeroldScene(3, 4)
 				EndIf
-			ElseIf MQ09.GetStage() >= 10
+			ElseIf MQ09.GetCurrentStageID() >= 10
 				If bWarScenePlayed == False
 					iNewScene = 3
 				Else
diff --git a/source/scripts/_00e_losegamewhendetectedtrigger.psc b/source/scripts/_00e_losegamewhendetectedtrigger.psc
index a43bbbb7..802d157e 100644
--- a/source/scripts/_00e_losegamewhendetectedtrigger.psc
+++ b/source/scripts/_00e_losegamewhendetectedtrigger.psc
@@ -3,7 +3,7 @@ Scriptname _00E_LoseGameWhenDetectedTrigger extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 if akActionRef == Game.GetPlayer()
-		if (SneakQuest.GetStage() == SneakQuestStage)
+		if (SneakQuest.GetCurrentStageID() == SneakQuestStage)
 			NQ_G_07_Dijaam.ShowSpottedMessageAndLoseGame()
 		EndIf
 EndIf
diff --git a/source/scripts/_00e_modifyweathercomplexsc.psc b/source/scripts/_00e_modifyweathercomplexsc.psc
index eb1355e2..fed60a59 100644
--- a/source/scripts/_00e_modifyweathercomplexsc.psc
+++ b/source/scripts/_00e_modifyweathercomplexsc.psc
@@ -8,7 +8,7 @@ Event OnTriggerEnter (ObjectReference akActionREF)
 
 	if akActionREF == PlayerREF
 		
-		if (QuestToSet.GetStage() >= iMinStage) && (QuestToSet.GetStage() <= iMaxStage)
+		if (QuestToSet.GetCurrentStageID() >= iMinStage) && (QuestToSet.GetCurrentStageID() <= iMaxStage)
 			
 			if bForceActive
 				WeatherToSet.ForceActive(True)
diff --git a/source/scripts/_00e_mq00_trigbox00script.psc b/source/scripts/_00e_mq00_trigbox00script.psc
index a27230e9..4f51aee9 100644
--- a/source/scripts/_00e_mq00_trigbox00script.psc
+++ b/source/scripts/_00e_mq00_trigbox00script.psc
@@ -20,7 +20,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 			Game.GetPlayer().SetRace(NordRaceChild) 					; Set player race to child
 
 			Debug.MessageBox("Yippee, jetzt bin ich Jorle Rostlöffel!")
-			_00E_MQ00.SetStage(0)									; Starts _00E_MQ00 Quest
+			_00E_MQ00.SetCurrentStageID(0)									; Starts _00E_MQ00 Quest
 
 			DoOnce = -1
 
diff --git a/source/scripts/_00e_mq00tempelkonstrukttriggbox.psc b/source/scripts/_00e_mq00tempelkonstrukttriggbox.psc
index eba1244d..b084315a 100644
--- a/source/scripts/_00e_mq00tempelkonstrukttriggbox.psc
+++ b/source/scripts/_00e_mq00tempelkonstrukttriggbox.psc
@@ -27,7 +27,7 @@ if(akActionRef == Game.GetPlayer())
 		_00E_Event01Single.Add()
 	        Game.ForceThirdPerson()
 		Game.SetPlayerAIDriven(true)
-		_00E_MQ00TempelScene.SetStage(10)
+		_00E_MQ00TempelScene.SetCurrentStageID(10)
 		Game.GetPlayer().EvaluatePackage()
 		Utility.Wait(0.5)
 		;Game.GetPlayer().PlayIdle(IdleWalkingCameraStart)
@@ -42,7 +42,7 @@ if(akActionRef == Game.GetPlayer())
 	endif
 
 
-	if ( _00E_MQ00TempelScene.GetStage() == 20 )	
+	if ( _00E_MQ00TempelScene.GetCurrentStageID() == 20 )	
 		Game.GetPlayer().PlayIdle(IdleWalkingCameraEnd)
 		Game.DisablePlayerControls(ablooking = true, abCamSwitch = true)
 	       Game.ForceFirstPerson()
diff --git a/source/scripts/_00e_mq00tempelkonstrukttriggboxb.psc b/source/scripts/_00e_mq00tempelkonstrukttriggboxb.psc
index c03ed666..66e67ea3 100644
--- a/source/scripts/_00e_mq00tempelkonstrukttriggboxb.psc
+++ b/source/scripts/_00e_mq00tempelkonstrukttriggboxb.psc
@@ -43,7 +43,7 @@ if(akActionRef == Game.GetPlayer())
 		Game.DisablePlayerControls(ablooking = true, abCamSwitch = true)
 	        
 		_00E_MQ00TempleIMSMO01.apply()
-		_00E_MQ00TempelScene.SetStage(20)
+		_00E_MQ00TempelScene.SetCurrentStageID(20)
 		Utility.Wait(0.5)
 		PlayerREF.SetAlpha(0)
 		PlayerREF.SetGhost(True)
@@ -73,7 +73,7 @@ if(akActionRef == Game.GetPlayer())
 		Utility.Wait(2.0)
 		
 		MQ00RefMagicBlue.TranslateToRef(MQ00LightTransferRef, 200)
-		_00E_MQ00TempelScene.SetStage(30)
+		_00E_MQ00TempelScene.SetCurrentStageID(30)
 		_00E_DerBote.EvaluatePackage()
 		Utility.Wait(2.0)
 		_00E_DerBote.Say(_00E_MQ00TempelSceneDialogTopic03, _00E_Anfuehrer)
diff --git a/source/scripts/_00e_mq01_functions.psc b/source/scripts/_00e_mq01_functions.psc
index b77a3f3d..b2d0f807 100644
--- a/source/scripts/_00e_mq01_functions.psc
+++ b/source/scripts/_00e_mq01_functions.psc
@@ -108,7 +108,7 @@ function BeginVision()
 	_00E_MQ01_FinnREF.EnableAI(False)
 	_00E_MQ01_CarbosREF.EnableAI(False)
 	Wait(11)
-	SetStage(50)
+	SetCurrentStageID(50)
 	
 endFunction
 
@@ -244,7 +244,7 @@ Function CleanUp()
 	Wait(1)
 	MQ02.Start()
 	FadeToBlackHoldImod.Remove()
-	MQ02.SetStage(10)
+	MQ02.SetCurrentStageID(10)
 	
 EndFunction
 
diff --git a/source/scripts/_00e_mq01_killerarrow02script.psc b/source/scripts/_00e_mq01_killerarrow02script.psc
index fc873fb4..0b621155 100644
--- a/source/scripts/_00e_mq01_killerarrow02script.psc
+++ b/source/scripts/_00e_mq01_killerarrow02script.psc
@@ -11,7 +11,7 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)
 	PlayerREF.SplineTranslateToRef(PlayerThrowMarker, 100, 2000)
 	MAGFireBallExpImod.Apply()
 	Utility.Wait(4)
-	MQ01_UnchartedLand.SetStage(130)
+	MQ01_UnchartedLand.SetCurrentStageID(130)
 
 
 EndEvent
diff --git a/source/scripts/_00e_mq01_playerknockoutscript.psc b/source/scripts/_00e_mq01_playerknockoutscript.psc
index da489095..76e2ce6d 100644
--- a/source/scripts/_00e_mq01_playerknockoutscript.psc
+++ b/source/scripts/_00e_mq01_playerknockoutscript.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ01_PlayerKnockoutScript extends ReferenceAlias
 
 Event OnTranslationComplete()
 
-	if MQ01New.GetStage() < 130
+	if MQ01New.GetCurrentStageID() < 130
 		_00E_NPCKillBodyfall.Play(Game.GetPlayer())
 		FadeToBlackHoldImod.Apply()
 	EndIf
diff --git a/source/scripts/_00e_mq01_setstageonactivatesit.psc b/source/scripts/_00e_mq01_setstageonactivatesit.psc
index 5d203be9..c1926ef3 100644
--- a/source/scripts/_00e_mq01_setstageonactivatesit.psc
+++ b/source/scripts/_00e_mq01_setstageonactivatesit.psc
@@ -10,7 +10,7 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if (akActionRef == PlayerREF) && (MQ01.GetStage() == 30)
+	if (akActionRef == PlayerREF) && (MQ01.GetCurrentStageID() == 30)
 	
 		if PlayerREF.IsEquipped(Torch01)
 			PlayerREF.UnequipItem(Torch01)
@@ -18,7 +18,7 @@ Event OnActivate(ObjectReference akActionRef)
 
 		Self.Activate(PlayerREF, True)
 		Game.DisablePlayerControls(true, true, false, false, true, false, false, true)
-		MQ01.SetStage(32)
+		MQ01.SetCurrentStageID(32)
 
 	EndIf
 
diff --git a/source/scripts/_00e_mq01_triggerrangebox02.psc b/source/scripts/_00e_mq01_triggerrangebox02.psc
index 6b77e25a..39d06464 100644
--- a/source/scripts/_00e_mq01_triggerrangebox02.psc
+++ b/source/scripts/_00e_mq01_triggerrangebox02.psc
@@ -2,8 +2,8 @@ Scriptname _00E_MQ01_TriggerRangeBox02 extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-if (MQ01_UnchartedLand.GetStage() >= 70) && (MQ01_UnchartedLand.GetStage() <= 72) && (akActionRef == Game.GetPlayer())
-	MQ01_UnchartedLand.SetStage(75)
+if (MQ01_UnchartedLand.GetCurrentStageID() >= 70) && (MQ01_UnchartedLand.GetCurrentStageID() <= 72) && (akActionRef == Game.GetPlayer())
+	MQ01_UnchartedLand.SetCurrentStageID(75)
 	Self.Disable()
 EndIf
 
diff --git a/source/scripts/_00e_mq01_triggerrangeboxscript.psc b/source/scripts/_00e_mq01_triggerrangeboxscript.psc
index e911d8c9..1c5867ef 100644
--- a/source/scripts/_00e_mq01_triggerrangeboxscript.psc
+++ b/source/scripts/_00e_mq01_triggerrangeboxscript.psc
@@ -5,8 +5,8 @@ Scriptname _00E_MQ01_TriggerRangeBoxScript extends ObjectReference
 Event OnTriggerLeave(ObjectReference akActionRef)
 
 
-if !(MQ01_UnchartedLand.GetStage() == 70) && (akActionRef == Game.GetPlayer())
-MQ01_UnchartedLand.SetStage(70)
+if !(MQ01_UnchartedLand.GetCurrentStageID() == 70) && (akActionRef == Game.GetPlayer())
+MQ01_UnchartedLand.SetCurrentStageID(70)
 Debug.Trace("Left trigger, set stage")
 Self.Disable()
 EndIf
diff --git a/source/scripts/_00e_mq01_updatestageonleavescript.psc b/source/scripts/_00e_mq01_updatestageonleavescript.psc
index c6a26db1..6d99c847 100644
--- a/source/scripts/_00e_mq01_updatestageonleavescript.psc
+++ b/source/scripts/_00e_mq01_updatestageonleavescript.psc
@@ -2,8 +2,8 @@ Scriptname _00E_MQ01_UpdateStageOnLeaveScript extends ObjectReference
 
 Event OnTriggerLeave(ObjectReference akActionRef)
 
-	if (MQ01.GetStage() == 60) && (akActionRef == Game.GetPlayer())
-		MQ01.SetStage(65)
+	if (MQ01.GetCurrentStageID() == 60) && (akActionRef == Game.GetPlayer())
+		MQ01.SetCurrentStageID(65)
 	Else
 		Return
 	EndIf
diff --git a/source/scripts/_00e_mq01b_changetrigboxscript.psc b/source/scripts/_00e_mq01b_changetrigboxscript.psc
index dc83e3d6..5adb2599 100644
--- a/source/scripts/_00e_mq01b_changetrigboxscript.psc
+++ b/source/scripts/_00e_mq01b_changetrigboxscript.psc
@@ -18,7 +18,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 			MQ01TempleIntactMarkerRef.Disable()
 			MQ01TempleDestroyedMarkerRef.Enable()
 
-			_00E_MQ01b.SetStage(10)	
+			_00E_MQ01b.SetCurrentStageID(10)	
 
 			DoOnce = -1
 		endif
diff --git a/source/scripts/_00e_mq02_d3_alfridbenchscript.psc b/source/scripts/_00e_mq02_d3_alfridbenchscript.psc
index f8cf7cc5..7eab7aed 100644
--- a/source/scripts/_00e_mq02_d3_alfridbenchscript.psc
+++ b/source/scripts/_00e_mq02_d3_alfridbenchscript.psc
@@ -4,10 +4,10 @@ Import Utility
 
 Event OnActivate(ObjectReference akActionRef)
 
-if (akActionRef == PlayerREF) && (MQ02.GetStage() == 45)
+if (akActionRef == PlayerREF) && (MQ02.GetCurrentStageID() == 45)
 	if (Alfrid.GetActorReference().GetSitState() == 3)
 		Wait(2)
-		MQ02.SetStage(47)
+		MQ02.SetCurrentStageID(47)
 	Else
 		RegisterForSingleUpdate(1)
 	EndIf
@@ -18,12 +18,12 @@ EndEvent
 Event OnUpdate()
 	if (Alfrid.GetActorReference().GetSitState() == 3)
 		If (PlayerREF.GetSitState() == 3)
-			MQ02.SetStage(47)
+			MQ02.SetCurrentStageID(47)
 		Elseif (PlayerREF.GetSitState() == 2)
 			Wait(1.5)
-			MQ02.SetStage(47)
+			MQ02.SetCurrentStageID(47)
 		Else
-			MQ02.SetStage(47)
+			MQ02.SetCurrentStageID(47)
 		EndIf
 	Else
 		RegisterForSingleUpdate(1)
diff --git a/source/scripts/_00e_mq02_d7_followstartboxsc.psc b/source/scripts/_00e_mq02_d7_followstartboxsc.psc
index a11fd833..77dde2fd 100644
--- a/source/scripts/_00e_mq02_d7_followstartboxsc.psc
+++ b/source/scripts/_00e_mq02_d7_followstartboxsc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ02_D7_FollowStartBoxSC extends ObjectReference
 Event OnTriggerLeave(ObjectReference akActionRef)
 
 	If (akActionRef == PlayerREF)
-		If(MQ02.GetStage() >= 140) && (MQ02.GetStage() < 160 )
+		If(MQ02.GetCurrentStageID() >= 140) && (MQ02.GetCurrentStageID() < 160 )
 					_00E_MQ02_TravelState.SetValue(0)
 		Endif
 	Endif
diff --git a/source/scripts/_00e_mq02_doorcrashfailsavesc.psc b/source/scripts/_00e_mq02_doorcrashfailsavesc.psc
index 81ee6070..3fce40bb 100644
--- a/source/scripts/_00e_mq02_doorcrashfailsavesc.psc
+++ b/source/scripts/_00e_mq02_doorcrashfailsavesc.psc
@@ -7,7 +7,7 @@ Event OnActivate(ObjectReference akActionRef)
 
 	if !bDone
 
-		if akActionRef == PlayerREF && MQ02.GetStage() == 140 
+		if akActionRef == PlayerREF && MQ02.GetCurrentStageID() == 140 
 
 			_00E_MC_JesparREF.Disable()
 			
diff --git a/source/scripts/_00e_mq02_functions.psc b/source/scripts/_00e_mq02_functions.psc
index a1cd219b..2de2e631 100644
--- a/source/scripts/_00e_mq02_functions.psc
+++ b/source/scripts/_00e_mq02_functions.psc
@@ -20,7 +20,7 @@ Function MovePlayerAndJesparToStart()
 	_00E_MC_JesparREF.Enable()
 	_00E_MC_JesparREF.MoveTo(MQ02_D0_JesparSpawnMarker)
 	Wait(0.3)
-	Self.SetStage(15)
+	Self.SetCurrentStageID(15)
 	
 EndFunction
 
@@ -30,7 +30,7 @@ Function WakeUpPlayer()
 	PlayerRef.PlayIdle(Idle_1stPersonWoozyGetUpFromBed)
 	FadeToBlackHoldImod.Remove()
 	_00E_MQ02_WakeUp.Apply()
-	Self.SetStage(20)
+	Self.SetCurrentStageID(20)
 	RequestAutoSave()
 	EnablePlayerControls()
 	_00E_SilenceLongTransitionHighPriority.Remove()
@@ -60,7 +60,7 @@ Function FadeOutAndBack()
 	_00E_MC_JesparREF.Enable()
 	_00E_MC_JesparREF.MoveTo(MQ02_D0_JesparSpawnMarker)
 	EnablePlayerControls()
-	SetStage(30)
+	SetCurrentStageID(30)
 	ShowFirstPersonGeometry(true)
 	
 EndFunction
@@ -93,7 +93,7 @@ EndFunction
 Function CheckIfObjectivesAreCompleted()
 
 	if (Self.IsObjectiveCompleted(15)) && (Self.IsObjectiveCompleted(25))
-		Self.SetStage(55)
+		Self.SetCurrentStageID(55)
 	Else
 		Return
 	EndIf
@@ -175,7 +175,7 @@ Function TeleportJesparAway()
 
 	PlayerREF.AddItem(_01E_TeleportrolleFlusshaim, 1, false)
 	_00E_PlayerFunctions.GetTeleportControl().TeleportNPC(_00E_MC_JesparREF, MQ02_D5_JesparTeleportMarker)
-	Self.SetStage(135)
+	Self.SetCurrentStageID(135)
 	SetFlusshaimTavernBarStoolsOwner(PlayerREF.GetActorBase())
 	
 EndFunction
@@ -231,7 +231,7 @@ Function WaitForNightfall()
 	FadeToBlackAndBackIMOD02.Apply()
 	Wait(3)
 	_00E_TimeControl.SkipTimeToHour(3)
-	SetStage(140)
+	SetCurrentStageID(140)
 	
 EndFunction
 
@@ -306,10 +306,10 @@ Function FinishQuest()
 	_00E_PlayerFunctions.GetSoundControl().RemoveSilence()
 	_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
 	EnablePlayerControls()
-	MQ03.SetStage(5)
+	MQ03.SetCurrentStageID(5)
 	; SE: No such objective.
 	; Self.SetObjectiveCompleted(70)
-	Self.SetStage(175)
+	Self.SetCurrentStageID(175)
 	_00E_MC_JesparREF.EvaluatePackage()
 	MyradWardenFlusshaim.EnableNoWait()
 	PlayerREF.RemoveItem(_00E_MQ02YeroBook)
@@ -349,7 +349,7 @@ Function TryToInsertStick(ObjectReference ActivatorREF)
 	
 	ObjectReference LinkedREF = ActivatorREF.GetLinkedRef()
 	
-	If GetStage() == 70 && LinkedREF.IsDisabled()
+	If GetCurrentStageID() == 70 && LinkedREF.IsDisabled()
 	
 		If CurrentValue == 0
 	
@@ -378,7 +378,7 @@ Function TryToInsertStick(ObjectReference ActivatorREF)
 			
 			UnregisterForUpdate()
 			MQ02_Puzzle_DoorREF.Activate(ActivatorREF as objectReference)
-			SetStage(80)
+			SetCurrentStageID(80)
 		
 			If _00E_MQ02_Riddle_IsThisTheFirstRun.GetValueInt() == 1
 				Steam.UnlockAchievement("END_STARLING_PUZZLE_01")
diff --git a/source/scripts/_00e_mq02_secretleversscn.psc b/source/scripts/_00e_mq02_secretleversscn.psc
index 11a60d43..1f25ae18 100644
--- a/source/scripts/_00e_mq02_secretleversscn.psc
+++ b/source/scripts/_00e_mq02_secretleversscn.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ02_SecretLeversSCN extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 	
-	If MQ02.GetStage() == 70 && self.GetLinkedRef().IsDisabled()
+	If MQ02.GetCurrentStageID() == 70 && self.GetLinkedRef().IsDisabled()
 		
 		(MQ02 as _00E_MQ02_Functions).TryToInsertStick(Self)
 	
diff --git a/source/scripts/_00e_mq02_yerosbookscn.psc b/source/scripts/_00e_mq02_yerosbookscn.psc
index a3e70de2..141b1d6e 100644
--- a/source/scripts/_00e_mq02_yerosbookscn.psc
+++ b/source/scripts/_00e_mq02_yerosbookscn.psc
@@ -19,5 +19,5 @@ EndIf
 EndEvent
 
 Event OnRead()
-		_00E_MQ02_TheVoid.SetStage(120)
+		_00E_MQ02_TheVoid.SetCurrentStageID(120)
 endEvent
\ No newline at end of file
diff --git a/source/scripts/_00e_mq02_yeroscellarjesparfssc.psc b/source/scripts/_00e_mq02_yeroscellarjesparfssc.psc
index de790883..99723f7b 100644
--- a/source/scripts/_00e_mq02_yeroscellarjesparfssc.psc
+++ b/source/scripts/_00e_mq02_yeroscellarjesparfssc.psc
@@ -12,7 +12,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
             MQ02_SC1_JesparDialogeInterlude.Stop()
         endif
         ; Failsave for the case when Jespar isn't here:
-        if (MQ02.GetStage() >= 60) && (MQ02.GetStage() <= 120)
+        if (MQ02.GetCurrentStageID() >= 60) && (MQ02.GetCurrentStageID() <= 120)
             if (_00E_MC_JesparREF.GetParentCell() != PlayerRef.GetParentCell())
                 _00E_MC_JesparREF.MoveTo(MQ02_D5_JesparYeroMarker01)
             EndIf
diff --git a/source/scripts/_00e_mq02arktrigger.psc b/source/scripts/_00e_mq02arktrigger.psc
index 31d4ba3f..c0e7f0e4 100644
--- a/source/scripts/_00e_mq02arktrigger.psc
+++ b/source/scripts/_00e_mq02arktrigger.psc
@@ -2,11 +2,11 @@ Scriptname _00E_MQ02ArkTrigger extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 	If (akActionRef == PlayerRef && !bDone)
-		Int curStage = MQ02.GetStage()
+		Int curStage = MQ02.GetCurrentStageID()
 		If curStage >= 140
 			bDone = True
 			If curStage < 160
-				MQ02.SetStage(160)
+				MQ02.SetCurrentStageID(160)
 			EndIf
 		EndIf
 	EndIf
diff --git a/source/scripts/_00e_mq02jesparfollowentrigger.psc b/source/scripts/_00e_mq02jesparfollowentrigger.psc
index 60d23153..a5ed4679 100644
--- a/source/scripts/_00e_mq02jesparfollowentrigger.psc
+++ b/source/scripts/_00e_mq02jesparfollowentrigger.psc
@@ -31,7 +31,7 @@ EndEvent
 
 Function SendEnterEvent()
     
-	if (MQ02.GetStage() >= 140) && (MQ02.GetStage() < 160) && (PlayerREF.GetWorldSpace() != Ark)
+	if (MQ02.GetCurrentStageID() >= 140) && (MQ02.GetCurrentStageID() < 160) && (PlayerREF.GetWorldSpace() != Ark)
 
 		if _00E_MQ02_TravelState.GetValue() == 0
 			_00E_MQ02_TravelState.SetValue(1)
@@ -59,8 +59,8 @@ Function SendEnterEvent()
 		
 	EndIf
 	
-	if PlayerREF.GetWorldSpace() == Ark && MQ02.GetStage() > 140
-		MQ02.SetStage(160)
+	if PlayerREF.GetWorldSpace() == Ark && MQ02.GetCurrentStageID() > 140
+		MQ02.SetCurrentStageID(160)
 	EndIf
 	
 	Return
@@ -69,7 +69,7 @@ EndFunction
 
 Function SendExitEvent()
 
-	If (MQ02.GetStage() >= 140) && (MQ02.GetStage() < 160)
+	If (MQ02.GetCurrentStageID() >= 140) && (MQ02.GetCurrentStageID() < 160)
 		
 		If _00E_MQ02_TravelState.GetValue() == 1
 			_00E_MQ02_TravelState.SetValue(0)
diff --git a/source/scripts/_00e_mq03_forschungsergebnissescn.psc b/source/scripts/_00e_mq03_forschungsergebnissescn.psc
index d4b0f9f5..eba9f485 100644
--- a/source/scripts/_00e_mq03_forschungsergebnissescn.psc
+++ b/source/scripts/_00e_mq03_forschungsergebnissescn.psc
@@ -10,7 +10,7 @@ Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldCo
 				_00E_MQ04_StoneofMadness.SetObjectiveCompleted(50)
 				
 				if (Game.GetPlayer().GetItemCount(_00E_MQ03Visionsstein) >= 6)
-					_00E_MQ04_StoneofMadness.setstage(30)
+					_00E_MQ04_StoneofMadness.SetCurrentStageID(30)
 				endif
 				
 			endif
diff --git a/source/scripts/_00e_mq03_functions.psc b/source/scripts/_00e_mq03_functions.psc
index d55cbc08..50df45b4 100644
--- a/source/scripts/_00e_mq03_functions.psc
+++ b/source/scripts/_00e_mq03_functions.psc
@@ -67,7 +67,7 @@ Function FadeToBlackAndBack()
 	PlayerREF.MoveTo(MQ03_SC4_PlayerPortToMarker)
 	_00E_MC_JesparREF.MoveTo(MQ03_SC4_JesparSniffleStartMarker)
 	MQ03_SC4_BenchPlayer.Activate(PlayerREF)
-	Self.SetStage(43)
+	Self.SetCurrentStageID(43)
 
 EndFunction
 
@@ -130,8 +130,8 @@ Function GiveRewardEXP()
 	_00E_MC_KonstantinREF.EvaluatePackage()
 	_00E_MC_JesparREF.EvaluatePackage()
 	MQ04.Start()
-	MQ04.SetStage(10)
-	CQJ01.SetStage(5)
+	MQ04.SetCurrentStageID(10)
+	CQJ01.SetCurrentStageID(5)
 	If _00E_DisableQuestTutorials.GetValueInt() == 0
 		_00E_Tutorial_Companions.Show()
 	EndIf
diff --git a/source/scripts/_00e_mq03_jesparfailsavesc.psc b/source/scripts/_00e_mq03_jesparfailsavesc.psc
index 0e5f226a..74fefda2 100644
--- a/source/scripts/_00e_mq03_jesparfailsavesc.psc
+++ b/source/scripts/_00e_mq03_jesparfailsavesc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ03_JesparFailsaveSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if (akActionRef == PlayerREF) && !bDone
-		if MQ03.GetStage() >= 15 && MQ03.GetStage() < 23
+		if MQ03.GetCurrentStageID() >= 15 && MQ03.GetCurrentStageID() < 23
 			bDone = True
 			_00E_MC_JesparREF.MoveTo(PlayerREF)
 			Self.Delete()
diff --git a/source/scripts/_00e_mq03ruinetriggerstartscene.psc b/source/scripts/_00e_mq03ruinetriggerstartscene.psc
index 5b5d9278..80233f60 100644
--- a/source/scripts/_00e_mq03ruinetriggerstartscene.psc
+++ b/source/scripts/_00e_mq03ruinetriggerstartscene.psc
@@ -8,7 +8,7 @@ Int DoOnce
 
 Event OnTrigger(ObjectReference akActionRef)
 
-if(_00E_MQ03_PathOfHope.GetStage() >= 40)
+if(_00E_MQ03_PathOfHope.GetCurrentStageID() >= 40)
 if(akActionRef == Game.GetPlayer())	
 if(DoOnce == 0)
 	if(MQ03Soeldner02Ref.IsDead() == true)&&(MQ03Soeldner03Ref.IsDead() == true)
diff --git a/source/scripts/_00e_mq03steinfragmentscn.psc b/source/scripts/_00e_mq03steinfragmentscn.psc
index 37ffdb11..7fe7f45a 100644
--- a/source/scripts/_00e_mq03steinfragmentscn.psc
+++ b/source/scripts/_00e_mq03steinfragmentscn.psc
@@ -29,7 +29,7 @@ Event OnActivate(ObjectReference akActionRef)
 				_00E_MQ04_StoneofMadness.SetObjectiveCompleted(40)
 				
 				if (Game.GetPlayer().GetItemCount(_00E_MQ03Forschungsergebnisse) >= 2)
-					_00E_MQ04_StoneofMadness.setstage(30)
+					_00E_MQ04_StoneofMadness.SetCurrentStageID(30)
 				endif
 				
 			endif
diff --git a/source/scripts/_00e_mq03zauberbuchscn.psc b/source/scripts/_00e_mq03zauberbuchscn.psc
index 6985dbba..87b0c46d 100644
--- a/source/scripts/_00e_mq03zauberbuchscn.psc
+++ b/source/scripts/_00e_mq03zauberbuchscn.psc
@@ -6,7 +6,7 @@ int DoOnce
 Event OnActivate(ObjectReference akActionRef)
 	if(akActionRef == Game.GetPlayer())
 			if DoOnce == 0
-				_00E_MQ04_StoneofMadness.SetStage(20)
+				_00E_MQ04_StoneofMadness.SetCurrentStageID(20)
 				DoOnce = 1
 			endif
 		
diff --git a/source/scripts/_00e_mq04_firescript.psc b/source/scripts/_00e_mq04_firescript.psc
index df4eaa01..8bfbb270 100644
--- a/source/scripts/_00e_mq04_firescript.psc
+++ b/source/scripts/_00e_mq04_firescript.psc
@@ -13,7 +13,7 @@ EndEvent
 
 Event OnUpdate()
 
-	If QuestScript.GetStage() < 60 && QuestScript.GetStage() >= 50
+	If QuestScript.GetCurrentStageID() < 60 && QuestScript.GetCurrentStageID() >= 50
 		If Self.IsEnabled()
 			objFireRef.Reset()
 			objLightRef.Reset()
diff --git a/source/scripts/_00e_mq04_lishariliftscript.psc b/source/scripts/_00e_mq04_lishariliftscript.psc
index 2c706b44..6b828ca5 100644
--- a/source/scripts/_00e_mq04_lishariliftscript.psc
+++ b/source/scripts/_00e_mq04_lishariliftscript.psc
@@ -14,7 +14,7 @@ Event OnTranslationComplete()
 Sound.StopInstance(LiftLoop)
 Game.ShakeCamera(afStrength = 0.3)
 Utility.Wait(1)
-MQ04.SetStage(70)
+MQ04.SetCurrentStageID(70)
 
 
 
diff --git a/source/scripts/_00e_mq04_lishariritualeffectscript.psc b/source/scripts/_00e_mq04_lishariritualeffectscript.psc
index c2ad1093..d2d4301a 100644
--- a/source/scripts/_00e_mq04_lishariritualeffectscript.psc
+++ b/source/scripts/_00e_mq04_lishariritualeffectscript.psc
@@ -26,7 +26,7 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)
 	FadeToBlackHoldImod.Remove()
 	Wait(2)
 	Game.EnablePlayerControls()
-	MQ04.SetStage(90)
+	MQ04.SetCurrentStageID(90)
 
 EndEvent
 
diff --git a/source/scripts/_00e_mq04_veryuglylisharfailsafe.psc b/source/scripts/_00e_mq04_veryuglylisharfailsafe.psc
index 1300e035..28d664ff 100644
--- a/source/scripts/_00e_mq04_veryuglylisharfailsafe.psc
+++ b/source/scripts/_00e_mq04_veryuglylisharfailsafe.psc
@@ -2,8 +2,8 @@ Scriptname _00E_MQ04_VeryUglyLisharFailsafe extends ObjectReference
 
 
 Event OnTriggerEnter(ObjectReference akactionref)
-	if akactionref == Lishari && MQ04.GetStage() < 40 && MQ04.GetStage() >= 38
-		MQ04.SetStage(40)
+	if akactionref == Lishari && MQ04.GetCurrentStageID() < 40 && MQ04.GetCurrentStageID() >= 38
+		MQ04.SetCurrentStageID(40)
 	endif
 EndEvent
 
diff --git a/source/scripts/_00e_mq05_aixonattackscript.psc b/source/scripts/_00e_mq05_aixonattackscript.psc
index e2a9bdff..8564a68c 100644
--- a/source/scripts/_00e_mq05_aixonattackscript.psc
+++ b/source/scripts/_00e_mq05_aixonattackscript.psc
@@ -4,8 +4,8 @@ Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile,
   bool abBashAttack, bool abHitBlocked)
   
 if akAggressor == PlayerREF 
-	if (MQ05.GetStage() == 135)
-		MQ05.SetStage(140)
+	if (MQ05.GetCurrentStageID() == 135)
+		MQ05.SetCurrentStageID(140)
 	EndIf
 EndIf
   
diff --git a/source/scripts/_00e_mq05_functions.psc b/source/scripts/_00e_mq05_functions.psc
index 137edc95..a8fc20bc 100644
--- a/source/scripts/_00e_mq05_functions.psc
+++ b/source/scripts/_00e_mq05_functions.psc
@@ -21,10 +21,10 @@ EndFunction
 
 Function UpdateStage()
 
-    if GetStage() == 15
-        SetStage(17)
-    Elseif GetStage() == 17
-        SetStage(20)
+    if GetCurrentStageID() == 15
+        SetCurrentStageID(17)
+    Elseif GetCurrentStageID() == 17
+        SetCurrentStageID(20)
     EndIf
 
 EndFunction
@@ -114,7 +114,7 @@ Function KillMerchantFailsave()
     SkyMarker.MoveTo(akMerchant, 0.0 , 0.0, 500)
     _00E_MQ05_DunwarLighting.RemoteCast(SkyMarker, akMerchant, akMerchant)
     SkyMarker.Delete()
-    SetStage(80)
+    SetCurrentStageID(80)
     
 EndFunction
 
@@ -206,7 +206,7 @@ Function PlayerDrinksPotion()
     Wait(5)
     Game.EnablePlayerControls()
     Game.SetPlayerAIDriven(False)
-    Self.SetStage(95)
+    Self.SetCurrentStageID(95)
     if Ryon.GetReference().GetParentCell() != PlayerREF.GetParentCell()
         ; Failsave for some weird cases where Aixon is missing. I
         ; hope this solves http://sureai.net:9898/browse/ERB-1794 .
@@ -230,7 +230,7 @@ Function DisableGhostDoor()
     _00E_MQ05_GhostSound.Play(PlayerREF)
     MQ05_D6_JailDoor.Enable(False)
     Wait(4.5)
-    Self.SetStage(110)
+    Self.SetCurrentStageID(110)
 
 EndFunction
 
@@ -256,7 +256,7 @@ Function StartFinalScene()
     Wait(10)
     If MQ05_SC14_PlayerWalksIntoCell.IsPlaying()
         Debug.Trace("MQ05: Ryon and player forcefully moved back to cell!")
-        Self.SetStage(125)
+        Self.SetCurrentStageID(125)
         MQ05_SC14_PlayerWalksIntoCell.Stop()
         Ryon.GetReference().MoveTo(MQ05_SC14_AixonEndMarker)
         PlayerREF.MoveTo(MQ05_SC14_AixonEndMarker)
@@ -273,7 +273,7 @@ Function DisableGhostDoorFinal()
     _00E_MQ05_GhostSound.Play(PlayerREF)
     MQ05_D7_JailDoorFinal.Enable(False)
     Wait(4.5)
-    Self.SetStage(130)
+    Self.SetCurrentStageID(130)
     Ryon.GetReference().MoveTo(MQ05_SC14_AixonEndMarker)
     
 EndFunction
@@ -306,7 +306,7 @@ Function StartAixonScene()
     Wait(5)
 	
 	_00E_PlayerFunctions.GetSafeItemRemove().RemoveAllItemsSafeVersion(None)
-	Self.SetStage(150)
+	Self.SetCurrentStageID(150)
 
 EndFunction
 
diff --git a/source/scripts/_00e_mq05_killessentialoneffectstart.psc b/source/scripts/_00e_mq05_killessentialoneffectstart.psc
index 96f7abf0..a8f80890 100644
--- a/source/scripts/_00e_mq05_killessentialoneffectstart.psc
+++ b/source/scripts/_00e_mq05_killessentialoneffectstart.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ05_KillEssentialOnEffectStart extends activemagiceffect
 
 Event OnEffectStart(Actor akTarget, Actor akCaster)
 
-MQ05.SetStage(80)
+MQ05.SetCurrentStageID(80)
 akTarget.KillEssential(akCaster)
 
 EndEvent
diff --git a/source/scripts/_00e_mq05complexscenetriggerscript.psc b/source/scripts/_00e_mq05complexscenetriggerscript.psc
index 21e68c75..ab86f77b 100644
--- a/source/scripts/_00e_mq05complexscenetriggerscript.psc
+++ b/source/scripts/_00e_mq05complexscenetriggerscript.psc
@@ -1,7 +1,7 @@
 Scriptname _00E_MQ05ComplexSceneTriggerScript extends ObjectReference  
 
 Event OnTrigger(ObjectReference akActionRef)
-	If DoOnce == false && MQ05.GetStage() == 85 && _00E_MC_Jorrek == akActionRef && _00E_MC_Jorrek.IsInCombat() == false
+	If DoOnce == false && MQ05.GetCurrentStageID() == 85 && _00E_MC_Jorrek == akActionRef && _00E_MC_Jorrek.IsInCombat() == false
 		DoOnce = true
 		MQ05_SC8_JorrekNoticesBandits.ForceStart()
 		Self.Disable()
diff --git a/source/scripts/_00e_mq05prologue_failsavesc.psc b/source/scripts/_00e_mq05prologue_failsavesc.psc
index e0413681..3510093d 100644
--- a/source/scripts/_00e_mq05prologue_failsavesc.psc
+++ b/source/scripts/_00e_mq05prologue_failsavesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ05Prologue_FailsaveSC extends ObjectReference Conditional
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if MQ05Prologue.GetStage() == 35 && !bDone
+	if MQ05Prologue.GetCurrentStageID() == 35 && !bDone
 		_00E_MC_TealorREF.MoveTo(Game.GetPlayer())
 		bDone = True
 		Self.Delete()
diff --git a/source/scripts/_00e_mq05prologue_functions.psc b/source/scripts/_00e_mq05prologue_functions.psc
index 7d5ac576..9c695c25 100644
--- a/source/scripts/_00e_mq05prologue_functions.psc
+++ b/source/scripts/_00e_mq05prologue_functions.psc
@@ -82,7 +82,7 @@ Function FinishUpAndStartMQ05()
 	_00E_MC_TealorREF.RemoveItem(_00E_MQ05_BartarrPackage, 1, false, PlayerREF)
 	Weather.ReleaseOverride()
 	MQ05.Start()
-	LishariDialogue.SetStage(5)
+	LishariDialogue.SetCurrentStageID(5)
 	_00E_Music_Special_Character_Tealor.Remove()
 	_00E_SilenceLongTransitionHighPriority.Remove()
 	_00E_MC_TealorREF.SetActorValue("speedmult", 100)
@@ -96,7 +96,7 @@ EndFunction
 
 Function FillEmptyAliasesFailsafe()
 	; failsafe for issue 1536, fills empty aliases
-	If Self.GetStage() == 5
+	If Self.GetCurrentStageID() == 5
 		Tealor.ForceRefIfEmpty(_00E_MC_TealorREF)
 		Konstantin.ForceRefIfEmpty(_00E_MC_KonstantinREF)
 		Natara.ForceRefIfEmpty(_00E_MC_NataraREF)
diff --git a/source/scripts/_00e_mq06_caliaguidefailsavesc.psc b/source/scripts/_00e_mq06_caliaguidefailsavesc.psc
index 4b876a80..e555d210 100644
--- a/source/scripts/_00e_mq06_caliaguidefailsavesc.psc
+++ b/source/scripts/_00e_mq06_caliaguidefailsavesc.psc
@@ -8,7 +8,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if !bDone && akActionRef == PlayerREF
         
-        if (MQ06.GetStage() == 28)
+        if (MQ06.GetCurrentStageID() == 28)
 
             if !MQ06_SC3.IsPlaying()
         
diff --git a/source/scripts/_00e_mq06_chestscript.psc b/source/scripts/_00e_mq06_chestscript.psc
index d1a06296..a0c6b3f4 100644
--- a/source/scripts/_00e_mq06_chestscript.psc
+++ b/source/scripts/_00e_mq06_chestscript.psc
@@ -10,16 +10,16 @@ Event OnActivate(ObjectReference akActionRef)
 
 	if akActionRef == PlayerREF 
     
-    	if (MQ06.GetStage() >= 27) && (MQ06.GetStage() != 29)
+    	if (MQ06.GetCurrentStageID() >= 27) && (MQ06.GetCurrentStageID() != 29)
 			Self.Activate(PlayerREF, True)
 		endif
             
-		if MQ06.GetStage() == 27
-			MQ06.SetStage(28)
+		if MQ06.GetCurrentStageID() == 27
+			MQ06.SetCurrentStageID(28)
 		endif
 		
-		if MQ06.GetStage() == 30
-			MQ06.SetStage(31)
+		if MQ06.GetCurrentStageID() == 30
+			MQ06.SetCurrentStageID(31)
 		endif
 		
 	endif
diff --git a/source/scripts/_00e_mq06_consecrationfailsavesc.psc b/source/scripts/_00e_mq06_consecrationfailsavesc.psc
index d3c5797f..24026d87 100644
--- a/source/scripts/_00e_mq06_consecrationfailsavesc.psc
+++ b/source/scripts/_00e_mq06_consecrationfailsavesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ06_ConsecrationFailsaveSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If akActionRef == Game.GetPlayer() && MQ06.GetStage() >= 40 && MQ06.GetStage() < 55 && MQ06_SC5_RitualScene.IsPlaying() == false
+	If akActionRef == Game.GetPlayer() && MQ06.GetCurrentStageID() >= 40 && MQ06.GetCurrentStageID() < 55 && MQ06_SC5_RitualScene.IsPlaying() == false
 
 		(MQ06 as _00E_MQ06_Functions).AddSilence()
 			
diff --git a/source/scripts/_00e_mq06_functions.psc b/source/scripts/_00e_mq06_functions.psc
index e35e67c8..559e5cd9 100644
--- a/source/scripts/_00e_mq06_functions.psc
+++ b/source/scripts/_00e_mq06_functions.psc
@@ -68,7 +68,7 @@ Function SetUp()
 	EndIf
 
 	Wait(0.2)
-	SetStage(5)
+	SetCurrentStageID(5)
 
 EndFunction
 
@@ -247,7 +247,7 @@ Function EndVision()
 	MakeActorInTranslucent(_00E_MC_TealorREF) ; Do this BEFORE disabling Tealor
 	_00E_MC_TealoRREF.Disable()
 	Wait(2)
-	SetStage(20)
+	SetCurrentStageID(20)
 
 EndFunction
 
@@ -317,7 +317,7 @@ EndFunction
 
 Function StartCQC01()
 
-	CQC01.SetStage(5)
+	CQC01.SetCurrentStageID(5)
 	CQC01.SetObjectiveDisplayed(5)
 
 EndFunction
@@ -390,10 +390,10 @@ EndFunction
 Function StartJesparQuest()
 
 	If CQJ01.IsCompleted()
-		CQJ02.SetStage(5)
+		CQJ02.SetCurrentStageID(5)
 	Elseif !(CQJ01.IsCompleted())
 		CQJ01.FailAllObjectives()
-		CQJ01.SetStage(20)
+		CQJ01.SetCurrentStageID(20)
 	EndIf
 	
 	If CQJ01_SC01_DancingNomadScene.IsPlaying()
@@ -656,10 +656,10 @@ EndEvent
 
 Event OnUpdateGameTime() ; because of how we registered, this event occurs every 30 minutes of game time	
 
-	if (GameDaysPassed.GetValue() + 1 >= GameDay) && GetStage() == 35
-		SetStage(40)
+	if (GameDaysPassed.GetValue() + 1 >= GameDay) && GetCurrentStageID() == 35
+		SetCurrentStageID(40)
 		UnregisterForUpdateGameTime()
-	ElseIf GetStage() == 55
+	ElseIf GetCurrentStageID() == 55
 		StopWeatherFX()
 	EndIf
 	
diff --git a/source/scripts/_00e_mq06_weatherreleasescript.psc b/source/scripts/_00e_mq06_weatherreleasescript.psc
index 3e041a06..ec139592 100644
--- a/source/scripts/_00e_mq06_weatherreleasescript.psc
+++ b/source/scripts/_00e_mq06_weatherreleasescript.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ06_WeatherReleaseScript extends ObjectReference
 
 Event OnTriggerLeave(ObjectReference akActionRef)
 
-	If ((MQ06.GetStage() == 25) || (MQ06.GetStage() == 27)) && !Done
+	If ((MQ06.GetCurrentStageID() == 25) || (MQ06.GetCurrentStageID() == 27)) && !Done
 		Done = True
 		Weather.ReleaseOverride()
 	EndIf
diff --git a/source/scripts/_00e_mq06johannesultradebugscenestart.psc b/source/scripts/_00e_mq06johannesultradebugscenestart.psc
index 1a030abb..45d5d3f9 100644
--- a/source/scripts/_00e_mq06johannesultradebugscenestart.psc
+++ b/source/scripts/_00e_mq06johannesultradebugscenestart.psc
@@ -4,7 +4,7 @@ Event OnTrigger(ObjectReference akActionRef)
 ;Debug.MessageBox("triggered")
 	If akActionRef == Game.GetPlayer() && DoOnce == false
 	;	Debug.MessageBox("triggered")
-		if MQ06.GetStage() < 10 && MQ06_SC1_PlayerEncountersHighOne.IsPlaying() == false
+		if MQ06.GetCurrentStageID() < 10 && MQ06_SC1_PlayerEncountersHighOne.IsPlaying() == false
 			;Debug.MessageBox("Try to start...")
 			MQ06_SC1_PlayerEncountersHighOne.ForceStart()
 			if MQ06_SC1_PlayerEncountersHighOne.IsPlaying() == true
diff --git a/source/scripts/_00e_mq07_functions.psc b/source/scripts/_00e_mq07_functions.psc
index 11141439..7c8b6e22 100644
--- a/source/scripts/_00e_mq07_functions.psc
+++ b/source/scripts/_00e_mq07_functions.psc
@@ -7,9 +7,9 @@ Scriptname _00E_MQ07_Functions extends Quest
 Function CompleteQuestMQ07()
 
 	_00E_EPHandler.GiveEP(__Config_RewardEXP)
-	SetStage(15)
+	SetCurrentStageID(15)
 	Self.CompleteQuest()
-	MQ08Prologue.SetStage(5)
+	MQ08Prologue.SetCurrentStageID(5)
 
 EndFunction
 
diff --git a/source/scripts/_00e_mq07a_chronikumbasementfailsc.psc b/source/scripts/_00e_mq07a_chronikumbasementfailsc.psc
index dff8de8a..99302407 100644
--- a/source/scripts/_00e_mq07a_chronikumbasementfailsc.psc
+++ b/source/scripts/_00e_mq07a_chronikumbasementfailsc.psc
@@ -2,11 +2,11 @@ Scriptname _00E_MQ07a_ChronikumBasementFailSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if !MQ07a.MQ07a_SC1_ExplanationInChronikum.IsPlaying() && akActionRef == PlayerREF && MQ07a.GetStage() <= 10 
+	if !MQ07a.MQ07a_SC1_ExplanationInChronikum.IsPlaying() && akActionRef == PlayerREF && MQ07a.GetCurrentStageID() <= 10 
 		bDone = False
 	EndIf
 
-	if akActionRef == PlayerREF && MQ07a.GetStage() >= 5 && MQ07a.GetStage() <= 10 && !bDone && (!(_00E_MC_JesparREF.GetParentCell() == SuntempleChronikumBasement) || !(_00E_MC_LexREF.GetParentCell() == SuntempleChronikumBasement))
+	if akActionRef == PlayerREF && MQ07a.GetCurrentStageID() >= 5 && MQ07a.GetCurrentStageID() <= 10 && !bDone && (!(_00E_MC_JesparREF.GetParentCell() == SuntempleChronikumBasement) || !(_00E_MC_LexREF.GetParentCell() == SuntempleChronikumBasement))
 
 		MQ07a.SC01Failsave()	
 	
diff --git a/source/scripts/_00e_mq07a_doorbellsc.psc b/source/scripts/_00e_mq07a_doorbellsc.psc
index f0e66d06..45c4285d 100644
--- a/source/scripts/_00e_mq07a_doorbellsc.psc
+++ b/source/scripts/_00e_mq07a_doorbellsc.psc
@@ -2,10 +2,10 @@ Scriptname _00E_MQ07a_DoorBellSC extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-	If (MQ07a.GetStage() == 55)
+	If (MQ07a.GetCurrentStageID() == 55)
 		If (GameHour.GetValue() > 20) || (GameHour.GetValue() < 6)
 			_00E_BellGong_02M.Play(Self)
-			MQ07a.SetStage(60)
+			MQ07a.SetCurrentStageID(60)
 		Else
 			_00E_MQ07_sWaitUntilNightfall.Show()
 		EndIf
diff --git a/source/scripts/_00e_mq07a_functions.psc b/source/scripts/_00e_mq07a_functions.psc
index 44c08349..8f5cfba3 100644
--- a/source/scripts/_00e_mq07a_functions.psc
+++ b/source/scripts/_00e_mq07a_functions.psc
@@ -163,7 +163,7 @@ EndFunction
 Function PlayerStandUp()
 
 	MQ07a_SC4_ChairREF.Activate(PlayerREF)
-	Self.SetStage(85)
+	Self.SetCurrentStageID(85)
 
 EndFunction
 
@@ -293,7 +293,7 @@ Function PortPyrean()
 	MQ07a_SC5_OetziREFNew.EnableNoWait(False)
 	MQ07a_SC5_Mist.EnableNoWait(False)
 	MQ07a_SC5_OetziREFNew.PlaceAtMe(_00E_TeleportExplosion)
-	Self.SetStage(115)
+	Self.SetCurrentStageID(115)
 	PlayerREF.UnequipSpell(_00E_MQ07a_TeleportPyreanSP, 0)
 	PlayerREF.UnequipSpell(_00E_MQ07a_TeleportPyreanSP, 1)
 	PlayerREF.RemoveSpell(_00E_MQ07a_TeleportPyreanSP)
@@ -354,7 +354,7 @@ Function PortPlayerIntoMemory()
 	Game.SetHUDCartMode(False)
 	FadeToBlackHoldImod.Remove()
 	_00E_MQ07a_VisionIMOD.ApplyCrossFade(2)
-	SetStage(120)
+	SetCurrentStageID(120)
 	
 EndFunction
 
@@ -563,7 +563,7 @@ Function TeleportMage()
 	Wait(0.4)
 	MQ07a_SC8_HouseDoor.SetOpen(True)
 	MQ07a_SC8_HouseDoor.BlockActivation(False)
-	SetStage(155)
+	SetCurrentStageID(155)
 	
 EndFunction
 
@@ -589,7 +589,7 @@ Function FreezePlayer()
 		_00E_MQ07a_FreezePlayer.Apply()
 		PlayerREF.PlayIdle(bleedoutStart)
 		Utility.Wait(2)
-		Self.SetStage(165)
+		Self.SetCurrentStageID(165)
 	
 	EndIf
 	
@@ -597,14 +597,14 @@ EndFunction
 
 Function KnockOutPlayer()
 
-	If Self.GetStage() < 170
+	If Self.GetCurrentStageID() < 170
 		_00E_MQ07a_FreezePlayerFinal.ApplyCrossFade(0.1)
 		_00E_MQ07a_SC10_PyreanDeathFreezeM.Play(PlayerREF)
 		FXExplosionCatapultNearM.Play(PlayerREF)
 		Utility.Wait(1.5)
 		_00E_MQ07a_FreezePlayer.Remove()
 		FadeToBlackHoldIMOD.Apply()
-		Self.SetStage(170)
+		Self.SetCurrentStageID(170)
 	EndIf
 		
 EndFunction
diff --git a/source/scripts/_00e_mq07a_housedoorsc.psc b/source/scripts/_00e_mq07a_housedoorsc.psc
index 4d19aeba..ac9d56a7 100644
--- a/source/scripts/_00e_mq07a_housedoorsc.psc
+++ b/source/scripts/_00e_mq07a_housedoorsc.psc
@@ -8,7 +8,7 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-	Int curStage = MQ07a.GetStage()
+	Int curStage = MQ07a.GetCurrentStageID()
 
 	if curStage < 135
 		if akActionRef as Actor != MQ07a_ZuraREF
diff --git a/source/scripts/_00e_mq07a_housedoortgbxsc.psc b/source/scripts/_00e_mq07a_housedoortgbxsc.psc
index 1bd9a5d4..f38d0b17 100644
--- a/source/scripts/_00e_mq07a_housedoortgbxsc.psc
+++ b/source/scripts/_00e_mq07a_housedoortgbxsc.psc
@@ -4,7 +4,7 @@ Event OnTriggerLeave(ObjectReference akActionRef)
 
 	if !bDone
 
-		if akActionRef == PlayerREF && MQ07a.GetStage() < 150 && MQ07A_SC9_Battle.IsPlaying() 
+		if akActionRef == PlayerREF && MQ07a.GetCurrentStageID() < 150 && MQ07A_SC9_Battle.IsPlaying() 
 			bDone = True
 			MQ07a_SC8_HouseDoor.SetOpen(False)
 			MQ07a_SC8_HouseDoor.BlockActivation(True)
diff --git a/source/scripts/_00e_mq07a_knockdoorspheresc.psc b/source/scripts/_00e_mq07a_knockdoorspheresc.psc
index 6e59526f..2605a232 100644
--- a/source/scripts/_00e_mq07a_knockdoorspheresc.psc
+++ b/source/scripts/_00e_mq07a_knockdoorspheresc.psc
@@ -7,8 +7,8 @@ Scriptname _00E_MQ07a_KnockDoorSphereSC extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-	If akActionRef == Game.GetPlayer() && MQ07a.GetStage() == 120
-		MQ07a.SetStage(125)
+	If akActionRef == Game.GetPlayer() && MQ07a.GetCurrentStageID() == 120
+		MQ07a.SetCurrentStageID(125)
 		;(MQ07a as _00E_MQ07a_Functions).StartSC06() ; just for patch 1.5.7.0 as hotfix because the questfragment doesn't seem to do what it should do
 		Self.Delete()
 	EndIf
diff --git a/source/scripts/_00e_mq07a_myradtowerfailsafesc.psc b/source/scripts/_00e_mq07a_myradtowerfailsafesc.psc
index 28951645..c43ce317 100644
--- a/source/scripts/_00e_mq07a_myradtowerfailsafesc.psc
+++ b/source/scripts/_00e_mq07a_myradtowerfailsafesc.psc
@@ -4,7 +4,7 @@ Scriptname _00E_MQ07a_MyradTowerFailsafeSC extends ObjectReference
 
 Event OnTriggerEnter (ObjectReference akActionREF)
 
-	if akActionRef == PlayerREF && MQ07a.GetStage() == 40 && !bDone
+	if akActionRef == PlayerREF && MQ07a.GetCurrentStageID() == 40 && !bDone
 		_00E_MC_JesparREF.Moveto(MQ07a_SC2_JesparTargetMarker)
 		bDone == true
 	endif
diff --git a/source/scripts/_00e_mq07a_riddlebooksc.psc b/source/scripts/_00e_mq07a_riddlebooksc.psc
index 6402613f..feca80c4 100644
--- a/source/scripts/_00e_mq07a_riddlebooksc.psc
+++ b/source/scripts/_00e_mq07a_riddlebooksc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ07a_RiddleBookSC extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-	If MQ07a.GetStage() == 90
+	If MQ07a.GetCurrentStageID() == 90
 		If MQ07a_BookRiddle.GetValueInt() == RiddleNumber
 			ProgressRiddle()
 		Else
diff --git a/source/scripts/_00e_mq07a_riddlechain.psc b/source/scripts/_00e_mq07a_riddlechain.psc
index 2e93acd3..117211ed 100644
--- a/source/scripts/_00e_mq07a_riddlechain.psc
+++ b/source/scripts/_00e_mq07a_riddlechain.psc
@@ -32,7 +32,7 @@ Event OnActivate(ObjectReference akActionRef)
 			Solved = True
 			Utility.Wait(2)
 			OBJDwemerRepositoryDoorM.Play(Self)
-			MQ07a.SetStage(95)
+			MQ07a.SetCurrentStageID(95)
 			Game.SetPlayerAIDriven(False)
 		EndIf
 		
diff --git a/source/scripts/_00e_mq07a_sc14_sigilshardssc.psc b/source/scripts/_00e_mq07a_sc14_sigilshardssc.psc
index 91dab32a..90146d8c 100644
--- a/source/scripts/_00e_mq07a_sc14_sigilshardssc.psc
+++ b/source/scripts/_00e_mq07a_sc14_sigilshardssc.psc
@@ -2,8 +2,8 @@ Scriptname _00E_MQ07a_SC14_SigilShardsSC extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-	If (MQ07a.GetStage() == 200) && (akActionRef == Game.GetPlayer())
-		MQ07a.SetStage(205)
+	If (MQ07a.GetCurrentStageID() == 200) && (akActionRef == Game.GetPlayer())
+		MQ07a.SetCurrentStageID(205)
 	EndIf
 
 EndEvent
diff --git a/source/scripts/_00e_mq07a_sc4_doorsc.psc b/source/scripts/_00e_mq07a_sc4_doorsc.psc
index c79ea571..d33cb548 100644
--- a/source/scripts/_00e_mq07a_sc4_doorsc.psc
+++ b/source/scripts/_00e_mq07a_sc4_doorsc.psc
@@ -8,18 +8,18 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-	If MQ07a.GetStage() == 75
+	If MQ07a.GetCurrentStageID() == 75
 		if (akActionRef == MQ07a_TheAgedManREF) 
 			Self.Activate(akActionRef, True)
 		Else
 			_00E_MC_JesparREF.Say(MQ07A_D3_RemarksTopic)
 		EndIf
-	ElseIf MQ07a.GetStage() == 85
+	ElseIf MQ07a.GetCurrentStageID() == 85
 		If akActionRef == Game.GetPlayer()
 			Self.BlockActivation(False)
 			self.Activate(Game.GetPlayer(), True)
 		EndIf
-	ElseIf MQ07a.GetStage() == 170
+	ElseIf MQ07a.GetCurrentStageID() == 170
 		Self.BlockActivation(True)
 		_00E_MQ07a_sDoorDoesntBudge.Show()
 	EndIf
diff --git a/source/scripts/_00e_mq07a_scrollsc.psc b/source/scripts/_00e_mq07a_scrollsc.psc
index 54ed1681..86a5bccf 100644
--- a/source/scripts/_00e_mq07a_scrollsc.psc
+++ b/source/scripts/_00e_mq07a_scrollsc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ07a_ScrollSC extends ObjectReference
 
 Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer)
   if akNewContainer == Game.GetPlayer()
-    MQ07a.SetStage(140)
+    MQ07a.SetCurrentStageID(140)
   endIf
 endEvent
 
diff --git a/source/scripts/_00e_mq07a_teleportpyreansc.psc b/source/scripts/_00e_mq07a_teleportpyreansc.psc
index 31a992aa..8580085a 100644
--- a/source/scripts/_00e_mq07a_teleportpyreansc.psc
+++ b/source/scripts/_00e_mq07a_teleportpyreansc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ07a_TeleportPyreanSC extends activemagiceffect
 
 Event OnEffectStart(actor akTarget, Actor akCaster)
 
-	If MQ07a.GetStage() == 110
+	If MQ07a.GetCurrentStageID() == 110
 		MQ07a.PortPyrean()
 		MQ07a_SC5_OetziREFNEW.Enable()
 	Else
diff --git a/source/scripts/_00e_mq07a_visionedgesc.psc b/source/scripts/_00e_mq07a_visionedgesc.psc
index 903540d3..a9389a4d 100644
--- a/source/scripts/_00e_mq07a_visionedgesc.psc
+++ b/source/scripts/_00e_mq07a_visionedgesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ07a_VisionEdgeSC extends ObjectReference
 
 Event OnTriggerLeave(ObjectReference akActionRef)
 
-	If akActionRef == Game.GetPlayer() && MQ07a.GetStage() < 170
+	If akActionRef == Game.GetPlayer() && MQ07a.GetCurrentStageID() < 170
 	
 		MAGVampireSunlight.Play(Game.GetPlayer())
 		_00E_MQ07a_VisionAwake.Apply()
diff --git a/source/scripts/_00e_mq07b_aftermath_playersc.psc b/source/scripts/_00e_mq07b_aftermath_playersc.psc
index 4be2fc62..7a38eb36 100644
--- a/source/scripts/_00e_mq07b_aftermath_playersc.psc
+++ b/source/scripts/_00e_mq07b_aftermath_playersc.psc
@@ -2,13 +2,13 @@ Scriptname _00E_MQ07b_Aftermath_PlayerSC extends ReferenceAlias
 
 Event OnLocationChange(Location akOldLoc, Location akNewLoc)
 
-	If MQ07bAftermath.GetStage() == 10 && !bDone
+	If MQ07bAftermath.GetCurrentStageID() == 10 && !bDone
 		If NQ_G_07Dijaam_SC03_EscapeThroughTomb == None
 			NQ_G_07Dijaam_SC03_EscapeThroughTomb = Game.GetFormFromFile(0x00147063, "Skyrim.esm") as Scene
 		EndIf
 		
 		If (Game.GetPlayer().GetCurrentLocation() == CapitalCityLocation && NQ_G_07Dijaam_SC03_EscapeThroughTomb.IsPlaying() == false)
-			MQ07bAftermath.SetStage(15)
+			MQ07bAftermath.SetCurrentStageID(15)
 			bDone = True
 		EndIf
 	EndIf
diff --git a/source/scripts/_00e_mq07b_beaconpartssc.psc b/source/scripts/_00e_mq07b_beaconpartssc.psc
index 46e17810..82781907 100644
--- a/source/scripts/_00e_mq07b_beaconpartssc.psc
+++ b/source/scripts/_00e_mq07b_beaconpartssc.psc
@@ -12,12 +12,12 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-	If akActionRef == PlayerREF && MQ07b.GetStage() == 135 && !bDone
+	If akActionRef == PlayerREF && MQ07b.GetCurrentStageID() == 135 && !bDone
 		bDone = True
 		MQ07b.SetObjectiveCompleted(100 + iVisionIndex)
 		MQ07b.PlayVisionVoice(iVisionIndex, Self)
 		Self.Activate(PlayerREF, true)
-	Elseif akActionRef == PlayerREF && MQ07b.GetStage() >= 135
+	Elseif akActionRef == PlayerREF && MQ07b.GetCurrentStageID() >= 135
 		Self.Activate(PlayerREF, true)
 	EndIf
 	
diff --git a/source/scripts/_00e_mq07b_bellscript.psc b/source/scripts/_00e_mq07b_bellscript.psc
index 556354d2..5db1f9b7 100644
--- a/source/scripts/_00e_mq07b_bellscript.psc
+++ b/source/scripts/_00e_mq07b_bellscript.psc
@@ -11,7 +11,7 @@ EndEvent
 
 Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile, bool abPowerAttack, bool abSneakAttack, bool abBashAttack, bool abHitBlocked)
 
-	If akAggressor == Game.GetPlayer() && akSource == _02E_UniGlockenhammer && MQ07b_DeusExMachina.GetStage() == 65
+	If akAggressor == Game.GetPlayer() && akSource == _02E_UniGlockenhammer && MQ07b_DeusExMachina.GetCurrentStageID() == 65
 
 		BellSound.Play(Self)
 		Game.ShakeCamera()
@@ -43,7 +43,7 @@ Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile,
 		EndIf
 
 		If MQ07b_BellVar.GetValue() == 4 && BellNumber == 2
-			MQ07b_DeusExMachina.SetStage(70)
+			MQ07b_DeusExMachina.SetCurrentStageID(70)
 			MQ07b_BellVar.SetValue(5)
 			Return
 		EndIf
diff --git a/source/scripts/_00e_mq07b_burntcorpsesc.psc b/source/scripts/_00e_mq07b_burntcorpsesc.psc
index c5416908..bc010a93 100644
--- a/source/scripts/_00e_mq07b_burntcorpsesc.psc
+++ b/source/scripts/_00e_mq07b_burntcorpsesc.psc
@@ -2,9 +2,9 @@ Scriptname _00E_MQ07b_BurntCorpseSC extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if MQ07b.GetStage() < 51 && akActionRef == PlayerREF && MQ07b_LishariUglyFailsaveGlobal.GetValueInt() == 1
-		MQ07b.SetStage(51)
-	Elseif MQ07b.GetStage() >= 51 && MQ07b.GetStage() < 70
+	if MQ07b.GetCurrentStageID() < 51 && akActionRef == PlayerREF && MQ07b_LishariUglyFailsaveGlobal.GetValueInt() == 1
+		MQ07b.SetCurrentStageID(51)
+	Elseif MQ07b.GetCurrentStageID() >= 51 && MQ07b.GetCurrentStageID() < 70
 		MQ07b.PlayBellVision()
 	EndIf
 		
diff --git a/source/scripts/_00e_mq07b_questboxsc.psc b/source/scripts/_00e_mq07b_questboxsc.psc
index d5ab7077..6443628c 100644
--- a/source/scripts/_00e_mq07b_questboxsc.psc
+++ b/source/scripts/_00e_mq07b_questboxsc.psc
@@ -17,8 +17,8 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 	MQ07b_SC2_Bellhammer.Enable()
 	
 	if MQ07b_LishariUglyFailsaveGlobal.GetValueInt() == 1 && akActionRef == Game.GetPlayer()
-		if MQ07b.GetStage() < 51
-			MQ07b.SetStage(51)
+		if MQ07b.GetCurrentStageID() < 51
+			MQ07b.SetCurrentStageID(51)
 		EndIf
 	EndIf
 
diff --git a/source/scripts/_00e_mq07b_questfunctions.psc b/source/scripts/_00e_mq07b_questfunctions.psc
index ffc3b700..9d331f76 100644
--- a/source/scripts/_00e_mq07b_questfunctions.psc
+++ b/source/scripts/_00e_mq07b_questfunctions.psc
@@ -8,11 +8,11 @@ Import Utility
 
 Event OnUpdate()
 
-	If GetStage() >= 145 && GetStage() < 150
-		SetStage(150)
+	If GetCurrentStageID() >= 145 && GetCurrentStageID() < 150
+		SetCurrentStageID(150)
 	EndIf
 	
-	If (PlayerREF.GetParentCell() == AltDothulgradL4) && (GetStage() == 80)
+	If (PlayerREF.GetParentCell() == AltDothulgradL4) && (GetCurrentStageID() == 80)
 
 		If !MQ07b_SC04_Massacre.IsPlaying()
 			MQ07b_SC04_Massacre.ForceStart()
@@ -49,7 +49,7 @@ Function StartQuest()
 	_00E_MC_LishariREF.MoveTo(MQ07_SC02_LishariStartMarker)
 	
 	If !CQC01.IsCompleted()
-		CQC01.SetStage(20)
+		CQC01.SetCurrentStageID(20)
 	EndIf
     
     ; Fix for http://sureai.net:9898/browse/ERB-914 and
@@ -97,7 +97,7 @@ EndFunction
 
 Function PlayBellVision()
 
-	if GetStage() < 55
+	if GetCurrentStageID() < 55
 		MQ07b_DeusExMachina.SetObjectiveCompleted(40)
 	EndIf
 	
@@ -138,8 +138,8 @@ Function PlayBellVision()
 	_00E_MC_CaliaREF.EvaluatePackage()
 	_00E_MC_LishariREF.EvaluatePackage()
 	
-	if GetStage() < 55
-		MQ07b_DeusExMachina.SetStage(55)
+	if GetCurrentStageID() < 55
+		MQ07b_DeusExMachina.SetCurrentStageID(55)
 		MQ07b_DeusExMachina.SetObjectiveDisplayed(45)
 	EndIf
 		
@@ -315,7 +315,7 @@ Function CaliaKillKarek()
 		Wait(1.5)
 		_00E_MC_CaliaItFXS.Stop(_00E_MC_CaliaREF)
 		_00E_MC_CaliaREF.SetEyeTexture(EyesMaleHumanHazelBrown)
-		SetStage(82)
+		SetCurrentStageID(82)
 	EndIf
 	
 EndFunction
@@ -329,9 +329,9 @@ Function PlayerWakeUp()
 	Wait(2.8)
 	Game.EnablePlayerControls()
 	Game.SetPlayerAIDriven(False)
-	MQ07b_DeusExMachina.SetStage(95)
+	MQ07b_DeusExMachina.SetCurrentStageID(95)
 	_00E_MC_CaliaREF.EvaluatePackage()
-	SetStage(95)
+	SetCurrentStageID(95)
 	
 EndFunction
 
@@ -450,13 +450,13 @@ Function SetUpFinalScene()
 EndFunction
 
 Function StartMQ08Prologue()
-	MQ07bAftermath.SetStage(5)
-	MQ08Prologue.SetStage(5)
+	MQ07bAftermath.SetCurrentStageID(5)
+	MQ08Prologue.SetCurrentStageID(5)
 	_00E_TeleportGlobal.SetValueInt(0)
 EndFunction
 
 Function InitiateResetAILoop()
-	while GetStage() >= 75
+	while GetCurrentStageID() >= 75
 	Wait(1.5)
 	EndWhile
 EndFunction
@@ -485,7 +485,7 @@ EndFunction
 Function FinishQuest()
 
 	CompanionIsTalking.SetValueInt(0)
-	MQ07bAftermath.SetStage(5)
+	MQ07bAftermath.SetCurrentStageID(5)
 	_00E_EPHandler.GiveEP(__Config_iRewardEXP)
 	_00E_PlayerFunctions.GetSoundControl().RemoveSilence()
 	AllowIdleChatter.SetValue(1)
@@ -495,7 +495,7 @@ Function FinishQuest()
 	CompleteAllObjectives()
 
 	If CQC01.IsCompleted()
-		CQC02.SetStage(5)
+		CQC02.SetCurrentStageID(5)
 	EndIf
 	
 	Steam.UnlockAchievement("END_PROTO_BEACON_01")
diff --git a/source/scripts/_00e_mq07b_sc02_failsave02sc.psc b/source/scripts/_00e_mq07b_sc02_failsave02sc.psc
index a87065dd..58c1cd86 100644
--- a/source/scripts/_00e_mq07b_sc02_failsave02sc.psc
+++ b/source/scripts/_00e_mq07b_sc02_failsave02sc.psc
@@ -4,7 +4,7 @@ Scriptname _00E_MQ07b_SC02_Failsave02SC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If (akActionRef == PlayerREF) && (MQ07b.GetStage() == 35) && (bDone == False)
+	If (akActionRef == PlayerREF) && (MQ07b.GetCurrentStageID() == 35) && (bDone == False)
 	
 		bDone = True
 		_00E_MC_LishariREF.MoveTo(MQ07_SC02_LishariStartMarker)
diff --git a/source/scripts/_00e_mq07b_sc02_failsavesc.psc b/source/scripts/_00e_mq07b_sc02_failsavesc.psc
index f09c693d..fdadcdf7 100644
--- a/source/scripts/_00e_mq07b_sc02_failsavesc.psc
+++ b/source/scripts/_00e_mq07b_sc02_failsavesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ07b_SC02_FailsaveSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if akActionRef == PlayerREF && MQ07b.GetStage() == 35
+	if akActionRef == PlayerREF && MQ07b.GetCurrentStageID() == 35
 	
 		AllowIdleChatter.SetValue(0)
 		_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
diff --git a/source/scripts/_00e_mq07b_triggerboxmyradtower.psc b/source/scripts/_00e_mq07b_triggerboxmyradtower.psc
index e0034ac2..c27acd11 100644
--- a/source/scripts/_00e_mq07b_triggerboxmyradtower.psc
+++ b/source/scripts/_00e_mq07b_triggerboxmyradtower.psc
@@ -2,9 +2,9 @@ scriptname _00E_MQ07b_TriggerboxMyradtower  extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 	if akActionRef == Game.GetPlayer()
-		If MQ07b_DeusExMachina.GetStage() == 20
+		If MQ07b_DeusExMachina.GetCurrentStageID() == 20
 			CaliaRef.MoveTo(MQ07CaliaSpawnMarker)
-			MQ07b_DeusExMachina.SetStage(30)
+			MQ07b_DeusExMachina.SetCurrentStageID(30)
 			Actor Calia = CaliaRef as Actor
 			Calia.EvaluatePackage()
 		EndIf
diff --git a/source/scripts/_00e_mq07baftermath_function.psc b/source/scripts/_00e_mq07baftermath_function.psc
index ee09e1d7..a6ebc87f 100644
--- a/source/scripts/_00e_mq07baftermath_function.psc
+++ b/source/scripts/_00e_mq07baftermath_function.psc
@@ -27,7 +27,7 @@ Function _RegisterForNextUpdate()
 		fNextUpdateTime = _CalcNextUpdate(fBeaconEnableDay, fNextUpdateTime)
 	EndIf
 
-	Int curStage = GetStage()
+	Int curStage = GetCurrentStageID()
 	If curStage < 10
 		fNextUpdateTime = _CalcNextUpdate(fConsequencesStartDay, fNextUpdateTime)
 	ElseIf curStage >= 20 && fConsequencesEndDay > 0.0
@@ -45,19 +45,19 @@ Event OnUpdateGameTime()
 	If bDoneTimeSetup == False
 		bDoneTimeSetup = True
 		fBeaconEnableDay = GameDaysPassed.GetValue()
-		If GetStage() < 10 && bBeaconErrected == False
+		If GetCurrentStageID() < 10 && bBeaconErrected == False
 			fConsequencesStartDay = fBeaconEnableDay + 1.0
 		Else
 			fConsequencesStartDay = fBeaconEnableDay
 		EndIf
-		If GetStage() >= 20 && _00E_MQ07b_HallysFree.GetValueInt() == 0 
+		If GetCurrentStageID() >= 20 && _00E_MQ07b_HallysFree.GetValueInt() == 0 
 			fConsequencesEndDay = fBeaconEnableDay
 		EndIf
 	EndIf
 
 	; Enable construction version of the beacon
 	If bBeaconErrected == False && GameDaysPassed.GetValue() >= fBeaconEnableDay
-		If MQ10b.GetStage() >= 5
+		If MQ10b.GetCurrentStageID() >= 5
 			bBeaconErrected = True ; Too late
 		ElseIf PlayerREF.GetWorldSpace() != CapitalCityUpperTemple
 			bBeaconErrected = True
@@ -67,7 +67,7 @@ Event OnUpdateGameTime()
 
 	; Teleport Lishari to the beacon
 	If bBeaconErrected && bLishariMoved == False
-		If MQ08Prologue.GetStage() >= 10
+		If MQ08Prologue.GetCurrentStageID() >= 10
 			bLishariMoved = True ; No point to move her anymore, MQ08Prologue has done this already
 		ElseIf _00E_MC_LishariREF.Is3DLoaded() == False && PlayerREF.GetWorldSpace() != CapitalCityUpperTemple
 			bLishariMoved = True
@@ -77,7 +77,7 @@ Event OnUpdateGameTime()
 	EndIf
 
 	; Consequences
-	Int curStage = GetStage()
+	Int curStage = GetCurrentStageID()
 	If curStage < 15 && GameDaysPassed.GetValue() >= fConsequencesStartDay
 		Bool bHallysIsReady
 		If _00E_MQ07b_HallysFree.GetValueInt() == 0
@@ -97,9 +97,9 @@ Event OnUpdateGameTime()
 			EndIf
 			
 			If (PlayerREF.GetCurrentLocation() == CapitalCityLocation && NQ_G_07Dijaam_SC03_EscapeThroughTomb.IsPlaying() == false)
-				SetStage(15)
+				SetCurrentStageID(15)
 			Else
-				SetStage(10)
+				SetCurrentStageID(10)
 			EndIf
 		EndIf
 	ElseIf curStage >= 20 && fConsequencesEndDay > 0.0 && GameDaysPassed.GetValue() >= fConsequencesEndDay
@@ -132,7 +132,7 @@ Function SetUpConsequences()
 		bDoneTimeSetup = True ; Version update failsave
 		fConsequencesEndDay = GameDaysPassed.GetValue() + 7.0
 		MQ07b_Aftermath_HallysCorpseREF.Enable()
-		SetStage(20)
+		SetCurrentStageID(20)
 		_RegisterForNextUpdate()
 	Else
 		objSpawnMarker = PlayerREF.PlaceAtMe(XMarkerHeading, 1)
diff --git a/source/scripts/_00e_mq07caliafollowentrigger.psc b/source/scripts/_00e_mq07caliafollowentrigger.psc
index c1d8236b..9d821574 100644
--- a/source/scripts/_00e_mq07caliafollowentrigger.psc
+++ b/source/scripts/_00e_mq07caliafollowentrigger.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ07CaliaFollowEntrigger extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
     if (akActionRef == Game.GetPlayer())
-        if ( MQ07b_DeusExMachina.GetStage() >= 35 ) && ( MQ07b_DeusExMachina.GetStage() <= 60 )
+        if ( MQ07b_DeusExMachina.GetCurrentStageID() >= 35 ) && ( MQ07b_DeusExMachina.GetCurrentStageID() <= 60 )
             myAlias = CaliaRef as Actor
             if (Counter.GetValue() == 0)
                 if CompanionIsTalking.GetValueInt() == 0
@@ -31,7 +31,7 @@ EndEvent
 
 Event OnTriggerLeave(ObjectReference akActionRef)
 
-    int MQ07b_stage = MQ07b_DeusExMachina.GetStage()
+    int MQ07b_stage = MQ07b_DeusExMachina.GetCurrentStageID()
     
     if (MQ07b_stage < 35) || (MQ07b_stage > 60)
         return
diff --git a/source/scripts/_00e_mq08_konstantinscn.psc b/source/scripts/_00e_mq08_konstantinscn.psc
index 13f298b6..504c15ac 100644
--- a/source/scripts/_00e_mq08_konstantinscn.psc
+++ b/source/scripts/_00e_mq08_konstantinscn.psc
@@ -2,14 +2,14 @@ Scriptname _00E_MQ08_KonstantinSCN extends Actor
 
 Event OnEnterBleedout()
 
-	if (MQ08_IntoTheDeep.GetStage() < 155) && (MQ08_IntoTheDeep.GetStage() >= 150)
+	if (MQ08_IntoTheDeep.GetCurrentStageID() < 155) && (MQ08_IntoTheDeep.GetCurrentStageID() >= 150)
 		_00E_MQ09a_KonstantinDeathM.Play(Self)
 		Self.SetActorValue("Aggression", 0)
 		Self.SetGhost(True)
 		Self.SetNoBleedoutRecovery(True)
 		Self.StopCombat()
 		Self.StopCombatAlarm()
-		MQ08_IntoTheDeep.SetStage(152)
+		MQ08_IntoTheDeep.SetCurrentStageID(152)
 	endif
 	
 EndEvent
@@ -17,8 +17,8 @@ EndEvent
 
 Event OnDeath(Actor akKiller)
 
-	if MQ08_IntoTheDeep.GetStage() >= 150
-		MQ08_IntoTheDeep.SetStage(155)
+	if MQ08_IntoTheDeep.GetCurrentStageID() >= 150
+		MQ08_IntoTheDeep.SetCurrentStageID(155)
 		_00E_MC_JesparRef.EvaluatePackage()
 	endif
 
diff --git a/source/scripts/_00e_mq08_leverscn.psc b/source/scripts/_00e_mq08_leverscn.psc
index 7fcf8eda..670b0175 100644
--- a/source/scripts/_00e_mq08_leverscn.psc
+++ b/source/scripts/_00e_mq08_leverscn.psc
@@ -5,13 +5,13 @@ scriptName _00E_MQ08_LeverSCN extends ObjectReference
 ;=====================================================================================
 
 EVENT onActivate(ObjectReference akActionRef)
-	if MQ08_IntoTheDeep.GetStage() >= 205
+	if MQ08_IntoTheDeep.GetCurrentStageID() >= 205
 		return
 	endif
 	
-	if DoOnce == False && Game.GetPlayer().IsInCombat() == 0 && MQ08_IntoTheDeep.GetStage() >= 195 && MQ08_IntoTheDeep.GetStage() < 200
+	if DoOnce == False && Game.GetPlayer().IsInCombat() == 0 && MQ08_IntoTheDeep.GetCurrentStageID() >= 195 && MQ08_IntoTheDeep.GetCurrentStageID() < 200
 		DoOnce = True
-		if akActionRef == Game.GetPlayer() && MQ08_IntoTheDeep.GetStage() == 195
+		if akActionRef == Game.GetPlayer() && MQ08_IntoTheDeep.GetCurrentStageID() == 195
 			if _00E_M08_LeversGlobal.GetValue() < 3
 				_00E_M08_LeversGlobal.SetValue(_00E_M08_LeversGlobal.GetValue() + 1)
 				MQ08_IntoTheDeep.UpdateCurrentInstanceGlobal(_00E_M08_LeversGlobal)
@@ -21,7 +21,7 @@ EVENT onActivate(ObjectReference akActionRef)
 				_00E_M08_LeversGlobal.SetValue(_00E_M08_LeversGlobal.GetValue() + 1)
 				MQ08_IntoTheDeep.UpdateCurrentInstanceGlobal(_00E_M08_LeversGlobal)
 				MQ08_IntoTheDeep.SetObjectiveCompleted(165)
-				MQ08_IntoTheDeep.SetStage(200)
+				MQ08_IntoTheDeep.SetCurrentStageID(200)
 			EndIf
 		EndIf
 		Utility.Wait(2.5)
diff --git a/source/scripts/_00e_mq08_questfunctions.psc b/source/scripts/_00e_mq08_questfunctions.psc
index 2d3d7235..69771d5d 100644
--- a/source/scripts/_00e_mq08_questfunctions.psc
+++ b/source/scripts/_00e_mq08_questfunctions.psc
@@ -194,7 +194,7 @@ Function KillKonstantin()
 	
 	_00E_Func_SetNPCAsCompanion.SetNPCAsCompanion(_00E_MC_JesparREF, False)
 	
-	SetStage(155)
+	SetCurrentStageID(155)
 
 EndFunction
 
@@ -308,7 +308,7 @@ Function StartTrainScene()
     While !Done 
         Game.ShakeCamera(PlayerREF, Utility.RandomFloat(0.05, 0.1), 3)
         Utility.Wait(3)
-        if GetStage() >= 220
+        if GetCurrentStageID() >= 220
             Done = True
         EndIf
     EndWhile
@@ -330,7 +330,7 @@ EndFunction
 
 Function RefreshCombatState()
 
-    While _00E_MC_KonstantinREF.IsDead() == 0 || GetStage() >= 156
+    While _00E_MC_KonstantinREF.IsDead() == 0 || GetCurrentStageID() >= 156
         _00E_MC_KonstantinREF.StartCombat(_00E_MC_JesparREF)
         Utility.Wait(4)
     EndWhile
diff --git a/source/scripts/_00e_mq08altarscript.psc b/source/scripts/_00e_mq08altarscript.psc
index 5513ca25..bad3f973 100644
--- a/source/scripts/_00e_mq08altarscript.psc
+++ b/source/scripts/_00e_mq08altarscript.psc
@@ -8,7 +8,7 @@ Scriptname _00E_MQ08AltarScript extends ObjectReference
 ;EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
-	if MQ08_IntoTheDeep.GetStage() == 100 && DoOnce == False
+	if MQ08_IntoTheDeep.GetCurrentStageID() == 100 && DoOnce == False
 		DoOnce = True
 		Game.GetPlayer().RemoveItem(_00E_MQ08Siegelstein, 1)
 		MQ08SiglstoneRef.Enable()
@@ -22,7 +22,7 @@ Event OnActivate(ObjectReference akActionRef)
         ; commented out again for the same reason
 		;MQ08BridgeRef.PlayGamebryoAnimation("Backward", true)
 		Utility.Wait(2.6)
-		MQ08_IntoTheDeep.SetStage(105)
+		MQ08_IntoTheDeep.SetCurrentStageID(105)
 	EndIf
 EndEvent
 
diff --git a/source/scripts/_00e_mq08aprologue_functions.psc b/source/scripts/_00e_mq08aprologue_functions.psc
index 120eeb83..c87c9746 100644
--- a/source/scripts/_00e_mq08aprologue_functions.psc
+++ b/source/scripts/_00e_mq08aprologue_functions.psc
@@ -17,7 +17,7 @@ Event OnUpdateGameTime()
 	If NQ_G_07Dijaam_SC03_EscapeThroughTomb.IsPlaying()
 		RegisterForSingleUpdate(10)
 	Else
-		Self.SetStage(10)
+		Self.SetCurrentStageID(10)
 	EndIf
 
 EndEvent
@@ -27,7 +27,7 @@ Event OnUpdate()
 	If NQ_G_07Dijaam_SC03_EscapeThroughTomb.IsPlaying()
 		RegisterForSingleUpdate(10)
 	Else
-		Self.SetStage(10)
+		Self.SetCurrentStageID(10)
 	EndIf
 	
 EndEvent
@@ -76,7 +76,7 @@ EndFunction
 Function CheckForCompanionQuests()
 
 	If !CQJ02.IsCompleted()
-		CQJ02.SetStage(40)
+		CQJ02.SetCurrentStageID(40)
 	EndIf
 	
 EndFunction
@@ -85,14 +85,14 @@ Function StartMQ08()
 
 	_00E_PlayerFunctions.GetSoundControl().RemoveSilence()
 	Self.CompleteQuest()
-	MQ08.SetStage(5)
+	MQ08.SetCurrentStageID(5)
 
 EndFunction
 
 Function PortKonstantin()
 
 	_00E_PlayerFunctions.GetSoundControl().RemoveSilence()
-	MQ08.SetStage(50)
+	MQ08.SetCurrentStageID(50)
 
 EndFunction
 
diff --git a/source/scripts/_00e_mq08jesparfollowentrigger.psc b/source/scripts/_00e_mq08jesparfollowentrigger.psc
index 25720e5b..8ecb750f 100644
--- a/source/scripts/_00e_mq08jesparfollowentrigger.psc
+++ b/source/scripts/_00e_mq08jesparfollowentrigger.psc
@@ -27,7 +27,7 @@ EndEvent
 
 Function SendEnterEvent()
     
-    if(MQ08b_IntoTheDeep.GetStage() >= 75) && (MQ08b_IntoTheDeep.GetStage() < 100 ) 
+    if(MQ08b_IntoTheDeep.GetCurrentStageID() >= 75) && (MQ08b_IntoTheDeep.GetCurrentStageID() < 100 ) 
         
         If _00E_MC_JesparREF == None
             _00E_MC_JesparREF = Game.GetForm(0x0002b253) as Actor
@@ -72,7 +72,7 @@ EndFunction
 
 Function SendExitEvent()
 
-	If(MQ08b_IntoTheDeep.GetStage() >= 75) && (MQ08b_IntoTheDeep.GetStage() < 100) 
+	If(MQ08b_IntoTheDeep.GetCurrentStageID() >= 75) && (MQ08b_IntoTheDeep.GetCurrentStageID() < 100) 
 
 		If InTrigger == True
 			Counter.SetValue((Counter.GetValue() - 1))
diff --git a/source/scripts/_00e_mq08myradisflying.psc b/source/scripts/_00e_mq08myradisflying.psc
index 94fcc3e7..f745e7c8 100644
--- a/source/scripts/_00e_mq08myradisflying.psc
+++ b/source/scripts/_00e_mq08myradisflying.psc
@@ -1,7 +1,7 @@
 Scriptname _00E_MQ08MyradIsFlying extends ObjectReference  
 
 Event OnTriggerEnter(ObjectReference akActionRef)
-	if MQ08_IntoTheDeep.GetStage() == 75 && _00E_MyradIsFlying.GetValue() != 0 && akActionRef == Game.GetPlayer()
+	if MQ08_IntoTheDeep.GetCurrentStageID() == 75 && _00E_MyradIsFlying.GetValue() != 0 && akActionRef == Game.GetPlayer()
 		JesparRef.MoveTo(GetLinkedRef())
 	EndIf
 EndEvent
diff --git a/source/scripts/_00e_mq08prologue_tealorfailsavesc.psc b/source/scripts/_00e_mq08prologue_tealorfailsavesc.psc
index 633c2d93..ec59971a 100644
--- a/source/scripts/_00e_mq08prologue_tealorfailsavesc.psc
+++ b/source/scripts/_00e_mq08prologue_tealorfailsavesc.psc
@@ -31,7 +31,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 			bDoItOnce2 = true
 		EndIf
 
-		if !MQ08Prologue_SC1_Discussion.IsPlaying() && (MQ08PrologueFunctions.GetStage() >= 10 && MQ08PrologueFunctions.GetStage() < 45)
+		if !MQ08Prologue_SC1_Discussion.IsPlaying() && (MQ08PrologueFunctions.GetCurrentStageID() >= 10 && MQ08PrologueFunctions.GetCurrentStageID() < 45)
 			
 			If MQ06_SC5_RitualScene.IsPlaying()
 				MQ06_SC5_RitualScene.Stop()
@@ -41,11 +41,11 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 		
 		EndIf
 	
-		If !MQ10b_SC2_Temple.IsPlaying() && (MQ10b.GetStage() >= 35 && MQ10b.GetStage() < 70)
+		If !MQ10b_SC2_Temple.IsPlaying() && (MQ10b.GetCurrentStageID() >= 35 && MQ10b.GetCurrentStageID() < 70)
 			MQ10bFunctions.SetUpTempleScene()
 		EndIf
 
-		If bMQ05Property == false && MQ05PrologueFunctions.GetStage() == 5
+		If bMQ05Property == false && MQ05PrologueFunctions.GetCurrentStageID() == 5
 			MQ05PrologueFunctions.FillTealorProperty()
 			bMQ05Property = true
 		EndIf
diff --git a/source/scripts/_00e_mq08siglstonescript.psc b/source/scripts/_00e_mq08siglstonescript.psc
index 1f5676e5..1cf72797 100644
--- a/source/scripts/_00e_mq08siglstonescript.psc
+++ b/source/scripts/_00e_mq08siglstonescript.psc
@@ -4,7 +4,7 @@ Event OnItemRemoved(Form akBaseItem, int aiItemCount, ObjectReference akItemRefe
 
 	if akDestContainer == Game.GetPlayer() && akBaseItem == _00E_MQ08Siegelstein
 
-		MQ08.SetStage(70)
+		MQ08.SetCurrentStageID(70)
 	EndIf
   
 
diff --git a/source/scripts/_00e_mq08trainsoundactivator.psc b/source/scripts/_00e_mq08trainsoundactivator.psc
index e69ec050..e0a5833b 100644
--- a/source/scripts/_00e_mq08trainsoundactivator.psc
+++ b/source/scripts/_00e_mq08trainsoundactivator.psc
@@ -5,7 +5,7 @@ Event OnInit()
 	While !Done	
 		Game.ShakeCamera(None, Utility.RandomFloat(0.05, 0.15), 3)
 		
-		If MQ08_IntoTheDeep.GetStage() == 220
+		If MQ08_IntoTheDeep.GetCurrentStageID() == 220
 			Done = True
 			Sound.StopInstance(SoundID)
 			Sound.StopInstance(SoundID2)
diff --git a/source/scripts/_00e_mq08triggerhouse.psc b/source/scripts/_00e_mq08triggerhouse.psc
index 88bc4ca2..b4403bf2 100644
--- a/source/scripts/_00e_mq08triggerhouse.psc
+++ b/source/scripts/_00e_mq08triggerhouse.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ08TriggerHouse extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if MQ08_IntoTheDeep.GetStage() == 180 && akActionRef == Game.GetPlayer() && DoOnce == False
+	if MQ08_IntoTheDeep.GetCurrentStageID() == 180 && akActionRef == Game.GetPlayer() && DoOnce == False
 		Message.ResetHelpMessage("Jump")
 		_00E_MQ08_HouseMessage01.ShowAsHelpMessage("Jump", 2, 1, 1)
 		DoOnce = True
@@ -10,7 +10,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 		Message.ResetHelpMessage("Jump")
 		_00E_MQ08_HouseMessage02.ShowAsHelpMessage("Jump", 2, 1, 1)
 		Utility.Wait(3.0)
-		MQ08_IntoTheDeep.SetStage(185)
+		MQ08_IntoTheDeep.SetCurrentStageID(185)
 	EndIf
 	
 EndEvent
diff --git a/source/scripts/_00e_mq08triggertemplescene.psc b/source/scripts/_00e_mq08triggertemplescene.psc
index 1930f41f..12887224 100644
--- a/source/scripts/_00e_mq08triggertemplescene.psc
+++ b/source/scripts/_00e_mq08triggertemplescene.psc
@@ -1,8 +1,8 @@
 Scriptname _00E_MQ08TriggerTempleScene extends ObjectReference  
 
 Event OnTriggerEnter(ObjectReference akActionRef)
-	if MQ08_IntoTheDeep.GetStage() >= 75 && akActionRef == Game.GetPlayer() && MQ08_IntoTheDeep.GetStage() < 90
-		MQ08_IntoTheDeep.SetStage(90)
+	if MQ08_IntoTheDeep.GetCurrentStageID() >= 75 && akActionRef == Game.GetPlayer() && MQ08_IntoTheDeep.GetCurrentStageID() < 90
+		MQ08_IntoTheDeep.SetCurrentStageID(90)
 		MQ08_IntoTheDeep_SceneTempleOutside.Start()
 		if Game.GetPlayer().GetDistance(_00E_MC_JesparREF) >= 1000 ; Debug - Standartmäßig auf 1000
 			_00E_MC_JesparREF.MoveTo(Game.GetPlayer())
diff --git a/source/scripts/_00e_mq09_questfunctions.psc b/source/scripts/_00e_mq09_questfunctions.psc
index 3b559bf6..b95125cd 100644
--- a/source/scripts/_00e_mq09_questfunctions.psc
+++ b/source/scripts/_00e_mq09_questfunctions.psc
@@ -14,19 +14,19 @@ EndEvent
 
 Event OnUpdate()
 
-	If GetStage() >= 60 && (MQ10a.GetStage() < 5 || !MQ10a.IsRunning())
+	If GetCurrentStageID() >= 60 && (MQ10a.GetCurrentStageID() < 5 || !MQ10a.IsRunning())
 	
-		MQ10a.SetStage(5)
+		MQ10a.SetCurrentStageID(5)
         
         Wait(1)
         
-        if MQ10a.GetStage() < 5
+        if MQ10a.GetCurrentStageID() < 5
         
            _00E_MQ09_MQ10a_Broken_Message.Show()
             RegisterForSingleUpdate(6)
 
         endif
-	ElseIf GetStage() == 15 && _00E_MC_JesparREF.GetParentCell() != MQ09bSkelett.GetParentCell()
+	ElseIf GetCurrentStageID() == 15 && _00E_MC_JesparREF.GetParentCell() != MQ09bSkelett.GetParentCell()
 		
 		_00E_MC_JesparREF.MoveTo(MQ09_SC1_JesparTravelToREF)
 		
@@ -83,7 +83,7 @@ Function InitQuest()
 	EndIf
 	
 	MQ09a.StopTrainSound()
-	Self.SetStage(10)
+	Self.SetCurrentStageID(10)
 	
 EndFunction
 
@@ -396,7 +396,7 @@ Function EndQuest()
 	Game.ShowFirstPersonGeometry(true)
 	_00E_MC_TaranorREF.SetActorValue("speedMult", 100)
 	RegisterForSingleUpdate(3)
-	MQ10a.SetStage(5)
+	MQ10a.SetCurrentStageID(5)
 	
 EndFunction
 
diff --git a/source/scripts/_00e_mq09a_failsavejesparsc.psc b/source/scripts/_00e_mq09a_failsavejesparsc.psc
index 6fab4dfd..6937203f 100644
--- a/source/scripts/_00e_mq09a_failsavejesparsc.psc
+++ b/source/scripts/_00e_mq09a_failsavejesparsc.psc
@@ -4,7 +4,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	If akActionRef == PlayerREF 
 
-		If MQ09a.GetStage() >= 70 && MQ09a.GetStage() < 75
+		If MQ09a.GetCurrentStageID() >= 70 && MQ09a.GetCurrentStageID() < 75
 			
 			_00E_MC_JesparREF.MoveTo(_00E_Nebelhaim_TeleportMarkerREF)			
 		
diff --git a/source/scripts/_00e_mq09a_nebelhaimfailsavesc.psc b/source/scripts/_00e_mq09a_nebelhaimfailsavesc.psc
index c9c04a5b..29e8e1e6 100644
--- a/source/scripts/_00e_mq09a_nebelhaimfailsavesc.psc
+++ b/source/scripts/_00e_mq09a_nebelhaimfailsavesc.psc
@@ -7,7 +7,7 @@ Scriptname _00E_MQ09a_NebelhaimFailsaveSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if !bDone && akActionRef == Game.GetPlayer()
-		if MQ09a.GetStage() >= 5 && MQ09a.GetStage() < 60
+		if MQ09a.GetCurrentStageID() >= 5 && MQ09a.GetCurrentStageID() < 60
 			bDone = True
 			MQ09a.JesparAndConstantineNebelhaimFailsave()
 		EndIf
diff --git a/source/scripts/_00e_mq09a_templefailsavesc.psc b/source/scripts/_00e_mq09a_templefailsavesc.psc
index 063dd8cc..9110f8d3 100644
--- a/source/scripts/_00e_mq09a_templefailsavesc.psc
+++ b/source/scripts/_00e_mq09a_templefailsavesc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ09a_TempleFailsaveSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	If !bDone && akActionRef == PlayerREF
-		If (MQ09a.GetStage() >= 140 && MQ09a.GetStage() < 155) && !MQ08_IntoTheDeep_SceneTempleInside.IsPlaying()
+		If (MQ09a.GetCurrentStageID() >= 140 && MQ09a.GetCurrentStageID() < 155) && !MQ08_IntoTheDeep_SceneTempleInside.IsPlaying()
 			bDone = True
 			MQ08_IntoTheDeep_SceneTempleInside.ForceStart()
 		EndIf
diff --git a/source/scripts/_00e_mq10_triggerboxcontrols.psc b/source/scripts/_00e_mq10_triggerboxcontrols.psc
index a1841384..2ea61ec4 100644
--- a/source/scripts/_00e_mq10_triggerboxcontrols.psc
+++ b/source/scripts/_00e_mq10_triggerboxcontrols.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ10_TriggerBoxControls extends ObjectReference
 
 Event OnTriggerenter(ObjectReference akAktionRef)
 
-	if akAktionRef == Game.GetPlayer() && MQ10b.GetStage() == 35
+	if akAktionRef == Game.GetPlayer() && MQ10b.GetCurrentStageID() == 35
 		Game.DisablePlayerControls()
 	EndIf
 
diff --git a/source/scripts/_00e_mq10a_functions.psc b/source/scripts/_00e_mq10a_functions.psc
index 196ca15b..43801518 100644
--- a/source/scripts/_00e_mq10a_functions.psc
+++ b/source/scripts/_00e_mq10a_functions.psc
@@ -22,7 +22,7 @@ Function SetUpScene()
 	Game.DisablePlayerControls(false, true, true, false, true, true, true, true, 0)
 	Game.RequestAutoSave()
 	PlayerREF.PlayIdle(TG05_GetUp)
-	if GetStage() >= 5
+	if GetCurrentStageID() >= 5
 		FadeToBlackBackImod2SecPause.Apply()
 	endif
 	Game.ShowFirstPersonGeometry(false)
@@ -122,7 +122,7 @@ EndFunction
 Function AddSilence()
 
 	_00E_SilenceAbruptHighPriority.Add()
-	SetStage(25)
+	SetCurrentStageID(25)
 	
 EndFunction
 
@@ -168,7 +168,7 @@ Function CleanUp()
 		
 	EndIf
 	
-	MQ10b.SetStage(5)
+	MQ10b.SetCurrentStageID(5)
 	
 EndFunction
 
@@ -178,7 +178,7 @@ EndFunction
 
 Event OnUpdate()
 
-	If GetStage() < 25
+	If GetCurrentStageID() < 25
 	
 		If GameHour.GetValue() >= 22
 			Timescale.SetValue(0.01)
diff --git a/source/scripts/_00e_mq10a_setupsc.psc b/source/scripts/_00e_mq10a_setupsc.psc
index d4587945..d55c0d06 100644
--- a/source/scripts/_00e_mq10a_setupsc.psc
+++ b/source/scripts/_00e_mq10a_setupsc.psc
@@ -11,7 +11,7 @@ Scriptname _00E_MQ10a_SetUpSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 ;	if akActionRef == PlayerREF
-;		if MQ10a.GetStage() == 5 && !bDone
+;		if MQ10a.GetCurrentStageID() == 5 && !bDone
 ;            bDone = True
 ;            MQ10a.SetUpSceneForReal()
 ;		endif
diff --git a/source/scripts/_00e_mq10b_lisharitriggerbox.psc b/source/scripts/_00e_mq10b_lisharitriggerbox.psc
index 522d68e9..ca23e83f 100644
--- a/source/scripts/_00e_mq10b_lisharitriggerbox.psc
+++ b/source/scripts/_00e_mq10b_lisharitriggerbox.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ10b_LishariTriggerbox extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if akActionRef == Game.GetPlayer() && MQ10b.GetStage() == 70 && DoOnce == 0
+	if akActionRef == Game.GetPlayer() && MQ10b.GetCurrentStageID() == 70 && DoOnce == 0
 		Message.ResetHelpMessage("Empty")
 		_00E_MQ10b_ThiningMessage01.ShowAsHelpMessage("Empty", 3, 2, 1)
 		_00E_MC_YuslanRef.EnableNoWait()
diff --git a/source/scripts/_00e_mq10b_questfunctions.psc b/source/scripts/_00e_mq10b_questfunctions.psc
index 134161e2..c8483783 100644
--- a/source/scripts/_00e_mq10b_questfunctions.psc
+++ b/source/scripts/_00e_mq10b_questfunctions.psc
@@ -51,7 +51,7 @@ EndFunction
 Function StartCQJ03()
 
     If CQJ02.IsCompleted()
-        CQJ03.SetStage(5)
+        CQJ03.SetCurrentStageID(5)
     EndIf
     
     Game.RequestAutoSave()
@@ -63,7 +63,7 @@ Function PortToDunehome()
     FadeToBlackImod.Apply()
     Utility.Wait(2)
     FadeToBlackHoldImod.ApplyCrossFade()
-    Self.SetStage(30)
+    Self.SetCurrentStageID(30)
     PlayerREF.MoveTo(MQ10b_SC02_PlayerMarker)
     _00E_SilenceLongTransitionHighPriority.Remove()
     _00E_PlayerFunctions.GetSoundControl().RemoveSilence()
@@ -87,9 +87,9 @@ Function PortJespar()
     
         
     If !CQC02.IsCompleted() && CQC02.IsRunning()
-        CQC02.SetStage(35)
+        CQC02.SetCurrentStageID(35)
     Elseif CQC02.IsCompleted()
-        CQC03.SetStage(5)
+        CQC03.SetCurrentStageID(5)
     EndIf
 
     _00E_Func_ReferenceFormList.Enable(_00E_MQ09b_NehrimeseSoldiersFRM)
@@ -147,7 +147,7 @@ Function FadeOutScene()
     EndIf
 
     SuntempleEmporium_ClearWeatherLinker.Disable()
-    SetStage(50)
+    SetCurrentStageID(50)
     _00E_TimeControl.SkipTimeToHour(20)
 
 EndFunction
@@ -231,7 +231,7 @@ ENdFunction
 Event OnUpdateGameTime() ; because of how we registered, this event occurs every 30 minutes of game time
 
     if GameDaysPassed.GetValue() + 1 >= GameDay
-        SetStage(125)
+        SetCurrentStageID(125)
         UnregisterForUpdateGameTime()
     endif
 	
@@ -256,17 +256,17 @@ EndFunction
 Function FinishQuest()
         
     If !CQJ03.IsCompleted()
-        CQJ03.SetStage(15)
+        CQJ03.SetCurrentStageID(15)
     EndIf
     
-    MQ12a.SetStage(5)
+    MQ12a.SetCurrentStageID(5)
 
     MQ10bLexilContainer.RemoveAllItems(PlayerREF, true, true)
     MQ10bLishariDead.disable()
     _00E_EPHandler.GiveEP(1000)
     _00E_PlayerFunctions.GetSoundControl().RemoveSilence()
 
-	FS_NQ03.SetStage(10)
+	FS_NQ03.SetCurrentStageID(10)
     
 EndFunction
 
diff --git a/source/scripts/_00e_mq10b_sc01_startfailsavesc.psc b/source/scripts/_00e_mq10b_sc01_startfailsavesc.psc
index e3cd1eca..8d18ebc5 100644
--- a/source/scripts/_00e_mq10b_sc01_startfailsavesc.psc
+++ b/source/scripts/_00e_mq10b_sc01_startfailsavesc.psc
@@ -9,7 +9,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
         
         Utility.Wait(1)
         
-        if (MQ10a.GetStage() >= 10)
+        if (MQ10a.GetCurrentStageID() >= 10)
 
             if !MQ10b_SC1_Ship.IsPlaying()
         
diff --git a/source/scripts/_00e_mq10b_sc02_lisharifailsavesc.psc b/source/scripts/_00e_mq10b_sc02_lisharifailsavesc.psc
index 795bb202..9491b0ec 100644
--- a/source/scripts/_00e_mq10b_sc02_lisharifailsavesc.psc
+++ b/source/scripts/_00e_mq10b_sc02_lisharifailsavesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ10b_SC02_LishariFailsaveSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If (akActionRef == Game.GetPlayer()) && (MQ10b.GetStage() == 55)
+	If (akActionRef == Game.GetPlayer()) && (MQ10b.GetCurrentStageID() == 55)
 		_00E_MC_LishariREF.Disable()
 		_00E_MC_LishariREF.MoveTo(MQ10b_SC02_LishariFailsaveMarker)
 		_00E_MC_LishariREF.Enable()
diff --git a/source/scripts/_00e_mq10bunlockdoorifscenerunning.psc b/source/scripts/_00e_mq10bunlockdoorifscenerunning.psc
index b1f82738..ba68dce8 100644
--- a/source/scripts/_00e_mq10bunlockdoorifscenerunning.psc
+++ b/source/scripts/_00e_mq10bunlockdoorifscenerunning.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ10bUnlockDoorIfSceneRunning extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if akActionRef == Game.GetPlayer() && MQ10b.GetStage() >= 70 &&  MQ10b.GetStage() <= 140
+	if akActionRef == Game.GetPlayer() && MQ10b.GetCurrentStageID() >= 70 &&  MQ10b.GetCurrentStageID() <= 140
 	
 		If MQ10bTavernDoor.IsLocked()
 	
diff --git a/source/scripts/_00e_mq11_critterobjectscn.psc b/source/scripts/_00e_mq11_critterobjectscn.psc
index 64448eea..62dd850b 100644
--- a/source/scripts/_00e_mq11_critterobjectscn.psc
+++ b/source/scripts/_00e_mq11_critterobjectscn.psc
@@ -26,7 +26,7 @@ EVENT onActivate(ObjectReference akActionRef)
 				MQ11c.SetObjectiveCompleted(45)
 				MQ11c.SetObjectiveDisplayed(55)
 				MQ11c.SetObjectiveDisplayed(50, true, true)
-				MQ11c.SetStage(190)
+				MQ11c.SetCurrentStageID(190)
 			EndIf
 		ElseIf CurrentCount > 7 && CurrentCount <= 14
 			MQ11c.SetObjectiveCompleted(50, false)
diff --git a/source/scripts/_00e_mq11a_barrelpilescript.psc b/source/scripts/_00e_mq11a_barrelpilescript.psc
index 753a1ef5..e8dc6c18 100644
--- a/source/scripts/_00e_mq11a_barrelpilescript.psc
+++ b/source/scripts/_00e_mq11a_barrelpilescript.psc
@@ -2,12 +2,12 @@ Scriptname _00E_MQ11a_BarrelPileScript extends ObjectReference
 
 Event OnActivate (ObjectReference akActionRef)
 
-	if (akActionRef == Game.GetPlayer()) && (MQ11a.GetStage() == 60)
+	if (akActionRef == Game.GetPlayer()) && (MQ11a.GetCurrentStageID() == 60)
 		int iButton = _00E_MQ11a_ExplosiveBarrelsMessagebox.Show()
 			If iButton == 0
 				Return
 			Elseif iButton == 1
-				MQ11a.SetStage(65)
+				MQ11a.SetCurrentStageID(65)
 			EndIf
 	EndIf
 
diff --git a/source/scripts/_00e_mq11a_caliaaliasscript.psc b/source/scripts/_00e_mq11a_caliaaliasscript.psc
index 36dd6d44..fd9b0abd 100644
--- a/source/scripts/_00e_mq11a_caliaaliasscript.psc
+++ b/source/scripts/_00e_mq11a_caliaaliasscript.psc
@@ -6,7 +6,7 @@ Actor Property PlayerRef Auto
 ObjectReference Property MQ11a_SC23_CaliaTalkingActivator Auto
 
 Function UpdateState()
-	Int mq11aStage = GetOwningQuest().GetStage()
+	Int mq11aStage = GetOwningQuest().GetCurrentStageID()
 	If mq11aStage >= 165 && mq11aStage < 215
 		GoToState("Unconscious")
 	Else
diff --git a/source/scripts/_00e_mq11a_caliacastlefailsavesc.psc b/source/scripts/_00e_mq11a_caliacastlefailsavesc.psc
index 16c05768..ad0dce5d 100644
--- a/source/scripts/_00e_mq11a_caliacastlefailsavesc.psc
+++ b/source/scripts/_00e_mq11a_caliacastlefailsavesc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ11a_CaliaCastleFailsaveSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == PlayerREF
-		if MQ11a.GetStage() >= 80 && MQ11a.GetStage() < 150
+		if MQ11a.GetCurrentStageID() >= 80 && MQ11a.GetCurrentStageID() < 150
 			; if MQ11a_TravelState02.GetValueInt() > 1
 				; MQ11a_TravelState02.SetValueInt(1)
 			; EndIf
diff --git a/source/scripts/_00e_mq11a_caliaquarterdoorscript.psc b/source/scripts/_00e_mq11a_caliaquarterdoorscript.psc
index 22462d76..ecf16713 100644
--- a/source/scripts/_00e_mq11a_caliaquarterdoorscript.psc
+++ b/source/scripts/_00e_mq11a_caliaquarterdoorscript.psc
@@ -9,13 +9,13 @@ EndEvent
 Event OnActivate(ObjectReference akActionRef)
 
 	; if (akActionRef == Game.GetPlayer()) 
-		; if (MQ11a.GetStage() == 80) && !(Game.GetPlayer().IsInCombat()) && !Done
-				; MQ11a.SetStage(85)
+		; if (MQ11a.GetCurrentStageID() == 80) && !(Game.GetPlayer().IsInCombat()) && !Done
+				; MQ11a.SetCurrentStageID(85)
 		; EndIf
 	; EndIf
 	
 	if (akActionRef == Game.GetPlayer()) 
-		if (MQ11a.GetStage() == 100) && (Game.GetPlayer().GetItemCount(_00E_MQ11a_DalGalarQuarterKey) >= 0)
+		if (MQ11a.GetCurrentStageID() == 100) && (Game.GetPlayer().GetItemCount(_00E_MQ11a_DalGalarQuarterKey) >= 0)
 				BlockActivation(False)
 				Self.Activate(Game.GetPlayer(), True)
 		EndIf
diff --git a/source/scripts/_00e_mq11a_caliasftoutsidefailsavesc.psc b/source/scripts/_00e_mq11a_caliasftoutsidefailsavesc.psc
index 27a214a1..dda1d25f 100644
--- a/source/scripts/_00e_mq11a_caliasftoutsidefailsavesc.psc
+++ b/source/scripts/_00e_mq11a_caliasftoutsidefailsavesc.psc
@@ -7,7 +7,7 @@ Scriptname _00E_MQ11a_CaliaSFTOutsideFailsaveSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == PlayerREF
-		if MQ11a.GetStage() == 40
+		if MQ11a.GetCurrentStageID() == 40
             if _00E_MC_CaliaREF.GetDistance(PlayerREF) > 4000
                 _00E_MC_CaliaREF.EvaluatePackage()
             endif
diff --git a/source/scripts/_00e_mq11a_combattavernscript.psc b/source/scripts/_00e_mq11a_combattavernscript.psc
index 0916ee4c..1bf6fd40 100644
--- a/source/scripts/_00e_mq11a_combattavernscript.psc
+++ b/source/scripts/_00e_mq11a_combattavernscript.psc
@@ -6,7 +6,7 @@ Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile,
 if akAggressor == PlayerREF
 
 	MQ11a.SetObjectiveFailed(15)
-	MQ11a.SetStage(39)
+	MQ11a.SetCurrentStageID(39)
 
 EndIf
 
diff --git a/source/scripts/_00e_mq11a_deaddraugrmotiontype.psc b/source/scripts/_00e_mq11a_deaddraugrmotiontype.psc
index fee3dd6f..19c7ced3 100644
--- a/source/scripts/_00e_mq11a_deaddraugrmotiontype.psc
+++ b/source/scripts/_00e_mq11a_deaddraugrmotiontype.psc
@@ -6,7 +6,7 @@ Scriptname _00E_MQ11a_DeadDraugrMotionType extends Actor
 
 Event OnInit()
 
-	If (MQ11a.GetStage() < 215)
+	If (MQ11a.GetCurrentStageID() < 215)
 		EnableAI(False)
 		BlockActivation(True)
 	EndIf
@@ -45,7 +45,7 @@ Function Reanimate()
 
 	StartCombat(PlayerRef)
 
-	Int mq11aStage = MQ11a.GetStage()
+	Int mq11aStage = MQ11a.GetCurrentStageID()
 	If mq11aStage >= 95 && mq11aStage < 130
 		Alias_Calia.GetActorReference().StartCombat(Self)
 	EndIf
diff --git a/source/scripts/_00e_mq11a_dissectingroomrenimatorsc.psc b/source/scripts/_00e_mq11a_dissectingroomrenimatorsc.psc
index dc1ba506..48af9776 100644
--- a/source/scripts/_00e_mq11a_dissectingroomrenimatorsc.psc
+++ b/source/scripts/_00e_mq11a_dissectingroomrenimatorsc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11a_DissectingRoomRenimatorSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    If (akActionRef == PlayerRef) && (MQ11a.GetStage() == 115) && (MQ11a_RightTower.GetValueInt() <= 2)
+    If (akActionRef == PlayerRef) && (MQ11a.GetCurrentStageID() == 115) && (MQ11a_RightTower.GetValueInt() <= 2)
         If Done == False
             Done = True
             MQ11a.ReanimateDissectingRoom()
diff --git a/source/scripts/_00e_mq11a_functions.psc b/source/scripts/_00e_mq11a_functions.psc
index b54f1b77..57d18ba7 100644
--- a/source/scripts/_00e_mq11a_functions.psc
+++ b/source/scripts/_00e_mq11a_functions.psc
@@ -16,10 +16,10 @@ Event OnUpdateGameTime()
     If bStartCaliaCQ
 
         If !CQC03.IsCompleted() && CQC03.IsRunning()
-            CQC03.SetStage(20)
+            CQC03.SetCurrentStageID(20)
             CQC03.FailAllObjectives()
         Elseif CQC03.IsCompleted()
-            CQC04.SetStage(5)
+            CQC04.SetCurrentStageID(5)
         EndIf
     
         bStartCaliaCQ = False
@@ -45,10 +45,10 @@ Event OnUpdate()
 	
 	EndIf
 
-    if GetStage() == 95 && (MQ11a_TravelState02.GetValueInt() > 0)
+    if GetCurrentStageID() == 95 && (MQ11a_TravelState02.GetValueInt() > 0)
     
         if !PlayerREF.IsInCombat()
-            SetStage(100)
+            SetCurrentStageID(100)
         Else
             RegisterForSingleUpdate(15)
         EndIf
@@ -70,7 +70,7 @@ EndState
 Function CaliaAppears()
 
     If !CQC03.IsCompleted() && CQC03.IsRunning()
-        CQC03.SetStage(20)
+        CQC03.SetCurrentStageID(20)
         CQC03.FailAllObjectives()
     EndIf
     
@@ -131,7 +131,7 @@ Function CheckSpokenWith()
         _00E_MQ11a_TavernGuestsTalkedTo.SetValue(_00E_MQ11a_TavernGuestsTalkedTo.GetValue() + 1)
         Self.UpdateCurrentInstanceGlobal(_00E_MQ11a_TavernGuestsTalkedTo)
         Self.SetObjectiveCompleted(15)
-        Self.SetStage(37)
+        Self.SetCurrentStageID(37)
     EndIf
 
     _00E_EPHandler.GiveEP(__Config_RewardEXPSpeakWithPeople)
@@ -235,7 +235,7 @@ Function BlowUpBarrels()
     MQ11a_SC7_DebrisParent.Enable()
     Wait(3)
     _00E_MC_CaliaREF.ClearLookAt()
-    Self.SetStage(75)
+    Self.SetCurrentStageID(75)
     Wait(2)
     EnablePlayerControls()
 
@@ -841,7 +841,7 @@ Function CheckForRiddleDoor()
     if (MQ11a_DoorRiddle.GetValueInt() == 2)
         DRSStoneLabyrinthianOpenM.Play(PlayerREF)
         Wait(1)
-        Self.SetStage(125)
+        Self.SetCurrentStageID(125)
         SetObjectiveCompleted(37)
         SetObjectiveCompleted(47)
         SetObjectiveCompleted(42)
@@ -894,7 +894,7 @@ Function PreparePortcullisFight()
     EndIf
     bPorcullisFightPrepared = True
 
-    Int myStage = GetStage()
+    Int myStage = GetCurrentStageID()
     If myStage != 125
         If myStage < 125
             bPorcullisFightPrepared = False
@@ -928,7 +928,7 @@ Function EndPortcullisFight()
 		nCountdown -= 1
 	EndWhile
 
-    If nCountdown > 0 && GetStage() < 130
+    If nCountdown > 0 && GetCurrentStageID() < 130
         CompanionIsTalking.SetValueInt(1)
     	_00E_MC_CaliaREF.Say(MQ11a_D14_Remarks02Topic)
     EndIf
@@ -1008,7 +1008,7 @@ Function KnockBackCalia()
     ParalyzeFxShader.Play(_00E_MC_CaliaREF)
     _00E_MAGEldritchFireSSVar01M.Play(_00E_MC_CaliaREF)
     _00E_MAGEldritchHitImod.Apply()
-    Self.SetStage(135)
+    Self.SetCurrentStageID(135)
     
 EndFunction
 
@@ -1036,7 +1036,7 @@ Function LeaderCastSpell()
     _00E_MC_CaliaREF.ClearLookAt()
     MQ11a_SC20_MercenaryLeader.ClearLookAt()
     _00E_MC_CaliaREF.SetHeadTracking(True)
-    Self.SetStage(145)
+    Self.SetCurrentStageID(145)
 
 EndFunction
 
@@ -1150,7 +1150,7 @@ Function PlayFinalExplosion()
     _00E_NPCKillBodyfall.Play(PlayerREF)
     FadeToBlackHoldIMOD.Apply()
     MQ11a_SC22_BrittleWall.Disable()
-    Self.SetStage(165)
+    Self.SetCurrentStageID(165)
     
 EndFunction
 
@@ -1322,7 +1322,7 @@ EndFunction
 
 Function EndLastFight(Int postFightQuestStage)
 
-    SetStage(postFightQuestStage)
+    SetCurrentStageID(postFightQuestStage)
     _00E_Meditate_Allowed.SetValueInt(1) ; Allow only meditation, other teleports are still forbidden
 
 EndFunction
@@ -1356,7 +1356,7 @@ Function StartBeamFX()
     MQ11a_SC25_CastMarker.InterruptCast()
     MQ11a_SC25_DalGalarREF.SetGhost(False)
     MQ11a_SC25_DalGalarREF.DamageActorValue("Health", 1000)
-    Self.SetStage(205)
+    Self.SetCurrentStageID(205)
     
 EndFunction
 
@@ -1419,7 +1419,7 @@ Function CaliaAndVeiledWomanDisappear()
     MQ11a_SC25_MayasREF.DisableNoWait()
     MQ11a_SC25_BeamREF.DisableNoWait()
     (PlayerREF as _00E_PlayerFunctions).ResumeRandomHeadTracking()
-    Self.SetStage(210)
+    Self.SetCurrentStageID(210)
     MQ11a_SC26_DoorREF.BlockActivation(False)
     _00E_MQ11a_SC23_Calia.ShowAsHelpMessage("MQ11aFinalCalia", 5, 1, 1)
 
@@ -1541,10 +1541,10 @@ Event OnUpdateGameTime()
     If bStartCaliaCQ
 
         If !CQC03.IsCompleted() && CQC03.IsRunning()
-            CQC03.SetStage(20)
+            CQC03.SetCurrentStageID(20)
             CQC03.FailAllObjectives()
         Elseif CQC03.IsCompleted()
-            CQC04.SetStage(5)
+            CQC04.SetCurrentStageID(5)
         EndIf
     
         bStartCaliaCQ = False
@@ -1555,7 +1555,7 @@ EndEvent
 
 Event OnUpdate()
 
-    if __Config_RescueTimer > 0 && GetStage() < 160
+    if __Config_RescueTimer > 0 && GetCurrentStageID() < 160
         __Config_RescueTimer -= 5
         ; Show message every 10 seconds, or every 5 seconds if 30 or less seconds left
         If (bSkipNextRescueSceneMessage == False) || (__Config_RescueTimer <= 30)
@@ -1565,7 +1565,7 @@ Event OnUpdate()
             bSkipNextRescueSceneMessage = False
         EndIf
         RegisterForSingleUpdate(5)
-    Elseif GetStage() < 160
+    Elseif GetCurrentStageID() < 160
         MUSSpecialDeath.Add()
         FadeToBlackHoldImod.Apply()
         Wait(2)
@@ -1640,7 +1640,7 @@ Function RaiseDeadServants(Formlist corpseList, ObjectReference corpseActivatorR
 EndFunction
 
 Function RegisterKilledEnemy()
-    Int curStage = GetStage()
+    Int curStage = GetCurrentStageID()
     If curStage >= 95 && curStage < 210
         (Alias_Player as _00E_MQ11a_PlayerAliasScript).RegisterEnemyDeath()
     EndIf
@@ -1648,7 +1648,7 @@ EndFunction
 
 Function RegisterFightEnd(Int fightId, Int postFightQuestStage)
     If (fightId == FIGHT_ID_SC08) || (fightId == FIGHT_ID_SC24)
-        SetStage(postFightQuestStage)
+        SetCurrentStageID(postFightQuestStage)
     ElseIf fightId == FIGHT_ID_SC15
         EndDissectingRoomFight()
     ElseIf fightId == FIGHT_ID_SC20
diff --git a/source/scripts/_00e_mq11a_gatetolibrarysc.psc b/source/scripts/_00e_mq11a_gatetolibrarysc.psc
index 64bf6ff0..614ce1ce 100644
--- a/source/scripts/_00e_mq11a_gatetolibrarysc.psc
+++ b/source/scripts/_00e_mq11a_gatetolibrarysc.psc
@@ -17,7 +17,7 @@ Event OnActivate(ObjectReference akActionRef)
 
     if self.IsActivationBlocked()
 
-        if MQ11a.GetStage() >= 125
+        if MQ11a.GetCurrentStageID() >= 125
             self.BlockActivation(False)
             Self.Activate(akActionRef, True)
         else
diff --git a/source/scripts/_00e_mq11a_knockdownboxsc.psc b/source/scripts/_00e_mq11a_knockdownboxsc.psc
index 8027498f..474636be 100644
--- a/source/scripts/_00e_mq11a_knockdownboxsc.psc
+++ b/source/scripts/_00e_mq11a_knockdownboxsc.psc
@@ -18,7 +18,7 @@ Function KnockOut()
 	Self.KnockAreaEffect(1, 512)
 	StaggerPushFFSelfAreaSP.Cast(PlayerREF, PlayerREF)
 	Game.ShakeCamera()
-	MQ11a.SetStage(160)
+	MQ11a.SetCurrentStageID(160)
 	Utility.Wait(1)
 	Game.EnablePlayerControls()
 	Game.SetPlayerAIDriven(False)
diff --git a/source/scripts/_00e_mq11a_mayavisibilitysc.psc b/source/scripts/_00e_mq11a_mayavisibilitysc.psc
index a30a6c12..970be5ae 100644
--- a/source/scripts/_00e_mq11a_mayavisibilitysc.psc
+++ b/source/scripts/_00e_mq11a_mayavisibilitysc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11a_MayaVisibilitySC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If akActionRef == PlayerREF && MQ11a.GetStage() < 200
+	If akActionRef == PlayerREF && MQ11a.GetCurrentStageID() < 200
 		MQ11a_SC25_MayasREF.SetAlpha(0.0)
 	EndIf
 
diff --git a/source/scripts/_00e_mq11a_playeraliasscript.psc b/source/scripts/_00e_mq11a_playeraliasscript.psc
index ccb3181a..14a1490b 100644
--- a/source/scripts/_00e_mq11a_playeraliasscript.psc
+++ b/source/scripts/_00e_mq11a_playeraliasscript.psc
@@ -85,7 +85,7 @@ State TrackFight
 	EndEvent
 
 	Event OnUpdate()
-		Int curStage = GetOwningQuest().GetStage()
+		Int curStage = GetOwningQuest().GetCurrentStageID()
 
 		If (PostFightQuestStage > 0) && (curStage >= PostFightQuestStage)
 			GoToState("")
diff --git a/source/scripts/_00e_mq11a_sc20_mainhallscript.psc b/source/scripts/_00e_mq11a_sc20_mainhallscript.psc
index 98d81c8a..46990f3b 100644
--- a/source/scripts/_00e_mq11a_sc20_mainhallscript.psc
+++ b/source/scripts/_00e_mq11a_sc20_mainhallscript.psc
@@ -2,8 +2,8 @@ Scriptname _00E_MQ11a_SC20_MainHallScript extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If (akActionRef == PlayerREF) && MQ11a.IsObjectiveCompleted(40) && MQ11a.IsObjectiveCompleted(45) && (MQ11a.GetStage() < 120)
-		MQ11a.SetStage(120)
+	If (akActionRef == PlayerREF) && MQ11a.IsObjectiveCompleted(40) && MQ11a.IsObjectiveCompleted(45) && (MQ11a.GetCurrentStageID() < 120)
+		MQ11a.SetCurrentStageID(120)
 	EndIf
 
 EndEvent
diff --git a/source/scripts/_00e_mq11a_sc20_sigilbox.psc b/source/scripts/_00e_mq11a_sc20_sigilbox.psc
index ed1d2381..7180b9c5 100644
--- a/source/scripts/_00e_mq11a_sc20_sigilbox.psc
+++ b/source/scripts/_00e_mq11a_sc20_sigilbox.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11a_SC20_SigilBox extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-if (MQ11a.GetStage() >= 115) && (akActionRef == PlayerREF) && !Done
+if (MQ11a.GetCurrentStageID() >= 115) && (akActionRef == PlayerREF) && !Done
 
 	; int iButton = _00E_MQ11a_SC20_SigilBox01.Show()
 	
diff --git a/source/scripts/_00e_mq11a_sc20_zombietriggerscript.psc b/source/scripts/_00e_mq11a_sc20_zombietriggerscript.psc
index 83eea01a..089af182 100644
--- a/source/scripts/_00e_mq11a_sc20_zombietriggerscript.psc
+++ b/source/scripts/_00e_mq11a_sc20_zombietriggerscript.psc
@@ -17,7 +17,7 @@ Event OnActivate(ObjectReference triggerRef)
 EndEvent
 
 Function TryActivateFight()
-	Int mq11aStage = MQ11a.GetStage()
+	Int mq11aStage = MQ11a.GetCurrentStageID()
 	If mq11aStage == 125
 		If (bDone == False)
 			bDone = True
diff --git a/source/scripts/_00e_mq11a_sc22_brittlewallsc.psc b/source/scripts/_00e_mq11a_sc22_brittlewallsc.psc
index 756fb033..ee5f9f10 100644
--- a/source/scripts/_00e_mq11a_sc22_brittlewallsc.psc
+++ b/source/scripts/_00e_mq11a_sc22_brittlewallsc.psc
@@ -6,7 +6,7 @@ Scriptname _00E_MQ11a_SC22_BrittleWallSC extends ObjectReference
 ; 
 ; Event OnLoad()
 ; 
-; 	if MQ11a.GetStage() >= 165
+; 	if MQ11a.GetCurrentStageID() >= 165
 ; 		Self.PlayAnimation("openStart")
 ; 	EndIf
 ; 	
diff --git a/source/scripts/_00e_mq11a_sc25_blackstonescript.psc b/source/scripts/_00e_mq11a_sc25_blackstonescript.psc
index e1367873..8a1f9ad3 100644
--- a/source/scripts/_00e_mq11a_sc25_blackstonescript.psc
+++ b/source/scripts/_00e_mq11a_sc25_blackstonescript.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11a_SC25_BlackStoneScript extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if akActionRef == PlayerREF && (MQ11a.GetStage() == 210)
+	if akActionRef == PlayerREF && (MQ11a.GetCurrentStageID() == 210)
 		int iButton = _00E_MQ11a_SC25_BlackStoneMessage.Show()
 		
 		if iButton == 1 
@@ -17,7 +17,7 @@ Event OnActivate(ObjectReference akActionRef)
 				EndIf
 				
 				Self.Disable()
-				MQ11a.SetStage(215)
+				MQ11a.SetCurrentStageID(215)
 		EndIf	
 		
 	EndIf
diff --git a/source/scripts/_00e_mq11a_sc25_veiledwomanspellsc.psc b/source/scripts/_00e_mq11a_sc25_veiledwomanspellsc.psc
index 60fc4f38..195693b5 100644
--- a/source/scripts/_00e_mq11a_sc25_veiledwomanspellsc.psc
+++ b/source/scripts/_00e_mq11a_sc25_veiledwomanspellsc.psc
@@ -10,10 +10,10 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)
 		ObjectReference Ashpile = akTarget.AttachAshPile(DefaultAshPile1)
 		Utility.Wait(0.8)
 		Ashpile.Delete()
-		MQ11a.SetStage(210)
+		MQ11a.SetCurrentStageID(210)
 	Elseif akTarget.GetActorBase() == _00E_MQ11a_Maya
 		MQ11a.StopItFX()
-		MQ11a.SetStage(215)
+		MQ11a.SetCurrentStageID(215)
 	EndIf		
 
 EndEvent
diff --git a/source/scripts/_00e_mq11b_dancingnomadfailsafesc.psc b/source/scripts/_00e_mq11b_dancingnomadfailsafesc.psc
index 72ff1745..ac1babb2 100644
--- a/source/scripts/_00e_mq11b_dancingnomadfailsafesc.psc
+++ b/source/scripts/_00e_mq11b_dancingnomadfailsafesc.psc
@@ -4,7 +4,7 @@ scriptName _00E_MQ11b_DancingNomadFailsafeSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if akActionRef == PlayerREF && MQ11b.GetStage() == 5 && !bDone
+	if akActionRef == PlayerREF && MQ11b.GetCurrentStageID() == 5 && !bDone
 		_00E_MC_JesparREF.Disable()
 		bDone == true
 	endIf
diff --git a/source/scripts/_00e_mq11b_door_crypt_sc.psc b/source/scripts/_00e_mq11b_door_crypt_sc.psc
index cd7a87e8..9b9a0a28 100644
--- a/source/scripts/_00e_mq11b_door_crypt_sc.psc
+++ b/source/scripts/_00e_mq11b_door_crypt_sc.psc
@@ -12,7 +12,7 @@ if Self.IsActivationBlocked()
 
 	if akActionRef == PlayerREF
 		
-		If MQ11b.GetStage() >= 100
+		If MQ11b.GetCurrentStageID() >= 100
 			Self.BlockActivation(False)
 			Self.Activate(PlayerREF, True)
 		EndIf
diff --git a/source/scripts/_00e_mq11b_questfunctions.psc b/source/scripts/_00e_mq11b_questfunctions.psc
index e4fed1b5..3b43fb61 100644
--- a/source/scripts/_00e_mq11b_questfunctions.psc
+++ b/source/scripts/_00e_mq11b_questfunctions.psc
@@ -41,7 +41,7 @@ Function GiveBox2()
         
         Wait(0.4)
         MQ11bMap.Activate(PlayerREF)
-        SetStage(10)
+        SetCurrentStageID(10)
         MQ11b_DoorC.Lock(0)
         MQ11b_DoorB.Lock(0)
         MQ11b_DoorA.Lock(0)
@@ -64,7 +64,7 @@ EndFunction
 Function UpdateObjectives()
 
 	If IsObjectiveCompleted(20) && IsObjectiveCompleted(30) && IsObjectiveCompleted(40)
-		SetStage(20)
+		SetCurrentStageID(20)
 		SetObjectiveDisplayed(50)
 	EndIf
 
@@ -195,7 +195,7 @@ Function SpawnBarrier()
 	_00E_MQ11b_PrisonerREF.Kill(_00E_MQ11b_PrisonerREF)
 	_00E_StaggerSelf.Cast(_00E_MC_JesparREF, _00E_MC_JesparREF)
 	_00E_StaggerSelf.Cast(_00E_MQ11b_AdilaREF, _00E_MQ11b_AdilaREF)
-	SetStage(115)
+	SetCurrentStageID(115)
 	
 EndFunction
 
@@ -354,7 +354,7 @@ Function ReanimateJespar()
 	
 	FadeToWhiteBackImod.ApplyCrossFade(afFadeDuration = 2.0)
 	SetObjectiveDisplayed(170)
-	SetStage(230)
+	SetCurrentStageID(230)
 		
 EndFunction
 
diff --git a/source/scripts/_00e_mq11b_sc02_adilabarriersc.psc b/source/scripts/_00e_mq11b_sc02_adilabarriersc.psc
index bf869ddf..9ff11f2e 100644
--- a/source/scripts/_00e_mq11b_sc02_adilabarriersc.psc
+++ b/source/scripts/_00e_mq11b_sc02_adilabarriersc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11b_SC02_AdilaBarrierSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If akActionRef == _00E_MC_JesparREF && MQ11b.GetStage() == 110
+	If akActionRef == _00E_MC_JesparREF && MQ11b.GetCurrentStageID() == 110
 		MQ11b.SpawnBarrier()
 	EndIf
 
diff --git a/source/scripts/_00e_mq11b_sc03_interruptsc.psc b/source/scripts/_00e_mq11b_sc03_interruptsc.psc
index 397fbae6..0802942f 100644
--- a/source/scripts/_00e_mq11b_sc03_interruptsc.psc
+++ b/source/scripts/_00e_mq11b_sc03_interruptsc.psc
@@ -4,7 +4,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if !bDone
 
-		if (akActionRef == PlayerREF) && (MQ11b.GetStage() == 105)
+		if (akActionRef == PlayerREF) && (MQ11b.GetCurrentStageID() == 105)
 			bDone = True
 			MQ11b.StartSC03()
 		EndIf
diff --git a/source/scripts/_00e_mq11b_sc05_jesparsc.psc b/source/scripts/_00e_mq11b_sc05_jesparsc.psc
index a7004e46..e5783f6f 100644
--- a/source/scripts/_00e_mq11b_sc05_jesparsc.psc
+++ b/source/scripts/_00e_mq11b_sc05_jesparsc.psc
@@ -2,8 +2,8 @@ Scriptname _00E_MQ11b_SC05_JesparSC extends ReferenceAlias
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if akActionRef == Game.GetPlayer() && MQ11b.GetStage() == 230
-		MQ11b.SetStage(235)
+	if akActionRef == Game.GetPlayer() && MQ11b.GetCurrentStageID() == 230
+		MQ11b.SetCurrentStageID(235)
 	EndIf
 
 EndEvent
diff --git a/source/scripts/_00e_mq11badilascn.psc b/source/scripts/_00e_mq11badilascn.psc
index 3023354f..43cc0b1f 100644
--- a/source/scripts/_00e_mq11badilascn.psc
+++ b/source/scripts/_00e_mq11badilascn.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11bAdilaSCN extends Actor
 
 
 Event OnDeath(Actor akKiller)
-	MQ11b.SetStage(195)
+	MQ11b.SetCurrentStageID(195)
 endEvent
 
 Quest Property MQ11b Auto
\ No newline at end of file
diff --git a/source/scripts/_00e_mq11bbookscn.psc b/source/scripts/_00e_mq11bbookscn.psc
index 0949e77d..94b7e4eb 100644
--- a/source/scripts/_00e_mq11bbookscn.psc
+++ b/source/scripts/_00e_mq11bbookscn.psc
@@ -5,13 +5,13 @@ Scriptname _00E_MQ11bBookSCN extends ObjectReference
 
 Function UpdateMQ11b()
 
-	If MQ11b.GetStage() >= 10 && DoOnce == false
+	If MQ11b.GetCurrentStageID() >= 10 && DoOnce == false
 
 		MQ11b.SetObjectiveCompleted(Objective)
 
 		If MQ11b.IsObjectiveCompleted(20) == 1 && MQ11b.IsObjectiveCompleted(30) == 1 && MQ11b.IsObjectiveCompleted(40) == 1
-			MQ11b.SetStage(20)
-			MQ11b.SetStage(30)
+			MQ11b.SetCurrentStageID(20)
+			MQ11b.SetCurrentStageID(30)
 			MQ11b.SetObjectiveDisplayed(60)
 		EndIf
 		DoOnce = true
diff --git a/source/scripts/_00e_mq11bjesparfollowentrigger.psc b/source/scripts/_00e_mq11bjesparfollowentrigger.psc
index 61bf696e..cfe59115 100644
--- a/source/scripts/_00e_mq11bjesparfollowentrigger.psc
+++ b/source/scripts/_00e_mq11bjesparfollowentrigger.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11bJesparFollowEntrigger extends ObjectReference
 
 ; Event OnTriggerEnter(ObjectReference akActionRef)
 		; if (akActionRef == PlayerREF)
-			; if(MQ11b.GetStage() >= 60 ) && (MQ11b.GetStage() < 70 ) 
+			; if(MQ11b.GetCurrentStageID() >= 60 ) && (MQ11b.GetCurrentStageID() < 70 ) 
 				; if (_00E_MQ11b_TravelState.GetValue() == 0) && IsNearDunehome == 0
 					; _00E_MC_JesparREF.Say(JesparDialogue_Misc_PlayerReentersFollowTrigger)
 					; Debug.MessageBox("Jespar folgt Euch wieder.")
@@ -20,7 +20,7 @@ Scriptname _00E_MQ11bJesparFollowEntrigger extends ObjectReference
 
 ; Event OnTriggerLeave(ObjectReference akActionRef)
 	; if (akActionRef == PlayerREF)
-		; if(MQ11b.GetStage() >= 60 ) && (MQ11b.GetStage() < 70 )  
+		; if(MQ11b.GetCurrentStageID() >= 60 ) && (MQ11b.GetCurrentStageID() < 70 )  
 			; If InTrigger == True
 				; _00E_MQ11b_TravelState.SetValue((_00E_MQ11b_TravelState.GetValue() - 1))
 				; Debug.MessageBox(akActionRef + " just left us!" + _00E_MQ11b_TravelState.GetValue())
diff --git a/source/scripts/_00e_mq11c_blockdooractivation.psc b/source/scripts/_00e_mq11c_blockdooractivation.psc
index 470aba88..26292a35 100644
--- a/source/scripts/_00e_mq11c_blockdooractivation.psc
+++ b/source/scripts/_00e_mq11c_blockdooractivation.psc
@@ -14,21 +14,21 @@ Event OnActivate(ObjectReference akActionRef)
 		If akActionRef == PlayerREF
 		
 			If !ConfigSmallerThan && !ConfigEqual
-				If SetQuest.GetStage() >= UnlockStage 
+				If SetQuest.GetCurrentStageID() >= UnlockStage 
 					self.BlockActivation(False)
 					Self.Activate(PlayerREF, True)
 				Else
 					_00E_BlockedMessage.Show()
 				EndIf	
 			ElseIf ConfigSmallerThan == True
-				If SetQuest.GetStage() <= UnlockStage 
+				If SetQuest.GetCurrentStageID() <= UnlockStage 
 					self.BlockActivation(False)
 					Self.Activate(PlayerREF, True)
 				Else
 					_00E_BlockedMessage.Show()
 				EndIf		
 			ElseIf ConfigEqual == True
-				If SetQuest.GetStage() == UnlockStage 
+				If SetQuest.GetCurrentStageID() == UnlockStage 
 					self.BlockActivation(False)
 					Self.Activate(PlayerREF, True)
 				Else
diff --git a/source/scripts/_00e_mq11c_caveentrancedoorsc.psc b/source/scripts/_00e_mq11c_caveentrancedoorsc.psc
index 252eb4cc..1afa0297 100644
--- a/source/scripts/_00e_mq11c_caveentrancedoorsc.psc
+++ b/source/scripts/_00e_mq11c_caveentrancedoorsc.psc
@@ -11,7 +11,7 @@ Event OnActivate(ObjectReference akActionRef)
     if self.IsActivationBlocked()
 
         if akActionRef == PlayerREF
-            int MQ11cStage = MQ11c.GetStage()
+            int MQ11cStage = MQ11c.GetCurrentStageID()
             if (MQ11cStage >= 205) && (MQ11cStage < 250)
                 Self.Activate(akActionRef, True)
             else
diff --git a/source/scripts/_00e_mq11c_d13_endtriggerboxsc.psc b/source/scripts/_00e_mq11c_d13_endtriggerboxsc.psc
index 31966928..d772dbe1 100644
--- a/source/scripts/_00e_mq11c_d13_endtriggerboxsc.psc
+++ b/source/scripts/_00e_mq11c_d13_endtriggerboxsc.psc
@@ -3,8 +3,8 @@ Scriptname _00E_MQ11c_D13_EndTriggerboxSc extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if (akActionRef == Game.GetPlayer()) && (_00E_MQ11c_RyneusPeacefulSolution.GetValueInt() == 0)
-		MQ11c.SetStage(275)
-		MQ11c.SetStage(280)
+		MQ11c.SetCurrentStageID(275)
+		MQ11c.SetCurrentStageID(280)
 	EndIf
 	
 EndEvent
diff --git a/source/scripts/_00e_mq11c_dogminigamefailsc.psc b/source/scripts/_00e_mq11c_dogminigamefailsc.psc
index adb46915..f904da90 100644
--- a/source/scripts/_00e_mq11c_dogminigamefailsc.psc
+++ b/source/scripts/_00e_mq11c_dogminigamefailsc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11c_DogMinigameFailSC extends ObjectReference
 
 Event OnTriggerEnter (ObjectReference akActionRef)
 
-if MQ11c.GetStage() == 120 && akActionRef == PlayerREF && !bDone
+if MQ11c.GetCurrentStageID() == 120 && akActionRef == PlayerREF && !bDone
 	MQ11c.SetObjectiveCompleted(43)
 	MQ11c.SetObjectiveDisplayed(41, true, false)
 	bDone = true
diff --git a/source/scripts/_00e_mq11c_dropryneusnote.psc b/source/scripts/_00e_mq11c_dropryneusnote.psc
index 967a5703..7299e675 100644
--- a/source/scripts/_00e_mq11c_dropryneusnote.psc
+++ b/source/scripts/_00e_mq11c_dropryneusnote.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ11c_DropRyneusNote extends ObjectReference
 
 Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer)
 	if akNewContainer == Game.GetPlayer()
-		MQ11c.SetStage(50)
+		MQ11c.SetCurrentStageID(50)
 	endif
 
 EndEvent
diff --git a/source/scripts/_00e_mq11c_entrymusicboxscript.psc b/source/scripts/_00e_mq11c_entrymusicboxscript.psc
index a9b99008..4d8817b5 100644
--- a/source/scripts/_00e_mq11c_entrymusicboxscript.psc
+++ b/source/scripts/_00e_mq11c_entrymusicboxscript.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ11c_EntryMusicBoxScript extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	If akActionRef == PlayerREF 
-		Int curStage = MQ11c.GetStage()
+		Int curStage = MQ11c.GetCurrentStageID()
 		If (curStage >= 60 && curStage < 70 && _00E_MQ11c_Headache.GetValue() != 0.0) || (curStage >= 70 && curStage < 295)
 			_00E_MQ11c_SilvergroveEntrySilence.SetValue(1)
 		ElseIf curStage >= 295
diff --git a/source/scripts/_00e_mq11c_functions.psc b/source/scripts/_00e_mq11c_functions.psc
index 7da1acc9..7fc6fce0 100644
--- a/source/scripts/_00e_mq11c_functions.psc
+++ b/source/scripts/_00e_mq11c_functions.psc
@@ -29,7 +29,7 @@ EndEvent
 
 Event OnUpdate()
 
-	if GetStage() >= 110 && GetStage() < 130
+	if GetCurrentStageID() >= 110 && GetCurrentStageID() < 130
 
 		if (PlayerREF.GetDistance(RyneusDogA) >= DogMinigameWarningDistance) && (PlayerREF.GetDistance(RyneusDogA) < DogMinigameLosingDistance)
 			if (Utility.RandomFloat(0, 1) <= 0.5)
@@ -251,7 +251,7 @@ Function FailedDogMinigame()
 	SetObjectiveFailed(40)
 	SetObjectiveDisplayed(43)
 	RyneusDogA.MoveTo(MQ11c_DogChaseMarker027)
-	SetStage(120)
+	SetCurrentStageID(120)
 EndFunction
 
 Function EndDogMinigame()
@@ -544,7 +544,7 @@ Function AddAmulet()
 	Timescale.SetValue(10)
 	MQ11cBlockMarker.disable()
 	_00E_TeleportGlobal.SetValue(0)
-	setstage(295)
+	SetCurrentStageID(295)
 	PostTransformCleanup()
 	
 EndFunction
@@ -561,7 +561,7 @@ Function BuryRyneus()
 			Timescale.SetValue(10)
 			MQ11cBlockMarker.disable()
 			_00E_TeleportGlobal.SetValue(0)
-			setstage(295)
+			SetCurrentStageID(295)
 		EndIf
 		
 		MQ11c_D13_RyneusBurialMarker.Disable()
@@ -713,7 +713,7 @@ EndFunction
 
 Event OnGainLOS(Actor akViewer, ObjectReference akTarget)
 	;added a global as condition to prevent multiple resets when the player was detected by multiple guards at the same time
-    If (((akViewer == Guard01) || (akViewer == Guard02) || (akViewer == Guard03)) && (MQ11c.GetStage() < 50) && (_00E_MQ11c_PlayerDetected.GetValueInt() == 0))
+    If (((akViewer == Guard01) || (akViewer == Guard02) || (akViewer == Guard03)) && (MQ11c.GetCurrentStageID() < 50) && (_00E_MQ11c_PlayerDetected.GetValueInt() == 0))
 		If !PlayerREF.HasMagicEffectWithKeyword(MagicInvisibility)
 			_00E_MQ11c_PlayerDetected.SetValueInt(1)
 			Self.UpdateCurrentInstanceGlobal(_00E_MQ11c_PlayerDetected)
@@ -730,7 +730,7 @@ EndEvent
 
 Event OnUpdate()
 
-	If !(PlayerREF.IsSneaking()) && (MQ11c.GetStage() < 50) && (PlayerREF.IsInLocation(_00E_MQ11c_KetaronsHouse))
+	If !(PlayerREF.IsSneaking()) && (MQ11c.GetCurrentStageID() < 50) && (PlayerREF.IsInLocation(_00E_MQ11c_KetaronsHouse))
 		UIActivateFailM.Play(PlayerREF)
 		_00E_MQ11c_StealthMinigame_PlayerCaught.Show()
 		PlayerREF.MoveTo(DebugPlayerStartMarker)
diff --git a/source/scripts/_00e_mq11c_getryneussc.psc b/source/scripts/_00e_mq11c_getryneussc.psc
index e37790f8..e45de715 100644
--- a/source/scripts/_00e_mq11c_getryneussc.psc
+++ b/source/scripts/_00e_mq11c_getryneussc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11c_GetRyneusSC extends ObjectReference
 
 Event OnUpdate()
 
-	If (MQ11c.GetStage() == 175) && !(MQ11c_RyneusREF.GetParentCell() == SilberhainRyneusHaus)
+	If (MQ11c.GetCurrentStageID() == 175) && !(MQ11c_RyneusREF.GetParentCell() == SilberhainRyneusHaus)
 		MQ11c_RyneusREF.MoveTo(MQ11c_RyneusDefaultPosition)
 	EndIf
 
@@ -12,11 +12,11 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	If akActionRef == PlayerREF
 	
-		If MQ11c.GetStage() >= 60 && MQ11c.GetStage() < 65
-			MQ11c.SetStage(65)
+		If MQ11c.GetCurrentStageID() >= 60 && MQ11c.GetCurrentStageID() < 65
+			MQ11c.SetCurrentStageID(65)
 		EndIf
 	
-		If (MQ11c.GetStage() == 175)
+		If (MQ11c.GetCurrentStageID() == 175)
 			MQ11c_RyneusREF.MoveTo(MQ11c_RyneusDefaultPosition)
 			RegisterForSingleUpdate(2)
 		EndIf
diff --git a/source/scripts/_00e_mq11c_horsescript.psc b/source/scripts/_00e_mq11c_horsescript.psc
index 464101d1..1c68c20a 100644
--- a/source/scripts/_00e_mq11c_horsescript.psc
+++ b/source/scripts/_00e_mq11c_horsescript.psc
@@ -2,8 +2,8 @@ Scriptname _00E_MQ11c_HorseScript extends ReferenceAlias
 
 Event OnActivate(ObjectReference akActionRef)
 
-if (akActionRef == Game.GetPlayer()) && (MQ11c.GetStage() == 265)
-	MQ11c.SetStage(270)
+if (akActionRef == Game.GetPlayer()) && (MQ11c.GetCurrentStageID() == 265)
+	MQ11c.SetCurrentStageID(270)
 	MQ11c.SetObjectiveCompleted(115)
 	MQ11c.SetObjectiveDisplayed(120)
 EndIf
diff --git a/source/scripts/_00e_mq11c_invisibilitytriggersc.psc b/source/scripts/_00e_mq11c_invisibilitytriggersc.psc
index eebf8a39..e432b6a6 100644
--- a/source/scripts/_00e_mq11c_invisibilitytriggersc.psc
+++ b/source/scripts/_00e_mq11c_invisibilitytriggersc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ11c_InvisibilityTriggerSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If akActionRef == PlayerREF && (MQ11c.GetStage() >= 35 && MQ11c.GetStage() < 50)
+	If akActionRef == PlayerREF && (MQ11c.GetCurrentStageID() >= 35 && MQ11c.GetCurrentStageID() < 50)
 		_00E_MQ11c_PlayerDetected.SetValueInt(1)
 		MQ11c.UpdateCurrentInstanceGlobal(_00E_MQ11c_PlayerDetected)
 		UIActivateFailM.Play(PlayerREF)
diff --git a/source/scripts/_00e_mq11c_kitchenexitdoor.psc b/source/scripts/_00e_mq11c_kitchenexitdoor.psc
index b59ad13f..e578a960 100644
--- a/source/scripts/_00e_mq11c_kitchenexitdoor.psc
+++ b/source/scripts/_00e_mq11c_kitchenexitdoor.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11c_KitchenExitDoor extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    if ((akActionRef == PlayerREF) && (MQ11c.GetStage() < 50) && (MQ11c.GetStage() >= 35)) && (_00E_MQ11c_StealthGame_Running.GetValueInt() == 1)
+    if ((akActionRef == PlayerREF) && (MQ11c.GetCurrentStageID() < 50) && (MQ11c.GetCurrentStageID() >= 35)) && (_00E_MQ11c_StealthGame_Running.GetValueInt() == 1)
         MQ11c.StopStealthMinigame()
     EndIf
 
diff --git a/source/scripts/_00e_mq11c_minigameshootingbutton.psc b/source/scripts/_00e_mq11c_minigameshootingbutton.psc
index 9f5cd945..3662f377 100644
--- a/source/scripts/_00e_mq11c_minigameshootingbutton.psc
+++ b/source/scripts/_00e_mq11c_minigameshootingbutton.psc
@@ -14,7 +14,7 @@ Event OnCellAttach()
 EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
-	if akActionRef == (Ryneus.GetActorReference()) && (MQ11c.GetStage() == 150)
+	if akActionRef == (Ryneus.GetActorReference()) && (MQ11c.GetCurrentStageID() == 150)
 		GoToState("Waiting")
 		;playAnimationAndWait("Trigger01","done")
 		if QSTAstrolabeButtonPressX
@@ -23,7 +23,7 @@ Event OnActivate(ObjectReference akActionRef)
 			SphereBoxDoor.Activate(Self)
 			Wait(2)
 			Sphere.Activate(Self)
-	ElseIf akActionRef == (Ryneus.GetActorReference()) && (MQ11c.GetStage() == 170)
+	ElseIf akActionRef == (Ryneus.GetActorReference()) && (MQ11c.GetCurrentStageID() == 170)
 			Wait(2)
 			Sphere.Activate(Self)
 	Else
diff --git a/source/scripts/_00e_mq11c_minigameshootingsphere.psc b/source/scripts/_00e_mq11c_minigameshootingsphere.psc
index c0aa085a..1bebf769 100644
--- a/source/scripts/_00e_mq11c_minigameshootingsphere.psc
+++ b/source/scripts/_00e_mq11c_minigameshootingsphere.psc
@@ -11,12 +11,12 @@ Import Utility
 Auto State WaitingForFirstActivation 									; State the sphere will automatically be set to once initialized
 
 Event OnActivate(ObjectReference akActionRef)
-	if (akActionRef == SphereButton01) && (MQ11c.GetStage() == 150)		; Have the sphere levitate upwards a little and play a cool sound once Rynéus hits the switch!
+	if (akActionRef == SphereButton01) && (MQ11c.GetCurrentStageID() == 150)		; Have the sphere levitate upwards a little and play a cool sound once Rynéus hits the switch!
 		NPCDwarvenSphereOpen.Play(Self)
 		Move(0.0, 0.0, 170, 65, 50)	
 		SphereInactiveLoop = QSTDA02ShrineActivateLPMMarker.Play(Self)
 		Wait(3)
-		MQ11c.SetStage(155)
+		MQ11c.SetCurrentStageID(155)
 		goToState("Pending")											; Go to the pending state and wait for input																		
 	EndIf
 EndEvent
@@ -70,7 +70,7 @@ Event OnActivate(ObjectReference akActionRef)
 			GoToState("RoundThree")
 			; Debug.Trace("Moving to round 3 state")
 		EndIf
-		If MQ11c.GetStage() < 175
+		If MQ11c.GetCurrentStageID() < 175
 			MakeRyneusLookAtSphere()
 		EndIf
 	EndIf
@@ -99,7 +99,7 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)						; Play the opening animation, refresh ammo, et cetera
 
-	if MQ11c.GetStage() == 170
+	if MQ11c.GetCurrentStageID() == 170
 		if akActionRef == SphereButton02
 			if (_00E_MQ11c_Sphere_NextStaqge.GetValueInt() == 0)
 				Phase = 0
@@ -135,7 +135,7 @@ Event OnActivate(ObjectReference akActionRef)						; Play the opening animation,
 				; Debug.Trace("Moving to round 3 state")
 			EndIf
 		EndIf
-	ElseIf MQ11c.GetStage() == 175										; If the minigame has ended, return to origin
+	ElseIf MQ11c.GetCurrentStageID() == 175										; If the minigame has ended, return to origin
 		Move(0.0, 0.0, -170.0, 65, 50)	
 		SphereInactiveLoop = QSTDA02ShrineActivateLPMMarker.Play(Self)
 		Wait(3)
diff --git a/source/scripts/_00e_mq11c_objectivefailsafe.psc b/source/scripts/_00e_mq11c_objectivefailsafe.psc
index de7da932..c9a358f4 100644
--- a/source/scripts/_00e_mq11c_objectivefailsafe.psc
+++ b/source/scripts/_00e_mq11c_objectivefailsafe.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11C_ObjectiveFailsafe extends ObjectReference
 
 Event OnTriggerEnter (ObjectReference akActionRef)
 
-if MQ11c.GetStage() == 45 && akActionRef == PlayerREF && !bDone
+if MQ11c.GetCurrentStageID() == 45 && akActionRef == PlayerREF && !bDone
 	MQ11c.SetObjectiveCompleted(15)
 	MQ11c.SetObjectiveDisplayed(20, true, true)
 	bDone = true
diff --git a/source/scripts/_00e_mq11c_objectiveswitchdalgeyss.psc b/source/scripts/_00e_mq11c_objectiveswitchdalgeyss.psc
index 2ff3907a..af69c650 100644
--- a/source/scripts/_00e_mq11c_objectiveswitchdalgeyss.psc
+++ b/source/scripts/_00e_mq11c_objectiveswitchdalgeyss.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11C_ObjectiveSwitchDalGeyss extends ObjectReference
 
 Event OnTriggerEnter (ObjectReference akActionRef)
 
-if MQ11c.GetStage() == 15 && akActionRef == PlayerREF && !bDone
+if MQ11c.GetCurrentStageID() == 15 && akActionRef == PlayerREF && !bDone
 	MQ11c.SetObjectiveCompleted(5)
 	MQ11c.SetObjectiveDisplayed(10)
 	bDone = true
diff --git a/source/scripts/_00e_mq11c_oorbayabossfightscript.psc b/source/scripts/_00e_mq11c_oorbayabossfightscript.psc
index 7f18b8e0..aefcd7dc 100644
--- a/source/scripts/_00e_mq11c_oorbayabossfightscript.psc
+++ b/source/scripts/_00e_mq11c_oorbayabossfightscript.psc
@@ -60,7 +60,7 @@ Function PlayDeathSequence()
 	Self.KillEssential(PlayerREF)
 	_00E_Music_CombatEpicBoss.Remove()
 	_00E_Music_Combat_Epic_Transition.Remove()
-	MQ11c.SetStage(260)
+	MQ11c.SetCurrentStageID(260)
 
 EndFunction
 
diff --git a/source/scripts/_00e_mq11c_pickuparroworquiver.psc b/source/scripts/_00e_mq11c_pickuparroworquiver.psc
index 4fb476e5..dc05884a 100644
--- a/source/scripts/_00e_mq11c_pickuparroworquiver.psc
+++ b/source/scripts/_00e_mq11c_pickuparroworquiver.psc
@@ -7,7 +7,7 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if (akActionRef == PlayerREF) && (MQ11c.GetStage() == 160) && bDone == False
+	if (akActionRef == PlayerREF) && (MQ11c.GetCurrentStageID() == 160) && bDone == False
 		bDone = True
 		self.Activate(PlayerREF, true)
 		if (Self.GetBaseObject() == _00E_MQ11c_SphereQuiver)
@@ -16,7 +16,7 @@ Event OnActivate(ObjectReference akActionRef)
 			Self.MoveTo(_00E_NPCDumpMarker)
 		EndIf
 		if (PlayerREF.GetItemCount(_00E_MQ11c_SphereArrow) >= 1) && (PlayerREF.GetItemCount(_00E_MQ11c_SphereBow) >= 1)
-			MQ11c.SetStage(165)
+			MQ11c.SetCurrentStageID(165)
 		EndIf		
 	EndIf
 
diff --git a/source/scripts/_00e_mq11c_playeraliasscript.psc b/source/scripts/_00e_mq11c_playeraliasscript.psc
index e765acaa..8f100d54 100644
--- a/source/scripts/_00e_mq11c_playeraliasscript.psc
+++ b/source/scripts/_00e_mq11c_playeraliasscript.psc
@@ -9,7 +9,7 @@ Event OnPlayerLoadGame()
 
 		UpdateWeatherTrackingState()
 
-		Int curStage = GetOwningQuest().GetStage()
+		Int curStage = GetOwningQuest().GetCurrentStageID()
 
 		If curStage >= 260
 			_00E_MQ11c_SilvergroveMainMusic.SetValue(0)
@@ -29,7 +29,7 @@ Event OnPlayerLoadGame()
 EndEvent
 
 Function UpdateWeatherTrackingState()
-	If _00E_MQ12a_MQ11cCleared.GetValueInt() == 0 && GetOwningQuest().GetStage() >= 260
+	If _00E_MQ12a_MQ11cCleared.GetValueInt() == 0 && GetOwningQuest().GetCurrentStageID() >= 260
 		GoToState("TrackingWeather")
 	Else
 		GoToState("")
diff --git a/source/scripts/_00e_mq11c_ryneusdogscript.psc b/source/scripts/_00e_mq11c_ryneusdogscript.psc
index 5fc90fc8..ded93bb6 100644
--- a/source/scripts/_00e_mq11c_ryneusdogscript.psc
+++ b/source/scripts/_00e_mq11c_ryneusdogscript.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11c_RyneusDogScript extends ReferenceAlias
 
 Event OnActivate(ObjectReference akActionRef)
 
-if (MQ11c.GetStage() == 120)
+if (MQ11c.GetCurrentStageID() == 120)
 	;Game.GetPlayer().AddItem(_00E_MQ11c_RyneusTeddy, 1)
 	Actor PlayerREF = Game.GetPlayer()
 	MQ11cTeddyContainer.RemoveAllItems(PlayerREF, false, true)
@@ -12,7 +12,7 @@ if (MQ11c.GetStage() == 120)
 	EndIf
 	
 	_00E_NPCDogIdleWhineM.Play(Self.GetReference())
-	MQ11c.SetStage(125)
+	MQ11c.SetCurrentStageID(125)
 	Self.GetActorReference().SetOutfit(_00E_MQ11c_RyneusDogOutfit)
 EndIf
 
diff --git a/source/scripts/_00e_mq11c_ryneusentryheadachesc.psc b/source/scripts/_00e_mq11c_ryneusentryheadachesc.psc
index 11dd9443..14c14b8e 100644
--- a/source/scripts/_00e_mq11c_ryneusentryheadachesc.psc
+++ b/source/scripts/_00e_mq11c_ryneusentryheadachesc.psc
@@ -12,7 +12,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	GoToState("DoNothing")
 
-	Int mq11cStage = MQ11c.GetStage()
+	Int mq11cStage = MQ11c.GetCurrentStageID()
 	If mq11cStage >= 60 && mq11cStage <= 65
 		If _00E_MQ11c_Headache.GetValueInt() == 0
 			Game.DisablePlayerControls(1, 1, 1, 0, 0, 1, 1)
diff --git a/source/scripts/_00e_mq11c_ryneusrealactivationscript.psc b/source/scripts/_00e_mq11c_ryneusrealactivationscript.psc
index c527193e..7732d088 100644
--- a/source/scripts/_00e_mq11c_ryneusrealactivationscript.psc
+++ b/source/scripts/_00e_mq11c_ryneusrealactivationscript.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ11c_RyneusRealActivationScript extends ReferenceAlias
 
 Event OnActivate(ObjectReference akActionRef)
 
-if (MQ11c.GetStage() >= 275)
+if (MQ11c.GetCurrentStageID() >= 275)
 	;Debug.Notification("Fired")
 	RyneusActivator.Activate(PlayerREF)
 EndIf
diff --git a/source/scripts/_00e_mq11c_sc1_gtfofailsavesc.psc b/source/scripts/_00e_mq11c_sc1_gtfofailsavesc.psc
index d4928241..dcc78493 100644
--- a/source/scripts/_00e_mq11c_sc1_gtfofailsavesc.psc
+++ b/source/scripts/_00e_mq11c_sc1_gtfofailsavesc.psc
@@ -9,7 +9,7 @@ Scriptname _00E_MQ11c_SC1_GTFOFailsaveSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if akActionRef == Game.GetPlayer() && MQ11c.GetStage() == 25
+	if akActionRef == Game.GetPlayer() && MQ11c.GetCurrentStageID() == 25
 		if !MQ11c_SC1_KeshanEscortsPlayer.IsPlaying()
             MQ11c_SC1_KeshanEscortsPlayer.ForceStart()
         endif
diff --git a/source/scripts/_00e_mq11c_silvergroveradiusboxscript.psc b/source/scripts/_00e_mq11c_silvergroveradiusboxscript.psc
index 7fc4b470..d6905b12 100644
--- a/source/scripts/_00e_mq11c_silvergroveradiusboxscript.psc
+++ b/source/scripts/_00e_mq11c_silvergroveradiusboxscript.psc
@@ -5,12 +5,12 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 	If akActionRef == PlayerREF 
 		MQ11c_PlayerInSilvergroveRadius.SetValue(1)
 
-		Int curStage = MQ11c.GetStage()
+		Int curStage = MQ11c.GetCurrentStageID()
 		If curStage < 70
 			_00E_MQ11c_SilvergroveCheatMSG.Show()
 			PlayerREF.MoveTo(WerkschauBullShitMarker)
 			MQ11c_PlayerInSilvergroveRadius.SetValue(0)
-		ElseIf MQ11c.GetStage() >= 85
+		ElseIf MQ11c.GetCurrentStageID() >= 85
 			MQ11c_PlayerInSilvergroveRadius.SetValue(0)
 			Disable() ; Don't need it anymore
 		EndIf
@@ -23,7 +23,7 @@ Event OnTriggerLeave(ObjectReference akActionRef)
 	If akActionRef == PlayerREF 
 		MQ11c_PlayerInSilvergroveRadius.SetValue(0)
 
-		If MQ11c.GetStage() >= 85
+		If MQ11c.GetCurrentStageID() >= 85
 			Disable() ; Don't need it anymore
 		EndIf
 	EndIf
diff --git a/source/scripts/_00e_mq11c_stealthminigameresetbox.psc b/source/scripts/_00e_mq11c_stealthminigameresetbox.psc
index 89811c4a..732bb1a5 100644
--- a/source/scripts/_00e_mq11c_stealthminigameresetbox.psc
+++ b/source/scripts/_00e_mq11c_stealthminigameresetbox.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11c_StealthMinigameResetBox extends _00E_MQ11c_Functions
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-if (MQ11c.GetStage() < 50) && (MQ11c.GetStage() >= 35) && (_00E_MQ11c_StealthGame_Running.GetValueInt() == 0)
+if (MQ11c.GetCurrentStageID() < 50) && (MQ11c.GetCurrentStageID() >= 35) && (_00E_MQ11c_StealthGame_Running.GetValueInt() == 0)
 StartStealthMinigame()
 EndIf
 
diff --git a/source/scripts/_00e_mq11c_thoughtmessagesc.psc b/source/scripts/_00e_mq11c_thoughtmessagesc.psc
index c38c1e7b..1358ba1d 100644
--- a/source/scripts/_00e_mq11c_thoughtmessagesc.psc
+++ b/source/scripts/_00e_mq11c_thoughtmessagesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ11c_ThoughtMessageSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if akActionRef == PlayerREF && MQ11c.GetStage() >= 60 && MQ11c.GetStage() <= 65 && !bDone
+	if akActionRef == PlayerREF && MQ11c.GetCurrentStageID() >= 60 && MQ11c.GetCurrentStageID() <= 65 && !bDone
 		bDone = true
 		_00E_MQ11c_RockBarrierThoughts.ShowAsHelpMessage("_00E_MQ11c_RockBarrierThoughts", 5, 1, 1)
 	EndIf
diff --git a/source/scripts/_00e_mq11c_wardenleverscript.psc b/source/scripts/_00e_mq11c_wardenleverscript.psc
index f5f1f7c1..b7e4cb4a 100644
--- a/source/scripts/_00e_mq11c_wardenleverscript.psc
+++ b/source/scripts/_00e_mq11c_wardenleverscript.psc
@@ -7,7 +7,7 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-	If akActionRef == SilvergroveGatenWarden.GetReference() || MQ11c.GetStage() > 255
+	If akActionRef == SilvergroveGatenWarden.GetReference() || MQ11c.GetCurrentStageID() > 255
 		MQ11c_SilvergroveGateREF.Activate(akActionRef)
 	EndIf
 
diff --git a/source/scripts/_00e_mq12a_functions.psc b/source/scripts/_00e_mq12a_functions.psc
index 7be14952..85cfc0e9 100644
--- a/source/scripts/_00e_mq12a_functions.psc
+++ b/source/scripts/_00e_mq12a_functions.psc
@@ -6,22 +6,22 @@ Scriptname _00E_MQ12a_Functions extends Quest
 
 Event OnUpdate()
 
-    If Self.GetStage() >= 20 && Self.GetStage() < 25
+    If Self.GetCurrentStageID() >= 20 && Self.GetCurrentStageID() < 25
         
-        Self.SetStage(25)
+        Self.SetCurrentStageID(25)
         Return
         
     EndIf
 
     ; Failsave for the case when MQ12b fails to start
     ; ( http://sureai.net:9898/browse/ERB-165 ).
-    If IsCompleted() && (MQ12b.GetStage() < 5 || !MQ12b.IsRunning())
+    If IsCompleted() && (MQ12b.GetCurrentStageID() < 5 || !MQ12b.IsRunning())
     
-        MQ12b.SetStage(5)
+        MQ12b.SetCurrentStageID(5)
         
         Utility.Wait(1)
         
-        if MQ12b.GetStage() < 5
+        if MQ12b.GetCurrentStageID() < 5
         
             _00E_MQ12aQuestBugMSG.Show()
             RegisterForSingleUpdate(6)
@@ -154,7 +154,7 @@ Function FinishQuestAndStartMQ12b()
     _00E_EPHandler.GiveEP(__Config_iRewardExp)
     Self.CompleteQuest()
     Self.SetObjectiveCompleted(5)
-    MQ12b.SetStage(5)
+    MQ12b.SetCurrentStageID(5)
     RegisterForSingleUpdate(4)
 	
     ; Failsafe in case SC3 fails to do this
@@ -167,9 +167,9 @@ Function FinishQuestAndStartMQ12b()
 	If FS_NQ03 == NONE
 		FS_NQ03 = Game.GetFormFromFile(0x000438AD, "Skyrim.esm") as Quest
 	EndIf
-	if FS_NQ03.GetStage() < 280
+	if FS_NQ03.GetCurrentStageID() < 280
 		FS_NQ03.FailAllObjectives()
-		FS_NQ03.SetStage(1000)
+		FS_NQ03.SetCurrentStageID(1000)
 	endif
 
 EndFunction
@@ -177,10 +177,10 @@ EndFunction
 Function StartCQC04()
 
     If !CQC03.IsCompleted() && CQC03.IsRunning()
-        CQC03.SetStage(20)
+        CQC03.SetCurrentStageID(20)
         CQC03.FailAllObjectives()
     Elseif CQC03.IsCompleted()
-        CQC04.SetStage(5)
+        CQC04.SetCurrentStageID(5)
     EndIf
 
 EndFunction
@@ -188,10 +188,10 @@ EndFunction
 Function StartCQJ04()
 
     If CQJ02.IsCompleted()
-        CQJ04.SetStage(5)
+        CQJ04.SetCurrentStageID(5)
     Elseif !(CQJ02.IsCompleted()) && CQJ02.IsRunning()
         CQJ04.FailAllObjectives()
-        CQJ04.SetStage(40)
+        CQJ04.SetCurrentStageID(40)
     EndIf
     
 EndFunction
diff --git a/source/scripts/_00e_mq12b_functions.psc b/source/scripts/_00e_mq12b_functions.psc
index ce1b23c2..567494e7 100644
--- a/source/scripts/_00e_mq12b_functions.psc
+++ b/source/scripts/_00e_mq12b_functions.psc
@@ -199,8 +199,8 @@ Function StartSC02Failsave()
     iCrimeGoldBeforeMQ12bNonViolent = A_CrimeFaction.GetCrimeGoldNonViolent()
     iCrimeGoldBeforeMQ12bViolent = A_CrimeFaction.GetCrimeGoldViolent()
     
-    If Self.GetStage() < 15
-        Self.SetStage(15)
+    If Self.GetCurrentStageID() < 15
+        Self.SetCurrentStageID(15)
     EndIf
     
     If _00E_MC_LeoraREF.IsDisabled()
@@ -935,7 +935,7 @@ Function CompleteQuestAndStartMQ12c()
     Self.CompleteQuest()
     ReEnableNPCs()
 	DisablePanicTriggerbox()
-    MQ12c.SetStage(5)
+    MQ12c.SetCurrentStageID(5)
     GoToState("Aftermath")
     RegisterForSingleUpdateGameTime(24)
             
diff --git a/source/scripts/_00e_mq12b_gettealorsc.psc b/source/scripts/_00e_mq12b_gettealorsc.psc
index bda2ad6e..c6922033 100644
--- a/source/scripts/_00e_mq12b_gettealorsc.psc
+++ b/source/scripts/_00e_mq12b_gettealorsc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ12b_GetTealorSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If MQ12b.GetStage() >= 25 && !bDone
+	If MQ12b.GetCurrentStageID() >= 25 && !bDone
 		bDone = True
 		_00E_MC_TealorREF.MoveTo(PlayerREF)
 		Self.Delete()
diff --git a/source/scripts/_00e_mq12b_infiltratorfailsavesc.psc b/source/scripts/_00e_mq12b_infiltratorfailsavesc.psc
index 9b6e6ddf..002083d2 100644
--- a/source/scripts/_00e_mq12b_infiltratorfailsavesc.psc
+++ b/source/scripts/_00e_mq12b_infiltratorfailsavesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ12b_InfiltratorFailsaveSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If MQ12b.GetStage() > 5 && !MQ12b.IsCompleted()
+	If MQ12b.GetCurrentStageID() > 5 && !MQ12b.IsCompleted()
 	
 		Actor akEnterActor
 	
diff --git a/source/scripts/_00e_mq12b_sc02_failsavesc.psc b/source/scripts/_00e_mq12b_sc02_failsavesc.psc
index e9dee099..43943e99 100644
--- a/source/scripts/_00e_mq12b_sc02_failsavesc.psc
+++ b/source/scripts/_00e_mq12b_sc02_failsavesc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ12b_SC02_FailsaveSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == Game.GetPlayer() && !bDone
-		if MQ12b.GetStage() >= 5 && MQ12b.GetStage() <= 15
+		if MQ12b.GetCurrentStageID() >= 5 && MQ12b.GetCurrentStageID() <= 15
 			bDone = True
 			Mq12b.StartSC02Failsave()
 		EndIf
diff --git a/source/scripts/_00e_mq12b_sc10_gearsc.psc b/source/scripts/_00e_mq12b_sc10_gearsc.psc
index 7c01df9d..89ddb157 100644
--- a/source/scripts/_00e_mq12b_sc10_gearsc.psc
+++ b/source/scripts/_00e_mq12b_sc10_gearsc.psc
@@ -8,9 +8,9 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-	If (MQ12b.GetStage() <= 85)
+	If (MQ12b.GetCurrentStageID() <= 85)
 		Self.Activate(Game.GetPlayer(), True)
-		MQ12b.SetStage(100)
+		MQ12b.SetCurrentStageID(100)
 	EndIf
 
 EndEvent
diff --git a/source/scripts/_00e_mq12b_sc12_killtriggersc.psc b/source/scripts/_00e_mq12b_sc12_killtriggersc.psc
index 8ed4f5a3..18e375e2 100644
--- a/source/scripts/_00e_mq12b_sc12_killtriggersc.psc
+++ b/source/scripts/_00e_mq12b_sc12_killtriggersc.psc
@@ -8,7 +8,7 @@ Scriptname _00E_MQ12b_SC12_KillTriggerSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-    int stage = MQ12b.GetStage()
+    int stage = MQ12b.GetCurrentStageID()
 	if stage >= 100 && stage <= 125
         Actor ac = akActionRef as Actor
         if ac == None
diff --git a/source/scripts/_00e_mq12b_sc15_startfailsavesc.psc b/source/scripts/_00e_mq12b_sc15_startfailsavesc.psc
index 626bef3d..e2625c6e 100644
--- a/source/scripts/_00e_mq12b_sc15_startfailsavesc.psc
+++ b/source/scripts/_00e_mq12b_sc15_startfailsavesc.psc
@@ -2,18 +2,18 @@ Scriptname _00E_MQ12b_SC15_StartFailsaveSC extends ObjectReference
 
 ; Failsave for http://forum.sureai.net//tracker.php?p=8&t=10674 .
 ; Sometimes, scene MQ12b_SC15_TempleScene03 would not properly start,
-; even if MQ12b.GetStage() was at 125 or 130. This script (placed
+; even if MQ12b.GetCurrentStageID() was at 125 or 130. This script (placed
 ; on triggerbox _00E_MQ12b_SC15_StartFailsaveTGBX near the Beacon)
 ; would restart it in such cases.
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == PlayerREF
-		if MQ12b.GetStage() == 125 || MQ12b.GetStage() == 130
+		if MQ12b.GetCurrentStageID() == 125 || MQ12b.GetCurrentStageID() == 130
             if !MQ12b_SC15_TempleScene03.IsPlaying() && !MQ12b_SC15_TempleScene03.IsActionComplete(24)
                 MQ12b.SetUpSC15()
             endif
-		elseif MQ13a.GetStage() == 5
+		elseif MQ13a.GetCurrentStageID() == 5
             ; Another failsave, probably fixing a bug caused by the
             ; failsave above: Shoot down scene
             ; MQ12b_SC15_TempleScene03 if it's running past its time.
diff --git a/source/scripts/_00e_mq12b_sc3_tealorfailsaveboxsc.psc b/source/scripts/_00e_mq12b_sc3_tealorfailsaveboxsc.psc
index cac4d412..f7f82d5c 100644
--- a/source/scripts/_00e_mq12b_sc3_tealorfailsaveboxsc.psc
+++ b/source/scripts/_00e_mq12b_sc3_tealorfailsaveboxsc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ12b_SC3_TealorFailsaveBoxSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If MQ12b.GetStage() == 30 || MQ12b.GetStage() == 55
+	If MQ12b.GetCurrentStageID() == 30 || MQ12b.GetCurrentStageID() == 55
 		; _00E_MC_TealorREF.MoveTo(PlayerREF)
 		;Game.RequestAutoSave()
 		Self.Delete()
diff --git a/source/scripts/_00e_mq12b_sc5_commandersilvassc.psc b/source/scripts/_00e_mq12b_sc5_commandersilvassc.psc
index 85a8cf00..521d7269 100644
--- a/source/scripts/_00e_mq12b_sc5_commandersilvassc.psc
+++ b/source/scripts/_00e_mq12b_sc5_commandersilvassc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ12b_SC5_CommanderSilvasSC extends ObjectReference
 
 Event OnUpdate()
 
-	MQ12b.SetStage(47)
+	MQ12b.SetCurrentStageID(47)
 	
 	if !PlayerREF.IsInCombat()
 		
diff --git a/source/scripts/_00e_mq12b_silencefailsavesc.psc b/source/scripts/_00e_mq12b_silencefailsavesc.psc
index 7509f200..f320f4c4 100644
--- a/source/scripts/_00e_mq12b_silencefailsavesc.psc
+++ b/source/scripts/_00e_mq12b_silencefailsavesc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ12b_SilenceFailsaveSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == PlayerREF
-		if (MQ12b.GetStage() >= __Config_iMinStage) && (MQ12b.GetStage() <= __Config_iMaxStage)
+		if (MQ12b.GetCurrentStageID() >= __Config_iMinStage) && (MQ12b.GetCurrentStageID() <= __Config_iMaxStage)
 			_00E_SilenceLongTransitionHighPriority.Add()
 		EndIf
 	EndIf
diff --git a/source/scripts/_00e_mq12b_tealorcombatsc.psc b/source/scripts/_00e_mq12b_tealorcombatsc.psc
index 23a188ee..ded74884 100644
--- a/source/scripts/_00e_mq12b_tealorcombatsc.psc
+++ b/source/scripts/_00e_mq12b_tealorcombatsc.psc
@@ -4,7 +4,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == PlayerREF
 
-		if MQ12b.GetStage() >= 30 && MQ12b.GetStage() < 40
+		if MQ12b.GetCurrentStageID() >= 30 && MQ12b.GetCurrentStageID() < 40
 		
 			if _00E_MC_TealorREF.IsInCombat()
 				_00E_MC_TealorREF.StopCombat()
diff --git a/source/scripts/_00e_mq12c_anistuckfixsc.psc b/source/scripts/_00e_mq12c_anistuckfixsc.psc
index c54d69e3..a1df8d75 100644
--- a/source/scripts/_00e_mq12c_anistuckfixsc.psc
+++ b/source/scripts/_00e_mq12c_anistuckfixsc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ12c_AniStuckFixSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 	
-	If MQ12c.GetStage() == 5 && akActionRef == PlayerREF && PlayerREF.IsWeaponDrawn()
+	If MQ12c.GetCurrentStageID() == 5 && akActionRef == PlayerREF && PlayerREF.IsWeaponDrawn()
 		PlayerREF.AddItem(GasTrapDummy, 1, 1)
 		PlayerREF.EquipItem(GasTrapDummy, 0, 1)
 		Utility.Wait(1)
diff --git a/source/scripts/_00e_mq12c_functions.psc b/source/scripts/_00e_mq12c_functions.psc
index 2845e9a1..9efc0cbb 100644
--- a/source/scripts/_00e_mq12c_functions.psc
+++ b/source/scripts/_00e_mq12c_functions.psc
@@ -163,43 +163,43 @@ Function ShowMessageBoxBeforeSleeping()
         If !CQJ04.IsCompleted() && !CQC04.IsCompleted()
             int iButton01 = _00E_MQ12c_SleepJesparCaliaMsg.Show()
                 If iButton01 == 0 
-                    SetStage(15)
+                    SetCurrentStageID(15)
                 Else 
                     Return
                 EndIf
         ElseIf CQJ04.IsCompleted() && !CQC04.IsCompleted()
                 int iButton02 = _00E_MQ12c_SleepCaliaMsg.Show()
                 If iButton02 == 0 
-                    SetStage(15)
+                    SetCurrentStageID(15)
                 Else 
                     Return
                 EndIf
         ElseIf !CQJ04.IsCompleted() && CQC04.IsCompleted()
                 int iButton03 = _00E_MQ12c_SleepJesparMsg.Show()
                 If iButton03 == 0 
-                    SetStage(15)
+                    SetCurrentStageID(15)
                 Else 
                     Return
                 EndIf
         Elseif CQJ04.IsCompleted() && CQC04.IsCompleted()
-            SetStage(15)
+            SetCurrentStageID(15)
         EndIf
     ElseIf (CQJ04.IsRunning()) && !(CQJ04.IsCompleted())
             int iButton04 = _00E_MQ12c_SleepJesparMsg.Show()
                 If iButton04 == 0 
-                    SetStage(15)
+                    SetCurrentStageID(15)
                 Else 
                     Return
                 EndIf
     ElseIf (CQC04.IsRunning()) && !(CQC04.IsCompleted())    
             int iButton05 = _00E_MQ12c_SleepCaliaMsg.Show()
             If iButton05 == 0 
-                SetStage(15)
+                SetCurrentStageID(15)
             Else 
                 Return
             EndIf
     Else
-        SetStage(15)
+        SetCurrentStageID(15)
     EndIf
     
 EndFunction
@@ -209,11 +209,11 @@ Function StartSC02()
     _00E_SilenceTransitionLowPriority.Add()
 
     If (!CQC04.IsCompleted()) && CQC04.IsRunning()
-        CQC04.SetStage(20)
+        CQC04.SetCurrentStageID(20)
     EndIf
     
     If (!CQJ04.IsCompleted()) && CQJ04.IsRunning()
-        CQJ04.SetStage(40)
+        CQJ04.SetCurrentStageID(40)
     EndIf
 
     _00E_Func_AIWalk.PlayerAIWalk()
@@ -225,7 +225,7 @@ EndFunction
 Function FadeToBlack()
     
     SetObjectiveCompleted(10)
-    SetStage(20)
+    SetCurrentStageID(20)
 
 EndFunction
 
@@ -294,7 +294,7 @@ Function EndSC03()
     _00E_Music_Special_Dreams.Remove()
     SetObjectiveCompleted(10)
     SetObjectiveCompleted(15)
-    SetStage(40)
+    SetCurrentStageID(40)
     
 EndFunction
 
@@ -367,7 +367,7 @@ Function CleanUpAndStartMQ13()
 	MQ12c_SC01_FailsaveREF.Disable()
     MQ12c_SC1_ExecutionDoor001.Lock(False)
     MQ12c_SC1_ExecutionDoor001.BlockActivation(False)
-    MQ13a.SetStage(5)
+    MQ13a.SetCurrentStageID(5)
 
 EndFunction
 
diff --git a/source/scripts/_00e_mq12c_sc2_bedsc.psc b/source/scripts/_00e_mq12c_sc2_bedsc.psc
index 8f69152b..24f7b653 100644
--- a/source/scripts/_00e_mq12c_sc2_bedsc.psc
+++ b/source/scripts/_00e_mq12c_sc2_bedsc.psc
@@ -6,8 +6,8 @@ Event OnActivate(ObjectReference akActionRef)
 ; otherwise, act as a regular bed.
 
 	If akActionRef == Game.GetPlayer()
-		If (MQ12c.GetStage() >= 5) && (MQ12c.GetStage() <= 20)
-			If (MQ12c.GetStage() <= 10)
+		If (MQ12c.GetCurrentStageID() >= 5) && (MQ12c.GetCurrentStageID() <= 20)
+			If (MQ12c.GetCurrentStageID() <= 10)
 				MQ12c.ShowMessageBoxBeforeSleeping()
 			EndIf
 		Else
diff --git a/source/scripts/_00e_mq13_lootboreo.psc b/source/scripts/_00e_mq13_lootboreo.psc
index 881abc10..ee657fcb 100644
--- a/source/scripts/_00e_mq13_lootboreo.psc
+++ b/source/scripts/_00e_mq13_lootboreo.psc
@@ -9,7 +9,7 @@ Event OnActivate (ObjectReference akActionRef)
 
 if doOnce == 0
 	Debug.Messagebox("Boreos Körper ist ausgemergelt und blutig zerkratzt. Er muss sich diese Wunden im Hungerwahn zugefügt haben. Außerdem ist alles voller Espenblätter...Woher die wohl stammen?")
-	QuestToSet.Setstage(StageToSet)
+	QuestToSet.SetCurrentStageID(StageToSet)
 	QuestToSet.SetObjectiveCompleted(10)
 	doOnce = 1
 endif
diff --git a/source/scripts/_00e_mq13a_functions.psc b/source/scripts/_00e_mq13a_functions.psc
index ec7ec6d0..4400fbee 100644
--- a/source/scripts/_00e_mq13a_functions.psc
+++ b/source/scripts/_00e_mq13a_functions.psc
@@ -28,7 +28,7 @@ Function SetUp()
     
     ; This starts the Forgotten Stories - quest for Yuslan.
     
-    FS_NQ01.SetStage(5)
+    FS_NQ01.SetCurrentStageID(5)
     
     _00E_MC_YuslanREF.MoveTo(MQ13a_SC01_YuslanMarker)
     _00E_MC_LexREF.MoveTo(MQ13a_SC01_LexMarkerREF)
@@ -42,8 +42,8 @@ Function AddScrollSetUpSC02()
         _00E_SC_KurmaiREF.Enable()
     EndIf
     
-    if FS_NQ01.GetStage() < 10
-        FS_NQ01.SetStage(10)
+    if FS_NQ01.GetCurrentStageID() < 10
+        FS_NQ01.SetCurrentStageID(10)
     EndIf
 
     _00E_SC_KurmaiREF.MoveTo(MQ13a_SC03_KurmaiStartMarker)
@@ -54,7 +54,7 @@ Function AddScrollSetUpSC02()
     PlayerREF.AddItem(_01E_TeleportrolleDuenenhaim, 1)
 
     If NQ01.IsRunning() && !NQ01.IsCompleted()
-        NQ01.SetStage(35)
+        NQ01.SetCurrentStageID(35)
     EndIf
     
 EndFunction
@@ -62,7 +62,7 @@ EndFunction
 Function StartSC02()
 
     If NQ01.IsRunning() && !NQ01.IsCompleted()
-        NQ01.SetStage(35)
+        NQ01.SetCurrentStageID(35)
     EndIf
 
     MQ13a_SC02_Cave_YoungMageREF.MoveTo(MQ13a_SC02_Cave_YoungMage01MarkerREF)
@@ -102,7 +102,7 @@ Function AddCube()
     Self.SetObjectiveCompleted(15)
     
     If Self.IsObjectiveCompleted(10)
-        Self.SetStage(50)
+        Self.SetCurrentStageID(50)
         Game.RequestAutoSave()
     EndIf
     
@@ -125,7 +125,7 @@ Function UpdateAlloyCounter()
     
     If Self.IsObjectiveCompleted(15) && iCurrentCount == 5
         bAlloysCollected = True
-        Self.SetStage(50)
+        Self.SetCurrentStageID(50)
         Game.RequestAutoSave()
     EndIf
 
@@ -223,7 +223,7 @@ Function SetUpSC05()
     
     MQ13a_SC05_SpiderParentREF.Disable()
 
-    Self.SetStage(65)
+    Self.SetCurrentStageID(65)
     
     MQ13a_SC05_Departure01.ForceStart()
     
@@ -302,7 +302,7 @@ Function StarshipFadeToBlack()
     FadeToBlackIMOD.Apply()
     Wait(2)
     FadeToBlackHoldIMOD.ApplyCrossFade(1)
-    SetStage(75)
+    SetCurrentStageID(75)
     
 EndFunction
 
@@ -372,11 +372,11 @@ Function CleanUpAndSetUpSC07()
         
         If CQJ04.IsCompleted()
             _00E_MC_CaliaREF.MoveTo(_00E_NPCDumpMarker)
-            CQJ05.SetStage(5)
+            CQJ05.SetCurrentStageID(5)
             SetObjectiveDisplayed(30)
             SetObjectiveDisplayed(35)
         Elseif CQC04.IsCompleted()
-            CQC05.SetStage(5)
+            CQC05.SetCurrentStageID(5)
             SetObjectiveDisplayed(20)
             SetObjectiveDisplayed(25)
         Else
@@ -392,11 +392,11 @@ Function CleanUpAndSetUpSC07()
         
         If CQC04.IsCompleted()
             _00E_MC_JesparREF.MoveTo(_00E_NPCDumpMarker)
-            CQC05.SetStage(5)
+            CQC05.SetCurrentStageID(5)
             SetObjectiveDisplayed(20)
             SetObjectiveDisplayed(25)
         Elseif CQJ04.IsCompleted()
-            CQJ05.SetStage(5)
+            CQJ05.SetCurrentStageID(5)
             SetObjectiveDisplayed(30)
             SetObjectiveDisplayed(35)
         Else
@@ -412,11 +412,11 @@ Function CleanUpAndSetUpSC07()
         
         If CQJ04.IsCompleted()
             _00E_MC_CaliaREF.MoveTo(_00E_NPCDumpMarker)
-            CQJ05.SetStage(5)
+            CQJ05.SetCurrentStageID(5)
             SetObjectiveDisplayed(30)
             SetObjectiveDisplayed(35)
         Elseif CQC04.IsCompleted()
-            CQC05.SetStage(5)
+            CQC05.SetCurrentStageID(5)
             SetObjectiveDisplayed(20)
             SetObjectiveDisplayed(25)
         Else
@@ -431,11 +431,11 @@ Function CleanUpAndSetUpSC07()
         
         If CQC04.IsCompleted()
             _00E_MC_JesparREF.Disable()
-            CQC05.SetStage(5)
+            CQC05.SetCurrentStageID(5)
             SetObjectiveDisplayed(20)
             SetObjectiveDisplayed(25)
         Elseif CQJ04.IsCompleted()
-            CQJ05.SetStage(5)
+            CQJ05.SetCurrentStageID(5)
             SetObjectiveDisplayed(30)
             SetObjectiveDisplayed(35)
         Else
@@ -455,7 +455,7 @@ Function CallSleepBox()
         FadeToBlackIMOD.Apply()
         Wait(2)
         FadeToBlackHoldIMOD.ApplyCrossFade(1)
-        SetStage(80)
+        SetCurrentStageID(80)
         SetObjectiveCompleted(25)
     ElseIf iButton02 == 1
         Return
@@ -471,14 +471,14 @@ Function FinishQuest()
     PlayerREF.EquipItem(ClothesJarlShoes, false, true)
     
     _00E_EPHandler.GiveEP(__Config_RewardEXP)
-    MQ13b.SetStage(5)
+    MQ13b.SetCurrentStageID(5)
 	
 	If CQC05.IsRunning() && !CQC05.IsCompleted()
-        CQC05.SetStage(65)
+        CQC05.SetCurrentStageID(65)
     EndIf
 
     If CQJ05.IsRunning() && !CQJ05.IsCompleted()
-        CQJ05.SetStage(30)
+        CQJ05.SetCurrentStageID(30)
     EndIf
 
 EndFunction
diff --git a/source/scripts/_00e_mq13a_sc04_cubesc.psc b/source/scripts/_00e_mq13a_sc04_cubesc.psc
index 7ef227a5..d1a8056d 100644
--- a/source/scripts/_00e_mq13a_sc04_cubesc.psc
+++ b/source/scripts/_00e_mq13a_sc04_cubesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ13a_SC04_CubeSC extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if (akActionRef == Game.GetPlayer()) && MQ13a.GetStage() == 45
+	if (akActionRef == Game.GetPlayer()) && MQ13a.GetCurrentStageID() == 45
 		MQ13a.AddCube()
 	EndIf
 	
diff --git a/source/scripts/_00e_mq13a_sc07_starshipbedsc.psc b/source/scripts/_00e_mq13a_sc07_starshipbedsc.psc
index 7a878c94..56ad39a2 100644
--- a/source/scripts/_00e_mq13a_sc07_starshipbedsc.psc
+++ b/source/scripts/_00e_mq13a_sc07_starshipbedsc.psc
@@ -6,7 +6,7 @@ Scriptname _00E_MQ13a_SC07_StarshipBedSC extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-	If MQ13a.GetStage() == 75 && akActionRef == Game.GetPlayer()
+	If MQ13a.GetCurrentStageID() == 75 && akActionRef == Game.GetPlayer()
 		If CaliaRomance.GetValueInt() == 0 && JesparRomance.GetValueInt() == 0
 			MQ13a.CallSleepBox()
 		EndIf
diff --git a/source/scripts/_00e_mq13a_sc1_startfailsavesc.psc b/source/scripts/_00e_mq13a_sc1_startfailsavesc.psc
index 32d75d1f..115d8e85 100644
--- a/source/scripts/_00e_mq13a_sc1_startfailsavesc.psc
+++ b/source/scripts/_00e_mq13a_sc1_startfailsavesc.psc
@@ -9,7 +9,7 @@ Scriptname _00E_MQ13a_SC1_StartFailsaveSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == PlayerREF
-		if MQ13a.GetStage() == 5
+		if MQ13a.GetCurrentStageID() == 5
             if !MQ13a_SC01_LexYuslan.IsPlaying()
                 MQ13a.SetUp()
             endif
diff --git a/source/scripts/_00e_mq13b_functions.psc b/source/scripts/_00e_mq13b_functions.psc
index 3c099ceb..069b43bf 100644
--- a/source/scripts/_00e_mq13b_functions.psc
+++ b/source/scripts/_00e_mq13b_functions.psc
@@ -45,7 +45,7 @@ Function SetUpSC01()
 	
 	GetRomance()
 	
-	SetStage(10)
+	SetCurrentStageID(10)
 	
 	MQ13b_StarshipREF002.TranslateToREF(MQ13b_SC01_StarshipPierMarker, 40.0)
 	MQ13b_Starship_SteamREF.TranslateToREF(MQ13b_Starship_TranslateSteamREF, 40.0)
@@ -504,7 +504,7 @@ EndFunction
 Function FinishUpAndStartMQ13c()
 
 	_00E_EPHandler.GiveEP(__Config_RewardEXP)
-	MQ13c.SetStage(5)
+	MQ13c.SetCurrentStageID(5)
 	
 EndFunction
 
diff --git a/source/scripts/_00e_mq13b_sc08_elevatorsc.psc b/source/scripts/_00e_mq13b_sc08_elevatorsc.psc
index d4d7c543..65855306 100644
--- a/source/scripts/_00e_mq13b_sc08_elevatorsc.psc
+++ b/source/scripts/_00e_mq13b_sc08_elevatorsc.psc
@@ -2,8 +2,8 @@ Scriptname _00E_MQ13b_SC08_ElevatorSC extends ObjectReference
 
 Event OnTranslationAlmostComplete()
 
-	If iState == 0 && MQ13b.GetStage() < 75
-		MQ13b.SetStage(75)
+	If iState == 0 && MQ13b.GetCurrentStageID() < 75
+		MQ13b.SetCurrentStageID(75)
 		MQ13b.StopElevatorSound()
 		iState = 1
 	EndIf
diff --git a/source/scripts/_00e_mq13b_sc08_searchtgbxsc.psc b/source/scripts/_00e_mq13b_sc08_searchtgbxsc.psc
index 40d04c05..0b1452a1 100644
--- a/source/scripts/_00e_mq13b_sc08_searchtgbxsc.psc
+++ b/source/scripts/_00e_mq13b_sc08_searchtgbxsc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ13b_SC08_SearchTGBXSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if akActionRef == Game.GetPlayer() && MQ13b.GetStage() == 60
+	if akActionRef == Game.GetPlayer() && MQ13b.GetCurrentStageID() == 60
 		MQ13b.ShowFailedMessage(__Config_iNumber)
 	EndIf
 EndEvent
diff --git a/source/scripts/_00e_mq13b_sc09_chainsc.psc b/source/scripts/_00e_mq13b_sc09_chainsc.psc
index f5451405..d494a7a6 100644
--- a/source/scripts/_00e_mq13b_sc09_chainsc.psc
+++ b/source/scripts/_00e_mq13b_sc09_chainsc.psc
@@ -2,12 +2,12 @@ Scriptname _00E_MQ13b_SC09_ChainSC extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-	If MQ13b.GetStage() == 80 
+	If MQ13b.GetCurrentStageID() == 80 
 		Utility.Wait(1)
-		MQ13b.SetStage(85)
-	ElseIf MQ13c.GetStage() == 25
+		MQ13b.SetCurrentStageID(85)
+	ElseIf MQ13c.GetCurrentStageID() == 25
 		MQ13b_SC09_HiddenStairs.PlayAnimation("up")
-		MQ13c.SetStage(30)
+		MQ13c.SetCurrentStageID(30)
 	EndIf
 	
 EndEvent
diff --git a/source/scripts/_00e_mq13c_companionfailsavesc.psc b/source/scripts/_00e_mq13c_companionfailsavesc.psc
index a60c0b8d..3e9e6b0a 100644
--- a/source/scripts/_00e_mq13c_companionfailsavesc.psc
+++ b/source/scripts/_00e_mq13c_companionfailsavesc.psc
@@ -7,8 +7,8 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 	If !bDone && akActionRef == PlayerREF
 	
 		bDone = True		
-		If MQ13c.GetStage() < 55
-			MQ13c.SetStage(55)
+		If MQ13c.GetCurrentStageID() < 55
+			MQ13c.SetCurrentStageID(55)
 		EndIf
 		
 		If MQ13c.akCompanionRomance.GetParentCell() != PlayerREF.GetParentCell()
diff --git a/source/scripts/_00e_mq13c_functions.psc b/source/scripts/_00e_mq13c_functions.psc
index 424b4c7b..dc6fef78 100644
--- a/source/scripts/_00e_mq13c_functions.psc
+++ b/source/scripts/_00e_mq13c_functions.psc
@@ -192,7 +192,7 @@ Function DragonIdle()
 
 	If !NQ01.IsCompleted()
 		NQ01.FailAllObjectives()
-		NQ01.SetStage(35)
+		NQ01.SetCurrentStageID(35)
 	EndIf
 	
 	MQ13c_SC03_CollisionPlane.Enable()
@@ -494,7 +494,7 @@ EndFunction
 
 Function OpenSecretPassage()
 
-	SetStage(95)
+	SetCurrentStageID(95)
 	MQ13c_SC07_WallTranslater.TranslateToRef(MQ13c_SC07_WallTranslateRef, 400.0)
 	OBJDwemerRepositoryRotateM.Play(MQ13c_SC07_WallTranslater)
 	SetObjectiveDisplayed(20)
@@ -671,7 +671,7 @@ Function CollapseReactor()
 	MQ13c_SC09_ReactorREF.PlaceAtMe(_00E_MQ13c_SC09_LethalShockExplosion)
 	MQ13c_SC09_ReactorREF.PlaceAtMe(ExplosionShockMass01)
 	
-	If GetStage() < 120
+	If GetCurrentStageID() < 120
 		Wait(0.7)
 		akCompanionRomance.SetGhost(False)
 		akCompanionRomance.GetActorBase().SetEssential(False)
@@ -744,7 +744,7 @@ Function PlayLaunchSequence()
 	PlayerREF.StopTranslation()
 	MQ13c_SC09_CapsuleREF.StopTranslation()
 	Wait(2)
-	SetStage(125)
+	SetCurrentStageID(125)
 	
 EndFunction
 
@@ -858,7 +858,7 @@ Function FadeOutAndStartSC11()
 	PlayerREF.MoveTo(_00E_MQ08aPrologue_KonstantinChair)
 	akCompanionNoRomance.MoveTo(MQ06_SC2_PlayerBed)
 	_00E_MC_LexREF.MoveTo(LexStool)
-	SetStage(140)
+	SetCurrentStageID(140)
 	MQ13c_SC11_Emporium.ForceStart()
 	
 	PlayerREF.Activate(_00E_MQ08aPrologue_KonstantinChair)
@@ -874,9 +874,9 @@ EndFunction
 Function StartFinalCompanionQuest()
 
 	If akCompanionRomance == _00E_MC_JesparREF && !CQJ06.IsCompleted()
-		CQJ06.SetStage(5)
+		CQJ06.SetCurrentStageID(5)
 	Elseif akCompanionRomance == _00E_MC_CaliaREF && !CQC06.IsCompleted()
-		CQC06.SetStage(5)
+		CQC06.SetCurrentStageID(5)
 	EndIf
 	
 EndFunction
@@ -900,19 +900,19 @@ Function FinishUP()
 	_00E_PlayerFunctions.GetSoundControl().RemoveSilence()
 	AllowIdleChatter.SetValue(1)
 	_00E_EPHandler.GiveEP(__Config_iRewardEXP)
-	MQ14.SetStage(5)
+	MQ14.SetCurrentStageID(5)
 	TimeScale.SetValue(10)
 	
 EndFunction
 
 Function CompanionQuestFailsave()
 
-	If MQ14.GetStage() < 15
+	If MQ14.GetCurrentStageID() < 15
 
 		if (JesparRomance.GetValueInt() == 1) && !(CQJ06.IsRunning())
-			CQJ06.SetStage(5)
+			CQJ06.SetCurrentStageID(5)
 		Elseif (CaliaRomance.GetValueInt() == 1) && !(CQC06.IsRunning())
-			CQC06.SetStage(5)
+			CQC06.SetCurrentStageID(5)
 		EndIf
 	
 	EndIf
@@ -937,7 +937,7 @@ Event OnUpdate()
 	
 	If (fSteelbirdTimer > 0) && !MQ13c_SC09_PlayerIsInCapsule
 		BangOnDoor()
-        if GetStage() < 120
+        if GetCurrentStageID() < 120
             _00E_MQ13c_sSteelBirdTimerMSG.Show(fSteelbirdTimer as Int)
             fSteelbirdTimer = (fSteelbirdTimer - __Config_fKnockInterval)
             RegisterForSingleUpdate(__Config_fKnockInterval)
diff --git a/source/scripts/_00e_mq13c_sc07_turretsc.psc b/source/scripts/_00e_mq13c_sc07_turretsc.psc
index 35bd5660..b9564ab3 100644
--- a/source/scripts/_00e_mq13c_sc07_turretsc.psc
+++ b/source/scripts/_00e_mq13c_sc07_turretsc.psc
@@ -17,7 +17,7 @@ Bool property bPlayerOnSurface auto conditional
 
 function OnTriggerLeave(ObjectReference akActionRef)
 
-	if akActionRef == game.GetPlayer() as ObjectReference && MQ13c.GetStage() >= 100
+	if akActionRef == game.GetPlayer() as ObjectReference && MQ13c.GetCurrentStageID() >= 100
 		bPlayerOnSurface = false
 	endIf
 endFunction
@@ -28,7 +28,7 @@ endFunction
 
 function OnTriggerEnter(ObjectReference akActionRef)
 
-	if akActionRef == game.GetPlayer() as ObjectReference && MQ13c.GetStage() >= 100
+	if akActionRef == game.GetPlayer() as ObjectReference && MQ13c.GetCurrentStageID() >= 100
 		bPlayerOnSurface = true
 	endIf
 endFunction
diff --git a/source/scripts/_00e_mq13c_sc09_buttonsc.psc b/source/scripts/_00e_mq13c_sc09_buttonsc.psc
index 95bb0f01..f11a0c4f 100644
--- a/source/scripts/_00e_mq13c_sc09_buttonsc.psc
+++ b/source/scripts/_00e_mq13c_sc09_buttonsc.psc
@@ -13,7 +13,7 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-	If MQ13c.GetStage() == 120
+	If MQ13c.GetCurrentStageID() == 120
 		If bButtonPlayer
 			If akActionRef == Game.GetPlayer()
 				Self.Activate(akActionRef, True)
diff --git a/source/scripts/_00e_mq13c_sureaidoorsc.psc b/source/scripts/_00e_mq13c_sureaidoorsc.psc
index 99043884..94ee3fdb 100644
--- a/source/scripts/_00e_mq13c_sureaidoorsc.psc
+++ b/source/scripts/_00e_mq13c_sureaidoorsc.psc
@@ -14,7 +14,7 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if MQ13c.GetStage() < 60
+	if MQ13c.GetCurrentStageID() < 60
 		; Do nothing
 	Else
 		Self.Activate(akActionRef, True)
diff --git a/source/scripts/_00e_mq14_functions.psc b/source/scripts/_00e_mq14_functions.psc
index d2c854d7..c4726dce 100644
--- a/source/scripts/_00e_mq14_functions.psc
+++ b/source/scripts/_00e_mq14_functions.psc
@@ -96,7 +96,7 @@ Function SetToTen()
     ; They're done deciphering the star map.
     
     if PlayerREF.GetWorldspace() == SuntempleWorldspace
-        SetStage(10)
+        SetCurrentStageID(10)
     endif
     _00E_MQ14_Readyfor10.SetValue(1)
     SetObjectiveDisplayed(10)
@@ -107,9 +107,9 @@ EndFunction
 Function FailCompanionQuestsIfNotCompleted()
     
     If CQJ06.IsRunning() && !CQJ06.IsCompleted()
-        CQJ06.SetStage(30)
+        CQJ06.SetCurrentStageID(30)
     ElseIf CQC06.IsRunning() && !CQC06.IsCompleted()
-        CQC06.SetStage(30)
+        CQC06.SetCurrentStageID(30)
     EndIf
     CQJ06.Stop()
     CQC06.Stop()
@@ -176,7 +176,7 @@ Function LockUpEverything()
     EndIf
 	
 	If !FS_NQ01.IsCompleted()
-		FS_NQ01.SetStage(200)
+		FS_NQ01.SetCurrentStageID(200)
 	EndIf
     
     SuntempleNakedNoviceREF.Disable()
@@ -600,7 +600,7 @@ Function PlayApplauseAndCheer()
     
     SetObjectiveCompleted(35)
     SetObjectiveDisplayed(40)
-    SetStage(67)
+    SetCurrentStageID(67)
     
     MQ14_SC09_Tealor.ForceStart()
     
@@ -639,7 +639,7 @@ Function FinishQuest()
         _00E_MC_JesparREF.SetOutfit(_00E_MC_JesparOutfit)
     EndIf
     
-    MQ15.SetStage(5)
+    MQ15.SetCurrentStageID(5)
     
 EndFunction
 
diff --git a/source/scripts/_00e_mq14_playersc.psc b/source/scripts/_00e_mq14_playersc.psc
index 61b17533..b4137499 100644
--- a/source/scripts/_00e_mq14_playersc.psc
+++ b/source/scripts/_00e_mq14_playersc.psc
@@ -2,17 +2,17 @@ Scriptname _00E_MQ14_PlayerSC extends ReferenceAlias
 
 Event OnLocationChange(Location akOldLoc, Location akNewLoc)
 
-    if MQ14.GetStage() >= 15
+    if MQ14.GetCurrentStageID() >= 15
         return
     endif
 
 	If akNewLoc == _00E_SuntempleLocation
-		If MQ14.GetStage() == 10
-			MQ14.SetStage(15)
+		If MQ14.GetCurrentStageID() == 10
+			MQ14.SetCurrentStageID(15)
 		EndIf
     Endif
 
-    If MQ14.GetStage() == 5
+    If MQ14.GetCurrentStageID() == 5
        bool b = MQ14.ReminderFailsave()
 	EndIf
     
diff --git a/source/scripts/_00e_mq14_reminderfailsavesc.psc b/source/scripts/_00e_mq14_reminderfailsavesc.psc
index 792ff715..504a185a 100644
--- a/source/scripts/_00e_mq14_reminderfailsavesc.psc
+++ b/source/scripts/_00e_mq14_reminderfailsavesc.psc
@@ -11,15 +11,15 @@ Scriptname _00E_MQ14_ReminderFailsaveSC extends ObjectReference
 Event OnTriggerEnter (ObjectReference akActionREF)
 
     if akActionRef == PlayerREF
-        if MQ14.GetStage() == 5
+        if MQ14.GetCurrentStageID() == 5
             bool b = MQ14.ReminderFailsave()
             if b
-                MQ14.SetStage(10)
+                MQ14.SetCurrentStageID(10)
                 Disable()
             endif
         endif
         if _00E_MQ14_Readyfor10.GetValue() == 1
-            MQ14.SetStage(10)
+            MQ14.SetCurrentStageID(10)
             Disable()
         endif
     endif
diff --git a/source/scripts/_00e_mq15_functions.psc b/source/scripts/_00e_mq15_functions.psc
index 4884040c..6778885a 100644
--- a/source/scripts/_00e_mq15_functions.psc
+++ b/source/scripts/_00e_mq15_functions.psc
@@ -215,7 +215,7 @@ EndFunction
 Function GiveEP()
 
 	_00E_EPHandler.GiveEP(__Config_iRewardEXP)
-	MQ16.SetStage(5)
+	MQ16.SetCurrentStageID(5)
 	
 EndFunction
 
diff --git a/source/scripts/_00e_mq16_echo_cluesc.psc b/source/scripts/_00e_mq16_echo_cluesc.psc
index 0302f4ba..c4fb9bb3 100644
--- a/source/scripts/_00e_mq16_echo_cluesc.psc
+++ b/source/scripts/_00e_mq16_echo_cluesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ16_Echo_ClueSC extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-	If !bDone && MQ16.GetStage() == 130
+	If !bDone && MQ16.GetCurrentStageID() == 130
 		MQ16.PlayVisionFragment(iVisionIndex, Self, iDuration)
 		bDone = True
 		_00E_QuestshaderNew.Stop(Self)
diff --git a/source/scripts/_00e_mq16_failsavecavernsc.psc b/source/scripts/_00e_mq16_failsavecavernsc.psc
index 804891dd..b0a1d995 100644
--- a/source/scripts/_00e_mq16_failsavecavernsc.psc
+++ b/source/scripts/_00e_mq16_failsavecavernsc.psc
@@ -2,9 +2,9 @@ Scriptname _00E_MQ16_FailsaveCavernSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if !bDone && akActionRef == PlayerREF && MQ16.GetStage() < 25
+	if !bDone && akActionRef == PlayerREF && MQ16.GetCurrentStageID() < 25
 		bDone = True
-		MQ16.SetStage(25)
+		MQ16.SetCurrentStageID(25)
 	EndIf
 
 EndEvent
diff --git a/source/scripts/_00e_mq16_functions.psc b/source/scripts/_00e_mq16_functions.psc
index 76ba2d3a..ccb27835 100644
--- a/source/scripts/_00e_mq16_functions.psc
+++ b/source/scripts/_00e_mq16_functions.psc
@@ -90,7 +90,7 @@ Function StopVision_SC01()
     MQ16_SC01_MotherREF02.Disable()
     Sound.StopInstance(iVisionIntenseSound)
     ImageSpaceModifier.RemoveCrossFade()
-    SetStage(15)
+    SetCurrentStageID(15)
     
 EndFunction
 
@@ -137,7 +137,7 @@ Function StopVision_SC03()
     _00E_PlayerFunctions.GetVisionControl().VisionEffectTimestopStop()
     ImageSpaceModifier.RemoveCrossFade()
     Wait(1)
-    SetStage(45)
+    SetCurrentStageID(45)
     SetObjectiveDisplayed(12)
     
 EndFunction
@@ -155,7 +155,7 @@ EndFunction
 Function StopElevatorSound()
     
     PlayerREF.SetGhost(False)
-    SetStage(45)
+    SetCurrentStageID(45)
     
 EndFunction
 
@@ -447,7 +447,7 @@ Function Impact()
 	QSTTG05ArrowKnockOut2D.Play(PlayerREF)
 	FadeToBlackHoldImod.Apply()
 	Wait(4)
-	SetStage(80)
+	SetCurrentStageID(80)
 
 EndFunction
 
@@ -521,7 +521,7 @@ Function StopVision_SC09()
     MQ16_SC09_VisionNPCLinkREF.Disable()
     Sound.StopInstance(iVisionIntenseSound)
     ImageSpaceModifier.RemoveCrossFade()
-    SetStage(100)
+    SetCurrentStageID(100)
     _00E_MQ16_Temple_Thoughts_01.ShowAsHelpMessage("_00E_MQ16_Temple_Thoughts_01", 5, 1, 1)
     
 EndFunction
@@ -571,7 +571,7 @@ Function StopVision_SC10()
     MQ16_SC10_VisionLinker.Disable()
     Sound.StopInstance(iVisionIntenseSound)
     ImageSpaceModifier.RemoveCrossFade()
-    SetStage(110)
+    SetCurrentStageID(110)
     
 EndFunction
 
@@ -617,7 +617,7 @@ Function UpdateEchoCount()
 
     if CurrentCount >= 5
         Self.SetObjectiveCompleted(25, 1)
-        Self.SetStage(135)
+        Self.SetCurrentStageID(135)
     ElseIf CurrentCount < 5
         Self.SetObjectiveCompleted(25,0)
         Self.SetObjectiveDisplayed(25, True, True)
@@ -677,7 +677,7 @@ Function StartCleansingMemory()
     Game.ShakeCamera(afStrength = 1, afDuration = 26)
     Wait(25.5)
     FadeToWhiteHoldImod.ApplyCrossFade(afFadeDuration = 0.25)
-    SetStage(140)
+    SetCurrentStageID(140)
 
 EndFunction
 
@@ -803,7 +803,7 @@ Function StartEarthquake()
     Wait(11)
     FadeToBlackHoldImod.ApplyCrossFade(afFadeDuration = 0.25)
     Wait(2)
-    SetStage(165)
+    SetCurrentStageID(165)
     
 EndFunction
 
@@ -901,7 +901,7 @@ Function TealorKillYuslan()
     Game.TriggerScreenBlood(7)
     Utility.Wait(3)
     YuslanDeath()
-    SetStage(170)
+    SetCurrentStageID(170)
     
 EndFunction
 
@@ -935,7 +935,7 @@ EndFunction
 
 Function StartMQ17()
 
-    MQ17.SetStage(5)
+    MQ17.SetCurrentStageID(5)
 
 EndFunction
 
diff --git a/source/scripts/_00e_mq16_sc06_hearthitboxsc.psc b/source/scripts/_00e_mq16_sc06_hearthitboxsc.psc
index 5199732f..fe167c7c 100644
--- a/source/scripts/_00e_mq16_sc06_hearthitboxsc.psc
+++ b/source/scripts/_00e_mq16_sc06_hearthitboxsc.psc
@@ -2,8 +2,8 @@ Scriptname _00E_MQ16_SC06_HeartHitBoxSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If MQ17.GetStage() == 65
-		MQ17.SetStage(70)
+	If MQ17.GetCurrentStageID() == 65
+		MQ17.SetCurrentStageID(70)
 	EndIf
 
 EndEvent
diff --git a/source/scripts/_00e_mq16_sc07_projectiletgbxsc.psc b/source/scripts/_00e_mq16_sc07_projectiletgbxsc.psc
index 2ba96d4c..7f51c25b 100644
--- a/source/scripts/_00e_mq16_sc07_projectiletgbxsc.psc
+++ b/source/scripts/_00e_mq16_sc07_projectiletgbxsc.psc
@@ -2,8 +2,8 @@ Scriptname _00E_MQ16_SC07_ProjectileTGBXSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	If MQ16.GetStage() == 75
-		MQ16.SetStage(77)
+	If MQ16.GetCurrentStageID() == 75
+		MQ16.SetCurrentStageID(77)
 		MQ16.Impact()
 	EndIf
 
diff --git a/source/scripts/_00e_mq16_sc14_tealorshocksc.psc b/source/scripts/_00e_mq16_sc14_tealorshocksc.psc
index a98fe0f5..63db3935 100644
--- a/source/scripts/_00e_mq16_sc14_tealorshocksc.psc
+++ b/source/scripts/_00e_mq16_sc14_tealorshocksc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ16_SC14_TealorShockSC extends activemagiceffect
 Event OnEffectStart(Actor akTarget, Actor akCaster)
 
 	MQ16.YuslanDeath()
-	MQ16.SetStage(170)
+	MQ16.SetCurrentStageID(170)
 	
 EndEvent
 
diff --git a/source/scripts/_00e_mq16_telaoryuslanfailsavesc.psc b/source/scripts/_00e_mq16_telaoryuslanfailsavesc.psc
index 02908f03..9592165c 100644
--- a/source/scripts/_00e_mq16_telaoryuslanfailsavesc.psc
+++ b/source/scripts/_00e_mq16_telaoryuslanfailsavesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ16_TelaorYuslanFailsaveSC extends ObjectReference
 
 Event OnUpdate()
 
-	If MQ16.GetStage() < 155
+	If MQ16.GetCurrentStageID() < 155
 
 		If _00E_MC_YuslanREF.GetDistance(MQ16_SC12_YuslanStartREF003) >= 700
 			_00E_MC_YuslanREF.MoveTo(MQ16_SC12_FailsaveMarker)
diff --git a/source/scripts/_00e_mq17_blackguardianbuttonsc.psc b/source/scripts/_00e_mq17_blackguardianbuttonsc.psc
index 4b74a4c8..b375139b 100644
--- a/source/scripts/_00e_mq17_blackguardianbuttonsc.psc
+++ b/source/scripts/_00e_mq17_blackguardianbuttonsc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ17_BlackGuardianButtonSC extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if MQ17.GetStage() == 55
+	if MQ17.GetCurrentStageID() == 55
 	
 		if Game.GetPlayer().IsWeaponDrawn()
 			Game.GetPlayer().SheatheWeapon()
@@ -10,7 +10,7 @@ Event OnActivate(ObjectReference akActionRef)
 		EndIf
 	
 		QSTOculoryRingM.Play(Self)
-		MQ17.SetStage(60)
+		MQ17.SetCurrentStageID(60)
 	EndIf
 	
 EndEvent
diff --git a/source/scripts/_00e_mq17_blackstonesc.psc b/source/scripts/_00e_mq17_blackstonesc.psc
index a69abf60..74e844a4 100644
--- a/source/scripts/_00e_mq17_blackstonesc.psc
+++ b/source/scripts/_00e_mq17_blackstonesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ17_BlackStoneSC extends ObjectReference
 
 Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile, bool abPowerAttack, bool abSneakAttack, bool abBashAttack, bool abHitBlocked)
 
-	If MQ17.GetStage() >= 105 && MQ17.bHasChosenEndingKatharsis && !bDone && akAggressor == Game.GetPlayer()
+	If MQ17.GetCurrentStageID() >= 105 && MQ17.bHasChosenEndingKatharsis && !bDone && akAggressor == Game.GetPlayer()
 		bDone = True
 		MQ17.DestroyBlackStone(Self.GetLinkedRef())
 	EndIf
diff --git a/source/scripts/_00e_mq17_functions.psc b/source/scripts/_00e_mq17_functions.psc
index 12958c04..77c00645 100644
--- a/source/scripts/_00e_mq17_functions.psc
+++ b/source/scripts/_00e_mq17_functions.psc
@@ -202,7 +202,7 @@ Function StartExplanationVideo01()
 		Game.PlayBink("MQ17BlackGuardian.bik")
 		Wait(2)
 	EndIf
-	SetStage(40)
+	SetCurrentStageID(40)
 
 EndFunction
 
@@ -216,7 +216,7 @@ Function StartExplanationVideo02()
 
 	MQ17_SC04_BlackGuardian_02.Stop()
 	Wait(1)
-	SetStage(50)
+	SetCurrentStageID(50)
 
 EndFunction
 
@@ -448,7 +448,7 @@ Function DestroyBlackGuardian()
 	MQ17_SC02_BlackGuardianLightLinker.Disable()
 	Wait(0.75)
 	MQ17_SC08_DeathSmoke.Enable()
-	SetStage(90)
+	SetCurrentStageID(90)
     SetObjectiveDisplayed(18)
 	_00E_Func_SetNPCAsCompanion.SetNPCAsCompanion(akCompanion, False)
 
@@ -663,14 +663,14 @@ Function StartSC09()
 	
 	If bHasChosenEndingKatharsis
 		Chronicum_Door.BlockActivation(True)
-		MQ18b.SetStage(5)
+		MQ18b.SetCurrentStageID(5)
 		if akCompanion == _00E_MC_CaliaREF
 			MQ18b.SetObjectiveDisplayed(7)
 		else
 			MQ18b.SetObjectiveDisplayed(6)
 		endif
 	Else
-		MQ18a.SetStage(5)
+		MQ18a.SetCurrentStageID(5)
 		if akCompanion == _00E_MC_CaliaREF
 			MQ18a.SetObjectiveDisplayed(7)
 		else
@@ -887,7 +887,7 @@ Function LaunchCapsule()
 	Wait(3)
 	PlayerREF.StopTranslation()
 	MQ17_SC09_Capsule_01_REF.StopTranslation()
-	SetStage(150)
+	SetCurrentStageID(150)
 	
 EndFunction
 
@@ -918,14 +918,14 @@ Function DestroyBeacon()
 	MQ18b.SetObjectiveCompleted(5)
 	_00E_Music_Special_Cleansing.Remove()
 	_00E_SilenceAbruptHighPriority.Add()
-	SetStage(130)
+	SetCurrentStageID(130)
 	QSTDwemerGong01.Play(PlayerREF)
 	Game.ShakeCamera(afStrength = 0.1, afDuration = 3.0)
 	FadeToWhiteImod.Apply()
 	Wait(1)
 	FadeToWhiteHoldImod.ApplyCrossFade(afFadeDuration = 1.0)
 	Wait(9.5)
-	SetStage(150)
+	SetCurrentStageID(150)
 	
 EndFunction
 
@@ -935,18 +935,18 @@ Function SetUpEpilogue()
 	
 		if _00E_FS_DreamflowerConsumed.GetValueInt() == 1
 		
-			FS_MQ18c.SetStage(5)
+			FS_MQ18c.SetCurrentStageID(5)
 		
 		Else
 	
-			MQ18b.SetStage(10)
+			MQ18b.SetCurrentStageID(10)
 			MQ18b.SetUpDreamScene(True)
 			
 		EndIf
 		
 	Else
 		MQ18b.SetUpDreamScene(False)
-		MQ18a.SetStage(10)
+		MQ18a.SetCurrentStageID(10)
 	EndIf
 		
 	Self.CompleteQuest()
diff --git a/source/scripts/_00e_mq17_generatorhitboxsc.psc b/source/scripts/_00e_mq17_generatorhitboxsc.psc
index fc998681..ff24af44 100644
--- a/source/scripts/_00e_mq17_generatorhitboxsc.psc
+++ b/source/scripts/_00e_mq17_generatorhitboxsc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ17_GeneratorHitBoxSC extends ObjectReference
 
 Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile, bool abPowerAttack, bool abSneakAttack, bool abBashAttack, bool abHitBlocked)
 
-	If !LinkedGenerator.IsDead() && MQ17.GetStage() >= 75 && akAggressor == Game.GetPlayer()
+	If !LinkedGenerator.IsDead() && MQ17.GetCurrentStageID() >= 75 && akAggressor == Game.GetPlayer()
 		LinkedGenerator.CheckForDamage(akSource)
 	EndIf
 
diff --git a/source/scripts/_00e_mq17_portalsc.psc b/source/scripts/_00e_mq17_portalsc.psc
index 5ec37666..83ded086 100644
--- a/source/scripts/_00e_mq17_portalsc.psc
+++ b/source/scripts/_00e_mq17_portalsc.psc
@@ -3,8 +3,8 @@ Scriptname _00E_MQ17_PortalSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == Game.GetPlayer()
-		if MQ17.GetStage() == 20 && !MQ17.bIsVisionPlaying
-			MQ17.SetStage(25)
+		if MQ17.GetCurrentStageID() == 20 && !MQ17.bIsVisionPlaying
+			MQ17.SetCurrentStageID(25)
 			Self.Disable()
 		EndIf
 	EndIf
diff --git a/source/scripts/_00e_mq17_premonitionthoughtmessagesc.psc b/source/scripts/_00e_mq17_premonitionthoughtmessagesc.psc
index b685a66b..acae5546 100644
--- a/source/scripts/_00e_mq17_premonitionthoughtmessagesc.psc
+++ b/source/scripts/_00e_mq17_premonitionthoughtmessagesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ17_PremonitionThoughtMessageSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if akActionRef == PlayerREF && MQ17.GetStage() > 5
+	if akActionRef == PlayerREF && MQ17.GetCurrentStageID() > 5
 	
 		_00E_MQ17_ForbiddenRoomThoughtMessage.ShowAsHelpMessage("_00E_MQ17_ForbiddenRoomThoughtMessage", 5, 1, 1)
 		
diff --git a/source/scripts/_00e_mq17_sc02_questtgbxsc.psc b/source/scripts/_00e_mq17_sc02_questtgbxsc.psc
index 15eb4fbc..e064e266 100644
--- a/source/scripts/_00e_mq17_sc02_questtgbxsc.psc
+++ b/source/scripts/_00e_mq17_sc02_questtgbxsc.psc
@@ -2,8 +2,8 @@ Scriptname _00E_MQ17_SC02_QuestTGBXSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionref)
 
-	if akActionRef == Game.GetPlayer() && !MQ17.bIsVisionPlaying && MQ17.GetStage() == iStageRequired
-		MQ17.SetStage(iStageToSet)
+	if akActionRef == Game.GetPlayer() && !MQ17.bIsVisionPlaying && MQ17.GetCurrentStageID() == iStageRequired
+		MQ17.SetCurrentStageID(iStageToSet)
 		Self.Disable()
 	EndIf
 
diff --git a/source/scripts/_00e_mq17_sc09_triggersc.psc b/source/scripts/_00e_mq17_sc09_triggersc.psc
index 58add91d..12fb84e4 100644
--- a/source/scripts/_00e_mq17_sc09_triggersc.psc
+++ b/source/scripts/_00e_mq17_sc09_triggersc.psc
@@ -2,8 +2,8 @@ Scriptname _00E_MQ17_SC09_TriggerSC extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if MQ17.GetStage() <= 140
-		MQ17.SetStage(140)
+	if MQ17.GetCurrentStageID() <= 140
+		MQ17.SetCurrentStageID(140)
 		Self.Disable()
 	EndIf
 
diff --git a/source/scripts/_00e_mq17_sc10_capsulelaunchact.psc b/source/scripts/_00e_mq17_sc10_capsulelaunchact.psc
index 4c796254..858cd04f 100644
--- a/source/scripts/_00e_mq17_sc10_capsulelaunchact.psc
+++ b/source/scripts/_00e_mq17_sc10_capsulelaunchact.psc
@@ -3,7 +3,7 @@ Scriptname _00E_MQ17_SC10_CapsuleLaunchAct extends ObjectReference
 Event OnActivate(ObjectReference akActionRef)
 
 	if akActionRef == Game.GetPlayer()
-		MQ17.SetStage(145)
+		MQ17.SetCurrentStageID(145)
 		Self.Disable()
 	EndIf
 
diff --git a/source/scripts/_00e_mq17_temple_blockdoorsc.psc b/source/scripts/_00e_mq17_temple_blockdoorsc.psc
index 4a4cddc1..9d83fa0a 100644
--- a/source/scripts/_00e_mq17_temple_blockdoorsc.psc
+++ b/source/scripts/_00e_mq17_temple_blockdoorsc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ17_Temple_BlockDoorSC extends ObjectReference
 
 Event OnLoad()
 
-	if MQ17.GetStage() >= 70
+	if MQ17.GetCurrentStageID() >= 70
 		Self.BlockActivation(True)
 	EndIf
 
@@ -10,7 +10,7 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if akActionRef == Game.GetPlayer() && MQ17.GetStage() > 5
+	if akActionRef == Game.GetPlayer() && MQ17.GetCurrentStageID() > 5
 		_00E_BlockedMessage.Show()
 	EndIf
 
diff --git a/source/scripts/_00e_mq18a_functions.psc b/source/scripts/_00e_mq18a_functions.psc
index 78fa769a..1040233f 100644
--- a/source/scripts/_00e_mq18a_functions.psc
+++ b/source/scripts/_00e_mq18a_functions.psc
@@ -44,7 +44,7 @@ Function FadeOutDream()
 	Wait(4)
 	Weather.ReleaseOverride()
 	PlayerREF.SetScale(1)
-	SetStage(20)
+	SetCurrentStageID(20)
 	
 EndFunction
 
diff --git a/source/scripts/_00e_mq18b_showthoughtmessagesc.psc b/source/scripts/_00e_mq18b_showthoughtmessagesc.psc
index 808ec911..f4397d20 100644
--- a/source/scripts/_00e_mq18b_showthoughtmessagesc.psc
+++ b/source/scripts/_00e_mq18b_showthoughtmessagesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_MQ18b_ShowThoughtMessageSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if MQ17.GetStage() >= 105 && MQ17.bHasChosenEndingKatharsis && !bDone
+	if MQ17.GetCurrentStageID() >= 105 && MQ17.bHasChosenEndingKatharsis && !bDone
 		bDone = True
 		_00E_MQ18b_ThoughtBox.ShowAsHelpMessage("_00E_MQ18b_ThoughtBox", 5, 1, 1)
 	EndIf
diff --git a/source/scripts/_00e_mq1c_ketarondoorscript.psc b/source/scripts/_00e_mq1c_ketarondoorscript.psc
index 73a4e4a7..3e4992dd 100644
--- a/source/scripts/_00e_mq1c_ketarondoorscript.psc
+++ b/source/scripts/_00e_mq1c_ketarondoorscript.psc
@@ -10,10 +10,10 @@ Event OnActivate(ObjectReference akActionRef)
 
 if akActionRef == Game.GetPlayer()
 
-	If MQ11c_ASongInTheSilence.GetStage() == StayLockedStage01
-		MQ11c_ASongInTheSilence.SetStage(StayLockedStage02)
+	If MQ11c_ASongInTheSilence.GetCurrentStageID() == StayLockedStage01
+		MQ11c_ASongInTheSilence.SetCurrentStageID(StayLockedStage02)
 		
-	Elseif MQ11c_ASongInTheSilence.GetStage() >= UnlockStage
+	Elseif MQ11c_ASongInTheSilence.GetCurrentStageID() >= UnlockStage
 		self.BlockActivation(False)
 		self.Activate(PlayerREF, true)
 		
diff --git a/source/scripts/_00e_mqp01_functions.psc b/source/scripts/_00e_mqp01_functions.psc
index f4e06b16..9bb89404 100644
--- a/source/scripts/_00e_mqp01_functions.psc
+++ b/source/scripts/_00e_mqp01_functions.psc
@@ -204,7 +204,7 @@ Function PlayIntroAndMovePlayerToShip()
 	
 	AudioCategoryAMBr.SetVolume(1)
 	AudioCategoryAMB.SetVolume(1)
-	MQP02.SetStage(5)
+	MQP02.SetCurrentStageID(5)
 	AudioCategoryAMB.UnMute()
 	AudioCategoryMAG.UnMute()
 	AudioCategorySFX.UnMute()
diff --git a/source/scripts/_00e_mqp01_playertranslationscript.psc b/source/scripts/_00e_mqp01_playertranslationscript.psc
index 253c8ee4..08dac0eb 100644
--- a/source/scripts/_00e_mqp01_playertranslationscript.psc
+++ b/source/scripts/_00e_mqp01_playertranslationscript.psc
@@ -2,13 +2,13 @@ Scriptname _00E_MQP01_PlayerTranslationScript extends ReferenceAlias
 
 Event OnTranslationAlmostComplete()
 
-	if (MQP01.GetStage() < 40 && MQP01.GetStage() >= 35) && !MQ04.IsCompleted()
+	if (MQP01.GetCurrentStageID() < 40 && MQP01.GetCurrentStageID() >= 35) && !MQ04.IsCompleted()
 		;.MessageBox("Ich triggere")
 		FadeToBlackHoldIMOD.Apply()
 		_00E_SilenceAbruptHighPriority.Add()
 		FXExplosionCatapultNearM.Play(Game.GetPlayer())
 		Utility.Wait(5)
-		MQP01.SetStage(40)
+		MQP01.SetCurrentStageID(40)
 	EndIf
 	
 EndEvent
diff --git a/source/scripts/_00e_mqp01_startsc.psc b/source/scripts/_00e_mqp01_startsc.psc
index 9672289c..9605b9cd 100644
--- a/source/scripts/_00e_mqp01_startsc.psc
+++ b/source/scripts/_00e_mqp01_startsc.psc
@@ -5,7 +5,7 @@ Event OnTriggerEnter (ObjectReference akActionREF)
 if akActionRef == PlayerREF && !bDone
 	If !MQ10a.IsRunning() 
 		If	!MQ12c.IsRunning()
-		MQP01.SetStage(10)
+		MQP01.SetCurrentStageID(10)
 		Self.Delete()
 		EndIf
 	EndIf
diff --git a/source/scripts/_00e_mqp02_functions.psc b/source/scripts/_00e_mqp02_functions.psc
index 9065ebb9..7abd8c0a 100644
--- a/source/scripts/_00e_mqp02_functions.psc
+++ b/source/scripts/_00e_mqp02_functions.psc
@@ -8,8 +8,8 @@ Import Utility
 
 Event OnUpdate()
 
-	If GetStage() < 10
-		SetStage(10)
+	If GetCurrentStageID() < 10
+		SetCurrentStageID(10)
 	EndIf
 
 EndEvent
@@ -63,7 +63,7 @@ Function WakeUp()
 	
 	RegisterForSingleUpdate(5)
 	
-	Self.SetStage(10)
+	Self.SetCurrentStageID(10)
 
 EndFunction
 
@@ -314,7 +314,7 @@ Function KnockOutPlayer()
 	Sound.StopInstance(VeiledWomanSpellSound)
 	Wait(3)
 	Game.PrecacheCharGenClear() 
-	Self.SetStage(80) 
+	Self.SetCurrentStageID(80) 
 	
 EndFunction
 
@@ -397,7 +397,7 @@ Function RocioKillPlayer()
 	PlayerREF.SetAlpha(1)
 	Wait(3)
 	Game.RequestAutoSave()
-	Self.SetStage(115)
+	Self.SetCurrentStageID(115)
 	MQP03.Start()
 
 EndFunction
@@ -416,7 +416,7 @@ State Chargen
 	Event OnUpdate()
 
 		If !(Utility.IsInMenuMode())
-			Self.SetStage(17)
+			Self.SetCurrentStageID(17)
 			Game.EnablePlayerControls()
 			PlayerREF.PlayIdle(IdleForceDefaultState)
 			Debug.SendAnimationEvent(PlayerREF, "IdleForceDefaultState")
@@ -438,7 +438,7 @@ State CombatTutorial
 
 	Event OnUpdate()
 
-		If Self.GetStage() < 60
+		If Self.GetCurrentStageID() < 60
 
 			If !(MQP02_RiqRef.GetCombatTarget() == PlayerREF || MQP02_SiriusREF) 
 				MQP02_RiqRef.StartCombat(PlayerREF)
diff --git a/source/scripts/_00e_mqp02_lanternscript.psc b/source/scripts/_00e_mqp02_lanternscript.psc
index f89ac14f..59143e1f 100644
--- a/source/scripts/_00e_mqp02_lanternscript.psc
+++ b/source/scripts/_00e_mqp02_lanternscript.psc
@@ -9,12 +9,12 @@ ObjectReference Property CandleOff Auto
 
 Event OnActivate(ObjectReference akActionRef)
 
-if (MQ_P02_ANewLife.GetStage() == 30)
+if (MQ_P02_ANewLife.GetCurrentStageID() == 30)
 	CandleLight.Disable()
 	CandleOn.Disable()
 	CandleOff.Enable()
 	FXFireOut.Play(Game.GetPlayer())
-	MQ_P02_ANewLife.SetStage(35)
+	MQ_P02_ANewLife.SetCurrentStageID(35)
 EndIf
 
 EndEvent
diff --git a/source/scripts/_00e_mqp02_playerknockoutscript.psc b/source/scripts/_00e_mqp02_playerknockoutscript.psc
index 35128831..62708a44 100644
--- a/source/scripts/_00e_mqp02_playerknockoutscript.psc
+++ b/source/scripts/_00e_mqp02_playerknockoutscript.psc
@@ -1,7 +1,7 @@
 Scriptname _00E_MQP02_PlayerKnockOutScript extends ReferenceAlias  
 
 Event OnTranslationAlmostComplete()
-	If MQP02.GetStage() < 110
+	If MQP02.GetCurrentStageID() < 110
 		If LevitationState == 1
 			LevitationState = 2
 			MQP02Functions.KnockOutPlayer()
diff --git a/source/scripts/_00e_mqp02_playintrolauncherscript.psc b/source/scripts/_00e_mqp02_playintrolauncherscript.psc
index 2ac37ba7..9539c05b 100644
--- a/source/scripts/_00e_mqp02_playintrolauncherscript.psc
+++ b/source/scripts/_00e_mqp02_playintrolauncherscript.psc
@@ -18,7 +18,7 @@ Sirius.MoveTo(SiriusMoveMarker)
 Game.ForceFirstPerson()
 Game.GetPlayer().MoveTo(PlayerMarker)
 ;Game.GetPlayer().StartSneaking()
-MQ_P02_ANewLife.SetStage(20)
+MQ_P02_ANewLife.SetCurrentStageID(20)
 SitMarker.Disable()
 
 EndEvent
diff --git a/source/scripts/_00e_mqp02_siriusriqdeathscript.psc b/source/scripts/_00e_mqp02_siriusriqdeathscript.psc
index 91cb055e..e4c0ae99 100644
--- a/source/scripts/_00e_mqp02_siriusriqdeathscript.psc
+++ b/source/scripts/_00e_mqp02_siriusriqdeathscript.psc
@@ -7,19 +7,19 @@ Event OnDeath(Actor akKiller)
 		_00E_Debug.PrintMessage("Sailor killed by Sirius, check for failsave.")
 		
 		If Self == MQP02_SebaldREF
-			If MQP02_RiqRef.IsDead() && MQP02.GetStage() < 60
-				MQP02.SetStage(60)
+			If MQP02_RiqRef.IsDead() && MQP02.GetCurrentStageID() < 60
+				MQP02.SetCurrentStageID(60)
 			EndIf
 		Else
-			If MQP02_SebaldREF.IsDead() && MQP02.GetStage() < 60
-				MQP02.SetStage(60)
+			If MQP02_SebaldREF.IsDead() && MQP02.GetCurrentStageID() < 60
+				MQP02.SetCurrentStageID(60)
 			EndIf
 		EndIf
 		
 	Else
 		
 		if MQP02_RiqRef.IsDead() && MQP02_SebaldREF.IsDead()
-			MQP02.SetStage(60)
+			MQP02.SetCurrentStageID(60)
 		EndIf
 		
 	EndIf
diff --git a/source/scripts/_00e_mqp03_akropolissetstageonlea.psc b/source/scripts/_00e_mqp03_akropolissetstageonlea.psc
index ba3f1003..4b28fc1b 100644
--- a/source/scripts/_00e_mqp03_akropolissetstageonlea.psc
+++ b/source/scripts/_00e_mqp03_akropolissetstageonlea.psc
@@ -5,7 +5,7 @@ Event OnTriggerLeave(ObjectReference akActionRef)
 
 	if !Done && (MQP03.IsRunning())
 		Done = True
-		MQP03.SetStage(15)
+		MQP03.SetCurrentStageID(15)
 		iMappedKeyCode = Input.GetMappedKey("Shout")
 		RegisterForKey(iMappedKeyCode)
 		Self.Disable()
diff --git a/source/scripts/_00e_mqp03_exitdoorscript.psc b/source/scripts/_00e_mqp03_exitdoorscript.psc
index 9688f0f5..16ecfbbe 100644
--- a/source/scripts/_00e_mqp03_exitdoorscript.psc
+++ b/source/scripts/_00e_mqp03_exitdoorscript.psc
@@ -5,7 +5,7 @@ bool Done = False
 Event OnActivate(ObjectReference akActionRef)
 
 	if akActionRef == Game.GetPlayer() && !Done
-		MQP03.SetStage(70)
+		MQP03.SetCurrentStageID(70)
 		Done = True
 	EndIf	
 
diff --git a/source/scripts/_00e_mqp03_functions.psc b/source/scripts/_00e_mqp03_functions.psc
index 4ed716ee..8ac14165 100644
--- a/source/scripts/_00e_mqp03_functions.psc
+++ b/source/scripts/_00e_mqp03_functions.psc
@@ -10,7 +10,7 @@ Import Game
 
 Event OnUpdate()
 
-	If (Self.GetStage() < 20) && _00E_DisableMenuTutorials.GetValueInt() == 0
+	If (Self.GetCurrentStageID() < 20) && _00E_DisableMenuTutorials.GetValueInt() == 0
 		If UsingGamepad()
 			Message.ResetHelpMessage("Empty")
 			_00E_MQP03_Tutorial_LeaveMenuHintConsole.ShowAsHelpMessage("Empty", 5, 1, 1)
@@ -39,7 +39,7 @@ Function MovePlayerToStart()
 	DisablePlayerControls(false, true, true, false, true, false, false, true)
 	PlayerREF.SetAlpha(0.0)
 	PlayerREF.MoveTo(_00E_ClassMenuOrigin)
-	Self.SetStage(10)
+	Self.SetCurrentStageID(10)
 	
 EndFunction
 
@@ -85,7 +85,7 @@ Function StrandingCutscene()
 	Game.EnablePlayerControls()
 	_00E_MQP03_sFeelDizzy.Show()
 	Wait(1)
-	Self.SetStage(25)
+	Self.SetCurrentStageID(25)
 	
 EndFunction
 
@@ -157,7 +157,7 @@ Function FinishQuestAndStartMQ01()
 	_00E_Music_Special_Act1Theme.Add()
 	Self.SetObjectiveCompleted(5)
 	MQ01.Start()
-	MQ01.SetStage(5)
+	MQ01.SetCurrentStageID(5)
 	Wait(1)
 	If _00E_DisableOtherTutorials.GetValueInt() == 0
 		_00E_MQ01_Tutorial_FoodAndMushrooms.ShowAsHelpMessage("Empty", 5, 1, 1)
diff --git a/source/scripts/_00e_myradsystem02.psc b/source/scripts/_00e_myradsystem02.psc
index 797baf44..11b60ce1 100644
--- a/source/scripts/_00e_myradsystem02.psc
+++ b/source/scripts/_00e_myradsystem02.psc
@@ -123,7 +123,7 @@ Function PortPlayer(ObjectReference Destination)
 	FadeToBlackBackImod.ApplyCrossFade()
 	Game.SetHudCartMode(false)
 	
-	If MQ04.GetStage() >= 10 && !bDone
+	If MQ04.GetCurrentStageID() >= 10 && !bDone
 		bDone = True
 		MQ04.SetObjectiveCompleted(20)
 		_00E_EPHandler.GiveEP(150)
diff --git a/source/scripts/_00e_nq02_newhorizons_library.psc b/source/scripts/_00e_nq02_newhorizons_library.psc
index e0273eae..3f1ccab9 100644
--- a/source/scripts/_00e_nq02_newhorizons_library.psc
+++ b/source/scripts/_00e_nq02_newhorizons_library.psc
@@ -15,7 +15,7 @@ Function AddKP(bool bKnowledgePointEarned)
 		EndIf
 	
 		If !Self.IsRunning()
-			Self.SetStage(5)
+			Self.SetCurrentStageID(5)
 		EndIf
 		
 		if !(Self.IsObjectiveCompleted(5))
@@ -26,7 +26,7 @@ Function AddKP(bool bKnowledgePointEarned)
 			if CurrentCount >= 40
 				Self.SetObjectiveCompleted(5, 1)
 				Self.SetObjectiveCompleted(10, 1)
-				Self.SetStage(10)
+				Self.SetCurrentStageID(10)
 			ElseIf CurrentCount < 40
 				Self.SetObjectiveCompleted(5,0)
 				Self.SetObjectiveDisplayed(5, True, True)
@@ -74,7 +74,7 @@ Function CheckForBuff()
 				PlayerREF.AddSpell(_00E_Ab_VagabondsBlessing_04)
 			EndIf	
 			
-			SetStage(10)
+			SetCurrentStageID(10)
 			
 		EndIf
 	EndIf
diff --git a/source/scripts/_00e_nq03_functions.psc b/source/scripts/_00e_nq03_functions.psc
index 9f61511b..49f64bb6 100644
--- a/source/scripts/_00e_nq03_functions.psc
+++ b/source/scripts/_00e_nq03_functions.psc
@@ -41,7 +41,7 @@ Function ShowMessageBox()
 
         _00E_NQ03_sRaisedSpeechcraft.Show(__Config_fSpeecCraftBonus)
 
-        SetStage(25)
+        SetCurrentStageID(25)
         if IsObjectiveDisplayed(15)
             SetObjectiveFailed(15)
         endif
@@ -51,7 +51,7 @@ Function ShowMessageBox()
             PlayerREF.RemoveItem(_00E_NQ03_TarhutiesBottle, 1)
         endif
     Else
-        SetStage(20)
+        SetCurrentStageID(20)
         SetObjectiveDisplayed(15)
         if PlayerREF.GetItemCount(_00E_NQ03_TarhutiesBottle) < 1
             PlayerREF.AddItem(_00E_NQ03_TarhutiesBottle, 1)
@@ -64,10 +64,10 @@ EndFunction
 
 Function GiveMoneyReward()
 
-    if GetStage() == 25
+    if GetCurrentStageID() == 25
         PlayerREF.AddItem(Gold001, __Config_iMoneyWhenBottleBroken)
         PlayerREF.RemoveItem(_00E_NQ03_BottleShards, 1)
-    Elseif GetStage() == 20
+    Elseif GetCurrentStageID() == 20
         PlayerREF.AddItem(Gold001, __Config_iMoneyWhenBottleIntact)
         PlayerREF.RemoveItem(_00E_NQ03_TarhutiesBottle, 1)
     EndIf
diff --git a/source/scripts/_00e_nq03_potionsc.psc b/source/scripts/_00e_nq03_potionsc.psc
index b98ff208..0012ab1f 100644
--- a/source/scripts/_00e_nq03_potionsc.psc
+++ b/source/scripts/_00e_nq03_potionsc.psc
@@ -9,9 +9,9 @@ EndEvent
 Event OnActivate(ObjectReference akActionRef)
 
     If akActionRef == Game.GetPlayer()
-        If NQ03.GetStage() == 10
+        If NQ03.GetCurrentStageID() == 10
             NQ03.SpawnAurathief()
-        ElseIf (NQ03.GetStage() == 15) || (NQ03.GetStage() == 20)
+        ElseIf (NQ03.GetCurrentStageID() == 15) || (NQ03.GetCurrentStageID() == 20)
             NQ03.ShowMessageBox()
         EndIf
     EndIf
@@ -20,7 +20,7 @@ EndEvent
 
 Event OnEquipped(Actor akActor)
 
-	If akActor == Game.GetPlayer() && NQ03.GetStage() == 20
+	If akActor == Game.GetPlayer() && NQ03.GetCurrentStageID() == 20
 		NQ03.ShowMessageBox()
 	EndIf
 
diff --git a/source/scripts/_00e_nq03_skullspheresc.psc b/source/scripts/_00e_nq03_skullspheresc.psc
index ca638c19..449ba1cb 100644
--- a/source/scripts/_00e_nq03_skullspheresc.psc
+++ b/source/scripts/_00e_nq03_skullspheresc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_NQ03_SkullSphereSC extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 	
-	If NQ03.GetStage() == 30 && !PlayerREF.IsInCombat() && !bInteracting
+	If NQ03.GetCurrentStageID() == 30 && !PlayerREF.IsInCombat() && !bInteracting
 		bInteracting = true
 		If (GameHour.GetValue() >= 20) || (GameHour.GetValue() < 5)
 			
diff --git a/source/scripts/_00e_nq05mapscript.psc b/source/scripts/_00e_nq05mapscript.psc
index e066a2e4..c67722cf 100644
--- a/source/scripts/_00e_nq05mapscript.psc
+++ b/source/scripts/_00e_nq05mapscript.psc
@@ -5,6 +5,6 @@ Quest Property NQ05Quest  Auto
 Event OnContainerChanged(ObjectReference newContainer, ObjectReference oldContainer)
 	if (newContainer == Game.GetPlayer())
 		NQ05Quest.SetObjectivedisplayed(40)
-		NQ05Quest.SetStage(40)
+		NQ05Quest.SetCurrentStageID(40)
 	endif
 EndEvent
\ No newline at end of file
diff --git a/source/scripts/_00e_nq05meadbarrelscn.psc b/source/scripts/_00e_nq05meadbarrelscn.psc
index fbb7d5e0..301c891a 100644
--- a/source/scripts/_00e_nq05meadbarrelscn.psc
+++ b/source/scripts/_00e_nq05meadbarrelscn.psc
@@ -4,7 +4,7 @@ Event OnActivate(ObjectReference akActionRef)
 
 	if (akActionRef == Game.GetPlayer())
 
-			if (NQ05.GetStage() == 10 )
+			if (NQ05.GetCurrentStageID() == 10 )
 			
 				iMessage = _00E_NQ05BarrelBox.show()
 				
@@ -17,7 +17,7 @@ Event OnActivate(ObjectReference akActionRef)
 						Utility.Wait(2.0)
 						_00E_NQ05_MeadBarrel01EssigPlaced.EnableNoWait(true)
 						Utility.Wait(1.0)
-						NQ05.SetStage(20)
+						NQ05.SetCurrentStageID(20)
 						Utility.Wait(1.0)
 						Game.EnablePlayerControls()
 					
diff --git a/source/scripts/_00e_nq05secrettrigzonescript.psc b/source/scripts/_00e_nq05secrettrigzonescript.psc
index a39ada7c..afd72b7e 100644
--- a/source/scripts/_00e_nq05secrettrigzonescript.psc
+++ b/source/scripts/_00e_nq05secrettrigzonescript.psc
@@ -4,7 +4,7 @@ Quest Property NQ05Quest  Auto
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 	If akActionRef == Game.GetPlayer()
-		NQ05Quest.SetStage(51)
+		NQ05Quest.SetCurrentStageID(51)
 	EndIf
 EndEvent
 
diff --git a/source/scripts/_00e_nq06_portyrintosc.psc b/source/scripts/_00e_nq06_portyrintosc.psc
index b64610f0..b2f881b6 100644
--- a/source/scripts/_00e_nq06_portyrintosc.psc
+++ b/source/scripts/_00e_nq06_portyrintosc.psc
@@ -7,14 +7,14 @@ Scriptname _00E_NQ06_PortYrintoSC extends ObjectReference
 ; ( http://forum.sureai.net//tracker.php?p=8&t=10365 ).
 
 Event OnTrigger(ObjectReference akActionRef)
-    if akActionRef == PlayerREF && NQ06.GetStage() >= 15
+    if akActionRef == PlayerREF && NQ06.GetCurrentStageID() >= 15
         float gh = gamehour.GetValue()
         if (gh > 22.6) || (gh < 3)
             if Yrinto.GetDistance(NQ06_YrintoMeditateREF) > 5000
                 Yrinto.MoveTo(NQ06_YrintoMeditateREF)
             endif
         endif
-        if NQ06.GetStage() > 20
+        if NQ06.GetCurrentStageID() > 20
             Delete()
         endif
     endif
diff --git a/source/scripts/_00e_nq06triggerscn.psc b/source/scripts/_00e_nq06triggerscn.psc
index 2bd9b1b5..f18c769d 100644
--- a/source/scripts/_00e_nq06triggerscn.psc
+++ b/source/scripts/_00e_nq06triggerscn.psc
@@ -2,8 +2,8 @@ Scriptname _00E_NQ06TriggerSCN extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 	if akActionRef == Game.GetPlayer()
-		if NQ06.GetStage() == 15
-			NQ06.SetStage(20)
+		if NQ06.GetCurrentStageID() == 15
+			NQ06.SetCurrentStageID(20)
 		endif
 	elseif akActionRef == Yrinto
 		YrintoTriggered = true
diff --git a/source/scripts/_00e_nq07_functions.psc b/source/scripts/_00e_nq07_functions.psc
index c647d2c9..e4575198 100644
--- a/source/scripts/_00e_nq07_functions.psc
+++ b/source/scripts/_00e_nq07_functions.psc
@@ -45,10 +45,10 @@ Function AddLetter(ObjectReference objSelfRef)
 		Self.SetObjectiveDisplayed(10, True, True)
 	EndIf
 	
-	int Stage = GetStage()
+	int Stage = GetCurrentStageID()
 	
 	If Stage <= 50
-		SetStage(Stage + 5)
+		SetCurrentStageID(Stage + 5)
 	EndIf
 	
 EndFunction
diff --git a/source/scripts/_00e_nq07_notesc.psc b/source/scripts/_00e_nq07_notesc.psc
index b7a4f472..8006672b 100644
--- a/source/scripts/_00e_nq07_notesc.psc
+++ b/source/scripts/_00e_nq07_notesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_NQ07_NoteSC extends ObjectReference
 
 Event OnRead()
 
-	if NQ07.GetStage() >= 10 && !bDone
+	if NQ07.GetCurrentStageID() >= 10 && !bDone
 		bDone = True
 		NQ07.SetObjectiveDisplayed(22)
 		NQ07_SisterKorrieREF.Enable()
diff --git a/source/scripts/_00e_nq09_casketscript.psc b/source/scripts/_00e_nq09_casketscript.psc
index 47bd12da..89546962 100644
--- a/source/scripts/_00e_nq09_casketscript.psc
+++ b/source/scripts/_00e_nq09_casketscript.psc
@@ -3,7 +3,7 @@ Scriptname _00E_NQ09_CasketScript extends ObjectReference
 
 Event OnCellAttach() ;FIRE WHEN PLAYER ENTERS THE CELL THE NEEDED ACTOR IS IN
 
-if (NQ09.GetStage() < 30)
+if (NQ09.GetCurrentStageID() < 30)
 
 	int doOnce
 	
@@ -18,11 +18,11 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if (NQ09.GetStage() <= 20)
+	if (NQ09.GetCurrentStageID() <= 20)
         _00E_NQ09_Casket_mb.show()
         int soundInstanceID = _00E_Casket_LockedSound.Play(Self)
 		;Debug.Notification(sNQ09CasketLockedMessage)
-	Elseif NQ09.GetStage() >= 27
+	Elseif NQ09.GetCurrentStageID() >= 27
 		Self.Activate(akActionRef, True)
 	EndIf
 	
@@ -38,9 +38,9 @@ Event OnActivate(ObjectReference akActionRef)
 ;                 ; current version of NQ09 anymore.
 ;	if (Self.GetBaseObject() == _00E_NQ09_Casket02)
 ;		BlockActivation(false)
-;		if (NQ09.GetStage() == 60)
+;		if (NQ09.GetCurrentStageID() == 60)
 ;			Activate(Game.GetPlayer(), true)
-;			NQ09.SetStage(65)	
+;			NQ09.SetCurrentStageID(65)	
 ;		endif
 ;	endif
 	
@@ -48,17 +48,17 @@ EndEvent
 
 Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile, bool abPowerAttack, bool abSneakAttack, bool abBashAttack, bool abHitBlocked)
 
-if (NQ09.GetStage() < 20)
+if (NQ09.GetCurrentStageID() < 20)
     _00E_NQ09_Casket_notyet_mb.Show()
 	return
 endif
 
-if (NQ09.GetStage() < 60) && NQ09.GetStage() >= 20
+if (NQ09.GetCurrentStageID() < 60) && NQ09.GetCurrentStageID() >= 20
 	
 	if (IsActivationBlocked())
 		int soundInstanceID = _00E_NQ09_RustyCasketOpenSound.Play(Self) 
 		int soundInstanceID2 = _00E_NQ09_RustyCasketOpenSealSound.Play(Self)
-		NQ09.SetStage(25)
+		NQ09.SetCurrentStageID(25)
 		NQ09.SetObjectiveCompleted(20)
 		Self.SetOpen(True)
 	
diff --git a/source/scripts/_00e_nq09_deamontrigboxscript.psc b/source/scripts/_00e_nq09_deamontrigboxscript.psc
index 3c0a0ee9..8074bd4f 100644
--- a/source/scripts/_00e_nq09_deamontrigboxscript.psc
+++ b/source/scripts/_00e_nq09_deamontrigboxscript.psc
@@ -4,14 +4,14 @@ Scriptname _00E_NQ09_DeamonTrigBoxScript extends ObjectReference
 
 Event OnTrigger(ObjectReference akActionRef)
 
-  if ( NQ09.GetStage() <= 50 )
+  if ( NQ09.GetCurrentStageID() <= 50 )
  
 		activate(self as objectReference) ; TRIGGER LINKED OBJECT
-		NQ09.SetStage(52)
+		NQ09.SetCurrentStageID(52)
   
 		_00E_NQ09_DeamonRef.MoveTo(_00E_NQ09_DeamonSpawnMarkerRef)
   
-		NQ09.SetStage(55)
+		NQ09.SetCurrentStageID(55)
 		
 	endif
 	
diff --git a/source/scripts/_00e_nq09_oldnotescript.psc b/source/scripts/_00e_nq09_oldnotescript.psc
index ca0309cb..9378681a 100644
--- a/source/scripts/_00e_nq09_oldnotescript.psc
+++ b/source/scripts/_00e_nq09_oldnotescript.psc
@@ -1,8 +1,8 @@
 Scriptname _00E_NQ09_OldNoteScript extends ObjectReference  
 
 Event OnRead()
-	if ( NQ09.GetStage() < 30 ) 
-		NQ09.SetStage(28)	
+	if ( NQ09.GetCurrentStageID() < 30 ) 
+		NQ09.SetCurrentStageID(28)	
 	endif
 EndEvent
 
diff --git a/source/scripts/_00e_nq09_tabletscript.psc b/source/scripts/_00e_nq09_tabletscript.psc
index 844891ca..18068f3a 100644
--- a/source/scripts/_00e_nq09_tabletscript.psc
+++ b/source/scripts/_00e_nq09_tabletscript.psc
@@ -6,29 +6,29 @@ Event onActivate(objectReference actronaut)
 	; Show tablet texts
 		
 		if (Self.GetBaseObject() == _00E_NQ09_Tablet01)
-			if ( NQ09.GetStage() >= 30 )
+			if ( NQ09.GetCurrentStageID() >= 30 )
 				showMessage(_00E_NQ09_Tablet01_mb)
-				NQ09.SetStage(35)
+				NQ09.SetCurrentStageID(35)
 				Return
-			ElseIf ( NQ09.GetStage() >= 35 )
+			ElseIf ( NQ09.GetCurrentStageID() >= 35 )
 				showMessage(_00E_NQ09_Tablet01_mb)
 				Return
 			endif
 		elseif (Self.GetBaseObject() == _00E_NQ09_Tablet02 )
-			if ( NQ09.GetStage() >= 35 )
+			if ( NQ09.GetCurrentStageID() >= 35 )
 				showMessage(_00E_NQ09_Tablet02_mb)
-				NQ09.SetStage(40)
+				NQ09.SetCurrentStageID(40)
 				Return
-			ElseIf ( NQ09.GetStage() >= 40 )
+			ElseIf ( NQ09.GetCurrentStageID() >= 40 )
 				showMessage(_00E_NQ09_Tablet02_mb)
 				Return
 			endif
 		elseif (Self.GetBaseObject() == _00E_NQ09_Tablet03 )
-			if ( NQ09.GetStage() >= 40 )
+			if ( NQ09.GetCurrentStageID() >= 40 )
 				showMessage(_00E_NQ09_Tablet03_mb)
-				NQ09.SetStage(45)
+				NQ09.SetCurrentStageID(45)
 				Return
-			ElseIf ( NQ09.GetStage() >= 45 )
+			ElseIf ( NQ09.GetCurrentStageID() >= 45 )
 				showMessage(_00E_NQ09_Tablet03_mb)
 				Return
 			endif
diff --git a/source/scripts/_00e_nq09container.psc b/source/scripts/_00e_nq09container.psc
index 53b1fb1d..bee6d00e 100644
--- a/source/scripts/_00e_nq09container.psc
+++ b/source/scripts/_00e_nq09container.psc
@@ -3,7 +3,7 @@ Scriptname _00E_NQ09Container extends ObjectReference
 
 Event OnItemRemoved(Form akBaseItem, int aiItemCount, ObjectReference akItemReference, ObjectReference akDestContainer)
 	if DoOnce == false
-		NQ09.SetStage(40)
+		NQ09.SetCurrentStageID(40)
 		DoOnce = true
 	endif
 EndEvent
diff --git a/source/scripts/_00e_nq10_elfrideactivator.psc b/source/scripts/_00e_nq10_elfrideactivator.psc
index 0efabddd..1a616d7b 100644
--- a/source/scripts/_00e_nq10_elfrideactivator.psc
+++ b/source/scripts/_00e_nq10_elfrideactivator.psc
@@ -12,9 +12,9 @@ Event OnActivate(ObjectReference akActionRef)
 	Utility.Wait(0.7)
 	FSTWoodRunL_Loud.Play(Self)
 
-	If NQ10_Elfride.GetStage() == 15
+	If NQ10_Elfride.GetCurrentStageID() == 15
 		If Vatyr.IsDead()
-			NQ10_Elfride.SetStage(20)
+			NQ10_Elfride.SetCurrentStageID(20)
 			Disable()
 		Else
 			_00E_NQ10_sElfriedeDoesNotTrust.Show()
diff --git a/source/scripts/_00e_nq11_laute.psc b/source/scripts/_00e_nq11_laute.psc
index 815f6c4d..32ecbefe 100644
--- a/source/scripts/_00e_nq11_laute.psc
+++ b/source/scripts/_00e_nq11_laute.psc
@@ -1,10 +1,10 @@
 Scriptname _00E_NQ11_Laute extends ObjectReference  
 
 Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer)
-	If NQ11.GetStage() < 10 && akNewContainer == Game.GetPlayer()
-		NQ11.SetStage(7)
-	ElseIf NQ11.GetStage() == 10
-		NQ11.SetStage(15)
+	If NQ11.GetCurrentStageID() < 10 && akNewContainer == Game.GetPlayer()
+		NQ11.SetCurrentStageID(7)
+	ElseIf NQ11.GetCurrentStageID() == 10
+		NQ11.SetCurrentStageID(15)
 	EndIf
 EndEvent
 
diff --git a/source/scripts/_00e_nq11book.psc b/source/scripts/_00e_nq11book.psc
index cefcf8c7..477b076b 100644
--- a/source/scripts/_00e_nq11book.psc
+++ b/source/scripts/_00e_nq11book.psc
@@ -2,11 +2,11 @@ Scriptname _00E_NQ11Book extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
     if akActionRef == Game.GetPlayer() && DoOnce == false
-        if NQ11.GetStage() == 20
-            NQ11.SetStage(25)
+        if NQ11.GetCurrentStageID() == 20
+            NQ11.SetCurrentStageID(25)
             NQ11.SetObjectiveCompleted(20)
-        Elseif NQ11.GetStage() == 25
-            NQ11.SetStage(30)
+        Elseif NQ11.GetCurrentStageID() == 25
+            NQ11.SetCurrentStageID(30)
 			NQ11.SetObjectiveCompleted(20)
             NQ11.SetObjectiveDisplayed(30)
         Endif
diff --git a/source/scripts/_00e_nq11inschrift.psc b/source/scripts/_00e_nq11inschrift.psc
index 75717851..5fc18b6b 100644
--- a/source/scripts/_00e_nq11inschrift.psc
+++ b/source/scripts/_00e_nq11inschrift.psc
@@ -3,11 +3,11 @@ Scriptname _00E_NQ11Inschrift extends ObjectReference
 Event OnActivate(ObjectReference akActionRef)
 
     if akActionRef == Game.GetPlayer() && DoOnce == false
-        if NQ11.GetStage() == 20
-            NQ11.SetStage(25)
+        if NQ11.GetCurrentStageID() == 20
+            NQ11.SetCurrentStageID(25)
             NQ11.SetObjectiveCompleted(25)
-        Elseif NQ11.GetStage() == 25
-            NQ11.SetStage(30)
+        Elseif NQ11.GetCurrentStageID() == 25
+            NQ11.SetCurrentStageID(30)
             NQ11.SetObjectiveCompleted(25)
             NQ11.SetObjectiveDisplayed(30)
         Endif
diff --git a/source/scripts/_00e_nq12_failsavesc.psc b/source/scripts/_00e_nq12_failsavesc.psc
index c5e0a65b..0d814f70 100644
--- a/source/scripts/_00e_nq12_failsavesc.psc
+++ b/source/scripts/_00e_nq12_failsavesc.psc
@@ -4,7 +4,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == PlayerREF && !bDone
 	
-		if NQ12.GetStage() >= 40
+		if NQ12.GetCurrentStageID() >= 40
 
 			bDone = True
 			
diff --git a/source/scripts/_00e_nq12_silathoughtspheresc.psc b/source/scripts/_00e_nq12_silathoughtspheresc.psc
index b5e4176b..aacbf22d 100644
--- a/source/scripts/_00e_nq12_silathoughtspheresc.psc
+++ b/source/scripts/_00e_nq12_silathoughtspheresc.psc
@@ -3,9 +3,9 @@ Scriptname _00E_NQ12_SilaThoughtSphereSC extends ObjectReference
 Event OnActivate(ObjectReference akActionRef)
 
 	if akActionRef == PlayerREF
-		if NQ12.GetStage() == 32
+		if NQ12.GetCurrentStageID() == 32
 			NQ12_SilaPaintingThoughtBox.ShowAsHelpMessage("NQ12Sila", 7, 1, 1)
-			NQ12.SetStage(35)
+			NQ12.SetCurrentStageID(35)
 		EndIf
 	EndIf
 	
diff --git a/source/scripts/_00e_nq12functions.psc b/source/scripts/_00e_nq12functions.psc
index bc0b2a3d..be22fd51 100644
--- a/source/scripts/_00e_nq12functions.psc
+++ b/source/scripts/_00e_nq12functions.psc
@@ -46,7 +46,7 @@ EndFunction
 
 Function ShowMessage()
 
-	SetStage(40)
+	SetCurrentStageID(40)
 	SetObjectiveDisplayed(40)
 	NQ12VerloreneDisableMarker.disable()
     MilbertRef.DisableNoWait()
diff --git a/source/scripts/_00e_nq12scenetrigger.psc b/source/scripts/_00e_nq12scenetrigger.psc
index 1e0c3beb..39bdbae6 100644
--- a/source/scripts/_00e_nq12scenetrigger.psc
+++ b/source/scripts/_00e_nq12scenetrigger.psc
@@ -2,8 +2,8 @@ Scriptname _00E_NQ12SceneTrigger extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 	if akActionRef == Game.GetPlayer()
-		if NQ12.GetStage() >= 15 && Game.GetPlayer().GetItemCount(_00E_NQ12_SilasKey_Bank1121) >= 1
-			NQ12.SetStage(30)
+		if NQ12.GetCurrentStageID() >= 15 && Game.GetPlayer().GetItemCount(_00E_NQ12_SilasKey_Bank1121) >= 1
+			NQ12.SetCurrentStageID(30)
 		Endif
 	Endif
 EndEvent
diff --git a/source/scripts/_00e_nq13_book.psc b/source/scripts/_00e_nq13_book.psc
index 4469ad6e..42bbe2be 100644
--- a/source/scripts/_00e_nq13_book.psc
+++ b/source/scripts/_00e_nq13_book.psc
@@ -3,12 +3,12 @@ Scriptname _00E_NQ13_Book extends ReferenceAlias
 Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer)
 
 	If DoOnce == false && akNewContainer == Game.GetPlayer()
-		If NQ13.GetStage() == 20 
-			NQ13.SetStage(25)
+		If NQ13.GetCurrentStageID() == 20 
+			NQ13.SetCurrentStageID(25)
 			NQ13.SetObjectiveCompleted(20)
 			DoOnce = true
-		ElseIf NQ13.GetStage() == 25
-			NQ13.SetStage(30)
+		ElseIf NQ13.GetCurrentStageID() == 25
+			NQ13.SetCurrentStageID(30)
 			NQ13.SetObjectiveCompleted(20)
 			DoOnce = true
 		EndIf
diff --git a/source/scripts/_00e_nq13keyscript.psc b/source/scripts/_00e_nq13keyscript.psc
index a876dc1d..811dfa25 100644
--- a/source/scripts/_00e_nq13keyscript.psc
+++ b/source/scripts/_00e_nq13keyscript.psc
@@ -2,7 +2,7 @@ Scriptname _00E_NQ13KeyScript extends ObjectReference
 
 Event OnItemRemoved(Form akBaseItem, int aiItemCount, ObjectReference akItemReference, ObjectReference akDestContainer)
 	if akDestContainer == Game.GetPlayer() && akBaseItem == _00E_NQ13NebelwachtKey
-		NQ13.SetStage(20)
+		NQ13.SetCurrentStageID(20)
 	EndIf
 endEvent
 
diff --git a/source/scripts/_00e_nq13mushroomcontainer.psc b/source/scripts/_00e_nq13mushroomcontainer.psc
index 49c0e994..bc823a9f 100644
--- a/source/scripts/_00e_nq13mushroomcontainer.psc
+++ b/source/scripts/_00e_nq13mushroomcontainer.psc
@@ -11,11 +11,11 @@ Event OnItemRemoved(Form akBaseItem, int aiItemCount, ObjectReference akItemRefe
 	
 		if CurrentCount >= 4
 			NQ13.SetObjectiveCompleted(30, 1)
-			if NQ13.GetStage() < 25
-				NQ13.SetStage(25)
+			if NQ13.GetCurrentStageID() < 25
+				NQ13.SetCurrentStageID(25)
 				DoOnce = 1
-			ElseIf NQ13.GetStage() == 25
-				NQ13.SetStage(30)
+			ElseIf NQ13.GetCurrentStageID() == 25
+				NQ13.SetCurrentStageID(30)
 				DoOnce = 1
 		endif
 			
diff --git a/source/scripts/_00e_nq13starttrigger.psc b/source/scripts/_00e_nq13starttrigger.psc
index b94efe12..27357089 100644
--- a/source/scripts/_00e_nq13starttrigger.psc
+++ b/source/scripts/_00e_nq13starttrigger.psc
@@ -3,7 +3,7 @@ Scriptname _00E_NQ13StartTrigger extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 	if akActionRef == Game.GetPlayer() && DoOnce == 0 
-		NQ13.SetStage(5)
+		NQ13.SetCurrentStageID(5)
 		DoOnce = 1
 	endif
 EndEvent
diff --git a/source/scripts/_00e_nq14_ulvarscn.psc b/source/scripts/_00e_nq14_ulvarscn.psc
index 3e39e0a5..a1dd13a0 100644
--- a/source/scripts/_00e_nq14_ulvarscn.psc
+++ b/source/scripts/_00e_nq14_ulvarscn.psc
@@ -2,26 +2,26 @@ Scriptname _00E_NQ14_UlvarSCN extends Actor
 
 Event OnDeath(Actor akKiller)
 
-	If akKiller == Game.GetPlayer() && NQ14.GetStage() == 50
-		NQ14.SetStage(55)
+	If akKiller == Game.GetPlayer() && NQ14.GetCurrentStageID() == 50
+		NQ14.SetCurrentStageID(55)
 	EndIf
 
 EndEvent
 
 Event OnDying(Actor akKiller)
 
-	If akKiller == Game.GetPlayer() && NQ14.GetStage() == 50
-		NQ14.SetStage(55)
+	If akKiller == Game.GetPlayer() && NQ14.GetCurrentStageID() == 50
+		NQ14.SetCurrentStageID(55)
 	EndIf
 
 EndEvent
 
 Event OnEnterBleedout()
 
-	If NQ14.GetStage() == 50
-		NQ14.SetStage(55)
-	ElseIf NQ14.GetStage() == 41
-		NQ14.SetStage(42)
+	If NQ14.GetCurrentStageID() == 50
+		NQ14.SetCurrentStageID(55)
+	ElseIf NQ14.GetCurrentStageID() == 41
+		NQ14.SetCurrentStageID(42)
 	EndIf
 
 EndEvent
diff --git a/source/scripts/_00e_nq15_sc05_failsafe.psc b/source/scripts/_00e_nq15_sc05_failsafe.psc
index c8b078a7..2691f72c 100644
--- a/source/scripts/_00e_nq15_sc05_failsafe.psc
+++ b/source/scripts/_00e_nq15_sc05_failsafe.psc
@@ -2,7 +2,7 @@ Scriptname _00E_NQ15_SC05_Failsafe extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if akActionRef == PlayerREF && !NQ15_SC5.IsPlaying() && NQ15.GetStage() == 210
+	if akActionRef == PlayerREF && !NQ15_SC5.IsPlaying() && NQ15.GetCurrentStageID() == 210
 		
 		NQ15_SC5.ForceStart()
 		
diff --git a/source/scripts/_00e_nq15functions.psc b/source/scripts/_00e_nq15functions.psc
index 89a2569a..277a5319 100644
--- a/source/scripts/_00e_nq15functions.psc
+++ b/source/scripts/_00e_nq15functions.psc
@@ -17,7 +17,7 @@ EndFunction
 Event OnUpdateGameTime() ; because of how we registered, this event occurs every 30 minutes of game time
 
 	if GameHour.GetValue() as float >= GameHoursAfterQuest + 1.0
-		SetStage(50)
+		SetCurrentStageID(50)
 		UnregisterForUpdateGameTime()
 	endif
 	
@@ -167,7 +167,7 @@ Function LevitateMeldor()
 	Wait(0.2)
 	Meldor.KillEssential(Meldor)
 	MeldorRef.DisableNoWait()
-	SetStage(240)
+	SetCurrentStageID(240)
 	
 	_00E_Func_AIWalk.PlayerAIWalkStop()
 	
diff --git a/source/scripts/_00e_nq15trigboxhouse.psc b/source/scripts/_00e_nq15trigboxhouse.psc
index 9f3dbfdb..51486067 100644
--- a/source/scripts/_00e_nq15trigboxhouse.psc
+++ b/source/scripts/_00e_nq15trigboxhouse.psc
@@ -2,8 +2,8 @@ Scriptname _00E_NQ15TrigBoxHouse extends ObjectReference
 
 Event OnTrigger(ObjectReference akActionRef)
 	
-	If akActionRef == Game.GetPlayer() && (akActionRef as Actor).IsInCombat() == false && NQ15.GetStage() == 140
-		NQ15.SetStage(150)
+	If akActionRef == Game.GetPlayer() && (akActionRef as Actor).IsInCombat() == false && NQ15.GetCurrentStageID() == 140
+		NQ15.SetCurrentStageID(150)
 	EndIf
 
 EndEvent
diff --git a/source/scripts/_00e_nq16ausgangscript.psc b/source/scripts/_00e_nq16ausgangscript.psc
index b67ec562..e38c43cf 100644
--- a/source/scripts/_00e_nq16ausgangscript.psc
+++ b/source/scripts/_00e_nq16ausgangscript.psc
@@ -2,19 +2,19 @@ Scriptname _00E_NQ16AusgangScript extends ObjectReference
 
 
 Event OnActivate(ObjectReference akActionRef)
-	if NQ16.GetStage() == 0 && akActionRef == Game.GetPlayer()
+	if NQ16.GetCurrentStageID() == 0 && akActionRef == Game.GetPlayer()
 		if Game.GetPlayer().GetActorBase().GetSex() == false
 			_00E_NQ16AushangMessageMale.Show()
 		Else
 			_00E_NQ16AushangMessageFemale.Show()
 		EndIf
-		NQ16.SetStage(5)
+		NQ16.SetCurrentStageID(5)
 		Disable()
 	Endif
 EndEvent
 
 Event OnUnload()
-	if NQ16.GetStage() >= 5
+	if NQ16.GetCurrentStageID() >= 5
 		Disable()
 	EndIf
 EndEvent
diff --git a/source/scripts/_00e_nq16note.psc b/source/scripts/_00e_nq16note.psc
index 9ce485fd..22baf9c2 100644
--- a/source/scripts/_00e_nq16note.psc
+++ b/source/scripts/_00e_nq16note.psc
@@ -9,7 +9,7 @@ Event OnRead()
 		Message.ResetHelpMessage("Empty")
 		_00E_NQ16Falle.ShowAsHelpMessage("Empty", 4, 1, 1)
 		Utility.Wait(8)
-		NQ16.SetStage(10)
+		NQ16.SetCurrentStageID(10)
 		DoOnce = true
 	endif
 EndEvent
diff --git a/source/scripts/_00e_nq18ausgangscript.psc b/source/scripts/_00e_nq18ausgangscript.psc
index c497b06c..68841418 100644
--- a/source/scripts/_00e_nq18ausgangscript.psc
+++ b/source/scripts/_00e_nq18ausgangscript.psc
@@ -2,15 +2,15 @@ Scriptname _00E_NQ18AusgangScript extends ObjectReference
 
 
 Event OnActivate(ObjectReference akActionRef)
-	if NQ18.GetStage() == 0 && akActionRef == Game.GetPlayer()
+	if NQ18.GetCurrentStageID() == 0 && akActionRef == Game.GetPlayer()
 		_00E_NQ18AushangMessage.Show()
-		NQ18.SetStage(5)
+		NQ18.SetCurrentStageID(5)
 		Disable()
 	Endif
 EndEvent
 
 Event OnUnload()
-	if NQ18.GetStage() >= 5
+	if NQ18.GetCurrentStageID() >= 5
 		Disable()
 	EndIf
 EndEvent
diff --git a/source/scripts/_00e_nq19_notesc.psc b/source/scripts/_00e_nq19_notesc.psc
index 35f643c6..6573315d 100644
--- a/source/scripts/_00e_nq19_notesc.psc
+++ b/source/scripts/_00e_nq19_notesc.psc
@@ -14,9 +14,9 @@ Event OnActivate(ObjectReference akActionRef)
 	
 		_00E_NQ19_ActivationMessage.Show()
 		
-		if NQ19.GetStage() < 10
+		if NQ19.GetCurrentStageID() < 10
 		
-			NQ19.SetStage(5)
+			NQ19.SetCurrentStageID(5)
 			NQ19.SetObjectiveDisplayed(5)
 			
 		endif
@@ -29,7 +29,7 @@ Event OnActivate(ObjectReference akActionRef)
 EndEvent
 
 Event OnUnload()
-	if NQ19.GetStage() >= 10
+	if NQ19.GetCurrentStageID() >= 10
 		Self.GetLinkedRef().Disable()
 		Self.Disable()
 	EndIf
diff --git a/source/scripts/_00e_nq21_notescript.psc b/source/scripts/_00e_nq21_notescript.psc
index 60a1b82a..86a4bde4 100644
--- a/source/scripts/_00e_nq21_notescript.psc
+++ b/source/scripts/_00e_nq21_notescript.psc
@@ -1,7 +1,7 @@
 Scriptname _00E_NQ21_NoteScript extends ObjectReference
 
 Event OnCellAttach()
-	If NQ21.GetStage() < 25
+	If NQ21.GetCurrentStageID() < 25
 		self.Disable()
 	Else
 		self.Enable()
diff --git a/source/scripts/_00e_nq22_pagesc.psc b/source/scripts/_00e_nq22_pagesc.psc
index 56596814..706fe7f8 100644
--- a/source/scripts/_00e_nq22_pagesc.psc
+++ b/source/scripts/_00e_nq22_pagesc.psc
@@ -19,8 +19,8 @@ Event OnActivate(ObjectReference akActionRef)
 	
 		bDone = True
 
-		if NQ22.GetStage() < 10
-			NQ22.SetStage(10)
+		if NQ22.GetCurrentStageID() < 10
+			NQ22.SetCurrentStageID(10)
 		EndIf
 		
 		Game.GetPlayer().AddItem(_00E_NQ22_DiaryPages.GetAt(iPageIndex - 1) as Book, 1)
@@ -46,7 +46,7 @@ Function UpdatePageCount()
 
 	if CurrentCount >= 7
 		NQ22.SetObjectiveCompleted(15, 1)
-		NQ22.SetStage(35)
+		NQ22.SetCurrentStageID(35)
 	ElseIf CurrentCount < 7
 		NQ22.SetObjectiveCompleted(15,0)
 		NQ22.SetObjectiveDisplayed(15, True, True)
diff --git a/source/scripts/_00e_nq23_functions.psc b/source/scripts/_00e_nq23_functions.psc
index 0118ae7e..661ba23f 100644
--- a/source/scripts/_00e_nq23_functions.psc
+++ b/source/scripts/_00e_nq23_functions.psc
@@ -36,7 +36,7 @@ EndFunction
 Function CompleteQuest()
 	Game.GetPlayer().AddItem(Gold001, 450)
 	Game.GetPlayer().AddItem(_00E_HandwerksbuchSmithingTo99,1)
-	NQ26.SetStage(5)
+	NQ26.SetCurrentStageID(5)
 	_00E_EPHandler.GiveEP(2800)
 	NQ23Target.Disable()
 EndFunction
diff --git a/source/scripts/_00e_nq23_triggerboxobjectiveupdate.psc b/source/scripts/_00e_nq23_triggerboxobjectiveupdate.psc
index 78165866..9ae677e7 100644
--- a/source/scripts/_00e_nq23_triggerboxobjectiveupdate.psc
+++ b/source/scripts/_00e_nq23_triggerboxobjectiveupdate.psc
@@ -2,7 +2,7 @@ Scriptname _00E_NQ23_TriggerboxObjectiveUpdate extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if (NQ23.GetStage() == 20 || NQ23.GetStage() == 21) && _bDoOnce == false && akActionRef == PlayerREF && NQ23.IsObjectiveDisplayed(_iDisplayedObjective)
+	if (NQ23.GetCurrentStageID() == 20 || NQ23.GetCurrentStageID() == 21) && _bDoOnce == false && akActionRef == PlayerREF && NQ23.IsObjectiveDisplayed(_iDisplayedObjective)
 		NQ23.SetObjectiveCompleted(_iDisplayedObjective, true)
 		NQ23.SetObjectiveDisplayed(_iObjectiveToActivate, true)
 		_bDoOnce = true
diff --git a/source/scripts/_00e_nq23_triggerboxpahtirafailsafe.psc b/source/scripts/_00e_nq23_triggerboxpahtirafailsafe.psc
index 7082fc92..37ff5a2f 100644
--- a/source/scripts/_00e_nq23_triggerboxpahtirafailsafe.psc
+++ b/source/scripts/_00e_nq23_triggerboxpahtirafailsafe.psc
@@ -2,7 +2,7 @@ Scriptname _00E_NQ23_TriggerboxPahtiraFailsafe extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if NQ23.GetStage() == 50 && !DoOnce && akActionRef == PlayerREF && !(MuldirRef.GetParentCell() == PlayerREF.GetParentCell())
+	if NQ23.GetCurrentStageID() == 50 && !DoOnce && akActionRef == PlayerREF && !(MuldirRef.GetParentCell() == PlayerREF.GetParentCell())
 		MuldirRef.MoveTo(NQ23PortMarker)
 		MuldirRef.EvaluatePackage()
 		DoOnce = true
diff --git a/source/scripts/_00e_nq23cagedoor.psc b/source/scripts/_00e_nq23cagedoor.psc
index 3fcb5acb..4cc8d8f2 100644
--- a/source/scripts/_00e_nq23cagedoor.psc
+++ b/source/scripts/_00e_nq23cagedoor.psc
@@ -4,7 +4,7 @@ Scriptname _00E_NQ23CageDoor extends ObjectReference
 
 Event OnActivate(ObjectReference akActionRef)
 	if akActionRef == Game.GetPlayer() && Game.GetPlayer().GetItemCount(FelsenhammerGefaengnisschluessel) >= 1
-		NQ23.SetStage(30)
+		NQ23.SetCurrentStageID(30)
 		MuldirRef.AddToFaction(PlayerFaction)
 	EndIf
 	
diff --git a/source/scripts/_00e_nq24_leveledlistcheck.psc b/source/scripts/_00e_nq24_leveledlistcheck.psc
index 1ab6cbde..dfd969d5 100644
--- a/source/scripts/_00e_nq24_leveledlistcheck.psc
+++ b/source/scripts/_00e_nq24_leveledlistcheck.psc
@@ -30,7 +30,7 @@ Event OnTriggerEnter (ObjectReference akActionRef)
 		EndIf
 
 		;just for FS_NQ07
-		If _00E_FS_NQ07_DoorOwned.GetValueInt() == 0 && FS_NQ07.GetStage() >= 115
+		If _00E_FS_NQ07_DoorOwned.GetValueInt() == 0 && FS_NQ07.GetCurrentStageID() >= 115
 			_00E_FS_NQ07_LeveledListDoor.AddForm(_00E_FS_NQ07_MiscDoor, 1, 1)
 			VendorItemsBanker.AddForm(_00E_FS_NQ07_VendorNoSale)
 		ElseIf _00E_FS_NQ07_DoorOwned.GetValueInt() == 1
diff --git a/source/scripts/_00e_nq26_leverscn.psc b/source/scripts/_00e_nq26_leverscn.psc
index 2e4885ce..1e8dd736 100644
--- a/source/scripts/_00e_nq26_leverscn.psc
+++ b/source/scripts/_00e_nq26_leverscn.psc
@@ -3,7 +3,7 @@ scriptName _00E_NQ26_LeverSCN extends ObjectReference
 
 EVENT onActivate(ObjectReference akActionRef)
 
-	If NQ26.GetStage() == 40 && Game.GetPlayer().IsInCombat() == False && DoOnce == False
+	If NQ26.GetCurrentStageID() == 40 && Game.GetPlayer().IsInCombat() == False && DoOnce == False
 		DoOnce = True
 
 		BlockActivation(True)
@@ -13,7 +13,7 @@ EVENT onActivate(ObjectReference akActionRef)
 		NQ26.UpdateCurrentInstanceGlobal(_00E_NQ26_LeversGlobal)
 
 		If _00E_NQ26_LeversGlobal.GetValue() >= 4
-			NQ26.SetStage(50)
+			NQ26.SetCurrentStageID(50)
 		Else
 			NQ26.SetObjectiveDisplayed(20, true, true)
 		EndIf
diff --git a/source/scripts/_00e_nq26_pahtirafailsavebox.psc b/source/scripts/_00e_nq26_pahtirafailsavebox.psc
index f7c1623a..dee5847f 100644
--- a/source/scripts/_00e_nq26_pahtirafailsavebox.psc
+++ b/source/scripts/_00e_nq26_pahtirafailsavebox.psc
@@ -4,7 +4,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	If akActionRef == PlayerREF && (MuldirRef.GetParentCell() != ArkSternlingshaus) && !bDone
 		
-		if NQ23.GetStage() >= 50 && NQ26.GetStage() < 20
+		if NQ23.GetCurrentStageID() >= 50 && NQ26.GetCurrentStageID() < 20
 			
 			bDone = True
 			MuldirRef.MoveTo(PlayerREF)
diff --git a/source/scripts/_00e_nq26_pathiraportfailsavesc.psc b/source/scripts/_00e_nq26_pathiraportfailsavesc.psc
index c5d84a95..02ba58e7 100644
--- a/source/scripts/_00e_nq26_pathiraportfailsavesc.psc
+++ b/source/scripts/_00e_nq26_pathiraportfailsavesc.psc
@@ -12,10 +12,10 @@ EndEvent
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	If !bDone
-		If akActionRef == PlayerREF && (NQ26.GetStage() >= 20 && NQ26.GetStage() < 35)
+		If akActionRef == PlayerREF && (NQ26.GetCurrentStageID() >= 20 && NQ26.GetCurrentStageID() < 35)
 			bDone = True
 			RegisterForSingleUpdate(3)
-			NQ26.SetStage(35)
+			NQ26.SetCurrentStageID(35)
 			NQ26_SC2.Stop()
 			NQ26_SC2.ForceStart()
 		EndIf
@@ -24,7 +24,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 EndEvent
 
 Event OnLoad()
-	Int qStage = NQ26.GetStage()
+	Int qStage = NQ26.GetCurrentStageID()
 	If qStage >= 30 && qStage < 50
 		(NQ26 as _00E_NQ26_Questfunctions).StartNQ26Explosion()
 	EndIf
diff --git a/source/scripts/_00e_nq26_pathirastuckscenefailsavesc.psc b/source/scripts/_00e_nq26_pathirastuckscenefailsavesc.psc
index 711f2fb5..72f2bdf4 100644
--- a/source/scripts/_00e_nq26_pathirastuckscenefailsavesc.psc
+++ b/source/scripts/_00e_nq26_pathirastuckscenefailsavesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_NQ26_PathiraStuckSceneFailsaveSC extends ReferenceAlias
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if akActionRef == PlayerREF && NQ26.GetStage() >= 30 && NQ26.GetStage() <= 35 && !bDone
+	if akActionRef == PlayerREF && NQ26.GetCurrentStageID() >= 30 && NQ26.GetCurrentStageID() <= 35 && !bDone
 	
 		bDone = True
 		If !NQ26_SC2.IsPlaying()
diff --git a/source/scripts/_00e_nq26_playeraliasscript.psc b/source/scripts/_00e_nq26_playeraliasscript.psc
index 8233a385..1cb0f4bc 100644
--- a/source/scripts/_00e_nq26_playeraliasscript.psc
+++ b/source/scripts/_00e_nq26_playeraliasscript.psc
@@ -4,7 +4,7 @@ Auto State TrackingLoads
 
 	Event OnPlayerLoadGame()
 		_00E_NQ26_Questfunctions qScript = (GetOwningQuest() as _00E_NQ26_Questfunctions)
-		Int qStage = qScript.GetStage()
+		Int qStage = qScript.GetCurrentStageID()
 		If qStage >= 50
 			GoToState("DoNothing")
 		ElseIf qStage >= 30 && GetRef().GetParentCell() == AgnodLevel00Generator
diff --git a/source/scripts/_00e_nq29_ashwidowsc.psc b/source/scripts/_00e_nq29_ashwidowsc.psc
index 095f5d9e..6ca25988 100644
--- a/source/scripts/_00e_nq29_ashwidowsc.psc
+++ b/source/scripts/_00e_nq29_ashwidowsc.psc
@@ -24,7 +24,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 		If PlayerREF.GetItemCount(_00E_NQ29_Boss_AshWidowClaw) >= 1
 
 			if !NQ29.IsRunning()
-				NQ29.SetStage(5)
+				NQ29.SetCurrentStageID(5)
 			EndIf
 
 			NQ29.AshWidowSetWeather()
diff --git a/source/scripts/_00e_nq29_boss_ashwidowsc.psc b/source/scripts/_00e_nq29_boss_ashwidowsc.psc
index 10f2f55a..9ccf6b0b 100644
--- a/source/scripts/_00e_nq29_boss_ashwidowsc.psc
+++ b/source/scripts/_00e_nq29_boss_ashwidowsc.psc
@@ -18,7 +18,7 @@ Event OnDeath(Actor akKiller)
 	NQ29.AshWidowReleaseWeather()
 	
 	if !NQ29.IsRunning()
-		NQ29.SetStage(5)
+		NQ29.SetCurrentStageID(5)
 	EndIf
 	
 	NQ29.SetObjectiveDisplayed(15)
@@ -30,7 +30,7 @@ Event OnDeath(Actor akKiller)
 
 	if CurrentCount >= NQ29_MythicalCreaturesMax.GetValueInt()
 		NQ29.SetObjectiveCompleted(0, 1)
-		NQ29.SetStage(10)
+		NQ29.SetCurrentStageID(10)
 	Else
 		NQ29.SetObjectiveCompleted(0,0)
 		NQ29.SetObjectiveDisplayed(0, True, True)
diff --git a/source/scripts/_00e_nq29_boss_blindminersc.psc b/source/scripts/_00e_nq29_boss_blindminersc.psc
index b7497eef..9d02cfc1 100644
--- a/source/scripts/_00e_nq29_boss_blindminersc.psc
+++ b/source/scripts/_00e_nq29_boss_blindminersc.psc
@@ -36,7 +36,7 @@ EndEvent
 Event OnDeath(Actor akKiller)
 
 	if !NQ29.IsRunning()
-		NQ29.SetStage(5)
+		NQ29.SetCurrentStageID(5)
 	Endif
 	
 	NQ29.SetObjectiveDisplayed(5)
@@ -49,7 +49,7 @@ Event OnDeath(Actor akKiller)
 
 	if CurrentCount >= NQ29_MythicalCreaturesMax.GetValueInt()
 		NQ29.SetObjectiveCompleted(0, 1)
-		NQ29.SetStage(10)
+		NQ29.SetCurrentStageID(10)
 	Else
 		NQ29.SetObjectiveCompleted(0,0)
 		NQ29.SetObjectiveDisplayed(0, True, True)
diff --git a/source/scripts/_00e_nq29_boss_werewolf_sc.psc b/source/scripts/_00e_nq29_boss_werewolf_sc.psc
index beb0194b..d32743ef 100644
--- a/source/scripts/_00e_nq29_boss_werewolf_sc.psc
+++ b/source/scripts/_00e_nq29_boss_werewolf_sc.psc
@@ -25,7 +25,7 @@ EndEvent
 Event OnDeath(Actor akKiller)
 
 	if !NQ29.IsRunning()
-		NQ29.SetStage(5)
+		NQ29.SetCurrentStageID(5)
 	EndIf
 	
 	NQ29.SetObjectiveDisplayed(__Config_iObjectiveIndex)
@@ -37,7 +37,7 @@ Event OnDeath(Actor akKiller)
 
 	if CurrentCount >= NQ29_MythicalCreaturesMax.GetValueInt()
 		NQ29.SetObjectiveCompleted(0, 1)
-		NQ29.SetStage(10)
+		NQ29.SetCurrentStageID(10)
 	Else
 		NQ29.SetObjectiveCompleted(0,0)
 		NQ29.SetObjectiveDisplayed(0, True, True)
diff --git a/source/scripts/_00e_nq29_bosssteelwatchersc.psc b/source/scripts/_00e_nq29_bosssteelwatchersc.psc
index 46073f83..373d0e2b 100644
--- a/source/scripts/_00e_nq29_bosssteelwatchersc.psc
+++ b/source/scripts/_00e_nq29_bosssteelwatchersc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_NQ29_BossSteelWatcherSC extends ObjectReference
 Event OnDeath(Actor akKiller)
 
 	if !NQ29.IsRunning()
-		NQ29.SetStage(5)
+		NQ29.SetCurrentStageID(5)
 	EndIf
 	
 	NQ29.SetObjectiveDisplayed(__Config_iObjectiveIndex)
@@ -15,7 +15,7 @@ Event OnDeath(Actor akKiller)
 
 	if CurrentCount >= NQ29_MythicalCreaturesMax.GetValueInt()
 		NQ29.SetObjectiveCompleted(0, 1)
-		NQ29.SetStage(10)
+		NQ29.SetCurrentStageID(10)
 	Else
 		NQ29.SetObjectiveCompleted(0,0)
 		NQ29.SetObjectiveDisplayed(0, True, True)
diff --git a/source/scripts/_00e_nq32_startboxsc.psc b/source/scripts/_00e_nq32_startboxsc.psc
index 70f66715..d3f99149 100644
--- a/source/scripts/_00e_nq32_startboxsc.psc
+++ b/source/scripts/_00e_nq32_startboxsc.psc
@@ -4,9 +4,9 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if !bDone
 	
-		if akActionRef == PlayerREF && NQ32.GetStage() < 5
+		if akActionRef == PlayerREF && NQ32.GetCurrentStageID() < 5
 			bDone = True
-			NQ32.SetStage(5)
+			NQ32.SetCurrentStageID(5)
 		EndIf
 		
 	EndIf
diff --git a/source/scripts/_00e_nq33_functions.psc b/source/scripts/_00e_nq33_functions.psc
index e6f16d37..8663d5bd 100644
--- a/source/scripts/_00e_nq33_functions.psc
+++ b/source/scripts/_00e_nq33_functions.psc
@@ -10,7 +10,7 @@ Event OnUpdateGameTime()
 	CapitalCityUajaanVuulGlobal.SetValueInt(2)
 	FXReadScrollsImod.Apply()
 	MAGRestorationConcentrationFire2D.Play(PlayerREF)
-	SetStage(5)
+	SetCurrentStageID(5)
 
 EndEvent
 
diff --git a/source/scripts/_00e_nq34_book.psc b/source/scripts/_00e_nq34_book.psc
index 6eb4cb83..b9574ec7 100644
--- a/source/scripts/_00e_nq34_book.psc
+++ b/source/scripts/_00e_nq34_book.psc
@@ -2,7 +2,7 @@ Scriptname _00E_NQ34_Book extends ObjectReference
 
 Event OnContainerChanged(ObjectReference akNewContainer, OBjectReference akOldContainer)
 
-	if akNewContainer == PlayerREF && NQ34.GetStage() == 10 && !Done && !(NQ34.IsObjectiveDisplayed(2))
+	if akNewContainer == PlayerREF && NQ34.GetCurrentStageID() == 10 && !Done && !(NQ34.IsObjectiveDisplayed(2))
 		NQ34.SetObjectiveCompleted(1)
 		NQ34.SetObjectiveDisplayed(2)
 		Done = True
diff --git a/source/scripts/_00e_nq34_failsavesc.psc b/source/scripts/_00e_nq34_failsavesc.psc
index cd8e9db8..212c4d36 100644
--- a/source/scripts/_00e_nq34_failsavesc.psc
+++ b/source/scripts/_00e_nq34_failsavesc.psc
@@ -6,7 +6,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 		NQ34_PlayerInQuestVolume.SetValueInt(1)
 		
-		if NQ34.IsRunning() && NQ34.GetStage() == 20
+		if NQ34.IsRunning() && NQ34.GetCurrentStageID() == 20
 		
 			NQ34.Stop()
 			
@@ -22,7 +22,7 @@ Event OnTriggerLeave(ObjectReference akActionRef)
 
 		NQ34_PlayerInQuestVolume.SetValueInt(0)
 		
-		if NQ34.IsRunning() && NQ34.GetStage() < 15 && !bDone
+		if NQ34.IsRunning() && NQ34.GetCurrentStageID() < 15 && !bDone
 		
 			bDone = True
 			
@@ -30,7 +30,7 @@ Event OnTriggerLeave(ObjectReference akActionRef)
 				NQ34_SC01_ExamineCorpse.Stop()
 			EndIf
 		
-			NQ34.SetStage(15)
+			NQ34.SetCurrentStageID(15)
 			
 		EndIf
 
diff --git a/source/scripts/_00e_nq34_startsc.psc b/source/scripts/_00e_nq34_startsc.psc
index 5e2d7cb7..6bf3dfba 100644
--- a/source/scripts/_00e_nq34_startsc.psc
+++ b/source/scripts/_00e_nq34_startsc.psc
@@ -1,7 +1,7 @@
 Scriptname _00E_NQ34_StartSC extends ObjectReference
 
 Event OnCellLoad()
-	If MQ11a.GetStage() >= 45 && MQ11a.GetStage() <= 55 && NQ34.IsRunning() == False && NQ34.GetStage() < 20 && !bDone
+	If MQ11a.GetCurrentStageID() >= 45 && MQ11a.GetCurrentStageID() <= 55 && NQ34.IsRunning() == False && NQ34.GetCurrentStageID() < 20 && !bDone
 		TryStartQuest()
 	EndIf
 EndEvent
@@ -35,7 +35,7 @@ Function TryStartQuest()
             NQ34_WildMageREF.Resurrect()
         endif
 
-		NQ34.Start();SetStage(5)
+		NQ34.Start();SetCurrentStageID(5)
 	Else
 		; Try again a bit later
 		If distance <= (triggerDistance + 1024.0)
diff --git a/source/scripts/_00e_nq36_functions.psc b/source/scripts/_00e_nq36_functions.psc
index 76b82c01..bf1d2bb3 100644
--- a/source/scripts/_00e_nq36_functions.psc
+++ b/source/scripts/_00e_nq36_functions.psc
@@ -11,13 +11,13 @@ Function CheckForWishingWells()
 	
 	int CurrentCount = NQ36_WishWellsCompleted.GetValueInt()
 
-	if Self.GetStage() < 5
-		SetStage(10)
+	if Self.GetCurrentStageID() < 5
+		SetCurrentStageID(10)
 	EndIf
 	
 	if CurrentCount >= 4
 		Self.SetObjectiveCompleted(5, 1)
-		SetStage(10)
+		SetCurrentStageID(10)
 	ElseIf CurrentCount < 4
 		_00E_EPHandler.GiveEP(250)
 		Self.SetObjectiveCompleted(5,0)
diff --git a/source/scripts/_00e_nq_bounty01_boardscript.psc b/source/scripts/_00e_nq_bounty01_boardscript.psc
index 0a8262b2..399d4dd2 100644
--- a/source/scripts/_00e_nq_bounty01_boardscript.psc
+++ b/source/scripts/_00e_nq_bounty01_boardscript.psc
@@ -38,7 +38,7 @@ Event OnActivate (ObjectReference akActionRef)
             BountyScript.GiveGold(BountyScript.__Config_MissionRewards[iQuestDone]) ;Give Player the Gold
         
             iStage += 5                                                     ;Up QuestStage +5
-            NQ_Bounty01.SetStage(iStage)
+            NQ_Bounty01.SetCurrentStageID(iStage)
             iQuestDone += 1
             If ( iQuestDone == iAvailableQuests )
                 BountyScript._00E_NQ_Bounty01_Status = 10
@@ -130,7 +130,7 @@ Function M_two (Message chosenMessage2)                                     ;ACC
         endif
         
         iStage += 10														;Up QuestStage +10
-		NQ_Bounty01.SetStage(iStage)
+		NQ_Bounty01.SetCurrentStageID(iStage)
         NQ_Bounty01.SetObjectiveDisplayed(iStage)
         BountyScript._00E_NQ_Bounty01_Status = 1                            ;Bounty quest active
         GotoState("")
diff --git a/source/scripts/_00e_nq_bounty01_targetscript.psc b/source/scripts/_00e_nq_bounty01_targetscript.psc
index 531e87a7..8c917790 100644
--- a/source/scripts/_00e_nq_bounty01_targetscript.psc
+++ b/source/scripts/_00e_nq_bounty01_targetscript.psc
@@ -10,7 +10,7 @@ Scriptname _00E_NQ_Bounty01_TargetScript extends ReferenceAlias
 ; ====================================================================================	
 
 Event OnCellAttach() ;FIRE WHEN PLAYER ENTERS THE CELL THE NEEDED ACTOR IS IN
-	If NQ_Bounty01.GetStage() == __Config_iEnableAtStage && GetReference().IsDisabled()
+	If NQ_Bounty01.GetCurrentStageID() == __Config_iEnableAtStage && GetReference().IsDisabled()
 		GetReference().Enable() ; Enable the bandit when he is needed in the quest
 	Endif
 EndEvent
@@ -23,7 +23,7 @@ Event OnDeath(Actor akKiller)
     NQ_Bounty01.SetObjectiveCompleted(iStage)		;MissionObjective: Kill the bandit - Done
 
     iStage += 5
-    NQ_Bounty01.SetStage(iStage)					;MissionObjective: Take your bounty - New
+    NQ_Bounty01.SetCurrentStageID(iStage)					;MissionObjective: Take your bounty - New
     NQ_Bounty01.SetObjectiveDisplayed(iStage)		;Show Objective
     BountyScript._00E_NQ_Bounty01_Status = 2		;Unlock bounty board to receive your gold
 EndEvent
diff --git a/source/scripts/_00e_nq_g_01_functions.psc b/source/scripts/_00e_nq_g_01_functions.psc
index ee081b96..b5b2d1ca 100644
--- a/source/scripts/_00e_nq_g_01_functions.psc
+++ b/source/scripts/_00e_nq_g_01_functions.psc
@@ -30,7 +30,7 @@ Function FinishQuest()
 		_00E_EPHandler.GiveEP(__Config_RewardEXP + __Config_BonusEXP)
 	EndIf
 	
-	NQ_G_02.SetStage(5)
+	NQ_G_02.SetCurrentStageID(5)
 		
 	Self.CompleteQuest()
 
diff --git a/source/scripts/_00e_nq_g_02_displaymushroomobjective.psc b/source/scripts/_00e_nq_g_02_displaymushroomobjective.psc
index a1c9697c..6fd85c60 100644
--- a/source/scripts/_00e_nq_g_02_displaymushroomobjective.psc
+++ b/source/scripts/_00e_nq_g_02_displaymushroomobjective.psc
@@ -5,7 +5,7 @@ Scriptname _00E_NQ_G_02_DisplayMushroomObjective extends ObjectReference
 ;=====================================================================================
 Event OnTriggerEnter (ObjectReference akActionREF)
 
-	if ((akActionRef == PlayerREF) && (bDone == False)) && ((NQ_G_02.GetStage() == 20 || NQ_G_02.GetStage() == 30))
+	if ((akActionRef == PlayerREF) && (bDone == False)) && ((NQ_G_02.GetCurrentStageID() == 20 || NQ_G_02.GetCurrentStageID() == 30))
 		NQ_G_02.SetObjectiveDisplayed(21)
 		_00E_TeleportGlobal.SetValueInt(1)
 		bDone = True
diff --git a/source/scripts/_00e_nq_g_02_functions.psc b/source/scripts/_00e_nq_g_02_functions.psc
index 9aaab7f5..6afc6bb6 100644
--- a/source/scripts/_00e_nq_g_02_functions.psc
+++ b/source/scripts/_00e_nq_g_02_functions.psc
@@ -75,9 +75,9 @@ Function FadeOut()
 		Wait(2)
 		FadeToBlackHoldIMOD.ApplyCrossFade(1)
 			
-		If (GetStage() == 35 || GetStage() == 40)
+		If (GetCurrentStageID() == 35 || GetCurrentStageID() == 40)
 			SetUpSC03()
-		ElseIf (GetStage() == 45)
+		ElseIf (GetCurrentStageID() == 45)
 			SetUpSC04()
 		EndIf
 		
@@ -121,7 +121,7 @@ EndFunction
 
 Function FinishQuest()
 
-	If (GetStage() == 80)
+	If (GetCurrentStageID() == 80)
 		_00E_EPHandler.GiveEP(__Config_RewardEXP - __Config_EXPMalus)
 	Else
 		_00E_EPHandler.GiveEP(__Config_RewardEXP)
diff --git a/source/scripts/_00e_nq_g_02_mushroomonhit.psc b/source/scripts/_00e_nq_g_02_mushroomonhit.psc
index 68fd60c3..4963fbca 100644
--- a/source/scripts/_00e_nq_g_02_mushroomonhit.psc
+++ b/source/scripts/_00e_nq_g_02_mushroomonhit.psc
@@ -5,7 +5,7 @@ Scriptname _00E_NQ_G_02_MushroomOnHit extends ObjectReference
 ;=====================================================================================
 Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile, bool abPowerAttack, bool abSneakAttack, bool abBashAttack, bool abHitBlocked)
 
-	If (akAggressor == PlayerREF) && ((NQ_G_02.GetStage() == 20 || NQ_G_02.GetStage() == 30)) && (bDone == False)
+	If (akAggressor == PlayerREF) && ((NQ_G_02.GetCurrentStageID() == 20 || NQ_G_02.GetCurrentStageID() == 30)) && (bDone == False)
 		bDone = True
 		NQ_G_02.SetObjectiveCompleted(21)
 		NQ_G_02.StartSC02()
diff --git a/source/scripts/_00e_nq_g_02_trapdoorstartscene.psc b/source/scripts/_00e_nq_g_02_trapdoorstartscene.psc
index c0ec4977..5de71e9b 100644
--- a/source/scripts/_00e_nq_g_02_trapdoorstartscene.psc
+++ b/source/scripts/_00e_nq_g_02_trapdoorstartscene.psc
@@ -11,9 +11,9 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-	If (NQ_G_02.GetStage() <= 45) && (NQ_G_02.GetStage() >= 35) && (akActionRef == PlayerREF)
+	If (NQ_G_02.GetCurrentStageID() <= 45) && (NQ_G_02.GetCurrentStageID() >= 35) && (akActionRef == PlayerREF)
 		NQ_G_02.FadeOut()
-	ElseIf (NQ_G_02.GetStage() > 45)
+	ElseIf (NQ_G_02.GetCurrentStageID() > 45)
 		Self.Activate(Game.GetPlayer(), true)
 	Endif
 
diff --git a/source/scripts/_00e_nq_g_03_functions.psc b/source/scripts/_00e_nq_g_03_functions.psc
index 02011321..2348ebaa 100644
--- a/source/scripts/_00e_nq_g_03_functions.psc
+++ b/source/scripts/_00e_nq_g_03_functions.psc
@@ -116,7 +116,7 @@ EndFunction
 
 Function StopFight()
 
-	SetStage(20)
+	SetCurrentStageID(20)
 	_00E_NQ_G_03_DevraREF001.SetActorValue("Aggression", 0)
 	_00E_NQ_G_03_AlyxREF001.SetActorValue("Aggression", 0)
 	_00E_NQ_G_03_DevraREF001.StopCombat()
diff --git a/source/scripts/_00e_nq_g_03_petrifiedcombatsc.psc b/source/scripts/_00e_nq_g_03_petrifiedcombatsc.psc
index df42dc9c..2d4e77b6 100644
--- a/source/scripts/_00e_nq_g_03_petrifiedcombatsc.psc
+++ b/source/scripts/_00e_nq_g_03_petrifiedcombatsc.psc
@@ -7,7 +7,7 @@ Event OnInit()
 
 	akSelf = Self.GetActorReference()
 	
-	If NQ_G_03.GetStage() == 15
+	If NQ_G_03.GetCurrentStageID() == 15
 		akSelf.SetGhost(false)
 		akSelf.SetActorValue("Aggression", 2)
 	EndIf
@@ -16,7 +16,7 @@ EndEvent
 
 Event OnEnterBleedout()
 
-	If NQ_G_03.GetStage() < 20
+	If NQ_G_03.GetCurrentStageID() < 20
 		SpawnProtectiveBarrier()
 	EndIf
 	
@@ -24,7 +24,7 @@ EndEvent
 
 Event OnUpdate()
 
-	if !akSelf.IsBleedingOut() || NQ_G_03.GetStage() >= 20
+	if !akSelf.IsBleedingOut() || NQ_G_03.GetCurrentStageID() >= 20
 		StopProtectiveBarrier()
 	Else
 		RegisterForSingleUpdate(1)
@@ -81,7 +81,7 @@ Function StopProtectiveBarrier()
 	akSelf.RestoreActorValue("Health", (akSelf.GetBaseActorValue("Health")*__Config_fHealthPercentage))
 	MAGRestorationFFFire.Play(akSelf)
 	
-	If (NQ_G_03.GetStage() == 15)
+	If (NQ_G_03.GetCurrentStageID() == 15)
 		akSelf.StartCombat(Game.GetPlayer())
 	Endif
 	
diff --git a/source/scripts/_00e_nq_g_05_functions.psc b/source/scripts/_00e_nq_g_05_functions.psc
index a4bf5124..b1b4d65d 100644
--- a/source/scripts/_00e_nq_g_05_functions.psc
+++ b/source/scripts/_00e_nq_g_05_functions.psc
@@ -79,7 +79,7 @@ Function UpdatePlantCounter(int iType, int iAmount)
 	EndIf
 	
 	If Self.IsObjectiveCompleted(10) && Self.IsObjectiveCompleted(15) && Self.IsObjectiveCompleted(20)
-		Self.SetStage(30)
+		Self.SetCurrentStageID(30)
 		If !bDoneAutosave
 			Game.RequestAutoSave()
 			bDoneAutoSave = true
@@ -116,7 +116,7 @@ EndFunction
 Function DumpDijaam()
 
 	If !CQ_D_01.IsCompleted()
-		CQ_D_01.SetStage(20)
+		CQ_D_01.SetCurrentStageID(20)
 	EndIf
 
 	_00E_SC_DijaamOnelys.MoveTo(_00E_NPCDumpMarker)
@@ -220,7 +220,7 @@ Function FinishQuest()
 	_00E_PlayerFunctions.GetSoundControl().RemoveSilence()
 	AllowIdleChatter.SetValue(1)
 	Self.CompleteQuest()
-	NQ_G_06.SetStage(5)
+	NQ_G_06.SetCurrentStageID(5)
 
 EndFunction
 
diff --git a/source/scripts/_00e_nq_g_06_debugbox.psc b/source/scripts/_00e_nq_g_06_debugbox.psc
index 6c301f2e..e0b7ce20 100644
--- a/source/scripts/_00e_nq_g_06_debugbox.psc
+++ b/source/scripts/_00e_nq_g_06_debugbox.psc
@@ -2,7 +2,7 @@ Scriptname _00E_NQ_G_06_DebugBox extends ObjectReference
 
 
 Event OnTriggerEnter(ObjectReference akactionref)
-	if NQ_G_06.GetStage() == 10 && DoOnce == false && akactionref == game.getplayer()
+	if NQ_G_06.GetCurrentStageID() == 10 && DoOnce == false && akactionref == game.getplayer()
 		_00E_SC_DijaamOnelys.MoveTo(NQ_G_06PortMarker)
 		
 		if NQ_G_06_SC02_DijaamTalkAtTavern.IsPlaying() == false
diff --git a/source/scripts/_00e_nq_g_06_functions.psc b/source/scripts/_00e_nq_g_06_functions.psc
index c5e2460b..f59759ca 100644
--- a/source/scripts/_00e_nq_g_06_functions.psc
+++ b/source/scripts/_00e_nq_g_06_functions.psc
@@ -13,7 +13,7 @@ EndFunction
 
 Function PlaceMessenger()
 
-	If !bMessengerSpawned && (MQ12b.IsCompleted() || MQ12b.GetStage() < 5) && MQ14.GetStage() <= 15
+	If !bMessengerSpawned && (MQ12b.IsCompleted() || MQ12b.GetCurrentStageID() < 5) && MQ14.GetCurrentStageID() <= 15
 
 		If (PlayerREF.GetCurrentLocation() == CapitalCityLocation) || (PlayerREF.GetCurrentLocation() == _00E_SuntempleLocation)
 		
@@ -141,13 +141,13 @@ Function DespawnMages()
 	if !_00E_NQ_G_06_MercenaryKilean_MageREF.IsDisabled()
 		_00E_NQ_G_06_MercenaryKilean_MageREF.Disable()
 		if PlayerREF.GetItemCount(_00E_NQ_G_06_Contract) > 0
-			SetStage(45)
+			SetCurrentStageID(45)
 		Else
-			SetStage(40)
+			SetCurrentStageID(40)
 		EndIf
 	ElseIf !_00E_NQ_G_06_MercenaryEnderalean_MageREF.IsDisabled()
 		_00E_NQ_G_06_MercenaryEnderalean_MageREF.Disable()
-		SetStage(35)
+		SetCurrentStageID(35)
 	EndIf
 
 EndFunction 
@@ -238,9 +238,9 @@ Function FinishQuest()
 	_00E_EPHandler.GiveEP(__Config_RewardEXP)
 	
 	if _00E_NQ_G_SidedMael.GetValueInt() == 1
-		NQ_G_07Mael.SetStage(5)
+		NQ_G_07Mael.SetCurrentStageID(5)
 	Else
-		NQ_G_07Dijaam.SetStage(5)
+		NQ_G_07Dijaam.SetCurrentStageID(5)
 	EndIf
 	
 EndFunction
diff --git a/source/scripts/_00e_nq_g_06_playerlocationchanged.psc b/source/scripts/_00e_nq_g_06_playerlocationchanged.psc
index 7a6ff8c4..7ad0a02b 100644
--- a/source/scripts/_00e_nq_g_06_playerlocationchanged.psc
+++ b/source/scripts/_00e_nq_g_06_playerlocationchanged.psc
@@ -2,7 +2,7 @@ Scriptname _00E_NQ_G_06_PlayerLocationChanged extends ReferenceAlias
 
 Event OnLocationChange(Location akOldLoc, Location akNewLoc)
 	
-	If NQ_G_06.GetStage() == 5
+	If NQ_G_06.GetCurrentStageID() == 5
 
 		If NQG06_ReadyToSpawn == NONE
 			NQG06_ReadyToSpawn = Game.GetFormFromFile(0x0003AC60, "Skyrim.esm") as GlobalVariable
diff --git a/source/scripts/_00e_nq_g_07_brief_setstageonread.psc b/source/scripts/_00e_nq_g_07_brief_setstageonread.psc
index 86aaa47a..6961cf52 100644
--- a/source/scripts/_00e_nq_g_07_brief_setstageonread.psc
+++ b/source/scripts/_00e_nq_g_07_brief_setstageonread.psc
@@ -22,7 +22,7 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-    if NQ_G_07Dijaam.GetStage() >= 130
+    if NQ_G_07Dijaam.GetCurrentStageID() >= 130
         ; The letter should not be enabled at this point to begin
         ; with!
         BlockActivation(false)
@@ -34,7 +34,7 @@ EndEvent
 Event OnRead()
 
 If !bDone
-	QuestToSet.SetStage(__Config_iDesiredStage)
+	QuestToSet.SetCurrentStageID(__Config_iDesiredStage)
 	bDone = True
 EndIf
 	
diff --git a/source/scripts/_00e_nq_g_07_functions.psc b/source/scripts/_00e_nq_g_07_functions.psc
index 3a7f5c91..7b467987 100644
--- a/source/scripts/_00e_nq_g_07_functions.psc
+++ b/source/scripts/_00e_nq_g_07_functions.psc
@@ -177,8 +177,8 @@ Function GetUp(Actor akGetUpTarget)
 	akGetUpTarget.SetGhost(true)
 	akGetUpTarget.PlayIdle(_00E_IdleGetUp)
 	Wait(0.1)
-	if Self.GetStage() == 90
-	Self.Setstage(92)
+	if Self.GetCurrentStageID() == 90
+	Self.SetCurrentStageID(92)
 	endif
 
 EndFunction
@@ -582,7 +582,7 @@ Function FadeInLying()
 	_00E_CameraControl.UnlockVanityCamera()
 	_00E_Func_RefreshFace.RefreshFace()
 	Game.EnablePlayerControls()
-	SetStage(145)
+	SetCurrentStageID(145)
 	
 	FadeIn()
 
@@ -970,7 +970,7 @@ Function CheckForBagLooted()
 	If PlayerREF.GetItemCount(_00E_NQ_G_07Dijaam_DijaamShackleKey) >= 1 && PlayerREF.GetItemCount(_00E_NQ_G_07_NoteGoToTheater) >= 1
 		SetObjectiveCompleted(60)
 		If CheckIfNoteIsRead()
-			SetStage(65)
+			SetCurrentStageID(65)
 		EndIf
 	EndIf
 
@@ -1480,7 +1480,7 @@ EndFunction
 
 Function SetupSC05D()
 
-	if Self.GetStage() < 80
+	if Self.GetCurrentStageID() < 80
 
 		_00E_NQ_G_07Mael_DoorToLockREF.Setopen(false)
 		_00E_NQ_G_07Mael_DoorToLockREF.Lock(true)
@@ -1601,7 +1601,7 @@ Function ResetGraveyardScene()
 
 	int iIndex = NQG07_GraveyardNPCs.GetSize() - 1
 
-	while iIndex >= 0 && Self.GetStage() <= 70
+	while iIndex >= 0 && Self.GetCurrentStageID() <= 70
 	
 		Actor akActorToEnable = NQG07_GraveyardNPCs.GetAt(iIndex) as Actor
 		akActorToEnable.MoveToMyEditorLocation()
@@ -1615,7 +1615,7 @@ EndFunction
 
 Function StartSC05D()
 
-	if Self.GetStage() < 80
+	if Self.GetCurrentStageID() < 80
 	
 		NQ_G_07Dijaam_SC05_TheaterFinale.ForceStart()
 
diff --git a/source/scripts/_00e_nq_g_07_letterpickup.psc b/source/scripts/_00e_nq_g_07_letterpickup.psc
index 24c9621f..0ac98e24 100644
--- a/source/scripts/_00e_nq_g_07_letterpickup.psc
+++ b/source/scripts/_00e_nq_g_07_letterpickup.psc
@@ -7,7 +7,7 @@ Bool bReadingDone
 
 Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer)
 
-	If !bDone && akNewContainer == Game.GetPlayer() && NQ_G_07Dijaam.GetStage() == 60
+	If !bDone && akNewContainer == Game.GetPlayer() && NQ_G_07Dijaam.GetCurrentStageID() == 60
 		bDone = true
 		(NQ_G_07Dijaam as _00E_NQ_G_07_Functions).CheckForBagLooted()
 		NQ_G_07Dijaam.SetObjectiveDisplayed(64)
diff --git a/source/scripts/_00e_nq_g_07_shacklekeypickup.psc b/source/scripts/_00e_nq_g_07_shacklekeypickup.psc
index 174a25c3..229f5f36 100644
--- a/source/scripts/_00e_nq_g_07_shacklekeypickup.psc
+++ b/source/scripts/_00e_nq_g_07_shacklekeypickup.psc
@@ -5,7 +5,7 @@ Bool bDone
 
 Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer)
 
-	If bDone == false && akNewContainer == Game.GetPlayer() && NQ_G_07Dijaam.GetStage() == 60
+	If bDone == false && akNewContainer == Game.GetPlayer() && NQ_G_07Dijaam.GetCurrentStageID() == 60
 		bDone = true
 		(NQ_G_07Dijaam as _00E_NQ_G_07_Functions).CheckForBagLooted()
 	EndIf
diff --git a/source/scripts/_00e_nq_g_07dijaam_trapdoorsc.psc b/source/scripts/_00e_nq_g_07dijaam_trapdoorsc.psc
index ffe5ce4a..e7a48536 100644
--- a/source/scripts/_00e_nq_g_07dijaam_trapdoorsc.psc
+++ b/source/scripts/_00e_nq_g_07dijaam_trapdoorsc.psc
@@ -8,7 +8,7 @@ EndEvent
 
 Event OnActivate(ObjectReference akActionRef)
 
-	if NQ_G_07Dijaam.GetStage() >= 72 || NQ_G_07Mael.GetStage() >= 50
+	if NQ_G_07Dijaam.GetCurrentStageID() >= 72 || NQ_G_07Mael.GetCurrentStageID() >= 50
 		Self.Activate(akActionRef, True)
 	EndIf
 
diff --git a/source/scripts/_00e_nq_g_07mael_setstageoncast.psc b/source/scripts/_00e_nq_g_07mael_setstageoncast.psc
index 94368231..d2885da4 100644
--- a/source/scripts/_00e_nq_g_07mael_setstageoncast.psc
+++ b/source/scripts/_00e_nq_g_07mael_setstageoncast.psc
@@ -2,7 +2,7 @@ Scriptname _00E_NQ_G_07Mael_SetStageOnCast extends activemagiceffect
 
 Event OnEffectStart(Actor akTarget, Actor akCaster)
 
-	NQ_G_07.SetStage(35)
+	NQ_G_07.SetCurrentStageID(35)
 
 EndEvent
 
diff --git a/source/scripts/_00e_nqaltyogoshventilscn.psc b/source/scripts/_00e_nqaltyogoshventilscn.psc
index 43a3e64f..40cc850c 100644
--- a/source/scripts/_00e_nqaltyogoshventilscn.psc
+++ b/source/scripts/_00e_nqaltyogoshventilscn.psc
@@ -8,11 +8,11 @@ Event OnActivate(ObjectReference akActionRef)
 		PlayerREF.RemoveItem(_00E_NQYogoshAntriebskern, 1)
 		Ventil.Enable()
 		_00E_Questshader.Stop(VentilCap)
-		NQAltYogosh.SetStage(20)
+		NQAltYogosh.SetCurrentStageID(20)
 		
 	ElseIf akActionRef != PlayerREF
 
-		If (NQAltYogosh.GetStage() == 20)
+		If (NQAltYogosh.GetCurrentStageID() == 20)
 	
 			door01.Lock(150)
 			door02.Lock(150)
@@ -20,7 +20,7 @@ Event OnActivate(ObjectReference akActionRef)
 			door02.BlockActivation(True)
 			door01.Enable()
 			door02.Enable()
-			NQAltYogosh.SetStage(30)
+			NQAltYogosh.SetCurrentStageID(30)
 			NQAltYogoshLinker.Enable()
 			Utility.Wait(1)
 			NQAltYogoshWaterPlane.TranslateTo(NQAltYogoshWaterPlane.GetPositionX(), NQAltYogoshWaterPlane.GetPositionY(), NQAltYogoshWaterPlane.GetPositionZ() + 880, 0, 0, 0, 10, 0)
diff --git a/source/scripts/_00e_nqg02_doorsc.psc b/source/scripts/_00e_nqg02_doorsc.psc
index 8a73aee3..0afc4a48 100644
--- a/source/scripts/_00e_nqg02_doorsc.psc
+++ b/source/scripts/_00e_nqg02_doorsc.psc
@@ -13,7 +13,7 @@ EndEvent
 Event OnActivate(ObjectReference akActionRef)
 
 	if akActionRef == Game.GetPlayer()
-		if NQ_G_02.GetStage() < 20
+		if NQ_G_02.GetCurrentStageID() < 20
 			_00E_NQ_G_02_DoorMessage.Show()
 			Return
 		Else
diff --git a/source/scripts/_00e_nqg05_trapdoorfailsavesc.psc b/source/scripts/_00e_nqg05_trapdoorfailsavesc.psc
index 6f771052..2947d458 100644
--- a/source/scripts/_00e_nqg05_trapdoorfailsavesc.psc
+++ b/source/scripts/_00e_nqg05_trapdoorfailsavesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_NQG05_TrapdoorFailsaveSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if NQ_G_05.GetStage() >= 15 && (_00E_NQ_G_05_CellarDoorREF.IsLocked() || _00E_NQ_G_05_CellarDoorREF.IsActivationBlocked())
+	if NQ_G_05.GetCurrentStageID() >= 15 && (_00E_NQ_G_05_CellarDoorREF.IsLocked() || _00E_NQ_G_05_CellarDoorREF.IsActivationBlocked())
 		_00E_NQ_G_05_CellarDoorREF.BlockActivation(False)
 		_00E_NQ_G_05_CellarDoorREF.Lock(False)
 	EndIf
diff --git a/source/scripts/_00e_nqg07_dijaamescapesc.psc b/source/scripts/_00e_nqg07_dijaamescapesc.psc
index 1bfcd581..8ee9f473 100644
--- a/source/scripts/_00e_nqg07_dijaamescapesc.psc
+++ b/source/scripts/_00e_nqg07_dijaamescapesc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_NQG07_DijaamEscapeSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == PlayerREF
-		if NQ_G_07Dijaam.GetStage() >= 35 && NQ_G_07Dijaam.GetStage() < 45
+		if NQ_G_07Dijaam.GetCurrentStageID() >= 35 && NQ_G_07Dijaam.GetCurrentStageID() < 45
 			NQ_G_07Dijaam.ShowSpottedMessageAndLoseGame()
 		EndIf
 	EndIf	
diff --git a/source/scripts/_00e_nqg07_dijaamscenesc.psc b/source/scripts/_00e_nqg07_dijaamscenesc.psc
index cae7507b..4a41c508 100644
--- a/source/scripts/_00e_nqg07_dijaamscenesc.psc
+++ b/source/scripts/_00e_nqg07_dijaamscenesc.psc
@@ -4,7 +4,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if !bDone && akActionRef == PlayerREF
 	
-		if NQ_G_07Dijaam.GetStage() == 45 && !NQ_G_07Dijaam_SC04_DijaamPrisonBreak.IsPlaying()
+		if NQ_G_07Dijaam.GetCurrentStageID() == 45 && !NQ_G_07Dijaam_SC04_DijaamPrisonBreak.IsPlaying()
 		
 			bDone = True
 			NQ_G_07Dijaam.StartSC04D()
diff --git a/source/scripts/_00e_nqg07_maelfailsavesc.psc b/source/scripts/_00e_nqg07_maelfailsavesc.psc
index 5b53294e..68d1708c 100644
--- a/source/scripts/_00e_nqg07_maelfailsavesc.psc
+++ b/source/scripts/_00e_nqg07_maelfailsavesc.psc
@@ -2,7 +2,7 @@ Scriptname _00E_NQG07_MaelFailsaveSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if NQ_G_07Mael.GetStage() >= 15
+	if NQ_G_07Mael.GetCurrentStageID() >= 15
 
 		if akActionRef == PlayerREF && !bDone 
 			bDone = True
diff --git a/source/scripts/_00e_nqg07_movedijaamtoplayersc.psc b/source/scripts/_00e_nqg07_movedijaamtoplayersc.psc
index bca6d7a1..175ac35d 100644
--- a/source/scripts/_00e_nqg07_movedijaamtoplayersc.psc
+++ b/source/scripts/_00e_nqg07_movedijaamtoplayersc.psc
@@ -2,12 +2,12 @@ Scriptname _00E_NQG07_MoveDijaamToPlayerSC extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if akActionRef == PlayerREF && NQ_G_07Dijaam.IsRunning() && NQ_G_07Dijaam.GetStage() < 80 && !bDone 
+	if akActionRef == PlayerREF && NQ_G_07Dijaam.IsRunning() && NQ_G_07Dijaam.GetCurrentStageID() < 80 && !bDone 
 		
 		bDone = True
 		; fixes issue 1226
-		If NQ_G_07Dijaam.GetStage() < 75
-			NQ_G_07Dijaam.SetStage(75)
+		If NQ_G_07Dijaam.GetCurrentStageID() < 75
+			NQ_G_07Dijaam.SetCurrentStageID(75)
 			Utility.Wait(2)
 		EndIf
 		
diff --git a/source/scripts/_00e_nqg07dijaam_scenefailsavetgbx.psc b/source/scripts/_00e_nqg07dijaam_scenefailsavetgbx.psc
index 83cd1e27..8a0f9436 100644
--- a/source/scripts/_00e_nqg07dijaam_scenefailsavetgbx.psc
+++ b/source/scripts/_00e_nqg07dijaam_scenefailsavetgbx.psc
@@ -2,9 +2,9 @@ Scriptname _00E_NQG07Dijaam_SceneFailsaveTGBX extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionRef)
 
-	if NQ_G_07Dijaam.GetStage() == 75 && akActionRef == PlayerREF
+	if NQ_G_07Dijaam.GetCurrentStageID() == 75 && akActionRef == PlayerREF
 		_00E_SC_DijaamOnelys.MoveTo(PlayerREF)
-		NQ_G_07Dijaam.SetStage(80)
+		NQ_G_07Dijaam.SetCurrentStageID(80)
 	EndIf
 	
 EndEvent
diff --git a/source/scripts/_00e_nqr01_functions.psc b/source/scripts/_00e_nqr01_functions.psc
index e6c74e48..9708539e 100644
--- a/source/scripts/_00e_nqr01_functions.psc
+++ b/source/scripts/_00e_nqr01_functions.psc
@@ -12,18 +12,18 @@ endFunction
 
 Event OnUpdateGameTime()
 
-	if GetStage() == 25
+	if GetCurrentStageID() == 25
 		SetObjectiveDisplayed(0, True, True)
-		SetStage(30)
-	Elseif GetStage() == 45
+		SetCurrentStageID(30)
+	Elseif GetCurrentStageID() == 45
 		SetObjectiveDisplayed(0, True, True)
-		SetStage(50)
-	Elseif GetStage() == 61
+		SetCurrentStageID(50)
+	Elseif GetCurrentStageID() == 61
 		SetObjectiveDisplayed(0, True, True)
-		SetStage(62)
-	Elseif GetStage() == 66
+		SetCurrentStageID(62)
+	Elseif GetCurrentStageID() == 66
 		SetObjectiveDisplayed(0, True, True)
-		SetStage(70)
+		SetCurrentStageID(70)
 	EndIf
 	
 EndEvent
@@ -425,7 +425,7 @@ Function DisableCorpsesAndAdvanceStage(Formlist flEnemies, int iDesiredStage)
 	FS_NQR01_PitFighterFacadeParentREF.StartCombat(FS_NQR01_Fistfighter02)
 	Wait(3)
 	FadeToBlackBackIMOD.ApplyCrossFade(1)
-	SetStage(iDesiredStage)
+	SetCurrentStageID(iDesiredStage)
 	Game.RequestAutoSave()
 	
 EndFunction
@@ -506,14 +506,14 @@ Function WaitForNextCombat()
 	Wait(2)
 	FadeToBlackHoldIMOD.ApplyCrossFade(2)
 
-	if GetStage() == 25
-		SetStage(30)
-	Elseif GetStage() == 45
-		SetStage(50)
-	Elseif GetStage() == 61
-		SetStage(62)
-	Elseif GetStage() == 66
-		SetStage(70)
+	if GetCurrentStageID() == 25
+		SetCurrentStageID(30)
+	Elseif GetCurrentStageID() == 45
+		SetCurrentStageID(50)
+	Elseif GetCurrentStageID() == 61
+		SetCurrentStageID(62)
+	Elseif GetCurrentStageID() == 66
+		SetCurrentStageID(70)
 	EndIf
 	
 	FadeToBlackBackIMOD.ApplyCrossFade(1)
@@ -626,7 +626,7 @@ EndFunction
 
 Function StartSC05()
 
-	SetStage(80)
+	SetCurrentStageID(80)
 	Game.ForceFirstPerson()
 	_00E_TeleportGlobal.SetValueInt(0)
 	AllowIdleChatter.SetValue(1)
@@ -669,7 +669,7 @@ Function GiveRewardEXP(bool bDeclined)
 	
 	if !bDeclined
 		PlayerREF.AddItem(_01E_FS_TeleportrolleUnterstadt, 3)
-		FS_NQR02.SetStage(5)
+		FS_NQR02.SetCurrentStageID(5)
 	EndIf
 	
 EndFunction
diff --git a/source/scripts/_00e_oldsherath_zucombatscript.psc b/source/scripts/_00e_oldsherath_zucombatscript.psc
index 35d6439d..743444e4 100644
--- a/source/scripts/_00e_oldsherath_zucombatscript.psc
+++ b/source/scripts/_00e_oldsherath_zucombatscript.psc
@@ -15,7 +15,7 @@ int LightSize
 
 Event OnCombatStateChanged(Actor akTarget, int aeCombatState)
 	;Debug.Notification("setting state")
-	; QuestToSet.SetStage(55)
+	; QuestToSet.SetCurrentStageID(55)
 	; QuestToSet.SetObjectiveCompleted(15)
 	; QuestToSet.SetObjectiveDisplayed(20)
 	GoToState("NormalCombat")
@@ -23,7 +23,7 @@ EndEvent
 
 Event OnDeath(Actor akKiller)
 	GoToState("Death")
-	; QuestToSet.SetStage(60)
+	; QuestToSet.SetCurrentStageID(60)
 	; QuestToSet.SetObjectiveCompleted(20)
 	; QuestToSet.CompleteQuest()
 	;Debug.Notification("Death state entered")
diff --git a/source/scripts/_00e_p02_combattutorialscript.psc b/source/scripts/_00e_p02_combattutorialscript.psc
index b55c7068..81864d41 100644
--- a/source/scripts/_00e_p02_combattutorialscript.psc
+++ b/source/scripts/_00e_p02_combattutorialscript.psc
@@ -29,7 +29,7 @@ Event OnInit()
 ;------------DEBUG-----------------
 
 MQ_P02_ANewLife.Start()
-MQ_P02_ANewLife.SetStage(55) 
+MQ_P02_ANewLife.SetCurrentStageID(55) 
 
 ;------------DEBUG-----------------
 
@@ -67,7 +67,7 @@ ElseIf (MQP02CombatGlobal.GetValue() == 1)
 Debug.Notification("Completed!")
 _00E_Music_CombatRegular.Remove()
 MQ_P02_ANewLife.SetObjectiveCompleted(5)
-MQ_P02_ANewLife.SetStage(60)
+MQ_P02_ANewLife.SetCurrentStageID(60)
 UnregisterForUpdate()
 self.Delete()
 
diff --git a/source/scripts/_00e_p02_veiledwomanspelllaunchers.psc b/source/scripts/_00e_p02_veiledwomanspelllaunchers.psc
deleted file mode 100644
index ec556e6f..00000000
--- a/source/scripts/_00e_p02_veiledwomanspelllaunchers.psc
+++ /dev/null
@@ -1,59 +0,0 @@
-Scriptname _00E_P02_VeiledWomanSpellLauncherS extends ObjectReference  
-
-ReferenceAlias Property SiriusREF Auto
-Actor Property PlayerREF Auto
-
-Sound Property QSTMG07MagnusStormCollegeSmallLPM Auto
-Sound Property _00E_MQP02_SpellThunderC Auto
-Sound Property _00E_NPCKillBodyfall Auto
-
-Idle Property IdleT02AscendMale Auto
-
-ObjectReference Property SiriusMarker Auto
-ObjectReference Property PlayerMarker Auto
-
-GlobalVariable Property _00E_MQP02_LevitateGlobal Auto
-
-Topic Property MQP02_SC4_SiriusLevitationTopic Auto
-Topic Property MQP02_SC4_SiriusScreamTopic Auto
-
-Event OnInit()
-
-Actor Sirius = Sirius.GetActorReference() as Actor
-Sirius.SetLookAt(PlayerREF)
-Game.ForceFirstPerson()
-Game.DisablePlayerControls(true, true, true, false, true, true, true, true)
-int SpellAMB =  QSTMG07MagnusStormCollegeSmallLPM.Play(PlayerREF)
-Sirius.PlayIdle(IdleT02AscendMale)
-
-;--------------------LEVITATE----------------------
-PlayerREF.SplineTranslateTo(PlayerREF.GetPositionX(), PlayerREF.GetPositionY(), 90.0, PlayerREF.GetAngleX(), PlayerREF.GetAngleY(), PlayerREF.GetAngleZ(), 5, 9)
-Sirius.SplineTranslateTo(Sirius.GetPositionX(), Sirius.GetPositionY(), 90.0, Sirius.GetAngleX(), Sirius.GetAngleY(), Sirius.GetAngleZ(), 5, 9)
-_00E_P02_VeiledWomanSpellIntro.Apply()
-Utility.Wait(1)
-_00E_P02_VeiledWomanSpellIntro.PopTo(_00E_P02_VeiledWomanSpellLoop)
-Sirius.Say(MQP02_SC4_SiriusLevitationTopic)
-Utility.Wait(7)
-
-;--------------------CRASH!-------------------------
-PlayerREF.StopTranslation()
-Game.ShakeCamera()
-int SpellSound = _00E_MQP02_SpellThunderC.Play(PlayerREF)
-PlayerREF.SplineTranslateTo(300.0 * Math.Sin(PlayerRef.GetAngleZ()), PlayerREF.GetPositionY(), PlayerREF.GetPositionZ() - 5.0, PlayerREF.GetAngleX(), PlayerREF.GetAngleY(), -90, 100, 2000)
-Sirius.Say(MQP02_SC4_SiriusScreamTopic) 
-Utility.Wait(0.3)
-Sound.StopInstance(SpellAMB)
-_00E_NPCKillBodyfall.Play(PlayerREF)
-_00E_P02_VeiledWomanSpellLoop.PopTo(FadeToBlackHoldImod)
-Utility.Wait(0.8)
-Sound.StopInstance(SpellSound)
-MQ_P02_ANewLife.SetStage(80) 
-Self.Delete()
-
-
-EndEvent
-
-
-ImageSpaceModifier Property _00E_P02_VeiledWomanSpellLoop Auto
-ImageSpaceModifier Property _00E_P02_VeiledWomanSpellIntro Auto
-ImageSpaceModifier Property FadeToBlackHoldImod Auto
\ No newline at end of file
diff --git a/source/scripts/_00e_phasmalist_soul.psc b/source/scripts/_00e_phasmalist_soul.psc
index d8bd6664..187b526f 100644
--- a/source/scripts/_00e_phasmalist_soul.psc
+++ b/source/scripts/_00e_phasmalist_soul.psc
@@ -43,7 +43,7 @@ Event OnActivate(ObjectReference akActivator)
 		taken = true
 		
 		If !FS_NQ09.IsRunning()
-			FS_NQ09.SetStage(5)
+			FS_NQ09.SetCurrentStageID(5)
 		EndIf
 		FS_NQ09.UpdateSoulCount()
 		
diff --git a/source/scripts/_00e_playercontrolsswitchactivation.psc b/source/scripts/_00e_playercontrolsswitchactivation.psc
index c3fbbe70..2784f08d 100644
--- a/source/scripts/_00e_playercontrolsswitchactivation.psc
+++ b/source/scripts/_00e_playercontrolsswitchactivation.psc
@@ -1,7 +1,7 @@
 Scriptname _00E_PlayerControlsSwitchActivation extends ObjectReference  
 
 Event OnTriggerEnter(ObjectReference akactionref)
-	if akactionref == game.getplayer() && QuestID.getstage() == StageValue
+	if akactionref == game.getplayer() && QuestID.GetCurrentStageID() == StageValue
 		Game.EnablePlayerControls(abMovement = true,abFighting = false,abCamSwitch = false,abLooking = true,abSneaking = false,abMenu = false,abActivate = true,abJournalTabs = true,aiDisablePOVType = 0)
 	endif
 EndEvent
@@ -9,7 +9,7 @@ EndEvent
 
 
 Event OnTriggerLeave(ObjectReference akactionref)
-	if akactionref == game.getplayer() && QuestID.getstage() == StageValue || QuestID.getstage() == StateValueTwo 
+	if akactionref == game.getplayer() && QuestID.GetCurrentStageID() == StageValue || QuestID.GetCurrentStageID() == StateValueTwo 
 		Game.DisablePlayerControls(abMovement = false, abFighting = true, abCamSwitch = true, abLooking = false, abSneaking = true,abMenu = true, abActivate = true, abJournalTabs = true, aiDisablePOVType = 0)
 	endif
 
diff --git a/source/scripts/_00e_portnpctoplayerfailsavesc.psc b/source/scripts/_00e_portnpctoplayerfailsavesc.psc
index 6ef1d174..1f345313 100644
--- a/source/scripts/_00e_portnpctoplayerfailsavesc.psc
+++ b/source/scripts/_00e_portnpctoplayerfailsavesc.psc
@@ -3,7 +3,7 @@ Scriptname _00E_PortNPCToPlayerFailsaveSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	If akActionRef == PlayerREF
-		If QuestToSet.GetStage() == __Config_iRequiredStage
+		If QuestToSet.GetCurrentStageID() == __Config_iRequiredStage
 			Companion.GetReference().MoveTo(PlayerREF)
 			Self.Delete()
 		EndIf
diff --git a/source/scripts/_00e_queststarttrigger.psc b/source/scripts/_00e_queststarttrigger.psc
index addb1471..d80e1f3e 100644
--- a/source/scripts/_00e_queststarttrigger.psc
+++ b/source/scripts/_00e_queststarttrigger.psc
@@ -11,7 +11,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 			;Debug.Notification("Quest gestartet.")
 			DoOnce = 1
 			if SetStage == true
-				StartQuest.SetStage(DesiredStage)
+				StartQuest.SetCurrentStageID(DesiredStage)
 			endif
 		endif
 	endif
diff --git a/source/scripts/_00e_questupdateontriggercomplex.psc b/source/scripts/_00e_questupdateontriggercomplex.psc
index 76990e93..6d4e072e 100644
--- a/source/scripts/_00e_questupdateontriggercomplex.psc
+++ b/source/scripts/_00e_questupdateontriggercomplex.psc
@@ -2,7 +2,7 @@ Scriptname _00E_QuestUpdateOnTriggerComplex extends ObjectReference
 
 Event OnTriggerEnter(ObjectReference akActionREF)
 	If akActionRef == PlayerREF && Done == False && Config_UpdateStage
-		Int curStage = QuestToSet.GetStage()
+		Int curStage = QuestToSet.GetCurrentStageID()
 		If Config_StageRequiredToUpdate
 			If curStage == StageRequriedToUpdate
 				SetDone(True)
@@ -26,7 +26,7 @@ Function SetDone(Bool bDoSetStage)
 	Done = True
 
 	If bDoSetStage
-		QuestToSet.SetStage(DesiredStage)
+		QuestToSet.SetCurrentStageID(DesiredStage)
 	EndIf
 
 	If Config_DisableWhenDone
diff --git a/source/scripts/_00e_scenestartscript.psc b/source/scripts/_00e_scenestartscript.psc
index f622fa31..b305078b 100644
--- a/source/scripts/_00e_scenestartscript.psc
+++ b/source/scripts/_00e_scenestartscript.psc
@@ -6,7 +6,7 @@ Scriptname _00E_SceneStartScript extends ObjectReference
 Event OnTrigger(ObjectReference akActionRef)
 
 if(DoOnce == False)
-	if(QuestForScene.GetStage() == QueststageForStart)
+	if(QuestForScene.GetCurrentStageID() == QueststageForStart)
 
 		Debug.Trace("Queststage ok")
 		if(akActionRef == Game.GetPlayer())	
diff --git a/source/scripts/_00e_setstageonactivate.psc b/source/scripts/_00e_setstageonactivate.psc
index 924ac40f..493db4be 100644
--- a/source/scripts/_00e_setstageonactivate.psc
+++ b/source/scripts/_00e_setstageonactivate.psc
@@ -4,14 +4,14 @@ Event OnActivate(ObjectReference akActionRef)
 
 	If akActionRef == PlayerREF && !Done
 		If __Config_StageRequiredToUpdate
-			If (__Config_QuestToSet.GetStage() == __Config_RequiredStage)
-				__Config_QuestToSet.SetStage(__Config_DesiredStage)
+			If (__Config_QuestToSet.GetCurrentStageID() == __Config_RequiredStage)
+				__Config_QuestToSet.SetCurrentStageID(__Config_DesiredStage)
 				Done = True
 			Else
 				Return
 			EndIf
 		Else
-			__Config_QuestToSet.SetStage(__Config_DesiredStage)
+			__Config_QuestToSet.SetCurrentStageID(__Config_DesiredStage)
 			Done = True
 		EndIf
 	EndIf
diff --git a/source/scripts/_00e_setstageondeath.psc b/source/scripts/_00e_setstageondeath.psc
index 87bd65d7..3ca88635 100644
--- a/source/scripts/_00e_setstageondeath.psc
+++ b/source/scripts/_00e_setstageondeath.psc
@@ -15,7 +15,7 @@ Scene Property SceneToStart Auto
 Event OnDeath(Actor akKiller)
 
     if( QuestToSet )
-        QuestToSet.SetStage(DesiredStage)
+        QuestToSet.SetCurrentStageID(DesiredStage)
         ;Debug.Notification("Setting stage")
     endif
 
diff --git a/source/scripts/_00e_setstageondropitem.psc b/source/scripts/_00e_setstageondropitem.psc
index 0e069bd3..19002446 100644
--- a/source/scripts/_00e_setstageondropitem.psc
+++ b/source/scripts/_00e_setstageondropitem.psc
@@ -1,8 +1,8 @@
 Scriptname _00E_SetStageOnDropItem extends ObjectReference  
 
 Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer)
-	If QuestToSet.GetStage() == StageNeeded && akNewContainer == Game.GetPlayer()
-		QuestToSet.SetStage(StageToSet)
+	If QuestToSet.GetCurrentStageID() == StageNeeded && akNewContainer == Game.GetPlayer()
+		QuestToSet.SetCurrentStageID(StageToSet)
 	EndIf
 endEvent
 
diff --git a/source/scripts/_00e_setstageonopen.psc b/source/scripts/_00e_setstageonopen.psc
index fadf3b40..faba667b 100644
--- a/source/scripts/_00e_setstageonopen.psc
+++ b/source/scripts/_00e_setstageonopen.psc
@@ -3,7 +3,7 @@ Scriptname _00E_SetStageOnOpen extends ObjectReference
 Event OnActivate(ObjectReference akActionRef)
 
 	If (akActionRef == Game.GetPlayer()) && (doOnce == 0)
-		QuestToSet.SetStage(StageToSet)
+		QuestToSet.SetCurrentStageID(StageToSet)
 		doOnce = 0
 	Else
 		Return
diff --git a/source/scripts/_00e_setstageonpickup.psc b/source/scripts/_00e_setstageonpickup.psc
index 096a0079..339a83a9 100644
--- a/source/scripts/_00e_setstageonpickup.psc
+++ b/source/scripts/_00e_setstageonpickup.psc
@@ -11,14 +11,14 @@ Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldCo
 
 	If akNewContainer == Game.GetPlayer() && !bDone
 		If __Config_bStageRequired
-			If __Config_QuestToSet.GetStage() == __Config_iStageRequired
-				__Config_QuestToSet.SetStage(__Config_iStageToSet)
+			If __Config_QuestToSet.GetCurrentStageID() == __Config_iStageRequired
+				__Config_QuestToSet.SetCurrentStageID(__Config_iStageToSet)
 				bDone = true
 			Else
 				return 
 			EndIf
 		Else
-			__Config_QuestToSet.SetStage(__Config_iStageToSet)
+			__Config_QuestToSet.SetCurrentStageID(__Config_iStageToSet)
 			bDone = true
 		EndIf
 	EndIf
diff --git a/source/scripts/_00e_setstageonread.psc b/source/scripts/_00e_setstageonread.psc
index 151d7ebf..e9ff426c 100644
--- a/source/scripts/_00e_setstageonread.psc
+++ b/source/scripts/_00e_setstageonread.psc
@@ -4,7 +4,7 @@ Scriptname _00E_SetStageOnRead extends ObjectReference
 Event OnRead()
 
 If !bDone
-	QuestToSet.SetStage(__Config_iDesiredStage)
+	QuestToSet.SetCurrentStageID(__Config_iDesiredStage)
 	bDone = True
 EndIf
 	
diff --git a/source/scripts/_00e_setstageonreadwithrequiredstage.psc b/source/scripts/_00e_setstageonreadwithrequiredstage.psc
index f9e972b9..cfc426a7 100644
--- a/source/scripts/_00e_setstageonreadwithrequiredstage.psc
+++ b/source/scripts/_00e_setstageonreadwithrequiredstage.psc
@@ -4,14 +4,14 @@ Event OnRead()
 	
 	if !bDone
 		if __Config_StageRequiredToUpdate
-			if (__Config_QuestToSet.GetStage() == __Config_RequiredStage)
-				__Config_QuestToSet.SetStage(__Config_DesiredStage)
+			if (__Config_QuestToSet.GetCurrentStageID() == __Config_RequiredStage)
+				__Config_QuestToSet.SetCurrentStageID(__Config_DesiredStage)
 				bDone = True
 			Else
 				Return
 			EndIf
 		Else
-			__Config_QuestToSet.SetStage(__Config_DesiredStage)
+			__Config_QuestToSet.SetCurrentStageID(__Config_DesiredStage)
 			bDone = True
 		EndIf
 	Endif
diff --git a/source/scripts/_00e_setstageontriggerenter.psc b/source/scripts/_00e_setstageontriggerenter.psc
index 922f7860..24091fe0 100644
--- a/source/scripts/_00e_setstageontriggerenter.psc
+++ b/source/scripts/_00e_setstageontriggerenter.psc
@@ -17,7 +17,7 @@ Event OnTriggerEnter (ObjectReference akActionRef)
 if akActionRef == PlayerREF 
 	if doOnce == 0
 
-QuestToSet.SetStage(DesiredStage)
+QuestToSet.SetCurrentStageID(DesiredStage)
 Debug.Notification("Stage updated")
 
 if CompleteQuest == true
diff --git a/source/scripts/_00e_stagetriggerboxscn.psc b/source/scripts/_00e_stagetriggerboxscn.psc
index c6ed9c53..72e0c6d9 100644
--- a/source/scripts/_00e_stagetriggerboxscn.psc
+++ b/source/scripts/_00e_stagetriggerboxscn.psc
@@ -15,9 +15,9 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 
 	if akActionRef == Game.GetPlayer() && !bDone
 
-		if (NeccessaryStage == False) || (QuestID.Getstage() == QuestStageBeforeTriggering)
+		if (NeccessaryStage == False) || (QuestID.GetCurrentStageID() == QuestStageBeforeTriggering)
 			bDone = True
-			QuestID.SetStage(QuestStageAfterTriggering)
+			QuestID.SetCurrentStageID(QuestStageAfterTriggering)
 		endif
 
 		if UpdateObjectives == true
diff --git a/source/scripts/_00e_startquestandsetstage.psc b/source/scripts/_00e_startquestandsetstage.psc
index 96a95ead..8f6e0d84 100644
--- a/source/scripts/_00e_startquestandsetstage.psc
+++ b/source/scripts/_00e_startquestandsetstage.psc
@@ -9,7 +9,7 @@ Event OnActivate (ObjectReference akActionRef)
 
 if akActionRef == PlayerREF
 	QuestToSet.Start()
-	QuestToSet.SetStage(10)
+	QuestToSet.SetCurrentStageID(10)
 	Debug.Notification("Quest Set!")
 	RegisterForSleep()
 endif
diff --git a/source/scripts/_00e_startscenetrigger.psc b/source/scripts/_00e_startscenetrigger.psc
index 27ad709a..bb08c04e 100644
--- a/source/scripts/_00e_startscenetrigger.psc
+++ b/source/scripts/_00e_startscenetrigger.psc
@@ -14,7 +14,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 			SceneToStart.Start()
 
 		if SetStageDesired == true
-			QuestStart.SetStage(QuestStage)
+			QuestStart.SetCurrentStageID(QuestStage)
 		endif
 					
 			DoOnce = 1
diff --git a/source/scripts/_00e_suntemple_weathercontrolsc.psc b/source/scripts/_00e_suntemple_weathercontrolsc.psc
index c8e9cfb2..2470cf40 100644
--- a/source/scripts/_00e_suntemple_weathercontrolsc.psc
+++ b/source/scripts/_00e_suntemple_weathercontrolsc.psc
@@ -6,7 +6,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 		Return
 	EndIf
 
-	If MQ17.GetStage() > 5
+	If MQ17.GetCurrentStageID() > 5
 		_00E_MQ17_Purge_Weather.ForceActive(True)
 		_00E_Music_Special_Cleansing.Add()
 		_00E_PlayerFunctions.GetSoundControl().RemoveSilence()
@@ -15,11 +15,11 @@ Event OnTriggerEnter(ObjectReference akActionRef)
 		_00E_Music_Special_Cleansing.Add()
 	EndIf
 
-	If MQ14.GetStage() >= 10 && MQ14.GetStage() < 20
+	If MQ14.GetCurrentStageID() >= 10 && MQ14.GetCurrentStageID() < 20
 		MQ14.PrepareForFinalMission()
 	EndIf
 	
-	If MQ12a.GetStage() >= 5 && !MQ12a.IsCompleted()
+	If MQ12a.GetCurrentStageID() >= 5 && !MQ12a.IsCompleted()
 		_00E_MC_LexREF.MoveTo(MQ12a_SC0_DebugLexStart)
 		MQ10b_SC4_Tealor.Stop()
 	EndIf
diff --git a/source/scripts/_00e_teleport_suntempleme.psc b/source/scripts/_00e_teleport_suntempleme.psc
index 806b7896..73a0c42d 100644
--- a/source/scripts/_00e_teleport_suntempleme.psc
+++ b/source/scripts/_00e_teleport_suntempleme.psc
@@ -6,11 +6,11 @@ Scriptname _00E_Teleport_SuntempleME extends activemagiceffect
 
 Event OnEffectStart (Actor akTarket, Actor akCaster)
 
-	If (_00E_TeleportGlobal.GetValueInt() == 1 && !(MQ12b.IsRunning())) || PlayerREF.GetWorldSpace() == Akropolis || MQ03.GetStage() < 30
+	If (_00E_TeleportGlobal.GetValueInt() == 1 && !(MQ12b.IsRunning())) || PlayerREF.GetWorldSpace() == Akropolis || MQ03.GetCurrentStageID() < 30
         _00E_Teleport_sTeleportNotPossible.Show()
 		MAGVampireSunlight.Play(PlayerREF)
 		PlayerREF.AddItem(_01E_TeleportrolleSonnentempel, 1)
-	Elseif ((_00E_TeleportGlobal.GetValueInt() == 1) && (MQ12b.GetStage() == 115) ||(MQ12b.GetStage() == 120))
+	Elseif ((_00E_TeleportGlobal.GetValueInt() == 1) && (MQ12b.GetCurrentStageID() == 115) ||(MQ12b.GetCurrentStageID() == 120))
 		_00E_PlayerFunctions.GetTeleportControl().TeleportPlayer(_00E_TeleportMarker_Suntemple)
 	ElseIf (_00E_TeleportGlobal.GetValueInt() == 0)
 		_00E_PlayerFunctions.GetTeleportControl().TeleportPlayer(_00E_TeleportMarker_Suntemple)
diff --git a/source/scripts/_00e_testbossfightsc.psc b/source/scripts/_00e_testbossfightsc.psc
index 0fe2e5e9..8a027b9a 100644
--- a/source/scripts/_00e_testbossfightsc.psc
+++ b/source/scripts/_00e_testbossfightsc.psc
@@ -91,7 +91,7 @@ Function InitializeFight()
 		MQ17.akCompanion.Say(MQ17_D04_Fight_Start)
 	EndIf
 		
-	MQ17.SetStage(5)
+	MQ17.SetCurrentStageID(5)
 	MQ17.SetObjectiveDisplayed(15)
 	MQ17_Generator_Right_REF003.ActivateShield()
 	MQ17_Generator_Left_REF003.ActivateShield()
@@ -110,7 +110,7 @@ Function StopFight()
 	MQ17_SC07_BarrierREF.PlayAnimation("playanim01")
 	UnregisterForUpdate()
 	_00E_Music_Combat_Epic.Remove()
-	MQ17.SetStage(85)
+	MQ17.SetCurrentStageID(85)
 	MQ17.SetObjectiveCompleted(15)
 	bSpecialAttackInAction = True
 	
diff --git a/source/scripts/_00e_testquest_functions.psc b/source/scripts/_00e_testquest_functions.psc
index 4e31272e..95e3d227 100644
--- a/source/scripts/_00e_testquest_functions.psc
+++ b/source/scripts/_00e_testquest_functions.psc
@@ -74,7 +74,7 @@ EndFunction
 Function StartSlowMoScene()
 
 	
-	FS_NQR05.SetStage(320)
+	FS_NQR05.SetCurrentStageID(320)
 
 EndFunction
 
diff --git a/source/scripts/_00e_theriantrophist_playeraswerewolf.psc b/source/scripts/_00e_theriantrophist_playeraswerewolf.psc
index fbf8a312..7fd14575 100644
--- a/source/scripts/_00e_theriantrophist_playeraswerewolf.psc
+++ b/source/scripts/_00e_theriantrophist_playeraswerewolf.psc
@@ -115,7 +115,7 @@ Function Transform(int duration)
 		Steam.UnlockAchievement("END_WEREWOLF_01")
 	EndIf
 	 
-	If FS_NQ11.GetStage() == 15 || FS_NQ11.GetStage() == 17
+	If FS_NQ11.GetCurrentStageID() == 15 || FS_NQ11.GetCurrentStageID() == 17
 		FS_NQ11.SetObjectiveCompleted(20)
 	EndIf
 
diff --git a/source/scripts/_00e_theriantrophist_wolfformsc.psc b/source/scripts/_00e_theriantrophist_wolfformsc.psc
index e13b907d..2ae54656 100644
--- a/source/scripts/_00e_theriantrophist_wolfformsc.psc
+++ b/source/scripts/_00e_theriantrophist_wolfformsc.psc
@@ -71,7 +71,7 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)
 
 	if !FS_NQ11.IsObjectiveCompleted(20)
 		FS_NQ11.SetObjectiveCompleted(20)
-		FS_NQ11.SetStage(20)
+		FS_NQ11.SetCurrentStageID(20)
 		FS_NQ11.ShowTutorial(3)
 	endif
 	
diff --git a/source/scripts/_00e_triggerboxsaynotincombatscript.psc b/source/scripts/_00e_triggerboxsaynotincombatscript.psc
index c585230f..9ecac60f 100644
--- a/source/scripts/_00e_triggerboxsaynotincombatscript.psc
+++ b/source/scripts/_00e_triggerboxsaynotincombatscript.psc
@@ -62,7 +62,7 @@ EndFunction
 
 Bool Function CheckQuest()
 	If __Config_Quest
-		Int questStage = __Config_Quest.GetStage()
+		Int questStage = __Config_Quest.GetCurrentStageID()
 
 		If questStage > __Config_QuestMaxStage
 			; We are past the max stage of the quest, no point in saying anything anymore.
diff --git a/source/scripts/_00e_visionhomesc.psc b/source/scripts/_00e_visionhomesc.psc
index ba12b601..30b237ba 100644
--- a/source/scripts/_00e_visionhomesc.psc
+++ b/source/scripts/_00e_visionhomesc.psc
@@ -60,7 +60,7 @@ Function UpdatePendingWeather()
 	CurrentWeather = PendindWeather
 	PendindWeather = None
 
-	If MQ07a.GetStage() < 170
+	If MQ07a.GetCurrentStageID() < 170
 		CurrentWeather.ForceActive(True)
 		If CurrentWeather == _00E_MQ07aVisionWeatherNoRain
 			MQ07a_SC6_Rainparent.Enable()
@@ -92,7 +92,7 @@ Function TryCloseDoor()
 EndFunction
 
 Bool Function IsBattleRunning()
-	Return (MQ07a.GetStage() == 145)
+	Return (MQ07a.GetCurrentStageID() == 145)
 EndFunction
 
 
diff --git a/source/scripts/_00e_weathercontrolquestscript.psc b/source/scripts/_00e_weathercontrolquestscript.psc
index b590e50a..31a704ee 100644
--- a/source/scripts/_00e_weathercontrolquestscript.psc
+++ b/source/scripts/_00e_weathercontrolquestscript.psc
@@ -125,11 +125,11 @@ Function UpdateWeathers(Bool bForceUpdate)
 EndFunction
 
 Bool Function AreSpecialWeathersEnabled()
-	If MQ17.GetStage() >= 5
+	If MQ17.GetCurrentStageID() >= 5
 		Return False
 	EndIf
 
-	Int mq12bStage = MQ12b.GetStage()
+	Int mq12bStage = MQ12b.GetCurrentStageID()
 	If mq12bStage >= 5 && mq12bStage < 135
 		Return False
 	EndIf
diff --git a/source/scripts/_00e_z_conversations_tealorandjoreksc.psc b/source/scripts/_00e_z_conversations_tealorandjoreksc.psc
index e8f63397..a88feac4 100644
--- a/source/scripts/_00e_z_conversations_tealorandjoreksc.psc
+++ b/source/scripts/_00e_z_conversations_tealorandjoreksc.psc
@@ -3,12 +3,12 @@ Scriptname _00E_Z_Conversations_TealorAndJorekSC extends ObjectReference
 Event OnTriggerEnter(ObjectReference akActionRef)
 
 	If akActionRef == Game.GetPlayer()
-		If MQ07.GetStage() == 5 && !bFirstScenePlayed
+		If MQ07.GetCurrentStageID() == 5 && !bFirstScenePlayed
 			bFirstScenePlayed = True
-			Z_Conversations_TealorAndJorrek_01.SetStage(5)
-		ElseIf MQ10b.GetStage() >= 70 && !bSecondScenePlayed && (MQ12b.GetStage() < 5)
+			Z_Conversations_TealorAndJorrek_01.SetCurrentStageID(5)
+		ElseIf MQ10b.GetCurrentStageID() >= 70 && !bSecondScenePlayed && (MQ12b.GetCurrentStageID() < 5)
 			bSecondScenePlayed = True
-			Z_Conversations_TealorAndJorrek_02.SetStage(5)
+			Z_Conversations_TealorAndJorrek_02.SetCurrentStageID(5)
 			Self.Disable()
 		EndIf
 	EndIf
diff --git a/source/scripts/_fs_phasmalist_controlquest.psc b/source/scripts/_fs_phasmalist_controlquest.psc
index 717f1ca4..b175ecd9 100644
--- a/source/scripts/_fs_phasmalist_controlquest.psc
+++ b/source/scripts/_fs_phasmalist_controlquest.psc
@@ -76,11 +76,11 @@ EndFunction
 
 ; Event called by _00E_Phasmalist_Soul
 Function OnPlayerSoulCollected()
-	If FS_NQ08.getStage() == 5 || FS_NQ08.getStage() == 1
+	If FS_NQ08.GetCurrentStageID() == 5 || FS_NQ08.GetCurrentStageID() == 1
 		If PlayerREF.hasPerk(_00E_Class_Phasmalist_P02_CraftTier1)
-			FS_NQ08.setStage(10)
+			FS_NQ08.SetCurrentStageID(10)
 		Else
-			FS_NQ08.setStage(7)
+			FS_NQ08.SetCurrentStageID(7)
 			RegisterForModEvent("Phasmalist_Learn_Soulsmith1", "OnUnlockSoulsmithNovice")
 		EndIf
 	EndIf
@@ -88,8 +88,8 @@ EndFunction
 
 ; Event called by _00E_Phasmalist_Workbench
 Function OnPlayerItemSpectralized()
-	If FS_NQ08.getStage() == 15
-		FS_NQ08.setStage(20)
+	If FS_NQ08.GetCurrentStageID() == 15
+		FS_NQ08.SetCurrentStageID(20)
 	EndIf
 EndFunction
 
@@ -102,8 +102,8 @@ Function OnPlayerTrinketCreated()
 			Game.unlockWord(_00E_A3_Phasmalist_MoveApparationToPlayer1)
 		EndIf
 	
-		If FS_NQ08.getStage() == 10
-			FS_NQ08.setStage(15)
+		If FS_NQ08.GetCurrentStageID() == 10
+			FS_NQ08.SetCurrentStageID(15)
 		EndIf
 	
 		If _00E_PhasmalistAchievementUnlocked.GetValueInt() == 0
@@ -116,8 +116,8 @@ Function OnPlayerTrinketCreated()
 EndFunction
 
 Event OnUnlockSoulsmithNovice(string eventName, string strArg, float numArg, Form sender)
-	If FS_NQ08.getStage() == 7
-		FS_NQ08.setStage(10)
+	If FS_NQ08.GetCurrentStageID() == 7
+		FS_NQ08.SetCurrentStageID(10)
 		UnRegisterForModEvent("Phasmalist_Learn_Soulsmith1")
 	EndIf
 EndEvent
diff --git a/source/scripts/defaultfakenpcloadtrig.psc b/source/scripts/defaultfakenpcloadtrig.psc
index f0ad218e..0a5cbfe3 100644
--- a/source/scripts/defaultfakenpcloadtrig.psc
+++ b/source/scripts/defaultfakenpcloadtrig.psc
@@ -17,8 +17,8 @@ auto STATE waiting
 		if actronaut.getBaseObject() == NPCtoDisable && (actronaut as actor).isDead() == false
 			if myQuest != NONE
 				; check conditions
-				if (preRequisiteStage != -1 && myQuest.getStageDone(preRequisiteStage) == true) || (preRequisiteStage == -1)
-					myQuest.setStage(stageToSet)
+				if (preRequisiteStage != -1 && myQuest.IsStageDone(preRequisiteStage) == true) || (preRequisiteStage == -1)
+					myQuest.SetCurrentStageID(stageToSet)
 					; fade out the actor we care about
 					actronaut.disable(true)
 					; change states and let the trigger commit suicide
diff --git a/source/scripts/defaultfireweaponscript.psc b/source/scripts/defaultfireweaponscript.psc
index cdccf6d3..d4d7f5f5 100644
--- a/source/scripts/defaultfireweaponscript.psc
+++ b/source/scripts/defaultfireweaponscript.psc
@@ -82,11 +82,11 @@ state FireLoop
 				; There is a quest set, lets see if it's running
 				if (myQuest.IsRunning())
 					; There is a quest running, lets see if we should be firing
-					if (myQuest.GetStage() >= StageToStopFire)
+					if (myQuest.GetCurrentStageID() >= StageToStopFire)
 						;trace(self + " The done stage has been hit.  No longer going to fire.  Also dropping out of loop")
 						; The quest is at the stop firing stage, so don't fire
 						Looping = False
-					elseif (myQuest.GetStage() >= StageToStartFire)
+					elseif (myQuest.GetCurrentStageID() >= StageToStartFire)
 						;trace(self + " The correct stage is set, I'm going to fire.")
 						; The quest isn't at the stop firing stage yet, but is at the firing stage, so see if we are enabled
 							if (self as ObjectReference).IsEnabled()
diff --git a/source/scripts/defaultsetstageonenter.psc b/source/scripts/defaultsetstageonenter.psc
index 7512f520..5f47cf67 100644
--- a/source/scripts/defaultsetstageonenter.psc
+++ b/source/scripts/defaultsetstageonenter.psc
@@ -17,6 +17,6 @@ int targetCountTotal
 ; what happens when all my targets are in the trigger?
 ; override on subclass to change behavior
 function TriggerMe()
-	myQuest.setStage(stage)
+	myQuest.SetCurrentStageID(stage)
 	parent.TriggerMe()
 endFunction
diff --git a/source/scripts/defaultsetstagetrigscript.psc b/source/scripts/defaultsetstagetrigscript.psc
index b0c4e9eb..60a72020 100644
--- a/source/scripts/defaultsetstagetrigscript.psc
+++ b/source/scripts/defaultsetstagetrigscript.psc
@@ -24,7 +24,7 @@ auto STATE waitingForPlayer
 	EVENT onTriggerEnter(objectReference triggerRef)
 		if triggerRef == getPlayer() as actor
 			; check to see if a pre-req stage was specificed and if it's been met
-			if prereqStageOPT == -1 || MyQuest.getStageDone(prereqStageOPT) == 1
+			if prereqStageOPT == -1 || MyQuest.IsStageDone(prereqStageOPT) == 1
 				; Start the quest just in case it isn't already running.
 				if myQuest.isRunning() == FALSE
 					bool check = myQuest.start()
@@ -35,7 +35,7 @@ auto STATE waitingForPlayer
 				endif
 				
 				; do the actual business of setting the stage we want
-				myQuest.setStage(stage)
+				myQuest.SetCurrentStageID(stage)
 				if doOnce
 					gotoState("hasBeenTriggered")
 				endif
diff --git a/source/scripts/dragontowerwallscript.psc b/source/scripts/dragontowerwallscript.psc
index 4aaeafc6..e499c533 100644
--- a/source/scripts/dragontowerwallscript.psc
+++ b/source/scripts/dragontowerwallscript.psc
@@ -25,7 +25,7 @@ endEVENT
 
 EVENT onAnimationEvent(ObjectReference akSource, string asEventName)
 	if (asEventName == myEvent)
-		myQuest.setStage(myQuestStage)
+		myQuest.SetCurrentStageID(myQuestStage)
 		KnockAreaEffect(1, 1.5*getLength())
 		QSTE3TowerHoleMono.play(self) 
 		QSTE3TowerHoleStereo.play(self)
diff --git a/source/scripts/dunarcherpressureplatescript.psc b/source/scripts/dunarcherpressureplatescript.psc
index bf7fa4f4..39772894 100644
--- a/source/scripts/dunarcherpressureplatescript.psc
+++ b/source/scripts/dunarcherpressureplatescript.psc
@@ -31,7 +31,7 @@ auto State Waiting
 	Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile, bool abPowerAttack, bool abSneakAttack, bool abBashAttack, bool abHitBlocked)
 		Actor actorRef = akAggressor as Actor
 		gotoState("DoNothing")
-		if(myQuest.getStage() == 30 && myQuest.getStage() <= 32)
+		if(myQuest.GetCurrentStageID() == 30 && myQuest.GetCurrentStageID() <= 32)
 			myQuest.feedbackFlag = 0
 		endif
 		
@@ -56,16 +56,16 @@ auto State Waiting
 			;player hit target and is using the correct arrows and is in box
 			if(targetNumber == 0)
 				;if player hit left target
-				if(myQuest.getStage() == 30 || myQuest.getStage() == 32 || myQuest.getStage() == 60)
+				if(myQuest.GetCurrentStageID() == 30 || myQuest.GetCurrentStageID() == 32 || myQuest.GetCurrentStageID() == 60)
 					;player hit the wrong target
 					myQuest.feedbackFlag = 4
 				else
-					if(myQuest.getStage() == 31)
+					if(myQuest.GetCurrentStageID() == 31)
 						;player hit the left target correctly
 						myQuest.feedbackFlag = 0
-						myQuest.setStage(32)
+						myQuest.SetCurrentStageID(32)
 					else
-						if(myQuest.getStage() == 50 || myQuest.getStage() == 51 || myQuest.getStage() == 70 || myQuest.getStage() == 71)
+						if(myQuest.GetCurrentStageID() == 50 || myQuest.GetCurrentStageID() == 51 || myQuest.GetCurrentStageID() == 70 || myQuest.GetCurrentStageID() == 71)
 							;checking for when player needs to hit each of the three targets
 							myQuest.playerHitTargetLeft = 1
 						endif
@@ -74,16 +74,16 @@ auto State Waiting
 			else
 				if(targetNumber == 1)
 					;if player hit middle target
-					if(myQuest.getStage() == 30)
+					if(myQuest.GetCurrentStageID() == 30)
 						;player hit middle target correctly
 						myQuest.feedbackFlag = 0
-						myQuest.setStage(31)
+						myQuest.SetCurrentStageID(31)
 					else
-						if(myQuest.getStage() == 31 || myQuest.getStage() == 32 || myQuest.getStage() == 60)
+						if(myQuest.GetCurrentStageID() == 31 || myQuest.GetCurrentStageID() == 32 || myQuest.GetCurrentStageID() == 60)
 							;player hit the wrong target
 							myQuest.feedbackFlag = 4
 						else
-							if(myQuest.getStage() == 50 || myQuest.getStage() == 51 || myQuest.getStage() == 70 || myQuest.getStage() == 71)
+							if(myQuest.GetCurrentStageID() == 50 || myQuest.GetCurrentStageID() == 51 || myQuest.GetCurrentStageID() == 70 || myQuest.GetCurrentStageID() == 71)
 								;checking for when player needs to hit each of the three targets
 								myQuest.playerHitTargetMiddle = 1
 							endif
@@ -92,16 +92,16 @@ auto State Waiting
 				else
 					if(targetNumber == 2)
 						;player hit right target
-						if(myQuest.getStage() == 30 || myQuest.getStage() == 31 || myQuest.getStage() == 60)
+						if(myQuest.GetCurrentStageID() == 30 || myQuest.GetCurrentStageID() == 31 || myQuest.GetCurrentStageID() == 60)
 							;player hit the wrong target
 							myQuest.feedbackFlag = 4
 						else
-							if(myQuest.getStage() == 32)
+							if(myQuest.GetCurrentStageID() == 32)
 								;player hit the right target correctly
 								myQuest.feedbackFlag = 0
-								myQuest.setStage(40)
+								myQuest.SetCurrentStageID(40)
 							else
-								if(myQuest.getStage() == 50 || myQuest.getStage() == 51 || myQuest.getStage() == 70 || myQuest.getStage() == 71)
+								if(myQuest.GetCurrentStageID() == 50 || myQuest.GetCurrentStageID() == 51 || myQuest.GetCurrentStageID() == 70 || myQuest.GetCurrentStageID() == 71)
 									;checking for when player needs to hit each of the three targets
 									myQuest.playerHitTargetRight = 1
 								endif
@@ -110,17 +110,17 @@ auto State Waiting
 					else
 						if(targetNumber == 3)
 							;player hit far target
-							if(myQuest.getStage() == 30 || myQuest.getStage() == 31 || myQuest.getStage() == 32)
+							if(myQuest.GetCurrentStageID() == 30 || myQuest.GetCurrentStageID() == 31 || myQuest.GetCurrentStageID() == 32)
 								;player hit the wrong target
 								myQuest.feedbackFlag = 4
 							else
-								if(myQuest.getStage() == 60)
+								if(myQuest.GetCurrentStageID() == 60)
 									;player hit the far target correctly
 									myQuest.feedbackFlag = 0
 									myQuest.playerChallengeComplete01 = 1
-									myQuest.setStage(62)
+									myQuest.SetCurrentStageID(62)
 								else
-									if(myQuest.getStage() == 70 || myQuest.getStage() == 71)
+									if(myQuest.GetCurrentStageID() == 70 || myQuest.GetCurrentStageID() == 71)
 										;checking for when player needs to hit all targets
 										myQuest.playerHitTargetFar = 1
 									endif
@@ -151,7 +151,7 @@ auto State Waiting
 		
 		;this is for angie
 		if(actorRef == myActor)
-			if(myQuest.getStage() == 45)
+			if(myQuest.GetCurrentStageID() == 45)
 				;Angi is shooting the three targets
 				if(myQuest.count == 0)
 					myActorTarget.moveto(LeftTarget)
@@ -170,7 +170,7 @@ auto State Waiting
 					endif
 				endif
 			else
-				if(myQuest.getStage() == 69)
+				if(myQuest.GetCurrentStageID() == 69)
 					;Angi is shooting all four targets
 					if(myQuest.count == 0)
 						myActorTarget.moveto(LeftTarget)
@@ -202,13 +202,13 @@ auto State Waiting
 
 		
 		;for player hitting three targets
-		if(myQuest.getStage() == 50 || myQuest.getStage() == 51)
+		if(myQuest.GetCurrentStageID() == 50 || myQuest.GetCurrentStageID() == 51)
 			if((myQuest.playerHitTargetLeft == 1) && (myQuest.playerHitTargetMiddle == 1) && (myQuest.playerHitTargetRight == 1))
 				myQuest.playerChallengeComplete01 = 1
 			endif
 		endif
 		
-		if(myQuest.getStage() == 70 || myQuest.getStage() == 71)
+		if(myQuest.GetCurrentStageID() == 70 || myQuest.GetCurrentStageID() == 71)
 			if((myQuest.playerHitTargetLeft == 1) && (myQuest.playerHitTargetMiddle == 1) && (myQuest.playerHitTargetRight == 1) && (myQuest.playerHitTargetFar == 1))
 				myQuest.playerChallengeComplete01 = 1
 			endif
diff --git a/source/scripts/fs_nq05_chairscript.psc b/source/scripts/fs_nq05_chairscript.psc
index ba62f315..990532cd 100644
--- a/source/scripts/fs_nq05_chairscript.psc
+++ b/source/scripts/fs_nq05_chairscript.psc
@@ -1,10 +1,10 @@
 Scriptname FS_NQ05_ChairScript extends ObjectReference  
 
 Event OnActivate(ObjectReference akActionRef)
-	if (FS_NQ05.GetStage() == 50 && akActionRef == PlayerREF)
-		FS_NQ05.SetStage(55)
-	Elseif (FS_NQ05.GetStage() == 65 && akActionRef == PlayerREF)
-		FS_NQ05.SetStage(70)
+	if (FS_NQ05.GetCurrentStageID() == 50 && akActionRef == PlayerREF)
+		FS_NQ05.SetCurrentStageID(55)
+	Elseif (FS_NQ05.GetCurrentStageID() == 65 && akActionRef == PlayerREF)
+		FS_NQ05.SetCurrentStageID(70)
 	Endif
 EndEvent
 
diff --git a/source/scripts/fs_nq05_mirelldeadscript.psc b/source/scripts/fs_nq05_mirelldeadscript.psc
index 9d34fb67..204618c2 100644
--- a/source/scripts/fs_nq05_mirelldeadscript.psc
+++ b/source/scripts/fs_nq05_mirelldeadscript.psc
@@ -4,8 +4,8 @@ Quest Property FS_NQ05 Auto
 
 Event OnDeath(Actor akKiller)
 
-	if(FS_NQ05.GetStage() == 110)
-	FS_NQ05.SetStage(120)
+	if(FS_NQ05.GetCurrentStageID() == 110)
+	FS_NQ05.SetCurrentStageID(120)
 	Endif
 
 EndEvent
\ No newline at end of file
diff --git a/source/scripts/fs_nq05_tochterdeadscript.psc b/source/scripts/fs_nq05_tochterdeadscript.psc
index acd6da99..e80af754 100644
--- a/source/scripts/fs_nq05_tochterdeadscript.psc
+++ b/source/scripts/fs_nq05_tochterdeadscript.psc
@@ -4,8 +4,8 @@ Quest Property FS_NQ05 Auto
 
 Event OnDeath(Actor akKiller)
 
-	if(FS_NQ05.GetStage() == 120)
-	FS_NQ05.SetStage(140)
+	if(FS_NQ05.GetCurrentStageID() == 120)
+	FS_NQ05.SetCurrentStageID(140)
 	Endif
 
 EndEvent
diff --git a/source/scripts/fs_nqr05_bossfightabnormalitysc.psc b/source/scripts/fs_nqr05_bossfightabnormalitysc.psc
index 57bf3f24..5b7728f9 100644
--- a/source/scripts/fs_nqr05_bossfightabnormalitysc.psc
+++ b/source/scripts/fs_nqr05_bossfightabnormalitysc.psc
@@ -38,7 +38,7 @@ Event OnEnterBleedout()
 EndEvent
 
 Event OnDeath(Actor killer)
-	FS_NQR05.setStage(255)
+	FS_NQR05.SetCurrentStageID(255)
 	gotoState("Dead")
 EndEvent
 
@@ -49,7 +49,7 @@ Event OnLoad()
 		return
 	endif
 
-	if FS_NQR05.GetStage() >= 251 && FS_NQR05.GetStage() < 255
+	if FS_NQR05.GetCurrentStageID() >= 251 && FS_NQR05.GetCurrentStageID() < 255
 		gotostate("CombatStart")
 	elseif FS_NQR05_AbnormalityInitialized.GetValueInt() == 0
 		self.playIdle(GiantKnownDown)
@@ -75,7 +75,7 @@ State CombatStart
 	
 	Event OnUpdate()
 	
-		if FS_NQR05.GetStage() >= 251 && FS_NQR05.GetStage() < 255
+		if FS_NQR05.GetCurrentStageID() >= 251 && FS_NQR05.GetCurrentStageID() < 255
 			gotoState("Invulnerability")
 		endif
 		
@@ -87,7 +87,7 @@ State Invulnerability
 
 	Event OnBeginState()
 	
-		if FS_NQR05.GetStage() >= 251 && FS_NQR05.GetStage() < 255
+		if FS_NQR05.GetCurrentStageID() >= 251 && FS_NQR05.GetCurrentStageID() < 255
 	
 			MAGFireBoltEXCastImod.Apply()
 			;SoulTrapPVFX02.Play(self, -1, heart)
diff --git a/source/scripts/headchopblockhookupscript.psc b/source/scripts/headchopblockhookupscript.psc
index e8e10a85..b1f403bd 100644
--- a/source/scripts/headchopblockhookupscript.psc
+++ b/source/scripts/headchopblockhookupscript.psc
@@ -94,7 +94,7 @@ Event OnUpdate()
 ; 				debug.trace(self+ "player play idle failed" )
 			endif
 			wait(5)
-			MQ101.SetStage(98)
+			MQ101.SetCurrentStageID(98)
 		else
 			if ( !myExecutionee.PlayIdle( animIdle ) )
 ; 				debug.trace(self+ " play idle failed" )
diff --git a/source/scripts/mg08paralysiseffectscript.psc b/source/scripts/mg08paralysiseffectscript.psc
index 2b7addae..acf98b34 100644
--- a/source/scripts/mg08paralysiseffectscript.psc
+++ b/source/scripts/mg08paralysiseffectscript.psc
@@ -7,7 +7,7 @@ Quest Property MG08 Auto
 Event OnEffectStart(Actor AkTarget, Actor akCaster)
 
 	AkTarget.AddSpell(MG08ParalysisAbility)
-	While MG08.GetStage() < 40
+	While MG08.GetCurrentStageID() < 40
 		Utility.Wait(5)
 ; 		Debug.Trace(self + "In While Loop")
 	EndWhile
diff --git a/source/scripts/mq03_functions.psc b/source/scripts/mq03_functions.psc
index 97509454..c0571c3a 100644
--- a/source/scripts/mq03_functions.psc
+++ b/source/scripts/mq03_functions.psc
@@ -49,17 +49,17 @@ Function DetonateMines()
 	KnockBackMarker.Delete()
 	Wait(3)
 	FadeToBlackBackImod.ApplyCrossFade()
-	Self.SetStage(25)
+	Self.SetCurrentStageID(25)
 
 EndFunction
 
 Function UglyLishariFailsave()
 
-	If GetStage() < 38
+	If GetCurrentStageID() < 38
 		bDeadBodyFailsaveUsed = True
 		MQ04_SC3_DeadBodyComment.ForceStart()
 	Else
-		SetStage(40)
+		SetCurrentStageID(40)
 	EndIf
 
 EndFunction
@@ -67,7 +67,7 @@ EndFunction
 Function SetStageIfFailsaveUsed()
 
 	If bDeadBodyFailsaveUsed
-		SetStage(40)
+		SetCurrentStageID(40)
 	Else
 		Return
 	EndIf
@@ -155,7 +155,7 @@ Function FadeToBlackAndBack()
 	PlayerREF.MoveTo(MQ04_D4_PlayerStandMarker)
 	Wait(4)
 	FadeToBlackHoldImod.PopTo(FadeToBlackBackImod)
-	Self.SetStage(80)
+	Self.SetCurrentStageID(80)
 	_00E_MC_LishariREF.EvaluatePackage()
 
 EndFunction
@@ -197,7 +197,7 @@ Function RitualFailsave()
 	PlayerREF.PlayIdle(TG05_GetUp)
 	Wait(2)
 	Game.EnablePlayerControls()
-	Self.SetStage(90)
+	Self.SetCurrentStageID(90)
 
 EndFunction
 
@@ -216,7 +216,7 @@ Function FinishUp()
 	_00E_PlayerFunctions.GetSoundControl().RemoveSilence()
 	_00E_EPHandler.GiveEP(__Config_RewardEXP)
 	Self.SetObjectiveCompleted(70)
-	NQ41.SetStage(10)
+	NQ41.SetCurrentStageID(10)
 	MQ05Prologue.Start()
 	If MQ04_SC6_LishariLiftPlatform == None
 		MQ04_SC6_LishariLiftPlatform = Game.GetFormFromFile(0x000329E8, "Skyrim.esm") as ObjectReference
@@ -294,7 +294,7 @@ Function UpdateObjectives()
 	
 	if (AlreadySaved == StonesLeft) || (StonesLeft == 0)
 		Self.SetObjectiveCompleted(40)
-		Self.SetStage(60)
+		Self.SetCurrentStageID(60)
 		_00E_Music_CombatRegular.Remove()
 	Else
 		Self.SetObjectiveCompleted(40,0)
@@ -315,7 +315,7 @@ Event OnUpdate()
 	
 	bool Saved = StonetoCheck.CheckSaved()
 
-	if Self.GetStage() < 60
+	if Self.GetCurrentStageID() < 60
 		if !(Saved)
 			StoneToDestroy.Activate(StoneToDestroy)
 			_00E_MQ04_StoneFragmentDestroyed.Show(StoneInterval as Int)
diff --git a/source/scripts/mqgreybeardabsorbscript.psc b/source/scripts/mqgreybeardabsorbscript.psc
index 402e935c..ced1a53e 100644
--- a/source/scripts/mqgreybeardabsorbscript.psc
+++ b/source/scripts/mqgreybeardabsorbscript.psc
@@ -70,7 +70,7 @@ function AbsorbEffect(Actor target, int stageToSet = 0)
 
 	; set stage when finished
 	if stageToSet > 0
-		setstage(stageToSet)
+		SetCurrentStageID(stageToSet)
 	endif
 
 endFunction
@@ -106,7 +106,7 @@ function DragonAbsorbEffect(Actor target, int stageToSet = 0)
 
 	; set stage when finished
 	if stageToSet > 0
-		setstage(stageToSet)
+		SetCurrentStageID(stageToSet)
 	endif
 
 endFunction
diff --git a/source/scripts/pf__0007b8f7.psc b/source/scripts/pf__0007b8f7.psc
index 8ed52157..26f2ec0b 100644
--- a/source/scripts/pf__0007b8f7.psc
+++ b/source/scripts/pf__0007b8f7.psc
@@ -6,7 +6,7 @@ Scriptname PF__0007B8F7 Extends Package Hidden
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
 Utility.Wait(4)
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf__000812ba.psc b/source/scripts/pf__000812ba.psc
index 902fce5e..ce102eeb 100644
--- a/source/scripts/pf__000812ba.psc
+++ b/source/scripts/pf__000812ba.psc
@@ -6,7 +6,7 @@ Scriptname PF__000812BA Extends Package Hidden
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
 Utility.Wait(8)
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf__000812c2.psc b/source/scripts/pf__000812c2.psc
index b0290f77..abf7a35e 100644
--- a/source/scripts/pf__000812c2.psc
+++ b/source/scripts/pf__000812c2.psc
@@ -6,7 +6,7 @@ Scriptname PF__000812C2 Extends Package Hidden
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
 Utility.Wait(4)
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf__00e_fs_nq07_aarostravelb_0101ecdc.psc b/source/scripts/pf__00e_fs_nq07_aarostravelb_0101ecdc.psc
index 791b8178..c6b6056f 100644
--- a/source/scripts/pf__00e_fs_nq07_aarostravelb_0101ecdc.psc
+++ b/source/scripts/pf__00e_fs_nq07_aarostravelb_0101ecdc.psc
@@ -5,7 +5,7 @@ Scriptname PF__00E_FS_NQ07_AarosTravelB_0101ECDC Extends Package Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf__00e_fs_nq07_aarostravelt_02004392.psc b/source/scripts/pf__00e_fs_nq07_aarostravelt_02004392.psc
index 346a2b8f..38c19612 100644
--- a/source/scripts/pf__00e_fs_nq07_aarostravelt_02004392.psc
+++ b/source/scripts/pf__00e_fs_nq07_aarostravelt_02004392.psc
@@ -5,7 +5,7 @@ Scriptname PF__00E_FS_NQ07_AarosTravelT_02004392 Extends Package Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1(Actor akActor)
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf__0200576c.psc b/source/scripts/pf__0200576c.psc
index 3594cf7e..a2262e17 100644
--- a/source/scripts/pf__0200576c.psc
+++ b/source/scripts/pf__0200576c.psc
@@ -5,7 +5,7 @@ Scriptname PF__0200576C Extends Package Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf_mq03_sc3_traveloutsidemag_0014156f.psc b/source/scripts/pf_mq03_sc3_traveloutsidemag_0014156f.psc
index 641b2274..aef7564f 100644
--- a/source/scripts/pf_mq03_sc3_traveloutsidemag_0014156f.psc
+++ b/source/scripts/pf_mq03_sc3_traveloutsidemag_0014156f.psc
@@ -6,7 +6,7 @@ Scriptname PF_MQ03_SC3_TravelOutsideMag_0014156F Extends Package Hidden
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
 Utility.Wait(4)
-GetOwningQuest().SetStage(37)
+GetOwningQuest().SetCurrentStageID(37)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf_mq05_sc14_playerwalktomar_0009cfe3.psc b/source/scripts/pf_mq05_sc14_playerwalktomar_0009cfe3.psc
index 84dcc2a3..f7a1ac3e 100644
--- a/source/scripts/pf_mq05_sc14_playerwalktomar_0009cfe3.psc
+++ b/source/scripts/pf_mq05_sc14_playerwalktomar_0009cfe3.psc
@@ -5,7 +5,7 @@ Scriptname PF_MQ05_SC14_PlayerWalKToMar_0009CFE3 Extends Package Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1(Actor akActor)
 ;BEGIN CODE
-GetOwningQuest().SetStage(125)
+GetOwningQuest().SetCurrentStageID(125)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf_mq05_sc6_dunwarfireslight_00097c31.psc b/source/scripts/pf_mq05_sc6_dunwarfireslight_00097c31.psc
index 7b9c79ba..eaf82936 100644
--- a/source/scripts/pf_mq05_sc6_dunwarfireslight_00097c31.psc
+++ b/source/scripts/pf_mq05_sc6_dunwarfireslight_00097c31.psc
@@ -6,7 +6,7 @@ Scriptname PF_MQ05_SC6_DunwarFiresLight_00097C31 Extends Package Hidden
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
 Utility.Wait(2)
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf_mq05_sc7_escortpackage_00097d04.psc b/source/scripts/pf_mq05_sc7_escortpackage_00097d04.psc
index 323bb106..5cbf87bf 100644
--- a/source/scripts/pf_mq05_sc7_escortpackage_00097d04.psc
+++ b/source/scripts/pf_mq05_sc7_escortpackage_00097d04.psc
@@ -5,7 +5,7 @@ Scriptname PF_MQ05_SC7_EscortPackage_00097D04 Extends Package Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
-GetOwningQuest().Setstage(87)
+GetOwningQuest().SetCurrentStageID(87)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf_mq09amlaplacesilverplate_000eb3d9.psc b/source/scripts/pf_mq09amlaplacesilverplate_000eb3d9.psc
index c4d500a7..0c1910aa 100644
--- a/source/scripts/pf_mq09amlaplacesilverplate_000eb3d9.psc
+++ b/source/scripts/pf_mq09amlaplacesilverplate_000eb3d9.psc
@@ -6,7 +6,7 @@ Scriptname PF_MQ09AmlaPlaceSilverplate_000EB3D9 Extends Package Hidden
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
 Utility.Wait(3.5)
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf_mq09samaelgoestoplayer_000eb3cb.psc b/source/scripts/pf_mq09samaelgoestoplayer_000eb3cb.psc
index 661bb2ba..e799e463 100644
--- a/source/scripts/pf_mq09samaelgoestoplayer_000eb3cb.psc
+++ b/source/scripts/pf_mq09samaelgoestoplayer_000eb3cb.psc
@@ -5,7 +5,7 @@ Scriptname PF_MQ09SamaelGoesToPlayer_000EB3CB Extends Package Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
-GetOwningQuest().SetStage(56)
+GetOwningQuest().SetCurrentStageID(56)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf_mq11badilacastspell_00117944.psc b/source/scripts/pf_mq11badilacastspell_00117944.psc
index 3f299701..859f3fc4 100644
--- a/source/scripts/pf_mq11badilacastspell_00117944.psc
+++ b/source/scripts/pf_mq11badilacastspell_00117944.psc
@@ -5,7 +5,7 @@ Scriptname PF_MQ11bAdilaCastSpell_00117944 Extends Package Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
-MQ11b.SetStage(170)
+MQ11b.SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf_mq11c_d11_ryneuswalktoeas_00092a71.psc b/source/scripts/pf_mq11c_d11_ryneuswalktoeas_00092a71.psc
index 2a9785e6..c387f7de 100644
--- a/source/scripts/pf_mq11c_d11_ryneuswalktoeas_00092a71.psc
+++ b/source/scripts/pf_mq11c_d11_ryneuswalktoeas_00092a71.psc
@@ -5,7 +5,7 @@ Scriptname PF_MQ11c_D11_RyneusWalkToEas_00092A71 Extends Package Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
-GetOwningQuest().SetStage(230)
+GetOwningQuest().SetCurrentStageID(230)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf_mq11c_sc2_wifewalktomarke_0008d961.psc b/source/scripts/pf_mq11c_sc2_wifewalktomarke_0008d961.psc
index 95257a0f..9db53de7 100644
--- a/source/scripts/pf_mq11c_sc2_wifewalktomarke_0008d961.psc
+++ b/source/scripts/pf_mq11c_sc2_wifewalktomarke_0008d961.psc
@@ -6,7 +6,7 @@ Scriptname PF_MQ11c_SC2_WifeWalkToMarke_0008D961 Extends Package Hidden
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
 Utility.Wait(4)
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf_mq11c_sc4_dogchase_00090468.psc b/source/scripts/pf_mq11c_sc4_dogchase_00090468.psc
index b36255ae..58ffa172 100644
--- a/source/scripts/pf_mq11c_sc4_dogchase_00090468.psc
+++ b/source/scripts/pf_mq11c_sc4_dogchase_00090468.psc
@@ -5,7 +5,7 @@ Scriptname PF_MQ11c_SC4_DogChase_00090468 Extends Package Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
-GetOwningQuest().Setstage(120)
+GetOwningQuest().SetCurrentStageID(120)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf_mq11c_sc4_ryneuswalktodoo_00090932.psc b/source/scripts/pf_mq11c_sc4_ryneuswalktodoo_00090932.psc
index 361fe57f..43d4deec 100644
--- a/source/scripts/pf_mq11c_sc4_ryneuswalktodoo_00090932.psc
+++ b/source/scripts/pf_mq11c_sc4_ryneuswalktodoo_00090932.psc
@@ -5,7 +5,7 @@ Scriptname PF_MQ11c_SC4_RyneusWalkToDoo_00090932 Extends Package Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
-GetOwningQuest().SetStage(140)
+GetOwningQuest().SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf_mqp02_sc3_sebaldwalkupsta_0007741b.psc b/source/scripts/pf_mqp02_sc3_sebaldwalkupsta_0007741b.psc
index b085b02d..da11762b 100644
--- a/source/scripts/pf_mqp02_sc3_sebaldwalkupsta_0007741b.psc
+++ b/source/scripts/pf_mqp02_sc3_sebaldwalkupsta_0007741b.psc
@@ -6,7 +6,7 @@ Scriptname PF_MQP02_SC3_SebaldWalkUpsta_0007741B Extends Package Hidden
 Function Fragment_0(Actor akActor)
 ;BEGIN CODE
 Utility.Wait(2)
-GetOwningQUest().SetStage(50)
+GetOwningQUest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/pf_websitlinkedref_00044ea0.psc b/source/scripts/pf_websitlinkedref_00044ea0.psc
index ec96c0fe..7a15d14e 100644
--- a/source/scripts/pf_websitlinkedref_00044ea0.psc
+++ b/source/scripts/pf_websitlinkedref_00044ea0.psc
@@ -6,7 +6,7 @@ Scriptname PF_webSitLinkedRef_00044EA0 Extends Package Hidden
 Function Fragment_1(Actor akActor)
 ;BEGIN CODE
 akActor.SetGhost(False)
-myQST.setStage(150)
+myQST.SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/qf_dgintimidatequest_0011a493.psc b/source/scripts/qf_dgintimidatequest_0011a493.psc
index 1d8b646c..5a84abc7 100644
--- a/source/scripts/qf_dgintimidatequest_0011a493.psc
+++ b/source/scripts/qf_dgintimidatequest_0011a493.psc
@@ -161,7 +161,7 @@ Function Fragment_5()
 ;BEGIN CODE
 ; Stage 100: player's victory, victory forcegreet done (does not happen in Enderal)
 ; Game.IncrementStat( "Brawls Won" ) ; Moved to Stage 15
-SetStage(200)
+SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/qf_mq06_0002eba4.psc b/source/scripts/qf_mq06_0002eba4.psc
index 0edaf84b..cfdd96f6 100644
--- a/source/scripts/qf_mq06_0002eba4.psc
+++ b/source/scripts/qf_mq06_0002eba4.psc
@@ -228,7 +228,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_21
 Function Fragment_21()
 ;BEGIN CODE
-MQ07.SetStage(5)
+MQ07.SetCurrentStageID(5)
 SetObjectiveCompleted(25)
 ;END CODE
 EndFunction
@@ -320,7 +320,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_23
 Function Fragment_23()
 ;BEGIN CODE
-MQ07.SetStage(5)
+MQ07.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -380,7 +380,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_17
 Function Fragment_17()
 ;BEGIN CODE
-MQ07.SetStage(5)
+MQ07.SetCurrentStageID(5)
 SetObjectiveCompleted(25)
 SetObjectiveDisplayed(35)
 ;END CODE
diff --git a/source/scripts/qf_mq08_intothedeep_0002eba6.psc b/source/scripts/qf_mq08_intothedeep_0002eba6.psc
index ef0464a5..bcc33e41 100644
--- a/source/scripts/qf_mq08_intothedeep_0002eba6.psc
+++ b/source/scripts/qf_mq08_intothedeep_0002eba6.psc
@@ -213,7 +213,7 @@ _00E_MQ08_Questfunctions kmyQuest = __temp as _00E_MQ08_Questfunctions
 ;BEGIN CODE
 kmyQuest.PlayerStopAIWalk()
 MQ08_IntoTheDeep_GoToTrain3.Start()
-SetStage(180)
+SetCurrentStageID(180)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/qf_mq101_0003372b.psc b/source/scripts/qf_mq101_0003372b.psc
index cf56fa31..e255c23c 100644
--- a/source/scripts/qf_mq101_0003372b.psc
+++ b/source/scripts/qf_mq101_0003372b.psc
@@ -15,7 +15,7 @@ ReferenceAlias Property Alias_StartMarkerRef Auto
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-SetStage(10)
+SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/qf_mq10b_001080b2.psc b/source/scripts/qf_mq10b_001080b2.psc
index 754296a9..c41919ba 100644
--- a/source/scripts/qf_mq10b_001080b2.psc
+++ b/source/scripts/qf_mq10b_001080b2.psc
@@ -218,7 +218,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_33
 Function Fragment_33()
 ;BEGIN CODE
-MQ12a.SetStage(5)
+MQ12a.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/qf_mq11a_0002eba9.psc b/source/scripts/qf_mq11a_0002eba9.psc
index 83f9e23d..0167f868 100644
--- a/source/scripts/qf_mq11a_0002eba9.psc
+++ b/source/scripts/qf_mq11a_0002eba9.psc
@@ -412,7 +412,7 @@ _00E_MQ11a_Functions kmyQuest = __temp as _00E_MQ11a_Functions
 ;END AUTOCAST
 ;BEGIN CODE
 If !NQ34.IsCompleted()
-NQ34.SetStage(17)
+NQ34.SetCurrentStageID(17)
 EndIf
 SetObjectivecompleted(20)
 kmyQuest.StartCastleGateScene()
diff --git a/source/scripts/qf_mq11b_0002ebab.psc b/source/scripts/qf_mq11b_0002ebab.psc
index 43de0f39..86d9bb43 100644
--- a/source/scripts/qf_mq11b_0002ebab.psc
+++ b/source/scripts/qf_mq11b_0002ebab.psc
@@ -242,7 +242,7 @@ SetObjectiveCompleted(160)
 SetObjectiveCompleted(165)
 SetObjectiveDisplayed(170)
 CompleteAllObjectives()
-MQ10b.SetStage(MQ10b.GetStage()+5)
+MQ10b.SetCurrentStageID(MQ10b.GetCurrentStageID()+5)
 kmyQuest.CompleteEverything()
 ;END CODE
 EndFunction
diff --git a/source/scripts/qf_mq11c_asonginthesilence_0002ebaa.psc b/source/scripts/qf_mq11c_asonginthesilence_0002ebaa.psc
index 6e2e5d13..d4ed97e2 100644
--- a/source/scripts/qf_mq11c_asonginthesilence_0002ebaa.psc
+++ b/source/scripts/qf_mq11c_asonginthesilence_0002ebaa.psc
@@ -244,7 +244,7 @@ _00E_MQ11c_Functions kmyQuest = __temp as _00E_MQ11c_Functions
 ;END AUTOCAST
 ;BEGIN CODE
 kmyQuest.BuryRyneus()
-SetStage(295)
+SetCurrentStageID(295)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -271,7 +271,7 @@ _00E_MQ11c_Functions kmyQuest = __temp as _00E_MQ11c_Functions
 ;END AUTOCAST
 ;BEGIN CODE
 CompleteAllObjectives()
-MQ10b.SetStage(MQ10b.GetStage()+5)
+MQ10b.SetCurrentStageID(MQ10b.GetCurrentStageID()+5)
 kmyQuest.ResetMusic()
 _00E_TeleportGlobal.SetValue(0)
 _00E_MQ11c_MercenaryREF.Disable()
@@ -401,7 +401,7 @@ _00E_MQ11c_Functions kmyQuest = __temp as _00E_MQ11c_Functions
 ;END AUTOCAST
 ;BEGIN CODE
 kmyQuest.AddAmulet()
-SetStage(295)
+SetCurrentStageID(295)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -682,7 +682,7 @@ EndFunction
 Function Fragment_150()
 ;BEGIN CODE
 UnregisterForUpdate()
-self.setstage(45)
+self.SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/qf_mq12a_0011b063.psc b/source/scripts/qf_mq12a_0011b063.psc
index 31000202..91922e75 100644
--- a/source/scripts/qf_mq12a_0011b063.psc
+++ b/source/scripts/qf_mq12a_0011b063.psc
@@ -44,7 +44,7 @@ _00E_MQ12a_Functions kmyQuest = __temp as _00E_MQ12a_Functions
 kmyQuest.UpdateStoneCount()
 kmyQuest.StartSC03()
 kmyQuest.StartMQ12bFailsave()
-MQ10b.SetStage(160)
+MQ10b.SetCurrentStageID(160)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/qf_mqp03_0007b1e5.psc b/source/scripts/qf_mqp03_0007b1e5.psc
index 3ab843d8..52d7c8de 100644
--- a/source/scripts/qf_mqp03_0007b1e5.psc
+++ b/source/scripts/qf_mqp03_0007b1e5.psc
@@ -35,7 +35,7 @@ _00E_MQP03_Functions kmyQuest = __temp as _00E_MQP03_Functions
 ;END AUTOCAST
 ;BEGIN CODE
 kmyQuest.FinishQuestAndStartMQ01()
-SetStage(75)
+SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/qf_nq15_00125367.psc b/source/scripts/qf_nq15_00125367.psc
index d0d0e992..1f136270 100644
--- a/source/scripts/qf_nq15_00125367.psc
+++ b/source/scripts/qf_nq15_00125367.psc
@@ -106,7 +106,7 @@ _00E_NQ15Functions kmyQuest = __temp as _00E_NQ15Functions
 ;BEGIN CODE
 kmyQuest.MarkAsNotFair()
 kmyQuest.GiveGold()
-SetStage(225)
+SetCurrentStageID(225)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -178,7 +178,7 @@ _00E_NQ15Functions kmyQuest = __temp as _00E_NQ15Functions
 ;END AUTOCAST
 ;BEGIN CODE
 kmyQuest.EnableContainerAndGiveKey()
-SetStage(255)
+SetCurrentStageID(255)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -226,7 +226,7 @@ _00E_NQ15Functions kmyQuest = __temp as _00E_NQ15Functions
 ;END AUTOCAST
 ;BEGIN CODE
 kmyQuest.MarkAsNotFair()
-SetStage(225)
+SetCurrentStageID(225)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -325,7 +325,7 @@ _00E_NQ15Functions kmyQuest = __temp as _00E_NQ15Functions
 kmyQuest.MarkAsNotFair()
 kmyQuest.GiveAmulet()
 kmyQuest.GiveGold()
-SetStage(225)
+SetCurrentStageID(225)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/qf_nq27_00149517.psc b/source/scripts/qf_nq27_00149517.psc
index f900c9bc..ff780330 100644
--- a/source/scripts/qf_nq27_00149517.psc
+++ b/source/scripts/qf_nq27_00149517.psc
@@ -239,7 +239,7 @@ if !IsObjectiveCompleted(60)
     SetObjectiveFailed(60)
 endif
 if IsObjectiveCompleted(20)
-    SetStage(100)
+    SetCurrentStageID(100)
 endif
 ;END CODE
 EndFunction
diff --git a/source/scripts/qf_nq_g_07_0013c2e4.psc b/source/scripts/qf_nq_g_07_0013c2e4.psc
index 4e1cb4cd..2c2ece75 100644
--- a/source/scripts/qf_nq_g_07_0013c2e4.psc
+++ b/source/scripts/qf_nq_g_07_0013c2e4.psc
@@ -151,7 +151,7 @@ _00E_NQ_G_07_Functions kmyQuest = __temp as _00E_NQ_G_07_Functions
 ;END AUTOCAST
 ;BEGIN CODE
 kmyQuest.ChairSwitch()
-SetStage(85)
+SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/qf_nq_g_07dijaam_0013fa27.psc b/source/scripts/qf_nq_g_07dijaam_0013fa27.psc
index 61dfcc2e..9494a117 100644
--- a/source/scripts/qf_nq_g_07dijaam_0013fa27.psc
+++ b/source/scripts/qf_nq_g_07dijaam_0013fa27.psc
@@ -273,7 +273,7 @@ _00E_NQ_G_07_Functions kmyQuest = __temp as _00E_NQ_G_07_Functions
 ;END AUTOCAST
 ;BEGIN CODE
 kmyQuest.DespawnHideOut()
-SetStage(170)
+SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -314,7 +314,7 @@ _00E_NQ_G_07_Functions kmyQuest = __temp as _00E_NQ_G_07_Functions
 ;BEGIN CODE
 kmyQuest.FinishQuestDijaam()
 kmyQuest.DespawnHideOut()
-SetStage(170)
+SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -414,7 +414,7 @@ _00E_NQ_G_07_Functions kmyQuest = __temp as _00E_NQ_G_07_Functions
 ;BEGIN CODE
 SetObjectiveCompleted(160)
 kmyQuest.FinishQuestDijaam()
-SetStage(170)
+SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -598,7 +598,7 @@ _00E_NQ_G_07_Functions kmyQuest = __temp as _00E_NQ_G_07_Functions
 ;END AUTOCAST
 ;BEGIN CODE
 kmyQuest.DespawnHideOut()
-SetStage(170)
+SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf__00e_mq02_thevoidpuzzle_00074b00.psc b/source/scripts/sf__00e_mq02_thevoidpuzzle_00074b00.psc
index 320b1643..a1e49e20 100644
--- a/source/scripts/sf__00e_mq02_thevoidpuzzle_00074b00.psc
+++ b/source/scripts/sf__00e_mq02_thevoidpuzzle_00074b00.psc
@@ -5,7 +5,7 @@ Scriptname SF__00E_MQ02_TheVoidPuzzle_00074B00 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf__00e_mq03_pathofhopescene_00032e83.psc b/source/scripts/sf__00e_mq03_pathofhopescene_00032e83.psc
index d624c4d1..bae4d69a 100644
--- a/source/scripts/sf__00e_mq03_pathofhopescene_00032e83.psc
+++ b/source/scripts/sf__00e_mq03_pathofhopescene_00032e83.psc
@@ -14,7 +14,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_7
 Function Fragment_7()
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf__00e_mq03_pathofhopescene_0007c97a.psc b/source/scripts/sf__00e_mq03_pathofhopescene_0007c97a.psc
index bf6f1a6f..a7999e1d 100644
--- a/source/scripts/sf__00e_mq03_pathofhopescene_0007c97a.psc
+++ b/source/scripts/sf__00e_mq03_pathofhopescene_0007c97a.psc
@@ -5,7 +5,7 @@ Scriptname SF__00E_MQ03_PathOfHopeScene_0007C97A Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_5
 Function Fragment_5()
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_bardaudiencescene01_00149596.psc b/source/scripts/sf_bardaudiencescene01_00149596.psc
index 6ca95b43..e9de97e5 100644
--- a/source/scripts/sf_bardaudiencescene01_00149596.psc
+++ b/source/scripts/sf_bardaudiencescene01_00149596.psc
@@ -5,7 +5,7 @@ Scriptname SF_BardAudienceScene01_00149596 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(200)
+GetOwningQuest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_bardaudiencescene02_00149597.psc b/source/scripts/sf_bardaudiencescene02_00149597.psc
index f792f849..7165b39c 100644
--- a/source/scripts/sf_bardaudiencescene02_00149597.psc
+++ b/source/scripts/sf_bardaudiencescene02_00149597.psc
@@ -5,7 +5,7 @@ Scriptname SF_BardAudienceScene02_00149597 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(200)
+GetOwningQuest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_cqc01_sc01_caliacuratoriu_0013d0d9.psc b/source/scripts/sf_cqc01_sc01_caliacuratoriu_0013d0d9.psc
index 8a477b80..67496ffa 100644
--- a/source/scripts/sf_cqc01_sc01_caliacuratoriu_0013d0d9.psc
+++ b/source/scripts/sf_cqc01_sc01_caliacuratoriu_0013d0d9.psc
@@ -5,7 +5,7 @@ Scriptname SF_CQC01_SC01_CaliaCuratoriu_0013D0D9 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(17)
+GetOwningQuest().SetCurrentStageID(17)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_cqc05_sc01_caliaromance01_00140073.psc b/source/scripts/sf_cqc05_sc01_caliaromance01_00140073.psc
index ce233f5e..f3b4a170 100644
--- a/source/scripts/sf_cqc05_sc01_caliaromance01_00140073.psc
+++ b/source/scripts/sf_cqc05_sc01_caliaromance01_00140073.psc
@@ -5,7 +5,7 @@ Scriptname SF_CQC05_SC01_CaliaRomance01_00140073 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_5
 Function Fragment_5()
 ;BEGIN CODE
-CQC05.SetStage(10)
+CQC05.SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-CQC05.SetStage(20)
+CQC05.SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_cqc06_sc02_room_001417b9.psc b/source/scripts/sf_cqc06_sc02_room_001417b9.psc
index aff2e879..90f51a47 100644
--- a/source/scripts/sf_cqc06_sc02_room_001417b9.psc
+++ b/source/scripts/sf_cqc06_sc02_room_001417b9.psc
@@ -14,7 +14,7 @@ EndFunction
 Function Fragment_0()
 ;BEGIN CODE
 CQC06.FadeBack()
-CQC06.SetStage(25)
+CQC06.SetCurrentStageID(25)
 AllowIdleChatter.SetValue(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_cqj02_sc03_lysia_02_0013c96b.psc b/source/scripts/sf_cqj02_sc03_lysia_02_0013c96b.psc
index e8faaef8..6818d2b3 100644
--- a/source/scripts/sf_cqj02_sc03_lysia_02_0013c96b.psc
+++ b/source/scripts/sf_cqj02_sc03_lysia_02_0013c96b.psc
@@ -5,7 +5,7 @@ Scriptname SF_CQJ02_SC03_Lysia_02_0013C96B Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-CQJ02.SetStage(35)
+CQJ02.SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-CQJ02.SetStage(35)
+CQJ02.SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_environmentscene02_magist_0014861a.psc b/source/scripts/sf_environmentscene02_magist_0014861a.psc
index dc8130ac..6ee31018 100644
--- a/source/scripts/sf_environmentscene02_magist_0014861a.psc
+++ b/source/scripts/sf_environmentscene02_magist_0014861a.psc
@@ -5,7 +5,7 @@ Scriptname SF_EnvironmentScene02_Magist_0014861A Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-EnvironmentScene02.SetStage(10)
+EnvironmentScene02.SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_environmentscene03_interl_0014862d.psc b/source/scripts/sf_environmentscene03_interl_0014862d.psc
index fd4b67bf..543c1b53 100644
--- a/source/scripts/sf_environmentscene03_interl_0014862d.psc
+++ b/source/scripts/sf_environmentscene03_interl_0014862d.psc
@@ -6,7 +6,7 @@ Scriptname SF_EnvironmentScene03_Interl_0014862D Extends Scene Hidden
 Function Fragment_0()
 ;BEGIN CODE
 Quest q = GetOwningQuest()
-q.SetStage(20)
+q.SetCurrentStageID(20)
 q.Stop()
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_environmentscene03_interl_0014862e.psc b/source/scripts/sf_environmentscene03_interl_0014862e.psc
index 96b0f92a..d2231d6b 100644
--- a/source/scripts/sf_environmentscene03_interl_0014862e.psc
+++ b/source/scripts/sf_environmentscene03_interl_0014862e.psc
@@ -6,7 +6,7 @@ Scriptname SF_EnvironmentScene03_Interl_0014862E Extends Scene Hidden
 Function Fragment_0()
 ;BEGIN CODE
 Quest q = GetOwningQuest()
-q.SetStage(20)
+q.SetCurrentStageID(20)
 q.Stop()
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_environmentscene03_sc_0014862a.psc b/source/scripts/sf_environmentscene03_sc_0014862a.psc
index 4a48a450..1fb13146 100644
--- a/source/scripts/sf_environmentscene03_sc_0014862a.psc
+++ b/source/scripts/sf_environmentscene03_sc_0014862a.psc
@@ -6,7 +6,7 @@ Scriptname SF_EnvironmentScene03_SC_0014862A Extends Scene Hidden
 Function Fragment_2()
 ;BEGIN CODE
 Quest q = GetOwningQuest()
-q.SetStage(20)
+q.SetCurrentStageID(20)
 q.Stop()
 ;END CODE
 EndFunction
@@ -15,7 +15,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_environmentscene04_sc01_0014864a.psc b/source/scripts/sf_environmentscene04_sc01_0014864a.psc
index 64ff1667..fd1e4893 100644
--- a/source/scripts/sf_environmentscene04_sc01_0014864a.psc
+++ b/source/scripts/sf_environmentscene04_sc01_0014864a.psc
@@ -5,7 +5,7 @@ Scriptname SF_EnvironmentScene04_SC01_0014864A Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_environmentscene05_sc_0014ce42.psc b/source/scripts/sf_environmentscene05_sc_0014ce42.psc
index 1a9f8e49..30a9abfe 100644
--- a/source/scripts/sf_environmentscene05_sc_0014ce42.psc
+++ b/source/scripts/sf_environmentscene05_sc_0014ce42.psc
@@ -5,7 +5,7 @@ Scriptname SF_EnvironmentScene05_SC_0014CE42 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_cqt01_sc01_tharaelmemo_0101ebaa.psc b/source/scripts/sf_fs_cqt01_sc01_tharaelmemo_0101ebaa.psc
index abab8f5e..1f73810f 100644
--- a/source/scripts/sf_fs_cqt01_sc01_tharaelmemo_0101ebaa.psc
+++ b/source/scripts/sf_fs_cqt01_sc01_tharaelmemo_0101ebaa.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_CQT01_SC01_TharaelMemo_0101EBAA Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -45,7 +45,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_6
 Function Fragment_6()
 ;BEGIN CODE
-FS_CQT01.SetStage(40)
+FS_CQT01.SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -53,7 +53,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-FS_CQT01.SetStage(30)
+FS_CQT01.SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_cqt01_sc01_tharaelmemo_0200f75c.psc b/source/scripts/sf_fs_cqt01_sc01_tharaelmemo_0200f75c.psc
index 41c1c52b..e46171de 100644
--- a/source/scripts/sf_fs_cqt01_sc01_tharaelmemo_0200f75c.psc
+++ b/source/scripts/sf_fs_cqt01_sc01_tharaelmemo_0200f75c.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_CQT01_SC01_TharaelMemo_0200F75C Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-FS_CQT01.SetStage(30)
+FS_CQT01.SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_6
 Function Fragment_6()
 ;BEGIN CODE
-FS_CQT01.SetStage(40)
+FS_CQT01.SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -29,7 +29,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -46,7 +46,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_environmentscene01_sce_0102e14b.psc b/source/scripts/sf_fs_environmentscene01_sce_0102e14b.psc
index 4b9cd40c..5190ee68 100644
--- a/source/scripts/sf_fs_environmentscene01_sce_0102e14b.psc
+++ b/source/scripts/sf_fs_environmentscene01_sce_0102e14b.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_EnvironmentScene01_Sce_0102E14B Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_environmentscene02_sce_0202e311.psc b/source/scripts/sf_fs_environmentscene02_sce_0202e311.psc
index 78da3506..edce7806 100644
--- a/source/scripts/sf_fs_environmentscene02_sce_0202e311.psc
+++ b/source/scripts/sf_fs_environmentscene02_sce_0202e311.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 AllowIdleChatter.SetValue(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_fs_environmentscene04_sce_0102e997.psc b/source/scripts/sf_fs_environmentscene04_sce_0102e997.psc
index f01095e1..d43bc19b 100644
--- a/source/scripts/sf_fs_environmentscene04_sce_0102e997.psc
+++ b/source/scripts/sf_fs_environmentscene04_sce_0102e997.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_EnvironmentScene04_Sce_0102E997 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-FS_EnvironmentScene04.SetStage(10)
+FS_EnvironmentScene04.SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_environmentscene06_sce_0102ef8a.psc b/source/scripts/sf_fs_environmentscene06_sce_0102ef8a.psc
index 96bcbc13..6f2a5be4 100644
--- a/source/scripts/sf_fs_environmentscene06_sce_0102ef8a.psc
+++ b/source/scripts/sf_fs_environmentscene06_sce_0102ef8a.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 CapitalCityWaterMill02.SetPublic(False)
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_fs_mq18c_sc01_qyrasc_0101bea6.psc b/source/scripts/sf_fs_mq18c_sc01_qyrasc_0101bea6.psc
index 81cf6abe..0d517cd3 100644
--- a/source/scripts/sf_fs_mq18c_sc01_qyrasc_0101bea6.psc
+++ b/source/scripts/sf_fs_mq18c_sc01_qyrasc_0101bea6.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_9
 Function Fragment_9()
 ;BEGIN CODE
-GetOwningQuest().SetStage(18)
+GetOwningQuest().SetCurrentStageID(18)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq01_sc01_expositionin_0004415d.psc b/source/scripts/sf_fs_nq01_sc01_expositionin_0004415d.psc
index 84154f59..e65b58a4 100644
--- a/source/scripts/sf_fs_nq01_sc01_expositionin_0004415d.psc
+++ b/source/scripts/sf_fs_nq01_sc01_expositionin_0004415d.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ01_SC01_ExpositionIn_0004415D Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-FS_NQ01.SetStage(25)
+FS_NQ01.SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq01_sc07_worldwalker__01007ee9.psc b/source/scripts/sf_fs_nq01_sc07_worldwalker__01007ee9.psc
index 73af1837..d5ccbfd9 100644
--- a/source/scripts/sf_fs_nq01_sc07_worldwalker__01007ee9.psc
+++ b/source/scripts/sf_fs_nq01_sc07_worldwalker__01007ee9.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ01_SC07_Worldwalker__01007EE9 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_10
 Function Fragment_10()
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq01_sc08_qyra_01_0100a69f.psc b/source/scripts/sf_fs_nq01_sc08_qyra_01_0100a69f.psc
index e111858c..b7aa16ce 100644
--- a/source/scripts/sf_fs_nq01_sc08_qyra_01_0100a69f.psc
+++ b/source/scripts/sf_fs_nq01_sc08_qyra_01_0100a69f.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(120)
+GetOwningQuest().SetCurrentStageID(120)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -40,7 +40,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(125)
+GetOwningQuest().SetCurrentStageID(125)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq01_sc10_qyra_secrete_0100f745.psc b/source/scripts/sf_fs_nq01_sc10_qyra_secrete_0100f745.psc
index 3edd4b90..2aa8d320 100644
--- a/source/scripts/sf_fs_nq01_sc10_qyra_secrete_0100f745.psc
+++ b/source/scripts/sf_fs_nq01_sc10_qyra_secrete_0100f745.psc
@@ -38,7 +38,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_11
 Function Fragment_11()
 ;BEGIN CODE
-GetOwningQuest().SetStage(140)
+GetOwningQuest().SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc06_mitdunkan_01028e82.psc b/source/scripts/sf_fs_nq02_sc06_mitdunkan_01028e82.psc
index 3d7632aa..20c16036 100644
--- a/source/scripts/sf_fs_nq02_sc06_mitdunkan_01028e82.psc
+++ b/source/scripts/sf_fs_nq02_sc06_mitdunkan_01028e82.psc
@@ -14,7 +14,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(280)
+GetOwningQuest().SetCurrentStageID(280)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc06_mitdunkan_02007f64.psc b/source/scripts/sf_fs_nq02_sc06_mitdunkan_02007f64.psc
index ff0d6b63..c257c29b 100644
--- a/source/scripts/sf_fs_nq02_sc06_mitdunkan_02007f64.psc
+++ b/source/scripts/sf_fs_nq02_sc06_mitdunkan_02007f64.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ02_SC06_mitDunkan_02007F64 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(280)
+GetOwningQuest().SetCurrentStageID(280)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc06_ohnedunkan_01028e81.psc b/source/scripts/sf_fs_nq02_sc06_ohnedunkan_01028e81.psc
index 6d2458a4..188bf7c4 100644
--- a/source/scripts/sf_fs_nq02_sc06_ohnedunkan_01028e81.psc
+++ b/source/scripts/sf_fs_nq02_sc06_ohnedunkan_01028e81.psc
@@ -14,7 +14,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(280)
+GetOwningQuest().SetCurrentStageID(280)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc06_ohnedunkan_02007f63.psc b/source/scripts/sf_fs_nq02_sc06_ohnedunkan_02007f63.psc
index ea32ea08..82474d5b 100644
--- a/source/scripts/sf_fs_nq02_sc06_ohnedunkan_02007f63.psc
+++ b/source/scripts/sf_fs_nq02_sc06_ohnedunkan_02007f63.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ02_SC06_ohneDunkan_02007F63 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(280)
+GetOwningQuest().SetCurrentStageID(280)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc07_keller_01028e89.psc b/source/scripts/sf_fs_nq02_sc07_keller_01028e89.psc
index d537b33d..e595b788 100644
--- a/source/scripts/sf_fs_nq02_sc07_keller_01028e89.psc
+++ b/source/scripts/sf_fs_nq02_sc07_keller_01028e89.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ02_SC07_Keller_01028E89 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(310)
+GetOwningQuest().SetCurrentStageID(310)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc09_aftervision_01028f7c.psc b/source/scripts/sf_fs_nq02_sc09_aftervision_01028f7c.psc
index c16844af..de109365 100644
--- a/source/scripts/sf_fs_nq02_sc09_aftervision_01028f7c.psc
+++ b/source/scripts/sf_fs_nq02_sc09_aftervision_01028f7c.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ02_SC09_AfterVision_01028F7C Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(420)
+GetOwningQuest().SetCurrentStageID(420)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc14_well_010298f7.psc b/source/scripts/sf_fs_nq02_sc14_well_010298f7.psc
index 97e4eb3b..325bd4b8 100644
--- a/source/scripts/sf_fs_nq02_sc14_well_010298f7.psc
+++ b/source/scripts/sf_fs_nq02_sc14_well_010298f7.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ02_SC14_Well_010298F7 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(670)
+GetOwningQuest().SetCurrentStageID(670)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc14_well_02006b69.psc b/source/scripts/sf_fs_nq02_sc14_well_02006b69.psc
index 591a78f1..2cf342d2 100644
--- a/source/scripts/sf_fs_nq02_sc14_well_02006b69.psc
+++ b/source/scripts/sf_fs_nq02_sc14_well_02006b69.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ02_SC14_Well_02006B69 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(670)
+GetOwningQuest().SetCurrentStageID(670)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc16_duenenhaim_01029938.psc b/source/scripts/sf_fs_nq02_sc16_duenenhaim_01029938.psc
index 666e6e23..c1d1dfbc 100644
--- a/source/scripts/sf_fs_nq02_sc16_duenenhaim_01029938.psc
+++ b/source/scripts/sf_fs_nq02_sc16_duenenhaim_01029938.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ02_SC16_Duenenhaim_01029938 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(815)
+GetOwningQuest().SetCurrentStageID(815)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc16_duenenhaim_0200e2ca.psc b/source/scripts/sf_fs_nq02_sc16_duenenhaim_0200e2ca.psc
index 2be43efa..1340b3d6 100644
--- a/source/scripts/sf_fs_nq02_sc16_duenenhaim_0200e2ca.psc
+++ b/source/scripts/sf_fs_nq02_sc16_duenenhaim_0200e2ca.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ02_SC16_Duenenhaim_0200E2CA Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(815)
+GetOwningQuest().SetCurrentStageID(815)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc17_ishmartep_01029955.psc b/source/scripts/sf_fs_nq02_sc17_ishmartep_01029955.psc
index b270a563..7c7a1dcb 100644
--- a/source/scripts/sf_fs_nq02_sc17_ishmartep_01029955.psc
+++ b/source/scripts/sf_fs_nq02_sc17_ishmartep_01029955.psc
@@ -14,7 +14,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(855)
+GetOwningQuest().SetCurrentStageID(855)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -22,7 +22,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(840)
+GetOwningQuest().SetCurrentStageID(840)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc17_ishmartep_02010aca.psc b/source/scripts/sf_fs_nq02_sc17_ishmartep_02010aca.psc
index b041b907..6c81e4ec 100644
--- a/source/scripts/sf_fs_nq02_sc17_ishmartep_02010aca.psc
+++ b/source/scripts/sf_fs_nq02_sc17_ishmartep_02010aca.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ02_SC17_Ishmartep_02010ACA Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(840)
+GetOwningQuest().SetCurrentStageID(840)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc18_vision_01029957.psc b/source/scripts/sf_fs_nq02_sc18_vision_01029957.psc
index 4b00b42a..0e212c4b 100644
--- a/source/scripts/sf_fs_nq02_sc18_vision_01029957.psc
+++ b/source/scripts/sf_fs_nq02_sc18_vision_01029957.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ02_SC18_Vision_01029957 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(880)
+GetOwningQuest().SetCurrentStageID(880)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc19_aftervision_01029b23.psc b/source/scripts/sf_fs_nq02_sc19_aftervision_01029b23.psc
index 4c64429d..30d5e58d 100644
--- a/source/scripts/sf_fs_nq02_sc19_aftervision_01029b23.psc
+++ b/source/scripts/sf_fs_nq02_sc19_aftervision_01029b23.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ02_SC19_AfterVision_01029B23 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(950)
+GetOwningQuest().SetCurrentStageID(950)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc19_aftervision_02011e00.psc b/source/scripts/sf_fs_nq02_sc19_aftervision_02011e00.psc
index 333fecaf..b368b790 100644
--- a/source/scripts/sf_fs_nq02_sc19_aftervision_02011e00.psc
+++ b/source/scripts/sf_fs_nq02_sc19_aftervision_02011e00.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ02_SC19_AfterVision_02011E00 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(950)
+GetOwningQuest().SetCurrentStageID(950)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc21_epilog_01029b5c.psc b/source/scripts/sf_fs_nq02_sc21_epilog_01029b5c.psc
index 2d5ca161..4758eda2 100644
--- a/source/scripts/sf_fs_nq02_sc21_epilog_01029b5c.psc
+++ b/source/scripts/sf_fs_nq02_sc21_epilog_01029b5c.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ02_SC21_Epilog_01029B5C Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(1010)
+GetOwningQuest().SetCurrentStageID(1010)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq02_sc21_epilog_020159d3.psc b/source/scripts/sf_fs_nq02_sc21_epilog_020159d3.psc
index aa56a7a2..1ce19ad0 100644
--- a/source/scripts/sf_fs_nq02_sc21_epilog_020159d3.psc
+++ b/source/scripts/sf_fs_nq02_sc21_epilog_020159d3.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ02_SC21_Epilog_020159D3 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(1010)
+GetOwningQuest().SetCurrentStageID(1010)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq03_sc02_prevision_0102aa42.psc b/source/scripts/sf_fs_nq03_sc02_prevision_0102aa42.psc
index b699314e..6716237f 100644
--- a/source/scripts/sf_fs_nq03_sc02_prevision_0102aa42.psc
+++ b/source/scripts/sf_fs_nq03_sc02_prevision_0102aa42.psc
@@ -14,7 +14,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq03_sc13_commenthideo_0102ae12.psc b/source/scripts/sf_fs_nq03_sc13_commenthideo_0102ae12.psc
index 64bca718..4b8bde50 100644
--- a/source/scripts/sf_fs_nq03_sc13_commenthideo_0102ae12.psc
+++ b/source/scripts/sf_fs_nq03_sc13_commenthideo_0102ae12.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ03_SC13_CommentHideo_0102AE12 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(170)
+GetOwningQuest().SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq03_sc17_commentlette_0102b3c6.psc b/source/scripts/sf_fs_nq03_sc17_commentlette_0102b3c6.psc
index c38901a0..afd27b5f 100644
--- a/source/scripts/sf_fs_nq03_sc17_commentlette_0102b3c6.psc
+++ b/source/scripts/sf_fs_nq03_sc17_commentlette_0102b3c6.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ03_SC17_CommentLette_0102B3C6 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(190)
+GetOwningQuest().SetCurrentStageID(190)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq03_sc18_tavernforceg_0102b8eb.psc b/source/scripts/sf_fs_nq03_sc18_tavernforceg_0102b8eb.psc
index bb2a6ec0..6223d61a 100644
--- a/source/scripts/sf_fs_nq03_sc18_tavernforceg_0102b8eb.psc
+++ b/source/scripts/sf_fs_nq03_sc18_tavernforceg_0102b8eb.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ03_SC18_TavernForceg_0102B8EB Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(200)
+GetOwningQuest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq03_sc19_garrecappear_0102b8f4.psc b/source/scripts/sf_fs_nq03_sc19_garrecappear_0102b8f4.psc
index 223a8eb0..2331ba33 100644
--- a/source/scripts/sf_fs_nq03_sc19_garrecappear_0102b8f4.psc
+++ b/source/scripts/sf_fs_nq03_sc19_garrecappear_0102b8f4.psc
@@ -23,7 +23,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(210)
+GetOwningQuest().SetCurrentStageID(210)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq03_sc20_taverntalk_0102b901.psc b/source/scripts/sf_fs_nq03_sc20_taverntalk_0102b901.psc
index ddd18d4c..13ac209c 100644
--- a/source/scripts/sf_fs_nq03_sc20_taverntalk_0102b901.psc
+++ b/source/scripts/sf_fs_nq03_sc20_taverntalk_0102b901.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ03_SC20_TavernTalk_0102B901 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(220)
+GetOwningQuest().SetCurrentStageID(220)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq03_sc21_lisharimurde_0102b915.psc b/source/scripts/sf_fs_nq03_sc21_lisharimurde_0102b915.psc
index 0d78de00..119eef3c 100644
--- a/source/scripts/sf_fs_nq03_sc21_lisharimurde_0102b915.psc
+++ b/source/scripts/sf_fs_nq03_sc21_lisharimurde_0102b915.psc
@@ -41,7 +41,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_7
 Function Fragment_7()
 ;BEGIN CODE
-GetOwningQuest().SetStage(240)
+GetOwningQuest().SetCurrentStageID(240)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq03_sc22_epilog_0102b921.psc b/source/scripts/sf_fs_nq03_sc22_epilog_0102b921.psc
index 478f0805..36b97bf0 100644
--- a/source/scripts/sf_fs_nq03_sc22_epilog_0102b921.psc
+++ b/source/scripts/sf_fs_nq03_sc22_epilog_0102b921.psc
@@ -23,7 +23,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(280)
+GetOwningQuest().SetCurrentStageID(280)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq07_sc01_tavern_0101ecd9.psc b/source/scripts/sf_fs_nq07_sc01_tavern_0101ecd9.psc
index 342ed1c3..197eef0c 100644
--- a/source/scripts/sf_fs_nq07_sc01_tavern_0101ecd9.psc
+++ b/source/scripts/sf_fs_nq07_sc01_tavern_0101ecd9.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQ07_SC01_Tavern_0101ECD9 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nq07_sc05_manfredseele_01024b61.psc b/source/scripts/sf_fs_nq07_sc05_manfredseele_01024b61.psc
index 4d18ab05..4ad4789a 100644
--- a/source/scripts/sf_fs_nq07_sc05_manfredseele_01024b61.psc
+++ b/source/scripts/sf_fs_nq07_sc05_manfredseele_01024b61.psc
@@ -43,7 +43,7 @@ EndFunction
 Function Fragment_11()
 ;BEGIN CODE
 _00E_FS_NQ07_Functions FS_NQ07 = GetOwningQuest() as _00E_FS_NQ07_Functions
-FS_NQ07.SetStage(290)
+FS_NQ07.SetCurrentStageID(290)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr02_sc02_meetingqali_0101c6c5.psc b/source/scripts/sf_fs_nqr02_sc02_meetingqali_0101c6c5.psc
index 3d16553f..06352d55 100644
--- a/source/scripts/sf_fs_nqr02_sc02_meetingqali_0101c6c5.psc
+++ b/source/scripts/sf_fs_nqr02_sc02_meetingqali_0101c6c5.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr02_sc03_qalianleads_0101c6dc.psc b/source/scripts/sf_fs_nqr02_sc03_qalianleads_0101c6dc.psc
index 478c2877..d7d89387 100644
--- a/source/scripts/sf_fs_nqr02_sc03_qalianleads_0101c6dc.psc
+++ b/source/scripts/sf_fs_nqr02_sc03_qalianleads_0101c6dc.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR02_SC03_QalianLeads_0101C6DC Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr02_sc04_tarpit_0101c6f2.psc b/source/scripts/sf_fs_nqr02_sc04_tarpit_0101c6f2.psc
index 352ec879..1dae9333 100644
--- a/source/scripts/sf_fs_nqr02_sc04_tarpit_0101c6f2.psc
+++ b/source/scripts/sf_fs_nqr02_sc04_tarpit_0101c6f2.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr02_sc05_corpsedisco_0101c709.psc b/source/scripts/sf_fs_nqr02_sc05_corpsedisco_0101c709.psc
index 8fc46a3a..466d2b39 100644
--- a/source/scripts/sf_fs_nqr02_sc05_corpsedisco_0101c709.psc
+++ b/source/scripts/sf_fs_nqr02_sc05_corpsedisco_0101c709.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR02_SC05_CorpseDisco_0101C709 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_9
 Function Fragment_9()
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr02_sc06_qalianconfr_0101c72e.psc b/source/scripts/sf_fs_nqr02_sc06_qalianconfr_0101c72e.psc
index b6b4b1b5..2c7da7f7 100644
--- a/source/scripts/sf_fs_nqr02_sc06_qalianconfr_0101c72e.psc
+++ b/source/scripts/sf_fs_nqr02_sc06_qalianconfr_0101c72e.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr03_sc02_templescene_0101c90c.psc b/source/scripts/sf_fs_nqr03_sc02_templescene_0101c90c.psc
index e4d43165..651859ec 100644
--- a/source/scripts/sf_fs_nqr03_sc02_templescene_0101c90c.psc
+++ b/source/scripts/sf_fs_nqr03_sc02_templescene_0101c90c.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR03_SC02_TempleScene_0101C90C Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr03_sc02_templescene_0200301d.psc b/source/scripts/sf_fs_nqr03_sc02_templescene_0200301d.psc
index e08b9019..19b2d2ca 100644
--- a/source/scripts/sf_fs_nqr03_sc02_templescene_0200301d.psc
+++ b/source/scripts/sf_fs_nqr03_sc02_templescene_0200301d.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR03_SC02_TempleScene_0200301D Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr03_sc04_templescene_0101cae1.psc b/source/scripts/sf_fs_nqr03_sc04_templescene_0101cae1.psc
index 3ca6b740..c1eb5ad2 100644
--- a/source/scripts/sf_fs_nqr03_sc04_templescene_0101cae1.psc
+++ b/source/scripts/sf_fs_nqr03_sc04_templescene_0101cae1.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR03_SC04_TempleScene_0101CAE1 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr03_sc04_templescene_0200bc5c.psc b/source/scripts/sf_fs_nqr03_sc04_templescene_0200bc5c.psc
index c7eac82c..b757bb71 100644
--- a/source/scripts/sf_fs_nqr03_sc04_templescene_0200bc5c.psc
+++ b/source/scripts/sf_fs_nqr03_sc04_templescene_0200bc5c.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR03_SC04_TempleScene_0200BC5C Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr04_sc02_tharaelzork_0101e8af.psc b/source/scripts/sf_fs_nqr04_sc02_tharaelzork_0101e8af.psc
index e3e7f4bf..4e1b0e7b 100644
--- a/source/scripts/sf_fs_nqr04_sc02_tharaelzork_0101e8af.psc
+++ b/source/scripts/sf_fs_nqr04_sc02_tharaelzork_0101e8af.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_6
 Function Fragment_6()
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr04_sc03_tharaelorph_0101eb2c.psc b/source/scripts/sf_fs_nqr04_sc03_tharaelorph_0101eb2c.psc
index 119c870a..a4f41b9d 100644
--- a/source/scripts/sf_fs_nqr04_sc03_tharaelorph_0101eb2c.psc
+++ b/source/scripts/sf_fs_nqr04_sc03_tharaelorph_0101eb2c.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR04_SC03_TharaelOrph_0101EB2C Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr04_sc03_tharaelorph_02007f46.psc b/source/scripts/sf_fs_nqr04_sc03_tharaelorph_02007f46.psc
index e00d7358..0ef54e25 100644
--- a/source/scripts/sf_fs_nqr04_sc03_tharaelorph_02007f46.psc
+++ b/source/scripts/sf_fs_nqr04_sc03_tharaelorph_02007f46.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR04_SC03_TharaelOrph_02007F46 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr04_sc04_tharaelseiz_0101eb92.psc b/source/scripts/sf_fs_nqr04_sc04_tharaelseiz_0101eb92.psc
index ce8601db..a199c8b1 100644
--- a/source/scripts/sf_fs_nqr04_sc04_tharaelseiz_0101eb92.psc
+++ b/source/scripts/sf_fs_nqr04_sc04_tharaelseiz_0101eb92.psc
@@ -6,7 +6,7 @@ Scriptname SF_FS_NQR04_SC04_TharaelSeiz_0101EB92 Extends Scene Hidden
 Function Fragment_5()
 ;BEGIN CODE
 FS_NQR04.FadeToBlackAndBackReal()
-FS_NQR04.Setstage(65)
+FS_NQR04.SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -22,7 +22,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-FS_NQR04.SetStage(80)
+FS_NQR04.SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -38,7 +38,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-FS_NQR04.SetStage(70)
+FS_NQR04.SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr04_sc05_tharaelwalk_0101eba6.psc b/source/scripts/sf_fs_nqr04_sc05_tharaelwalk_0101eba6.psc
index ffcf25e3..f1363a31 100644
--- a/source/scripts/sf_fs_nqr04_sc05_tharaelwalk_0101eba6.psc
+++ b/source/scripts/sf_fs_nqr04_sc05_tharaelwalk_0101eba6.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR04_SC05_TharaelWalk_0101EBA6 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr04_sc05_tharaelwalk_0200f74d.psc b/source/scripts/sf_fs_nqr04_sc05_tharaelwalk_0200f74d.psc
index 90d98e5f..c97c44aa 100644
--- a/source/scripts/sf_fs_nqr04_sc05_tharaelwalk_0200f74d.psc
+++ b/source/scripts/sf_fs_nqr04_sc05_tharaelwalk_0200f74d.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR04_SC05_TharaelWalk_0200F74D Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc01_dream_0101efa4.psc b/source/scripts/sf_fs_nqr05_sc01_dream_0101efa4.psc
index 52cf9e05..d1023199 100644
--- a/source/scripts/sf_fs_nqr05_sc01_dream_0101efa4.psc
+++ b/source/scripts/sf_fs_nqr05_sc01_dream_0101efa4.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR05_SC01_Dream_0101EFA4 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc02_father_0101f00b.psc b/source/scripts/sf_fs_nqr05_sc02_father_0101f00b.psc
index 857da54d..7ae03664 100644
--- a/source/scripts/sf_fs_nqr05_sc02_father_0101f00b.psc
+++ b/source/scripts/sf_fs_nqr05_sc02_father_0101f00b.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR05_SC02_Father_0101F00B Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_5
 Function Fragment_5()
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc03_tharaelprep_0101f126.psc b/source/scripts/sf_fs_nqr05_sc03_tharaelprep_0101f126.psc
index 06a6cb76..fcf6f58a 100644
--- a/source/scripts/sf_fs_nqr05_sc03_tharaelprep_0101f126.psc
+++ b/source/scripts/sf_fs_nqr05_sc03_tharaelprep_0101f126.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR05_SC03_TharaelPrep_0101F126 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc04_gatescene_0101f229.psc b/source/scripts/sf_fs_nqr05_sc04_gatescene_0101f229.psc
index be4978e0..6bba788d 100644
--- a/source/scripts/sf_fs_nqr05_sc04_gatescene_0101f229.psc
+++ b/source/scripts/sf_fs_nqr05_sc04_gatescene_0101f229.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR05_SC04_GateScene_0101F229 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc05_zaraah_0101f23a.psc b/source/scripts/sf_fs_nqr05_sc05_zaraah_0101f23a.psc
index 08d5d772..06c74e67 100644
--- a/source/scripts/sf_fs_nqr05_sc05_zaraah_0101f23a.psc
+++ b/source/scripts/sf_fs_nqr05_sc05_zaraah_0101f23a.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR05_SC05_Zaraah_0101F23A Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(105)
+GetOwningQuest().SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc06_fatherarriv_0101f27a.psc b/source/scripts/sf_fs_nqr05_sc06_fatherarriv_0101f27a.psc
index de9132f6..da84f241 100644
--- a/source/scripts/sf_fs_nqr05_sc06_fatherarriv_0101f27a.psc
+++ b/source/scripts/sf_fs_nqr05_sc06_fatherarriv_0101f27a.psc
@@ -61,7 +61,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(120)
+GetOwningQuest().SetCurrentStageID(120)
 FS_NQR05.FadeBack()
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_fs_nqr05_sc07_fatherplann_0101fdec.psc b/source/scripts/sf_fs_nqr05_sc07_fatherplann_0101fdec.psc
index 3af69022..6335ab1d 100644
--- a/source/scripts/sf_fs_nqr05_sc07_fatherplann_0101fdec.psc
+++ b/source/scripts/sf_fs_nqr05_sc07_fatherplann_0101fdec.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR05_SC07_FatherPlann_0101FDEC Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(135)
+GetOwningQuest().SetCurrentStageID(135)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc08_preparation_0101fe00.psc b/source/scripts/sf_fs_nqr05_sc08_preparation_0101fe00.psc
index 50d8f7da..3dcc4e9b 100644
--- a/source/scripts/sf_fs_nqr05_sc08_preparation_0101fe00.psc
+++ b/source/scripts/sf_fs_nqr05_sc08_preparation_0101fe00.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-FS_NQR05.SetStage(140)
+FS_NQR05.SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc09_enterscene_0101fe3f.psc b/source/scripts/sf_fs_nqr05_sc09_enterscene_0101fe3f.psc
index 1e49a030..c392af63 100644
--- a/source/scripts/sf_fs_nqr05_sc09_enterscene_0101fe3f.psc
+++ b/source/scripts/sf_fs_nqr05_sc09_enterscene_0101fe3f.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR05_SC09_EnterScene_0101FE3F Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc11_entrancesce_010240a7.psc b/source/scripts/sf_fs_nqr05_sc11_entrancesce_010240a7.psc
index 08f4a63f..7f3d613c 100644
--- a/source/scripts/sf_fs_nqr05_sc11_entrancesce_010240a7.psc
+++ b/source/scripts/sf_fs_nqr05_sc11_entrancesce_010240a7.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR05_SC11_EntranceSce_010240A7 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(160)
+GetOwningQuest().SetCurrentStageID(160)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc12_temple_01_01024145.psc b/source/scripts/sf_fs_nqr05_sc12_temple_01_01024145.psc
index d3362d80..c0f268da 100644
--- a/source/scripts/sf_fs_nqr05_sc12_temple_01_01024145.psc
+++ b/source/scripts/sf_fs_nqr05_sc12_temple_01_01024145.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-FS_NQR05.SetStage(170)
+FS_NQR05.SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc13_temple_02_01024158.psc b/source/scripts/sf_fs_nqr05_sc13_temple_02_01024158.psc
index 95221054..6a9f3c2b 100644
--- a/source/scripts/sf_fs_nqr05_sc13_temple_02_01024158.psc
+++ b/source/scripts/sf_fs_nqr05_sc13_temple_02_01024158.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-FS_NQR05.SetStage(185)
+FS_NQR05.SetCurrentStageID(185)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc14_temple_03_01024bf7.psc b/source/scripts/sf_fs_nqr05_sc14_temple_03_01024bf7.psc
index 2c04a740..4a0f5559 100644
--- a/source/scripts/sf_fs_nqr05_sc14_temple_03_01024bf7.psc
+++ b/source/scripts/sf_fs_nqr05_sc14_temple_03_01024bf7.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR05_SC14_Temple_03_01024BF7 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(210)
+GetOwningQuest().SetCurrentStageID(210)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(200)
+GetOwningQuest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(190)
+GetOwningQuest().SetCurrentStageID(190)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc15_temple_04_01024c09.psc b/source/scripts/sf_fs_nqr05_sc15_temple_04_01024c09.psc
index 53701d7c..7b09c109 100644
--- a/source/scripts/sf_fs_nqr05_sc15_temple_04_01024c09.psc
+++ b/source/scripts/sf_fs_nqr05_sc15_temple_04_01024c09.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR05_SC15_Temple_04_01024C09 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(215)
+GetOwningQuest().SetCurrentStageID(215)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc16_temple_05_01024c1a.psc b/source/scripts/sf_fs_nqr05_sc16_temple_05_01024c1a.psc
index 63c40cc5..75e5dd82 100644
--- a/source/scripts/sf_fs_nqr05_sc16_temple_05_01024c1a.psc
+++ b/source/scripts/sf_fs_nqr05_sc16_temple_05_01024c1a.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-FS_NQR05.SetStage(240)
+FS_NQR05.SetCurrentStageID(240)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -38,7 +38,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_12
 Function Fragment_12()
 ;BEGIN CODE
-FS_NQR05.SetStage(250)
+FS_NQR05.SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc17_afterbossfi_01029a2d.psc b/source/scripts/sf_fs_nqr05_sc17_afterbossfi_01029a2d.psc
index 8f11a22b..017baba3 100644
--- a/source/scripts/sf_fs_nqr05_sc17_afterbossfi_01029a2d.psc
+++ b/source/scripts/sf_fs_nqr05_sc17_afterbossfi_01029a2d.psc
@@ -54,7 +54,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_12
 Function Fragment_12()
 ;BEGIN CODE
-FS_NQR05.setStage(270)
+FS_NQR05.SetCurrentStageID(270)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc18a_mistrusthi_0102a05f.psc b/source/scripts/sf_fs_nqr05_sc18a_mistrusthi_0102a05f.psc
index 6f760948..e4cac36e 100644
--- a/source/scripts/sf_fs_nqr05_sc18a_mistrusthi_0102a05f.psc
+++ b/source/scripts/sf_fs_nqr05_sc18a_mistrusthi_0102a05f.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR05_SC18a_MistrustHi_0102A05F Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().setStage(275)
+GetOwningQuest().SetCurrentStageID(275)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_4
 Function Fragment_4()
 ;BEGIN CODE
-GetOwningQuest().SetStage(295)
+GetOwningQuest().SetCurrentStageID(295)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc18b_mistrustlo_0102a060.psc b/source/scripts/sf_fs_nqr05_sc18b_mistrustlo_0102a060.psc
index 32e5384a..1d23e78f 100644
--- a/source/scripts/sf_fs_nqr05_sc18b_mistrustlo_0102a060.psc
+++ b/source/scripts/sf_fs_nqr05_sc18b_mistrustlo_0102a060.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR05_SC18b_MistrustLo_0102A060 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_4
 Function Fragment_4()
 ;BEGIN CODE
-GetOwningQuest().SetStage(295)
+GetOwningQuest().SetCurrentStageID(295)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc19_fatherstory_0102a070.psc b/source/scripts/sf_fs_nqr05_sc19_fatherstory_0102a070.psc
index c737dfbc..93db595c 100644
--- a/source/scripts/sf_fs_nqr05_sc19_fatherstory_0102a070.psc
+++ b/source/scripts/sf_fs_nqr05_sc19_fatherstory_0102a070.psc
@@ -22,7 +22,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(310)
+GetOwningQuest().SetCurrentStageID(310)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -46,7 +46,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_21
 Function Fragment_21()
 ;BEGIN CODE
-FS_NQR05.SetStage(320)
+FS_NQR05.SetCurrentStageID(320)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -62,7 +62,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_9
 Function Fragment_9()
 ;BEGIN CODE
-GetOwningQuest().SetStage(300)
+GetOwningQuest().SetCurrentStageID(300)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr05_sc19_fatherstory_02011a0f.psc b/source/scripts/sf_fs_nqr05_sc19_fatherstory_02011a0f.psc
index 8be5c5f9..fe307a22 100644
--- a/source/scripts/sf_fs_nqr05_sc19_fatherstory_02011a0f.psc
+++ b/source/scripts/sf_fs_nqr05_sc19_fatherstory_02011a0f.psc
@@ -5,7 +5,7 @@ Scriptname SF_FS_NQR05_SC19_FatherStory_02011A0F Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(310)
+GetOwningQuest().SetCurrentStageID(310)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(300)
+GetOwningQuest().SetCurrentStageID(300)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_fs_nqr_sq_01_scene_01_0102e6ed.psc b/source/scripts/sf_fs_nqr_sq_01_scene_01_0102e6ed.psc
index f5c1862f..ea59dd8d 100644
--- a/source/scripts/sf_fs_nqr_sq_01_scene_01_0102e6ed.psc
+++ b/source/scripts/sf_fs_nqr_sq_01_scene_01_0102e6ed.psc
@@ -14,7 +14,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq01_sc2_carbosstairs_0012d953.psc b/source/scripts/sf_mq01_sc2_carbosstairs_0012d953.psc
index 3037c657..c3b003aa 100644
--- a/source/scripts/sf_mq01_sc2_carbosstairs_0012d953.psc
+++ b/source/scripts/sf_mq01_sc2_carbosstairs_0012d953.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ01_SC2_CarbosStairs_0012D953 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(12)
+GetOwningQuest().SetCurrentStageID(12)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq01_unchartedland_bandit_000824a4.psc b/source/scripts/sf_mq01_unchartedland_bandit_000824a4.psc
index 93d41e44..70d713e2 100644
--- a/source/scripts/sf_mq01_unchartedland_bandit_000824a4.psc
+++ b/source/scripts/sf_mq01_unchartedland_bandit_000824a4.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_6
 Function Fragment_6(ReferenceAlias akAlias)
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq02_sc1_jespardialogeint_000c5658.psc b/source/scripts/sf_mq02_sc1_jespardialogeint_000c5658.psc
index 4ef0b559..3ec1814c 100644
--- a/source/scripts/sf_mq02_sc1_jespardialogeint_000c5658.psc
+++ b/source/scripts/sf_mq02_sc1_jespardialogeint_000c5658.psc
@@ -14,7 +14,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_6
 Function Fragment_6()
 ;BEGIN CODE
-GetOwningQuest().SetStage(37)
+GetOwningQuest().SetCurrentStageID(37)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq03_sc2_playermeetskonst_000cc95f.psc b/source/scripts/sf_mq03_sc2_playermeetskonst_000cc95f.psc
index 10752b35..e663e5fd 100644
--- a/source/scripts/sf_mq03_sc2_playermeetskonst_000cc95f.psc
+++ b/source/scripts/sf_mq03_sc2_playermeetskonst_000cc95f.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ03_SC2_PlayerMeetsKonst_000CC95F Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1(ReferenceAlias akAlias)
 ;BEGIN CODE
-GetOwningQuest().SetStage(31)
+GetOwningQuest().SetCurrentStageID(31)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0(ReferenceAlias akAlias)
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq03_sc3_playermeetskonst_000cc957.psc b/source/scripts/sf_mq03_sc3_playermeetskonst_000cc957.psc
index aae2f3c4..8fc219c4 100644
--- a/source/scripts/sf_mq03_sc3_playermeetskonst_000cc957.psc
+++ b/source/scripts/sf_mq03_sc3_playermeetskonst_000cc957.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ03_SC3_PlayerMeetsKonst_000CC957 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(41)
+GetOwningQuest().SetCurrentStageID(41)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq04_sc1_lishariappears_0009fcc0.psc b/source/scripts/sf_mq04_sc1_lishariappears_0009fcc0.psc
index 6a1cdc47..89c0206e 100644
--- a/source/scripts/sf_mq04_sc1_lishariappears_0009fcc0.psc
+++ b/source/scripts/sf_mq04_sc1_lishariappears_0009fcc0.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ04_SC1_LishariAppears_0009FCC0 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_8
 Function Fragment_8()
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq05prologue_sc2_000ce2dd.psc b/source/scripts/sf_mq05prologue_sc2_000ce2dd.psc
index c064f085..c7b7de7f 100644
--- a/source/scripts/sf_mq05prologue_sc2_000ce2dd.psc
+++ b/source/scripts/sf_mq05prologue_sc2_000ce2dd.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ05Prologue_SC2_000CE2DD Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_4
 Function Fragment_4()
 ;BEGIN CODE
-GetOwningQUest().SetStage(36)
+GetOwningQUest().SetCurrentStageID(36)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq06_sc2_playerwakesupdup_000d8e9e.psc b/source/scripts/sf_mq06_sc2_playerwakesupdup_000d8e9e.psc
index 13f83361..ff722bcf 100644
--- a/source/scripts/sf_mq06_sc2_playerwakesupdup_000d8e9e.psc
+++ b/source/scripts/sf_mq06_sc2_playerwakesupdup_000d8e9e.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_6
 Function Fragment_6()
 ;BEGIN CODE
-GetOwningQuest().SetStage(21)
+GetOwningQuest().SetCurrentStageID(21)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq06_sc3_caliashowsplayer_000d8ec4.psc b/source/scripts/sf_mq06_sc3_caliashowsplayer_000d8ec4.psc
index ac7614a5..488715ec 100644
--- a/source/scripts/sf_mq06_sc3_caliashowsplayer_000d8ec4.psc
+++ b/source/scripts/sf_mq06_sc3_caliashowsplayer_000d8ec4.psc
@@ -5,8 +5,8 @@ Scriptname SF_MQ06_SC3_CaliaShowsPlayer_000D8EC4 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-If MQ06.GetStage() < 31
-MQ06.SetStage(31)
+If MQ06.GetCurrentStageID() < 31
+MQ06.SetCurrentStageID(31)
 Endif
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_mq06_sc5_ritualscene_000fe207.psc b/source/scripts/sf_mq06_sc5_ritualscene_000fe207.psc
index e3358416..dfb7c2d7 100644
--- a/source/scripts/sf_mq06_sc5_ritualscene_000fe207.psc
+++ b/source/scripts/sf_mq06_sc5_ritualscene_000fe207.psc
@@ -39,7 +39,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq07a_sc10_magekillspyrea_0010a6f1.psc b/source/scripts/sf_mq07a_sc10_magekillspyrea_0010a6f1.psc
index 12669e4e..5c320651 100644
--- a/source/scripts/sf_mq07a_sc10_magekillspyrea_0010a6f1.psc
+++ b/source/scripts/sf_mq07a_sc10_magekillspyrea_0010a6f1.psc
@@ -15,9 +15,9 @@ Function Fragment_8()
 ;BEGIN CODE
 ; Failsave for the case that the ice spike doesn't
 ; hit the player:
-if MQ07a.GetStage() < 165
+if MQ07a.GetCurrentStageID() < 165
     Utility.Wait(5)
-    if MQ07a.GetStage() < 165
+    if MQ07a.GetCurrentStageID() < 165
         MQ07a.FreezePlayer()
     endif
 endif
diff --git a/source/scripts/sf_mq07a_sc12_jesparfinaldia_0010a751.psc b/source/scripts/sf_mq07a_sc12_jesparfinaldia_0010a751.psc
index a27e73ca..86fd54eb 100644
--- a/source/scripts/sf_mq07a_sc12_jesparfinaldia_0010a751.psc
+++ b/source/scripts/sf_mq07a_sc12_jesparfinaldia_0010a751.psc
@@ -6,7 +6,7 @@ Scriptname SF_MQ07A_SC12_JesparFinalDia_0010A751 Extends Scene Hidden
 Function Fragment_10()
 ;BEGIN CODE
 AllowIdleChatter.SetValue(0)
-If GetOwningQuest().GetStage() == 187
+If GetOwningQuest().GetCurrentStageID() == 187
 	Utility.Wait(3.0) ; Wait a bit for the player to end teleporting
 Else
 	Utility.Wait(0.1)
diff --git a/source/scripts/sf_mq07a_sc14_sigilstoneacti_0010a76f.psc b/source/scripts/sf_mq07a_sc14_sigilstoneacti_0010a76f.psc
index 96a79692..97f3cfd1 100644
--- a/source/scripts/sf_mq07a_sc14_sigilstoneacti_0010a76f.psc
+++ b/source/scripts/sf_mq07a_sc14_sigilstoneacti_0010a76f.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_5
 Function Fragment_5()
 ;BEGIN CODE
-GetOwningQuest().SetStage(215)
+GetOwningQuest().SetCurrentStageID(215)
 (Game.GetPlayer() as _00E_PlayerFunctions).ResumeRandomHeadTracking()
 MQ07A.EndSC14()
 ;END CODE
@@ -55,7 +55,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_13
 Function Fragment_13()
 ;BEGIN CODE
-MQ07a.SetStage(197)
+MQ07a.SetCurrentStageID(197)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq07a_sc1_explanationinch_001065b8.psc b/source/scripts/sf_mq07a_sc1_explanationinch_001065b8.psc
index 0155cb27..d57f1d30 100644
--- a/source/scripts/sf_mq07a_sc1_explanationinch_001065b8.psc
+++ b/source/scripts/sf_mq07a_sc1_explanationinch_001065b8.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ07a_SC1_ExplanationInCh_001065B8 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -45,7 +45,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq07a_sc6_doorstep_001067ca.psc b/source/scripts/sf_mq07a_sc6_doorstep_001067ca.psc
index 7a8bc117..3602dfa7 100644
--- a/source/scripts/sf_mq07a_sc6_doorstep_001067ca.psc
+++ b/source/scripts/sf_mq07a_sc6_doorstep_001067ca.psc
@@ -30,7 +30,7 @@ EndFunction
 Function Fragment_8()
 ;BEGIN CODE
 MQ07a.SC06DoorstepFailsave2()
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq07a_sc8_playerreadscrol_0010a69c.psc b/source/scripts/sf_mq07a_sc8_playerreadscrol_0010a69c.psc
index ac57bda7..273b0077 100644
--- a/source/scripts/sf_mq07a_sc8_playerreadscrol_0010a69c.psc
+++ b/source/scripts/sf_mq07a_sc8_playerreadscrol_0010a69c.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_25
 Function Fragment_25()
 ;BEGIN CODE
-GetOwningQuest().SetStage(145)
+GetOwningQuest().SetCurrentStageID(145)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq07a_sc9_battle_0010a6ae.psc b/source/scripts/sf_mq07a_sc9_battle_0010a6ae.psc
index 4caa6cf9..dbed0c32 100644
--- a/source/scripts/sf_mq07a_sc9_battle_0010a6ae.psc
+++ b/source/scripts/sf_mq07a_sc9_battle_0010a6ae.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_7
 Function Fragment_7()
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq07b_deusexmachina_karek_000a94e0.psc b/source/scripts/sf_mq07b_deusexmachina_karek_000a94e0.psc
index 65c203c0..6783126d 100644
--- a/source/scripts/sf_mq07b_deusexmachina_karek_000a94e0.psc
+++ b/source/scripts/sf_mq07b_deusexmachina_karek_000a94e0.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ07b_DeusExMachina_Karek_000A94E0 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_20
 Function Fragment_20()
 ;BEGIN CODE
-GetOwningQuest().SetStage(105)
+GetOwningQuest().SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_7
 Function Fragment_7()
 ;BEGIN CODE
-MQ07b.SetSTage(95)
+MQ07b.SetCurrentStageID(95)
 MQ07b.KillKarekFailsave()
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_mq07b_deusexmachina_scene_000a91eb.psc b/source/scripts/sf_mq07b_deusexmachina_scene_000a91eb.psc
index 2e3d580c..71ac87df 100644
--- a/source/scripts/sf_mq07b_deusexmachina_scene_000a91eb.psc
+++ b/source/scripts/sf_mq07b_deusexmachina_scene_000a91eb.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ07b_DeusExMachina_Scene_000A91EB Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq07b_deusexmachina_scene_000a9aba.psc b/source/scripts/sf_mq07b_deusexmachina_scene_000a9aba.psc
index 2a1a2e40..8fbb0931 100644
--- a/source/scripts/sf_mq07b_deusexmachina_scene_000a9aba.psc
+++ b/source/scripts/sf_mq07b_deusexmachina_scene_000a9aba.psc
@@ -47,7 +47,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_26
 Function Fragment_26()
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq08_intothedeep_gototrai_000d0edc.psc b/source/scripts/sf_mq08_intothedeep_gototrai_000d0edc.psc
index 11bce6c1..27f7b4e0 100644
--- a/source/scripts/sf_mq08_intothedeep_gototrai_000d0edc.psc
+++ b/source/scripts/sf_mq08_intothedeep_gototrai_000d0edc.psc
@@ -15,7 +15,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_26
 Function Fragment_26()
 ;BEGIN CODE
-GetOwningQuest().SetStage(170)
+GetOwningQuest().SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq08_intothedeep_gototrai_000e1a12.psc b/source/scripts/sf_mq08_intothedeep_gototrai_000e1a12.psc
index d104bf62..17ac1fd9 100644
--- a/source/scripts/sf_mq08_intothedeep_gototrai_000e1a12.psc
+++ b/source/scripts/sf_mq08_intothedeep_gototrai_000e1a12.psc
@@ -29,7 +29,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_4
 Function Fragment_4()
 ;BEGIN CODE
-GetOwningQuest().SetStage(215)
+GetOwningQuest().SetCurrentStageID(215)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq08_intothedeep_gototrai_000ea944.psc b/source/scripts/sf_mq08_intothedeep_gototrai_000ea944.psc
index 45b3fdf5..d6392b58 100644
--- a/source/scripts/sf_mq08_intothedeep_gototrai_000ea944.psc
+++ b/source/scripts/sf_mq08_intothedeep_gototrai_000ea944.psc
@@ -46,8 +46,8 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_8
 Function Fragment_8()
 ;BEGIN CODE
-GetOwningQuest().SetStage(220)
-MQ09.SetStage(5)
+GetOwningQuest().SetCurrentStageID(220)
+MQ09.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq08_intothedeep_nebelhai_000a85bf.psc b/source/scripts/sf_mq08_intothedeep_nebelhai_000a85bf.psc
index 1681a687..3b6b5d51 100644
--- a/source/scripts/sf_mq08_intothedeep_nebelhai_000a85bf.psc
+++ b/source/scripts/sf_mq08_intothedeep_nebelhai_000a85bf.psc
@@ -18,7 +18,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -26,7 +26,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq08_intothedeep_scenetem_000d0eaa.psc b/source/scripts/sf_mq08_intothedeep_scenetem_000d0eaa.psc
index fad1bc16..064585c4 100644
--- a/source/scripts/sf_mq08_intothedeep_scenetem_000d0eaa.psc
+++ b/source/scripts/sf_mq08_intothedeep_scenetem_000d0eaa.psc
@@ -60,7 +60,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_39
 Function Fragment_39()
 ;BEGIN CODE
-GetOwningQuest().SetStage(140)
+GetOwningQuest().SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -68,7 +68,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_16
 Function Fragment_16()
 ;BEGIN CODE
-GetOwningQuest().SetStage(145)
+GetOwningQuest().SetCurrentStageID(145)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq08prologue_sc1_discussi_0010d1a1.psc b/source/scripts/sf_mq08prologue_sc1_discussi_0010d1a1.psc
index 7b3b07f7..534a3f9f 100644
--- a/source/scripts/sf_mq08prologue_sc1_discussi_0010d1a1.psc
+++ b/source/scripts/sf_mq08prologue_sc1_discussi_0010d1a1.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 (Game.GetPlayer() as _00E_PlayerFunctions).ResumeRandomHeadTracking()
 ;END CODE
 EndFunction
@@ -39,7 +39,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq09_d1_sceneisle_000ea957.psc b/source/scripts/sf_mq09_d1_sceneisle_000ea957.psc
index f8d058be..3df704bc 100644
--- a/source/scripts/sf_mq09_d1_sceneisle_000ea957.psc
+++ b/source/scripts/sf_mq09_d1_sceneisle_000ea957.psc
@@ -40,7 +40,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 _00E_Func_SetNPCAsCompanion.SetNPCAsCompanion(_00E_MC_JesparREF, False)
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_mq09_d3_hohescene_000eaa5f.psc b/source/scripts/sf_mq09_d3_hohescene_000eaa5f.psc
index 28dc4db6..46e50743 100644
--- a/source/scripts/sf_mq09_d3_hohescene_000eaa5f.psc
+++ b/source/scripts/sf_mq09_d3_hohescene_000eaa5f.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ09_D3_HoheScene_000EAA5F Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -31,7 +31,7 @@ EndFunction
 Function Fragment_1()
 ;BEGIN CODE
 (Game.GetPlayer() as _00E_PlayerFunctions).ResumeRandomHeadTracking()
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq09_d4_taranorscene_000eac86.psc b/source/scripts/sf_mq09_d4_taranorscene_000eac86.psc
index 361be770..28ff261c 100644
--- a/source/scripts/sf_mq09_d4_taranorscene_000eac86.psc
+++ b/source/scripts/sf_mq09_d4_taranorscene_000eac86.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ09_D4_TaranorScene_000EAC86 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -15,7 +15,7 @@ Function Fragment_4()
 ;BEGIN CODE
 _00E_Func_AIWalk.PlayerAIWalkStop()
 Game.DisablePlayerControls(true, true, true, false, true, true, true)
-GetOwningQuest().SetStage(49)
+GetOwningQuest().SetCurrentStageID(49)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq09_d6_scene_000eac9d.psc b/source/scripts/sf_mq09_d6_scene_000eac9d.psc
index 4999b109..32205443 100644
--- a/source/scripts/sf_mq09_d6_scene_000eac9d.psc
+++ b/source/scripts/sf_mq09_d6_scene_000eac9d.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 MQ09.FadeInTealor()
 ;END CODE
 EndFunction
@@ -38,7 +38,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -95,7 +95,7 @@ EndFunction
 Function Fragment_8()
 ;BEGIN CODE
 MQ09.MovePlate()
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq10b_sc2_temple_001080c3.psc b/source/scripts/sf_mq10b_sc2_temple_001080c3.psc
index 24e33346..25aec796 100644
--- a/source/scripts/sf_mq10b_sc2_temple_001080c3.psc
+++ b/source/scripts/sf_mq10b_sc2_temple_001080c3.psc
@@ -41,7 +41,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 GetOwningQuest().SetObjectiveDisplayed(37)
 _00E_MQ10b_Questfunctions MQ10b = GetOwningQuest() as _00E_MQ10b_Questfunctions
 MQ10b.LockDoors()
@@ -69,7 +69,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_8
 Function Fragment_8()
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq10b_sc3_lisharidead_0010bbbb.psc b/source/scripts/sf_mq10b_sc3_lisharidead_0010bbbb.psc
index e9a231c0..b0c93306 100644
--- a/source/scripts/sf_mq10b_sc3_lisharidead_0010bbbb.psc
+++ b/source/scripts/sf_mq10b_sc3_lisharidead_0010bbbb.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ10b_SC3_LishariDead_0010BBBB Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq10b_sc4_tealor_0010bbba.psc b/source/scripts/sf_mq10b_sc4_tealor_0010bbba.psc
index 09cd320c..250ed235 100644
--- a/source/scripts/sf_mq10b_sc4_tealor_0010bbba.psc
+++ b/source/scripts/sf_mq10b_sc4_tealor_0010bbba.psc
@@ -22,7 +22,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq11a_sc05_calianorthwind_000de74c.psc b/source/scripts/sf_mq11a_sc05_calianorthwind_000de74c.psc
index 399dc10e..d02cddce 100644
--- a/source/scripts/sf_mq11a_sc05_calianorthwind_000de74c.psc
+++ b/source/scripts/sf_mq11a_sc05_calianorthwind_000de74c.psc
@@ -22,7 +22,7 @@ EndFunction
 Function Fragment_6()
 ;BEGIN CODE
 If !NQ34.IsCompleted()
-NQ34.SetStage(17)
+NQ34.SetCurrentStageID(17)
 EndIf
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_mq11a_sc20_libraryscene_000eaeb0.psc b/source/scripts/sf_mq11a_sc20_libraryscene_000eaeb0.psc
index 73f3472c..be971620 100644
--- a/source/scripts/sf_mq11a_sc20_libraryscene_000eaeb0.psc
+++ b/source/scripts/sf_mq11a_sc20_libraryscene_000eaeb0.psc
@@ -22,7 +22,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_31
 Function Fragment_31()
 ;BEGIN CODE
-Mq11a.SetStage(140)
+Mq11a.SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq11a_sc2_caliafrostcliff_000dd756.psc b/source/scripts/sf_mq11a_sc2_caliafrostcliff_000dd756.psc
index c0c241b6..52159852 100644
--- a/source/scripts/sf_mq11a_sc2_caliafrostcliff_000dd756.psc
+++ b/source/scripts/sf_mq11a_sc2_caliafrostcliff_000dd756.psc
@@ -22,7 +22,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq11b_s1_house_00110655.psc b/source/scripts/sf_mq11b_s1_house_00110655.psc
index a347f891..4cc21dae 100644
--- a/source/scripts/sf_mq11b_s1_house_00110655.psc
+++ b/source/scripts/sf_mq11b_s1_house_00110655.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ11b_S1_House_00110655 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq11b_sc03_interrupt_00145912.psc b/source/scripts/sf_mq11b_sc03_interrupt_00145912.psc
index 6cb5987e..78312cca 100644
--- a/source/scripts/sf_mq11b_sc03_interrupt_00145912.psc
+++ b/source/scripts/sf_mq11b_sc03_interrupt_00145912.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_3()
 ;BEGIN CODE
 _00E_MQ11b_Questfunctions MQ11bquest = GetOwningQuest() as _00E_MQ11b_Questfunctions
-MQ11bquest.SetStage(190)
+MQ11bquest.SetCurrentStageID(190)
 MQ11bquest.StartCombatAdila()
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_mq11b_sc04_adilacombat_001458fe.psc b/source/scripts/sf_mq11b_sc04_adilacombat_001458fe.psc
index 1dcf15f7..d591dc0f 100644
--- a/source/scripts/sf_mq11b_sc04_adilacombat_001458fe.psc
+++ b/source/scripts/sf_mq11b_sc04_adilacombat_001458fe.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-MQ11b.SetStage(195)
+MQ11b.SetCurrentStageID(195)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq11b_sc06_jesparfinal_0014590e.psc b/source/scripts/sf_mq11b_sc06_jesparfinal_0014590e.psc
index cef371fe..d394f749 100644
--- a/source/scripts/sf_mq11b_sc06_jesparfinal_0014590e.psc
+++ b/source/scripts/sf_mq11b_sc06_jesparfinal_0014590e.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq11b_sc2_00117933.psc b/source/scripts/sf_mq11b_sc2_00117933.psc
index cdea7cec..d180c2cb 100644
--- a/source/scripts/sf_mq11b_sc2_00117933.psc
+++ b/source/scripts/sf_mq11b_sc2_00117933.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ11b_SC2_00117933 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_6
 Function Fragment_6()
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(170)
+GetOwningQuest().SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq11c_sc10_ryneustransfor_00092a97.psc b/source/scripts/sf_mq11c_sc10_ryneustransfor_00092a97.psc
index a604a747..a5566685 100644
--- a/source/scripts/sf_mq11c_sc10_ryneustransfor_00092a97.psc
+++ b/source/scripts/sf_mq11c_sc10_ryneustransfor_00092a97.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ11c_SC10_RyneusTransfor_00092A97 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(255)
+GetOwningQuest().SetCurrentStageID(255)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq11c_sc3_wardenclosesgat_0008e875.psc b/source/scripts/sf_mq11c_sc3_wardenclosesgat_0008e875.psc
index d5d9f38b..9658afcb 100644
--- a/source/scripts/sf_mq11c_sc3_wardenclosesgat_0008e875.psc
+++ b/source/scripts/sf_mq11c_sc3_wardenclosesgat_0008e875.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ11c_SC3_WardenClosesGat_0008E875 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_20
 Function Fragment_20()
 ;BEGIN CODE
-MQ11c.SetStage(75)
+MQ11c.SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq11c_sc4_dogstealspuppet_0008f72e.psc b/source/scripts/sf_mq11c_sc4_dogstealspuppet_0008f72e.psc
index 2614db48..a5861765 100644
--- a/source/scripts/sf_mq11c_sc4_dogstealspuppet_0008f72e.psc
+++ b/source/scripts/sf_mq11c_sc4_dogstealspuppet_0008f72e.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ11c_SC4_DogStealsPuppet_0008F72E Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(105)
+GetOwningQuest().SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq12a_sc3_insert3rdstone_0011b08c.psc b/source/scripts/sf_mq12a_sc3_insert3rdstone_0011b08c.psc
index a889659f..e9460ec5 100644
--- a/source/scripts/sf_mq12a_sc3_insert3rdstone_0011b08c.psc
+++ b/source/scripts/sf_mq12a_sc3_insert3rdstone_0011b08c.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq12b_sc10_playerrepairsm_001291c3.psc b/source/scripts/sf_mq12b_sc10_playerrepairsm_001291c3.psc
index d105ad78..c3e52004 100644
--- a/source/scripts/sf_mq12b_sc10_playerrepairsm_001291c3.psc
+++ b/source/scripts/sf_mq12b_sc10_playerrepairsm_001291c3.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ12b_SC10_PlayerRepairsM_001291C3 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-MQ12b.SetStage(85)
+MQ12b.SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq12b_sc11_harborgatescen_0012ee7b.psc b/source/scripts/sf_mq12b_sc11_harborgatescen_0012ee7b.psc
index 0cc8415a..0560cbbc 100644
--- a/source/scripts/sf_mq12b_sc11_harborgatescen_0012ee7b.psc
+++ b/source/scripts/sf_mq12b_sc11_harborgatescen_0012ee7b.psc
@@ -22,7 +22,7 @@ EndFunction
 Function Fragment_19()
 ;BEGIN CODE
 MQ12b.SamaelTeleportAway()
-MQ12b.SetStage(105)
+MQ12b.SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq12b_sc13_templescene_00133d20.psc b/source/scripts/sf_mq12b_sc13_templescene_00133d20.psc
index 52556d25..a7d08c46 100644
--- a/source/scripts/sf_mq12b_sc13_templescene_00133d20.psc
+++ b/source/scripts/sf_mq12b_sc13_templescene_00133d20.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-MQ12b.SetStage(120)
+MQ12b.SetCurrentStageID(120)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq12b_sc14_templescene02_00133d31.psc b/source/scripts/sf_mq12b_sc14_templescene02_00133d31.psc
index 4280a09a..2337dbd1 100644
--- a/source/scripts/sf_mq12b_sc14_templescene02_00133d31.psc
+++ b/source/scripts/sf_mq12b_sc14_templescene02_00133d31.psc
@@ -31,7 +31,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-MQ12b.SetStage(125)
+MQ12b.SetCurrentStageID(125)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq12b_sc1_lexilexplains_0011b0a2.psc b/source/scripts/sf_mq12b_sc1_lexilexplains_0011b0a2.psc
index 9b6b6895..c52be1d0 100644
--- a/source/scripts/sf_mq12b_sc1_lexilexplains_0011b0a2.psc
+++ b/source/scripts/sf_mq12b_sc1_lexilexplains_0011b0a2.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ12b_SC1_LexilExplains_0011B0A2 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 AllowIdleChatter.SetValue(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_mq12b_sc2_attack_0011b0ab.psc b/source/scripts/sf_mq12b_sc2_attack_0011b0ab.psc
index 825aa958..4680a3a0 100644
--- a/source/scripts/sf_mq12b_sc2_attack_0011b0ab.psc
+++ b/source/scripts/sf_mq12b_sc2_attack_0011b0ab.psc
@@ -29,7 +29,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_4
 Function Fragment_4()
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq12b_sc4_tealortraveltom_0011b0f9.psc b/source/scripts/sf_mq12b_sc4_tealortraveltom_0011b0f9.psc
index 9378e02c..cb7c667c 100644
--- a/source/scripts/sf_mq12b_sc4_tealortraveltom_0011b0f9.psc
+++ b/source/scripts/sf_mq12b_sc4_tealortraveltom_0011b0f9.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ12b_SC4_TealorTravelToM_0011B0F9 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq12b_sc5_tealorlowerdist_0011b190.psc b/source/scripts/sf_mq12b_sc5_tealorlowerdist_0011b190.psc
index b37031c6..34f044a1 100644
--- a/source/scripts/sf_mq12b_sc5_tealorlowerdist_0011b190.psc
+++ b/source/scripts/sf_mq12b_sc5_tealorlowerdist_0011b190.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq12b_sc7_gatediscussion_001294c1.psc b/source/scripts/sf_mq12b_sc7_gatediscussion_001294c1.psc
index 2d9ff24d..cd0877a1 100644
--- a/source/scripts/sf_mq12b_sc7_gatediscussion_001294c1.psc
+++ b/source/scripts/sf_mq12b_sc7_gatediscussion_001294c1.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq12c_sc02_dreamgotosleep_00134594.psc b/source/scripts/sf_mq12c_sc02_dreamgotosleep_00134594.psc
index 8cc8953c..0b79b1ec 100644
--- a/source/scripts/sf_mq12c_sc02_dreamgotosleep_00134594.psc
+++ b/source/scripts/sf_mq12c_sc02_dreamgotosleep_00134594.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ12c_SC02_DreamGoToSleep_00134594 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-MQ12c.SetStage(20)
+MQ12c.SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq12c_sc03_dream_00134595.psc b/source/scripts/sf_mq12c_sc03_dream_00134595.psc
index 5972efe4..b7a4632d 100644
--- a/source/scripts/sf_mq12c_sc03_dream_00134595.psc
+++ b/source/scripts/sf_mq12c_sc03_dream_00134595.psc
@@ -30,7 +30,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 Steam.UnlockAchievement("END_DREAM_03")
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_mq13b_sc01_arrival_01_00137f92.psc b/source/scripts/sf_mq13b_sc01_arrival_01_00137f92.psc
index 2eb446e1..9e6558f9 100644
--- a/source/scripts/sf_mq13b_sc01_arrival_01_00137f92.psc
+++ b/source/scripts/sf_mq13b_sc01_arrival_01_00137f92.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_5
 Function Fragment_5()
 ;BEGIN CODE
-MQ13b.SetStage(20)
+MQ13b.SetCurrentStageID(20)
 MQ13b.StartSC02()
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_mq13b_sc03_walktocitadel_00137fcd.psc b/source/scripts/sf_mq13b_sc03_walktocitadel_00137fcd.psc
index 3a7fb044..288c7353 100644
--- a/source/scripts/sf_mq13b_sc03_walktocitadel_00137fcd.psc
+++ b/source/scripts/sf_mq13b_sc03_walktocitadel_00137fcd.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ13b_SC03_WalkToCitadel_00137FCD Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-MQ13b.SetStage(35)
+MQ13b.SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq13b_sc04_citadelgate_00137fda.psc b/source/scripts/sf_mq13b_sc04_citadelgate_00137fda.psc
index eec90383..60984d52 100644
--- a/source/scripts/sf_mq13b_sc04_citadelgate_00137fda.psc
+++ b/source/scripts/sf_mq13b_sc04_citadelgate_00137fda.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-MQ13b.SetStage(40)
+MQ13b.SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq13b_sc05_searchforsidee_00137fe7.psc b/source/scripts/sf_mq13b_sc05_searchforsidee_00137fe7.psc
index 16e6850f..2f1de34e 100644
--- a/source/scripts/sf_mq13b_sc05_searchforsidee_00137fe7.psc
+++ b/source/scripts/sf_mq13b_sc05_searchforsidee_00137fe7.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ13b_SC05_SearchForSideE_00137FE7 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq13b_sc06_expeditionplan_00137ffd.psc b/source/scripts/sf_mq13b_sc06_expeditionplan_00137ffd.psc
index 9a2f1c2c..c3341eb4 100644
--- a/source/scripts/sf_mq13b_sc06_expeditionplan_00137ffd.psc
+++ b/source/scripts/sf_mq13b_sc06_expeditionplan_00137ffd.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ13b_SC06_ExpeditionPlan_00137FFD Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq13b_sc07_nexustower_01_00138005.psc b/source/scripts/sf_mq13b_sc07_nexustower_01_00138005.psc
index f5b60232..69f6f3e1 100644
--- a/source/scripts/sf_mq13b_sc07_nexustower_01_00138005.psc
+++ b/source/scripts/sf_mq13b_sc07_nexustower_01_00138005.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_4
 Function Fragment_4()
 ;BEGIN CODE
-MQ13b.SetStage(60)
+MQ13b.SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq13b_sc08_nexustower_02_00138006.psc b/source/scripts/sf_mq13b_sc08_nexustower_02_00138006.psc
index 78639a26..8662c31d 100644
--- a/source/scripts/sf_mq13b_sc08_nexustower_02_00138006.psc
+++ b/source/scripts/sf_mq13b_sc08_nexustower_02_00138006.psc
@@ -37,7 +37,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_8
 Function Fragment_8()
 ;BEGIN CODE
-MQ13b.SetStage(80)
+MQ13b.SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq13b_sc09_nexustower_03_00138007.psc b/source/scripts/sf_mq13b_sc09_nexustower_03_00138007.psc
index 2eaa73f4..49a13e12 100644
--- a/source/scripts/sf_mq13b_sc09_nexustower_03_00138007.psc
+++ b/source/scripts/sf_mq13b_sc09_nexustower_03_00138007.psc
@@ -14,7 +14,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_6
 Function Fragment_6()
 ;BEGIN CODE
-MQ13b.SetStage(90)
+MQ13b.SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq13b_sc10_nexustower_04_00138064.psc b/source/scripts/sf_mq13b_sc10_nexustower_04_00138064.psc
index 3dfddf6b..d70a3c77 100644
--- a/source/scripts/sf_mq13b_sc10_nexustower_04_00138064.psc
+++ b/source/scripts/sf_mq13b_sc10_nexustower_04_00138064.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_17
 Function Fragment_17()
 ;BEGIN CODE
-MQ13b.SetStage(100)
+MQ13b.SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq13b_sc11_nexustower_05_0013808a.psc b/source/scripts/sf_mq13b_sc11_nexustower_05_0013808a.psc
index 092a2ac3..22a9024a 100644
--- a/source/scripts/sf_mq13b_sc11_nexustower_05_0013808a.psc
+++ b/source/scripts/sf_mq13b_sc11_nexustower_05_0013808a.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-MQ13b.SetStage(120)
+MQ13b.SetCurrentStageID(120)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq13c_sc01_moveelevatorup_0013b5e5.psc b/source/scripts/sf_mq13c_sc01_moveelevatorup_0013b5e5.psc
index 7a76c3e5..fa814138 100644
--- a/source/scripts/sf_mq13c_sc01_moveelevatorup_0013b5e5.psc
+++ b/source/scripts/sf_mq13c_sc01_moveelevatorup_0013b5e5.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-MQ13c.SetStage(10)
+MQ13c.SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq13c_sc02_kurmaireappear_0013b5e4.psc b/source/scripts/sf_mq13c_sc02_kurmaireappear_0013b5e4.psc
index ff01ba3e..ffcc6122 100644
--- a/source/scripts/sf_mq13c_sc02_kurmaireappear_0013b5e4.psc
+++ b/source/scripts/sf_mq13c_sc02_kurmaireappear_0013b5e4.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ13c_SC02_KurmaiReappear_0013B5E4 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-MQ13c.SetStage(15)
+MQ13c.SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq13c_sc03_steelbirdattac_0013b5e3.psc b/source/scripts/sf_mq13c_sc03_steelbirdattac_0013b5e3.psc
index c4caf899..3b5b866e 100644
--- a/source/scripts/sf_mq13c_sc03_steelbirdattac_0013b5e3.psc
+++ b/source/scripts/sf_mq13c_sc03_steelbirdattac_0013b5e3.psc
@@ -46,7 +46,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_10
 Function Fragment_10()
 ;BEGIN CODE
-MQ13c.SetStage(20)
+MQ13c.SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq13c_sc04_centurionattac_0013b5e2.psc b/source/scripts/sf_mq13c_sc04_centurionattac_0013b5e2.psc
index 8c06e1f5..ca2ce711 100644
--- a/source/scripts/sf_mq13c_sc04_centurionattac_0013b5e2.psc
+++ b/source/scripts/sf_mq13c_sc04_centurionattac_0013b5e2.psc
@@ -53,7 +53,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_4
 Function Fragment_4()
 ;BEGIN CODE
-MQ13c.SetStage(30)
+MQ13c.SetCurrentStageID(30)
 MQ13c.RemoveCombatMusic()
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_mq13c_sc08_traveltobridge_0013b5de.psc b/source/scripts/sf_mq13c_sc08_traveltobridge_0013b5de.psc
index 4a15fd7e..b452f4fb 100644
--- a/source/scripts/sf_mq13c_sc08_traveltobridge_0013b5de.psc
+++ b/source/scripts/sf_mq13c_sc08_traveltobridge_0013b5de.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_6()
 ;BEGIN CODE
 MQ13c.SetObjectiveDisplayed(40)
-MQ13c.SetStage(117)
+MQ13c.SetCurrentStageID(117)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq14_sc03_explanation_00141d24.psc b/source/scripts/sf_mq14_sc03_explanation_00141d24.psc
index f6ff48f0..1d55d210 100644
--- a/source/scripts/sf_mq14_sc03_explanation_00141d24.psc
+++ b/source/scripts/sf_mq14_sc03_explanation_00141d24.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ14_SC03_Explanation_00141D24 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq14_sc04_novicescene_00141d61.psc b/source/scripts/sf_mq14_sc04_novicescene_00141d61.psc
index a4a4e891..c4905879 100644
--- a/source/scripts/sf_mq14_sc04_novicescene_00141d61.psc
+++ b/source/scripts/sf_mq14_sc04_novicescene_00141d61.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(43)
+GetOwningQuest().SetCurrentStageID(43)
 MQ14.DisableBarrier()
 ;END CODE
 EndFunction
@@ -38,7 +38,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -46,7 +46,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-MQ14.SetStage(42)
+MQ14.SetCurrentStageID(42)
 MQ14.NoviceExplode()
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_mq14_sc05_tealor_00141d94.psc b/source/scripts/sf_mq14_sc05_tealor_00141d94.psc
index 6d8e5296..054f37e9 100644
--- a/source/scripts/sf_mq14_sc05_tealor_00141d94.psc
+++ b/source/scripts/sf_mq14_sc05_tealor_00141d94.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-MQ14.SetStage(55)
+MQ14.SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq14_sc07_planning_0014342f.psc b/source/scripts/sf_mq14_sc07_planning_0014342f.psc
index 5ca58fbc..491f55d9 100644
--- a/source/scripts/sf_mq14_sc07_planning_0014342f.psc
+++ b/source/scripts/sf_mq14_sc07_planning_0014342f.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq15_sc03_forbiddenroom_001448dc.psc b/source/scripts/sf_mq15_sc03_forbiddenroom_001448dc.psc
index 632edab7..9a036277 100644
--- a/source/scripts/sf_mq15_sc03_forbiddenroom_001448dc.psc
+++ b/source/scripts/sf_mq15_sc03_forbiddenroom_001448dc.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_7
 Function Fragment_7()
 ;BEGIN CODE
-MQ15.SetStage(15)
+MQ15.SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq15_sc04_traveltotunnels_001448f7.psc b/source/scripts/sf_mq15_sc04_traveltotunnels_001448f7.psc
index 66e76c92..b7017e21 100644
--- a/source/scripts/sf_mq15_sc04_traveltotunnels_001448f7.psc
+++ b/source/scripts/sf_mq15_sc04_traveltotunnels_001448f7.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ15_SC04_TravelToTunnels_001448F7 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq15_sc06_yuslandissolve_001458ba.psc b/source/scripts/sf_mq15_sc06_yuslandissolve_001458ba.psc
index 51b85cc9..3137f640 100644
--- a/source/scripts/sf_mq15_sc06_yuslandissolve_001458ba.psc
+++ b/source/scripts/sf_mq15_sc06_yuslandissolve_001458ba.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ15_SC06_YuslanDissolve_001458BA Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-MQ15.SetStage(40)
+MQ15.SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq16_sc01_journey_01_00147116.psc b/source/scripts/sf_mq16_sc01_journey_01_00147116.psc
index 8fd81fb7..4519c8a5 100644
--- a/source/scripts/sf_mq16_sc01_journey_01_00147116.psc
+++ b/source/scripts/sf_mq16_sc01_journey_01_00147116.psc
@@ -30,7 +30,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_4
 Function Fragment_4()
 ;BEGIN CODE
-MQ16.SetStage(25)
+MQ16.SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -46,7 +46,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_24
 Function Fragment_24()
 ;BEGIN CODE
-MQ16.SetStage(20)
+MQ16.SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq16_sc02_journey_02_00147139.psc b/source/scripts/sf_mq16_sc02_journey_02_00147139.psc
index 68edb223..fcffb759 100644
--- a/source/scripts/sf_mq16_sc02_journey_02_00147139.psc
+++ b/source/scripts/sf_mq16_sc02_journey_02_00147139.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq16_sc03_journey_03_00147148.psc b/source/scripts/sf_mq16_sc03_journey_03_00147148.psc
index 57fc3268..1893f693 100644
--- a/source/scripts/sf_mq16_sc03_journey_03_00147148.psc
+++ b/source/scripts/sf_mq16_sc03_journey_03_00147148.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_4
 Function Fragment_4()
 ;BEGIN CODE
-MQ16.SetStage(55)
+MQ16.SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq16_sc04_journey_04_00147193.psc b/source/scripts/sf_mq16_sc04_journey_04_00147193.psc
index e5efe499..94fb9d6d 100644
--- a/source/scripts/sf_mq16_sc04_journey_04_00147193.psc
+++ b/source/scripts/sf_mq16_sc04_journey_04_00147193.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ16_SC04_Journey_04_00147193 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-MQ16.SetStage(60)
+MQ16.SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq16_sc05_highones_001471e0.psc b/source/scripts/sf_mq16_sc05_highones_001471e0.psc
index c8b0ce1a..0aa8604a 100644
--- a/source/scripts/sf_mq16_sc05_highones_001471e0.psc
+++ b/source/scripts/sf_mq16_sc05_highones_001471e0.psc
@@ -54,7 +54,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_8
 Function Fragment_8()
 ;BEGIN CODE
-MQ16.SetStage(62)
+MQ16.SetCurrentStageID(62)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq16_sc06_assault_001484d8.psc b/source/scripts/sf_mq16_sc06_assault_001484d8.psc
index 0800c34d..9e0c44ee 100644
--- a/source/scripts/sf_mq16_sc06_assault_001484d8.psc
+++ b/source/scripts/sf_mq16_sc06_assault_001484d8.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ16_SC06_Assault_001484D8 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_5
 Function Fragment_5()
 ;BEGIN CODE
-MQ16.SetStage(70)
+MQ16.SetCurrentStageID(70)
 MQ16.ReanimateCorpses(3)
 ;END CODE
 EndFunction
@@ -14,7 +14,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-MQ16.SetStage(75)
+MQ16.SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -38,7 +38,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_4
 Function Fragment_4()
 ;BEGIN CODE
-MQ16.SetStage(65)
+MQ16.SetCurrentStageID(65)
 MQ16.ReanimateCorpses(2)
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_mq16_sc07_dragonattack_00148523.psc b/source/scripts/sf_mq16_sc07_dragonattack_00148523.psc
index bfd5da12..cd849337 100644
--- a/source/scripts/sf_mq16_sc07_dragonattack_00148523.psc
+++ b/source/scripts/sf_mq16_sc07_dragonattack_00148523.psc
@@ -5,8 +5,8 @@ Scriptname SF_MQ16_SC07_DragonAttack_00148523 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_10
 Function Fragment_10()
 ;BEGIN CODE
-If (MQ16.GetStage() < 77)
-    MQ16.SetStage(77)
+If (MQ16.GetCurrentStageID() < 77)
+    MQ16.SetCurrentStageID(77)
     MQ16.Impact()
 Endif
 ;END CODE
diff --git a/source/scripts/sf_mq16_sc08_temple_01_00148572.psc b/source/scripts/sf_mq16_sc08_temple_01_00148572.psc
index ef14bdce..31194de9 100644
--- a/source/scripts/sf_mq16_sc08_temple_01_00148572.psc
+++ b/source/scripts/sf_mq16_sc08_temple_01_00148572.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_7
 Function Fragment_7()
 ;BEGIN CODE
-GetOwningQuest().SetStage(86)
+GetOwningQuest().SetCurrentStageID(86)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq16_sc10_temple_03_001485f2.psc b/source/scripts/sf_mq16_sc10_temple_03_001485f2.psc
index 308d55ec..c2f870ed 100644
--- a/source/scripts/sf_mq16_sc10_temple_03_001485f2.psc
+++ b/source/scripts/sf_mq16_sc10_temple_03_001485f2.psc
@@ -30,7 +30,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_20
 Function Fragment_20()
 ;BEGIN CODE
-MQ16.SetStage(125)
+MQ16.SetCurrentStageID(125)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq16_sc12_numinos_001486a5.psc b/source/scripts/sf_mq16_sc12_numinos_001486a5.psc
index 3d9798c6..38eb2f3b 100644
--- a/source/scripts/sf_mq16_sc12_numinos_001486a5.psc
+++ b/source/scripts/sf_mq16_sc12_numinos_001486a5.psc
@@ -49,7 +49,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -57,7 +57,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_5
 Function Fragment_5()
 ;BEGIN CODE
-GetOwningQuest().SetStage(160)
+GetOwningQuest().SetCurrentStageID(160)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq16_sc14_temple_001486e8.psc b/source/scripts/sf_mq16_sc14_temple_001486e8.psc
index 281fe9d6..fdd57e96 100644
--- a/source/scripts/sf_mq16_sc14_temple_001486e8.psc
+++ b/source/scripts/sf_mq16_sc14_temple_001486e8.psc
@@ -29,7 +29,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_7
 Function Fragment_7()
 ;BEGIN CODE
-MQ16.SetStage(180)
+MQ16.SetCurrentStageID(180)
 MQ16.DisableTealor()
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_mq17_sc05_blackguardian_0_001496ad.psc b/source/scripts/sf_mq17_sc05_blackguardian_0_001496ad.psc
index 3630b2fb..505f26a4 100644
--- a/source/scripts/sf_mq17_sc05_blackguardian_0_001496ad.psc
+++ b/source/scripts/sf_mq17_sc05_blackguardian_0_001496ad.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ17_SC05_BlackGuardian_0_001496AD Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq17_sc06_blackguardiantr_001496bb.psc b/source/scripts/sf_mq17_sc06_blackguardiantr_001496bb.psc
index d9d863f8..91c64389 100644
--- a/source/scripts/sf_mq17_sc06_blackguardiantr_001496bb.psc
+++ b/source/scripts/sf_mq17_sc06_blackguardiantr_001496bb.psc
@@ -45,7 +45,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_23
 Function Fragment_23()
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq17_sc07_blackguardianfi_001496ec.psc b/source/scripts/sf_mq17_sc07_blackguardianfi_001496ec.psc
index 5960ca45..b7554872 100644
--- a/source/scripts/sf_mq17_sc07_blackguardianfi_001496ec.psc
+++ b/source/scripts/sf_mq17_sc07_blackguardianfi_001496ec.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-MQ17.SetStage(80)
+MQ17.SetCurrentStageID(80)
 MQ17.BeginFight()
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_mq17_sc08_precleansing_0014bd7e.psc b/source/scripts/sf_mq17_sc08_precleansing_0014bd7e.psc
index 69db3307..7d2b13ea 100644
--- a/source/scripts/sf_mq17_sc08_precleansing_0014bd7e.psc
+++ b/source/scripts/sf_mq17_sc08_precleansing_0014bd7e.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_6
 Function Fragment_6()
 ;BEGIN CODE
-MQ17.SetStage(105)
+MQ17.SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -29,7 +29,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_11
 Function Fragment_11()
 ;BEGIN CODE
-MQ17.SetStage(105)
+MQ17.SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq17_sc10_launchsequence_0014bebe.psc b/source/scripts/sf_mq17_sc10_launchsequence_0014bebe.psc
index 446ca8e9..3d260d53 100644
--- a/source/scripts/sf_mq17_sc10_launchsequence_0014bebe.psc
+++ b/source/scripts/sf_mq17_sc10_launchsequence_0014bebe.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_13
 Function Fragment_13()
 ;BEGIN CODE
-MQ17.MQ18a.SetStage(10)
+MQ17.MQ18a.SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq18a_sc02_starcity_0014bfdc.psc b/source/scripts/sf_mq18a_sc02_starcity_0014bfdc.psc
index 7448ce6d..6b147174 100644
--- a/source/scripts/sf_mq18a_sc02_starcity_0014bfdc.psc
+++ b/source/scripts/sf_mq18a_sc02_starcity_0014bfdc.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-MQ18a.SetStage(35)
+MQ18a.SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_mq_p02_anewlife_execution_0007bb8d.psc b/source/scripts/sf_mq_p02_anewlife_execution_0007bb8d.psc
index cabd645c..d4dfd996 100644
--- a/source/scripts/sf_mq_p02_anewlife_execution_0007bb8d.psc
+++ b/source/scripts/sf_mq_p02_anewlife_execution_0007bb8d.psc
@@ -5,7 +5,7 @@ Scriptname SF_MQ_P02_ANewLife_Execution_0007BB8D Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_4
 Function Fragment_4()
 ;BEGIN CODE
-MQp02.SetStage(90)
+MQp02.SetCurrentStageID(90)
 MQp02.SiriusGetUp()
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_mqp02_sc3_riqandsebald02_000775fc.psc b/source/scripts/sf_mqp02_sc3_riqandsebald02_000775fc.psc
index 7c62d9bd..a5083d10 100644
--- a/source/scripts/sf_mqp02_sc3_riqandsebald02_000775fc.psc
+++ b/source/scripts/sf_mqp02_sc3_riqandsebald02_000775fc.psc
@@ -25,7 +25,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_8
 Function Fragment_8()
 ;BEGIN CODE
-MQP02.SetStage(60)
+MQP02.SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq06_sc1_0012790d.psc b/source/scripts/sf_nq06_sc1_0012790d.psc
index b867b0d0..dda04304 100644
--- a/source/scripts/sf_nq06_sc1_0012790d.psc
+++ b/source/scripts/sf_nq06_sc1_0012790d.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ06_SC1_0012790D Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq10_elfride_scene01_000f8579.psc b/source/scripts/sf_nq10_elfride_scene01_000f8579.psc
index 1dc2be06..1a1298b1 100644
--- a/source/scripts/sf_nq10_elfride_scene01_000f8579.psc
+++ b/source/scripts/sf_nq10_elfride_scene01_000f8579.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ10_Elfride_Scene01_000F8579 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq11_sc1_00119bd9.psc b/source/scripts/sf_nq11_sc1_00119bd9.psc
index 8f59dd58..d869d0a9 100644
--- a/source/scripts/sf_nq11_sc1_00119bd9.psc
+++ b/source/scripts/sf_nq11_sc1_00119bd9.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ11_SC1_00119BD9 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq12_sc1_00119bda.psc b/source/scripts/sf_nq12_sc1_00119bda.psc
index fb5dfdf2..84aa3759 100644
--- a/source/scripts/sf_nq12_sc1_00119bda.psc
+++ b/source/scripts/sf_nq12_sc1_00119bda.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ12_SC1_00119BDA Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq12_sc2combat_0011a81d.psc b/source/scripts/sf_nq12_sc2combat_0011a81d.psc
index 80bd46f4..2f97a9ca 100644
--- a/source/scripts/sf_nq12_sc2combat_0011a81d.psc
+++ b/source/scripts/sf_nq12_sc2combat_0011a81d.psc
@@ -14,7 +14,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(56)
+GetOwningQuest().SetCurrentStageID(56)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq12_sc3milbertdeath_0011a841.psc b/source/scripts/sf_nq12_sc3milbertdeath_0011a841.psc
index 9320111c..4544e3ea 100644
--- a/source/scripts/sf_nq12_sc3milbertdeath_0011a841.psc
+++ b/source/scripts/sf_nq12_sc3milbertdeath_0011a841.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ12_SC3MilbertDeath_0011A841 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(61)
+GetOwningQuest().SetCurrentStageID(61)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(62)
+GetOwningQuest().SetCurrentStageID(62)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq14_sc1_fightsc_0003ac67.psc b/source/scripts/sf_nq14_sc1_fightsc_0003ac67.psc
index 5c97c5e6..c422c331 100644
--- a/source/scripts/sf_nq14_sc1_fightsc_0003ac67.psc
+++ b/source/scripts/sf_nq14_sc1_fightsc_0003ac67.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ14_SC1_FightSC_0003AC67 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(42)
+GetOwningQuest().SetCurrentStageID(42)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq15_sc0_001256f5.psc b/source/scripts/sf_nq15_sc0_001256f5.psc
index 797e9e9d..b061a346 100644
--- a/source/scripts/sf_nq15_sc0_001256f5.psc
+++ b/source/scripts/sf_nq15_sc0_001256f5.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ15_SC0_001256F5 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq15_sc1_001256ff.psc b/source/scripts/sf_nq15_sc1_001256ff.psc
index aa799884..0a4a4662 100644
--- a/source/scripts/sf_nq15_sc1_001256ff.psc
+++ b/source/scripts/sf_nq15_sc1_001256ff.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ15_SC1_001256FF Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_7
 Function Fragment_7()
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 Game.DisablePlayerControls()
 ;END CODE
 EndFunction
@@ -22,7 +22,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq15_sc2_00125a80.psc b/source/scripts/sf_nq15_sc2_00125a80.psc
index cd711cde..a7b95b2d 100644
--- a/source/scripts/sf_nq15_sc2_00125a80.psc
+++ b/source/scripts/sf_nq15_sc2_00125a80.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ15_SC2_00125A80 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(160)
+GetOwningQuest().SetCurrentStageID(160)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq15_sc3hinweis1_00125a91.psc b/source/scripts/sf_nq15_sc3hinweis1_00125a91.psc
index 47e24b15..540fc2a3 100644
--- a/source/scripts/sf_nq15_sc3hinweis1_00125a91.psc
+++ b/source/scripts/sf_nq15_sc3hinweis1_00125a91.psc
@@ -6,7 +6,7 @@ Scriptname SF_NQ15_SC3Hinweis1_00125A91 Extends Scene Hidden
 Function Fragment_1()
 ;BEGIN CODE
 NQ15.EndVisionNoActors()
-GetOwningQuest().SetStage(GetOwningQuest().GetStage() + 5)
+GetOwningQuest().SetCurrentStageID(GetOwningQuest().GetCurrentStageID() + 5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq15_sc3hinweis2_00125a92.psc b/source/scripts/sf_nq15_sc3hinweis2_00125a92.psc
index fb132c45..e0008c9e 100644
--- a/source/scripts/sf_nq15_sc3hinweis2_00125a92.psc
+++ b/source/scripts/sf_nq15_sc3hinweis2_00125a92.psc
@@ -14,7 +14,7 @@ EndFunction
 Function Fragment_2()
 ;BEGIN CODE
 NQ15.EndVisionNoActors()
-GetOwningQuest().SetStage(GetOwningQuest().GetStage() + 5)
+GetOwningQuest().SetCurrentStageID(GetOwningQuest().GetCurrentStageID() + 5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq15_sc3hinweis3_00125a95.psc b/source/scripts/sf_nq15_sc3hinweis3_00125a95.psc
index a150e568..28a07604 100644
--- a/source/scripts/sf_nq15_sc3hinweis3_00125a95.psc
+++ b/source/scripts/sf_nq15_sc3hinweis3_00125a95.psc
@@ -14,7 +14,7 @@ EndFunction
 Function Fragment_3()
 ;BEGIN CODE
 NQ15.EndVisionNoActors()
-GetOwningQuest().SetStage(GetOwningQuest().GetStage() + 5)
+GetOwningQuest().SetCurrentStageID(GetOwningQuest().GetCurrentStageID() + 5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq15_sc4_001276ea.psc b/source/scripts/sf_nq15_sc4_001276ea.psc
index 9b09a4a8..a7da914e 100644
--- a/source/scripts/sf_nq15_sc4_001276ea.psc
+++ b/source/scripts/sf_nq15_sc4_001276ea.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ15_SC4_001276EA Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(200)
+GetOwningQuest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq15_sc5_001276fb.psc b/source/scripts/sf_nq15_sc5_001276fb.psc
index 550d3f33..561815f7 100644
--- a/source/scripts/sf_nq15_sc5_001276fb.psc
+++ b/source/scripts/sf_nq15_sc5_001276fb.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(230)
+GetOwningQuest().SetCurrentStageID(230)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq17_sc1_001290d9.psc b/source/scripts/sf_nq17_sc1_001290d9.psc
index 42bc5b8b..b159b9b1 100644
--- a/source/scripts/sf_nq17_sc1_001290d9.psc
+++ b/source/scripts/sf_nq17_sc1_001290d9.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq17_sc2_0012dad9.psc b/source/scripts/sf_nq17_sc2_0012dad9.psc
index 3837ca12..39b9d9c6 100644
--- a/source/scripts/sf_nq17_sc2_0012dad9.psc
+++ b/source/scripts/sf_nq17_sc2_0012dad9.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ17_SC2_0012DAD9 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq17_sc3_0012dadb.psc b/source/scripts/sf_nq17_sc3_0012dadb.psc
index cc973aae..38b030bc 100644
--- a/source/scripts/sf_nq17_sc3_0012dadb.psc
+++ b/source/scripts/sf_nq17_sc3_0012dadb.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 _00E_NQ17AndrastaAsking.SetValue(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_nq21_sc1_0014c0e4.psc b/source/scripts/sf_nq21_sc1_0014c0e4.psc
index fac4701d..e52bc38e 100644
--- a/source/scripts/sf_nq21_sc1_0014c0e4.psc
+++ b/source/scripts/sf_nq21_sc1_0014c0e4.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ21_SC1_0014C0E4 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq22_s1_ishyianbattle_00132d82.psc b/source/scripts/sf_nq22_s1_ishyianbattle_00132d82.psc
index 040e38c8..c7f33d1e 100644
--- a/source/scripts/sf_nq22_s1_ishyianbattle_00132d82.psc
+++ b/source/scripts/sf_nq22_s1_ishyianbattle_00132d82.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ22_S1_IshyianBattle_00132D82 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq23_sc1_0013378e.psc b/source/scripts/sf_nq23_sc1_0013378e.psc
index 34354c67..1770e3d8 100644
--- a/source/scripts/sf_nq23_sc1_0013378e.psc
+++ b/source/scripts/sf_nq23_sc1_0013378e.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ23_SC1_0013378E Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(18)
+GetOwningQuest().SetCurrentStageID(18)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq23_sc2_00135771.psc b/source/scripts/sf_nq23_sc2_00135771.psc
index b5275bea..389a7cf5 100644
--- a/source/scripts/sf_nq23_sc2_00135771.psc
+++ b/source/scripts/sf_nq23_sc2_00135771.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ23_SC2_00135771 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(29)
+GetOwningQuest().SetCurrentStageID(29)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq23_sc3_00134e0a.psc b/source/scripts/sf_nq23_sc3_00134e0a.psc
index a4b020e5..8a073d06 100644
--- a/source/scripts/sf_nq23_sc3_00134e0a.psc
+++ b/source/scripts/sf_nq23_sc3_00134e0a.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ23_SC3_00134E0A Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq26_sc1_0014871a.psc b/source/scripts/sf_nq26_sc1_0014871a.psc
index 26db32ca..7217ac96 100644
--- a/source/scripts/sf_nq26_sc1_0014871a.psc
+++ b/source/scripts/sf_nq26_sc1_0014871a.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ26_SC1_0014871A Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq26_sc2_00149823.psc b/source/scripts/sf_nq26_sc2_00149823.psc
index 34008614..bb752973 100644
--- a/source/scripts/sf_nq26_sc2_00149823.psc
+++ b/source/scripts/sf_nq26_sc2_00149823.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ26_SC2_00149823 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_4
 Function Fragment_4()
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 Game.GetPlayer().PlayIdle(IdleWalkingCameraEnd)
 NQ26.Reactivate()
 ;END CODE
@@ -15,7 +15,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -23,7 +23,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq26_sc3_0014b5be.psc b/source/scripts/sf_nq26_sc3_0014b5be.psc
index 4c89318c..e6deb62e 100644
--- a/source/scripts/sf_nq26_sc3_0014b5be.psc
+++ b/source/scripts/sf_nq26_sc3_0014b5be.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ26_SC3_0014B5BE Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq26_sc4_0014b748.psc b/source/scripts/sf_nq26_sc4_0014b748.psc
index 656b0f9f..3d70e827 100644
--- a/source/scripts/sf_nq26_sc4_0014b748.psc
+++ b/source/scripts/sf_nq26_sc4_0014b748.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ26_SC4_0014B748 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq34_sc01_examinecorpse_00020a13.psc b/source/scripts/sf_nq34_sc01_examinecorpse_00020a13.psc
index 872eaa82..d50a7c83 100644
--- a/source/scripts/sf_nq34_sc01_examinecorpse_00020a13.psc
+++ b/source/scripts/sf_nq34_sc01_examinecorpse_00020a13.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ34_SC01_ExamineCorpse_00020A13 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(5)
+GetOwningQuest().SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq_g_04_sc02_duulfight_00139db9.psc b/source/scripts/sf_nq_g_04_sc02_duulfight_00139db9.psc
index 20b088bb..3872184a 100644
--- a/source/scripts/sf_nq_g_04_sc02_duulfight_00139db9.psc
+++ b/source/scripts/sf_nq_g_04_sc02_duulfight_00139db9.psc
@@ -29,7 +29,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_15
 Function Fragment_15()
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -45,7 +45,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_17
 Function Fragment_17()
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq_g_04_sc03_dijaamencoun_00139dc2.psc b/source/scripts/sf_nq_g_04_sc03_dijaamencoun_00139dc2.psc
index 049307f9..02e8a207 100644
--- a/source/scripts/sf_nq_g_04_sc03_dijaamencoun_00139dc2.psc
+++ b/source/scripts/sf_nq_g_04_sc03_dijaamencoun_00139dc2.psc
@@ -30,7 +30,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-NQ_G_04.SetSTage(60)
+NQ_G_04.SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq_g_05_sc01_messengerarr_0013b709.psc b/source/scripts/sf_nq_g_05_sc01_messengerarr_0013b709.psc
index 23f33f87..ac6d82cc 100644
--- a/source/scripts/sf_nq_g_05_sc01_messengerarr_0013b709.psc
+++ b/source/scripts/sf_nq_g_05_sc01_messengerarr_0013b709.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ_G_05_SC01_MessengerArr_0013B709 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq_g_05_sc03_dijaamtalk_0013c3f8.psc b/source/scripts/sf_nq_g_05_sc03_dijaamtalk_0013c3f8.psc
index 5a58ecb4..8bd13e2c 100644
--- a/source/scripts/sf_nq_g_05_sc03_dijaamtalk_0013c3f8.psc
+++ b/source/scripts/sf_nq_g_05_sc03_dijaamtalk_0013c3f8.psc
@@ -14,7 +14,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 NQ_G_05.SwitchChairs()
 ;END CODE
 EndFunction
@@ -39,7 +39,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 NQ_G_05.DumpDijaam()
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_nq_g_06_sc02_dijaamtalkat_0013cfc1.psc b/source/scripts/sf_nq_g_06_sc02_dijaamtalkat_0013cfc1.psc
index 1fe5bd0a..04652554 100644
--- a/source/scripts/sf_nq_g_06_sc02_dijaamtalkat_0013cfc1.psc
+++ b/source/scripts/sf_nq_g_06_sc02_dijaamtalkat_0013cfc1.psc
@@ -14,7 +14,7 @@ EndFunction
 Function Fragment_1()
 ;BEGIN CODE
 _00E_Func_AIWalk.PlayerAIWalkStop()
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq_g_06_sc04_protektorkic_0013cfdd.psc b/source/scripts/sf_nq_g_06_sc04_protektorkic_0013cfdd.psc
index 00f4a6cd..4febc6f6 100644
--- a/source/scripts/sf_nq_g_06_sc04_protektorkic_0013cfdd.psc
+++ b/source/scripts/sf_nq_g_06_sc04_protektorkic_0013cfdd.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ_G_06_SC04_ProtektorKic_0013CFDD Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(105)
+GetOwningQuest().SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.psc b/source/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.psc
index 41d1b0fe..c99b304a 100644
--- a/source/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.psc
+++ b/source/scripts/sf_nq_g_07dijaam_sc02_kontor_00147062.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ_G_07Dijaam_SC02_Kontor_00147062 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_4
 Function Fragment_4()
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -31,7 +31,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_18
 Function Fragment_18()
 ;BEGIN CODE
-GetOwningQuest().SetStage(17)
+GetOwningQuest().SetCurrentStageID(17)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq_g_07dijaam_sc04_dijaam_00147064.psc b/source/scripts/sf_nq_g_07dijaam_sc04_dijaam_00147064.psc
index 8ca47065..cd8ce23c 100644
--- a/source/scripts/sf_nq_g_07dijaam_sc04_dijaam_00147064.psc
+++ b/source/scripts/sf_nq_g_07dijaam_sc04_dijaam_00147064.psc
@@ -22,7 +22,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -56,7 +56,7 @@ EndFunction
 Function Fragment_5()
 ;BEGIN CODE
 NQ_G_07.DisableTriggerbox()
-NQ_G_07.SetStage(72)
+NQ_G_07.SetCurrentStageID(72)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq_g_07dijaam_sc05_theate_0013fa43.psc b/source/scripts/sf_nq_g_07dijaam_sc05_theate_0013fa43.psc
index 337aec4b..8a11d0cf 100644
--- a/source/scripts/sf_nq_g_07dijaam_sc05_theate_0013fa43.psc
+++ b/source/scripts/sf_nq_g_07dijaam_sc05_theate_0013fa43.psc
@@ -40,7 +40,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_11
 Function Fragment_11()
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -48,7 +48,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_6
 Function Fragment_6()
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 NQ_G_07.GiveDevraPotion()
 NQ_G_07.RemoveCombatMusic()
 ;END CODE
diff --git a/source/scripts/sf_nq_g_07dijaam_sc07_dijaam_00147066.psc b/source/scripts/sf_nq_g_07dijaam_sc07_dijaam_00147066.psc
index 78c47564..65179e0d 100644
--- a/source/scripts/sf_nq_g_07dijaam_sc07_dijaam_00147066.psc
+++ b/source/scripts/sf_nq_g_07dijaam_sc07_dijaam_00147066.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ_G_07Dijaam_SC07_Dijaam_00147066 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_5
 Function Fragment_5()
 ;BEGIN CODE
-GetOwningQuest().SetStage(145)
+GetOwningQuest().SetCurrentStageID(145)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -29,7 +29,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(135)
+GetOwningQuest().SetCurrentStageID(135)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -37,7 +37,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_6
 Function Fragment_6()
 ;BEGIN CODE
-GetOwningQuest().SetStage(155)
+GetOwningQuest().SetCurrentStageID(155)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -54,7 +54,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(125)
+GetOwningQuest().SetCurrentStageID(125)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -95,7 +95,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_8
 Function Fragment_8()
 ;BEGIN CODE
-GetOwningQuest().SetStage(160)
+GetOwningQuest().SetCurrentStageID(160)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq_g_07dijaam_sc08_houseo_00147067.psc b/source/scripts/sf_nq_g_07dijaam_sc08_houseo_00147067.psc
index 3ce328ea..caf651e1 100644
--- a/source/scripts/sf_nq_g_07dijaam_sc08_houseo_00147067.psc
+++ b/source/scripts/sf_nq_g_07dijaam_sc08_houseo_00147067.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ_G_07Dijaam_SC08_HouseO_00147067 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-GetOwningQuest().SetStage(175)
+GetOwningQuest().SetCurrentStageID(175)
 NQ_G_07.ClearSalvinaAlias()
 ;END CODE
 EndFunction
diff --git a/source/scripts/sf_nq_g_07mael_sc01_maelmiss_0013f6f3.psc b/source/scripts/sf_nq_g_07mael_sc01_maelmiss_0013f6f3.psc
index 5f377c04..1148de33 100644
--- a/source/scripts/sf_nq_g_07mael_sc01_maelmiss_0013f6f3.psc
+++ b/source/scripts/sf_nq_g_07mael_sc01_maelmiss_0013f6f3.psc
@@ -13,7 +13,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_5
 Function Fragment_5()
 ;BEGIN CODE
-GetOwningQuest().SetStage(13)
+GetOwningQuest().SetCurrentStageID(13)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -37,7 +37,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(17)
+GetOwningQuest().SetCurrentStageID(17)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq_g_07mael_sc02_escalati_0013f705.psc b/source/scripts/sf_nq_g_07mael_sc02_escalati_0013f705.psc
index f0eb7278..5b98e378 100644
--- a/source/scripts/sf_nq_g_07mael_sc02_escalati_0013f705.psc
+++ b/source/scripts/sf_nq_g_07mael_sc02_escalati_0013f705.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ_G_07Mael_SC02_Escalati_0013F705 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq_g_07mael_sc03_maeldisa_0013f706.psc b/source/scripts/sf_nq_g_07mael_sc03_maeldisa_0013f706.psc
index ff8dee16..d34f701c 100644
--- a/source/scripts/sf_nq_g_07mael_sc03_maeldisa_0013f706.psc
+++ b/source/scripts/sf_nq_g_07mael_sc03_maeldisa_0013f706.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ_G_07Mael_SC03_MaelDisa_0013F706 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(27)
+GetOwningQuest().SetCurrentStageID(27)
 ;END CODE
 EndFunction
 ;END FRAGMENT
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 b13860fc..bca4bea6 100644
--- a/source/scripts/sf_nq_g_07mael_sc04_dijaampr_0013f712.psc
+++ b/source/scripts/sf_nq_g_07mael_sc04_dijaampr_0013f712.psc
@@ -21,7 +21,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_12
 Function Fragment_12()
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -32,7 +32,7 @@ Function Fragment_4()
 NQ_G_07.DijaamThrowFlashpowder(NQ_G_07._00E_NQ_G_07_OolanREF, false)
 NQ_G_07.DumpDijaam()
 NQ_G_07.OolanFaint()
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq_g_07mael_sc05_theaterf_0013f9c6.psc b/source/scripts/sf_nq_g_07mael_sc05_theaterf_0013f9c6.psc
index 79963220..3fc2a90c 100644
--- a/source/scripts/sf_nq_g_07mael_sc05_theaterf_0013f9c6.psc
+++ b/source/scripts/sf_nq_g_07mael_sc05_theaterf_0013f9c6.psc
@@ -39,7 +39,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_3
 Function Fragment_3()
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 GetOwningQuest().SetObjectiveDisplayed(60)
 NQ_G_07.GiveDevraPotion()
 NQ_G_07.RemoveCombatMusic()
@@ -51,7 +51,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq_g_07mael_sc06_maeltalk_0013f9ed.psc b/source/scripts/sf_nq_g_07mael_sc06_maeltalk_0013f9ed.psc
index 7accc749..899dfaca 100644
--- a/source/scripts/sf_nq_g_07mael_sc06_maeltalk_0013f9ed.psc
+++ b/source/scripts/sf_nq_g_07mael_sc06_maeltalk_0013f9ed.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ_G_07Mael_SC06_MaelTalk_0013F9ED Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nq_g_07mael_sc07_houseofa_00147069.psc b/source/scripts/sf_nq_g_07mael_sc07_houseofa_00147069.psc
index ff154d52..a6568a5e 100644
--- a/source/scripts/sf_nq_g_07mael_sc07_houseofa_00147069.psc
+++ b/source/scripts/sf_nq_g_07mael_sc07_houseofa_00147069.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQ_G_07Mael_SC07_HouseOfA_00147069 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_nqr01_sc04_tharael_0013eb49.psc b/source/scripts/sf_nqr01_sc04_tharael_0013eb49.psc
index c6a3a0b9..fbeb62d0 100644
--- a/source/scripts/sf_nqr01_sc04_tharael_0013eb49.psc
+++ b/source/scripts/sf_nqr01_sc04_tharael_0013eb49.psc
@@ -5,7 +5,7 @@ Scriptname SF_NQR01_SC04_Tharael_0013EB49 Extends Scene Hidden
 ;BEGIN FRAGMENT Fragment_1
 Function Fragment_1()
 ;BEGIN CODE
-GetOwningQuest().SetStage(21)
+GetOwningQuest().SetCurrentStageID(21)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_z_conversations_tealorand_001489a4.psc b/source/scripts/sf_z_conversations_tealorand_001489a4.psc
index 98131550..537ac8d2 100644
--- a/source/scripts/sf_z_conversations_tealorand_001489a4.psc
+++ b/source/scripts/sf_z_conversations_tealorand_001489a4.psc
@@ -23,7 +23,7 @@ EndFunction
 Function Fragment_0()
 ;BEGIN CODE
 AllowIdleChatter.SetValue(1)
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/sf_z_conversations_tealorand_001489aa.psc b/source/scripts/sf_z_conversations_tealorand_001489aa.psc
index 7487cf17..717e9299 100644
--- a/source/scripts/sf_z_conversations_tealorand_001489aa.psc
+++ b/source/scripts/sf_z_conversations_tealorand_001489aa.psc
@@ -14,7 +14,7 @@ EndFunction
 ;BEGIN FRAGMENT Fragment_0
 Function Fragment_0()
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00020969.psc b/source/scripts/tif__00020969.psc
index d64fdb6f..30d35d37 100644
--- a/source/scripts/tif__00020969.psc
+++ b/source/scripts/tif__00020969.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00020969 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0002096b.psc b/source/scripts/tif__0002096b.psc
index 776eba21..aa690ab9 100644
--- a/source/scripts/tif__0002096b.psc
+++ b/source/scripts/tif__0002096b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0002096B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000209de.psc b/source/scripts/tif__000209de.psc
index 3674280b..398d79df 100644
--- a/source/scripts/tif__000209de.psc
+++ b/source/scripts/tif__000209de.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000209DE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000209df.psc b/source/scripts/tif__000209df.psc
index 2f598e6c..e284ec7f 100644
--- a/source/scripts/tif__000209df.psc
+++ b/source/scripts/tif__000209df.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000209DF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 GetOwningQuest().SetObjectiveCompleted(2)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000209fe.psc b/source/scripts/tif__000209fe.psc
index 819d14bb..f371f4a6 100644
--- a/source/scripts/tif__000209fe.psc
+++ b/source/scripts/tif__000209fe.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000209FE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00020a3b.psc b/source/scripts/tif__00020a3b.psc
index 87a4c174..3da96b21 100644
--- a/source/scripts/tif__00020a3b.psc
+++ b/source/scripts/tif__00020a3b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00020A3B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00020a74.psc b/source/scripts/tif__00020a74.psc
index 9d870d44..8057e66e 100644
--- a/source/scripts/tif__00020a74.psc
+++ b/source/scripts/tif__00020a74.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00020A74 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00020a75.psc b/source/scripts/tif__00020a75.psc
index 5ca11dc7..9e9f7259 100644
--- a/source/scripts/tif__00020a75.psc
+++ b/source/scripts/tif__00020a75.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00020A75 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 NQ17_DefiedAndrasta.SetValueInt(2)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00020a76.psc b/source/scripts/tif__00020a76.psc
index 07b9eb50..dbcd073e 100644
--- a/source/scripts/tif__00020a76.psc
+++ b/source/scripts/tif__00020a76.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00020A76 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().setStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00020aea.psc b/source/scripts/tif__00020aea.psc
index 30a69fd1..303e57bb 100644
--- a/source/scripts/tif__00020aea.psc
+++ b/source/scripts/tif__00020aea.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00020AEA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00020af0.psc b/source/scripts/tif__00020af0.psc
index 67852f5f..d44dd368 100644
--- a/source/scripts/tif__00020af0.psc
+++ b/source/scripts/tif__00020af0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00020AF0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00023094.psc b/source/scripts/tif__00023094.psc
index a656b40e..a1b96379 100644
--- a/source/scripts/tif__00023094.psc
+++ b/source/scripts/tif__00023094.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00023094 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQUest().SetStage(36)
+GetOwningQUest().SetCurrentStageID(36)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00023152.psc b/source/scripts/tif__00023152.psc
index 22cdd208..26ceec78 100644
--- a/source/scripts/tif__00023152.psc
+++ b/source/scripts/tif__00023152.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00023152 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 NQ19.GiveArtifactBow()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00023153.psc b/source/scripts/tif__00023153.psc
index 87480916..e104119d 100644
--- a/source/scripts/tif__00023153.psc
+++ b/source/scripts/tif__00023153.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00023153 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 NQ19.GiveArtifactStaff()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00023154.psc b/source/scripts/tif__00023154.psc
index 6344b270..703d500b 100644
--- a/source/scripts/tif__00023154.psc
+++ b/source/scripts/tif__00023154.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00023154 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 NQ19.GiveArtifactTwoHanded()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0002365e.psc b/source/scripts/tif__0002365e.psc
index da601dda..1b71dd92 100644
--- a/source/scripts/tif__0002365e.psc
+++ b/source/scripts/tif__0002365e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0002365E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00034daf.psc b/source/scripts/tif__00034daf.psc
index 445e4d96..b1594a96 100644
--- a/source/scripts/tif__00034daf.psc
+++ b/source/scripts/tif__00034daf.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00034DAF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00037f4c.psc b/source/scripts/tif__00037f4c.psc
index b28b4a54..08f363ba 100644
--- a/source/scripts/tif__00037f4c.psc
+++ b/source/scripts/tif__00037f4c.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-NQ31.SetStage(5)
+NQ31.SetCurrentStageID(5)
 NQ31.SetObjectiveDisplayed(40)
 _00E_GolfurDialogueGlobal.SetValueInt(1)
 ;END CODE
diff --git a/source/scripts/tif__00038710.psc b/source/scripts/tif__00038710.psc
index 1a10b9c7..3f2e43b8 100644
--- a/source/scripts/tif__00038710.psc
+++ b/source/scripts/tif__00038710.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-NQ31.SetStage(5)
+NQ31.SetCurrentStageID(5)
 NQ31.SetObjectiveDisplayed(30)
 _00E_GolfurDialogueGlobal.SetValueInt(2)
 ;END CODE
diff --git a/source/scripts/tif__0003b813.psc b/source/scripts/tif__0003b813.psc
index f6b0e5e4..38529ebc 100644
--- a/source/scripts/tif__0003b813.psc
+++ b/source/scripts/tif__0003b813.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0003B813 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0003db06.psc b/source/scripts/tif__0003db06.psc
index a356dc8e..7b70558e 100644
--- a/source/scripts/tif__0003db06.psc
+++ b/source/scripts/tif__0003db06.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0003DB06 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 NQ19.GiveArtifactOneHanded()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00043b1b.psc b/source/scripts/tif__00043b1b.psc
index 2db75afa..24060d36 100644
--- a/source/scripts/tif__00043b1b.psc
+++ b/source/scripts/tif__00043b1b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00043B1B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00043b44.psc b/source/scripts/tif__00043b44.psc
index 9085c68b..dd9c62fa 100644
--- a/source/scripts/tif__00043b44.psc
+++ b/source/scripts/tif__00043b44.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(200)
+GetOwningQuest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00043b55.psc b/source/scripts/tif__00043b55.psc
index 59ba45c4..82df01f3 100644
--- a/source/scripts/tif__00043b55.psc
+++ b/source/scripts/tif__00043b55.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00043B55 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00043b9f.psc b/source/scripts/tif__00043b9f.psc
index f2d01ac1..f949d981 100644
--- a/source/scripts/tif__00043b9f.psc
+++ b/source/scripts/tif__00043b9f.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 FS_NQR01.GiveRewardBattle03()
-GetOwningQuest().SetStage(61)
+GetOwningQuest().SetCurrentStageID(61)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00043ba0.psc b/source/scripts/tif__00043ba0.psc
index 22892ba8..a35c2f02 100644
--- a/source/scripts/tif__00043ba0.psc
+++ b/source/scripts/tif__00043ba0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00043BA0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00043ba1.psc b/source/scripts/tif__00043ba1.psc
index ebad4dfb..b81c53b2 100644
--- a/source/scripts/tif__00043ba1.psc
+++ b/source/scripts/tif__00043ba1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00043BA1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0004416b.psc b/source/scripts/tif__0004416b.psc
index fa217eb0..558628db 100644
--- a/source/scripts/tif__0004416b.psc
+++ b/source/scripts/tif__0004416b.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(200)
+GetOwningQuest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00044773.psc b/source/scripts/tif__00044773.psc
index 866f1fad..7d7535a3 100644
--- a/source/scripts/tif__00044773.psc
+++ b/source/scripts/tif__00044773.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00044773 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0004477a.psc b/source/scripts/tif__0004477a.psc
index 6e73cb74..9ff3372c 100644
--- a/source/scripts/tif__0004477a.psc
+++ b/source/scripts/tif__0004477a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0004477A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00046de1.psc b/source/scripts/tif__00046de1.psc
index 3ebe0ad0..6376d65c 100644
--- a/source/scripts/tif__00046de1.psc
+++ b/source/scripts/tif__00046de1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00046DE1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00046eb3.psc b/source/scripts/tif__00046eb3.psc
index 54422348..606e2580 100644
--- a/source/scripts/tif__00046eb3.psc
+++ b/source/scripts/tif__00046eb3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00046EB3 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00047c12.psc b/source/scripts/tif__00047c12.psc
index 1743dff1..1981706b 100644
--- a/source/scripts/tif__00047c12.psc
+++ b/source/scripts/tif__00047c12.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 Game.GetPlayer().AddItem(Gold001, 90)
 _00E_RhetorikCounter.SetValueInt(_00E_RhetorikCounter.GetValueInt()+1)
 ;END CODE
diff --git a/source/scripts/tif__0005bb4d.psc b/source/scripts/tif__0005bb4d.psc
index 57f83f76..3cbffb34 100644
--- a/source/scripts/tif__0005bb4d.psc
+++ b/source/scripts/tif__0005bb4d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0005BB4D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-NQ03.SetStage(5)
+NQ03.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00069ca7.psc b/source/scripts/tif__00069ca7.psc
index 0468be90..e0458620 100644
--- a/source/scripts/tif__00069ca7.psc
+++ b/source/scripts/tif__00069ca7.psc
@@ -7,7 +7,7 @@ Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 NQ03.GiveMasterTeacher()
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 Game.GetPlayer().RemoveItem(_00E_NQ03_TarhutiesBottle,1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00069caa.psc b/source/scripts/tif__00069caa.psc
index ea09153b..50fc1857 100644
--- a/source/scripts/tif__00069caa.psc
+++ b/source/scripts/tif__00069caa.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 NQ03.GiveMoneyReward()
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007079d.psc b/source/scripts/tif__0007079d.psc
index 380a04e0..83b85b4f 100644
--- a/source/scripts/tif__0007079d.psc
+++ b/source/scripts/tif__0007079d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007079D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007079e.psc b/source/scripts/tif__0007079e.psc
index 436c3c98..a31d6c16 100644
--- a/source/scripts/tif__0007079e.psc
+++ b/source/scripts/tif__0007079e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007079E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000707a0.psc b/source/scripts/tif__000707a0.psc
index fe9169ac..25f990cb 100644
--- a/source/scripts/tif__000707a0.psc
+++ b/source/scripts/tif__000707a0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000707A0 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 Game.GetPlayer().AddItem(Gold001, 40)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000707a3.psc b/source/scripts/tif__000707a3.psc
index f8459f0b..b8a6418e 100644
--- a/source/scripts/tif__000707a3.psc
+++ b/source/scripts/tif__000707a3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000707A3 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(6)
+GetOwningQuest().SetCurrentStageID(6)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000707a4.psc b/source/scripts/tif__000707a4.psc
index 4f0429b0..89b0db1f 100644
--- a/source/scripts/tif__000707a4.psc
+++ b/source/scripts/tif__000707a4.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 Debug.Trace("Freigekauft")
 Game.GetPlayer().RemoveItem(Gold001, 50)
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 NQ05_BribedCileo.SetValueInt(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000707a9.psc b/source/scripts/tif__000707a9.psc
index 2d87a845..d21b9c0a 100644
--- a/source/scripts/tif__000707a9.psc
+++ b/source/scripts/tif__000707a9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000707A9 Extends TopicInfo Hidden
 Function Fragment_2(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000707ab.psc b/source/scripts/tif__000707ab.psc
index 1fd21374..d5e241d9 100644
--- a/source/scripts/tif__000707ab.psc
+++ b/source/scripts/tif__000707ab.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000707AB Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 Game.GetPlayer().AddItem(Gold001, 90)
 _00E_RhetorikCounter.SetValueInt(_00E_RhetorikCounter.GetValueInt()+1)
 ;END CODE
diff --git a/source/scripts/tif__00074ab8.psc b/source/scripts/tif__00074ab8.psc
index 19daf41b..a045dc43 100644
--- a/source/scripts/tif__00074ab8.psc
+++ b/source/scripts/tif__00074ab8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00074AB8 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00074abe.psc b/source/scripts/tif__00074abe.psc
index 4f6f0250..473e7cae 100644
--- a/source/scripts/tif__00074abe.psc
+++ b/source/scripts/tif__00074abe.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 GetOwningQuest().SetObjectiveCompleted(15)
 if GetOwningQuest().IsObjectiveCompleted(25)
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 endif
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00074ac4.psc b/source/scripts/tif__00074ac4.psc
index 86781041..eab4f28f 100644
--- a/source/scripts/tif__00074ac4.psc
+++ b/source/scripts/tif__00074ac4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00074AC4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00074ac6.psc b/source/scripts/tif__00074ac6.psc
index d31e71ed..f0dc330d 100644
--- a/source/scripts/tif__00074ac6.psc
+++ b/source/scripts/tif__00074ac6.psc
@@ -11,7 +11,7 @@ MQ02.SetObjectiveDisplayed(25)
 MQ02.SetObjectiveCompleted(20)
 MQ02.SetObjectiveCompleted(25)
 if MQ02.IsObjectiveCompleted(15)
-MQ02.SetStage(55)
+MQ02.SetCurrentStageID(55)
 endif
 PlayerREF.RemoveItem(_00E_MQ02_YerosTagebuch, 1)
 PlayerREF.RemoveItem(_00E_MQ02_YerosTagebuch_2, 1)
diff --git a/source/scripts/tif__00074acb.psc b/source/scripts/tif__00074acb.psc
index 5c5e365e..0389d1d5 100644
--- a/source/scripts/tif__00074acb.psc
+++ b/source/scripts/tif__00074acb.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00074ada.psc b/source/scripts/tif__00074ada.psc
index 00167903..5e40a843 100644
--- a/source/scripts/tif__00074ada.psc
+++ b/source/scripts/tif__00074ada.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00074ADA Extends TopicInfo Hidden
 Function Fragment_2(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00074aec.psc b/source/scripts/tif__00074aec.psc
index 76267b39..5cd56e4b 100644
--- a/source/scripts/tif__00074aec.psc
+++ b/source/scripts/tif__00074aec.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00074AEC Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00074aef.psc b/source/scripts/tif__00074aef.psc
index 8a432b89..b00baedd 100644
--- a/source/scripts/tif__00074aef.psc
+++ b/source/scripts/tif__00074aef.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00074AEF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000753be.psc b/source/scripts/tif__000753be.psc
index 07f984d3..7820b911 100644
--- a/source/scripts/tif__000753be.psc
+++ b/source/scripts/tif__000753be.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000753BE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 Game.GetPlayer().AddItem(_00E_Ark_NQ_Kor_BankTresorKey, 1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000753bf.psc b/source/scripts/tif__000753bf.psc
index b5ae6659..fdf39d0c 100644
--- a/source/scripts/tif__000753bf.psc
+++ b/source/scripts/tif__000753bf.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000753BF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 GetOwningQuest().setObjectiveDisplayed(5)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000753c5.psc b/source/scripts/tif__000753c5.psc
index cbdf1b31..4067eda1 100644
--- a/source/scripts/tif__000753c5.psc
+++ b/source/scripts/tif__000753c5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000753C5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-self.GetOwningQuest().SetStage(65)
+self.GetOwningQuest().SetCurrentStageID(65)
 Game.GetPlayer().AddItem(_00E_Ark_NQ_Kor_BankTresorKey, 1, false)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000753d5.psc b/source/scripts/tif__000753d5.psc
index bd1f1fa6..7441b8d0 100644
--- a/source/scripts/tif__000753d5.psc
+++ b/source/scripts/tif__000753d5.psc
@@ -6,10 +6,10 @@ Scriptname TIF__000753D5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-if GetOwningQuest().GetStage() >= 15
+if GetOwningQuest().GetCurrentStageID() >= 15
     NQ07.MovePlayerToKor()
 else
-    GetOwningQuest().SetStage(15)
+    GetOwningQuest().SetCurrentStageID(15)
 endif
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0007733c.psc b/source/scripts/tif__0007733c.psc
index c78b96d6..ac4b20cf 100644
--- a/source/scripts/tif__0007733c.psc
+++ b/source/scripts/tif__0007733c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007733C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00077341.psc b/source/scripts/tif__00077341.psc
index 20cb3e76..b47103f5 100644
--- a/source/scripts/tif__00077341.psc
+++ b/source/scripts/tif__00077341.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00077341 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00077347.psc b/source/scripts/tif__00077347.psc
index 4603897b..b605e426 100644
--- a/source/scripts/tif__00077347.psc
+++ b/source/scripts/tif__00077347.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00077347 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007734f.psc b/source/scripts/tif__0007734f.psc
index 73f266fc..1ccbd296 100644
--- a/source/scripts/tif__0007734f.psc
+++ b/source/scripts/tif__0007734f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007734F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00077350.psc b/source/scripts/tif__00077350.psc
index 81a45f63..63fd8d30 100644
--- a/source/scripts/tif__00077350.psc
+++ b/source/scripts/tif__00077350.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00077350 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007b855.psc b/source/scripts/tif__0007b855.psc
index 4f64237b..f140687d 100644
--- a/source/scripts/tif__0007b855.psc
+++ b/source/scripts/tif__0007b855.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007B855 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007b856.psc b/source/scripts/tif__0007b856.psc
index 9850f3ba..2ecaea2c 100644
--- a/source/scripts/tif__0007b856.psc
+++ b/source/scripts/tif__0007b856.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007B856 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007b858.psc b/source/scripts/tif__0007b858.psc
index 36694f8d..4998d695 100644
--- a/source/scripts/tif__0007b858.psc
+++ b/source/scripts/tif__0007b858.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007B858 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(92)
+GetOwningQuest().SetCurrentStageID(92)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007b859.psc b/source/scripts/tif__0007b859.psc
index ff00a3a4..4cce7e63 100644
--- a/source/scripts/tif__0007b859.psc
+++ b/source/scripts/tif__0007b859.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007B859 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(102)
+GetOwningQuest().SetCurrentStageID(102)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007b85b.psc b/source/scripts/tif__0007b85b.psc
index 45e5c993..aa43c8e0 100644
--- a/source/scripts/tif__0007b85b.psc
+++ b/source/scripts/tif__0007b85b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007B85B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(104)
+GetOwningQuest().SetCurrentStageID(104)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007b85d.psc b/source/scripts/tif__0007b85d.psc
index 4edc2a38..3fd66788 100644
--- a/source/scripts/tif__0007b85d.psc
+++ b/source/scripts/tif__0007b85d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007B85D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007b861.psc b/source/scripts/tif__0007b861.psc
index 0b3660b0..08183788 100644
--- a/source/scripts/tif__0007b861.psc
+++ b/source/scripts/tif__0007b861.psc
@@ -7,7 +7,7 @@ Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 Utility.Wait(2)
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -17,7 +17,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 Utility.Wait(1.4)
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007b86c.psc b/source/scripts/tif__0007b86c.psc
index 0b3dedfe..b7118470 100644
--- a/source/scripts/tif__0007b86c.psc
+++ b/source/scripts/tif__0007b86c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007B86C Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(72)
+GetOwningQuest().SetCurrentStageID(72)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007b86e.psc b/source/scripts/tif__0007b86e.psc
index 9ab6c71e..c0b14886 100644
--- a/source/scripts/tif__0007b86e.psc
+++ b/source/scripts/tif__0007b86e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007B86E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(105)
+GetOwningQuest().SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007b86f.psc b/source/scripts/tif__0007b86f.psc
index b8010fb7..bc72fe39 100644
--- a/source/scripts/tif__0007b86f.psc
+++ b/source/scripts/tif__0007b86f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007B86F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOWningQuest().SetStage(87)
+GetOWningQuest().SetCurrentStageID(87)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007b872.psc b/source/scripts/tif__0007b872.psc
index 89c7871c..1ae0fd5b 100644
--- a/source/scripts/tif__0007b872.psc
+++ b/source/scripts/tif__0007b872.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007B872 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007bbe9.psc b/source/scripts/tif__0007bbe9.psc
index 6f0dd405..8c2babd1 100644
--- a/source/scripts/tif__0007bbe9.psc
+++ b/source/scripts/tif__0007bbe9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007BBE9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007bbf8.psc b/source/scripts/tif__0007bbf8.psc
index 0751c5bd..f9d8416a 100644
--- a/source/scripts/tif__0007bbf8.psc
+++ b/source/scripts/tif__0007bbf8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007BBF8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007bbf9.psc b/source/scripts/tif__0007bbf9.psc
index 5cfd5922..43214b10 100644
--- a/source/scripts/tif__0007bbf9.psc
+++ b/source/scripts/tif__0007bbf9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007BBF9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0007bbfa.psc b/source/scripts/tif__0007bbfa.psc
index b7c90af4..5c980262 100644
--- a/source/scripts/tif__0007bbfa.psc
+++ b/source/scripts/tif__0007bbfa.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0007BBFA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(170)
+GetOwningQuest().SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0008125f.psc b/source/scripts/tif__0008125f.psc
index 8ae824ff..f9397eb7 100644
--- a/source/scripts/tif__0008125f.psc
+++ b/source/scripts/tif__0008125f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008125F Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(11)
+GetOwningQuest().SetCurrentStageID(11)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(12)
+GetOwningQuest().SetCurrentStageID(12)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00081260.psc b/source/scripts/tif__00081260.psc
index cd2d47af..2a234746 100644
--- a/source/scripts/tif__00081260.psc
+++ b/source/scripts/tif__00081260.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00081260 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-NQ36.SetStage(5)
+NQ36.SetCurrentStageID(5)
 EnderalFunctions.DisableDialogueQuitting()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00081262.psc b/source/scripts/tif__00081262.psc
index 9d8b3c0a..824c9e03 100644
--- a/source/scripts/tif__00081262.psc
+++ b/source/scripts/tif__00081262.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00081262 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00081263.psc b/source/scripts/tif__00081263.psc
index bc715598..8e319db8 100644
--- a/source/scripts/tif__00081263.psc
+++ b/source/scripts/tif__00081263.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00081263 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(11)
+GetOwningQuest().SetCurrentStageID(11)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(12)
+GetOwningQuest().SetCurrentStageID(12)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00081275.psc b/source/scripts/tif__00081275.psc
index 7810d30c..8384b033 100644
--- a/source/scripts/tif__00081275.psc
+++ b/source/scripts/tif__00081275.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00081275 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0008127a.psc b/source/scripts/tif__0008127a.psc
index cbcf913a..e36bd1fc 100644
--- a/source/scripts/tif__0008127a.psc
+++ b/source/scripts/tif__0008127a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008127A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00082405.psc b/source/scripts/tif__00082405.psc
index f010b04b..77418a96 100644
--- a/source/scripts/tif__00082405.psc
+++ b/source/scripts/tif__00082405.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00082405 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(107)
+GetOwningQuest().SetCurrentStageID(107)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00082408.psc b/source/scripts/tif__00082408.psc
index ff7d54f3..b71d5ca0 100644
--- a/source/scripts/tif__00082408.psc
+++ b/source/scripts/tif__00082408.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00082408 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-;GetOwningQuest().SetStage(40)
+;GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0008240c.psc b/source/scripts/tif__0008240c.psc
index aede6751..c0cc94ac 100644
--- a/source/scripts/tif__0008240c.psc
+++ b/source/scripts/tif__0008240c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008240C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(27)
+GetOwningQuest().SetCurrentStageID(27)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00082411.psc b/source/scripts/tif__00082411.psc
index ca7f435f..a0aaf393 100644
--- a/source/scripts/tif__00082411.psc
+++ b/source/scripts/tif__00082411.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00082411 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(107)
+GetOwningQuest().SetCurrentStageID(107)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0008592c.psc b/source/scripts/tif__0008592c.psc
index 065c4d60..dbd33467 100644
--- a/source/scripts/tif__0008592c.psc
+++ b/source/scripts/tif__0008592c.psc
@@ -16,7 +16,7 @@ Function Fragment_2(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 Utility.Wait(1.5)
-GetOwningQuest().SetStage(120)
+GetOwningQuest().SetCurrentStageID(120)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00085930.psc b/source/scripts/tif__00085930.psc
index ee626d02..1ad6d74d 100644
--- a/source/scripts/tif__00085930.psc
+++ b/source/scripts/tif__00085930.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00085930 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(115)
+GetOwningQuest().SetCurrentStageID(115)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00085931.psc b/source/scripts/tif__00085931.psc
index 2a7bf12e..14ae405b 100644
--- a/source/scripts/tif__00085931.psc
+++ b/source/scripts/tif__00085931.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00085931 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00085a6a.psc b/source/scripts/tif__00085a6a.psc
index c8bbc18a..3380e987 100644
--- a/source/scripts/tif__00085a6a.psc
+++ b/source/scripts/tif__00085a6a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00085A6A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(42)
+GetOwningQuest().SetCurrentStageID(42)
 Game.DisablePlayerControls()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0008665f.psc b/source/scripts/tif__0008665f.psc
index 19b743f4..ab8e26f9 100644
--- a/source/scripts/tif__0008665f.psc
+++ b/source/scripts/tif__0008665f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008665F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 akSpeaker.EvaluatePackage()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00086664.psc b/source/scripts/tif__00086664.psc
index cec15181..11336822 100644
--- a/source/scripts/tif__00086664.psc
+++ b/source/scripts/tif__00086664.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00086664 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00086666.psc b/source/scripts/tif__00086666.psc
index 5048048e..02065f52 100644
--- a/source/scripts/tif__00086666.psc
+++ b/source/scripts/tif__00086666.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00086666 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00088cd8.psc b/source/scripts/tif__00088cd8.psc
index a61aefc6..43454a0e 100644
--- a/source/scripts/tif__00088cd8.psc
+++ b/source/scripts/tif__00088cd8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00088CD8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00088cd9.psc b/source/scripts/tif__00088cd9.psc
index 7c6be3a8..cb2a54ae 100644
--- a/source/scripts/tif__00088cd9.psc
+++ b/source/scripts/tif__00088cd9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00088CD9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000890d8.psc b/source/scripts/tif__000890d8.psc
index 471c628a..ac9bc49d 100644
--- a/source/scripts/tif__000890d8.psc
+++ b/source/scripts/tif__000890d8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000890D8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000890da.psc b/source/scripts/tif__000890da.psc
index ac9f8ad5..f78d49ea 100644
--- a/source/scripts/tif__000890da.psc
+++ b/source/scripts/tif__000890da.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000890DA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000890dd.psc b/source/scripts/tif__000890dd.psc
index 3a0855ad..f06871b2 100644
--- a/source/scripts/tif__000890dd.psc
+++ b/source/scripts/tif__000890dd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000890DD Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 Game.GetPlayer().RemoveItem(Gold001, 100)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000890de.psc b/source/scripts/tif__000890de.psc
index 351566a6..e0d95fff 100644
--- a/source/scripts/tif__000890de.psc
+++ b/source/scripts/tif__000890de.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000890DE Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 Game.GetPlayer().RemoveItem(Gold001, 300)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0008b2aa.psc b/source/scripts/tif__0008b2aa.psc
index bfd14bda..bd057034 100644
--- a/source/scripts/tif__0008b2aa.psc
+++ b/source/scripts/tif__0008b2aa.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008B2AA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0008b2ac.psc b/source/scripts/tif__0008b2ac.psc
index 3df13a95..0ca87922 100644
--- a/source/scripts/tif__0008b2ac.psc
+++ b/source/scripts/tif__0008b2ac.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008B2AC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 Game.EnablePlayerControls()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0008b2ad.psc b/source/scripts/tif__0008b2ad.psc
index 8e035c6b..9a729dea 100644
--- a/source/scripts/tif__0008b2ad.psc
+++ b/source/scripts/tif__0008b2ad.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008B2AD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 Game.EnablePlayerControls()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0008b2ae.psc b/source/scripts/tif__0008b2ae.psc
index ff9cfb84..fa03c580 100644
--- a/source/scripts/tif__0008b2ae.psc
+++ b/source/scripts/tif__0008b2ae.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008B2AE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 Game.EnablePlayerControls()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0008b2af.psc b/source/scripts/tif__0008b2af.psc
index ea215691..87251068 100644
--- a/source/scripts/tif__0008b2af.psc
+++ b/source/scripts/tif__0008b2af.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008B2AF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 Game.EnablePlayerControls()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0008d8ed.psc b/source/scripts/tif__0008d8ed.psc
index 50b6e2af..817a8889 100644
--- a/source/scripts/tif__0008d8ed.psc
+++ b/source/scripts/tif__0008d8ed.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008D8ED Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 akSpeaker.EvaluatePackage()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0008d8ef.psc b/source/scripts/tif__0008d8ef.psc
index 47633a51..2695f0cd 100644
--- a/source/scripts/tif__0008d8ef.psc
+++ b/source/scripts/tif__0008d8ef.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008D8EF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0008d8f3.psc b/source/scripts/tif__0008d8f3.psc
index bce176b5..86ffae66 100644
--- a/source/scripts/tif__0008d8f3.psc
+++ b/source/scripts/tif__0008d8f3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008D8F3 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0008d8f7.psc b/source/scripts/tif__0008d8f7.psc
index b4d8838b..3f526f4f 100644
--- a/source/scripts/tif__0008d8f7.psc
+++ b/source/scripts/tif__0008d8f7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008D8F7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(57)
+GetOwningQuest().SetCurrentStageID(57)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0008e82f.psc b/source/scripts/tif__0008e82f.psc
index d69cdf70..d9c11051 100644
--- a/source/scripts/tif__0008e82f.psc
+++ b/source/scripts/tif__0008e82f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008E82F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0008e833.psc b/source/scripts/tif__0008e833.psc
index b2be1c95..f0d4ddb8 100644
--- a/source/scripts/tif__0008e833.psc
+++ b/source/scripts/tif__0008e833.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008E833 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0008e917.psc b/source/scripts/tif__0008e917.psc
index cc425ac7..823dabd8 100644
--- a/source/scripts/tif__0008e917.psc
+++ b/source/scripts/tif__0008e917.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008E917 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0008f70f.psc b/source/scripts/tif__0008f70f.psc
index e37ff068..7259577f 100644
--- a/source/scripts/tif__0008f70f.psc
+++ b/source/scripts/tif__0008f70f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0008F70F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0009042f.psc b/source/scripts/tif__0009042f.psc
index bccccefd..3c13d613 100644
--- a/source/scripts/tif__0009042f.psc
+++ b/source/scripts/tif__0009042f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0009042F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00090904.psc b/source/scripts/tif__00090904.psc
index eb1f39ee..a1a0f33a 100644
--- a/source/scripts/tif__00090904.psc
+++ b/source/scripts/tif__00090904.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00090904 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0009090e.psc b/source/scripts/tif__0009090e.psc
index 15bdd0d0..09763ff2 100644
--- a/source/scripts/tif__0009090e.psc
+++ b/source/scripts/tif__0009090e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0009090E Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(135)
+GetOwningQuest().SetCurrentStageID(135)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00090912.psc b/source/scripts/tif__00090912.psc
index d332fa0c..a355c4a9 100644
--- a/source/scripts/tif__00090912.psc
+++ b/source/scripts/tif__00090912.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00090912 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(135)
+GetOwningQuest().SetCurrentStageID(135)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00090956.psc b/source/scripts/tif__00090956.psc
index ac7d8121..e14cf20c 100644
--- a/source/scripts/tif__00090956.psc
+++ b/source/scripts/tif__00090956.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00090956 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(145)
+GetOwningQuest().SetCurrentStageID(145)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00090957.psc b/source/scripts/tif__00090957.psc
index bb9eb774..d06eaf71 100644
--- a/source/scripts/tif__00090957.psc
+++ b/source/scripts/tif__00090957.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00090957 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00090b7d.psc b/source/scripts/tif__00090b7d.psc
index 9270d2a9..5acbf094 100644
--- a/source/scripts/tif__00090b7d.psc
+++ b/source/scripts/tif__00090b7d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00090B7D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(160)
+GetOwningQuest().SetCurrentStageID(160)
 GetOwningQuest().SetObjectiveDisplayed(62)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00090b8a.psc b/source/scripts/tif__00090b8a.psc
index 1c4d8a63..a167f5e4 100644
--- a/source/scripts/tif__00090b8a.psc
+++ b/source/scripts/tif__00090b8a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00090B8A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(170)
+GetOwningQuest().SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00090b8e.psc b/source/scripts/tif__00090b8e.psc
index c8035fed..1b6bd086 100644
--- a/source/scripts/tif__00090b8e.psc
+++ b/source/scripts/tif__00090b8e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00090B8E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(175)
+GetOwningQuest().SetCurrentStageID(175)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00092a21.psc b/source/scripts/tif__00092a21.psc
index 43cefe54..8319f371 100644
--- a/source/scripts/tif__00092a21.psc
+++ b/source/scripts/tif__00092a21.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00092A21 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(205)
+GetOwningQuest().SetCurrentStageID(205)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00092a25.psc b/source/scripts/tif__00092a25.psc
index d38a4152..f440e550 100644
--- a/source/scripts/tif__00092a25.psc
+++ b/source/scripts/tif__00092a25.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00092A25 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-getowningquest().setstage(200)
+getowningquest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00092a29.psc b/source/scripts/tif__00092a29.psc
index 48a867b1..af95d8fd 100644
--- a/source/scripts/tif__00092a29.psc
+++ b/source/scripts/tif__00092a29.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00092A29 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(200)
+GetOwningQuest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00092a2c.psc b/source/scripts/tif__00092a2c.psc
index fb74d251..1b0f3d45 100644
--- a/source/scripts/tif__00092a2c.psc
+++ b/source/scripts/tif__00092a2c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00092A2C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(195)
+GetOwningQuest().SetCurrentStageID(195)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00092a30.psc b/source/scripts/tif__00092a30.psc
index 071b4839..0a2c6091 100644
--- a/source/scripts/tif__00092a30.psc
+++ b/source/scripts/tif__00092a30.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00092A30 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(185)
+GetOwningQuest().SetCurrentStageID(185)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00092a35.psc b/source/scripts/tif__00092a35.psc
index a2a90cd1..abbdfc7a 100644
--- a/source/scripts/tif__00092a35.psc
+++ b/source/scripts/tif__00092a35.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00092A35 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(180)
+GetOwningQuest().SetCurrentStageID(180)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00095194.psc b/source/scripts/tif__00095194.psc
index 94d385ae..d251b207 100644
--- a/source/scripts/tif__00095194.psc
+++ b/source/scripts/tif__00095194.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00095194 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0009519c.psc b/source/scripts/tif__0009519c.psc
index 9fb917ee..a8e8f1a6 100644
--- a/source/scripts/tif__0009519c.psc
+++ b/source/scripts/tif__0009519c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0009519C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000951a0.psc b/source/scripts/tif__000951a0.psc
index 94233895..038d4cf2 100644
--- a/source/scripts/tif__000951a0.psc
+++ b/source/scripts/tif__000951a0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000951A0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(235)
+GetOwningQuest().SetCurrentStageID(235)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000951a3.psc b/source/scripts/tif__000951a3.psc
index 7f8e2dfb..b18d2ecd 100644
--- a/source/scripts/tif__000951a3.psc
+++ b/source/scripts/tif__000951a3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000951A3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000951ad.psc b/source/scripts/tif__000951ad.psc
index 70f4e999..128fb46b 100644
--- a/source/scripts/tif__000951ad.psc
+++ b/source/scripts/tif__000951ad.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000951AD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(245)
+GetOwningQuest().SetCurrentStageID(245)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000951b9.psc b/source/scripts/tif__000951b9.psc
index 105e3cb8..19cec67a 100644
--- a/source/scripts/tif__000951b9.psc
+++ b/source/scripts/tif__000951b9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000951B9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(240)
+GetOwningQuest().SetCurrentStageID(240)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000951cd.psc b/source/scripts/tif__000951cd.psc
index 2d94d4cf..ca42f58a 100644
--- a/source/scripts/tif__000951cd.psc
+++ b/source/scripts/tif__000951cd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000951CD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000951cf.psc b/source/scripts/tif__000951cf.psc
index 0435674e..48beea15 100644
--- a/source/scripts/tif__000951cf.psc
+++ b/source/scripts/tif__000951cf.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000951CF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00096390.psc b/source/scripts/tif__00096390.psc
index 29421f8c..c5797acc 100644
--- a/source/scripts/tif__00096390.psc
+++ b/source/scripts/tif__00096390.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00096390 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00096391.psc b/source/scripts/tif__00096391.psc
index 605243fe..3b9983fa 100644
--- a/source/scripts/tif__00096391.psc
+++ b/source/scripts/tif__00096391.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00096391 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00096392.psc b/source/scripts/tif__00096392.psc
index 5b85ca77..a3580bfd 100644
--- a/source/scripts/tif__00096392.psc
+++ b/source/scripts/tif__00096392.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00096392 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000967da.psc b/source/scripts/tif__000967da.psc
index 9dcea7b1..0b3ca52f 100644
--- a/source/scripts/tif__000967da.psc
+++ b/source/scripts/tif__000967da.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_MQ11c_Functions MQ11c = GetOwningQuest() as _00E_MQ11c_Functions
 MQ11c.FlagRyneusAsDead()
-GetOwningQuest().SetStage(275)
+GetOwningQuest().SetCurrentStageID(275)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000967dc.psc b/source/scripts/tif__000967dc.psc
index f4fedd68..f00b3ea4 100644
--- a/source/scripts/tif__000967dc.psc
+++ b/source/scripts/tif__000967dc.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000967DC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(265)
+GetOwningQuest().SetCurrentStageID(265)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000967dd.psc b/source/scripts/tif__000967dd.psc
index ffef662f..ea541d0e 100644
--- a/source/scripts/tif__000967dd.psc
+++ b/source/scripts/tif__000967dd.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_MQ11c_RyneusBuried.SetValueInt(1)
 Utility.Wait(0.5)
-GetOwningQuest().SetStage(290)
+GetOwningQuest().SetCurrentStageID(290)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000967de.psc b/source/scripts/tif__000967de.psc
index 5e9c2766..8c447efc 100644
--- a/source/scripts/tif__000967de.psc
+++ b/source/scripts/tif__000967de.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000967DE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(285)
+GetOwningQuest().SetCurrentStageID(285)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000967e0.psc b/source/scripts/tif__000967e0.psc
index dd574286..afbf81fd 100644
--- a/source/scripts/tif__000967e0.psc
+++ b/source/scripts/tif__000967e0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000967E0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(280)
+GetOwningQuest().SetCurrentStageID(280)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00096c61.psc b/source/scripts/tif__00096c61.psc
index 71672900..07e2fe17 100644
--- a/source/scripts/tif__00096c61.psc
+++ b/source/scripts/tif__00096c61.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00096C61 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00097cff.psc b/source/scripts/tif__00097cff.psc
index 307e39eb..b90a251b 100644
--- a/source/scripts/tif__00097cff.psc
+++ b/source/scripts/tif__00097cff.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00097CFF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0009855f.psc b/source/scripts/tif__0009855f.psc
index 76765b0d..7bec8870 100644
--- a/source/scripts/tif__0009855f.psc
+++ b/source/scripts/tif__0009855f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0009855F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00098560.psc b/source/scripts/tif__00098560.psc
index 77dfc4d9..67d91623 100644
--- a/source/scripts/tif__00098560.psc
+++ b/source/scripts/tif__00098560.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00098560 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0009aa06.psc b/source/scripts/tif__0009aa06.psc
index 2f3ea82f..ed8d9880 100644
--- a/source/scripts/tif__0009aa06.psc
+++ b/source/scripts/tif__0009aa06.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0009AA06 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0009b69d.psc b/source/scripts/tif__0009b69d.psc
index 7fbd6fcb..a0d077c8 100644
--- a/source/scripts/tif__0009b69d.psc
+++ b/source/scripts/tif__0009b69d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0009B69D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().setStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0009b6bf.psc b/source/scripts/tif__0009b6bf.psc
index 1d93967c..56e0c5f7 100644
--- a/source/scripts/tif__0009b6bf.psc
+++ b/source/scripts/tif__0009b6bf.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0009B6BF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0009b6c4.psc b/source/scripts/tif__0009b6c4.psc
index da10feef..f032f320 100644
--- a/source/scripts/tif__0009b6c4.psc
+++ b/source/scripts/tif__0009b6c4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0009B6C4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0009b6c8.psc b/source/scripts/tif__0009b6c8.psc
index 16869cca..cc61b70f 100644
--- a/source/scripts/tif__0009b6c8.psc
+++ b/source/scripts/tif__0009b6c8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0009B6C8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0009cfc5.psc b/source/scripts/tif__0009cfc5.psc
index 67a8d499..de89c8ca 100644
--- a/source/scripts/tif__0009cfc5.psc
+++ b/source/scripts/tif__0009cfc5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0009CFC5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(115)
+GetOwningQuest().SetCurrentStageID(115)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0009cfca.psc b/source/scripts/tif__0009cfca.psc
index dd08b965..6a48d591 100644
--- a/source/scripts/tif__0009cfca.psc
+++ b/source/scripts/tif__0009cfca.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0009CFCA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(135)
+GetOwningQuest().SetCurrentStageID(135)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0009fce5.psc b/source/scripts/tif__0009fce5.psc
index 32c8670d..57c0565d 100644
--- a/source/scripts/tif__0009fce5.psc
+++ b/source/scripts/tif__0009fce5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0009FCE5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a5811.psc b/source/scripts/tif__000a5811.psc
index d68d30da..4432aba9 100644
--- a/source/scripts/tif__000a5811.psc
+++ b/source/scripts/tif__000a5811.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A5811 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a5812.psc b/source/scripts/tif__000a5812.psc
index 40d692aa..6999e093 100644
--- a/source/scripts/tif__000a5812.psc
+++ b/source/scripts/tif__000a5812.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A5812 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a5813.psc b/source/scripts/tif__000a5813.psc
index 40cdedef..d426a289 100644
--- a/source/scripts/tif__000a5813.psc
+++ b/source/scripts/tif__000a5813.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A5813 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(37)
+GetOwningQuest().SetCurrentStageID(37)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a5817.psc b/source/scripts/tif__000a5817.psc
index 674929ae..1df31f95 100644
--- a/source/scripts/tif__000a5817.psc
+++ b/source/scripts/tif__000a5817.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A5817 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(38)
+GetOwningQuest().SetCurrentStageID(38)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a7049.psc b/source/scripts/tif__000a7049.psc
index 9972d070..b1c449ff 100644
--- a/source/scripts/tif__000a7049.psc
+++ b/source/scripts/tif__000a7049.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A7049 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a7050.psc b/source/scripts/tif__000a7050.psc
index 6d41dcf7..d89659a4 100644
--- a/source/scripts/tif__000a7050.psc
+++ b/source/scripts/tif__000a7050.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 Game.DisablePlayerControls()
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a7fa3.psc b/source/scripts/tif__000a7fa3.psc
index 13690249..37f42fcf 100644
--- a/source/scripts/tif__000a7fa3.psc
+++ b/source/scripts/tif__000a7fa3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A7FA3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a8355.psc b/source/scripts/tif__000a8355.psc
index 7ffdf661..1513b9d9 100644
--- a/source/scripts/tif__000a8355.psc
+++ b/source/scripts/tif__000a8355.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A8355 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a8359.psc b/source/scripts/tif__000a8359.psc
index 6dda4a0c..022dbadb 100644
--- a/source/scripts/tif__000a8359.psc
+++ b/source/scripts/tif__000a8359.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A8359 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(135)
+GetOwningQuest().SetCurrentStageID(135)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a836e.psc b/source/scripts/tif__000a836e.psc
index fee92278..2a910088 100644
--- a/source/scripts/tif__000a836e.psc
+++ b/source/scripts/tif__000a836e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A836E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(140)
+GetOwningQuest().SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a8370.psc b/source/scripts/tif__000a8370.psc
index 4536fb38..3ef5e75f 100644
--- a/source/scripts/tif__000a8370.psc
+++ b/source/scripts/tif__000a8370.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A8370 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(121)
+GetOwningQuest().SetCurrentStageID(121)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a8372.psc b/source/scripts/tif__000a8372.psc
index d8ddfb08..3b52e978 100644
--- a/source/scripts/tif__000a8372.psc
+++ b/source/scripts/tif__000a8372.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A8372 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a8375.psc b/source/scripts/tif__000a8375.psc
index 1816402d..7f717ed4 100644
--- a/source/scripts/tif__000a8375.psc
+++ b/source/scripts/tif__000a8375.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A8375 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a8378.psc b/source/scripts/tif__000a8378.psc
index 9c6afafb..1b4cff0f 100644
--- a/source/scripts/tif__000a8378.psc
+++ b/source/scripts/tif__000a8378.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(122)
+GetOwningQuest().SetCurrentStageID(122)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a8386.psc b/source/scripts/tif__000a8386.psc
index ccb9c86f..4351de3b 100644
--- a/source/scripts/tif__000a8386.psc
+++ b/source/scripts/tif__000a8386.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A8386 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a8395.psc b/source/scripts/tif__000a8395.psc
index 0b5fa9af..948d275a 100644
--- a/source/scripts/tif__000a8395.psc
+++ b/source/scripts/tif__000a8395.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A8395 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000a8396.psc b/source/scripts/tif__000a8396.psc
index e6e5ccac..52e4ae07 100644
--- a/source/scripts/tif__000a8396.psc
+++ b/source/scripts/tif__000a8396.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000A8396 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ac7bc.psc b/source/scripts/tif__000ac7bc.psc
index 4f1a7139..990aaec3 100644
--- a/source/scripts/tif__000ac7bc.psc
+++ b/source/scripts/tif__000ac7bc.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000AC7BC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ace1c.psc b/source/scripts/tif__000ace1c.psc
index 89d37e7b..1d91124a 100644
--- a/source/scripts/tif__000ace1c.psc
+++ b/source/scripts/tif__000ace1c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000ACE1C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000b35c0.psc b/source/scripts/tif__000b35c0.psc
index 84f70c60..3ad24575 100644
--- a/source/scripts/tif__000b35c0.psc
+++ b/source/scripts/tif__000b35c0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000B35C0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c3fe0.psc b/source/scripts/tif__000c3fe0.psc
index 2f473500..a0c3ece1 100644
--- a/source/scripts/tif__000c3fe0.psc
+++ b/source/scripts/tif__000c3fe0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C3FE0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c3fe4.psc b/source/scripts/tif__000c3fe4.psc
index 5b5f2f57..0ef0c2fc 100644
--- a/source/scripts/tif__000c3fe4.psc
+++ b/source/scripts/tif__000c3fe4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C3FE4 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-NQ41.SetStage(5)
+NQ41.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c55d4.psc b/source/scripts/tif__000c55d4.psc
index 1d011da6..02774fc3 100644
--- a/source/scripts/tif__000c55d4.psc
+++ b/source/scripts/tif__000c55d4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C55D4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c55da.psc b/source/scripts/tif__000c55da.psc
index b7ce1142..edd544ee 100644
--- a/source/scripts/tif__000c55da.psc
+++ b/source/scripts/tif__000c55da.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C55DA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(37)
+GetOwningQuest().SetCurrentStageID(37)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c55e0.psc b/source/scripts/tif__000c55e0.psc
index b9084a23..a58db978 100644
--- a/source/scripts/tif__000c55e0.psc
+++ b/source/scripts/tif__000c55e0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C55E0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c6570.psc b/source/scripts/tif__000c6570.psc
index 97a3c2fe..0c6210d2 100644
--- a/source/scripts/tif__000c6570.psc
+++ b/source/scripts/tif__000c6570.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C6570 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(170)
+GetOwningQuest().SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c6571.psc b/source/scripts/tif__000c6571.psc
index e24d9896..de15bd4e 100644
--- a/source/scripts/tif__000c6571.psc
+++ b/source/scripts/tif__000c6571.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C6571 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(155)
+GetOwningQuest().SetCurrentStageID(155)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c6578.psc b/source/scripts/tif__000c6578.psc
index 25619cf2..7b0d2435 100644
--- a/source/scripts/tif__000c6578.psc
+++ b/source/scripts/tif__000c6578.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C6578 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SEtStage(157)
+GetOwningQuest().SetCurrentStageID(157)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c6583.psc b/source/scripts/tif__000c6583.psc
index c616a776..c01e08e4 100644
--- a/source/scripts/tif__000c6583.psc
+++ b/source/scripts/tif__000c6583.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C6583 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(137)
+GetOwningQuest().SetCurrentStageID(137)
 Game.EnablePlayerControls()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000c6589.psc b/source/scripts/tif__000c6589.psc
index 4f8a7f9f..17c98126 100644
--- a/source/scripts/tif__000c6589.psc
+++ b/source/scripts/tif__000c6589.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C6589 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c669a.psc b/source/scripts/tif__000c669a.psc
index e63ec225..90c59497 100644
--- a/source/scripts/tif__000c669a.psc
+++ b/source/scripts/tif__000c669a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C669A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 GetOwningQuest().SetObjectiveCompleted(62)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000c669e.psc b/source/scripts/tif__000c669e.psc
index 41a975e3..857068db 100644
--- a/source/scripts/tif__000c669e.psc
+++ b/source/scripts/tif__000c669e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C669E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(119)
+GetOwningQuest().SetCurrentStageID(119)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c66a2.psc b/source/scripts/tif__000c66a2.psc
index f7469c8d..a2d1b2a3 100644
--- a/source/scripts/tif__000c66a2.psc
+++ b/source/scripts/tif__000c66a2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C66A2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c66a3.psc b/source/scripts/tif__000c66a3.psc
index 0e0dca8d..9d821f4e 100644
--- a/source/scripts/tif__000c66a3.psc
+++ b/source/scripts/tif__000c66a3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C66A3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 MQ09a.JesparGivePresent()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000c66a5.psc b/source/scripts/tif__000c66a5.psc
index 1ea498be..29b7f589 100644
--- a/source/scripts/tif__000c66a5.psc
+++ b/source/scripts/tif__000c66a5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C66A5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c66a7.psc b/source/scripts/tif__000c66a7.psc
index 66f4ce7c..e2e637d5 100644
--- a/source/scripts/tif__000c66a7.psc
+++ b/source/scripts/tif__000c66a7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C66A7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(71)
+GetOwningQuest().SetCurrentStageID(71)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c66a8.psc b/source/scripts/tif__000c66a8.psc
index 4fcc2eeb..ca5ab0a9 100644
--- a/source/scripts/tif__000c66a8.psc
+++ b/source/scripts/tif__000c66a8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C66A8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(118)
+GetOwningQuest().SetCurrentStageID(118)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c66b7.psc b/source/scripts/tif__000c66b7.psc
index 5ae19ad0..d21896df 100644
--- a/source/scripts/tif__000c66b7.psc
+++ b/source/scripts/tif__000c66b7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C66B7 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(120)
+GetOwningQuest().SetCurrentStageID(120)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c66b8.psc b/source/scripts/tif__000c66b8.psc
index 5453f80b..b8201273 100644
--- a/source/scripts/tif__000c66b8.psc
+++ b/source/scripts/tif__000c66b8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C66B8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c66bf.psc b/source/scripts/tif__000c66bf.psc
index d7164984..f5c89265 100644
--- a/source/scripts/tif__000c66bf.psc
+++ b/source/scripts/tif__000c66bf.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C66BF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000c66c0.psc b/source/scripts/tif__000c66c0.psc
index a1e60fb5..e1d36204 100644
--- a/source/scripts/tif__000c66c0.psc
+++ b/source/scripts/tif__000c66c0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000C66C0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000cad6b.psc b/source/scripts/tif__000cad6b.psc
index 1eb13c58..1ed77a9f 100644
--- a/source/scripts/tif__000cad6b.psc
+++ b/source/scripts/tif__000cad6b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CAD6B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000cc885.psc b/source/scripts/tif__000cc885.psc
index df14ebb5..46c17d66 100644
--- a/source/scripts/tif__000cc885.psc
+++ b/source/scripts/tif__000cc885.psc
@@ -6,11 +6,11 @@ Scriptname TIF__000CC885 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;Failsafe for bug ERB-424 below
 Utility.Wait(5)
-If GetOwningQuest().GetStage() < 40
-GetOwningQuest().SetStage(40)
+If GetOwningQuest().GetCurrentStageID() < 40
+GetOwningQuest().SetCurrentStageID(40)
 EndIf
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000cc88a.psc b/source/scripts/tif__000cc88a.psc
index 1390c9f4..7dc7480a 100644
--- a/source/scripts/tif__000cc88a.psc
+++ b/source/scripts/tif__000cc88a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CC88A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(42)
+GetOwningQuest().SetCurrentStageID(42)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ce01a.psc b/source/scripts/tif__000ce01a.psc
index 42ce74a8..0b2b5960 100644
--- a/source/scripts/tif__000ce01a.psc
+++ b/source/scripts/tif__000ce01a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CE01A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(46)
+GetOwningQuest().SetCurrentStageID(46)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ce01b.psc b/source/scripts/tif__000ce01b.psc
index 10e7766a..f7bd40ce 100644
--- a/source/scripts/tif__000ce01b.psc
+++ b/source/scripts/tif__000ce01b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CE01B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ce023.psc b/source/scripts/tif__000ce023.psc
index 3016d594..bf338783 100644
--- a/source/scripts/tif__000ce023.psc
+++ b/source/scripts/tif__000ce023.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CE023 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(48)
+GetOwningQuest().SetCurrentStageID(48)
 MQ03.GiveGoldReward()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000ce024.psc b/source/scripts/tif__000ce024.psc
index 8fdb3a46..7327d5a4 100644
--- a/source/scripts/tif__000ce024.psc
+++ b/source/scripts/tif__000ce024.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CE024 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(48)
+GetOwningQuest().SetCurrentStageID(48)
 MQ03.GiveGoldReward()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000ce02d.psc b/source/scripts/tif__000ce02d.psc
index e9486cbd..777710a7 100644
--- a/source/scripts/tif__000ce02d.psc
+++ b/source/scripts/tif__000ce02d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CE02D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(44)
+GetOwningQuest().SetCurrentStageID(44)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ce0dd.psc b/source/scripts/tif__000ce0dd.psc
index a3883167..bd32e514 100644
--- a/source/scripts/tif__000ce0dd.psc
+++ b/source/scripts/tif__000ce0dd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CE0DD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ce0e0.psc b/source/scripts/tif__000ce0e0.psc
index fb1736ca..bae2d44d 100644
--- a/source/scripts/tif__000ce0e0.psc
+++ b/source/scripts/tif__000ce0e0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CE0E0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ce0e1.psc b/source/scripts/tif__000ce0e1.psc
index 3a532d05..6a0c5b69 100644
--- a/source/scripts/tif__000ce0e1.psc
+++ b/source/scripts/tif__000ce0e1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CE0E1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ce0e4.psc b/source/scripts/tif__000ce0e4.psc
index d68be7dd..b24825a2 100644
--- a/source/scripts/tif__000ce0e4.psc
+++ b/source/scripts/tif__000ce0e4.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 AllowIdleChatter.SetValue(1)
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ce0e6.psc b/source/scripts/tif__000ce0e6.psc
index 2f1c37e9..64d4e70d 100644
--- a/source/scripts/tif__000ce0e6.psc
+++ b/source/scripts/tif__000ce0e6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CE0E6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ce0f8.psc b/source/scripts/tif__000ce0f8.psc
index 378ce0d4..80d32494 100644
--- a/source/scripts/tif__000ce0f8.psc
+++ b/source/scripts/tif__000ce0f8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CE0F8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(37)
+GetOwningQuest().SetCurrentStageID(37)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ce0fa.psc b/source/scripts/tif__000ce0fa.psc
index bd71ce25..184a45fe 100644
--- a/source/scripts/tif__000ce0fa.psc
+++ b/source/scripts/tif__000ce0fa.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CE0FA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ce114.psc b/source/scripts/tif__000ce114.psc
index e27429d4..ebd2a494 100644
--- a/source/scripts/tif__000ce114.psc
+++ b/source/scripts/tif__000ce114.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CE114 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ce11e.psc b/source/scripts/tif__000ce11e.psc
index 995d2307..619a1da6 100644
--- a/source/scripts/tif__000ce11e.psc
+++ b/source/scripts/tif__000ce11e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CE11E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ce11f.psc b/source/scripts/tif__000ce11f.psc
index c8c33b6c..4c69ad34 100644
--- a/source/scripts/tif__000ce11f.psc
+++ b/source/scripts/tif__000ce11f.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_2(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(36)
+GetOwningQuest().SetCurrentStageID(36)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ce307.psc b/source/scripts/tif__000ce307.psc
index 8c208e4e..f760ba6e 100644
--- a/source/scripts/tif__000ce307.psc
+++ b/source/scripts/tif__000ce307.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000CE307 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(7)
+GetOwningQuest().SetCurrentStageID(7)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000d03f6.psc b/source/scripts/tif__000d03f6.psc
index b293a4e6..57f3065b 100644
--- a/source/scripts/tif__000d03f6.psc
+++ b/source/scripts/tif__000d03f6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000D03F6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(140)
+GetOwningQuest().SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000d03fd.psc b/source/scripts/tif__000d03fd.psc
index f494e9b8..4389457c 100644
--- a/source/scripts/tif__000d03fd.psc
+++ b/source/scripts/tif__000d03fd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000D03FD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(160)
+GetOwningQuest().SetCurrentStageID(160)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000d03fe.psc b/source/scripts/tif__000d03fe.psc
index fca4024e..215b4d4e 100644
--- a/source/scripts/tif__000d03fe.psc
+++ b/source/scripts/tif__000d03fe.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000D03FE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000d0404.psc b/source/scripts/tif__000d0404.psc
index 32befdd3..4e6f3731 100644
--- a/source/scripts/tif__000d0404.psc
+++ b/source/scripts/tif__000d0404.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000D0404 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(156)
+GetOwningQuest().SetCurrentStageID(156)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000d0406.psc b/source/scripts/tif__000d0406.psc
index 8cf309bc..238040f0 100644
--- a/source/scripts/tif__000d0406.psc
+++ b/source/scripts/tif__000d0406.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000D0406 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(135)
+GetOwningQuest().SetCurrentStageID(135)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000d22cb.psc b/source/scripts/tif__000d22cb.psc
index 55f4bcdb..c700e0c8 100644
--- a/source/scripts/tif__000d22cb.psc
+++ b/source/scripts/tif__000d22cb.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 MQ06.FadeInSirius()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000d8e45.psc b/source/scripts/tif__000d8e45.psc
index 8167b5f1..9b33dbe1 100644
--- a/source/scripts/tif__000d8e45.psc
+++ b/source/scripts/tif__000d8e45.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000D8E45 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000d8e4a.psc b/source/scripts/tif__000d8e4a.psc
index b5e14e04..1c6f9d8f 100644
--- a/source/scripts/tif__000d8e4a.psc
+++ b/source/scripts/tif__000d8e4a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000D8E4A Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000d8e52.psc b/source/scripts/tif__000d8e52.psc
index 7903a888..83229aaf 100644
--- a/source/scripts/tif__000d8e52.psc
+++ b/source/scripts/tif__000d8e52.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000D8E52 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(27)
+GetOwningQuest().SetCurrentStageID(27)
 GetOwningQuest().SetObjectiveDisplayed(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000d8e55.psc b/source/scripts/tif__000d8e55.psc
index 1300d912..f2da971f 100644
--- a/source/scripts/tif__000d8e55.psc
+++ b/source/scripts/tif__000d8e55.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000D8E55 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(31)
+GetOwningQuest().SetCurrentStageID(31)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000d8e5b.psc b/source/scripts/tif__000d8e5b.psc
index 9ce864fc..ed620661 100644
--- a/source/scripts/tif__000d8e5b.psc
+++ b/source/scripts/tif__000d8e5b.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 GetOwningQuest().SetObjectiveDisplayed(1)
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000d8e5e.psc b/source/scripts/tif__000d8e5e.psc
index 9ecac425..d656c62f 100644
--- a/source/scripts/tif__000d8e5e.psc
+++ b/source/scripts/tif__000d8e5e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000D8E5E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(29)
+GetOwningQuest().SetCurrentStageID(29)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000d8e65.psc b/source/scripts/tif__000d8e65.psc
index ece0afc5..b096852a 100644
--- a/source/scripts/tif__000d8e65.psc
+++ b/source/scripts/tif__000d8e65.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000D8E65 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000d9b37.psc b/source/scripts/tif__000d9b37.psc
index d44922b5..cafe4da0 100644
--- a/source/scripts/tif__000d9b37.psc
+++ b/source/scripts/tif__000d9b37.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000D9B37 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000d9b47.psc b/source/scripts/tif__000d9b47.psc
index fcc3a2cf..19c631dc 100644
--- a/source/scripts/tif__000d9b47.psc
+++ b/source/scripts/tif__000d9b47.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000D9B47 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000d9b4c.psc b/source/scripts/tif__000d9b4c.psc
index cee99dd9..116481ca 100644
--- a/source/scripts/tif__000d9b4c.psc
+++ b/source/scripts/tif__000d9b4c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000D9B4C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000dd6da.psc b/source/scripts/tif__000dd6da.psc
index 4420a590..5afc4c7a 100644
--- a/source/scripts/tif__000dd6da.psc
+++ b/source/scripts/tif__000dd6da.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000DD6DA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000dd6dc.psc b/source/scripts/tif__000dd6dc.psc
index defd2431..21cc63a5 100644
--- a/source/scripts/tif__000dd6dc.psc
+++ b/source/scripts/tif__000dd6dc.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000DD6DC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000dd6e1.psc b/source/scripts/tif__000dd6e1.psc
index c89f4df8..d0a8f15a 100644
--- a/source/scripts/tif__000dd6e1.psc
+++ b/source/scripts/tif__000dd6e1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000DD6E1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(36)
+GetOwningQuest().SetCurrentStageID(36)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000dd6e9.psc b/source/scripts/tif__000dd6e9.psc
index 5e550eec..0523d491 100644
--- a/source/scripts/tif__000dd6e9.psc
+++ b/source/scripts/tif__000dd6e9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000DD6E9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000dd6ee.psc b/source/scripts/tif__000dd6ee.psc
index 51bbb609..a41274dc 100644
--- a/source/scripts/tif__000dd6ee.psc
+++ b/source/scripts/tif__000dd6ee.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000dd6f7.psc b/source/scripts/tif__000dd6f7.psc
index 8351bed2..0f3a4f96 100644
--- a/source/scripts/tif__000dd6f7.psc
+++ b/source/scripts/tif__000dd6f7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000DD6F7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000dd6f8.psc b/source/scripts/tif__000dd6f8.psc
index a4c3a043..3045b2e8 100644
--- a/source/scripts/tif__000dd6f8.psc
+++ b/source/scripts/tif__000dd6f8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000DD6F8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000de6fe.psc b/source/scripts/tif__000de6fe.psc
index 2e6737f1..db396bb1 100644
--- a/source/scripts/tif__000de6fe.psc
+++ b/source/scripts/tif__000de6fe.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000DE6FE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e03cd.psc b/source/scripts/tif__000e03cd.psc
index 1f9276ba..b127eff1 100644
--- a/source/scripts/tif__000e03cd.psc
+++ b/source/scripts/tif__000e03cd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000E03CD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e041b.psc b/source/scripts/tif__000e041b.psc
index 9305d032..e249b1ab 100644
--- a/source/scripts/tif__000e041b.psc
+++ b/source/scripts/tif__000e041b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000E041B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(180)
+GetOwningQuest().SetCurrentStageID(180)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e0420.psc b/source/scripts/tif__000e0420.psc
index 3002726b..935b8c3b 100644
--- a/source/scripts/tif__000e0420.psc
+++ b/source/scripts/tif__000e0420.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000E0420 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(195)
+GetOwningQuest().SetCurrentStageID(195)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e0424.psc b/source/scripts/tif__000e0424.psc
index 0edd25ec..f5ef06a3 100644
--- a/source/scripts/tif__000e0424.psc
+++ b/source/scripts/tif__000e0424.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000E0424 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(190)
+GetOwningQuest().SetCurrentStageID(190)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e0427.psc b/source/scripts/tif__000e0427.psc
index 57f77899..924d4274 100644
--- a/source/scripts/tif__000e0427.psc
+++ b/source/scripts/tif__000e0427.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000E0427 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(205)
+GetOwningQuest().SetCurrentStageID(205)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e42bb.psc b/source/scripts/tif__000e42bb.psc
index 6ff2c97a..34b8cb94 100644
--- a/source/scripts/tif__000e42bb.psc
+++ b/source/scripts/tif__000e42bb.psc
@@ -16,7 +16,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e42bc.psc b/source/scripts/tif__000e42bc.psc
index 75857f54..7423e1e0 100644
--- a/source/scripts/tif__000e42bc.psc
+++ b/source/scripts/tif__000e42bc.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000E42BC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e42cc.psc b/source/scripts/tif__000e42cc.psc
index a78d5729..f58bb535 100644
--- a/source/scripts/tif__000e42cc.psc
+++ b/source/scripts/tif__000e42cc.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000E42CC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e42cd.psc b/source/scripts/tif__000e42cd.psc
index b128ad15..dc3d8417 100644
--- a/source/scripts/tif__000e42cd.psc
+++ b/source/scripts/tif__000e42cd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000E42CD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e42ce.psc b/source/scripts/tif__000e42ce.psc
index 783076b2..710a42ab 100644
--- a/source/scripts/tif__000e42ce.psc
+++ b/source/scripts/tif__000e42ce.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000E42CE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e486e.psc b/source/scripts/tif__000e486e.psc
index bb9fe15b..430bcc68 100644
--- a/source/scripts/tif__000e486e.psc
+++ b/source/scripts/tif__000e486e.psc
@@ -9,7 +9,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 CapitalCityUajaanVuulGlobal.SetValueInt(1)
 Game.GetPlayer().AddItem(Gold001, 1)
 _00E_EPHandler.GiveEP(50)
-NQ33.SetStage(10)
+NQ33.SetCurrentStageID(10)
 _00E_RhetorikCounter.SetValueInt(_00E_RhetorikCounter.GetValueInt()+1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000e4874.psc b/source/scripts/tif__000e4874.psc
index 54ac1bb7..cd06465d 100644
--- a/source/scripts/tif__000e4874.psc
+++ b/source/scripts/tif__000e4874.psc
@@ -9,7 +9,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 CapitalCityUajaanVuulGlobal.SetValue(1)
 Game.GetPlayer().AddItem(_00E_CapitalCityUaljaanVuul_Potion, 1)
 Game.GetPlayer().RemoveItem(Gold001, 200)
-NQ33.SetStage(1)
+NQ33.SetCurrentStageID(1)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e487b.psc b/source/scripts/tif__000e487b.psc
index aff66682..f9d73e2c 100644
--- a/source/scripts/tif__000e487b.psc
+++ b/source/scripts/tif__000e487b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000E487B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e487d.psc b/source/scripts/tif__000e487d.psc
index e47e1037..b02dd522 100644
--- a/source/scripts/tif__000e487d.psc
+++ b/source/scripts/tif__000e487d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000E487D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(115)
+GetOwningQuest().SetCurrentStageID(115)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e4884.psc b/source/scripts/tif__000e4884.psc
index 09bcd0dd..e26aa4fb 100644
--- a/source/scripts/tif__000e4884.psc
+++ b/source/scripts/tif__000e4884.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 CapitalCityUajaanVuulGlobal.SetValueInt(3)
 Game.GetPlayer().AddItem(Gold001, 205)
-NQ33.SetStage(10)
+NQ33.SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000e99ed.psc b/source/scripts/tif__000e99ed.psc
index bc59ab33..ae429b53 100644
--- a/source/scripts/tif__000e99ed.psc
+++ b/source/scripts/tif__000e99ed.psc
@@ -7,13 +7,13 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_MQ08_Questfunctions MQ09a = GetOwningQuest() as _00E_MQ08_Questfunctions
-if GetOwningQuest().GetStage() < 215
-    GetOwningQuest().SetStage(215)
+if GetOwningQuest().GetCurrentStageID() < 215
+    GetOwningQuest().SetCurrentStageID(215)
     Utility.Wait(3)
 endif
 MQ09a.FadeToBlack()
 MQ09a.PrepareOstianTalk()
-GetOwningQuest().SetStage(216)
+GetOwningQuest().SetCurrentStageID(216)
 GetOwningQuest().SetObjectiveCompleted(170)
 MQ09a.CheckTrainScene() ; failsave
 ;END CODE
diff --git a/source/scripts/tif__000e99f0.psc b/source/scripts/tif__000e99f0.psc
index 29df15ef..f9064e14 100644
--- a/source/scripts/tif__000e99f0.psc
+++ b/source/scripts/tif__000e99f0.psc
@@ -16,7 +16,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 MQ09a.bAvoidedQuestion = True
-GetOwningQuest().SetStage(216)
+GetOwningQuest().SetCurrentStageID(216)
 GetOwningQuest().SetObjectiveCompleted(170)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000ea938.psc b/source/scripts/tif__000ea938.psc
index 08edd578..635b0f47 100644
--- a/source/scripts/tif__000ea938.psc
+++ b/source/scripts/tif__000ea938.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EA938 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ea939.psc b/source/scripts/tif__000ea939.psc
index 34e58222..e581915a 100644
--- a/source/scripts/tif__000ea939.psc
+++ b/source/scripts/tif__000ea939.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EA939 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ea943.psc b/source/scripts/tif__000ea943.psc
index dcc4a09e..431f86a9 100644
--- a/source/scripts/tif__000ea943.psc
+++ b/source/scripts/tif__000ea943.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EA943 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 Game.EnablePlayerControls()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000ea966.psc b/source/scripts/tif__000ea966.psc
index 3d731f0b..fe53cfa1 100644
--- a/source/scripts/tif__000ea966.psc
+++ b/source/scripts/tif__000ea966.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EA966 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ea967.psc b/source/scripts/tif__000ea967.psc
index 17ff1b4c..8c174db1 100644
--- a/source/scripts/tif__000ea967.psc
+++ b/source/scripts/tif__000ea967.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EA967 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000eaa86.psc b/source/scripts/tif__000eaa86.psc
index 13f8d5da..aba5362d 100644
--- a/source/scripts/tif__000eaa86.psc
+++ b/source/scripts/tif__000eaa86.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EAA86 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000eabf4.psc b/source/scripts/tif__000eabf4.psc
index d3d54836..35497905 100644
--- a/source/scripts/tif__000eabf4.psc
+++ b/source/scripts/tif__000eabf4.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_MQ09Liar.SetValue(1)
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000eabf8.psc b/source/scripts/tif__000eabf8.psc
index 20abc5a0..5d8863fe 100644
--- a/source/scripts/tif__000eabf8.psc
+++ b/source/scripts/tif__000eabf8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EABF8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000eac01.psc b/source/scripts/tif__000eac01.psc
index 5a45b448..7e99e8db 100644
--- a/source/scripts/tif__000eac01.psc
+++ b/source/scripts/tif__000eac01.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EAC01 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000eacf6.psc b/source/scripts/tif__000eacf6.psc
index 4a82c3d7..35a23142 100644
--- a/source/scripts/tif__000eacf6.psc
+++ b/source/scripts/tif__000eacf6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EACF6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000eacfb.psc b/source/scripts/tif__000eacfb.psc
index dac86e06..9abd678a 100644
--- a/source/scripts/tif__000eacfb.psc
+++ b/source/scripts/tif__000eacfb.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EACFB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(180)
+GetOwningQuest().SetCurrentStageID(180)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000eacfe.psc b/source/scripts/tif__000eacfe.psc
index b753266f..b96eebe1 100644
--- a/source/scripts/tif__000eacfe.psc
+++ b/source/scripts/tif__000eacfe.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EACFE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ead01.psc b/source/scripts/tif__000ead01.psc
index c77d0d8e..cc73b6d9 100644
--- a/source/scripts/tif__000ead01.psc
+++ b/source/scripts/tif__000ead01.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EAD01 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(220)
+GetOwningQuest().SetCurrentStageID(220)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ead07.psc b/source/scripts/tif__000ead07.psc
index f0c29488..4f6f8297 100644
--- a/source/scripts/tif__000ead07.psc
+++ b/source/scripts/tif__000ead07.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EAD07 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(155)
+GetOwningQuest().SetCurrentStageID(155)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ead1a.psc b/source/scripts/tif__000ead1a.psc
index d30e68f0..17ae80a7 100644
--- a/source/scripts/tif__000ead1a.psc
+++ b/source/scripts/tif__000ead1a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EAD1A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(220)
+GetOwningQuest().SetCurrentStageID(220)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ead2c.psc b/source/scripts/tif__000ead2c.psc
index a7e16696..219e2ef7 100644
--- a/source/scripts/tif__000ead2c.psc
+++ b/source/scripts/tif__000ead2c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EAD2C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ead36.psc b/source/scripts/tif__000ead36.psc
index f8aa05ba..69a2efb8 100644
--- a/source/scripts/tif__000ead36.psc
+++ b/source/scripts/tif__000ead36.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EAD36 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000ead3f.psc b/source/scripts/tif__000ead3f.psc
index f93a36e7..e6be106f 100644
--- a/source/scripts/tif__000ead3f.psc
+++ b/source/scripts/tif__000ead3f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EAD3F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(185)
+GetOwningQuest().SetCurrentStageID(185)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000eb3b4.psc b/source/scripts/tif__000eb3b4.psc
index 0d36bdb5..255faa26 100644
--- a/source/scripts/tif__000eb3b4.psc
+++ b/source/scripts/tif__000eb3b4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000EB3B4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000f7668.psc b/source/scripts/tif__000f7668.psc
index 214628eb..de86b345 100644
--- a/source/scripts/tif__000f7668.psc
+++ b/source/scripts/tif__000f7668.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000F7668 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 akSpeaker.EvaluatePackage()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000f766d.psc b/source/scripts/tif__000f766d.psc
index 84e8b17e..2b8bb3d5 100644
--- a/source/scripts/tif__000f766d.psc
+++ b/source/scripts/tif__000f766d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000F766D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 akSpeaker.EvaluatePackage()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__000f7670.psc b/source/scripts/tif__000f7670.psc
index aeb8f17a..df52f4b5 100644
--- a/source/scripts/tif__000f7670.psc
+++ b/source/scripts/tif__000f7670.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000F7670 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000f7688.psc b/source/scripts/tif__000f7688.psc
index 12fdd957..72c76435 100644
--- a/source/scripts/tif__000f7688.psc
+++ b/source/scripts/tif__000f7688.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000F7688 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000fe127.psc b/source/scripts/tif__000fe127.psc
index e63c6e9a..5c2b06ae 100644
--- a/source/scripts/tif__000fe127.psc
+++ b/source/scripts/tif__000fe127.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000FE127 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().setStage(51)
+GetOwningQuest().SetCurrentStageID(51)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__000fe12c.psc b/source/scripts/tif__000fe12c.psc
index a69e58d4..bc5c97af 100644
--- a/source/scripts/tif__000fe12c.psc
+++ b/source/scripts/tif__000fe12c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__000FE12C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00102980.psc b/source/scripts/tif__00102980.psc
index a131ec48..09fcc004 100644
--- a/source/scripts/tif__00102980.psc
+++ b/source/scripts/tif__00102980.psc
@@ -6,11 +6,11 @@ Scriptname TIF__00102980 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(155)
+GetOwningQuest().SetCurrentStageID(155)
 ;Failsafe for report ERB-718
 Utility.Wait(1)
-If GetOwningQuest().GetStage() != 155
-GetOwningQuest().SetStage(155)
+If GetOwningQuest().GetCurrentStageID() != 155
+GetOwningQuest().SetCurrentStageID(155)
 EndIf
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00102981.psc b/source/scripts/tif__00102981.psc
index 9ce9bed2..ea2b3c2f 100644
--- a/source/scripts/tif__00102981.psc
+++ b/source/scripts/tif__00102981.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00102981 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(145)
+GetOwningQuest().SetCurrentStageID(145)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00102992.psc b/source/scripts/tif__00102992.psc
index dc2afeb7..ce3bd5a6 100644
--- a/source/scripts/tif__00102992.psc
+++ b/source/scripts/tif__00102992.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00102992 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 GetOwningQuest().SetObjectiveDisplayed(35)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00102997.psc b/source/scripts/tif__00102997.psc
index e5135619..21e7daf8 100644
--- a/source/scripts/tif__00102997.psc
+++ b/source/scripts/tif__00102997.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00102997 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(160)
+GetOwningQuest().SetCurrentStageID(160)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00103599.psc b/source/scripts/tif__00103599.psc
index c93a97b1..ef7e8af1 100644
--- a/source/scripts/tif__00103599.psc
+++ b/source/scripts/tif__00103599.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00103599 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001035a8.psc b/source/scripts/tif__001035a8.psc
index aa1b04a0..c8bf35b2 100644
--- a/source/scripts/tif__001035a8.psc
+++ b/source/scripts/tif__001035a8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001035A8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010644f.psc b/source/scripts/tif__0010644f.psc
index fa96499c..b6d6a908 100644
--- a/source/scripts/tif__0010644f.psc
+++ b/source/scripts/tif__0010644f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010644F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(135)
+GetOwningQuest().SetCurrentStageID(135)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00106453.psc b/source/scripts/tif__00106453.psc
index 17489e0a..4e34f99d 100644
--- a/source/scripts/tif__00106453.psc
+++ b/source/scripts/tif__00106453.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00106453 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00106455.psc b/source/scripts/tif__00106455.psc
index 886c4ae1..3836829a 100644
--- a/source/scripts/tif__00106455.psc
+++ b/source/scripts/tif__00106455.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00106455 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010646b.psc b/source/scripts/tif__0010646b.psc
index 662a5002..e291a42f 100644
--- a/source/scripts/tif__0010646b.psc
+++ b/source/scripts/tif__0010646b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010646B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010646f.psc b/source/scripts/tif__0010646f.psc
index 8039e10c..c220298d 100644
--- a/source/scripts/tif__0010646f.psc
+++ b/source/scripts/tif__0010646f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010646F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010647e.psc b/source/scripts/tif__0010647e.psc
index 9c96a167..c7fa054d 100644
--- a/source/scripts/tif__0010647e.psc
+++ b/source/scripts/tif__0010647e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010647E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-MQ07a.SetStage(2)
+MQ07a.SetCurrentStageID(2)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00106485.psc b/source/scripts/tif__00106485.psc
index 86f1f695..f63f7146 100644
--- a/source/scripts/tif__00106485.psc
+++ b/source/scripts/tif__00106485.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00106485 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(27)
+GetOwningQuest().SetCurrentStageID(27)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010648e.psc b/source/scripts/tif__0010648e.psc
index 3fb7b51a..2106e7c4 100644
--- a/source/scripts/tif__0010648e.psc
+++ b/source/scripts/tif__0010648e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010648E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00106496.psc b/source/scripts/tif__00106496.psc
index e2aad10e..05dc3dcc 100644
--- a/source/scripts/tif__00106496.psc
+++ b/source/scripts/tif__00106496.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00106496 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 GetOwningQuest().SetObjectiveCompleted(5)
 GetOwningQuest().SetObjectiveDisplayed(15)
 GetOwningQuest().SetObjectiveDisplayed(10)
diff --git a/source/scripts/tif__001064a2.psc b/source/scripts/tif__001064a2.psc
index 3c202477..ff06bf86 100644
--- a/source/scripts/tif__001064a2.psc
+++ b/source/scripts/tif__001064a2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001064A2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(105)
+GetOwningQuest().SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001064a8.psc b/source/scripts/tif__001064a8.psc
index bbae622c..9798fdef 100644
--- a/source/scripts/tif__001064a8.psc
+++ b/source/scripts/tif__001064a8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001064A8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001064ab.psc b/source/scripts/tif__001064ab.psc
index bd6cb8a0..516d7560 100644
--- a/source/scripts/tif__001064ab.psc
+++ b/source/scripts/tif__001064ab.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001064AB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001064c1.psc b/source/scripts/tif__001064c1.psc
index b3143e10..a9680f5c 100644
--- a/source/scripts/tif__001064c1.psc
+++ b/source/scripts/tif__001064c1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001064C1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-MQ07a.SetStage(5)
+MQ07a.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00107f5b.psc b/source/scripts/tif__00107f5b.psc
index 785a6b81..12efd34e 100644
--- a/source/scripts/tif__00107f5b.psc
+++ b/source/scripts/tif__00107f5b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00107F5B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00107f5d.psc b/source/scripts/tif__00107f5d.psc
index c3519c0a..16211337 100644
--- a/source/scripts/tif__00107f5d.psc
+++ b/source/scripts/tif__00107f5d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00107F5D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 GetOwningQuest().SetObjectiveDisplayed(35)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00107f61.psc b/source/scripts/tif__00107f61.psc
index ef256cf7..35a39a8b 100644
--- a/source/scripts/tif__00107f61.psc
+++ b/source/scripts/tif__00107f61.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00107F61 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00107f66.psc b/source/scripts/tif__00107f66.psc
index cf9aa000..2a77e31d 100644
--- a/source/scripts/tif__00107f66.psc
+++ b/source/scripts/tif__00107f66.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00107F66 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 GetOwningQuest().SetObjectiveDisplayed(35)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00107f6b.psc b/source/scripts/tif__00107f6b.psc
index 73078002..4bf52e28 100644
--- a/source/scripts/tif__00107f6b.psc
+++ b/source/scripts/tif__00107f6b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00107F6B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00107f74.psc b/source/scripts/tif__00107f74.psc
index 038d48df..54d4cfa1 100644
--- a/source/scripts/tif__00107f74.psc
+++ b/source/scripts/tif__00107f74.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00107F74 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00107f83.psc b/source/scripts/tif__00107f83.psc
index 4a70d420..37277dac 100644
--- a/source/scripts/tif__00107f83.psc
+++ b/source/scripts/tif__00107f83.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00107F83 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a61d.psc b/source/scripts/tif__0010a61d.psc
index 7dcabdeb..eab722d2 100644
--- a/source/scripts/tif__0010a61d.psc
+++ b/source/scripts/tif__0010a61d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A61D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(195)
+GetOwningQuest().SetCurrentStageID(195)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a61e.psc b/source/scripts/tif__0010a61e.psc
index a40b7099..3f5b004a 100644
--- a/source/scripts/tif__0010a61e.psc
+++ b/source/scripts/tif__0010a61e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A61E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(195)
+GetOwningQuest().SetCurrentStageID(195)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a62a.psc b/source/scripts/tif__0010a62a.psc
index a9361059..3c6b6201 100644
--- a/source/scripts/tif__0010a62a.psc
+++ b/source/scripts/tif__0010a62a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A62A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(187)
+GetOwningQuest().SetCurrentStageID(187)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a634.psc b/source/scripts/tif__0010a634.psc
index 76accbed..717dd199 100644
--- a/source/scripts/tif__0010a634.psc
+++ b/source/scripts/tif__0010a634.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A634 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(185)
+GetOwningQuest().SetCurrentStageID(185)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a635.psc b/source/scripts/tif__0010a635.psc
index 5f0d6f05..5478ee38 100644
--- a/source/scripts/tif__0010a635.psc
+++ b/source/scripts/tif__0010a635.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A635 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(175)
+GetOwningQuest().SetCurrentStageID(175)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a643.psc b/source/scripts/tif__0010a643.psc
index b4808302..fbf2d010 100644
--- a/source/scripts/tif__0010a643.psc
+++ b/source/scripts/tif__0010a643.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A643 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 GetOwningQUest().SetObjectiveDisplayed(17)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0010a64f.psc b/source/scripts/tif__0010a64f.psc
index 6d3aec42..dd7b3e7f 100644
--- a/source/scripts/tif__0010a64f.psc
+++ b/source/scripts/tif__0010a64f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A64F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(190)
+GetOwningQuest().SetCurrentStageID(190)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a65b.psc b/source/scripts/tif__0010a65b.psc
index 4b0e0a28..cc230bca 100644
--- a/source/scripts/tif__0010a65b.psc
+++ b/source/scripts/tif__0010a65b.psc
@@ -16,7 +16,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-getowningquest().setstage(200)
+getowningquest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a65c.psc b/source/scripts/tif__0010a65c.psc
index 4d89929d..3f203ab6 100644
--- a/source/scripts/tif__0010a65c.psc
+++ b/source/scripts/tif__0010a65c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A65C Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(210)
+GetOwningQuest().SetCurrentStageID(210)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a661.psc b/source/scripts/tif__0010a661.psc
index d45756db..4c9c1db6 100644
--- a/source/scripts/tif__0010a661.psc
+++ b/source/scripts/tif__0010a661.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A661 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(180)
+GetOwningQuest().SetCurrentStageID(180)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a82c.psc b/source/scripts/tif__0010a82c.psc
index db530adf..6577a423 100644
--- a/source/scripts/tif__0010a82c.psc
+++ b/source/scripts/tif__0010a82c.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a82f.psc b/source/scripts/tif__0010a82f.psc
index 54c8b04a..8f3c26e8 100644
--- a/source/scripts/tif__0010a82f.psc
+++ b/source/scripts/tif__0010a82f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A82F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a83c.psc b/source/scripts/tif__0010a83c.psc
index 0633cae1..b0f92bfc 100644
--- a/source/scripts/tif__0010a83c.psc
+++ b/source/scripts/tif__0010a83c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A83C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a83e.psc b/source/scripts/tif__0010a83e.psc
index 85b3a35c..772ca0a0 100644
--- a/source/scripts/tif__0010a83e.psc
+++ b/source/scripts/tif__0010a83e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A83E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a842.psc b/source/scripts/tif__0010a842.psc
index 103f1f1c..3f2fb66d 100644
--- a/source/scripts/tif__0010a842.psc
+++ b/source/scripts/tif__0010a842.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A842 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(135)
+GetOwningQuest().SetCurrentStageID(135)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a843.psc b/source/scripts/tif__0010a843.psc
index e042302c..7c6f4bc8 100644
--- a/source/scripts/tif__0010a843.psc
+++ b/source/scripts/tif__0010a843.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A843 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(105)
+GetOwningQuest().SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a852.psc b/source/scripts/tif__0010a852.psc
index cce31e81..d5faa849 100644
--- a/source/scripts/tif__0010a852.psc
+++ b/source/scripts/tif__0010a852.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A852 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a859.psc b/source/scripts/tif__0010a859.psc
index 80fec956..c3a2a58b 100644
--- a/source/scripts/tif__0010a859.psc
+++ b/source/scripts/tif__0010a859.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010A859 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().Setstage(120)
+GetOwningQuest().SetCurrentStageID(120)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010a85c.psc b/source/scripts/tif__0010a85c.psc
index cac359bd..54cca2d5 100644
--- a/source/scripts/tif__0010a85c.psc
+++ b/source/scripts/tif__0010a85c.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010d158.psc b/source/scripts/tif__0010d158.psc
index 3e2d85b7..1a04c822 100644
--- a/source/scripts/tif__0010d158.psc
+++ b/source/scripts/tif__0010d158.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010D158 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010d15b.psc b/source/scripts/tif__0010d15b.psc
index 85ff646d..eac83391 100644
--- a/source/scripts/tif__0010d15b.psc
+++ b/source/scripts/tif__0010d15b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010D15B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010d163.psc b/source/scripts/tif__0010d163.psc
index 2a8de3b3..dd5737c8 100644
--- a/source/scripts/tif__0010d163.psc
+++ b/source/scripts/tif__0010d163.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010D163 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010d168.psc b/source/scripts/tif__0010d168.psc
index 96ca6f92..0c8b08ac 100644
--- a/source/scripts/tif__0010d168.psc
+++ b/source/scripts/tif__0010d168.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010D168 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010d170.psc b/source/scripts/tif__0010d170.psc
index cfebf715..186c5bc8 100644
--- a/source/scripts/tif__0010d170.psc
+++ b/source/scripts/tif__0010d170.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010D170 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010d171.psc b/source/scripts/tif__0010d171.psc
index ad357f11..b6642fce 100644
--- a/source/scripts/tif__0010d171.psc
+++ b/source/scripts/tif__0010d171.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010D171 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010d191.psc b/source/scripts/tif__0010d191.psc
index 00c9a463..b656c07f 100644
--- a/source/scripts/tif__0010d191.psc
+++ b/source/scripts/tif__0010d191.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010D191 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(22)
+GetOwningQuest().SetCurrentStageID(22)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010e666.psc b/source/scripts/tif__0010e666.psc
index 9d2c9e6a..f98168b4 100644
--- a/source/scripts/tif__0010e666.psc
+++ b/source/scripts/tif__0010e666.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010E666 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-MQ07b.SetStage(5)
+MQ07b.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_2(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-MQ07b.SetStage(5)
+MQ07b.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010e66a.psc b/source/scripts/tif__0010e66a.psc
index cfce1bd6..85ba4d52 100644
--- a/source/scripts/tif__0010e66a.psc
+++ b/source/scripts/tif__0010e66a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010E66A Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-MQ07a.SetStage(2)
+MQ07a.SetCurrentStageID(2)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010e66b.psc b/source/scripts/tif__0010e66b.psc
index 26a41d57..27939fda 100644
--- a/source/scripts/tif__0010e66b.psc
+++ b/source/scripts/tif__0010e66b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010E66B Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-MQ07b.SetStage(165)
+MQ07b.SetCurrentStageID(165)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010ff4c.psc b/source/scripts/tif__0010ff4c.psc
index a7b8d3ad..2869d075 100644
--- a/source/scripts/tif__0010ff4c.psc
+++ b/source/scripts/tif__0010ff4c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010FF4C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0010ff5f.psc b/source/scripts/tif__0010ff5f.psc
index 69f25461..0b5c28c2 100644
--- a/source/scripts/tif__0010ff5f.psc
+++ b/source/scripts/tif__0010ff5f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0010FF5F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 akSpeaker.EvaluatePackage()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00111e14.psc b/source/scripts/tif__00111e14.psc
index 2b661ab4..de1b2e54 100644
--- a/source/scripts/tif__00111e14.psc
+++ b/source/scripts/tif__00111e14.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00111E14 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011264e.psc b/source/scripts/tif__0011264e.psc
index 6e86af62..d1ca920f 100644
--- a/source/scripts/tif__0011264e.psc
+++ b/source/scripts/tif__0011264e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011264E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011265c.psc b/source/scripts/tif__0011265c.psc
index 19abe159..c18b1ded 100644
--- a/source/scripts/tif__0011265c.psc
+++ b/source/scripts/tif__0011265c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011265C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-NQ_G_00.SetStage(5)
+NQ_G_00.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001178d9.psc b/source/scripts/tif__001178d9.psc
index 2d905050..96359609 100644
--- a/source/scripts/tif__001178d9.psc
+++ b/source/scripts/tif__001178d9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001178D9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001178dd.psc b/source/scripts/tif__001178dd.psc
index ccc07c19..04646b43 100644
--- a/source/scripts/tif__001178dd.psc
+++ b/source/scripts/tif__001178dd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001178DD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(190)
+GetOwningQuest().SetCurrentStageID(190)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001178e8.psc b/source/scripts/tif__001178e8.psc
index e12f795d..5bd995d2 100644
--- a/source/scripts/tif__001178e8.psc
+++ b/source/scripts/tif__001178e8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001178E8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(210)
+GetOwningQuest().SetCurrentStageID(210)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001178ed.psc b/source/scripts/tif__001178ed.psc
index e14328f8..65e131eb 100644
--- a/source/scripts/tif__001178ed.psc
+++ b/source/scripts/tif__001178ed.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001178ED Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(190)
+GetOwningQuest().SetCurrentStageID(190)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001178f3.psc b/source/scripts/tif__001178f3.psc
index b91fd343..d2e68604 100644
--- a/source/scripts/tif__001178f3.psc
+++ b/source/scripts/tif__001178f3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001178F3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00117903.psc b/source/scripts/tif__00117903.psc
index 7b45feb8..3e0004c1 100644
--- a/source/scripts/tif__00117903.psc
+++ b/source/scripts/tif__00117903.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00117903 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00117904.psc b/source/scripts/tif__00117904.psc
index cbcd7b51..5c28261a 100644
--- a/source/scripts/tif__00117904.psc
+++ b/source/scripts/tif__00117904.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00117904 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00117908.psc b/source/scripts/tif__00117908.psc
index 3b94148f..ce3d8799 100644
--- a/source/scripts/tif__00117908.psc
+++ b/source/scripts/tif__00117908.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00117908 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(190)
+GetOwningQuest().SetCurrentStageID(190)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00118452.psc b/source/scripts/tif__00118452.psc
index f20aea69..8759144e 100644
--- a/source/scripts/tif__00118452.psc
+++ b/source/scripts/tif__00118452.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00118452 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00119ac6.psc b/source/scripts/tif__00119ac6.psc
index 6672e6ba..f44ee14b 100644
--- a/source/scripts/tif__00119ac6.psc
+++ b/source/scripts/tif__00119ac6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00119AC6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00119b5f.psc b/source/scripts/tif__00119b5f.psc
index 81656e6f..b79ddf62 100644
--- a/source/scripts/tif__00119b5f.psc
+++ b/source/scripts/tif__00119b5f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00119B5F Extends TopicInfo Hidden
 Function Fragment_2(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 Game.GetPlayer().AddItem(Lehrbuch, 1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00119b65.psc b/source/scripts/tif__00119b65.psc
index 9dd149ac..dbc61cfa 100644
--- a/source/scripts/tif__00119b65.psc
+++ b/source/scripts/tif__00119b65.psc
@@ -7,7 +7,7 @@ Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 NQ12Key.Enable()
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 GetOwningQuest().SetObjectiveDisplayed(20)
 GetOwningQuest().SetObjectiveCompleted(10)
 _00E_RhetorikCounter.SetValueInt(_00E_RhetorikCounter.GetValueInt()+1)
diff --git a/source/scripts/tif__00119b67.psc b/source/scripts/tif__00119b67.psc
index b5e547d7..b4879c41 100644
--- a/source/scripts/tif__00119b67.psc
+++ b/source/scripts/tif__00119b67.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00119B67 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 Game.GetPlayer().AddItem(Lehrbuch, 1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00119b69.psc b/source/scripts/tif__00119b69.psc
index e8057a31..d087612a 100644
--- a/source/scripts/tif__00119b69.psc
+++ b/source/scripts/tif__00119b69.psc
@@ -7,10 +7,10 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 Quest NQ11 = GetOwningQuest()
-if NQ11.GetStage() == 30
-     NQ11.SetStage(35)
-elseif NQ11.GetStage() == 35
-     NQ11.SetStage(40)
+if NQ11.GetCurrentStageID() == 30
+     NQ11.SetCurrentStageID(35)
+elseif NQ11.GetCurrentStageID() == 35
+     NQ11.SetCurrentStageID(40)
 Endif
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00119b74.psc b/source/scripts/tif__00119b74.psc
index 408415ef..62c4f730 100644
--- a/source/scripts/tif__00119b74.psc
+++ b/source/scripts/tif__00119b74.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00119B74 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 Utility.Wait(4)
 Game.GetPlayer().SetActorValue("Lockpicking", Game.GetPlayer().GetBaseActorValue("Lockpicking")+3)
 _00E_NQ15_sLockpickingIncreased.Show()
diff --git a/source/scripts/tif__00119b7d.psc b/source/scripts/tif__00119b7d.psc
index bb311050..0a5cf772 100644
--- a/source/scripts/tif__00119b7d.psc
+++ b/source/scripts/tif__00119b7d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00119B7D Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 Game.GetPlayer().AddItem(Lehrbuch, 1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00119b7e.psc b/source/scripts/tif__00119b7e.psc
index 623d75be..c70d3d66 100644
--- a/source/scripts/tif__00119b7e.psc
+++ b/source/scripts/tif__00119b7e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00119B7E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 Utility.Wait(4)
 Game.GetPlayer().SetActorValue("Smithing", Game.GetPlayer().GetBaseActorValue("Smithing")+3)
 _00E_NQ15_sCraftsmanshipIncreased.Show()
diff --git a/source/scripts/tif__00119b85.psc b/source/scripts/tif__00119b85.psc
index 92adf335..9316cd2e 100644
--- a/source/scripts/tif__00119b85.psc
+++ b/source/scripts/tif__00119b85.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00119B85 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00119b8b.psc b/source/scripts/tif__00119b8b.psc
index 96ab57f9..1a37363d 100644
--- a/source/scripts/tif__00119b8b.psc
+++ b/source/scripts/tif__00119b8b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00119B8B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00119ba6.psc b/source/scripts/tif__00119ba6.psc
index bf593fdb..2efd88d5 100644
--- a/source/scripts/tif__00119ba6.psc
+++ b/source/scripts/tif__00119ba6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00119BA6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00119bac.psc b/source/scripts/tif__00119bac.psc
index d82bde40..ff8caca4 100644
--- a/source/scripts/tif__00119bac.psc
+++ b/source/scripts/tif__00119bac.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00119BAC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00119bb1.psc b/source/scripts/tif__00119bb1.psc
index 343bb733..bc095600 100644
--- a/source/scripts/tif__00119bb1.psc
+++ b/source/scripts/tif__00119bb1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00119BB1 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00119bb3.psc b/source/scripts/tif__00119bb3.psc
index b92210e8..005492bc 100644
--- a/source/scripts/tif__00119bb3.psc
+++ b/source/scripts/tif__00119bb3.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_PlayerFunctions.GetBrawlControl().Brawl(akSpeaker)
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 Utility.Wait(2)
 _00E_Tutorial_Brawl.ShowAsHelpMessage("NQ11Brawl", 5, 1, 1)
 ;END CODE
diff --git a/source/scripts/tif__00119bb9.psc b/source/scripts/tif__00119bb9.psc
index 804814a2..9f959d92 100644
--- a/source/scripts/tif__00119bb9.psc
+++ b/source/scripts/tif__00119bb9.psc
@@ -7,10 +7,10 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 Quest NQ11 = GetOwningQuest()
-if NQ11.GetStage() == 30
-     NQ11.SetStage(35)
-elseif NQ11.GetStage() == 35
-     NQ11.SetStage(40)
+if NQ11.GetCurrentStageID() == 30
+     NQ11.SetCurrentStageID(35)
+elseif NQ11.GetCurrentStageID() == 35
+     NQ11.SetCurrentStageID(40)
 Endif
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00119bbe.psc b/source/scripts/tif__00119bbe.psc
index 0d833ddb..6984cc73 100644
--- a/source/scripts/tif__00119bbe.psc
+++ b/source/scripts/tif__00119bbe.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00119BBE Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 Game.GetPlayer().RemoveItem(_00E_EisenfurtsLaute, 1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0011a5fa.psc b/source/scripts/tif__0011a5fa.psc
index 47665b6b..0a7aad62 100644
--- a/source/scripts/tif__0011a5fa.psc
+++ b/source/scripts/tif__0011a5fa.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011A5FA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(64)
+GetOwningQuest().SetCurrentStageID(64)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011a5fb.psc b/source/scripts/tif__0011a5fb.psc
index 69cc49e7..d59ef765 100644
--- a/source/scripts/tif__0011a5fb.psc
+++ b/source/scripts/tif__0011a5fb.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011A5FB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(57)
+GetOwningQuest().SetCurrentStageID(57)
 Game.GetPlayer().AddItem(Lehrbuch, 1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0011a602.psc b/source/scripts/tif__0011a602.psc
index 37d0806d..18d8b2af 100644
--- a/source/scripts/tif__0011a602.psc
+++ b/source/scripts/tif__0011a602.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011A602 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(57)
+GetOwningQuest().SetCurrentStageID(57)
 Game.GetPlayer().AddItem(Lehrbuch, 1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0011a603.psc b/source/scripts/tif__0011a603.psc
index 1775585c..f20349f1 100644
--- a/source/scripts/tif__0011a603.psc
+++ b/source/scripts/tif__0011a603.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011A603 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011a60a.psc b/source/scripts/tif__0011a60a.psc
index e174b85b..3aef8d3b 100644
--- a/source/scripts/tif__0011a60a.psc
+++ b/source/scripts/tif__0011a60a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011A60A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(57)
+GetOwningQuest().SetCurrentStageID(57)
 Game.GetPlayer().AddItem(Lehrbuch, 1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0011a632.psc b/source/scripts/tif__0011a632.psc
index c231fd07..c4e55b40 100644
--- a/source/scripts/tif__0011a632.psc
+++ b/source/scripts/tif__0011a632.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011A632 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(57)
+GetOwningQuest().SetCurrentStageID(57)
 Game.GetPlayer().AddItem(Lehrbuch, 1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0011a633.psc b/source/scripts/tif__0011a633.psc
index ed47508b..75619f7b 100644
--- a/source/scripts/tif__0011a633.psc
+++ b/source/scripts/tif__0011a633.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011A633 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011b03c.psc b/source/scripts/tif__0011b03c.psc
index 3d5ced9a..50484396 100644
--- a/source/scripts/tif__0011b03c.psc
+++ b/source/scripts/tif__0011b03c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011B03C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011b042.psc b/source/scripts/tif__0011b042.psc
index 78de1dd2..51546579 100644
--- a/source/scripts/tif__0011b042.psc
+++ b/source/scripts/tif__0011b042.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011B042 Extends TopicInfo Hidden
 Function Fragment_2(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(12)
+GetOwningQuest().SetCurrentStageID(12)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011b044.psc b/source/scripts/tif__0011b044.psc
index a801ee85..d3fa7346 100644
--- a/source/scripts/tif__0011b044.psc
+++ b/source/scripts/tif__0011b044.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011B044 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011b045.psc b/source/scripts/tif__0011b045.psc
index 9624b3ef..f043373e 100644
--- a/source/scripts/tif__0011b045.psc
+++ b/source/scripts/tif__0011b045.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011B045 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011b046.psc b/source/scripts/tif__0011b046.psc
index d4728088..5f71d14b 100644
--- a/source/scripts/tif__0011b046.psc
+++ b/source/scripts/tif__0011b046.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011B046 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011b05b.psc b/source/scripts/tif__0011b05b.psc
index d4140c4d..294e3973 100644
--- a/source/scripts/tif__0011b05b.psc
+++ b/source/scripts/tif__0011b05b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011B05B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011b1fb.psc b/source/scripts/tif__0011b1fb.psc
index 54e78bbf..f2730438 100644
--- a/source/scripts/tif__0011b1fb.psc
+++ b/source/scripts/tif__0011b1fb.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011b1fd.psc b/source/scripts/tif__0011b1fd.psc
index dfce43a6..dc6fefd3 100644
--- a/source/scripts/tif__0011b1fd.psc
+++ b/source/scripts/tif__0011b1fd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011B1FD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-;GetOwningQuest().SetStage(10)
+;GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011b1ff.psc b/source/scripts/tif__0011b1ff.psc
index 586ed556..189fc6a1 100644
--- a/source/scripts/tif__0011b1ff.psc
+++ b/source/scripts/tif__0011b1ff.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011B1FF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011b204.psc b/source/scripts/tif__0011b204.psc
index 525c5861..e22f02eb 100644
--- a/source/scripts/tif__0011b204.psc
+++ b/source/scripts/tif__0011b204.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011B204 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011b205.psc b/source/scripts/tif__0011b205.psc
index b6e8aed6..9290593e 100644
--- a/source/scripts/tif__0011b205.psc
+++ b/source/scripts/tif__0011b205.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011B205 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011b209.psc b/source/scripts/tif__0011b209.psc
index acb19389..03757fcf 100644
--- a/source/scripts/tif__0011b209.psc
+++ b/source/scripts/tif__0011b209.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011B209 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(41)
+GetOwningQuest().SetCurrentStageID(41)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011b20c.psc b/source/scripts/tif__0011b20c.psc
index 0590a0b0..694679d3 100644
--- a/source/scripts/tif__0011b20c.psc
+++ b/source/scripts/tif__0011b20c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011B20C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0011b20d.psc b/source/scripts/tif__0011b20d.psc
index 6128a71c..100c2eb8 100644
--- a/source/scripts/tif__0011b20d.psc
+++ b/source/scripts/tif__0011b20d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0011B20D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00125161.psc b/source/scripts/tif__00125161.psc
index 78ec8d6f..6eab1ff5 100644
--- a/source/scripts/tif__00125161.psc
+++ b/source/scripts/tif__00125161.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00125161 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00125162.psc b/source/scripts/tif__00125162.psc
index c02f51bb..f585bf55 100644
--- a/source/scripts/tif__00125162.psc
+++ b/source/scripts/tif__00125162.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00125162 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00125164.psc b/source/scripts/tif__00125164.psc
index 1cad2196..ee6653c2 100644
--- a/source/scripts/tif__00125164.psc
+++ b/source/scripts/tif__00125164.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00125164 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00125187.psc b/source/scripts/tif__00125187.psc
index 56707c31..d6efc101 100644
--- a/source/scripts/tif__00125187.psc
+++ b/source/scripts/tif__00125187.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00125187 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012518b.psc b/source/scripts/tif__0012518b.psc
index 91632740..47585ee6 100644
--- a/source/scripts/tif__0012518b.psc
+++ b/source/scripts/tif__0012518b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012518B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012518e.psc b/source/scripts/tif__0012518e.psc
index bbc2e8de..6822e24d 100644
--- a/source/scripts/tif__0012518e.psc
+++ b/source/scripts/tif__0012518e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012518E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(140)
+GetOwningQuest().SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00125190.psc b/source/scripts/tif__00125190.psc
index 5bd9a0bc..e4fe791f 100644
--- a/source/scripts/tif__00125190.psc
+++ b/source/scripts/tif__00125190.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00125190 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001251a6.psc b/source/scripts/tif__001251a6.psc
index f7645e7c..4834c91e 100644
--- a/source/scripts/tif__001251a6.psc
+++ b/source/scripts/tif__001251a6.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 if Game.GetPlayer().GetDistance(akSpeaker) <= 700
-NQ15.SetStage(7)
+NQ15.SetCurrentStageID(7)
 Endif
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__001251a8.psc b/source/scripts/tif__001251a8.psc
index 1508f859..543b33e1 100644
--- a/source/scripts/tif__001251a8.psc
+++ b/source/scripts/tif__001251a8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001251A8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001251ac.psc b/source/scripts/tif__001251ac.psc
index 2e51f661..40eded40 100644
--- a/source/scripts/tif__001251ac.psc
+++ b/source/scripts/tif__001251ac.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001251AC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001251ae.psc b/source/scripts/tif__001251ae.psc
index fb615cec..43723dee 100644
--- a/source/scripts/tif__001251ae.psc
+++ b/source/scripts/tif__001251ae.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001251AE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012753a.psc b/source/scripts/tif__0012753a.psc
index 6b11e2e9..2209e7a0 100644
--- a/source/scripts/tif__0012753a.psc
+++ b/source/scripts/tif__0012753a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012753A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(221)
+GetOwningQuest().SetCurrentStageID(221)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00127542.psc b/source/scripts/tif__00127542.psc
index b09e8f37..6ea3e3a1 100644
--- a/source/scripts/tif__00127542.psc
+++ b/source/scripts/tif__00127542.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00127542 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(223)
+GetOwningQuest().SetCurrentStageID(223)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00127546.psc b/source/scripts/tif__00127546.psc
index 87fca770..0f192f81 100644
--- a/source/scripts/tif__00127546.psc
+++ b/source/scripts/tif__00127546.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00127546 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(222)
+GetOwningQuest().SetCurrentStageID(222)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00127558.psc b/source/scripts/tif__00127558.psc
index 8a0bd4f4..b811ba36 100644
--- a/source/scripts/tif__00127558.psc
+++ b/source/scripts/tif__00127558.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00127558 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(220)
+GetOwningQuest().SetCurrentStageID(220)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00127864.psc b/source/scripts/tif__00127864.psc
index db7a24c5..3cbc3925 100644
--- a/source/scripts/tif__00127864.psc
+++ b/source/scripts/tif__00127864.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00127864 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00127869.psc b/source/scripts/tif__00127869.psc
index 34593aa9..2261767d 100644
--- a/source/scripts/tif__00127869.psc
+++ b/source/scripts/tif__00127869.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00127869 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012786f.psc b/source/scripts/tif__0012786f.psc
index e17b5ca8..c9a00822 100644
--- a/source/scripts/tif__0012786f.psc
+++ b/source/scripts/tif__0012786f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012786F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00127872.psc b/source/scripts/tif__00127872.psc
index 1a3f6955..c286c081 100644
--- a/source/scripts/tif__00127872.psc
+++ b/source/scripts/tif__00127872.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00127872 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012787f.psc b/source/scripts/tif__0012787f.psc
index 312f6156..16867cd7 100644
--- a/source/scripts/tif__0012787f.psc
+++ b/source/scripts/tif__0012787f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012787F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00129063.psc b/source/scripts/tif__00129063.psc
index 09dc7348..bfc89f25 100644
--- a/source/scripts/tif__00129063.psc
+++ b/source/scripts/tif__00129063.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00129063 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00129067.psc b/source/scripts/tif__00129067.psc
index 6f23f216..33318f81 100644
--- a/source/scripts/tif__00129067.psc
+++ b/source/scripts/tif__00129067.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00129067 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00129073.psc b/source/scripts/tif__00129073.psc
index 69b781a2..c7bfc932 100644
--- a/source/scripts/tif__00129073.psc
+++ b/source/scripts/tif__00129073.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00129073 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00129076.psc b/source/scripts/tif__00129076.psc
index 0531ab88..7ad9f8e4 100644
--- a/source/scripts/tif__00129076.psc
+++ b/source/scripts/tif__00129076.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00129076 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00129078.psc b/source/scripts/tif__00129078.psc
index c060ac9c..6526bbc2 100644
--- a/source/scripts/tif__00129078.psc
+++ b/source/scripts/tif__00129078.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00129078 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00129079.psc b/source/scripts/tif__00129079.psc
index 7a420e29..f96c22f3 100644
--- a/source/scripts/tif__00129079.psc
+++ b/source/scripts/tif__00129079.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00129079 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012918f.psc b/source/scripts/tif__0012918f.psc
index d6b7333a..763b8795 100644
--- a/source/scripts/tif__0012918f.psc
+++ b/source/scripts/tif__0012918f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012918F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012919b.psc b/source/scripts/tif__0012919b.psc
index 15254ede..1c1281a7 100644
--- a/source/scripts/tif__0012919b.psc
+++ b/source/scripts/tif__0012919b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012919B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00129585.psc b/source/scripts/tif__00129585.psc
index 347c6db3..232fb694 100644
--- a/source/scripts/tif__00129585.psc
+++ b/source/scripts/tif__00129585.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00129585 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00129586.psc b/source/scripts/tif__00129586.psc
index 516d269c..73c1096e 100644
--- a/source/scripts/tif__00129586.psc
+++ b/source/scripts/tif__00129586.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00129586 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012959a.psc b/source/scripts/tif__0012959a.psc
index bc008bb0..f4c12ac9 100644
--- a/source/scripts/tif__0012959a.psc
+++ b/source/scripts/tif__0012959a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012959A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001295b2.psc b/source/scripts/tif__001295b2.psc
index 19f02e09..73d2396f 100644
--- a/source/scripts/tif__001295b2.psc
+++ b/source/scripts/tif__001295b2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001295B2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-NQ15.SetStage(7)
+NQ15.SetCurrentStageID(7)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001295b3.psc b/source/scripts/tif__001295b3.psc
index 05d210ee..7023ca61 100644
--- a/source/scripts/tif__001295b3.psc
+++ b/source/scripts/tif__001295b3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001295B3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-NQ_G_00.SetStage(5)
+NQ_G_00.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012d916.psc b/source/scripts/tif__0012d916.psc
index 9b58e12d..89184980 100644
--- a/source/scripts/tif__0012d916.psc
+++ b/source/scripts/tif__0012d916.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012D916 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012d91a.psc b/source/scripts/tif__0012d91a.psc
index 300f9284..efe7fb3e 100644
--- a/source/scripts/tif__0012d91a.psc
+++ b/source/scripts/tif__0012d91a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012D91A Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_2(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-;GetOwningQuest().SetStage(60)
+;GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012d91c.psc b/source/scripts/tif__0012d91c.psc
index 3f56b448..9130bae0 100644
--- a/source/scripts/tif__0012d91c.psc
+++ b/source/scripts/tif__0012d91c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012D91C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012d931.psc b/source/scripts/tif__0012d931.psc
index bbfbfe61..50c5e4c8 100644
--- a/source/scripts/tif__0012d931.psc
+++ b/source/scripts/tif__0012d931.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012D931 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012d935.psc b/source/scripts/tif__0012d935.psc
index 9a5dd0f6..1f96e6bf 100644
--- a/source/scripts/tif__0012d935.psc
+++ b/source/scripts/tif__0012d935.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012D935 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012d939.psc b/source/scripts/tif__0012d939.psc
index 2a1d2149..797e894f 100644
--- a/source/scripts/tif__0012d939.psc
+++ b/source/scripts/tif__0012d939.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012D939 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012d990.psc b/source/scripts/tif__0012d990.psc
index 12978372..4024ccf9 100644
--- a/source/scripts/tif__0012d990.psc
+++ b/source/scripts/tif__0012d990.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012D990 Extends TopicInfo Hidden
 Function Fragment_2(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 NQ17_SidedWithAndrasta.SetValueInt(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0012d999.psc b/source/scripts/tif__0012d999.psc
index 81f33321..c75ec496 100644
--- a/source/scripts/tif__0012d999.psc
+++ b/source/scripts/tif__0012d999.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 NQ17_ToldTruthToErika.SetValueInt(1)
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012d99c.psc b/source/scripts/tif__0012d99c.psc
index abce7b4a..182fa697 100644
--- a/source/scripts/tif__0012d99c.psc
+++ b/source/scripts/tif__0012d99c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012D99C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012d9a1.psc b/source/scripts/tif__0012d9a1.psc
index cfc5a32e..271a9399 100644
--- a/source/scripts/tif__0012d9a1.psc
+++ b/source/scripts/tif__0012d9a1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012D9A1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(52)
+GetOwningQuest().SetCurrentStageID(52)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012d9a2.psc b/source/scripts/tif__0012d9a2.psc
index 03fe3b11..3aea649d 100644
--- a/source/scripts/tif__0012d9a2.psc
+++ b/source/scripts/tif__0012d9a2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012D9A2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 NQ17.GiveLetter()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0012d9a3.psc b/source/scripts/tif__0012d9a3.psc
index 15ae331d..d16dea37 100644
--- a/source/scripts/tif__0012d9a3.psc
+++ b/source/scripts/tif__0012d9a3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012D9A3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012d9ac.psc b/source/scripts/tif__0012d9ac.psc
index 57e5354d..f7d8499a 100644
--- a/source/scripts/tif__0012d9ac.psc
+++ b/source/scripts/tif__0012d9ac.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012D9AC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012e0a3.psc b/source/scripts/tif__0012e0a3.psc
index 7fd23996..213f1fc0 100644
--- a/source/scripts/tif__0012e0a3.psc
+++ b/source/scripts/tif__0012e0a3.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012e0a4.psc b/source/scripts/tif__0012e0a4.psc
index 6b33ab62..95e1ef33 100644
--- a/source/scripts/tif__0012e0a4.psc
+++ b/source/scripts/tif__0012e0a4.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012e0a7.psc b/source/scripts/tif__0012e0a7.psc
index ca8b0e9b..167de994 100644
--- a/source/scripts/tif__0012e0a7.psc
+++ b/source/scripts/tif__0012e0a7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012E0A7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(104)
+GetOwningQuest().SetCurrentStageID(104)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012e0fc.psc b/source/scripts/tif__0012e0fc.psc
index a7bcd285..601c1bca 100644
--- a/source/scripts/tif__0012e0fc.psc
+++ b/source/scripts/tif__0012e0fc.psc
@@ -10,7 +10,7 @@ Game.GetPlayer().RemoveItem(_00E_NQ19_Artefakt2, 1)
 Game.GetPlayer().AddItem(Gold001, 450)
 GetOwningQuest().SetObjectiveCompleted(20)
 GetOwningQuest().SetObjectiveCompleted(25)
-GetOwningQuest().SetStage(GetOwningQuest().GetStage() +1)
+GetOwningQuest().SetCurrentStageID(GetOwningQuest().GetCurrentStageID() +1)
 NQ19_ArtifactsCollected.Mod(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0012e0ff.psc b/source/scripts/tif__0012e0ff.psc
index 09c5749f..4c636962 100644
--- a/source/scripts/tif__0012e0ff.psc
+++ b/source/scripts/tif__0012e0ff.psc
@@ -9,7 +9,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 Game.GetPlayer().AddItem(_03E_27WegestreuengroschwertDesFrostzorns, 1)
 Game.GetPlayer().RemoveItem(_00E_NQ19_Artefakt2, 1)
 GetOwningQuest().SetObjectiveCompleted(20)
-GetOwningQuest().SetStage(GetOwningQuest().GetStage() +1)
+GetOwningQuest().SetCurrentStageID(GetOwningQuest().GetCurrentStageID() +1)
 GetOwningQuest().SetObjectiveCompleted(25)
 NQ19_ArtifactsCollected.Mod(1)
 ;END CODE
diff --git a/source/scripts/tif__0012e102.psc b/source/scripts/tif__0012e102.psc
index 6d2f53a1..69cda48d 100644
--- a/source/scripts/tif__0012e102.psc
+++ b/source/scripts/tif__0012e102.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012E102 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012e103.psc b/source/scripts/tif__0012e103.psc
index 572edc1b..ee58e93a 100644
--- a/source/scripts/tif__0012e103.psc
+++ b/source/scripts/tif__0012e103.psc
@@ -10,7 +10,7 @@ Game.GetPlayer().RemoveItem(_00E_NQ19_Artefakt2, 1)
 Game.GetPlayer().AddItem(_03E_27WegesschwertDesFeuerzorns, 1)
 GetOwningQuest().SetObjectiveCompleted(20)
 GetOwningQuest().SetObjectiveCompleted(25)
-GetOwningQuest().SetStage(GetOwningQuest().GetStage() +1)
+GetOwningQuest().SetCurrentStageID(GetOwningQuest().GetCurrentStageID() +1)
 NQ19_ArtifactsCollected.Mod(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0012e106.psc b/source/scripts/tif__0012e106.psc
index 43a2e2f7..95992d98 100644
--- a/source/scripts/tif__0012e106.psc
+++ b/source/scripts/tif__0012e106.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012E106 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012e109.psc b/source/scripts/tif__0012e109.psc
index 1bd79977..a209128b 100644
--- a/source/scripts/tif__0012e109.psc
+++ b/source/scripts/tif__0012e109.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012E109 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(6)
+GetOwningQuest().SetCurrentStageID(6)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012e10f.psc b/source/scripts/tif__0012e10f.psc
index 71cf01c3..61cb8177 100644
--- a/source/scripts/tif__0012e10f.psc
+++ b/source/scripts/tif__0012e10f.psc
@@ -10,7 +10,7 @@ Game.GetPlayer().RemoveItem(_00E_NQ19Artefakt01,1)
 Game.GetPlayer().AddItem(Gold001, 230)
 GetOwningQuest().SetObjectiveCompleted(10)
 GetOwningQuest().SetObjectiveCompleted(15)
-GetOwningQuest().SetStage(GetOwningQuest().GetStage() +1)
+GetOwningQuest().SetCurrentStageID(GetOwningQuest().GetCurrentStageID() +1)
 NQ19_ArtifactsCollected.Mod(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0012e112.psc b/source/scripts/tif__0012e112.psc
index 9c1d3e7d..4247d2c2 100644
--- a/source/scripts/tif__0012e112.psc
+++ b/source/scripts/tif__0012e112.psc
@@ -9,7 +9,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 Game.GetPlayer().RemoveItem(_00E_NQ19_Artefakt3, 1)
 Game.GetPlayer().AddItem(Gold001, 500)
 GetOwningQuest().SetObjectiveCompleted(30)
-GetOwningQuest().SetStage(GetOwningQuest().GetStage() +1)
+GetOwningQuest().SetCurrentStageID(GetOwningQuest().GetCurrentStageID() +1)
 GetOwningQuest().SetObjectiveCompleted(35)
 NQ19_ArtifactsCollected.Mod(1)
 ;END CODE
diff --git a/source/scripts/tif__0012e113.psc b/source/scripts/tif__0012e113.psc
index 258d8986..557dbf31 100644
--- a/source/scripts/tif__0012e113.psc
+++ b/source/scripts/tif__0012e113.psc
@@ -10,7 +10,7 @@ Game.GetPlayer().AddItem(_02E_14RunenschildDesLebens, 1)
 Game.GetPlayer().RemoveItem(_00E_NQ19Artefakt01, 1)
 GetOwningQuest().SetObjectiveCompleted(10)
 GetOwningQuest().SetObjectiveCompleted(15)
-GetOwningQuest().SetStage(GetOwningQuest().GetStage() +1)
+GetOwningQuest().SetCurrentStageID(GetOwningQuest().GetCurrentStageID() +1)
 NQ19_ArtifactsCollected.Mod(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0012e114.psc b/source/scripts/tif__0012e114.psc
index 2b43d4e3..7f5050f1 100644
--- a/source/scripts/tif__0012e114.psc
+++ b/source/scripts/tif__0012e114.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012E114 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012e118.psc b/source/scripts/tif__0012e118.psc
index d885b767..3ca2232d 100644
--- a/source/scripts/tif__0012e118.psc
+++ b/source/scripts/tif__0012e118.psc
@@ -10,7 +10,7 @@ Game.GetPlayer().RemoveItem(_00E_NQ19_Artefakt3,1)
 Game.GetPlayer().AddItem(_20E_StabDesKettenBlitzes, 1)
 GetOwningQuest().SetObjectiveCompleted(30)
 GetOwningQuest().SetObjectiveCompleted(35)
-GetOwningQuest().SetStage(GetOwningQuest().GetStage() +1)
+GetOwningQuest().SetCurrentStageID(GetOwningQuest().GetCurrentStageID() +1)
 NQ19_ArtifactsCollected.Mod(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0012e11f.psc b/source/scripts/tif__0012e11f.psc
index e8e472b7..4d047513 100644
--- a/source/scripts/tif__0012e11f.psc
+++ b/source/scripts/tif__0012e11f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012E11F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012e120.psc b/source/scripts/tif__0012e120.psc
index 728baa17..0f57b5d0 100644
--- a/source/scripts/tif__0012e120.psc
+++ b/source/scripts/tif__0012e120.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012E120 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012e121.psc b/source/scripts/tif__0012e121.psc
index ddd704e5..b769f3bf 100644
--- a/source/scripts/tif__0012e121.psc
+++ b/source/scripts/tif__0012e121.psc
@@ -10,7 +10,7 @@ Game.GetPlayer().RemoveItem(_00E_NQ19_Artefakt3, 1)
 Game.GetPlayer().AddItem(_03E_22HarnischDerDiebeskunst, 1)
 GetOwningQuest().SetObjectiveCompleted(30)
 GetOwningQuest().SetObjectiveCompleted(35)
-GetOwningQuest().SetStage(GetOwningQuest().GetStage() +1)
+GetOwningQuest().SetCurrentStageID(GetOwningQuest().GetCurrentStageID() +1)
 NQ19_ArtifactsCollected.Mod(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0012e122.psc b/source/scripts/tif__0012e122.psc
index d679bb29..5d5bc765 100644
--- a/source/scripts/tif__0012e122.psc
+++ b/source/scripts/tif__0012e122.psc
@@ -10,7 +10,7 @@ Game.GetPlayer().AddItem(_02E_15DiademDerMagieregenerationI,1)
 Game.GetPlayer().RemoveItem(_00E_NQ19Artefakt01,1)
 GetOwningQuest().SetObjectiveCompleted(10)
 GetOwningQuest().SetObjectiveCompleted(15)
-GetOwningQuest().SetStage(GetOwningQuest().GetStage() +1)
+GetOwningQuest().SetCurrentStageID(GetOwningQuest().GetCurrentStageID() +1)
 NQ19_ArtifactsCollected.Mod(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0012e430.psc b/source/scripts/tif__0012e430.psc
index f939808c..ff5e6d20 100644
--- a/source/scripts/tif__0012e430.psc
+++ b/source/scripts/tif__0012e430.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012E430 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0012ee6a.psc b/source/scripts/tif__0012ee6a.psc
index 6cd6a622..546f67fb 100644
--- a/source/scripts/tif__0012ee6a.psc
+++ b/source/scripts/tif__0012ee6a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0012EE6A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00132d62.psc b/source/scripts/tif__00132d62.psc
index 4bc62cc4..88060c06 100644
--- a/source/scripts/tif__00132d62.psc
+++ b/source/scripts/tif__00132d62.psc
@@ -15,8 +15,8 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-NQ_G_00.SetStage(10)
-NQ_G_01.SetStage(10)
+NQ_G_00.SetCurrentStageID(10)
+NQ_G_01.SetCurrentStageID(10)
 EnderalFunctions.EnableDialogueQuitting()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00132e01.psc b/source/scripts/tif__00132e01.psc
index 919b770d..f36b21c1 100644
--- a/source/scripts/tif__00132e01.psc
+++ b/source/scripts/tif__00132e01.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00132E01 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00132e02.psc b/source/scripts/tif__00132e02.psc
index 563883dc..ffe4c5b1 100644
--- a/source/scripts/tif__00132e02.psc
+++ b/source/scripts/tif__00132e02.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00132E02 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00132e1c.psc b/source/scripts/tif__00132e1c.psc
index 945445e3..f2dd3c0e 100644
--- a/source/scripts/tif__00132e1c.psc
+++ b/source/scripts/tif__00132e1c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00132E1C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001338b4.psc b/source/scripts/tif__001338b4.psc
index 42355635..7a9fd83d 100644
--- a/source/scripts/tif__001338b4.psc
+++ b/source/scripts/tif__001338b4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001338B4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(115)
+GetOwningQuest().SetCurrentStageID(115)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001338b9.psc b/source/scripts/tif__001338b9.psc
index 3961d366..a6b811b8 100644
--- a/source/scripts/tif__001338b9.psc
+++ b/source/scripts/tif__001338b9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001338B9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(135)
+GetOwningQuest().SetCurrentStageID(135)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001338ec.psc b/source/scripts/tif__001338ec.psc
index 996676ce..25608f80 100644
--- a/source/scripts/tif__001338ec.psc
+++ b/source/scripts/tif__001338ec.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001338EC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001338f1.psc b/source/scripts/tif__001338f1.psc
index 49f7d9b9..faf137ba 100644
--- a/source/scripts/tif__001338f1.psc
+++ b/source/scripts/tif__001338f1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001338F1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00134484.psc b/source/scripts/tif__00134484.psc
index 5972b13e..acb9ad02 100644
--- a/source/scripts/tif__00134484.psc
+++ b/source/scripts/tif__00134484.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00134484 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-NQ_G_01.SetStage(5)
+NQ_G_01.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00134485.psc b/source/scripts/tif__00134485.psc
index 73b690ae..06bb427c 100644
--- a/source/scripts/tif__00134485.psc
+++ b/source/scripts/tif__00134485.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00134485 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013453c.psc b/source/scripts/tif__0013453c.psc
index d9cecd5f..3674e988 100644
--- a/source/scripts/tif__0013453c.psc
+++ b/source/scripts/tif__0013453c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013453C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013453d.psc b/source/scripts/tif__0013453d.psc
index eb3e5d6a..b64ac509 100644
--- a/source/scripts/tif__0013453d.psc
+++ b/source/scripts/tif__0013453d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013453D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013455d.psc b/source/scripts/tif__0013455d.psc
index b05fee58..075494fc 100644
--- a/source/scripts/tif__0013455d.psc
+++ b/source/scripts/tif__0013455d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013455D Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00134569.psc b/source/scripts/tif__00134569.psc
index 4ae65396..6278869d 100644
--- a/source/scripts/tif__00134569.psc
+++ b/source/scripts/tif__00134569.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00134569 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013456a.psc b/source/scripts/tif__0013456a.psc
index 1727b86a..68ebb512 100644
--- a/source/scripts/tif__0013456a.psc
+++ b/source/scripts/tif__0013456a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013456A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013456b.psc b/source/scripts/tif__0013456b.psc
index 3e146a92..24684764 100644
--- a/source/scripts/tif__0013456b.psc
+++ b/source/scripts/tif__0013456b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013456B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013456c.psc b/source/scripts/tif__0013456c.psc
index d5baaea4..175e683b 100644
--- a/source/scripts/tif__0013456c.psc
+++ b/source/scripts/tif__0013456c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013456C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00134574.psc b/source/scripts/tif__00134574.psc
index a30a43d5..876e1483 100644
--- a/source/scripts/tif__00134574.psc
+++ b/source/scripts/tif__00134574.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00134574 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00134575.psc b/source/scripts/tif__00134575.psc
index 9c7e2cee..6fe6998f 100644
--- a/source/scripts/tif__00134575.psc
+++ b/source/scripts/tif__00134575.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00134575 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00134576.psc b/source/scripts/tif__00134576.psc
index a6b342a9..8dcff73d 100644
--- a/source/scripts/tif__00134576.psc
+++ b/source/scripts/tif__00134576.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00134576 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00134577.psc b/source/scripts/tif__00134577.psc
index 10b253f3..70d09906 100644
--- a/source/scripts/tif__00134577.psc
+++ b/source/scripts/tif__00134577.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00134577 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001346d6.psc b/source/scripts/tif__001346d6.psc
index 3ac43770..4b41af2e 100644
--- a/source/scripts/tif__001346d6.psc
+++ b/source/scripts/tif__001346d6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001346D6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001346d9.psc b/source/scripts/tif__001346d9.psc
index 740104c0..8e4a79b2 100644
--- a/source/scripts/tif__001346d9.psc
+++ b/source/scripts/tif__001346d9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001346D9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001346db.psc b/source/scripts/tif__001346db.psc
index 39c90bdc..698073b8 100644
--- a/source/scripts/tif__001346db.psc
+++ b/source/scripts/tif__001346db.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001346DB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001346e8.psc b/source/scripts/tif__001346e8.psc
index 36b40e3c..b83d7425 100644
--- a/source/scripts/tif__001346e8.psc
+++ b/source/scripts/tif__001346e8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001346E8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(237)
+GetOwningQuest().SetCurrentStageID(237)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00136cc1.psc b/source/scripts/tif__00136cc1.psc
index 67594785..4eca4732 100644
--- a/source/scripts/tif__00136cc1.psc
+++ b/source/scripts/tif__00136cc1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00136CC1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00136cd2.psc b/source/scripts/tif__00136cd2.psc
index 170bd421..ca4fbce1 100644
--- a/source/scripts/tif__00136cd2.psc
+++ b/source/scripts/tif__00136cd2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00136CD2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00136cd3.psc b/source/scripts/tif__00136cd3.psc
index 9ccacd5a..4c12bbeb 100644
--- a/source/scripts/tif__00136cd3.psc
+++ b/source/scripts/tif__00136cd3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00136CD3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00136cd5.psc b/source/scripts/tif__00136cd5.psc
index e6aa329d..dbe62853 100644
--- a/source/scripts/tif__00136cd5.psc
+++ b/source/scripts/tif__00136cd5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00136CD5 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00136ce9.psc b/source/scripts/tif__00136ce9.psc
index 8431779b..b14a3120 100644
--- a/source/scripts/tif__00136ce9.psc
+++ b/source/scripts/tif__00136ce9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00136CE9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00136cec.psc b/source/scripts/tif__00136cec.psc
index 4d9b3992..a4f53e16 100644
--- a/source/scripts/tif__00136cec.psc
+++ b/source/scripts/tif__00136cec.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00136CEC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 GetOwningQuest().SetObjectiveCompleted(5)
 Steam.UnlockAchievement("END_STARSHIP_01")
 ;END CODE
diff --git a/source/scripts/tif__00137113.psc b/source/scripts/tif__00137113.psc
index 2135ff69..89f723a9 100644
--- a/source/scripts/tif__00137113.psc
+++ b/source/scripts/tif__00137113.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137113 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013711e.psc b/source/scripts/tif__0013711e.psc
index adb4f384..4df83a7a 100644
--- a/source/scripts/tif__0013711e.psc
+++ b/source/scripts/tif__0013711e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013711E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137123.psc b/source/scripts/tif__00137123.psc
index f131db44..63a3a646 100644
--- a/source/scripts/tif__00137123.psc
+++ b/source/scripts/tif__00137123.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137123 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013712f.psc b/source/scripts/tif__0013712f.psc
index bab7732b..057fccfb 100644
--- a/source/scripts/tif__0013712f.psc
+++ b/source/scripts/tif__0013712f.psc
@@ -6,8 +6,8 @@ Scriptname TIF__0013712F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
-NQ_G_03.SetStage(5)
+GetOwningQuest().SetCurrentStageID(80)
+NQ_G_03.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137134.psc b/source/scripts/tif__00137134.psc
index 4cf4deaf..42cdc165 100644
--- a/source/scripts/tif__00137134.psc
+++ b/source/scripts/tif__00137134.psc
@@ -15,8 +15,8 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
-NQ_G_03.SetStage(5)
+GetOwningQuest().SetCurrentStageID(70)
+NQ_G_03.SetCurrentStageID(5)
 _00E_RhetorikCounter.SetValueInt(_00E_RhetorikCounter.GetValueInt()+1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013713a.psc b/source/scripts/tif__0013713a.psc
index add5e0f1..b1b05d33 100644
--- a/source/scripts/tif__0013713a.psc
+++ b/source/scripts/tif__0013713a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013713A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013713b.psc b/source/scripts/tif__0013713b.psc
index 8b7dcc46..321f422a 100644
--- a/source/scripts/tif__0013713b.psc
+++ b/source/scripts/tif__0013713b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013713B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137140.psc b/source/scripts/tif__00137140.psc
index 4b48640b..9f5d0666 100644
--- a/source/scripts/tif__00137140.psc
+++ b/source/scripts/tif__00137140.psc
@@ -6,8 +6,8 @@ Scriptname TIF__00137140 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
-NQ_G_03.SetStage(5)
+GetOwningQuest().SetCurrentStageID(65)
+NQ_G_03.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137144.psc b/source/scripts/tif__00137144.psc
index 9906068a..11fedc4e 100644
--- a/source/scripts/tif__00137144.psc
+++ b/source/scripts/tif__00137144.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137144 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013714e.psc b/source/scripts/tif__0013714e.psc
index 3345ce47..bbc0f4b5 100644
--- a/source/scripts/tif__0013714e.psc
+++ b/source/scripts/tif__0013714e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013714E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013714f.psc b/source/scripts/tif__0013714f.psc
index c821a8b6..9e582e38 100644
--- a/source/scripts/tif__0013714f.psc
+++ b/source/scripts/tif__0013714f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013714F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 Game.GetPlayer().AddItem(_00E_BAltGaragathaL2ExitKey, 1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00137151.psc b/source/scripts/tif__00137151.psc
index 4ed38664..45b251ee 100644
--- a/source/scripts/tif__00137151.psc
+++ b/source/scripts/tif__00137151.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137151 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137152.psc b/source/scripts/tif__00137152.psc
index c8bf3366..c7bb57c6 100644
--- a/source/scripts/tif__00137152.psc
+++ b/source/scripts/tif__00137152.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137152 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013715e.psc b/source/scripts/tif__0013715e.psc
index 35100d69..38880a3c 100644
--- a/source/scripts/tif__0013715e.psc
+++ b/source/scripts/tif__0013715e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013715E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137167.psc b/source/scripts/tif__00137167.psc
index c1e43ecb..a714e228 100644
--- a/source/scripts/tif__00137167.psc
+++ b/source/scripts/tif__00137167.psc
@@ -6,8 +6,8 @@ Scriptname TIF__00137167 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
-NQ_G_03.SetStage(5)
+GetOwningQuest().SetCurrentStageID(75)
+NQ_G_03.SetCurrentStageID(5)
 Game.GetPlayer().AddItem(_00E_BankKey1111Hafner, 1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013716a.psc b/source/scripts/tif__0013716a.psc
index 1ad83892..734742ef 100644
--- a/source/scripts/tif__0013716a.psc
+++ b/source/scripts/tif__0013716a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013716A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013716d.psc b/source/scripts/tif__0013716d.psc
index 243124ef..c0f266e7 100644
--- a/source/scripts/tif__0013716d.psc
+++ b/source/scripts/tif__0013716d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013716D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137174.psc b/source/scripts/tif__00137174.psc
index 9fb27c39..5947991d 100644
--- a/source/scripts/tif__00137174.psc
+++ b/source/scripts/tif__00137174.psc
@@ -6,8 +6,8 @@ Scriptname TIF__00137174 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
-NQ_G_03.SetStage(5)
+GetOwningQuest().SetCurrentStageID(85)
+NQ_G_03.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013717d.psc b/source/scripts/tif__0013717d.psc
index 5170590b..c5d81025 100644
--- a/source/scripts/tif__0013717d.psc
+++ b/source/scripts/tif__0013717d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013717D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 NQ_G_02.AddMapMarker()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__001378e8.psc b/source/scripts/tif__001378e8.psc
index 36aa6bc7..119c3d70 100644
--- a/source/scripts/tif__001378e8.psc
+++ b/source/scripts/tif__001378e8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001378E8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(47)
+GetOwningQuest().SetCurrentStageID(47)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001378f1.psc b/source/scripts/tif__001378f1.psc
index 3f66fa45..84f602dd 100644
--- a/source/scripts/tif__001378f1.psc
+++ b/source/scripts/tif__001378f1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001378F1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(23)
+GetOwningQuest().SetCurrentStageID(23)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001378f6.psc b/source/scripts/tif__001378f6.psc
index 850e5333..c8623eba 100644
--- a/source/scripts/tif__001378f6.psc
+++ b/source/scripts/tif__001378f6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001378F6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137eeb.psc b/source/scripts/tif__00137eeb.psc
index 0091fa0c..a2f311d9 100644
--- a/source/scripts/tif__00137eeb.psc
+++ b/source/scripts/tif__00137eeb.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137EEB Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(135)
+GetOwningQuest().SetCurrentStageID(135)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137eef.psc b/source/scripts/tif__00137eef.psc
index 55a9ef39..80f521d9 100644
--- a/source/scripts/tif__00137eef.psc
+++ b/source/scripts/tif__00137eef.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137EEF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(105)
+GetOwningQuest().SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137ef8.psc b/source/scripts/tif__00137ef8.psc
index e35a9a62..4143e2d8 100644
--- a/source/scripts/tif__00137ef8.psc
+++ b/source/scripts/tif__00137ef8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137EF8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137eff.psc b/source/scripts/tif__00137eff.psc
index af69a547..f9ed302f 100644
--- a/source/scripts/tif__00137eff.psc
+++ b/source/scripts/tif__00137eff.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137EFF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137f00.psc b/source/scripts/tif__00137f00.psc
index f23c9921..08495f80 100644
--- a/source/scripts/tif__00137f00.psc
+++ b/source/scripts/tif__00137f00.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137F00 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137f0c.psc b/source/scripts/tif__00137f0c.psc
index 4fb24605..c09015ec 100644
--- a/source/scripts/tif__00137f0c.psc
+++ b/source/scripts/tif__00137f0c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137F0C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(115)
+GetOwningQuest().SetCurrentStageID(115)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137f0e.psc b/source/scripts/tif__00137f0e.psc
index fb2a7924..733a30e0 100644
--- a/source/scripts/tif__00137f0e.psc
+++ b/source/scripts/tif__00137f0e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137F0E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137f18.psc b/source/scripts/tif__00137f18.psc
index f04c4d3a..e6a1b788 100644
--- a/source/scripts/tif__00137f18.psc
+++ b/source/scripts/tif__00137f18.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137F18 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137f47.psc b/source/scripts/tif__00137f47.psc
index 63501dd2..04635a7a 100644
--- a/source/scripts/tif__00137f47.psc
+++ b/source/scripts/tif__00137f47.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137F47 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(140)
+GetOwningQuest().SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137f5b.psc b/source/scripts/tif__00137f5b.psc
index e719ea25..2d8b2c7e 100644
--- a/source/scripts/tif__00137f5b.psc
+++ b/source/scripts/tif__00137f5b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137F5B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(145)
+GetOwningQuest().SetCurrentStageID(145)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137f5e.psc b/source/scripts/tif__00137f5e.psc
index 2a770475..613a9415 100644
--- a/source/scripts/tif__00137f5e.psc
+++ b/source/scripts/tif__00137f5e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137F5E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137f6b.psc b/source/scripts/tif__00137f6b.psc
index ccbdca47..dff63c25 100644
--- a/source/scripts/tif__00137f6b.psc
+++ b/source/scripts/tif__00137f6b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137F6B Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137f6c.psc b/source/scripts/tif__00137f6c.psc
index ae8f8f6f..80262766 100644
--- a/source/scripts/tif__00137f6c.psc
+++ b/source/scripts/tif__00137f6c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137F6C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137f6d.psc b/source/scripts/tif__00137f6d.psc
index 4d66fce9..52587cc3 100644
--- a/source/scripts/tif__00137f6d.psc
+++ b/source/scripts/tif__00137f6d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137F6D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137f7d.psc b/source/scripts/tif__00137f7d.psc
index ef45ff9a..a000f3c7 100644
--- a/source/scripts/tif__00137f7d.psc
+++ b/source/scripts/tif__00137f7d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00137F7D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(125)
+GetOwningQuest().SetCurrentStageID(125)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00137f80.psc b/source/scripts/tif__00137f80.psc
index 8e9cb35b..0889f06b 100644
--- a/source/scripts/tif__00137f80.psc
+++ b/source/scripts/tif__00137f80.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001380cd.psc b/source/scripts/tif__001380cd.psc
index 33f97126..71bb5a14 100644
--- a/source/scripts/tif__001380cd.psc
+++ b/source/scripts/tif__001380cd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001380CD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 NQ_G_03.GiveLetter()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__001380e3.psc b/source/scripts/tif__001380e3.psc
index e609e6c7..47e4ea95 100644
--- a/source/scripts/tif__001380e3.psc
+++ b/source/scripts/tif__001380e3.psc
@@ -6,9 +6,9 @@ Scriptname TIF__001380E3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 NQ_G_03.GivePaycheck()
-NQ_G_04.SetStage(5)
+NQ_G_04.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139cfd.psc b/source/scripts/tif__00139cfd.psc
index 4e5fc42b..ff846cf5 100644
--- a/source/scripts/tif__00139cfd.psc
+++ b/source/scripts/tif__00139cfd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139CFD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 GetOwningQuest().SetObjectiveCompleted(50)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00139d02.psc b/source/scripts/tif__00139d02.psc
index ae183fa5..c1c15217 100644
--- a/source/scripts/tif__00139d02.psc
+++ b/source/scripts/tif__00139d02.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139D02 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 NQ_G_04.GiveContract()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00139d08.psc b/source/scripts/tif__00139d08.psc
index 9885d287..28cd4833 100644
--- a/source/scripts/tif__00139d08.psc
+++ b/source/scripts/tif__00139d08.psc
@@ -6,8 +6,8 @@ Scriptname TIF__00139D08 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
-NQ_G_05.SetStage(5)
+GetOwningQuest().SetCurrentStageID(75)
+NQ_G_05.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d0c.psc b/source/scripts/tif__00139d0c.psc
index 4df23686..45551b0c 100644
--- a/source/scripts/tif__00139d0c.psc
+++ b/source/scripts/tif__00139d0c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139D0C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d17.psc b/source/scripts/tif__00139d17.psc
index ea0919f6..df519c31 100644
--- a/source/scripts/tif__00139d17.psc
+++ b/source/scripts/tif__00139d17.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139D17 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-CQ_D_01.SetStage(5)
+CQ_D_01.SetCurrentStageID(5)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d30.psc b/source/scripts/tif__00139d30.psc
index 89ffc545..854c21d7 100644
--- a/source/scripts/tif__00139d30.psc
+++ b/source/scripts/tif__00139d30.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 NQ_G_04.GiveLetter()
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d36.psc b/source/scripts/tif__00139d36.psc
index 68bea18a..5c82f2e7 100644
--- a/source/scripts/tif__00139d36.psc
+++ b/source/scripts/tif__00139d36.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 NQ_G_03.RemovePaycheck()
 NQ_G_03.RewardMoney()
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d3a.psc b/source/scripts/tif__00139d3a.psc
index b372087c..6f7746c1 100644
--- a/source/scripts/tif__00139d3a.psc
+++ b/source/scripts/tif__00139d3a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139D3A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d43.psc b/source/scripts/tif__00139d43.psc
index 078fd52c..4485a2d4 100644
--- a/source/scripts/tif__00139d43.psc
+++ b/source/scripts/tif__00139d43.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139D43 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d45.psc b/source/scripts/tif__00139d45.psc
index 1c0eb255..144bad7d 100644
--- a/source/scripts/tif__00139d45.psc
+++ b/source/scripts/tif__00139d45.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139D45 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d46.psc b/source/scripts/tif__00139d46.psc
index 4ecca923..4b93f42e 100644
--- a/source/scripts/tif__00139d46.psc
+++ b/source/scripts/tif__00139d46.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139D46 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d4a.psc b/source/scripts/tif__00139d4a.psc
index 3a7782c5..ec4b9459 100644
--- a/source/scripts/tif__00139d4a.psc
+++ b/source/scripts/tif__00139d4a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139D4A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d50.psc b/source/scripts/tif__00139d50.psc
index 2210680e..16514ba3 100644
--- a/source/scripts/tif__00139d50.psc
+++ b/source/scripts/tif__00139d50.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139D50 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d52.psc b/source/scripts/tif__00139d52.psc
index bd3dc70c..cdaf9648 100644
--- a/source/scripts/tif__00139d52.psc
+++ b/source/scripts/tif__00139d52.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 GetOwningQuest().SetObjectiveCompleted(30)
 GetOwningQuest().SetObjectiveDisplayed(40)
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d53.psc b/source/scripts/tif__00139d53.psc
index 57b96cf1..6fc62361 100644
--- a/source/scripts/tif__00139d53.psc
+++ b/source/scripts/tif__00139d53.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 GetOwningQuest().SetObjectiveCompleted(30)
 GetOwningQuest().SetObjectiveDisplayed(40)
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d58.psc b/source/scripts/tif__00139d58.psc
index 5e827571..4b6eb808 100644
--- a/source/scripts/tif__00139d58.psc
+++ b/source/scripts/tif__00139d58.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139D58 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d63.psc b/source/scripts/tif__00139d63.psc
index e2654517..1cc737e7 100644
--- a/source/scripts/tif__00139d63.psc
+++ b/source/scripts/tif__00139d63.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139D63 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d64.psc b/source/scripts/tif__00139d64.psc
index da4168f3..7db0ba0f 100644
--- a/source/scripts/tif__00139d64.psc
+++ b/source/scripts/tif__00139d64.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 _00E_RhetorikCounter.SetValueInt(_00E_RhetorikCounter.GetValueInt()+1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00139d6f.psc b/source/scripts/tif__00139d6f.psc
index 92ab8141..b9156909 100644
--- a/source/scripts/tif__00139d6f.psc
+++ b/source/scripts/tif__00139d6f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139D6F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d76.psc b/source/scripts/tif__00139d76.psc
index 50228c61..62886718 100644
--- a/source/scripts/tif__00139d76.psc
+++ b/source/scripts/tif__00139d76.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139D76 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(32)
+GetOwningQuest().SetCurrentStageID(32)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139d85.psc b/source/scripts/tif__00139d85.psc
index 575130b4..2b728007 100644
--- a/source/scripts/tif__00139d85.psc
+++ b/source/scripts/tif__00139d85.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139D85 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 NQ_G_04.BribeDuul()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00139e19.psc b/source/scripts/tif__00139e19.psc
index 0e351e76..8b1ff7e1 100644
--- a/source/scripts/tif__00139e19.psc
+++ b/source/scripts/tif__00139e19.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139E19 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139e24.psc b/source/scripts/tif__00139e24.psc
index ae43faf1..26417668 100644
--- a/source/scripts/tif__00139e24.psc
+++ b/source/scripts/tif__00139e24.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139e44.psc b/source/scripts/tif__00139e44.psc
index d7851db3..7bab1f45 100644
--- a/source/scripts/tif__00139e44.psc
+++ b/source/scripts/tif__00139e44.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139E44 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 EnvironmentScene06.AttackPlayer()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00139e45.psc b/source/scripts/tif__00139e45.psc
index 91d6551e..69ca7938 100644
--- a/source/scripts/tif__00139e45.psc
+++ b/source/scripts/tif__00139e45.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139E45 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 EnvironmentScene06.AttackPlayer()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00139f04.psc b/source/scripts/tif__00139f04.psc
index fc8a14f7..b1033a09 100644
--- a/source/scripts/tif__00139f04.psc
+++ b/source/scripts/tif__00139f04.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139F04 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetSTage(131)
+GetOwningQuest().SetCurrentStageID(131)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139f4e.psc b/source/scripts/tif__00139f4e.psc
index 33598e6d..b7dc43a5 100644
--- a/source/scripts/tif__00139f4e.psc
+++ b/source/scripts/tif__00139f4e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139F4E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(145)
+GetOwningQuest().SetCurrentStageID(145)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139f4f.psc b/source/scripts/tif__00139f4f.psc
index 446fec51..61ba517f 100644
--- a/source/scripts/tif__00139f4f.psc
+++ b/source/scripts/tif__00139f4f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139F4F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(145)
+GetOwningQuest().SetCurrentStageID(145)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139f53.psc b/source/scripts/tif__00139f53.psc
index 26d977fb..ae821d30 100644
--- a/source/scripts/tif__00139f53.psc
+++ b/source/scripts/tif__00139f53.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139F53 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139f5c.psc b/source/scripts/tif__00139f5c.psc
index 6de3dccf..7aa68e45 100644
--- a/source/scripts/tif__00139f5c.psc
+++ b/source/scripts/tif__00139f5c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139F5C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(106)
+GetOwningQuest().SetCurrentStageID(106)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139f6b.psc b/source/scripts/tif__00139f6b.psc
index 7d70f9d2..ee9d1328 100644
--- a/source/scripts/tif__00139f6b.psc
+++ b/source/scripts/tif__00139f6b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139F6B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(106)
+GetOwningQuest().SetCurrentStageID(106)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139f75.psc b/source/scripts/tif__00139f75.psc
index 841859b4..27e5334e 100644
--- a/source/scripts/tif__00139f75.psc
+++ b/source/scripts/tif__00139f75.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139F75 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(12)
+GetOwningQuest().SetCurrentStageID(12)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139f76.psc b/source/scripts/tif__00139f76.psc
index d81de12f..30552b1f 100644
--- a/source/scripts/tif__00139f76.psc
+++ b/source/scripts/tif__00139f76.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139F76 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139f77.psc b/source/scripts/tif__00139f77.psc
index 13587df8..cde880d3 100644
--- a/source/scripts/tif__00139f77.psc
+++ b/source/scripts/tif__00139f77.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139F77 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139f93.psc b/source/scripts/tif__00139f93.psc
index 91b27147..bdd7c73e 100644
--- a/source/scripts/tif__00139f93.psc
+++ b/source/scripts/tif__00139f93.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139F93 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139f94.psc b/source/scripts/tif__00139f94.psc
index 643b951c..95bd9810 100644
--- a/source/scripts/tif__00139f94.psc
+++ b/source/scripts/tif__00139f94.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139F94 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139f99.psc b/source/scripts/tif__00139f99.psc
index 63a30bd4..42a2ba6d 100644
--- a/source/scripts/tif__00139f99.psc
+++ b/source/scripts/tif__00139f99.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139F99 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139f9a.psc b/source/scripts/tif__00139f9a.psc
index 132bb716..dc4795bf 100644
--- a/source/scripts/tif__00139f9a.psc
+++ b/source/scripts/tif__00139f9a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139F9A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139fa5.psc b/source/scripts/tif__00139fa5.psc
index 34cbec4c..f76519e5 100644
--- a/source/scripts/tif__00139fa5.psc
+++ b/source/scripts/tif__00139fa5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139FA5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139fa6.psc b/source/scripts/tif__00139fa6.psc
index 92b08900..2d41d4c2 100644
--- a/source/scripts/tif__00139fa6.psc
+++ b/source/scripts/tif__00139fa6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139FA6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139fa9.psc b/source/scripts/tif__00139fa9.psc
index 6eca36d4..63f9271d 100644
--- a/source/scripts/tif__00139fa9.psc
+++ b/source/scripts/tif__00139fa9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139FA9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139faa.psc b/source/scripts/tif__00139faa.psc
index 6f8046cb..6bf9b984 100644
--- a/source/scripts/tif__00139faa.psc
+++ b/source/scripts/tif__00139faa.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139FAA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139faf.psc b/source/scripts/tif__00139faf.psc
index 9101e8f2..923b5a22 100644
--- a/source/scripts/tif__00139faf.psc
+++ b/source/scripts/tif__00139faf.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139FAF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetSTage(131)
+GetOwningQuest().SetCurrentStageID(131)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139fb7.psc b/source/scripts/tif__00139fb7.psc
index 4dda2a9a..7e1481a6 100644
--- a/source/scripts/tif__00139fb7.psc
+++ b/source/scripts/tif__00139fb7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139FB7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(132)
+GetOwningQuest().SetCurrentStageID(132)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139fb8.psc b/source/scripts/tif__00139fb8.psc
index ff2df731..32689a00 100644
--- a/source/scripts/tif__00139fb8.psc
+++ b/source/scripts/tif__00139fb8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139FB8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(132)
+GetOwningQuest().SetCurrentStageID(132)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139fbf.psc b/source/scripts/tif__00139fbf.psc
index 2cf15fa5..fb6f07ac 100644
--- a/source/scripts/tif__00139fbf.psc
+++ b/source/scripts/tif__00139fbf.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139FBF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(105)
+GetOwningQuest().SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139fc0.psc b/source/scripts/tif__00139fc0.psc
index 93be3c22..a884c8f8 100644
--- a/source/scripts/tif__00139fc0.psc
+++ b/source/scripts/tif__00139fc0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139FC0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(105)
+GetOwningQuest().SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139fc5.psc b/source/scripts/tif__00139fc5.psc
index 05ac9cc1..e60ef43b 100644
--- a/source/scripts/tif__00139fc5.psc
+++ b/source/scripts/tif__00139fc5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139FC5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00139fc6.psc b/source/scripts/tif__00139fc6.psc
index 7753d10a..5c37618b 100644
--- a/source/scripts/tif__00139fc6.psc
+++ b/source/scripts/tif__00139fc6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00139FC6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c1e3.psc b/source/scripts/tif__0013c1e3.psc
index 6ceb802b..3d7e737f 100644
--- a/source/scripts/tif__0013c1e3.psc
+++ b/source/scripts/tif__0013c1e3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C1E3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c1e6.psc b/source/scripts/tif__0013c1e6.psc
index 87faa07b..2faedd3b 100644
--- a/source/scripts/tif__0013c1e6.psc
+++ b/source/scripts/tif__0013c1e6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C1E6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c1e8.psc b/source/scripts/tif__0013c1e8.psc
index 899b6c5d..c60263dc 100644
--- a/source/scripts/tif__0013c1e8.psc
+++ b/source/scripts/tif__0013c1e8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C1E8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c1ee.psc b/source/scripts/tif__0013c1ee.psc
index d9b22885..48590fc4 100644
--- a/source/scripts/tif__0013c1ee.psc
+++ b/source/scripts/tif__0013c1ee.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C1EE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c1f2.psc b/source/scripts/tif__0013c1f2.psc
index 66a4f586..e12314f0 100644
--- a/source/scripts/tif__0013c1f2.psc
+++ b/source/scripts/tif__0013c1f2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C1F2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c334.psc b/source/scripts/tif__0013c334.psc
index db968b17..b558140d 100644
--- a/source/scripts/tif__0013c334.psc
+++ b/source/scripts/tif__0013c334.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C334 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(125)
+GetOwningQuest().SetCurrentStageID(125)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c343.psc b/source/scripts/tif__0013c343.psc
index 016a3d18..4f2e5995 100644
--- a/source/scripts/tif__0013c343.psc
+++ b/source/scripts/tif__0013c343.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C343 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(97)
+GetOwningQuest().SetCurrentStageID(97)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c3ad.psc b/source/scripts/tif__0013c3ad.psc
index 39ff3ee3..6d8de276 100644
--- a/source/scripts/tif__0013c3ad.psc
+++ b/source/scripts/tif__0013c3ad.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C3AD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 GetOwningQuest().SetObjectiveDisplayed(30, 1, 1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013c3b8.psc b/source/scripts/tif__0013c3b8.psc
index 67810d6f..2ea47dd5 100644
--- a/source/scripts/tif__0013c3b8.psc
+++ b/source/scripts/tif__0013c3b8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C3B8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(21)
+GetOwningQuest().SetCurrentStageID(21)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c3be.psc b/source/scripts/tif__0013c3be.psc
index 181a89cc..37a995b6 100644
--- a/source/scripts/tif__0013c3be.psc
+++ b/source/scripts/tif__0013c3be.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_NQ_G_05_ToldDijaam.SetValue(1)
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c3c2.psc b/source/scripts/tif__0013c3c2.psc
index 62d21a71..e923e75a 100644
--- a/source/scripts/tif__0013c3c2.psc
+++ b/source/scripts/tif__0013c3c2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C3C2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 NQ_G_05.RemovePlants()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013c3c7.psc b/source/scripts/tif__0013c3c7.psc
index c4bad85a..46a7d633 100644
--- a/source/scripts/tif__0013c3c7.psc
+++ b/source/scripts/tif__0013c3c7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C3C7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c3c8.psc b/source/scripts/tif__0013c3c8.psc
index 59d4e7bb..702a8351 100644
--- a/source/scripts/tif__0013c3c8.psc
+++ b/source/scripts/tif__0013c3c8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C3C8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c3e8.psc b/source/scripts/tif__0013c3e8.psc
index 8cb5bf81..1aa49f77 100644
--- a/source/scripts/tif__0013c3e8.psc
+++ b/source/scripts/tif__0013c3e8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C3E8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 NQ_G_05.RemovePlayerFromSickle()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013c3eb.psc b/source/scripts/tif__0013c3eb.psc
index 890f0da3..ec13feda 100644
--- a/source/scripts/tif__0013c3eb.psc
+++ b/source/scripts/tif__0013c3eb.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C3EB Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 NQ_G_05.TeleportDijaam()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013c8ec.psc b/source/scripts/tif__0013c8ec.psc
index 430a663c..e0aed456 100644
--- a/source/scripts/tif__0013c8ec.psc
+++ b/source/scripts/tif__0013c8ec.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C8EC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c8ee.psc b/source/scripts/tif__0013c8ee.psc
index 14912f1f..e3c58fe9 100644
--- a/source/scripts/tif__0013c8ee.psc
+++ b/source/scripts/tif__0013c8ee.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(27)
+GetOwningQuest().SetCurrentStageID(27)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c8f3.psc b/source/scripts/tif__0013c8f3.psc
index d3e79f33..856c3f50 100644
--- a/source/scripts/tif__0013c8f3.psc
+++ b/source/scripts/tif__0013c8f3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C8F3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c8f5.psc b/source/scripts/tif__0013c8f5.psc
index fae4098b..24a65d78 100644
--- a/source/scripts/tif__0013c8f5.psc
+++ b/source/scripts/tif__0013c8f5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C8F5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(7)
+GetOwningQuest().SetCurrentStageID(7)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c90a.psc b/source/scripts/tif__0013c90a.psc
index 6e2616f5..a4a562a7 100644
--- a/source/scripts/tif__0013c90a.psc
+++ b/source/scripts/tif__0013c90a.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 CQJ02.SetTobbacoInt(2)
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c90c.psc b/source/scripts/tif__0013c90c.psc
index f6ae5bf6..78508add 100644
--- a/source/scripts/tif__0013c90c.psc
+++ b/source/scripts/tif__0013c90c.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c918.psc b/source/scripts/tif__0013c918.psc
index 72623e29..855bdca9 100644
--- a/source/scripts/tif__0013c918.psc
+++ b/source/scripts/tif__0013c918.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 CQJ2.SetTobbacoInt(1)
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c91c.psc b/source/scripts/tif__0013c91c.psc
index 7c53ffb1..c887ca47 100644
--- a/source/scripts/tif__0013c91c.psc
+++ b/source/scripts/tif__0013c91c.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 CQJ02.FadeToBlackAndBack()
 Utility.Wait(6)
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c921.psc b/source/scripts/tif__0013c921.psc
index f2e5c2af..b51e560b 100644
--- a/source/scripts/tif__0013c921.psc
+++ b/source/scripts/tif__0013c921.psc
@@ -7,7 +7,7 @@ Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 CQJ02.SetTobbacoInt(3)
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c923.psc b/source/scripts/tif__0013c923.psc
index d24621fb..9fcc34bc 100644
--- a/source/scripts/tif__0013c923.psc
+++ b/source/scripts/tif__0013c923.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 CQJ02.FadeToBlackAndBack()
 Utility.Wait(6)
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c931.psc b/source/scripts/tif__0013c931.psc
index 9235ea63..ed5dbed5 100644
--- a/source/scripts/tif__0013c931.psc
+++ b/source/scripts/tif__0013c931.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013C931 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013c932.psc b/source/scripts/tif__0013c932.psc
index c51da928..1b992b6f 100644
--- a/source/scripts/tif__0013c932.psc
+++ b/source/scripts/tif__0013c932.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 Game.GetPlayer().RemoveItem(Gold001, 10)
-GetOwningQuest().SetStage(7)
+GetOwningQuest().SetCurrentStageID(7)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013cec1.psc b/source/scripts/tif__0013cec1.psc
index 2cd0856d..f99c265e 100644
--- a/source/scripts/tif__0013cec1.psc
+++ b/source/scripts/tif__0013cec1.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 Game.GetPlayer().RemoveItem(Gold001, 50)
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013cec6.psc b/source/scripts/tif__0013cec6.psc
index eefc1e91..488ac515 100644
--- a/source/scripts/tif__0013cec6.psc
+++ b/source/scripts/tif__0013cec6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013CEC6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 GetOwningQuest().SetObjectiveCompleted(5)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013cecb.psc b/source/scripts/tif__0013cecb.psc
index 0fb4599d..d33f86dc 100644
--- a/source/scripts/tif__0013cecb.psc
+++ b/source/scripts/tif__0013cecb.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013CECB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013cecd.psc b/source/scripts/tif__0013cecd.psc
index 1cdb1087..a8978edd 100644
--- a/source/scripts/tif__0013cecd.psc
+++ b/source/scripts/tif__0013cecd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013CECD Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013cee2.psc b/source/scripts/tif__0013cee2.psc
index 46a98709..0539d59a 100644
--- a/source/scripts/tif__0013cee2.psc
+++ b/source/scripts/tif__0013cee2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013CEE2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013cee9.psc b/source/scripts/tif__0013cee9.psc
index 38848a7d..7aeed91a 100644
--- a/source/scripts/tif__0013cee9.psc
+++ b/source/scripts/tif__0013cee9.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013ceeb.psc b/source/scripts/tif__0013ceeb.psc
index a209eef0..1149a0c5 100644
--- a/source/scripts/tif__0013ceeb.psc
+++ b/source/scripts/tif__0013ceeb.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013CEEB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(17)
+GetOwningQuest().SetCurrentStageID(17)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013cf71.psc b/source/scripts/tif__0013cf71.psc
index 2ec4e2b8..a72fa773 100644
--- a/source/scripts/tif__0013cf71.psc
+++ b/source/scripts/tif__0013cf71.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013CF71 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013cf75.psc b/source/scripts/tif__0013cf75.psc
index 3d96e964..1c6e11a2 100644
--- a/source/scripts/tif__0013cf75.psc
+++ b/source/scripts/tif__0013cf75.psc
@@ -7,9 +7,9 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 If PlayerREF.IsInFaction(ArkHaendlergilde)
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 Else
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 EndIf
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013cfa5.psc b/source/scripts/tif__0013cfa5.psc
index 78644f18..e6400926 100644
--- a/source/scripts/tif__0013cfa5.psc
+++ b/source/scripts/tif__0013cfa5.psc
@@ -7,9 +7,9 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 If PlayerREF.IsInFaction(ArkHaendlergilde)
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 Else
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 EndIf
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013cfab.psc b/source/scripts/tif__0013cfab.psc
index 8875f24c..d59c936e 100644
--- a/source/scripts/tif__0013cfab.psc
+++ b/source/scripts/tif__0013cfab.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013CFAB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013cfb1.psc b/source/scripts/tif__0013cfb1.psc
index 496c23d5..acd6e2ae 100644
--- a/source/scripts/tif__0013cfb1.psc
+++ b/source/scripts/tif__0013cfb1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013CFB1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013cfb2.psc b/source/scripts/tif__0013cfb2.psc
index 1e3b43cd..8bb80a39 100644
--- a/source/scripts/tif__0013cfb2.psc
+++ b/source/scripts/tif__0013cfb2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013CFB2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013cfb5.psc b/source/scripts/tif__0013cfb5.psc
index f3a5770c..18c3aab4 100644
--- a/source/scripts/tif__0013cfb5.psc
+++ b/source/scripts/tif__0013cfb5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013CFB5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013cfb6.psc b/source/scripts/tif__0013cfb6.psc
index f159a56b..3df8f9a5 100644
--- a/source/scripts/tif__0013cfb6.psc
+++ b/source/scripts/tif__0013cfb6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013CFB6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013d048.psc b/source/scripts/tif__0013d048.psc
index d241d3a7..857d563c 100644
--- a/source/scripts/tif__0013d048.psc
+++ b/source/scripts/tif__0013d048.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013D048 Extends TopicInfo Hidden
 Function Fragment_2(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013d04c.psc b/source/scripts/tif__0013d04c.psc
index 346134e0..0eb6c285 100644
--- a/source/scripts/tif__0013d04c.psc
+++ b/source/scripts/tif__0013d04c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013D04C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013d04f.psc b/source/scripts/tif__0013d04f.psc
index ab9dc626..61c228eb 100644
--- a/source/scripts/tif__0013d04f.psc
+++ b/source/scripts/tif__0013d04f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013D04F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013d053.psc b/source/scripts/tif__0013d053.psc
index cc325dc4..6346200a 100644
--- a/source/scripts/tif__0013d053.psc
+++ b/source/scripts/tif__0013d053.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013D053 Extends TopicInfo Hidden
 Function Fragment_2(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013d054.psc b/source/scripts/tif__0013d054.psc
index 385aef7e..e05e753c 100644
--- a/source/scripts/tif__0013d054.psc
+++ b/source/scripts/tif__0013d054.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013d05f.psc b/source/scripts/tif__0013d05f.psc
index 9f91e7c1..20dd55e4 100644
--- a/source/scripts/tif__0013d05f.psc
+++ b/source/scripts/tif__0013d05f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013D05F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013d07d.psc b/source/scripts/tif__0013d07d.psc
index 1d6f4a5b..66fc5c15 100644
--- a/source/scripts/tif__0013d07d.psc
+++ b/source/scripts/tif__0013d07d.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 NQ03.GiveMoneyReward()
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 Game.GetPlayer().RemoveItem(_00E_NQ03_TarhutiesBottle,1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013d083.psc b/source/scripts/tif__0013d083.psc
index 02203098..e137172d 100644
--- a/source/scripts/tif__0013d083.psc
+++ b/source/scripts/tif__0013d083.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013D083 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013d085.psc b/source/scripts/tif__0013d085.psc
index 4e366792..c57f2f94 100644
--- a/source/scripts/tif__0013d085.psc
+++ b/source/scripts/tif__0013d085.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013D085 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 akSpeaker.EvaluatePackage()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013e86d.psc b/source/scripts/tif__0013e86d.psc
index 12860b94..f27a7088 100644
--- a/source/scripts/tif__0013e86d.psc
+++ b/source/scripts/tif__0013e86d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E86D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(113)
+GetOwningQuest().SetCurrentStageID(113)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e86f.psc b/source/scripts/tif__0013e86f.psc
index c70c5ad1..a0b7e32b 100644
--- a/source/scripts/tif__0013e86f.psc
+++ b/source/scripts/tif__0013e86f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E86F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e875.psc b/source/scripts/tif__0013e875.psc
index 3e39da61..8edc6f7c 100644
--- a/source/scripts/tif__0013e875.psc
+++ b/source/scripts/tif__0013e875.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E875 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e879.psc b/source/scripts/tif__0013e879.psc
index 23f5180d..fa893762 100644
--- a/source/scripts/tif__0013e879.psc
+++ b/source/scripts/tif__0013e879.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E879 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e881.psc b/source/scripts/tif__0013e881.psc
index 0e1b7ae9..eed650f8 100644
--- a/source/scripts/tif__0013e881.psc
+++ b/source/scripts/tif__0013e881.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E881 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e885.psc b/source/scripts/tif__0013e885.psc
index 40ccd1b0..4b53d7e6 100644
--- a/source/scripts/tif__0013e885.psc
+++ b/source/scripts/tif__0013e885.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E885 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e8f6.psc b/source/scripts/tif__0013e8f6.psc
index 8a61ffaa..94f48363 100644
--- a/source/scripts/tif__0013e8f6.psc
+++ b/source/scripts/tif__0013e8f6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E8F6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e8f8.psc b/source/scripts/tif__0013e8f8.psc
index 832f5df6..3b9cef42 100644
--- a/source/scripts/tif__0013e8f8.psc
+++ b/source/scripts/tif__0013e8f8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E8F8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e8fc.psc b/source/scripts/tif__0013e8fc.psc
index 248d6d4b..e48910a3 100644
--- a/source/scripts/tif__0013e8fc.psc
+++ b/source/scripts/tif__0013e8fc.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E8FC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e912.psc b/source/scripts/tif__0013e912.psc
index dc013e9d..8e9ea9c4 100644
--- a/source/scripts/tif__0013e912.psc
+++ b/source/scripts/tif__0013e912.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E912 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e91b.psc b/source/scripts/tif__0013e91b.psc
index e605d289..3b5abb07 100644
--- a/source/scripts/tif__0013e91b.psc
+++ b/source/scripts/tif__0013e91b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E91B Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e92c.psc b/source/scripts/tif__0013e92c.psc
index 860a9681..390c7594 100644
--- a/source/scripts/tif__0013e92c.psc
+++ b/source/scripts/tif__0013e92c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E92C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e92e.psc b/source/scripts/tif__0013e92e.psc
index 7786950c..a069c622 100644
--- a/source/scripts/tif__0013e92e.psc
+++ b/source/scripts/tif__0013e92e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E92E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e989.psc b/source/scripts/tif__0013e989.psc
index e2984ec8..66f76e7c 100644
--- a/source/scripts/tif__0013e989.psc
+++ b/source/scripts/tif__0013e989.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E989 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e98e.psc b/source/scripts/tif__0013e98e.psc
index 6d7ed279..5601a9f4 100644
--- a/source/scripts/tif__0013e98e.psc
+++ b/source/scripts/tif__0013e98e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E98E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e992.psc b/source/scripts/tif__0013e992.psc
index 41e51f9d..a7e50848 100644
--- a/source/scripts/tif__0013e992.psc
+++ b/source/scripts/tif__0013e992.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E992 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e998.psc b/source/scripts/tif__0013e998.psc
index 9c774c55..f7eeae6c 100644
--- a/source/scripts/tif__0013e998.psc
+++ b/source/scripts/tif__0013e998.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E998 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e99e.psc b/source/scripts/tif__0013e99e.psc
index 2a78e056..c3897e34 100644
--- a/source/scripts/tif__0013e99e.psc
+++ b/source/scripts/tif__0013e99e.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e9a3.psc b/source/scripts/tif__0013e9a3.psc
index 52201dc1..8c05c1bf 100644
--- a/source/scripts/tif__0013e9a3.psc
+++ b/source/scripts/tif__0013e9a3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E9A3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e9ae.psc b/source/scripts/tif__0013e9ae.psc
index 4e79da24..4c1d08d9 100644
--- a/source/scripts/tif__0013e9ae.psc
+++ b/source/scripts/tif__0013e9ae.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E9AE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(53)
+GetOwningQuest().SetCurrentStageID(53)
 AllowIdleChatter.SetValue(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013e9f3.psc b/source/scripts/tif__0013e9f3.psc
index 23c1c3c6..d594ce56 100644
--- a/source/scripts/tif__0013e9f3.psc
+++ b/source/scripts/tif__0013e9f3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013E9F3 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(52)
+GetOwningQuest().SetCurrentStageID(52)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013e9f7.psc b/source/scripts/tif__0013e9f7.psc
index dbfcbbcf..34a6c34a 100644
--- a/source/scripts/tif__0013e9f7.psc
+++ b/source/scripts/tif__0013e9f7.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-MQ07b.SetStage(165)
+MQ07b.SetCurrentStageID(165)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013ea9b.psc b/source/scripts/tif__0013ea9b.psc
index 971bd1ae..bee1f763 100644
--- a/source/scripts/tif__0013ea9b.psc
+++ b/source/scripts/tif__0013ea9b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013EA9B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013ea9f.psc b/source/scripts/tif__0013ea9f.psc
index 7adcbc48..b9dfe6b1 100644
--- a/source/scripts/tif__0013ea9f.psc
+++ b/source/scripts/tif__0013ea9f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013EA9F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013eabe.psc b/source/scripts/tif__0013eabe.psc
index a23c66eb..d507a8d3 100644
--- a/source/scripts/tif__0013eabe.psc
+++ b/source/scripts/tif__0013eabe.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013EABE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013eabf.psc b/source/scripts/tif__0013eabf.psc
index f4b4ddb4..c1a3ded9 100644
--- a/source/scripts/tif__0013eabf.psc
+++ b/source/scripts/tif__0013eabf.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013EABF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 GetOwningQuest().SetObjectiveDisplayed(10)
 NQR01.GiveContract()
 ;END CODE
diff --git a/source/scripts/tif__0013ead3.psc b/source/scripts/tif__0013ead3.psc
index 5b90a51f..09cf81cc 100644
--- a/source/scripts/tif__0013ead3.psc
+++ b/source/scripts/tif__0013ead3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013EAD3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013eada.psc b/source/scripts/tif__0013eada.psc
index 05414f7c..e43381e7 100644
--- a/source/scripts/tif__0013eada.psc
+++ b/source/scripts/tif__0013eada.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 MQ06.GivePlayerArmor(1)
-MQ06.SetStage(60)
+MQ06.SetCurrentStageID(60)
 MQ07.SetObjectiveCompleted(0)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013eae3.psc b/source/scripts/tif__0013eae3.psc
index 3a9ac99c..9456dbb9 100644
--- a/source/scripts/tif__0013eae3.psc
+++ b/source/scripts/tif__0013eae3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013EAE3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013eae6.psc b/source/scripts/tif__0013eae6.psc
index 9fa91b01..32c99d2a 100644
--- a/source/scripts/tif__0013eae6.psc
+++ b/source/scripts/tif__0013eae6.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 MQ06.GivePlayerArmor(2)
-MQ06.SetStage(60)
+MQ06.SetCurrentStageID(60)
 MQ07.SetObjectiveCompleted(0)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013eaed.psc b/source/scripts/tif__0013eaed.psc
index c79d4ca5..e1692d79 100644
--- a/source/scripts/tif__0013eaed.psc
+++ b/source/scripts/tif__0013eaed.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013EAED Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013eaf5.psc b/source/scripts/tif__0013eaf5.psc
index 6b5b66af..b7f47646 100644
--- a/source/scripts/tif__0013eaf5.psc
+++ b/source/scripts/tif__0013eaf5.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 Utility.Wait(2)
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013eaf6.psc b/source/scripts/tif__0013eaf6.psc
index 74225953..b5301fa6 100644
--- a/source/scripts/tif__0013eaf6.psc
+++ b/source/scripts/tif__0013eaf6.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 MQ06.GivePlayerArmor(3)
-MQ06.SetStage(60)
+MQ06.SetCurrentStageID(60)
 MQ07.SetObjectiveCompleted(0)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013eb04.psc b/source/scripts/tif__0013eb04.psc
index 05475821..d99bba8f 100644
--- a/source/scripts/tif__0013eb04.psc
+++ b/source/scripts/tif__0013eb04.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013EB04 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 FS_NQR01.HandOverContract()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013f5a5.psc b/source/scripts/tif__0013f5a5.psc
index 67b66daf..4982a858 100644
--- a/source/scripts/tif__0013f5a5.psc
+++ b/source/scripts/tif__0013f5a5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F5A5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 AllowIdleChatter.SetValue(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013f650.psc b/source/scripts/tif__0013f650.psc
index 9de5a2e7..53ffce69 100644
--- a/source/scripts/tif__0013f650.psc
+++ b/source/scripts/tif__0013f650.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 NQ_G_07.GiveKey()
-GetOwningQuest().SetStage(31)
+GetOwningQuest().SetCurrentStageID(31)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f651.psc b/source/scripts/tif__0013f651.psc
index da3410c1..5b5da7e2 100644
--- a/source/scripts/tif__0013f651.psc
+++ b/source/scripts/tif__0013f651.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F651 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f652.psc b/source/scripts/tif__0013f652.psc
index 6c333bc9..53238fdb 100644
--- a/source/scripts/tif__0013f652.psc
+++ b/source/scripts/tif__0013f652.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F652 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(26)
+GetOwningQuest().SetCurrentStageID(26)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f653.psc b/source/scripts/tif__0013f653.psc
index e055db1a..44f51550 100644
--- a/source/scripts/tif__0013f653.psc
+++ b/source/scripts/tif__0013f653.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F653 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(26)
+GetOwningQuest().SetCurrentStageID(26)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f65a.psc b/source/scripts/tif__0013f65a.psc
index b4c6e7af..702b4cd0 100644
--- a/source/scripts/tif__0013f65a.psc
+++ b/source/scripts/tif__0013f65a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F65A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f65b.psc b/source/scripts/tif__0013f65b.psc
index 7caef40e..53045641 100644
--- a/source/scripts/tif__0013f65b.psc
+++ b/source/scripts/tif__0013f65b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F65B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(58)
+GetOwningQuest().SetCurrentStageID(58)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f65c.psc b/source/scripts/tif__0013f65c.psc
index 3d0797d0..19d61861 100644
--- a/source/scripts/tif__0013f65c.psc
+++ b/source/scripts/tif__0013f65c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F65C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(58)
+GetOwningQuest().SetCurrentStageID(58)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f676.psc b/source/scripts/tif__0013f676.psc
index 038b4a7f..a114a4d0 100644
--- a/source/scripts/tif__0013f676.psc
+++ b/source/scripts/tif__0013f676.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F676 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(32)
+GetOwningQuest().SetCurrentStageID(32)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f67a.psc b/source/scripts/tif__0013f67a.psc
index 862dbba4..46b49561 100644
--- a/source/scripts/tif__0013f67a.psc
+++ b/source/scripts/tif__0013f67a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F67A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(28)
+GetOwningQuest().SetCurrentStageID(28)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f689.psc b/source/scripts/tif__0013f689.psc
index ca3dd603..64c4477d 100644
--- a/source/scripts/tif__0013f689.psc
+++ b/source/scripts/tif__0013f689.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F689 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(36)
+GetOwningQuest().SetCurrentStageID(36)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f691.psc b/source/scripts/tif__0013f691.psc
index 9d849335..40045e36 100644
--- a/source/scripts/tif__0013f691.psc
+++ b/source/scripts/tif__0013f691.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F691 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f693.psc b/source/scripts/tif__0013f693.psc
index caf53efd..364fb905 100644
--- a/source/scripts/tif__0013f693.psc
+++ b/source/scripts/tif__0013f693.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F693 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f698.psc b/source/scripts/tif__0013f698.psc
index 032c59b0..b8192765 100644
--- a/source/scripts/tif__0013f698.psc
+++ b/source/scripts/tif__0013f698.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F698 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(12)
+GetOwningQuest().SetCurrentStageID(12)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6a3.psc b/source/scripts/tif__0013f6a3.psc
index 819821ee..5c6ad9df 100644
--- a/source/scripts/tif__0013f6a3.psc
+++ b/source/scripts/tif__0013f6a3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6A3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(14)
+GetOwningQuest().SetCurrentStageID(14)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6a5.psc b/source/scripts/tif__0013f6a5.psc
index f8d7273c..6e0f0789 100644
--- a/source/scripts/tif__0013f6a5.psc
+++ b/source/scripts/tif__0013f6a5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6A5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(12)
+GetOwningQuest().SetCurrentStageID(12)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6ac.psc b/source/scripts/tif__0013f6ac.psc
index 1fb388fa..5bc3c620 100644
--- a/source/scripts/tif__0013f6ac.psc
+++ b/source/scripts/tif__0013f6ac.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6AC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(33)
+GetOwningQuest().SetCurrentStageID(33)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6b1.psc b/source/scripts/tif__0013f6b1.psc
index a3d8d5fe..f3bb593a 100644
--- a/source/scripts/tif__0013f6b1.psc
+++ b/source/scripts/tif__0013f6b1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6B1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6b2.psc b/source/scripts/tif__0013f6b2.psc
index ba89e069..dcd387a7 100644
--- a/source/scripts/tif__0013f6b2.psc
+++ b/source/scripts/tif__0013f6b2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6B2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6b6.psc b/source/scripts/tif__0013f6b6.psc
index 5bcbf4e1..cc61f5a9 100644
--- a/source/scripts/tif__0013f6b6.psc
+++ b/source/scripts/tif__0013f6b6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6B6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(14)
+GetOwningQuest().SetCurrentStageID(14)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6b7.psc b/source/scripts/tif__0013f6b7.psc
index 25376671..0e28bfab 100644
--- a/source/scripts/tif__0013f6b7.psc
+++ b/source/scripts/tif__0013f6b7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6B7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(67)
+GetOwningQuest().SetCurrentStageID(67)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6bf.psc b/source/scripts/tif__0013f6bf.psc
index 218b9972..b96181f5 100644
--- a/source/scripts/tif__0013f6bf.psc
+++ b/source/scripts/tif__0013f6bf.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6BF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(56)
+GetOwningQuest().SetCurrentStageID(56)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6c5.psc b/source/scripts/tif__0013f6c5.psc
index 8fa9a18d..d31f80cd 100644
--- a/source/scripts/tif__0013f6c5.psc
+++ b/source/scripts/tif__0013f6c5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6C5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(26)
+GetOwningQuest().SetCurrentStageID(26)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6c6.psc b/source/scripts/tif__0013f6c6.psc
index 9cbfe0d6..e96b5886 100644
--- a/source/scripts/tif__0013f6c6.psc
+++ b/source/scripts/tif__0013f6c6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6C6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(26)
+GetOwningQuest().SetCurrentStageID(26)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6c9.psc b/source/scripts/tif__0013f6c9.psc
index 04a0c8fa..e4184acf 100644
--- a/source/scripts/tif__0013f6c9.psc
+++ b/source/scripts/tif__0013f6c9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6C9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(16)
+GetOwningQuest().SetCurrentStageID(16)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6cb.psc b/source/scripts/tif__0013f6cb.psc
index c5b9b507..b67a2813 100644
--- a/source/scripts/tif__0013f6cb.psc
+++ b/source/scripts/tif__0013f6cb.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6CB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(66)
+GetOwningQuest().SetCurrentStageID(66)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6cc.psc b/source/scripts/tif__0013f6cc.psc
index ee392813..ea9ed28f 100644
--- a/source/scripts/tif__0013f6cc.psc
+++ b/source/scripts/tif__0013f6cc.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6CC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(11)
+GetOwningQuest().SetCurrentStageID(11)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6ce.psc b/source/scripts/tif__0013f6ce.psc
index b5d05ab1..dbdaf1fd 100644
--- a/source/scripts/tif__0013f6ce.psc
+++ b/source/scripts/tif__0013f6ce.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6CE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 NQ_G_04.BribeDuul()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0013f6d2.psc b/source/scripts/tif__0013f6d2.psc
index 64adb1b9..2e260239 100644
--- a/source/scripts/tif__0013f6d2.psc
+++ b/source/scripts/tif__0013f6d2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6D2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(57)
+GetOwningQuest().SetCurrentStageID(57)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6d3.psc b/source/scripts/tif__0013f6d3.psc
index 491560b4..e940be12 100644
--- a/source/scripts/tif__0013f6d3.psc
+++ b/source/scripts/tif__0013f6d3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6D3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(56)
+GetOwningQuest().SetCurrentStageID(56)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6d4.psc b/source/scripts/tif__0013f6d4.psc
index 01a60c04..a86898bb 100644
--- a/source/scripts/tif__0013f6d4.psc
+++ b/source/scripts/tif__0013f6d4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6D4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(32)
+GetOwningQuest().SetCurrentStageID(32)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6da.psc b/source/scripts/tif__0013f6da.psc
index b2014e66..d0b2c18d 100644
--- a/source/scripts/tif__0013f6da.psc
+++ b/source/scripts/tif__0013f6da.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6DA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(26)
+GetOwningQuest().SetCurrentStageID(26)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6dd.psc b/source/scripts/tif__0013f6dd.psc
index 4cf506ad..bff97654 100644
--- a/source/scripts/tif__0013f6dd.psc
+++ b/source/scripts/tif__0013f6dd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6DD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6de.psc b/source/scripts/tif__0013f6de.psc
index 330c4b46..8348292b 100644
--- a/source/scripts/tif__0013f6de.psc
+++ b/source/scripts/tif__0013f6de.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6DE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6e3.psc b/source/scripts/tif__0013f6e3.psc
index 2e4352a1..6bb34fff 100644
--- a/source/scripts/tif__0013f6e3.psc
+++ b/source/scripts/tif__0013f6e3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013F6E3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(32)
+GetOwningQuest().SetCurrentStageID(32)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6ef.psc b/source/scripts/tif__0013f6ef.psc
index 04097161..02a39256 100644
--- a/source/scripts/tif__0013f6ef.psc
+++ b/source/scripts/tif__0013f6ef.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 GetOwningQuest().SetObjectiveCompleted(30)
 GetOwningQuest().SetObjectiveDisplayed(40)
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013f6f0.psc b/source/scripts/tif__0013f6f0.psc
index 2c46d4b9..3125594a 100644
--- a/source/scripts/tif__0013f6f0.psc
+++ b/source/scripts/tif__0013f6f0.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 GetOwningQuest().SetObjectiveCompleted(30)
 GetOwningQuest().SetObjectiveDisplayed(40)
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013fa68.psc b/source/scripts/tif__0013fa68.psc
index 88c85adf..42ef3a1c 100644
--- a/source/scripts/tif__0013fa68.psc
+++ b/source/scripts/tif__0013fa68.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013FA68 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013fa6a.psc b/source/scripts/tif__0013fa6a.psc
index 51601a09..52b149b0 100644
--- a/source/scripts/tif__0013fa6a.psc
+++ b/source/scripts/tif__0013fa6a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013FA6A Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013fa6d.psc b/source/scripts/tif__0013fa6d.psc
index 4d66b7cb..a8beccad 100644
--- a/source/scripts/tif__0013fa6d.psc
+++ b/source/scripts/tif__0013fa6d.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 Game.EnablePlayerControls()
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 GetOwningQuest().SetObjectiveCompleted(30)
 MQ13a.SetObjectiveCompleted(30)
 If CQC04.IsCompleted() && !(CQC05.IsCompleted())
@@ -15,7 +15,7 @@ _00E_MQ13a_CaliaDump.SetValueInt(0)
 _00E_MC_CaliaREF.Enable()
 _00E_MC_CaliaREF.MoveTo(CQC05_SC01_CaliaSpawn)
 _00E_MC_CaliaREF.EvaluatePackage()
-CQC05.SetStage(5)
+CQC05.SetCurrentStageID(5)
 MQ13a.SetObjectiveDisplayed(20)
 MQ13a.SetObjectiveDisplayed(25)
 ElseIf CQC04.IsCompleted() && CQC05.IsCompleted()
diff --git a/source/scripts/tif__0013fa71.psc b/source/scripts/tif__0013fa71.psc
index 01c6a104..c0176497 100644
--- a/source/scripts/tif__0013fa71.psc
+++ b/source/scripts/tif__0013fa71.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013FA71 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(7)
+GetOwningQuest().SetCurrentStageID(7)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013fa89.psc b/source/scripts/tif__0013fa89.psc
index e6bb42fb..52908c87 100644
--- a/source/scripts/tif__0013fa89.psc
+++ b/source/scripts/tif__0013fa89.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0013fa8c.psc b/source/scripts/tif__0013fa8c.psc
index 7901067e..f6916260 100644
--- a/source/scripts/tif__0013fa8c.psc
+++ b/source/scripts/tif__0013fa8c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0013FA8C Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00140027.psc b/source/scripts/tif__00140027.psc
index 3155aea2..44f01724 100644
--- a/source/scripts/tif__00140027.psc
+++ b/source/scripts/tif__00140027.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 Game.EnablePlayerControls()
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 MQ13a.SetObjectiveCompleted(20)
 If CQJ04.IsCompleted() && !(CQJ05.IsCompleted())
 _00E_MQ13a_JesparDump.SetValueInt(0)
@@ -16,7 +16,7 @@ _00E_MC_JesparREF.MoveTo(MQ13a_SC07_JesparLeanMarker)
 _00E_MC_JesparREF.EvaluatePackage()
 MQ13a.SetObjectiveDisplayed(30)
 MQ13a.SetObjectiveDisplayed(35)
-CQJ05.SetStage(5)
+CQJ05.SetCurrentStageID(5)
 ElseIf CQJ04.IsCompleted() && CQJ05.IsCompleted()
 MQ13a.SetObjectiveDisplayed(40)
 Endif
diff --git a/source/scripts/tif__0014002c.psc b/source/scripts/tif__0014002c.psc
index 65a4369e..b91c4e89 100644
--- a/source/scripts/tif__0014002c.psc
+++ b/source/scripts/tif__0014002c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014002C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00140037.psc b/source/scripts/tif__00140037.psc
index dd880d80..107c3f21 100644
--- a/source/scripts/tif__00140037.psc
+++ b/source/scripts/tif__00140037.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00140037 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 MQ13a.SetObjectiveCompleted(20)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0014003a.psc b/source/scripts/tif__0014003a.psc
index c47b8804..2c942d87 100644
--- a/source/scripts/tif__0014003a.psc
+++ b/source/scripts/tif__0014003a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014003A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014003f.psc b/source/scripts/tif__0014003f.psc
index 72e2cd56..ff0ff041 100644
--- a/source/scripts/tif__0014003f.psc
+++ b/source/scripts/tif__0014003f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014003F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00140040.psc b/source/scripts/tif__00140040.psc
index a0b04b5f..1a4c2543 100644
--- a/source/scripts/tif__00140040.psc
+++ b/source/scripts/tif__00140040.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00140040 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00140045.psc b/source/scripts/tif__00140045.psc
index 7b1d0327..82824ea7 100644
--- a/source/scripts/tif__00140045.psc
+++ b/source/scripts/tif__00140045.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00140045 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00140048.psc b/source/scripts/tif__00140048.psc
index 7c67e6c9..3950c7f3 100644
--- a/source/scripts/tif__00140048.psc
+++ b/source/scripts/tif__00140048.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00140049.psc b/source/scripts/tif__00140049.psc
index 6c64e062..e2c87789 100644
--- a/source/scripts/tif__00140049.psc
+++ b/source/scripts/tif__00140049.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00140049 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00140055.psc b/source/scripts/tif__00140055.psc
index 1a7239c2..8a4a98bb 100644
--- a/source/scripts/tif__00140055.psc
+++ b/source/scripts/tif__00140055.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00140055 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014005b.psc b/source/scripts/tif__0014005b.psc
index a582cd47..c970e8ad 100644
--- a/source/scripts/tif__0014005b.psc
+++ b/source/scripts/tif__0014005b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014005B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141740.psc b/source/scripts/tif__00141740.psc
index d04df00c..402a4483 100644
--- a/source/scripts/tif__00141740.psc
+++ b/source/scripts/tif__00141740.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00141740 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141747.psc b/source/scripts/tif__00141747.psc
index 11b69d79..5757b142 100644
--- a/source/scripts/tif__00141747.psc
+++ b/source/scripts/tif__00141747.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00141747 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141748.psc b/source/scripts/tif__00141748.psc
index 271a1a1e..f225ee33 100644
--- a/source/scripts/tif__00141748.psc
+++ b/source/scripts/tif__00141748.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00141748 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141752.psc b/source/scripts/tif__00141752.psc
index 0947ce47..6ebe39dd 100644
--- a/source/scripts/tif__00141752.psc
+++ b/source/scripts/tif__00141752.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00141752 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141753.psc b/source/scripts/tif__00141753.psc
index 0d140052..ff6558a7 100644
--- a/source/scripts/tif__00141753.psc
+++ b/source/scripts/tif__00141753.psc
@@ -7,11 +7,11 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_MQ08_Questfunctions MQ09a = GetOwningQuest() as _00E_MQ08_Questfunctions
-if GetOwningQuest().GetStage() < 215
-    GetOwningQuest().SetStage(215)
+if GetOwningQuest().GetCurrentStageID() < 215
+    GetOwningQuest().SetCurrentStageID(215)
 endif
 Utility.Wait(7)
-GetOwningQuest().SetStage(216)
+GetOwningQuest().SetCurrentStageID(216)
 MQ09a.CheckTrainScene() ; failsave
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__001417cc.psc b/source/scripts/tif__001417cc.psc
index 6f4d4672..9e0e02fe 100644
--- a/source/scripts/tif__001417cc.psc
+++ b/source/scripts/tif__001417cc.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001417CC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141c01.psc b/source/scripts/tif__00141c01.psc
index 533446aa..b15c43a6 100644
--- a/source/scripts/tif__00141c01.psc
+++ b/source/scripts/tif__00141c01.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00141C01 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 CQJ03PlayerAskedAboutAdila.SetValueInt(1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00141c02.psc b/source/scripts/tif__00141c02.psc
index 575e021a..b0ea1afe 100644
--- a/source/scripts/tif__00141c02.psc
+++ b/source/scripts/tif__00141c02.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00141C02 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141cbe.psc b/source/scripts/tif__00141cbe.psc
index a728fe22..11757588 100644
--- a/source/scripts/tif__00141cbe.psc
+++ b/source/scripts/tif__00141cbe.psc
@@ -16,7 +16,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141cd1.psc b/source/scripts/tif__00141cd1.psc
index 05e46442..cf829c33 100644
--- a/source/scripts/tif__00141cd1.psc
+++ b/source/scripts/tif__00141cd1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00141CD1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141cd3.psc b/source/scripts/tif__00141cd3.psc
index 46726a37..c5eb420a 100644
--- a/source/scripts/tif__00141cd3.psc
+++ b/source/scripts/tif__00141cd3.psc
@@ -7,8 +7,8 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_MQ14_Functions MQ14 = GetOwningQuest() as _00E_MQ14_Functions
-If MQ14.GetStage() != 15
-    MQ14.SetStage(15)
+If MQ14.GetCurrentStageID() != 15
+    MQ14.SetCurrentStageID(15)
 Endif
 MQ14.ShowPONRMessage()
 ;END CODE
diff --git a/source/scripts/tif__00141cd4.psc b/source/scripts/tif__00141cd4.psc
index 29dddaac..5d8fe8a9 100644
--- a/source/scripts/tif__00141cd4.psc
+++ b/source/scripts/tif__00141cd4.psc
@@ -7,8 +7,8 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_MQ14_Functions MQ14 = GetOwningQuest() as _00E_MQ14_Functions
-If MQ14.GetStage() != 15
-    MQ14.SetStage(15)
+If MQ14.GetCurrentStageID() != 15
+    MQ14.SetCurrentStageID(15)
 Endif
 MQ14.ShowPONRMessage()
 ;END CODE
diff --git a/source/scripts/tif__00141cd5.psc b/source/scripts/tif__00141cd5.psc
index b3f04617..b063cd70 100644
--- a/source/scripts/tif__00141cd5.psc
+++ b/source/scripts/tif__00141cd5.psc
@@ -7,8 +7,8 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_MQ14_Functions MQ14 = GetOwningQuest() as _00E_MQ14_Functions
-If MQ14.GetStage() != 15
-    MQ14.SetStage(15)
+If MQ14.GetCurrentStageID() != 15
+    MQ14.SetCurrentStageID(15)
 Endif
 MQ14.ShowPONRMessage()
 ;END CODE
diff --git a/source/scripts/tif__00141cd6.psc b/source/scripts/tif__00141cd6.psc
index 26b882ac..16636de9 100644
--- a/source/scripts/tif__00141cd6.psc
+++ b/source/scripts/tif__00141cd6.psc
@@ -7,8 +7,8 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_MQ14_Functions MQ14 = GetOwningQuest() as _00E_MQ14_Functions
-If MQ14.GetStage() != 15
-    MQ14.SetStage(15)
+If MQ14.GetCurrentStageID() != 15
+    MQ14.SetCurrentStageID(15)
 Endif
 MQ14.ShowPONRMessage()
 ;END CODE
diff --git a/source/scripts/tif__00141cdd.psc b/source/scripts/tif__00141cdd.psc
index 1fe66e8e..d16e0c9b 100644
--- a/source/scripts/tif__00141cdd.psc
+++ b/source/scripts/tif__00141cdd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00141CDD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141ce0.psc b/source/scripts/tif__00141ce0.psc
index c01b225f..8d3ff9f8 100644
--- a/source/scripts/tif__00141ce0.psc
+++ b/source/scripts/tif__00141ce0.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_NQ09_Functions NQ09 = GetOwningQuest() as _00E_NQ09_Functions
-NQ09.SetStage(27)
+NQ09.SetCurrentStageID(27)
 NQ09.GiveNote()
 NQ09.SetObjectiveDisplayed(25)
 ;END CODE
diff --git a/source/scripts/tif__00141ce3.psc b/source/scripts/tif__00141ce3.psc
index 0f0b321b..e107d198 100644
--- a/source/scripts/tif__00141ce3.psc
+++ b/source/scripts/tif__00141ce3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00141CE3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141ce9.psc b/source/scripts/tif__00141ce9.psc
index e575d7e4..60d29fc5 100644
--- a/source/scripts/tif__00141ce9.psc
+++ b/source/scripts/tif__00141ce9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00141CE9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141cea.psc b/source/scripts/tif__00141cea.psc
index 96623365..d57db826 100644
--- a/source/scripts/tif__00141cea.psc
+++ b/source/scripts/tif__00141cea.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00141CEA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141cf4.psc b/source/scripts/tif__00141cf4.psc
index 13b45dee..1e7ba7bb 100644
--- a/source/scripts/tif__00141cf4.psc
+++ b/source/scripts/tif__00141cf4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00141CF4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141cf6.psc b/source/scripts/tif__00141cf6.psc
index 5873ec6f..b1811c19 100644
--- a/source/scripts/tif__00141cf6.psc
+++ b/source/scripts/tif__00141cf6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00141CF6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(27)
+GetOwningQuest().SetCurrentStageID(27)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00141d06.psc b/source/scripts/tif__00141d06.psc
index 63c04db6..5f78684d 100644
--- a/source/scripts/tif__00141d06.psc
+++ b/source/scripts/tif__00141d06.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00141D06 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001433ba.psc b/source/scripts/tif__001433ba.psc
index 1103d8db..2b3ae9df 100644
--- a/source/scripts/tif__001433ba.psc
+++ b/source/scripts/tif__001433ba.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001433BA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001433be.psc b/source/scripts/tif__001433be.psc
index d49eff6f..d9bc6716 100644
--- a/source/scripts/tif__001433be.psc
+++ b/source/scripts/tif__001433be.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001433BE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00144720.psc b/source/scripts/tif__00144720.psc
index daadbd4c..9191d364 100644
--- a/source/scripts/tif__00144720.psc
+++ b/source/scripts/tif__00144720.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00144720 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014489d.psc b/source/scripts/tif__0014489d.psc
index f5dd3e82..015ae8d4 100644
--- a/source/scripts/tif__0014489d.psc
+++ b/source/scripts/tif__0014489d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014489D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001448a5.psc b/source/scripts/tif__001448a5.psc
index c62800ea..cbcc1931 100644
--- a/source/scripts/tif__001448a5.psc
+++ b/source/scripts/tif__001448a5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001448A5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146664.psc b/source/scripts/tif__00146664.psc
index 97f25233..f862eed4 100644
--- a/source/scripts/tif__00146664.psc
+++ b/source/scripts/tif__00146664.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146664 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(138)
+GetOwningQuest().SetCurrentStageID(138)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146665.psc b/source/scripts/tif__00146665.psc
index 66086be6..a86bccd7 100644
--- a/source/scripts/tif__00146665.psc
+++ b/source/scripts/tif__00146665.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146665 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(140)
+GetOwningQuest().SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f09.psc b/source/scripts/tif__00146f09.psc
index 9ebe502c..beeec171 100644
--- a/source/scripts/tif__00146f09.psc
+++ b/source/scripts/tif__00146f09.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(16)
+GetOwningQuest().SetCurrentStageID(16)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f0b.psc b/source/scripts/tif__00146f0b.psc
index eddbd80f..7e0c6029 100644
--- a/source/scripts/tif__00146f0b.psc
+++ b/source/scripts/tif__00146f0b.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 NQ_G_07.GiveSword()
-GetOwningQuest().SetStage(120)
+GetOwningQuest().SetCurrentStageID(120)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f0c.psc b/source/scripts/tif__00146f0c.psc
index cdaf74b5..ac2d2bc9 100644
--- a/source/scripts/tif__00146f0c.psc
+++ b/source/scripts/tif__00146f0c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F0C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f0d.psc b/source/scripts/tif__00146f0d.psc
index b2183e89..39446366 100644
--- a/source/scripts/tif__00146f0d.psc
+++ b/source/scripts/tif__00146f0d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F0D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(115)
+GetOwningQuest().SetCurrentStageID(115)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f15.psc b/source/scripts/tif__00146f15.psc
index cffbd19b..05751546 100644
--- a/source/scripts/tif__00146f15.psc
+++ b/source/scripts/tif__00146f15.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 NQ_G_07.GiveCellKey()
 NQ_G_07.GuardRemoveMoney(500)
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f20.psc b/source/scripts/tif__00146f20.psc
index 228fc907..765553e4 100644
--- a/source/scripts/tif__00146f20.psc
+++ b/source/scripts/tif__00146f20.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F20 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f21.psc b/source/scripts/tif__00146f21.psc
index 0e709394..82ac8cbe 100644
--- a/source/scripts/tif__00146f21.psc
+++ b/source/scripts/tif__00146f21.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(140)
+GetOwningQuest().SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f29.psc b/source/scripts/tif__00146f29.psc
index 927e8cbb..04638250 100644
--- a/source/scripts/tif__00146f29.psc
+++ b/source/scripts/tif__00146f29.psc
@@ -16,7 +16,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 NQ_G_07.EnableKey()
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 _00E_RhetorikCounter.SetValueInt(_00E_RhetorikCounter.GetValueInt()+1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00146f36.psc b/source/scripts/tif__00146f36.psc
index fd80539f..362fe106 100644
--- a/source/scripts/tif__00146f36.psc
+++ b/source/scripts/tif__00146f36.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F36 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 Steam.UnlockAchievement("END_DIJAAM_ESCAPE_01")
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00146f3d.psc b/source/scripts/tif__00146f3d.psc
index 9f5b86d8..0e0ea196 100644
--- a/source/scripts/tif__00146f3d.psc
+++ b/source/scripts/tif__00146f3d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F3D Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f3e.psc b/source/scripts/tif__00146f3e.psc
index 772a3602..26c9fc7a 100644
--- a/source/scripts/tif__00146f3e.psc
+++ b/source/scripts/tif__00146f3e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F3E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(57)
+GetOwningQuest().SetCurrentStageID(57)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f3f.psc b/source/scripts/tif__00146f3f.psc
index 47cfc2d7..c8e8b223 100644
--- a/source/scripts/tif__00146f3f.psc
+++ b/source/scripts/tif__00146f3f.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 NQ_G_07.GiveCellKey()
 NQ_G_07.GuardRemoveMoney(300)
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f44.psc b/source/scripts/tif__00146f44.psc
index ccb67bf4..79b889c3 100644
--- a/source/scripts/tif__00146f44.psc
+++ b/source/scripts/tif__00146f44.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F44 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(165)
+GetOwningQuest().SetCurrentStageID(165)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f54.psc b/source/scripts/tif__00146f54.psc
index fb746e69..71ba34ef 100644
--- a/source/scripts/tif__00146f54.psc
+++ b/source/scripts/tif__00146f54.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F54 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f5b.psc b/source/scripts/tif__00146f5b.psc
index 228b26c4..75ec919f 100644
--- a/source/scripts/tif__00146f5b.psc
+++ b/source/scripts/tif__00146f5b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F5B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(105)
+GetOwningQuest().SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f60.psc b/source/scripts/tif__00146f60.psc
index 091e05b3..97e807c4 100644
--- a/source/scripts/tif__00146f60.psc
+++ b/source/scripts/tif__00146f60.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 NQ_G_07.GiveSword()
-GetOwningQuest().SetStage(120)
+GetOwningQuest().SetCurrentStageID(120)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f61.psc b/source/scripts/tif__00146f61.psc
index a462acf5..b4be7ecd 100644
--- a/source/scripts/tif__00146f61.psc
+++ b/source/scripts/tif__00146f61.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(140)
+GetOwningQuest().SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f65.psc b/source/scripts/tif__00146f65.psc
index aef58272..fa18a71f 100644
--- a/source/scripts/tif__00146f65.psc
+++ b/source/scripts/tif__00146f65.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F65 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(82)
+GetOwningQuest().SetCurrentStageID(82)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f6e.psc b/source/scripts/tif__00146f6e.psc
index 89be89d5..37888be3 100644
--- a/source/scripts/tif__00146f6e.psc
+++ b/source/scripts/tif__00146f6e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F6E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f75.psc b/source/scripts/tif__00146f75.psc
index 8cecf247..048c4975 100644
--- a/source/scripts/tif__00146f75.psc
+++ b/source/scripts/tif__00146f75.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F75 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(84)
+GetOwningQuest().SetCurrentStageID(84)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f76.psc b/source/scripts/tif__00146f76.psc
index 2f637deb..ade99cb1 100644
--- a/source/scripts/tif__00146f76.psc
+++ b/source/scripts/tif__00146f76.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F76 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(84)
+GetOwningQuest().SetCurrentStageID(84)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f7b.psc b/source/scripts/tif__00146f7b.psc
index d211b71c..1bfb1699 100644
--- a/source/scripts/tif__00146f7b.psc
+++ b/source/scripts/tif__00146f7b.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 NQ_G_07.GiveCellKey()
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f8c.psc b/source/scripts/tif__00146f8c.psc
index 47c806eb..8d9f9671 100644
--- a/source/scripts/tif__00146f8c.psc
+++ b/source/scripts/tif__00146f8c.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 GetOwningQuest().SetObjectiveDisplayed(75)
-GetOwningQuest().SetStage(74)
+GetOwningQuest().SetCurrentStageID(74)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f94.psc b/source/scripts/tif__00146f94.psc
index 513b8e63..2695e656 100644
--- a/source/scripts/tif__00146f94.psc
+++ b/source/scripts/tif__00146f94.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F94 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(16)
+GetOwningQuest().SetCurrentStageID(16)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146f9b.psc b/source/scripts/tif__00146f9b.psc
index 1bd58e93..8a1a3223 100644
--- a/source/scripts/tif__00146f9b.psc
+++ b/source/scripts/tif__00146f9b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146F9B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146fa0.psc b/source/scripts/tif__00146fa0.psc
index 4c8383b5..37442a97 100644
--- a/source/scripts/tif__00146fa0.psc
+++ b/source/scripts/tif__00146fa0.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 GetOwningQuest().SetObjectiveDisplayed(75)
-GetOwningQuest().SetStage(74)
+GetOwningQuest().SetCurrentStageID(74)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146fac.psc b/source/scripts/tif__00146fac.psc
index 6f9772c8..13616f1b 100644
--- a/source/scripts/tif__00146fac.psc
+++ b/source/scripts/tif__00146fac.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(16)
+GetOwningQuest().SetCurrentStageID(16)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00146fad.psc b/source/scripts/tif__00146fad.psc
index 5bfb435b..c018c4d5 100644
--- a/source/scripts/tif__00146fad.psc
+++ b/source/scripts/tif__00146fad.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00146FAD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(72)
+GetOwningQuest().SetCurrentStageID(72)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00147108.psc b/source/scripts/tif__00147108.psc
index 570b9233..ef1532a2 100644
--- a/source/scripts/tif__00147108.psc
+++ b/source/scripts/tif__00147108.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00147108 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014710a.psc b/source/scripts/tif__0014710a.psc
index 1086bf19..7e593008 100644
--- a/source/scripts/tif__0014710a.psc
+++ b/source/scripts/tif__0014710a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014710A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00148429.psc b/source/scripts/tif__00148429.psc
index 8276d99d..11ad0d2f 100644
--- a/source/scripts/tif__00148429.psc
+++ b/source/scripts/tif__00148429.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00148429 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(17)
+GetOwningQuest().SetCurrentStageID(17)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00148443.psc b/source/scripts/tif__00148443.psc
index 26b20b13..0b32c59a 100644
--- a/source/scripts/tif__00148443.psc
+++ b/source/scripts/tif__00148443.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00148443 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(17)
+GetOwningQuest().SetCurrentStageID(17)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014848c.psc b/source/scripts/tif__0014848c.psc
index d2c84afb..50c3f6ee 100644
--- a/source/scripts/tif__0014848c.psc
+++ b/source/scripts/tif__0014848c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014848C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014848d.psc b/source/scripts/tif__0014848d.psc
index 64fbad47..dab3312a 100644
--- a/source/scripts/tif__0014848d.psc
+++ b/source/scripts/tif__0014848d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014848D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014849f.psc b/source/scripts/tif__0014849f.psc
index 82fd792f..baac411c 100644
--- a/source/scripts/tif__0014849f.psc
+++ b/source/scripts/tif__0014849f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014849F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(155)
+GetOwningQuest().SetCurrentStageID(155)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001484a3.psc b/source/scripts/tif__001484a3.psc
index f1ce7d41..03645318 100644
--- a/source/scripts/tif__001484a3.psc
+++ b/source/scripts/tif__001484a3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001484A3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(145)
+GetOwningQuest().SetCurrentStageID(145)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001484b4.psc b/source/scripts/tif__001484b4.psc
index f5693d5d..6d0ec395 100644
--- a/source/scripts/tif__001484b4.psc
+++ b/source/scripts/tif__001484b4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001484B4 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001484c4.psc b/source/scripts/tif__001484c4.psc
index fdb960c4..a78ca5e9 100644
--- a/source/scripts/tif__001484c4.psc
+++ b/source/scripts/tif__001484c4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001484C4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00148713.psc b/source/scripts/tif__00148713.psc
index d920db45..e577e615 100644
--- a/source/scripts/tif__00148713.psc
+++ b/source/scripts/tif__00148713.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00148713 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00148715.psc b/source/scripts/tif__00148715.psc
index c09abe17..368da2a8 100644
--- a/source/scripts/tif__00148715.psc
+++ b/source/scripts/tif__00148715.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00148715 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001488e0.psc b/source/scripts/tif__001488e0.psc
index 23581ae6..2bedaec9 100644
--- a/source/scripts/tif__001488e0.psc
+++ b/source/scripts/tif__001488e0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001488E0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(175)
+GetOwningQuest().SetCurrentStageID(175)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001488e1.psc b/source/scripts/tif__001488e1.psc
index 9beb5503..7c9a9b15 100644
--- a/source/scripts/tif__001488e1.psc
+++ b/source/scripts/tif__001488e1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001488E1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(175)
+GetOwningQuest().SetCurrentStageID(175)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001488ef.psc b/source/scripts/tif__001488ef.psc
index ba34fe5e..b34ac2dd 100644
--- a/source/scripts/tif__001488ef.psc
+++ b/source/scripts/tif__001488ef.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001488EF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(175)
+GetOwningQuest().SetCurrentStageID(175)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__001488f0.psc b/source/scripts/tif__001488f0.psc
index 1ed91f21..cec91863 100644
--- a/source/scripts/tif__001488f0.psc
+++ b/source/scripts/tif__001488f0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__001488F0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(175)
+GetOwningQuest().SetCurrentStageID(175)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00149509.psc b/source/scripts/tif__00149509.psc
index ea3bbf5a..f0639c50 100644
--- a/source/scripts/tif__00149509.psc
+++ b/source/scripts/tif__00149509.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00149509 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014950d.psc b/source/scripts/tif__0014950d.psc
index 513fd89b..7321fcdc 100644
--- a/source/scripts/tif__0014950d.psc
+++ b/source/scripts/tif__0014950d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014950D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00149514.psc b/source/scripts/tif__00149514.psc
index e8a6e6f7..82f4f622 100644
--- a/source/scripts/tif__00149514.psc
+++ b/source/scripts/tif__00149514.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00149514 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 EnderalFunctions.EnableDialogueQuitting()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__00149616.psc b/source/scripts/tif__00149616.psc
index bf6e389f..18cbb339 100644
--- a/source/scripts/tif__00149616.psc
+++ b/source/scripts/tif__00149616.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00149616 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00149636.psc b/source/scripts/tif__00149636.psc
index 2c9311c4..f1a17c58 100644
--- a/source/scripts/tif__00149636.psc
+++ b/source/scripts/tif__00149636.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00149636 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014964c.psc b/source/scripts/tif__0014964c.psc
index 48935a29..30118909 100644
--- a/source/scripts/tif__0014964c.psc
+++ b/source/scripts/tif__0014964c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014964C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014964d.psc b/source/scripts/tif__0014964d.psc
index a39d9fbc..b3c9216c 100644
--- a/source/scripts/tif__0014964d.psc
+++ b/source/scripts/tif__0014964d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014964D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014964e.psc b/source/scripts/tif__0014964e.psc
index 89c057ac..e92d3df1 100644
--- a/source/scripts/tif__0014964e.psc
+++ b/source/scripts/tif__0014964e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014964E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00149773.psc b/source/scripts/tif__00149773.psc
index f4a8f1dd..14a56302 100644
--- a/source/scripts/tif__00149773.psc
+++ b/source/scripts/tif__00149773.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00149773 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQUest().SetStage(40)
+GetOwningQUest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014b5b5.psc b/source/scripts/tif__0014b5b5.psc
index 0882c8bb..07981217 100644
--- a/source/scripts/tif__0014b5b5.psc
+++ b/source/scripts/tif__0014b5b5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014B5B5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014bc58.psc b/source/scripts/tif__0014bc58.psc
index eeefe786..136fa401 100644
--- a/source/scripts/tif__0014bc58.psc
+++ b/source/scripts/tif__0014bc58.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014BC58 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(97)
+GetOwningQuest().SetCurrentStageID(97)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014bc5e.psc b/source/scripts/tif__0014bc5e.psc
index b20e8ebf..0cbca101 100644
--- a/source/scripts/tif__0014bc5e.psc
+++ b/source/scripts/tif__0014bc5e.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_MQ17_Functions MQ17 = GetOwningQuest() as _00E_MQ17_Functions
-GetOwningQuest().SetStage(117)
+GetOwningQuest().SetCurrentStageID(117)
 MQ17.SetUnconsciousCompanion()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0014bc5f.psc b/source/scripts/tif__0014bc5f.psc
index 9e30db11..1a569f2a 100644
--- a/source/scripts/tif__0014bc5f.psc
+++ b/source/scripts/tif__0014bc5f.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_MQ17_Functions MQ17 = GetOwningQuest() as _00E_MQ17_Functions
-GetOwningQuest().SetStage(117)
+GetOwningQuest().SetCurrentStageID(117)
 MQ17.SetUnconsciousCompanion()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0014bc8f.psc b/source/scripts/tif__0014bc8f.psc
index 12d5751c..e5af4390 100644
--- a/source/scripts/tif__0014bc8f.psc
+++ b/source/scripts/tif__0014bc8f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014BC8F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 GetOwningQuest().SetObjectiveCompleted(5)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0014bc90.psc b/source/scripts/tif__0014bc90.psc
index b51e3964..f9683e93 100644
--- a/source/scripts/tif__0014bc90.psc
+++ b/source/scripts/tif__0014bc90.psc
@@ -8,7 +8,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 Game.GetPlayer().AddItem(Gold001, 150)
 _00E_EPHandler.GiveEP(150)
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014bc9f.psc b/source/scripts/tif__0014bc9f.psc
index 7a348a75..77e9a608 100644
--- a/source/scripts/tif__0014bc9f.psc
+++ b/source/scripts/tif__0014bc9f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014BC9F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014bca1.psc b/source/scripts/tif__0014bca1.psc
index 14182b8a..6f90d1f7 100644
--- a/source/scripts/tif__0014bca1.psc
+++ b/source/scripts/tif__0014bca1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014BCA1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014bca5.psc b/source/scripts/tif__0014bca5.psc
index 25a7fab7..39cab32d 100644
--- a/source/scripts/tif__0014bca5.psc
+++ b/source/scripts/tif__0014bca5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014BCA5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014bca6.psc b/source/scripts/tif__0014bca6.psc
index 391df804..57cf68c0 100644
--- a/source/scripts/tif__0014bca6.psc
+++ b/source/scripts/tif__0014bca6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014BCA6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(12)
+GetOwningQuest().SetCurrentStageID(12)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014bcaa.psc b/source/scripts/tif__0014bcaa.psc
index 434d64d8..dd408b38 100644
--- a/source/scripts/tif__0014bcaa.psc
+++ b/source/scripts/tif__0014bcaa.psc
@@ -6,8 +6,8 @@ Scriptname TIF__0014BCAA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-if NQ28.GetStage() < 5
-NQ28.SetStage(5)
+if NQ28.GetCurrentStageID() < 5
+NQ28.SetCurrentStageID(5)
 NQ28.SetObjectiveDisplayed(5)
 endif
 ;END CODE
diff --git a/source/scripts/tif__0014bcab.psc b/source/scripts/tif__0014bcab.psc
index 1f9d3387..d29a4210 100644
--- a/source/scripts/tif__0014bcab.psc
+++ b/source/scripts/tif__0014bcab.psc
@@ -6,8 +6,8 @@ Scriptname TIF__0014BCAB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-if NQ28.GetStage() < 5
-NQ28.SetStage(5)
+if NQ28.GetCurrentStageID() < 5
+NQ28.SetCurrentStageID(5)
 NQ28.SetObjectiveDisplayed(5)
 endif
 ;END CODE
diff --git a/source/scripts/tif__0014bcb0.psc b/source/scripts/tif__0014bcb0.psc
index ba726f93..71e49f4b 100644
--- a/source/scripts/tif__0014bcb0.psc
+++ b/source/scripts/tif__0014bcb0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014BCB0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014bcb1.psc b/source/scripts/tif__0014bcb1.psc
index 73b002ea..70d92d61 100644
--- a/source/scripts/tif__0014bcb1.psc
+++ b/source/scripts/tif__0014bcb1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014BCB1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014bcb3.psc b/source/scripts/tif__0014bcb3.psc
index b26cf87d..05163151 100644
--- a/source/scripts/tif__0014bcb3.psc
+++ b/source/scripts/tif__0014bcb3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014BCB3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014bcc6.psc b/source/scripts/tif__0014bcc6.psc
index 5f71baaf..4efebdf7 100644
--- a/source/scripts/tif__0014bcc6.psc
+++ b/source/scripts/tif__0014bcc6.psc
@@ -16,7 +16,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014bcc7.psc b/source/scripts/tif__0014bcc7.psc
index f94c28a8..65366e43 100644
--- a/source/scripts/tif__0014bcc7.psc
+++ b/source/scripts/tif__0014bcc7.psc
@@ -16,7 +16,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014bcc8.psc b/source/scripts/tif__0014bcc8.psc
index cf343674..bfe57b64 100644
--- a/source/scripts/tif__0014bcc8.psc
+++ b/source/scripts/tif__0014bcc8.psc
@@ -16,7 +16,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014bcc9.psc b/source/scripts/tif__0014bcc9.psc
index 051c6a0f..900da059 100644
--- a/source/scripts/tif__0014bcc9.psc
+++ b/source/scripts/tif__0014bcc9.psc
@@ -16,7 +16,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014c102.psc b/source/scripts/tif__0014c102.psc
index 65c48a29..2b6ff0d8 100644
--- a/source/scripts/tif__0014c102.psc
+++ b/source/scripts/tif__0014c102.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014C102 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014c104.psc b/source/scripts/tif__0014c104.psc
index f243a7d6..9a3fc7bd 100644
--- a/source/scripts/tif__0014c104.psc
+++ b/source/scripts/tif__0014c104.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014C104 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014c10a.psc b/source/scripts/tif__0014c10a.psc
index a5c214b6..63877dff 100644
--- a/source/scripts/tif__0014c10a.psc
+++ b/source/scripts/tif__0014c10a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014C10A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014caf7.psc b/source/scripts/tif__0014caf7.psc
index 916410b8..816fc2cd 100644
--- a/source/scripts/tif__0014caf7.psc
+++ b/source/scripts/tif__0014caf7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014CAF7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014db17.psc b/source/scripts/tif__0014db17.psc
index 982901ae..64edc75e 100644
--- a/source/scripts/tif__0014db17.psc
+++ b/source/scripts/tif__0014db17.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014DB17 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014f504.psc b/source/scripts/tif__0014f504.psc
index 42f44e4f..398e30e4 100644
--- a/source/scripts/tif__0014f504.psc
+++ b/source/scripts/tif__0014f504.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014F504 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014f505.psc b/source/scripts/tif__0014f505.psc
index ce413f89..5f8653bc 100644
--- a/source/scripts/tif__0014f505.psc
+++ b/source/scripts/tif__0014f505.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014F505 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014f6c0.psc b/source/scripts/tif__0014f6c0.psc
index b3693078..b456b28c 100644
--- a/source/scripts/tif__0014f6c0.psc
+++ b/source/scripts/tif__0014f6c0.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 GetOwningQuest().SetObjectiveCompleted(60)
-GetOwningQuest().SetStage(56)
+GetOwningQuest().SetCurrentStageID(56)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014f6c1.psc b/source/scripts/tif__0014f6c1.psc
index 95517cc4..425e6cd6 100644
--- a/source/scripts/tif__0014f6c1.psc
+++ b/source/scripts/tif__0014f6c1.psc
@@ -7,10 +7,10 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 Game.GetPlayer().RemoveItem(NirnrootRed, 10)
-if GetOwningQuest().GetStage() == 55
-GetOwningQuest().SetStage(60)
+if GetOwningQuest().GetCurrentStageID() == 55
+GetOwningQuest().SetCurrentStageID(60)
 else
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 endif
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0014f6c3.psc b/source/scripts/tif__0014f6c3.psc
index 9390e423..e0065072 100644
--- a/source/scripts/tif__0014f6c3.psc
+++ b/source/scripts/tif__0014f6c3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014F6C3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(46)
+GetOwningQuest().SetCurrentStageID(46)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014f6c5.psc b/source/scripts/tif__0014f6c5.psc
index 047d1c02..9c64edb2 100644
--- a/source/scripts/tif__0014f6c5.psc
+++ b/source/scripts/tif__0014f6c5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014F6C5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 GetOwningQuest().SetObjectiveCompleted(60)
 GetOwningQuest().SetObjectiveDisplayed(30, true, true)
 Game.GetPlayer().AddItem(RedNirnroot, 10)
diff --git a/source/scripts/tif__0014f6c8.psc b/source/scripts/tif__0014f6c8.psc
index f77b7d2a..efc7289f 100644
--- a/source/scripts/tif__0014f6c8.psc
+++ b/source/scripts/tif__0014f6c8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014F6C8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 GetOwningQuest().SetObjectiveCompleted(60)
 Game.GetPlayer().RemoveItem(Gold001, 300, false, akSpeaker)
 ;END CODE
diff --git a/source/scripts/tif__0014f6ca.psc b/source/scripts/tif__0014f6ca.psc
index dd7f5a21..9790faeb 100644
--- a/source/scripts/tif__0014f6ca.psc
+++ b/source/scripts/tif__0014f6ca.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014F6CA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 GetOwningQuest().SetObjectiveCompleted(60)
 Game.GetPlayer().RemoveItem(Gold001, 100, false, akSpeaker)
 ;END CODE
diff --git a/source/scripts/tif__0014f6cb.psc b/source/scripts/tif__0014f6cb.psc
index e4a79e9e..26ffae5c 100644
--- a/source/scripts/tif__0014f6cb.psc
+++ b/source/scripts/tif__0014f6cb.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014F6CB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(57)
+GetOwningQuest().SetCurrentStageID(57)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0014fffd.psc b/source/scripts/tif__0014fffd.psc
index 8b94ed00..ffcab0eb 100644
--- a/source/scripts/tif__0014fffd.psc
+++ b/source/scripts/tif__0014fffd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0014FFFD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00150005.psc b/source/scripts/tif__00150005.psc
index 7764fe46..feb3f1ba 100644
--- a/source/scripts/tif__00150005.psc
+++ b/source/scripts/tif__00150005.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00150008.psc b/source/scripts/tif__00150008.psc
index 201f4d88..bdf27a8a 100644
--- a/source/scripts/tif__00150008.psc
+++ b/source/scripts/tif__00150008.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00150008 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0015011b.psc b/source/scripts/tif__0015011b.psc
index dd425881..9626c790 100644
--- a/source/scripts/tif__0015011b.psc
+++ b/source/scripts/tif__0015011b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0015011B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0015011e.psc b/source/scripts/tif__0015011e.psc
index a8ec6f2e..6c624896 100644
--- a/source/scripts/tif__0015011e.psc
+++ b/source/scripts/tif__0015011e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0015011E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__00153b41.psc b/source/scripts/tif__00153b41.psc
index fdaabd1e..8d95fb8f 100644
--- a/source/scripts/tif__00153b41.psc
+++ b/source/scripts/tif__00153b41.psc
@@ -6,7 +6,7 @@ Scriptname TIF__00153B41 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0100572f.psc b/source/scripts/tif__0100572f.psc
index fd42aede..8917b058 100644
--- a/source/scripts/tif__0100572f.psc
+++ b/source/scripts/tif__0100572f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0100572F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01007ee8.psc b/source/scripts/tif__01007ee8.psc
index e071c26e..5f472300 100644
--- a/source/scripts/tif__01007ee8.psc
+++ b/source/scripts/tif__01007ee8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01007EE8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0100cee9.psc b/source/scripts/tif__0100cee9.psc
index 02d9dfa3..f1c35374 100644
--- a/source/scripts/tif__0100cee9.psc
+++ b/source/scripts/tif__0100cee9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0100CEE9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0100e356.psc b/source/scripts/tif__0100e356.psc
index 82f60dd6..bbd31761 100644
--- a/source/scripts/tif__0100e356.psc
+++ b/source/scripts/tif__0100e356.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0100E356 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0100e35e.psc b/source/scripts/tif__0100e35e.psc
index c646993d..c074fe72 100644
--- a/source/scripts/tif__0100e35e.psc
+++ b/source/scripts/tif__0100e35e.psc
@@ -16,7 +16,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 FS_NQ01.SetSecretEnding()
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__010132fa.psc b/source/scripts/tif__010132fa.psc
index 5503101f..86dbcb1d 100644
--- a/source/scripts/tif__010132fa.psc
+++ b/source/scripts/tif__010132fa.psc
@@ -6,7 +6,7 @@ Scriptname TIF__010132FA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(145)
+GetOwningQuest().SetCurrentStageID(145)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01013320.psc b/source/scripts/tif__01013320.psc
index a0235db3..49092aa9 100644
--- a/source/scripts/tif__01013320.psc
+++ b/source/scripts/tif__01013320.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01013320 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(145)
+GetOwningQuest().SetCurrentStageID(145)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01013322.psc b/source/scripts/tif__01013322.psc
index 483e9534..cf0623c6 100644
--- a/source/scripts/tif__01013322.psc
+++ b/source/scripts/tif__01013322.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01013322 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01013326.psc b/source/scripts/tif__01013326.psc
index dc17225b..1377fb40 100644
--- a/source/scripts/tif__01013326.psc
+++ b/source/scripts/tif__01013326.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01013326 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(160)
+GetOwningQuest().SetCurrentStageID(160)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01016eaf.psc b/source/scripts/tif__01016eaf.psc
index cf511b72..a4b312c9 100644
--- a/source/scripts/tif__01016eaf.psc
+++ b/source/scripts/tif__01016eaf.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01016EAF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101beb7.psc b/source/scripts/tif__0101beb7.psc
index 2549f592..7f7bf326 100644
--- a/source/scripts/tif__0101beb7.psc
+++ b/source/scripts/tif__0101beb7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101BEB7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(17)
+GetOwningQuest().SetCurrentStageID(17)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c59f.psc b/source/scripts/tif__0101c59f.psc
index e923cad4..d31da93a 100644
--- a/source/scripts/tif__0101c59f.psc
+++ b/source/scripts/tif__0101c59f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C59F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c5b0.psc b/source/scripts/tif__0101c5b0.psc
index 21af9316..21784cd6 100644
--- a/source/scripts/tif__0101c5b0.psc
+++ b/source/scripts/tif__0101c5b0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C5B0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c5b2.psc b/source/scripts/tif__0101c5b2.psc
index 61ad609e..61ae23a1 100644
--- a/source/scripts/tif__0101c5b2.psc
+++ b/source/scripts/tif__0101c5b2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C5B2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(115)
+GetOwningQuest().SetCurrentStageID(115)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c5b3.psc b/source/scripts/tif__0101c5b3.psc
index 53b79342..9018eb24 100644
--- a/source/scripts/tif__0101c5b3.psc
+++ b/source/scripts/tif__0101c5b3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C5B3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(115)
+GetOwningQuest().SetCurrentStageID(115)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c5c6.psc b/source/scripts/tif__0101c5c6.psc
index e76a2e90..85f1ef01 100644
--- a/source/scripts/tif__0101c5c6.psc
+++ b/source/scripts/tif__0101c5c6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C5C6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c5cc.psc b/source/scripts/tif__0101c5cc.psc
index 32cb43e6..26afebdd 100644
--- a/source/scripts/tif__0101c5cc.psc
+++ b/source/scripts/tif__0101c5cc.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C5CC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c5d4.psc b/source/scripts/tif__0101c5d4.psc
index 76583732..230b87c1 100644
--- a/source/scripts/tif__0101c5d4.psc
+++ b/source/scripts/tif__0101c5d4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C5D4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c60a.psc b/source/scripts/tif__0101c60a.psc
index d86e1e58..0673a754 100644
--- a/source/scripts/tif__0101c60a.psc
+++ b/source/scripts/tif__0101c60a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C60A Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(105)
+GetOwningQuest().SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c60b.psc b/source/scripts/tif__0101c60b.psc
index 8840799c..a3ec0367 100644
--- a/source/scripts/tif__0101c60b.psc
+++ b/source/scripts/tif__0101c60b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C60B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c60e.psc b/source/scripts/tif__0101c60e.psc
index 45f5cdd9..5b5d5ba6 100644
--- a/source/scripts/tif__0101c60e.psc
+++ b/source/scripts/tif__0101c60e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C60E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c61c.psc b/source/scripts/tif__0101c61c.psc
index 2e5b7874..5c544bd7 100644
--- a/source/scripts/tif__0101c61c.psc
+++ b/source/scripts/tif__0101c61c.psc
@@ -16,7 +16,7 @@ Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_FS_NQR02_SparedQalian.SetValueInt(1)
-GetOwningQuest().SetStage(105)
+GetOwningQuest().SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c793.psc b/source/scripts/tif__0101c793.psc
index e2e836ec..cb6c4dbf 100644
--- a/source/scripts/tif__0101c793.psc
+++ b/source/scripts/tif__0101c793.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C793 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c794.psc b/source/scripts/tif__0101c794.psc
index f547bc1d..3975d44b 100644
--- a/source/scripts/tif__0101c794.psc
+++ b/source/scripts/tif__0101c794.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C794 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(200)
+GetOwningQuest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c795.psc b/source/scripts/tif__0101c795.psc
index 9d5d9e3c..1f042566 100644
--- a/source/scripts/tif__0101c795.psc
+++ b/source/scripts/tif__0101c795.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C795 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c79c.psc b/source/scripts/tif__0101c79c.psc
index b6098a30..3111b8e9 100644
--- a/source/scripts/tif__0101c79c.psc
+++ b/source/scripts/tif__0101c79c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C79C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(180)
+GetOwningQuest().SetCurrentStageID(180)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c79d.psc b/source/scripts/tif__0101c79d.psc
index a2059a90..252e40cf 100644
--- a/source/scripts/tif__0101c79d.psc
+++ b/source/scripts/tif__0101c79d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C79D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c7a1.psc b/source/scripts/tif__0101c7a1.psc
index f6128905..d343b549 100644
--- a/source/scripts/tif__0101c7a1.psc
+++ b/source/scripts/tif__0101c7a1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C7A1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c7aa.psc b/source/scripts/tif__0101c7aa.psc
index be841888..c7c35dcc 100644
--- a/source/scripts/tif__0101c7aa.psc
+++ b/source/scripts/tif__0101c7aa.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C7AA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c7ab.psc b/source/scripts/tif__0101c7ab.psc
index 46895750..b6b3c4c4 100644
--- a/source/scripts/tif__0101c7ab.psc
+++ b/source/scripts/tif__0101c7ab.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C7AB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c7b2.psc b/source/scripts/tif__0101c7b2.psc
index 1a149204..9bb9b929 100644
--- a/source/scripts/tif__0101c7b2.psc
+++ b/source/scripts/tif__0101c7b2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C7B2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(170)
+GetOwningQuest().SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c8ae.psc b/source/scripts/tif__0101c8ae.psc
index 76508528..01a2800d 100644
--- a/source/scripts/tif__0101c8ae.psc
+++ b/source/scripts/tif__0101c8ae.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C8AE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c8df.psc b/source/scripts/tif__0101c8df.psc
index 2cd01492..eaf0ad6f 100644
--- a/source/scripts/tif__0101c8df.psc
+++ b/source/scripts/tif__0101c8df.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C8DF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c8e9.psc b/source/scripts/tif__0101c8e9.psc
index 140ca026..fd1055d1 100644
--- a/source/scripts/tif__0101c8e9.psc
+++ b/source/scripts/tif__0101c8e9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C8E9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c9bf.psc b/source/scripts/tif__0101c9bf.psc
index 7bf78abb..8a1b36c4 100644
--- a/source/scripts/tif__0101c9bf.psc
+++ b/source/scripts/tif__0101c9bf.psc
@@ -6,10 +6,10 @@ Scriptname TIF__0101C9BF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-if GetOwningQuest().GetStage()==110
-   GetOwningQuest().SetStage(120)
-elseif GetOwningQuest().GetStage()==140
-   GetOwningQuest().SetStage(150)
+if GetOwningQuest().GetCurrentStageID()==110
+   GetOwningQuest().SetCurrentStageID(120)
+elseif GetOwningQuest().GetCurrentStageID()==140
+   GetOwningQuest().SetCurrentStageID(150)
 endif
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0101c9c7.psc b/source/scripts/tif__0101c9c7.psc
index 70100680..e32a22b7 100644
--- a/source/scripts/tif__0101c9c7.psc
+++ b/source/scripts/tif__0101c9c7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C9C7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c9cc.psc b/source/scripts/tif__0101c9cc.psc
index 76c83abe..3f5f3711 100644
--- a/source/scripts/tif__0101c9cc.psc
+++ b/source/scripts/tif__0101c9cc.psc
@@ -9,7 +9,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 _00E_FS_NQ06_KarymeaVar.SetValue(1)
 GetOwningQuest().SetObjectiveCompleted(20)
 if GetOwningQuest().IsObjectiveCompleted(50)
-   GetOwningQuest().SetStage(100)
+   GetOwningQuest().SetCurrentStageID(100)
 endif
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0101c9d5.psc b/source/scripts/tif__0101c9d5.psc
index c7697c14..99d4f1ee 100644
--- a/source/scripts/tif__0101c9d5.psc
+++ b/source/scripts/tif__0101c9d5.psc
@@ -9,7 +9,7 @@ Actor akSpeaker = akSpeakerRef as Actor
 _00E_FS_NQ06_KarymeaVar.SetValue(1)
 GetOwningQuest().SetObjectiveCompleted(20)
 if GetOwningQuest().IsObjectiveCompleted(50)
-   GetOwningQuest().SetStage(100)
+   GetOwningQuest().SetCurrentStageID(100)
 endif
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0101c9df.psc b/source/scripts/tif__0101c9df.psc
index e4a75f8d..2eb9ab9c 100644
--- a/source/scripts/tif__0101c9df.psc
+++ b/source/scripts/tif__0101c9df.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C9DF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(140)
+GetOwningQuest().SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c9ec.psc b/source/scripts/tif__0101c9ec.psc
index 95b173cc..72616a91 100644
--- a/source/scripts/tif__0101c9ec.psc
+++ b/source/scripts/tif__0101c9ec.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C9EC Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c9ef.psc b/source/scripts/tif__0101c9ef.psc
index 6e5966f5..2efa388c 100644
--- a/source/scripts/tif__0101c9ef.psc
+++ b/source/scripts/tif__0101c9ef.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C9EF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c9f2.psc b/source/scripts/tif__0101c9f2.psc
index fdafa781..58c6dee8 100644
--- a/source/scripts/tif__0101c9f2.psc
+++ b/source/scripts/tif__0101c9f2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C9F2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101c9f3.psc b/source/scripts/tif__0101c9f3.psc
index 8194e4c2..ed3610fa 100644
--- a/source/scripts/tif__0101c9f3.psc
+++ b/source/scripts/tif__0101c9f3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101C9F3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ca78.psc b/source/scripts/tif__0101ca78.psc
index 991f39ab..7d7d525d 100644
--- a/source/scripts/tif__0101ca78.psc
+++ b/source/scripts/tif__0101ca78.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101CA78 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ca7b.psc b/source/scripts/tif__0101ca7b.psc
index 51e0f95e..724e42ab 100644
--- a/source/scripts/tif__0101ca7b.psc
+++ b/source/scripts/tif__0101ca7b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101CA7B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ca8a.psc b/source/scripts/tif__0101ca8a.psc
index f3e50867..59b38964 100644
--- a/source/scripts/tif__0101ca8a.psc
+++ b/source/scripts/tif__0101ca8a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101CA8A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ca90.psc b/source/scripts/tif__0101ca90.psc
index d7b65c07..b2eba0de 100644
--- a/source/scripts/tif__0101ca90.psc
+++ b/source/scripts/tif__0101ca90.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101CA90 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ca93.psc b/source/scripts/tif__0101ca93.psc
index 53f9860b..9450d665 100644
--- a/source/scripts/tif__0101ca93.psc
+++ b/source/scripts/tif__0101ca93.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101CA93 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(105)
+GetOwningQuest().SetCurrentStageID(105)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101caaf.psc b/source/scripts/tif__0101caaf.psc
index c62bce38..c5485710 100644
--- a/source/scripts/tif__0101caaf.psc
+++ b/source/scripts/tif__0101caaf.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101CAAF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101cab1.psc b/source/scripts/tif__0101cab1.psc
index b5bfedb7..5db08cd1 100644
--- a/source/scripts/tif__0101cab1.psc
+++ b/source/scripts/tif__0101cab1.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101cab2.psc b/source/scripts/tif__0101cab2.psc
index cc182774..169c5e24 100644
--- a/source/scripts/tif__0101cab2.psc
+++ b/source/scripts/tif__0101cab2.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101cab3.psc b/source/scripts/tif__0101cab3.psc
index 69234025..afed05de 100644
--- a/source/scripts/tif__0101cab3.psc
+++ b/source/scripts/tif__0101cab3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101CAB3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101cab4.psc b/source/scripts/tif__0101cab4.psc
index 8907ded1..991c7e4f 100644
--- a/source/scripts/tif__0101cab4.psc
+++ b/source/scripts/tif__0101cab4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101CAB4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101cab5.psc b/source/scripts/tif__0101cab5.psc
index 7c4ed79f..17004cd1 100644
--- a/source/scripts/tif__0101cab5.psc
+++ b/source/scripts/tif__0101cab5.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101cab6.psc b/source/scripts/tif__0101cab6.psc
index f78f6500..bbd7d246 100644
--- a/source/scripts/tif__0101cab6.psc
+++ b/source/scripts/tif__0101cab6.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101e848.psc b/source/scripts/tif__0101e848.psc
index f8c38194..9aaa61ed 100644
--- a/source/scripts/tif__0101e848.psc
+++ b/source/scripts/tif__0101e848.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101E848 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101e84d.psc b/source/scripts/tif__0101e84d.psc
index c68e66b8..bbf88473 100644
--- a/source/scripts/tif__0101e84d.psc
+++ b/source/scripts/tif__0101e84d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101E84D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101e853.psc b/source/scripts/tif__0101e853.psc
index c61c70f0..51f72afd 100644
--- a/source/scripts/tif__0101e853.psc
+++ b/source/scripts/tif__0101e853.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101E853 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101e859.psc b/source/scripts/tif__0101e859.psc
index aee960b2..c86a9745 100644
--- a/source/scripts/tif__0101e859.psc
+++ b/source/scripts/tif__0101e859.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101E859 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101e922.psc b/source/scripts/tif__0101e922.psc
index f5f51675..7c37c6b7 100644
--- a/source/scripts/tif__0101e922.psc
+++ b/source/scripts/tif__0101e922.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101E922 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101eabd.psc b/source/scripts/tif__0101eabd.psc
index 34748908..54347101 100644
--- a/source/scripts/tif__0101eabd.psc
+++ b/source/scripts/tif__0101eabd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101EABD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101eac6.psc b/source/scripts/tif__0101eac6.psc
index e1d33cd9..0be74058 100644
--- a/source/scripts/tif__0101eac6.psc
+++ b/source/scripts/tif__0101eac6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101EAC6 Extends TopicInfo Hidden
 Function Fragment_2(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101eac8.psc b/source/scripts/tif__0101eac8.psc
index 5b62e4b2..e6e90a09 100644
--- a/source/scripts/tif__0101eac8.psc
+++ b/source/scripts/tif__0101eac8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101EAC8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ead1.psc b/source/scripts/tif__0101ead1.psc
index 1b604978..546f4250 100644
--- a/source/scripts/tif__0101ead1.psc
+++ b/source/scripts/tif__0101ead1.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ead3.psc b/source/scripts/tif__0101ead3.psc
index 081e16ba..930c40b6 100644
--- a/source/scripts/tif__0101ead3.psc
+++ b/source/scripts/tif__0101ead3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101EAD3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101eae1.psc b/source/scripts/tif__0101eae1.psc
index 0bdc50af..f252e09b 100644
--- a/source/scripts/tif__0101eae1.psc
+++ b/source/scripts/tif__0101eae1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101EAE1 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101eae3.psc b/source/scripts/tif__0101eae3.psc
index e3abf531..10e30fcd 100644
--- a/source/scripts/tif__0101eae3.psc
+++ b/source/scripts/tif__0101eae3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101EAE3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101eae7.psc b/source/scripts/tif__0101eae7.psc
index 0f913ddf..754b1ce9 100644
--- a/source/scripts/tif__0101eae7.psc
+++ b/source/scripts/tif__0101eae7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101EAE7 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101eaf4.psc b/source/scripts/tif__0101eaf4.psc
index c9390640..e84f45db 100644
--- a/source/scripts/tif__0101eaf4.psc
+++ b/source/scripts/tif__0101eaf4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101EAF4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101eaf8.psc b/source/scripts/tif__0101eaf8.psc
index 3fe1bb26..a28e2e7f 100644
--- a/source/scripts/tif__0101eaf8.psc
+++ b/source/scripts/tif__0101eaf8.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101eb05.psc b/source/scripts/tif__0101eb05.psc
index c5ebb82b..9b6f3c29 100644
--- a/source/scripts/tif__0101eb05.psc
+++ b/source/scripts/tif__0101eb05.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101EB05 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101eb06.psc b/source/scripts/tif__0101eb06.psc
index 5c432055..71509dec 100644
--- a/source/scripts/tif__0101eb06.psc
+++ b/source/scripts/tif__0101eb06.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101EB06 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101eb0d.psc b/source/scripts/tif__0101eb0d.psc
index 410e4d85..0cccbb92 100644
--- a/source/scripts/tif__0101eb0d.psc
+++ b/source/scripts/tif__0101eb0d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101EB0D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ecb5.psc b/source/scripts/tif__0101ecb5.psc
index e58cc6ac..a78a2581 100644
--- a/source/scripts/tif__0101ecb5.psc
+++ b/source/scripts/tif__0101ecb5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101ECB5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ecbe.psc b/source/scripts/tif__0101ecbe.psc
index e1532824..17badfed 100644
--- a/source/scripts/tif__0101ecbe.psc
+++ b/source/scripts/tif__0101ecbe.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101ECBE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(140)
+GetOwningQuest().SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ecc0.psc b/source/scripts/tif__0101ecc0.psc
index e25ed651..ab691602 100644
--- a/source/scripts/tif__0101ecc0.psc
+++ b/source/scripts/tif__0101ecc0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101ECC0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ecc1.psc b/source/scripts/tif__0101ecc1.psc
index eb5432c5..005857e0 100644
--- a/source/scripts/tif__0101ecc1.psc
+++ b/source/scripts/tif__0101ecc1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101ECC1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ecc5.psc b/source/scripts/tif__0101ecc5.psc
index 2c3662d1..d22f64eb 100644
--- a/source/scripts/tif__0101ecc5.psc
+++ b/source/scripts/tif__0101ecc5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101ECC5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ecd1.psc b/source/scripts/tif__0101ecd1.psc
index d0bc8fdc..242348fc 100644
--- a/source/scripts/tif__0101ecd1.psc
+++ b/source/scripts/tif__0101ecd1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101ECD1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ecd2.psc b/source/scripts/tif__0101ecd2.psc
index d7665c51..9f4423bc 100644
--- a/source/scripts/tif__0101ecd2.psc
+++ b/source/scripts/tif__0101ecd2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101ECD2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ecd4.psc b/source/scripts/tif__0101ecd4.psc
index 2ad936aa..50426433 100644
--- a/source/scripts/tif__0101ecd4.psc
+++ b/source/scripts/tif__0101ecd4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101ECD4 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ecd5.psc b/source/scripts/tif__0101ecd5.psc
index 3a80087d..9acfa50f 100644
--- a/source/scripts/tif__0101ecd5.psc
+++ b/source/scripts/tif__0101ecd5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101ECD5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(160)
+GetOwningQuest().SetCurrentStageID(160)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ed98.psc b/source/scripts/tif__0101ed98.psc
index 9a7fd63e..6e775975 100644
--- a/source/scripts/tif__0101ed98.psc
+++ b/source/scripts/tif__0101ed98.psc
@@ -6,10 +6,10 @@ Scriptname TIF__0101ED98 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-if GetOwningQuest().GetStage() == 15
+if GetOwningQuest().GetCurrentStageID() == 15
 GetOwningQuest().SetObjectiveFailed(20)
 endif
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101ed9d.psc b/source/scripts/tif__0101ed9d.psc
index 1c491ec0..dbea0032 100644
--- a/source/scripts/tif__0101ed9d.psc
+++ b/source/scripts/tif__0101ed9d.psc
@@ -7,7 +7,7 @@ Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_FS_NQR05_Functions FS_NQR05 = GetOwningQuest() as _00E_FS_NQR05_Functions
-FS_NQR05.SetStage(20)
+FS_NQR05.SetCurrentStageID(20)
 FS_NQR05.SetObjectiveCompleted(20)
 FS_NQR05._00E_FS_NQR05_SpokenToTharael.SetValueInt(1)
 ;END CODE
diff --git a/source/scripts/tif__0101eff5.psc b/source/scripts/tif__0101eff5.psc
index 59c2c1e5..6c01cfc7 100644
--- a/source/scripts/tif__0101eff5.psc
+++ b/source/scripts/tif__0101eff5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101EFF5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101f0b2.psc b/source/scripts/tif__0101f0b2.psc
index 9b526017..cd260aab 100644
--- a/source/scripts/tif__0101f0b2.psc
+++ b/source/scripts/tif__0101f0b2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101F0B2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101f0bb.psc b/source/scripts/tif__0101f0bb.psc
index fd8f9376..db13d38d 100644
--- a/source/scripts/tif__0101f0bb.psc
+++ b/source/scripts/tif__0101f0bb.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101F0BB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101f123.psc b/source/scripts/tif__0101f123.psc
index fbd12da3..516a3da0 100644
--- a/source/scripts/tif__0101f123.psc
+++ b/source/scripts/tif__0101f123.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101F123 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101f1f3.psc b/source/scripts/tif__0101f1f3.psc
index 7c3b5a7c..0cf5922f 100644
--- a/source/scripts/tif__0101f1f3.psc
+++ b/source/scripts/tif__0101f1f3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101F1F3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101f1fe.psc b/source/scripts/tif__0101f1fe.psc
index c1c72034..ebfe7f54 100644
--- a/source/scripts/tif__0101f1fe.psc
+++ b/source/scripts/tif__0101f1fe.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101F1FE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101f214.psc b/source/scripts/tif__0101f214.psc
index 598afc9c..d5588624 100644
--- a/source/scripts/tif__0101f214.psc
+++ b/source/scripts/tif__0101f214.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101F214 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101f216.psc b/source/scripts/tif__0101f216.psc
index a2675027..d9195f2e 100644
--- a/source/scripts/tif__0101f216.psc
+++ b/source/scripts/tif__0101f216.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101F216 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0101f21f.psc b/source/scripts/tif__0101f21f.psc
index 1a5b7e4a..3a1b45d1 100644
--- a/source/scripts/tif__0101f21f.psc
+++ b/source/scripts/tif__0101f21f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0101F21F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024121.psc b/source/scripts/tif__01024121.psc
index 70e8df67..834f964c 100644
--- a/source/scripts/tif__01024121.psc
+++ b/source/scripts/tif__01024121.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024121 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(180)
+GetOwningQuest().SetCurrentStageID(180)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102413a.psc b/source/scripts/tif__0102413a.psc
index 96f4456f..8826d8d4 100644
--- a/source/scripts/tif__0102413a.psc
+++ b/source/scripts/tif__0102413a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102413A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(175)
+GetOwningQuest().SetCurrentStageID(175)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102413b.psc b/source/scripts/tif__0102413b.psc
index e6be4535..3a67d307 100644
--- a/source/scripts/tif__0102413b.psc
+++ b/source/scripts/tif__0102413b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102413B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(175)
+GetOwningQuest().SetCurrentStageID(175)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a1b.psc b/source/scripts/tif__01024a1b.psc
index 5ec74ded..09f086c3 100644
--- a/source/scripts/tif__01024a1b.psc
+++ b/source/scripts/tif__01024a1b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A1B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(230)
+GetOwningQuest().SetCurrentStageID(230)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a1c.psc b/source/scripts/tif__01024a1c.psc
index 3ad97ae2..26719aac 100644
--- a/source/scripts/tif__01024a1c.psc
+++ b/source/scripts/tif__01024a1c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A1C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(210)
+GetOwningQuest().SetCurrentStageID(210)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a24.psc b/source/scripts/tif__01024a24.psc
index 15bfaf87..f4bad186 100644
--- a/source/scripts/tif__01024a24.psc
+++ b/source/scripts/tif__01024a24.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A24 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(270)
+GetOwningQuest().SetCurrentStageID(270)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a2a.psc b/source/scripts/tif__01024a2a.psc
index ccfdf527..d17d51cd 100644
--- a/source/scripts/tif__01024a2a.psc
+++ b/source/scripts/tif__01024a2a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A2A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(410)
+GetOwningQuest().SetCurrentStageID(410)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a31.psc b/source/scripts/tif__01024a31.psc
index fb6571af..1e9d9b98 100644
--- a/source/scripts/tif__01024a31.psc
+++ b/source/scripts/tif__01024a31.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A31 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(170)
+GetOwningQuest().SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a36.psc b/source/scripts/tif__01024a36.psc
index 4a3c056a..4f767c3a 100644
--- a/source/scripts/tif__01024a36.psc
+++ b/source/scripts/tif__01024a36.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A36 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(370)
+GetOwningQuest().SetCurrentStageID(370)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a39.psc b/source/scripts/tif__01024a39.psc
index 042253f8..70448ba7 100644
--- a/source/scripts/tif__01024a39.psc
+++ b/source/scripts/tif__01024a39.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A39 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(200)
+GetOwningQuest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a3a.psc b/source/scripts/tif__01024a3a.psc
index b3bc14d2..b9a40eae 100644
--- a/source/scripts/tif__01024a3a.psc
+++ b/source/scripts/tif__01024a3a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A3A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(240)
+GetOwningQuest().SetCurrentStageID(240)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a3c.psc b/source/scripts/tif__01024a3c.psc
index 30219917..f70d9b08 100644
--- a/source/scripts/tif__01024a3c.psc
+++ b/source/scripts/tif__01024a3c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A3C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(330)
+GetOwningQuest().SetCurrentStageID(330)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a47.psc b/source/scripts/tif__01024a47.psc
index 72e199d4..75b3ba7a 100644
--- a/source/scripts/tif__01024a47.psc
+++ b/source/scripts/tif__01024a47.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A47 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(350)
+GetOwningQuest().SetCurrentStageID(350)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a49.psc b/source/scripts/tif__01024a49.psc
index 466faa6a..490b503c 100644
--- a/source/scripts/tif__01024a49.psc
+++ b/source/scripts/tif__01024a49.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A49 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a4d.psc b/source/scripts/tif__01024a4d.psc
index 62060847..ff6227b6 100644
--- a/source/scripts/tif__01024a4d.psc
+++ b/source/scripts/tif__01024a4d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A4D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(180)
+GetOwningQuest().SetCurrentStageID(180)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(190)
+GetOwningQuest().SetCurrentStageID(190)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a4e.psc b/source/scripts/tif__01024a4e.psc
index e209ab7a..1385e77e 100644
--- a/source/scripts/tif__01024a4e.psc
+++ b/source/scripts/tif__01024a4e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A4E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(390)
+GetOwningQuest().SetCurrentStageID(390)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a54.psc b/source/scripts/tif__01024a54.psc
index 0e8fc414..ffe91ac7 100644
--- a/source/scripts/tif__01024a54.psc
+++ b/source/scripts/tif__01024a54.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A54 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(115)
+GetOwningQuest().SetCurrentStageID(115)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a55.psc b/source/scripts/tif__01024a55.psc
index 6d531934..611b0291 100644
--- a/source/scripts/tif__01024a55.psc
+++ b/source/scripts/tif__01024a55.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A55 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(115)
+GetOwningQuest().SetCurrentStageID(115)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a56.psc b/source/scripts/tif__01024a56.psc
index 85248569..cacc4d54 100644
--- a/source/scripts/tif__01024a56.psc
+++ b/source/scripts/tif__01024a56.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A56 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(400)
+GetOwningQuest().SetCurrentStageID(400)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a5b.psc b/source/scripts/tif__01024a5b.psc
index cb35605d..cdeffc6e 100644
--- a/source/scripts/tif__01024a5b.psc
+++ b/source/scripts/tif__01024a5b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A5B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(500)
+GetOwningQuest().SetCurrentStageID(500)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a6b.psc b/source/scripts/tif__01024a6b.psc
index fb6d1c7f..e38c6a9a 100644
--- a/source/scripts/tif__01024a6b.psc
+++ b/source/scripts/tif__01024a6b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A6B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(360)
+GetOwningQuest().SetCurrentStageID(360)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a73.psc b/source/scripts/tif__01024a73.psc
index f119e0a4..bd78a408 100644
--- a/source/scripts/tif__01024a73.psc
+++ b/source/scripts/tif__01024a73.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A73 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(220)
+GetOwningQuest().SetCurrentStageID(220)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024a74.psc b/source/scripts/tif__01024a74.psc
index b2eecd45..4222c784 100644
--- a/source/scripts/tif__01024a74.psc
+++ b/source/scripts/tif__01024a74.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024A74 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(310)
+GetOwningQuest().SetCurrentStageID(310)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024bab.psc b/source/scripts/tif__01024bab.psc
index 70770449..86045480 100644
--- a/source/scripts/tif__01024bab.psc
+++ b/source/scripts/tif__01024bab.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024BAB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(205)
+GetOwningQuest().SetCurrentStageID(205)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024bb2.psc b/source/scripts/tif__01024bb2.psc
index bbe6ce25..b9c8c2a1 100644
--- a/source/scripts/tif__01024bb2.psc
+++ b/source/scripts/tif__01024bb2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024BB2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(230)
+GetOwningQuest().SetCurrentStageID(230)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01024bc7.psc b/source/scripts/tif__01024bc7.psc
index 54426b9f..7315ca59 100644
--- a/source/scripts/tif__01024bc7.psc
+++ b/source/scripts/tif__01024bc7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01024BC7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(230)
+GetOwningQuest().SetCurrentStageID(230)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01025174.psc b/source/scripts/tif__01025174.psc
index 42844fb1..e0f2f03e 100644
--- a/source/scripts/tif__01025174.psc
+++ b/source/scripts/tif__01025174.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01025174 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(245)
+GetOwningQuest().SetCurrentStageID(245)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102523c.psc b/source/scripts/tif__0102523c.psc
index 8c60a19f..61dc4a83 100644
--- a/source/scripts/tif__0102523c.psc
+++ b/source/scripts/tif__0102523c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102523C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01025241.psc b/source/scripts/tif__01025241.psc
index 68409cdc..22921e07 100644
--- a/source/scripts/tif__01025241.psc
+++ b/source/scripts/tif__01025241.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 EnderalFunctions.DisableDialogueQuitting()
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 _00E_FS_NQ02_EsmeREF.PlayIdle(IdleBook_Reading)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__01025243.psc b/source/scripts/tif__01025243.psc
index 6112c27a..773c1e25 100644
--- a/source/scripts/tif__01025243.psc
+++ b/source/scripts/tif__01025243.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01025243 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01025248.psc b/source/scripts/tif__01025248.psc
index 1a8f3505..91e8f351 100644
--- a/source/scripts/tif__01025248.psc
+++ b/source/scripts/tif__01025248.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01025248 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01025249.psc b/source/scripts/tif__01025249.psc
index 93049746..7948c4c9 100644
--- a/source/scripts/tif__01025249.psc
+++ b/source/scripts/tif__01025249.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01025249 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(220)
+GetOwningQuest().SetCurrentStageID(220)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102524a.psc b/source/scripts/tif__0102524a.psc
index fe3a7727..630034d4 100644
--- a/source/scripts/tif__0102524a.psc
+++ b/source/scripts/tif__0102524a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102524A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(200)
+GetOwningQuest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102524c.psc b/source/scripts/tif__0102524c.psc
index a3001309..2658a30e 100644
--- a/source/scripts/tif__0102524c.psc
+++ b/source/scripts/tif__0102524c.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102524d.psc b/source/scripts/tif__0102524d.psc
index 53045f93..7e707efd 100644
--- a/source/scripts/tif__0102524d.psc
+++ b/source/scripts/tif__0102524d.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 EnderalFunctions.DisableDialogueQuitting()
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 _00E_FS_NQ02_EsmeREF.PlayIdle(IdleBook_Reading)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0102524f.psc b/source/scripts/tif__0102524f.psc
index 51348168..9d763573 100644
--- a/source/scripts/tif__0102524f.psc
+++ b/source/scripts/tif__0102524f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102524F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01025253.psc b/source/scripts/tif__01025253.psc
index dddeec90..28166d4a 100644
--- a/source/scripts/tif__01025253.psc
+++ b/source/scripts/tif__01025253.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01025253 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01025255.psc b/source/scripts/tif__01025255.psc
index 43c51722..d1301c2c 100644
--- a/source/scripts/tif__01025255.psc
+++ b/source/scripts/tif__01025255.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01025255 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(190)
+GetOwningQuest().SetCurrentStageID(190)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01025258.psc b/source/scripts/tif__01025258.psc
index b2fbe3a3..824ab7bd 100644
--- a/source/scripts/tif__01025258.psc
+++ b/source/scripts/tif__01025258.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102527e.psc b/source/scripts/tif__0102527e.psc
index 53727ccf..d20fe449 100644
--- a/source/scripts/tif__0102527e.psc
+++ b/source/scripts/tif__0102527e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102527E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(210)
+GetOwningQuest().SetCurrentStageID(210)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102527f.psc b/source/scripts/tif__0102527f.psc
index 42ab5b29..735bbc61 100644
--- a/source/scripts/tif__0102527f.psc
+++ b/source/scripts/tif__0102527f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102527F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(180)
+GetOwningQuest().SetCurrentStageID(180)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102528d.psc b/source/scripts/tif__0102528d.psc
index 4442fdf7..0427515e 100644
--- a/source/scripts/tif__0102528d.psc
+++ b/source/scripts/tif__0102528d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102528D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(160)
+GetOwningQuest().SetCurrentStageID(160)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102528e.psc b/source/scripts/tif__0102528e.psc
index 6ffe93a3..84fd3b48 100644
--- a/source/scripts/tif__0102528e.psc
+++ b/source/scripts/tif__0102528e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102528E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102528f.psc b/source/scripts/tif__0102528f.psc
index e70f1b7e..88177b8a 100644
--- a/source/scripts/tif__0102528f.psc
+++ b/source/scripts/tif__0102528f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102528F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(135)
+GetOwningQuest().SetCurrentStageID(135)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01025292.psc b/source/scripts/tif__01025292.psc
index 0fbbe513..668c3e55 100644
--- a/source/scripts/tif__01025292.psc
+++ b/source/scripts/tif__01025292.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01025292 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01025298.psc b/source/scripts/tif__01025298.psc
index ac30245c..9d57f920 100644
--- a/source/scripts/tif__01025298.psc
+++ b/source/scripts/tif__01025298.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01025298 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(190)
+GetOwningQuest().SetCurrentStageID(190)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028e45.psc b/source/scripts/tif__01028e45.psc
index 5d3b75bd..d68ea401 100644
--- a/source/scripts/tif__01028e45.psc
+++ b/source/scripts/tif__01028e45.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028E45 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(260)
+GetOwningQuest().SetCurrentStageID(260)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028e46.psc b/source/scripts/tif__01028e46.psc
index 83302279..b993cc45 100644
--- a/source/scripts/tif__01028e46.psc
+++ b/source/scripts/tif__01028e46.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028E46 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(270)
+GetOwningQuest().SetCurrentStageID(270)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028e4b.psc b/source/scripts/tif__01028e4b.psc
index 795dae94..2d456ff5 100644
--- a/source/scripts/tif__01028e4b.psc
+++ b/source/scripts/tif__01028e4b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028E4B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(290)
+GetOwningQuest().SetCurrentStageID(290)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028e4d.psc b/source/scripts/tif__01028e4d.psc
index 0bd39012..72cb5115 100644
--- a/source/scripts/tif__01028e4d.psc
+++ b/source/scripts/tif__01028e4d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028E4D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028e55.psc b/source/scripts/tif__01028e55.psc
index 5607bd45..b6ddff52 100644
--- a/source/scripts/tif__01028e55.psc
+++ b/source/scripts/tif__01028e55.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028E55 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(300)
+GetOwningQuest().SetCurrentStageID(300)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028e5b.psc b/source/scripts/tif__01028e5b.psc
index 8ac9525a..fd4711a9 100644
--- a/source/scripts/tif__01028e5b.psc
+++ b/source/scripts/tif__01028e5b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028E5B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(240)
+GetOwningQuest().SetCurrentStageID(240)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028e60.psc b/source/scripts/tif__01028e60.psc
index b0d2e1a0..39f16b29 100644
--- a/source/scripts/tif__01028e60.psc
+++ b/source/scripts/tif__01028e60.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028E60 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(295)
+GetOwningQuest().SetCurrentStageID(295)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028ef6.psc b/source/scripts/tif__01028ef6.psc
index e8438b59..832cebda 100644
--- a/source/scripts/tif__01028ef6.psc
+++ b/source/scripts/tif__01028ef6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028EF6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(540)
+GetOwningQuest().SetCurrentStageID(540)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028ef9.psc b/source/scripts/tif__01028ef9.psc
index c33e7d1c..b696bd50 100644
--- a/source/scripts/tif__01028ef9.psc
+++ b/source/scripts/tif__01028ef9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028EF9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(500)
+GetOwningQuest().SetCurrentStageID(500)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f06.psc b/source/scripts/tif__01028f06.psc
index cabd380d..ba3d1956 100644
--- a/source/scripts/tif__01028f06.psc
+++ b/source/scripts/tif__01028f06.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(390)
+GetOwningQuest().SetCurrentStageID(390)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f07.psc b/source/scripts/tif__01028f07.psc
index e67f75e1..94522a51 100644
--- a/source/scripts/tif__01028f07.psc
+++ b/source/scripts/tif__01028f07.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F07 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(370)
+GetOwningQuest().SetCurrentStageID(370)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f0f.psc b/source/scripts/tif__01028f0f.psc
index 421920ae..06eb55cf 100644
--- a/source/scripts/tif__01028f0f.psc
+++ b/source/scripts/tif__01028f0f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F0F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(440)
+GetOwningQuest().SetCurrentStageID(440)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f14.psc b/source/scripts/tif__01028f14.psc
index f64419ed..2428a156 100644
--- a/source/scripts/tif__01028f14.psc
+++ b/source/scripts/tif__01028f14.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F14 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(360)
+GetOwningQuest().SetCurrentStageID(360)
 GetOwningQUest().SetObjectiveCompleted(110)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__01028f1a.psc b/source/scripts/tif__01028f1a.psc
index dad3f539..ba495c74 100644
--- a/source/scripts/tif__01028f1a.psc
+++ b/source/scripts/tif__01028f1a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F1A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(490)
+GetOwningQuest().SetCurrentStageID(490)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f1c.psc b/source/scripts/tif__01028f1c.psc
index aaacfbf3..059bb532 100644
--- a/source/scripts/tif__01028f1c.psc
+++ b/source/scripts/tif__01028f1c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F1C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(460)
+GetOwningQuest().SetCurrentStageID(460)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f1e.psc b/source/scripts/tif__01028f1e.psc
index 1a216c19..d838b8a3 100644
--- a/source/scripts/tif__01028f1e.psc
+++ b/source/scripts/tif__01028f1e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F1E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(380)
+GetOwningQuest().SetCurrentStageID(380)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f21.psc b/source/scripts/tif__01028f21.psc
index 1f2be7b2..cf06afa0 100644
--- a/source/scripts/tif__01028f21.psc
+++ b/source/scripts/tif__01028f21.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F21 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(330)
+GetOwningQuest().SetCurrentStageID(330)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f2a.psc b/source/scripts/tif__01028f2a.psc
index 72511805..51dd5f98 100644
--- a/source/scripts/tif__01028f2a.psc
+++ b/source/scripts/tif__01028f2a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F2A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(485)
+GetOwningQuest().SetCurrentStageID(485)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f2e.psc b/source/scripts/tif__01028f2e.psc
index b2f8503b..ad12ac9b 100644
--- a/source/scripts/tif__01028f2e.psc
+++ b/source/scripts/tif__01028f2e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F2E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(400)
+GetOwningQuest().SetCurrentStageID(400)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f33.psc b/source/scripts/tif__01028f33.psc
index d965039b..f2a60a8f 100644
--- a/source/scripts/tif__01028f33.psc
+++ b/source/scripts/tif__01028f33.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F33 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(530)
+GetOwningQuest().SetCurrentStageID(530)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f34.psc b/source/scripts/tif__01028f34.psc
index b4853a36..57a3485d 100644
--- a/source/scripts/tif__01028f34.psc
+++ b/source/scripts/tif__01028f34.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F34 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(495)
+GetOwningQuest().SetCurrentStageID(495)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f3f.psc b/source/scripts/tif__01028f3f.psc
index d74276f0..1de72ecb 100644
--- a/source/scripts/tif__01028f3f.psc
+++ b/source/scripts/tif__01028f3f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F3F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(570)
+GetOwningQuest().SetCurrentStageID(570)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f45.psc b/source/scripts/tif__01028f45.psc
index e8b3afdb..ef4dab66 100644
--- a/source/scripts/tif__01028f45.psc
+++ b/source/scripts/tif__01028f45.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F45 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(470)
+GetOwningQuest().SetCurrentStageID(470)
 _00E_FS_NQ02_MuseumVar.SetValue(0.0)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__01028f46.psc b/source/scripts/tif__01028f46.psc
index 4b46921a..291f8429 100644
--- a/source/scripts/tif__01028f46.psc
+++ b/source/scripts/tif__01028f46.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F46 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(390)
+GetOwningQuest().SetCurrentStageID(390)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f4a.psc b/source/scripts/tif__01028f4a.psc
index 44be081b..42c4c890 100644
--- a/source/scripts/tif__01028f4a.psc
+++ b/source/scripts/tif__01028f4a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F4A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(350)
+GetOwningQuest().SetCurrentStageID(350)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f50.psc b/source/scripts/tif__01028f50.psc
index 518fe428..9678f7f6 100644
--- a/source/scripts/tif__01028f50.psc
+++ b/source/scripts/tif__01028f50.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F50 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(560)
+GetOwningQuest().SetCurrentStageID(560)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f51.psc b/source/scripts/tif__01028f51.psc
index 47528cba..8e3f4fb0 100644
--- a/source/scripts/tif__01028f51.psc
+++ b/source/scripts/tif__01028f51.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F51 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(520)
+GetOwningQuest().SetCurrentStageID(520)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f53.psc b/source/scripts/tif__01028f53.psc
index e3997e78..6a1ebafa 100644
--- a/source/scripts/tif__01028f53.psc
+++ b/source/scripts/tif__01028f53.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F53 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(480)
+GetOwningQuest().SetCurrentStageID(480)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f54.psc b/source/scripts/tif__01028f54.psc
index 2e1b8404..4f2a9370 100644
--- a/source/scripts/tif__01028f54.psc
+++ b/source/scripts/tif__01028f54.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F54 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(450)
+GetOwningQuest().SetCurrentStageID(450)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f55.psc b/source/scripts/tif__01028f55.psc
index ff24cf50..a2c88cb9 100644
--- a/source/scripts/tif__01028f55.psc
+++ b/source/scripts/tif__01028f55.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F55 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(430)
+GetOwningQuest().SetCurrentStageID(430)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f56.psc b/source/scripts/tif__01028f56.psc
index 6d7956a1..a3509ead 100644
--- a/source/scripts/tif__01028f56.psc
+++ b/source/scripts/tif__01028f56.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F56 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(255)
+GetOwningQuest().SetCurrentStageID(255)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01028f57.psc b/source/scripts/tif__01028f57.psc
index b86d6fae..14b01a18 100644
--- a/source/scripts/tif__01028f57.psc
+++ b/source/scripts/tif__01028f57.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01028F57 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(410)
+GetOwningQuest().SetCurrentStageID(410)
 GetOwningQuest().SetObjectiveCompleted(115)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0102988a.psc b/source/scripts/tif__0102988a.psc
index 3737a3b3..8f768164 100644
--- a/source/scripts/tif__0102988a.psc
+++ b/source/scripts/tif__0102988a.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(610)
+GetOwningQuest().SetCurrentStageID(610)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102988f.psc b/source/scripts/tif__0102988f.psc
index f0eda918..a9c24957 100644
--- a/source/scripts/tif__0102988f.psc
+++ b/source/scripts/tif__0102988f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102988F Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(790)
+GetOwningQuest().SetCurrentStageID(790)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029893.psc b/source/scripts/tif__01029893.psc
index 9fbe45e0..32929708 100644
--- a/source/scripts/tif__01029893.psc
+++ b/source/scripts/tif__01029893.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029893 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(600)
+GetOwningQuest().SetCurrentStageID(600)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029894.psc b/source/scripts/tif__01029894.psc
index abc7ea90..92d16b3e 100644
--- a/source/scripts/tif__01029894.psc
+++ b/source/scripts/tif__01029894.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029894 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(800)
+GetOwningQuest().SetCurrentStageID(800)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029895.psc b/source/scripts/tif__01029895.psc
index ceb04e8c..63d0865b 100644
--- a/source/scripts/tif__01029895.psc
+++ b/source/scripts/tif__01029895.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029895 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(770)
+GetOwningQuest().SetCurrentStageID(770)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029896.psc b/source/scripts/tif__01029896.psc
index 01d0528e..d72163d5 100644
--- a/source/scripts/tif__01029896.psc
+++ b/source/scripts/tif__01029896.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029896 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(775)
+GetOwningQuest().SetCurrentStageID(775)
 Game.GetPlayer().Additem(_01E_TeleportrolleArk, 1)
 GetOwningQUest().SetObjectiveCompleted(185)
 ;END CODE
diff --git a/source/scripts/tif__01029898.psc b/source/scripts/tif__01029898.psc
index 7e149076..f2da9b5c 100644
--- a/source/scripts/tif__01029898.psc
+++ b/source/scripts/tif__01029898.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029898 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(690)
+GetOwningQuest().SetCurrentStageID(690)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__010298a2.psc b/source/scripts/tif__010298a2.psc
index f44e1cba..faa39d45 100644
--- a/source/scripts/tif__010298a2.psc
+++ b/source/scripts/tif__010298a2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__010298A2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(760)
+GetOwningQuest().SetCurrentStageID(760)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__010298ad.psc b/source/scripts/tif__010298ad.psc
index 415d29ac..2fc9e444 100644
--- a/source/scripts/tif__010298ad.psc
+++ b/source/scripts/tif__010298ad.psc
@@ -6,7 +6,7 @@ Scriptname TIF__010298AD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(730)
+GetOwningQuest().SetCurrentStageID(730)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__010298b2.psc b/source/scripts/tif__010298b2.psc
index ec75711c..803ecfc9 100644
--- a/source/scripts/tif__010298b2.psc
+++ b/source/scripts/tif__010298b2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__010298B2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(740)
+GetOwningQuest().SetCurrentStageID(740)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__010298b6.psc b/source/scripts/tif__010298b6.psc
index b2e75173..50ca0470 100644
--- a/source/scripts/tif__010298b6.psc
+++ b/source/scripts/tif__010298b6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__010298B6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(580)
+GetOwningQuest().SetCurrentStageID(580)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__010298b7.psc b/source/scripts/tif__010298b7.psc
index ddac397b..9c6978ef 100644
--- a/source/scripts/tif__010298b7.psc
+++ b/source/scripts/tif__010298b7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__010298B7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(850)
+GetOwningQuest().SetCurrentStageID(850)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__010298bb.psc b/source/scripts/tif__010298bb.psc
index 8be4628c..387be470 100644
--- a/source/scripts/tif__010298bb.psc
+++ b/source/scripts/tif__010298bb.psc
@@ -6,7 +6,7 @@ Scriptname TIF__010298BB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(680)
+GetOwningQuest().SetCurrentStageID(680)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__010298be.psc b/source/scripts/tif__010298be.psc
index e5a3b554..58e1245b 100644
--- a/source/scripts/tif__010298be.psc
+++ b/source/scripts/tif__010298be.psc
@@ -6,7 +6,7 @@ Scriptname TIF__010298BE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(610)
+GetOwningQuest().SetCurrentStageID(610)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__010298bf.psc b/source/scripts/tif__010298bf.psc
index b5c6ca52..ebd89be0 100644
--- a/source/scripts/tif__010298bf.psc
+++ b/source/scripts/tif__010298bf.psc
@@ -6,7 +6,7 @@ Scriptname TIF__010298BF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(830)
+GetOwningQuest().SetCurrentStageID(830)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__010298c0.psc b/source/scripts/tif__010298c0.psc
index 8408f70d..e5207b8b 100644
--- a/source/scripts/tif__010298c0.psc
+++ b/source/scripts/tif__010298c0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__010298C0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(775)
+GetOwningQuest().SetCurrentStageID(775)
 GetOwningQUest().SetObjectiveCompleted(185)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__010298c1.psc b/source/scripts/tif__010298c1.psc
index 2f3f3497..a7e2bf7a 100644
--- a/source/scripts/tif__010298c1.psc
+++ b/source/scripts/tif__010298c1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__010298C1 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(825)
+GetOwningQuest().SetCurrentStageID(825)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__010298c9.psc b/source/scripts/tif__010298c9.psc
index 4980dd81..76889202 100644
--- a/source/scripts/tif__010298c9.psc
+++ b/source/scripts/tif__010298c9.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(820)
+GetOwningQuest().SetCurrentStageID(820)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__010298cb.psc b/source/scripts/tif__010298cb.psc
index 32269959..37ce32d0 100644
--- a/source/scripts/tif__010298cb.psc
+++ b/source/scripts/tif__010298cb.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(800)
+GetOwningQuest().SetCurrentStageID(800)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__010298cc.psc b/source/scripts/tif__010298cc.psc
index d219c670..dca2c977 100644
--- a/source/scripts/tif__010298cc.psc
+++ b/source/scripts/tif__010298cc.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(810)
+GetOwningQuest().SetCurrentStageID(810)
 _00E_RhetorikCounter.SetValueInt(_00E_RhetorikCounter.GetValueInt()+1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__01029a19.psc b/source/scripts/tif__01029a19.psc
index 9c4dc589..a052abd1 100644
--- a/source/scripts/tif__01029a19.psc
+++ b/source/scripts/tif__01029a19.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029A19 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(260)
+GetOwningQuest().SetCurrentStageID(260)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029a21.psc b/source/scripts/tif__01029a21.psc
index b3a6ca24..85ce6a82 100644
--- a/source/scripts/tif__01029a21.psc
+++ b/source/scripts/tif__01029a21.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029A21 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(260)
+GetOwningQuest().SetCurrentStageID(260)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029a8f.psc b/source/scripts/tif__01029a8f.psc
index ca6952bc..344df552 100644
--- a/source/scripts/tif__01029a8f.psc
+++ b/source/scripts/tif__01029a8f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029A8F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(1020)
+GetOwningQuest().SetCurrentStageID(1020)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029a94.psc b/source/scripts/tif__01029a94.psc
index dd1ddbbd..7b92922a 100644
--- a/source/scripts/tif__01029a94.psc
+++ b/source/scripts/tif__01029a94.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029A94 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(930)
+GetOwningQuest().SetCurrentStageID(930)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029a97.psc b/source/scripts/tif__01029a97.psc
index a11f232c..2d3eb690 100644
--- a/source/scripts/tif__01029a97.psc
+++ b/source/scripts/tif__01029a97.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029A97 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(1020)
+GetOwningQuest().SetCurrentStageID(1020)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029aa8.psc b/source/scripts/tif__01029aa8.psc
index a0b81012..52aae44c 100644
--- a/source/scripts/tif__01029aa8.psc
+++ b/source/scripts/tif__01029aa8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029AA8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(920)
+GetOwningQuest().SetCurrentStageID(920)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029aaf.psc b/source/scripts/tif__01029aaf.psc
index 83a98620..f6fb86c6 100644
--- a/source/scripts/tif__01029aaf.psc
+++ b/source/scripts/tif__01029aaf.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029AAF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(910)
+GetOwningQuest().SetCurrentStageID(910)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029ab5.psc b/source/scripts/tif__01029ab5.psc
index 5f5b1dca..0c90a657 100644
--- a/source/scripts/tif__01029ab5.psc
+++ b/source/scripts/tif__01029ab5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029AB5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(1000)
+GetOwningQuest().SetCurrentStageID(1000)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029ab7.psc b/source/scripts/tif__01029ab7.psc
index 716b6b61..aafff560 100644
--- a/source/scripts/tif__01029ab7.psc
+++ b/source/scripts/tif__01029ab7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029AB7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(910)
+GetOwningQuest().SetCurrentStageID(910)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029ab9.psc b/source/scripts/tif__01029ab9.psc
index df5c9c3f..843b1197 100644
--- a/source/scripts/tif__01029ab9.psc
+++ b/source/scripts/tif__01029ab9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029AB9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(900)
+GetOwningQuest().SetCurrentStageID(900)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029abe.psc b/source/scripts/tif__01029abe.psc
index 60f0faea..183e2e3c 100644
--- a/source/scripts/tif__01029abe.psc
+++ b/source/scripts/tif__01029abe.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029ABE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(980)
+GetOwningQuest().SetCurrentStageID(980)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029ac4.psc b/source/scripts/tif__01029ac4.psc
index de891eca..292982b1 100644
--- a/source/scripts/tif__01029ac4.psc
+++ b/source/scripts/tif__01029ac4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029AC4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(890)
+GetOwningQuest().SetCurrentStageID(890)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029ac6.psc b/source/scripts/tif__01029ac6.psc
index 3c56800c..12313a7f 100644
--- a/source/scripts/tif__01029ac6.psc
+++ b/source/scripts/tif__01029ac6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029AC6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(860)
+GetOwningQuest().SetCurrentStageID(860)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029acd.psc b/source/scripts/tif__01029acd.psc
index 0d9e4c99..40a93177 100644
--- a/source/scripts/tif__01029acd.psc
+++ b/source/scripts/tif__01029acd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029ACD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(940)
+GetOwningQuest().SetCurrentStageID(940)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__01029adc.psc b/source/scripts/tif__01029adc.psc
index 68765a26..914a84fb 100644
--- a/source/scripts/tif__01029adc.psc
+++ b/source/scripts/tif__01029adc.psc
@@ -6,7 +6,7 @@ Scriptname TIF__01029ADC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(910)
+GetOwningQuest().SetCurrentStageID(910)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a006.psc b/source/scripts/tif__0102a006.psc
index 6a75394b..67a793a2 100644
--- a/source/scripts/tif__0102a006.psc
+++ b/source/scripts/tif__0102a006.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A006 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(305)
+GetOwningQuest().SetCurrentStageID(305)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a011.psc b/source/scripts/tif__0102a011.psc
index eee905af..fa939ce4 100644
--- a/source/scripts/tif__0102a011.psc
+++ b/source/scripts/tif__0102a011.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A011 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(290)
+GetOwningQuest().SetCurrentStageID(290)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a013.psc b/source/scripts/tif__0102a013.psc
index 801b2ce0..8402f4fa 100644
--- a/source/scripts/tif__0102a013.psc
+++ b/source/scripts/tif__0102a013.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A013 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(280)
+GetOwningQuest().SetCurrentStageID(280)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a017.psc b/source/scripts/tif__0102a017.psc
index 58f5979d..e99de7a5 100644
--- a/source/scripts/tif__0102a017.psc
+++ b/source/scripts/tif__0102a017.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A017 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(315)
+GetOwningQuest().SetCurrentStageID(315)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a033.psc b/source/scripts/tif__0102a033.psc
index 61de7864..b461cf2e 100644
--- a/source/scripts/tif__0102a033.psc
+++ b/source/scripts/tif__0102a033.psc
@@ -7,7 +7,7 @@ Function Fragment_3(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_FS_NQR05_TharaelLoyalToPlayer.SetValueInt(1)
-GetOwningQuest().SetStage(290)
+GetOwningQuest().SetCurrentStageID(290)
 _00E_RhetorikCounter.SetValueInt(_00E_RhetorikCounter.GetValueInt()+1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0102a038.psc b/source/scripts/tif__0102a038.psc
index d62edf2b..706f2480 100644
--- a/source/scripts/tif__0102a038.psc
+++ b/source/scripts/tif__0102a038.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A038 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(265)
+GetOwningQuest().SetCurrentStageID(265)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a039.psc b/source/scripts/tif__0102a039.psc
index 20ca0be3..14a2d73e 100644
--- a/source/scripts/tif__0102a039.psc
+++ b/source/scripts/tif__0102a039.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A039 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(265)
+GetOwningQuest().SetCurrentStageID(265)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a03e.psc b/source/scripts/tif__0102a03e.psc
index 2773d241..925eb989 100644
--- a/source/scripts/tif__0102a03e.psc
+++ b/source/scripts/tif__0102a03e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A03E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(285)
+GetOwningQuest().SetCurrentStageID(285)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a03f.psc b/source/scripts/tif__0102a03f.psc
index db5b23d5..d68375f7 100644
--- a/source/scripts/tif__0102a03f.psc
+++ b/source/scripts/tif__0102a03f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A03F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(285)
+GetOwningQuest().SetCurrentStageID(285)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a420.psc b/source/scripts/tif__0102a420.psc
index 7c66587b..33ac2028 100644
--- a/source/scripts/tif__0102a420.psc
+++ b/source/scripts/tif__0102a420.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A420 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(17)
+GetOwningQuest().SetCurrentStageID(17)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a42d.psc b/source/scripts/tif__0102a42d.psc
index 1c7cd8fa..ef5fa742 100644
--- a/source/scripts/tif__0102a42d.psc
+++ b/source/scripts/tif__0102a42d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A42D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a465.psc b/source/scripts/tif__0102a465.psc
index 4013240b..bffa9a51 100644
--- a/source/scripts/tif__0102a465.psc
+++ b/source/scripts/tif__0102a465.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A465 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(340)
+GetOwningQuest().SetCurrentStageID(340)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a486.psc b/source/scripts/tif__0102a486.psc
index 17f05cad..233bf869 100644
--- a/source/scripts/tif__0102a486.psc
+++ b/source/scripts/tif__0102a486.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A486 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(520)
+GetOwningQuest().SetCurrentStageID(520)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a488.psc b/source/scripts/tif__0102a488.psc
index 551780d6..c1fec625 100644
--- a/source/scripts/tif__0102a488.psc
+++ b/source/scripts/tif__0102a488.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A488 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(1050)
+GetOwningQuest().SetCurrentStageID(1050)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a48f.psc b/source/scripts/tif__0102a48f.psc
index 55f0a6f4..2d6cff0c 100644
--- a/source/scripts/tif__0102a48f.psc
+++ b/source/scripts/tif__0102a48f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A48F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(1050)
+GetOwningQuest().SetCurrentStageID(1050)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a4e8.psc b/source/scripts/tif__0102a4e8.psc
index 2528e1e2..51f20af8 100644
--- a/source/scripts/tif__0102a4e8.psc
+++ b/source/scripts/tif__0102a4e8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A4E8 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(132)
+GetOwningQuest().SetCurrentStageID(132)
 GetOwningQuest().SetObjectiveCompleted(40)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0102a502.psc b/source/scripts/tif__0102a502.psc
index 89298f11..5709aba5 100644
--- a/source/scripts/tif__0102a502.psc
+++ b/source/scripts/tif__0102a502.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 FS_NQR01.GiveRewardBattle04()
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a508.psc b/source/scripts/tif__0102a508.psc
index 6f25c55d..eca445b9 100644
--- a/source/scripts/tif__0102a508.psc
+++ b/source/scripts/tif__0102a508.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A508 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a625.psc b/source/scripts/tif__0102a625.psc
index 0302572a..d2c4af65 100644
--- a/source/scripts/tif__0102a625.psc
+++ b/source/scripts/tif__0102a625.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A625 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(170)
+GetOwningQuest().SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a656.psc b/source/scripts/tif__0102a656.psc
index 8116570a..ff918bb1 100644
--- a/source/scripts/tif__0102a656.psc
+++ b/source/scripts/tif__0102a656.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A656 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a668.psc b/source/scripts/tif__0102a668.psc
index e44389d8..94d9b8a4 100644
--- a/source/scripts/tif__0102a668.psc
+++ b/source/scripts/tif__0102a668.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 FS_NQR02_SC05CollisionREF.Disable()
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a669.psc b/source/scripts/tif__0102a669.psc
index b45d9b9f..39af3b60 100644
--- a/source/scripts/tif__0102a669.psc
+++ b/source/scripts/tif__0102a669.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A669 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a66f.psc b/source/scripts/tif__0102a66f.psc
index 71da6082..81e216df 100644
--- a/source/scripts/tif__0102a66f.psc
+++ b/source/scripts/tif__0102a66f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A66F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a671.psc b/source/scripts/tif__0102a671.psc
index 4a180ca9..a0cbeb0a 100644
--- a/source/scripts/tif__0102a671.psc
+++ b/source/scripts/tif__0102a671.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A671 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().Setstage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a90a.psc b/source/scripts/tif__0102a90a.psc
index 8f12950e..c4a4cab2 100644
--- a/source/scripts/tif__0102a90a.psc
+++ b/source/scripts/tif__0102a90a.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a90b.psc b/source/scripts/tif__0102a90b.psc
index 5f9b2c63..656cd335 100644
--- a/source/scripts/tif__0102a90b.psc
+++ b/source/scripts/tif__0102a90b.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102a9f3.psc b/source/scripts/tif__0102a9f3.psc
index 5a988936..a32f9433 100644
--- a/source/scripts/tif__0102a9f3.psc
+++ b/source/scripts/tif__0102a9f3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102A9F3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102aa09.psc b/source/scripts/tif__0102aa09.psc
index e66edc90..1c7472a5 100644
--- a/source/scripts/tif__0102aa09.psc
+++ b/source/scripts/tif__0102aa09.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102AA09 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102aa0d.psc b/source/scripts/tif__0102aa0d.psc
index 39da3a31..e2543143 100644
--- a/source/scripts/tif__0102aa0d.psc
+++ b/source/scripts/tif__0102aa0d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102AA0D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(1000)
+GetOwningQuest().SetCurrentStageID(1000)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102aa0e.psc b/source/scripts/tif__0102aa0e.psc
index 50383d47..3e4c305f 100644
--- a/source/scripts/tif__0102aa0e.psc
+++ b/source/scripts/tif__0102aa0e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102AA0E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(1000)
+GetOwningQuest().SetCurrentStageID(1000)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102aa13.psc b/source/scripts/tif__0102aa13.psc
index 5dc665b2..386ff47c 100644
--- a/source/scripts/tif__0102aa13.psc
+++ b/source/scripts/tif__0102aa13.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102AA13 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102aa16.psc b/source/scripts/tif__0102aa16.psc
index 5a73a908..6505c8bf 100644
--- a/source/scripts/tif__0102aa16.psc
+++ b/source/scripts/tif__0102aa16.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102AA16 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102aa17.psc b/source/scripts/tif__0102aa17.psc
index 7c5d81b6..7f7e78cb 100644
--- a/source/scripts/tif__0102aa17.psc
+++ b/source/scripts/tif__0102aa17.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102AA17 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 GetOwningQuest().SetObjectiveCompleted(30)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0102b405.psc b/source/scripts/tif__0102b405.psc
index 0978b244..680dcf6c 100644
--- a/source/scripts/tif__0102b405.psc
+++ b/source/scripts/tif__0102b405.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B405 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(355)
+GetOwningQuest().SetCurrentStageID(355)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b40f.psc b/source/scripts/tif__0102b40f.psc
index a3cb8cdd..2a9326a4 100644
--- a/source/scripts/tif__0102b40f.psc
+++ b/source/scripts/tif__0102b40f.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(365)
+GetOwningQuest().SetCurrentStageID(365)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b42d.psc b/source/scripts/tif__0102b42d.psc
index 19dc6e60..26adbc07 100644
--- a/source/scripts/tif__0102b42d.psc
+++ b/source/scripts/tif__0102b42d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B42D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(355)
+GetOwningQuest().SetCurrentStageID(355)
 (GetOwningQuest() as _00E_FS_NQR05_Functions).AddKey()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0102b433.psc b/source/scripts/tif__0102b433.psc
index 0070abe9..c108ef9c 100644
--- a/source/scripts/tif__0102b433.psc
+++ b/source/scripts/tif__0102b433.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 (GetOwningQuest() as _00E_FS_NQR05_Functions).AddDeathMusic()
-GetOwningQuest().SetStage(355)
+GetOwningQuest().SetCurrentStageID(355)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b434.psc b/source/scripts/tif__0102b434.psc
index 9a62aa3d..7698f88d 100644
--- a/source/scripts/tif__0102b434.psc
+++ b/source/scripts/tif__0102b434.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(365)
+GetOwningQuest().SetCurrentStageID(365)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b4b9.psc b/source/scripts/tif__0102b4b9.psc
index 9b9452f6..34a28f66 100644
--- a/source/scripts/tif__0102b4b9.psc
+++ b/source/scripts/tif__0102b4b9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B4B9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(270)
+GetOwningQuest().SetCurrentStageID(270)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b4de.psc b/source/scripts/tif__0102b4de.psc
index 465e96af..f9967445 100644
--- a/source/scripts/tif__0102b4de.psc
+++ b/source/scripts/tif__0102b4de.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B4DE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b95d.psc b/source/scripts/tif__0102b95d.psc
index cd79201e..f8e30ed3 100644
--- a/source/scripts/tif__0102b95d.psc
+++ b/source/scripts/tif__0102b95d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B95D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(265)
+GetOwningQuest().SetCurrentStageID(265)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b976.psc b/source/scripts/tif__0102b976.psc
index 9fc7b5e4..455d0f19 100644
--- a/source/scripts/tif__0102b976.psc
+++ b/source/scripts/tif__0102b976.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B976 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(64)
+GetOwningQuest().SetCurrentStageID(64)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b977.psc b/source/scripts/tif__0102b977.psc
index 9af8df9a..6285072c 100644
--- a/source/scripts/tif__0102b977.psc
+++ b/source/scripts/tif__0102b977.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B977 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(63)
+GetOwningQuest().SetCurrentStageID(63)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b978.psc b/source/scripts/tif__0102b978.psc
index 0831a449..5d3dfdab 100644
--- a/source/scripts/tif__0102b978.psc
+++ b/source/scripts/tif__0102b978.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B978 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 FS_NQR01.HandOverContract()
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0102b979.psc b/source/scripts/tif__0102b979.psc
index f4c7cbc1..05b3743a 100644
--- a/source/scripts/tif__0102b979.psc
+++ b/source/scripts/tif__0102b979.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B979 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(11)
+GetOwningQuest().SetCurrentStageID(11)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b97a.psc b/source/scripts/tif__0102b97a.psc
index ba9cd3b0..46d53eab 100644
--- a/source/scripts/tif__0102b97a.psc
+++ b/source/scripts/tif__0102b97a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B97A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().setStage(51)
+GetOwningQuest().SetCurrentStageID(51)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b97b.psc b/source/scripts/tif__0102b97b.psc
index cc70d29e..9f97a2db 100644
--- a/source/scripts/tif__0102b97b.psc
+++ b/source/scripts/tif__0102b97b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B97B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b97c.psc b/source/scripts/tif__0102b97c.psc
index 5afaa6a6..80fc5965 100644
--- a/source/scripts/tif__0102b97c.psc
+++ b/source/scripts/tif__0102b97c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B97C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(55)
+GetOwningQuest().SetCurrentStageID(55)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b97d.psc b/source/scripts/tif__0102b97d.psc
index f5287ac6..ba0dd36f 100644
--- a/source/scripts/tif__0102b97d.psc
+++ b/source/scripts/tif__0102b97d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B97D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(31)
+GetOwningQuest().SetCurrentStageID(31)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b97e.psc b/source/scripts/tif__0102b97e.psc
index 262e2512..2324b44e 100644
--- a/source/scripts/tif__0102b97e.psc
+++ b/source/scripts/tif__0102b97e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B97E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(64)
+GetOwningQuest().SetCurrentStageID(64)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b97f.psc b/source/scripts/tif__0102b97f.psc
index 358a0bbd..8a0789aa 100644
--- a/source/scripts/tif__0102b97f.psc
+++ b/source/scripts/tif__0102b97f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B97F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102b980.psc b/source/scripts/tif__0102b980.psc
index c8cd5f5c..2b26dee7 100644
--- a/source/scripts/tif__0102b980.psc
+++ b/source/scripts/tif__0102b980.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102B980 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(71)
+GetOwningQuest().SetCurrentStageID(71)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102c5c4.psc b/source/scripts/tif__0102c5c4.psc
index e4c4a573..592496df 100644
--- a/source/scripts/tif__0102c5c4.psc
+++ b/source/scripts/tif__0102c5c4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102C5C4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(145)
+GetOwningQuest().SetCurrentStageID(145)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102c5c9.psc b/source/scripts/tif__0102c5c9.psc
index f8b9faa8..3e0aec37 100644
--- a/source/scripts/tif__0102c5c9.psc
+++ b/source/scripts/tif__0102c5c9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102C5C9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102e1ea.psc b/source/scripts/tif__0102e1ea.psc
index 2f8ee182..3c35988d 100644
--- a/source/scripts/tif__0102e1ea.psc
+++ b/source/scripts/tif__0102e1ea.psc
@@ -7,8 +7,8 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 EnderalFunctions.EnableDialogueQuitting()
-If NQ25.GetStage() < 7
-NQ25.SetStage(7)
+If NQ25.GetCurrentStageID() < 7
+NQ25.SetCurrentStageID(7)
 NQ25.SetObjectiveDisplayed(10, 0, 0)
 NQ25.SetObjectiveDisplayed(20, 1, 1)
 _00E_NQ25_TalkedToMarius.SetValueInt(1)
diff --git a/source/scripts/tif__0102e600.psc b/source/scripts/tif__0102e600.psc
index 588947b8..7e917cf7 100644
--- a/source/scripts/tif__0102e600.psc
+++ b/source/scripts/tif__0102e600.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102E600 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102e605.psc b/source/scripts/tif__0102e605.psc
index 45076dc7..5d59b8da 100644
--- a/source/scripts/tif__0102e605.psc
+++ b/source/scripts/tif__0102e605.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102E605 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102e607.psc b/source/scripts/tif__0102e607.psc
index 5423cb9f..ee4529b0 100644
--- a/source/scripts/tif__0102e607.psc
+++ b/source/scripts/tif__0102e607.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102E607 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102e616.psc b/source/scripts/tif__0102e616.psc
index 1b6eb946..fc3cc3d8 100644
--- a/source/scripts/tif__0102e616.psc
+++ b/source/scripts/tif__0102e616.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102E616 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102e617.psc b/source/scripts/tif__0102e617.psc
index b4f6f6de..aff26a71 100644
--- a/source/scripts/tif__0102e617.psc
+++ b/source/scripts/tif__0102e617.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102E617 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().Setstage(19)
+GetOwningQuest().SetCurrentStageID(19)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102e633.psc b/source/scripts/tif__0102e633.psc
index 6bcf16cf..ad5d69a5 100644
--- a/source/scripts/tif__0102e633.psc
+++ b/source/scripts/tif__0102e633.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102E633 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102e634.psc b/source/scripts/tif__0102e634.psc
index 6c20cba0..34b1007e 100644
--- a/source/scripts/tif__0102e634.psc
+++ b/source/scripts/tif__0102e634.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102E634 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(16)
+GetOwningQuest().SetCurrentStageID(16)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102e635.psc b/source/scripts/tif__0102e635.psc
index b52e01f7..eb1944fb 100644
--- a/source/scripts/tif__0102e635.psc
+++ b/source/scripts/tif__0102e635.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102E635 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102e650.psc b/source/scripts/tif__0102e650.psc
index bebf9d08..2077d6b5 100644
--- a/source/scripts/tif__0102e650.psc
+++ b/source/scripts/tif__0102e650.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102e651.psc b/source/scripts/tif__0102e651.psc
index 3f4e8688..33ff60d3 100644
--- a/source/scripts/tif__0102e651.psc
+++ b/source/scripts/tif__0102e651.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102E651 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102e658.psc b/source/scripts/tif__0102e658.psc
index cb6ab397..7656372b 100644
--- a/source/scripts/tif__0102e658.psc
+++ b/source/scripts/tif__0102e658.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102E658 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(17)
+GetOwningQuest().SetCurrentStageID(17)
 _00E_RhetorikCounter.SetValueInt(_00E_RhetorikCounter.GetValueInt()+1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0102e65a.psc b/source/scripts/tif__0102e65a.psc
index add5089a..2ce325c1 100644
--- a/source/scripts/tif__0102e65a.psc
+++ b/source/scripts/tif__0102e65a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0102E65A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().Setstage(19)
+GetOwningQuest().SetCurrentStageID(19)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0102ee99.psc b/source/scripts/tif__0102ee99.psc
index 64ffd56c..8599d86a 100644
--- a/source/scripts/tif__0102ee99.psc
+++ b/source/scripts/tif__0102ee99.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 _00E_PlayerFunctions.GetTeleportControl().TeleportNPC(FS_EnvironmentScene05_RhalaimREF, _00E_NPCDumpMarker)
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02001bfe.psc b/source/scripts/tif__02001bfe.psc
index 3c9410f3..37b5092c 100644
--- a/source/scripts/tif__02001bfe.psc
+++ b/source/scripts/tif__02001bfe.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02001BFE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200301b.psc b/source/scripts/tif__0200301b.psc
index c8b3d61a..d1e9d2b4 100644
--- a/source/scripts/tif__0200301b.psc
+++ b/source/scripts/tif__0200301b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200301B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__020030b3.psc b/source/scripts/tif__020030b3.psc
index 5a1ff1a7..075b122a 100644
--- a/source/scripts/tif__020030b3.psc
+++ b/source/scripts/tif__020030b3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__020030B3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02004390.psc b/source/scripts/tif__02004390.psc
index 58e9f6c4..be6a3c3a 100644
--- a/source/scripts/tif__02004390.psc
+++ b/source/scripts/tif__02004390.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02004390 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02004391.psc b/source/scripts/tif__02004391.psc
index fe2bac0a..f480e2fa 100644
--- a/source/scripts/tif__02004391.psc
+++ b/source/scripts/tif__02004391.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02004391 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200439d.psc b/source/scripts/tif__0200439d.psc
index 06cf8ee6..a1f0aae2 100644
--- a/source/scripts/tif__0200439d.psc
+++ b/source/scripts/tif__0200439d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200439D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02004a52.psc b/source/scripts/tif__02004a52.psc
index e547bb82..4002849d 100644
--- a/source/scripts/tif__02004a52.psc
+++ b/source/scripts/tif__02004a52.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02004A52 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02004a54.psc b/source/scripts/tif__02004a54.psc
index 310e00c2..8b2fa5fb 100644
--- a/source/scripts/tif__02004a54.psc
+++ b/source/scripts/tif__02004a54.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02004A54 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__020056de.psc b/source/scripts/tif__020056de.psc
index 59acab3e..a4fc1758 100644
--- a/source/scripts/tif__020056de.psc
+++ b/source/scripts/tif__020056de.psc
@@ -6,7 +6,7 @@ Scriptname TIF__020056DE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(15)
+GetOwningQuest().SetCurrentStageID(15)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02005702.psc b/source/scripts/tif__02005702.psc
index 4569bce9..6174101c 100644
--- a/source/scripts/tif__02005702.psc
+++ b/source/scripts/tif__02005702.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02005702 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200574e.psc b/source/scripts/tif__0200574e.psc
index b6cdbffd..470b5870 100644
--- a/source/scripts/tif__0200574e.psc
+++ b/source/scripts/tif__0200574e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200574E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(580)
+GetOwningQuest().SetCurrentStageID(580)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200576b.psc b/source/scripts/tif__0200576b.psc
index e1800bc1..e291d746 100644
--- a/source/scripts/tif__0200576b.psc
+++ b/source/scripts/tif__0200576b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200576B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(600)
+GetOwningQuest().SetCurrentStageID(600)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200576e.psc b/source/scripts/tif__0200576e.psc
index c78a05be..a2253239 100644
--- a/source/scripts/tif__0200576e.psc
+++ b/source/scripts/tif__0200576e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200576E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(170)
+GetOwningQuest().SetCurrentStageID(170)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02005777.psc b/source/scripts/tif__02005777.psc
index 4a920fac..e9b8895d 100644
--- a/source/scripts/tif__02005777.psc
+++ b/source/scripts/tif__02005777.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02005777 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(610)
+GetOwningQuest().SetCurrentStageID(610)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02005778.psc b/source/scripts/tif__02005778.psc
index 9d93a97b..1418761e 100644
--- a/source/scripts/tif__02005778.psc
+++ b/source/scripts/tif__02005778.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02005778 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(610)
+GetOwningQuest().SetCurrentStageID(610)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02005789.psc b/source/scripts/tif__02005789.psc
index 9015e6c2..e450b237 100644
--- a/source/scripts/tif__02005789.psc
+++ b/source/scripts/tif__02005789.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02005789 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200578b.psc b/source/scripts/tif__0200578b.psc
index 2cfa5273..aea41078 100644
--- a/source/scripts/tif__0200578b.psc
+++ b/source/scripts/tif__0200578b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200578B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02005792.psc b/source/scripts/tif__02005792.psc
index bbdca853..894d3221 100644
--- a/source/scripts/tif__02005792.psc
+++ b/source/scripts/tif__02005792.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02005792 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(30)
+GetOwningQuest().SetCurrentStageID(30)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200579c.psc b/source/scripts/tif__0200579c.psc
index 067a9c25..7127bf94 100644
--- a/source/scripts/tif__0200579c.psc
+++ b/source/scripts/tif__0200579c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200579C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__020057a1.psc b/source/scripts/tif__020057a1.psc
index 9b63cacd..ddc289f4 100644
--- a/source/scripts/tif__020057a1.psc
+++ b/source/scripts/tif__020057a1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__020057A1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__020057ae.psc b/source/scripts/tif__020057ae.psc
index 100c9a91..38c2f259 100644
--- a/source/scripts/tif__020057ae.psc
+++ b/source/scripts/tif__020057ae.psc
@@ -6,7 +6,7 @@ Scriptname TIF__020057AE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__020057c2.psc b/source/scripts/tif__020057c2.psc
index 5bb08921..8f6dbe3e 100644
--- a/source/scripts/tif__020057c2.psc
+++ b/source/scripts/tif__020057c2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__020057C2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(330)
+GetOwningQuest().SetCurrentStageID(330)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02006b65.psc b/source/scripts/tif__02006b65.psc
index 70883960..00e176e0 100644
--- a/source/scripts/tif__02006b65.psc
+++ b/source/scripts/tif__02006b65.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02006B65 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02006b67.psc b/source/scripts/tif__02006b67.psc
index 35728cb0..fb781064 100644
--- a/source/scripts/tif__02006b67.psc
+++ b/source/scripts/tif__02006b67.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02006B67 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02006b6e.psc b/source/scripts/tif__02006b6e.psc
index 9490136f..6f919baa 100644
--- a/source/scripts/tif__02006b6e.psc
+++ b/source/scripts/tif__02006b6e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02006B6E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02006b77.psc b/source/scripts/tif__02006b77.psc
index f43561e9..cc137453 100644
--- a/source/scripts/tif__02006b77.psc
+++ b/source/scripts/tif__02006b77.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02006B77 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(240)
+GetOwningQuest().SetCurrentStageID(240)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02006b7f.psc b/source/scripts/tif__02006b7f.psc
index 6fbdbf2b..d9fd40e9 100644
--- a/source/scripts/tif__02006b7f.psc
+++ b/source/scripts/tif__02006b7f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02006B7F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02006b89.psc b/source/scripts/tif__02006b89.psc
index 415d2d64..5af63b68 100644
--- a/source/scripts/tif__02006b89.psc
+++ b/source/scripts/tif__02006b89.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02006B89 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(260)
+GetOwningQuest().SetCurrentStageID(260)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02006b8a.psc b/source/scripts/tif__02006b8a.psc
index b881a31f..37769352 100644
--- a/source/scripts/tif__02006b8a.psc
+++ b/source/scripts/tif__02006b8a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02006B8A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(270)
+GetOwningQuest().SetCurrentStageID(270)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02006bad.psc b/source/scripts/tif__02006bad.psc
index 498942f8..3b52aa5b 100644
--- a/source/scripts/tif__02006bad.psc
+++ b/source/scripts/tif__02006bad.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02006BAD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(350)
+GetOwningQuest().SetCurrentStageID(350)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02006bc7.psc b/source/scripts/tif__02006bc7.psc
index eb62bec3..199f13bf 100644
--- a/source/scripts/tif__02006bc7.psc
+++ b/source/scripts/tif__02006bc7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02006BC7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(360)
+GetOwningQuest().SetCurrentStageID(360)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02006bde.psc b/source/scripts/tif__02006bde.psc
index 2b8d9d6f..7b63c074 100644
--- a/source/scripts/tif__02006bde.psc
+++ b/source/scripts/tif__02006bde.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02006BDE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(370)
+GetOwningQuest().SetCurrentStageID(370)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02006be6.psc b/source/scripts/tif__02006be6.psc
index 5223ccf8..1120237b 100644
--- a/source/scripts/tif__02006be6.psc
+++ b/source/scripts/tif__02006be6.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02006BE6 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(380)
+GetOwningQuest().SetCurrentStageID(380)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02006be8.psc b/source/scripts/tif__02006be8.psc
index 6ffe07b0..c85c9911 100644
--- a/source/scripts/tif__02006be8.psc
+++ b/source/scripts/tif__02006be8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02006BE8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(400)
+GetOwningQuest().SetCurrentStageID(400)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02006bf4.psc b/source/scripts/tif__02006bf4.psc
index e4da513f..4d7572eb 100644
--- a/source/scripts/tif__02006bf4.psc
+++ b/source/scripts/tif__02006bf4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02006BF4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(390)
+GetOwningQuest().SetCurrentStageID(390)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02006bf5.psc b/source/scripts/tif__02006bf5.psc
index 5dc2f05f..e6e4e799 100644
--- a/source/scripts/tif__02006bf5.psc
+++ b/source/scripts/tif__02006bf5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02006BF5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(390)
+GetOwningQuest().SetCurrentStageID(390)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02007f36.psc b/source/scripts/tif__02007f36.psc
index e76f9267..eb988c4c 100644
--- a/source/scripts/tif__02007f36.psc
+++ b/source/scripts/tif__02007f36.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02007F36 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(115)
+GetOwningQuest().SetCurrentStageID(115)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02007f37.psc b/source/scripts/tif__02007f37.psc
index 9aee5f66..02f3af4d 100644
--- a/source/scripts/tif__02007f37.psc
+++ b/source/scripts/tif__02007f37.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02007F37 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(115)
+GetOwningQuest().SetCurrentStageID(115)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02007f42.psc b/source/scripts/tif__02007f42.psc
index 7a8b2c3b..ee5fba27 100644
--- a/source/scripts/tif__02007f42.psc
+++ b/source/scripts/tif__02007f42.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02007F42 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(40)
+GetOwningQuest().SetCurrentStageID(40)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02007f5a.psc b/source/scripts/tif__02007f5a.psc
index 5a52d434..0978e543 100644
--- a/source/scripts/tif__02007f5a.psc
+++ b/source/scripts/tif__02007f5a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02007F5A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(680)
+GetOwningQuest().SetCurrentStageID(680)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02007f63.psc b/source/scripts/tif__02007f63.psc
index f94120a5..52042795 100644
--- a/source/scripts/tif__02007f63.psc
+++ b/source/scripts/tif__02007f63.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02007F63 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(690)
+GetOwningQuest().SetCurrentStageID(690)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02007f7c.psc b/source/scripts/tif__02007f7c.psc
index 32ae80b5..cb4a9389 100644
--- a/source/scripts/tif__02007f7c.psc
+++ b/source/scripts/tif__02007f7c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02007F7C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(730)
+GetOwningQuest().SetCurrentStageID(730)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02007f80.psc b/source/scripts/tif__02007f80.psc
index 6ad5cc26..49cee922 100644
--- a/source/scripts/tif__02007f80.psc
+++ b/source/scripts/tif__02007f80.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02007F80 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(290)
+GetOwningQuest().SetCurrentStageID(290)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02007fdd.psc b/source/scripts/tif__02007fdd.psc
index 8f238dfc..785601a4 100644
--- a/source/scripts/tif__02007fdd.psc
+++ b/source/scripts/tif__02007fdd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02007FDD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(410)
+GetOwningQuest().SetCurrentStageID(410)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200931e.psc b/source/scripts/tif__0200931e.psc
index 8c27689c..163ae81b 100644
--- a/source/scripts/tif__0200931e.psc
+++ b/source/scripts/tif__0200931e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200931E Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(190)
+GetOwningQuest().SetCurrentStageID(190)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(180)
+GetOwningQuest().SetCurrentStageID(180)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02009322.psc b/source/scripts/tif__02009322.psc
index e14099ea..e2dc9e9c 100644
--- a/source/scripts/tif__02009322.psc
+++ b/source/scripts/tif__02009322.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02009322 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(200)
+GetOwningQuest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200932b.psc b/source/scripts/tif__0200932b.psc
index 66389bb2..88c049e2 100644
--- a/source/scripts/tif__0200932b.psc
+++ b/source/scripts/tif__0200932b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200932B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(210)
+GetOwningQuest().SetCurrentStageID(210)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02009330.psc b/source/scripts/tif__02009330.psc
index b2d52fd9..192bf1ae 100644
--- a/source/scripts/tif__02009330.psc
+++ b/source/scripts/tif__02009330.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02009330 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200933c.psc b/source/scripts/tif__0200933c.psc
index 7ba4c5c5..f39ff7f3 100644
--- a/source/scripts/tif__0200933c.psc
+++ b/source/scripts/tif__0200933c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200933C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02009365.psc b/source/scripts/tif__02009365.psc
index 1d0d1160..2fd3359e 100644
--- a/source/scripts/tif__02009365.psc
+++ b/source/scripts/tif__02009365.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02009365 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(300)
+GetOwningQuest().SetCurrentStageID(300)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__020093b5.psc b/source/scripts/tif__020093b5.psc
index f4e65ace..015fd86e 100644
--- a/source/scripts/tif__020093b5.psc
+++ b/source/scripts/tif__020093b5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__020093B5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(255)
+GetOwningQuest().SetCurrentStageID(255)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200a6ec.psc b/source/scripts/tif__0200a6ec.psc
index 4ffc34a4..38ebaad7 100644
--- a/source/scripts/tif__0200a6ec.psc
+++ b/source/scripts/tif__0200a6ec.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200A6EC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(20)
+GetOwningQuest().SetCurrentStageID(20)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200a797.psc b/source/scripts/tif__0200a797.psc
index b87fc33a..e9f2ea82 100644
--- a/source/scripts/tif__0200a797.psc
+++ b/source/scripts/tif__0200a797.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(110)
+GetOwningQuest().SetCurrentStageID(110)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200baec.psc b/source/scripts/tif__0200baec.psc
index ff385dfc..adf5b4f3 100644
--- a/source/scripts/tif__0200baec.psc
+++ b/source/scripts/tif__0200baec.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BAEC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(220)
+GetOwningQuest().SetCurrentStageID(220)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bafd.psc b/source/scripts/tif__0200bafd.psc
index a86ecd90..e49ebb54 100644
--- a/source/scripts/tif__0200bafd.psc
+++ b/source/scripts/tif__0200bafd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BAFD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(230)
+GetOwningQuest().SetCurrentStageID(230)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bb02.psc b/source/scripts/tif__0200bb02.psc
index d5a1793d..daf414ee 100644
--- a/source/scripts/tif__0200bb02.psc
+++ b/source/scripts/tif__0200bb02.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BB02 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(740)
+GetOwningQuest().SetCurrentStageID(740)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bb0a.psc b/source/scripts/tif__0200bb0a.psc
index af1e3562..580c4643 100644
--- a/source/scripts/tif__0200bb0a.psc
+++ b/source/scripts/tif__0200bb0a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BB0A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(750)
+GetOwningQuest().SetCurrentStageID(750)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bb19.psc b/source/scripts/tif__0200bb19.psc
index cf3a1cd2..38857659 100644
--- a/source/scripts/tif__0200bb19.psc
+++ b/source/scripts/tif__0200bb19.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BB19 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(770)
+GetOwningQuest().SetCurrentStageID(770)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bb1e.psc b/source/scripts/tif__0200bb1e.psc
index c54bbcb1..b48c8768 100644
--- a/source/scripts/tif__0200bb1e.psc
+++ b/source/scripts/tif__0200bb1e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BB1E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bb21.psc b/source/scripts/tif__0200bb21.psc
index d5bd90eb..3fbc4adc 100644
--- a/source/scripts/tif__0200bb21.psc
+++ b/source/scripts/tif__0200bb21.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BB21 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bb23.psc b/source/scripts/tif__0200bb23.psc
index 5f0423b5..8b27b573 100644
--- a/source/scripts/tif__0200bb23.psc
+++ b/source/scripts/tif__0200bb23.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BB23 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bb25.psc b/source/scripts/tif__0200bb25.psc
index e028ec07..55546db3 100644
--- a/source/scripts/tif__0200bb25.psc
+++ b/source/scripts/tif__0200bb25.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BB25 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(780)
+GetOwningQuest().SetCurrentStageID(780)
 Game.GetPlayer().Additem(_01E_TeleportrolleArk, 1)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__0200bb26.psc b/source/scripts/tif__0200bb26.psc
index c11e8fa0..4e689c4b 100644
--- a/source/scripts/tif__0200bb26.psc
+++ b/source/scripts/tif__0200bb26.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BB26 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(780)
+GetOwningQuest().SetCurrentStageID(780)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bc4e.psc b/source/scripts/tif__0200bc4e.psc
index f88429a5..2371261c 100644
--- a/source/scripts/tif__0200bc4e.psc
+++ b/source/scripts/tif__0200bc4e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BC4E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bc4f.psc b/source/scripts/tif__0200bc4f.psc
index 04fd6ff4..d90895ad 100644
--- a/source/scripts/tif__0200bc4f.psc
+++ b/source/scripts/tif__0200bc4f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BC4F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bc50.psc b/source/scripts/tif__0200bc50.psc
index 75d0480b..5b9c559d 100644
--- a/source/scripts/tif__0200bc50.psc
+++ b/source/scripts/tif__0200bc50.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BC50 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bc51.psc b/source/scripts/tif__0200bc51.psc
index 392bc243..f0c7a0e8 100644
--- a/source/scripts/tif__0200bc51.psc
+++ b/source/scripts/tif__0200bc51.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BC51 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bc52.psc b/source/scripts/tif__0200bc52.psc
index 5f01732b..c5f054af 100644
--- a/source/scripts/tif__0200bc52.psc
+++ b/source/scripts/tif__0200bc52.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BC52 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bc53.psc b/source/scripts/tif__0200bc53.psc
index 76150fc7..8323ef0a 100644
--- a/source/scripts/tif__0200bc53.psc
+++ b/source/scripts/tif__0200bc53.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BC53 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(50)
+GetOwningQuest().SetCurrentStageID(50)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bc75.psc b/source/scripts/tif__0200bc75.psc
index abb430de..cd051970 100644
--- a/source/scripts/tif__0200bc75.psc
+++ b/source/scripts/tif__0200bc75.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BC75 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(65)
+GetOwningQuest().SetCurrentStageID(65)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bc81.psc b/source/scripts/tif__0200bc81.psc
index e86b8538..ab181e9c 100644
--- a/source/scripts/tif__0200bc81.psc
+++ b/source/scripts/tif__0200bc81.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BC81 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(70)
+GetOwningQuest().SetCurrentStageID(70)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200bc88.psc b/source/scripts/tif__0200bc88.psc
index bdf097f7..60467da9 100644
--- a/source/scripts/tif__0200bc88.psc
+++ b/source/scripts/tif__0200bc88.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200BC88 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(80)
+GetOwningQuest().SetCurrentStageID(80)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200ce53.psc b/source/scripts/tif__0200ce53.psc
index 9ba999b9..3b829abc 100644
--- a/source/scripts/tif__0200ce53.psc
+++ b/source/scripts/tif__0200ce53.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200CE53 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(860)
+GetOwningQuest().SetCurrentStageID(860)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200ce87.psc b/source/scripts/tif__0200ce87.psc
index bd2096c0..938507c6 100644
--- a/source/scripts/tif__0200ce87.psc
+++ b/source/scripts/tif__0200ce87.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200CE87 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(260)
+GetOwningQuest().SetCurrentStageID(260)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200cf0d.psc b/source/scripts/tif__0200cf0d.psc
index 5ca991a1..a5e1f182 100644
--- a/source/scripts/tif__0200cf0d.psc
+++ b/source/scripts/tif__0200cf0d.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 EnderalFunctions.DisableDialogueQuitting()
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200cf13.psc b/source/scripts/tif__0200cf13.psc
index 2ccf0281..6bfd3c21 100644
--- a/source/scripts/tif__0200cf13.psc
+++ b/source/scripts/tif__0200cf13.psc
@@ -7,7 +7,7 @@ Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
 EnderalFunctions.DisableDialogueQuitting()
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200cf17.psc b/source/scripts/tif__0200cf17.psc
index 91ce8396..6385b7b6 100644
--- a/source/scripts/tif__0200cf17.psc
+++ b/source/scripts/tif__0200cf17.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200CF17 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(135)
+GetOwningQuest().SetCurrentStageID(135)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200cf43.psc b/source/scripts/tif__0200cf43.psc
index 7ce42671..65bcd234 100644
--- a/source/scripts/tif__0200cf43.psc
+++ b/source/scripts/tif__0200cf43.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200CF43 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(430)
+GetOwningQuest().SetCurrentStageID(430)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200cf50.psc b/source/scripts/tif__0200cf50.psc
index 5e6f7a14..c702279c 100644
--- a/source/scripts/tif__0200cf50.psc
+++ b/source/scripts/tif__0200cf50.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200CF50 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(440)
+GetOwningQuest().SetCurrentStageID(440)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200cf5b.psc b/source/scripts/tif__0200cf5b.psc
index 85c80c50..73f2d0fa 100644
--- a/source/scripts/tif__0200cf5b.psc
+++ b/source/scripts/tif__0200cf5b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200CF5B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(460)
+GetOwningQuest().SetCurrentStageID(460)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200cf5d.psc b/source/scripts/tif__0200cf5d.psc
index a98ffd3e..9ba0b2c1 100644
--- a/source/scripts/tif__0200cf5d.psc
+++ b/source/scripts/tif__0200cf5d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200CF5D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(450)
+GetOwningQuest().SetCurrentStageID(450)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200cf5e.psc b/source/scripts/tif__0200cf5e.psc
index 1c9debd1..42a7109b 100644
--- a/source/scripts/tif__0200cf5e.psc
+++ b/source/scripts/tif__0200cf5e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200CF5E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(60)
+GetOwningQuest().SetCurrentStageID(60)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200e2ee.psc b/source/scripts/tif__0200e2ee.psc
index 5d94e895..444ad0a8 100644
--- a/source/scripts/tif__0200e2ee.psc
+++ b/source/scripts/tif__0200e2ee.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200E2EE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(140)
+GetOwningQuest().SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200e2ef.psc b/source/scripts/tif__0200e2ef.psc
index ca71b3b7..b8f79bd9 100644
--- a/source/scripts/tif__0200e2ef.psc
+++ b/source/scripts/tif__0200e2ef.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200E2EF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(150)
+GetOwningQuest().SetCurrentStageID(150)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200e2f0.psc b/source/scripts/tif__0200e2f0.psc
index 2c962977..2f9810e0 100644
--- a/source/scripts/tif__0200e2f0.psc
+++ b/source/scripts/tif__0200e2f0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200E2F0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(160)
+GetOwningQuest().SetCurrentStageID(160)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f6b1.psc b/source/scripts/tif__0200f6b1.psc
index 62586cfa..292fc8b3 100644
--- a/source/scripts/tif__0200f6b1.psc
+++ b/source/scripts/tif__0200f6b1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200F6B1 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(790)
+GetOwningQuest().SetCurrentStageID(790)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f6bc.psc b/source/scripts/tif__0200f6bc.psc
index 1917d57f..1e5d210f 100644
--- a/source/scripts/tif__0200f6bc.psc
+++ b/source/scripts/tif__0200f6bc.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(800)
+GetOwningQuest().SetCurrentStageID(800)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f6bd.psc b/source/scripts/tif__0200f6bd.psc
index 7ca96794..a0f1758a 100644
--- a/source/scripts/tif__0200f6bd.psc
+++ b/source/scripts/tif__0200f6bd.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(810)
+GetOwningQuest().SetCurrentStageID(810)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f6be.psc b/source/scripts/tif__0200f6be.psc
index 3647456d..07ea0e0b 100644
--- a/source/scripts/tif__0200f6be.psc
+++ b/source/scripts/tif__0200f6be.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200F6BE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(800)
+GetOwningQuest().SetCurrentStageID(800)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f6c0.psc b/source/scripts/tif__0200f6c0.psc
index 4807d0c2..5e29193c 100644
--- a/source/scripts/tif__0200f6c0.psc
+++ b/source/scripts/tif__0200f6c0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200F6C0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(820)
+GetOwningQuest().SetCurrentStageID(820)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f6cd.psc b/source/scripts/tif__0200f6cd.psc
index be11d16c..050d978b 100644
--- a/source/scripts/tif__0200f6cd.psc
+++ b/source/scripts/tif__0200f6cd.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200F6CD Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(825)
+GetOwningQuest().SetCurrentStageID(825)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f6ea.psc b/source/scripts/tif__0200f6ea.psc
index 4da11540..d059f3b4 100644
--- a/source/scripts/tif__0200f6ea.psc
+++ b/source/scripts/tif__0200f6ea.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200F6EA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(830)
+GetOwningQuest().SetCurrentStageID(830)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f738.psc b/source/scripts/tif__0200f738.psc
index b8af8117..30b27244 100644
--- a/source/scripts/tif__0200f738.psc
+++ b/source/scripts/tif__0200f738.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200F738 Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(75)
+GetOwningQuest().SetCurrentStageID(75)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f749.psc b/source/scripts/tif__0200f749.psc
index b187c92f..1072edd7 100644
--- a/source/scripts/tif__0200f749.psc
+++ b/source/scripts/tif__0200f749.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200F749 Extends TopicInfo Hidden
 Function Fragment_2(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(85)
+GetOwningQuest().SetCurrentStageID(85)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f74c.psc b/source/scripts/tif__0200f74c.psc
index e900afc9..e3e0ae0a 100644
--- a/source/scripts/tif__0200f74c.psc
+++ b/source/scripts/tif__0200f74c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200F74C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f752.psc b/source/scripts/tif__0200f752.psc
index 5401d005..901df9bb 100644
--- a/source/scripts/tif__0200f752.psc
+++ b/source/scripts/tif__0200f752.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(100)
+GetOwningQuest().SetCurrentStageID(100)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f75b.psc b/source/scripts/tif__0200f75b.psc
index 2428f8da..924b91e5 100644
--- a/source/scripts/tif__0200f75b.psc
+++ b/source/scripts/tif__0200f75b.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200F75B Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(10)
+GetOwningQuest().SetCurrentStageID(10)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f774.psc b/source/scripts/tif__0200f774.psc
index 56cbeffd..5bcf71aa 100644
--- a/source/scripts/tif__0200f774.psc
+++ b/source/scripts/tif__0200f774.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200F774 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(130)
+GetOwningQuest().SetCurrentStageID(130)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f77a.psc b/source/scripts/tif__0200f77a.psc
index 7bfa2933..973f587c 100644
--- a/source/scripts/tif__0200f77a.psc
+++ b/source/scripts/tif__0200f77a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200F77A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(140)
+GetOwningQuest().SetCurrentStageID(140)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f77d.psc b/source/scripts/tif__0200f77d.psc
index b9bb2663..418b124b 100644
--- a/source/scripts/tif__0200f77d.psc
+++ b/source/scripts/tif__0200f77d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200F77D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(25)
+GetOwningQuest().SetCurrentStageID(25)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f7ab.psc b/source/scripts/tif__0200f7ab.psc
index 1d022022..a850760c 100644
--- a/source/scripts/tif__0200f7ab.psc
+++ b/source/scripts/tif__0200f7ab.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200F7AB Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f7ad.psc b/source/scripts/tif__0200f7ad.psc
index 047f4707..ca09c6c1 100644
--- a/source/scripts/tif__0200f7ad.psc
+++ b/source/scripts/tif__0200f7ad.psc
@@ -15,7 +15,7 @@ EndFunction
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(35)
+GetOwningQuest().SetCurrentStageID(35)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0200f7c7.psc b/source/scripts/tif__0200f7c7.psc
index 9b6ee988..24be3d67 100644
--- a/source/scripts/tif__0200f7c7.psc
+++ b/source/scripts/tif__0200f7c7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0200F7C7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(45)
+GetOwningQuest().SetCurrentStageID(45)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02010a72.psc b/source/scripts/tif__02010a72.psc
index 9a6d1f43..f06a3022 100644
--- a/source/scripts/tif__02010a72.psc
+++ b/source/scripts/tif__02010a72.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02010A72 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(240)
+GetOwningQuest().SetCurrentStageID(240)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02010a77.psc b/source/scripts/tif__02010a77.psc
index 82655f84..f7dda992 100644
--- a/source/scripts/tif__02010a77.psc
+++ b/source/scripts/tif__02010a77.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02010A77 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(250)
+GetOwningQuest().SetCurrentStageID(250)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02010ad2.psc b/source/scripts/tif__02010ad2.psc
index 0690c16a..a28efb6c 100644
--- a/source/scripts/tif__02010ad2.psc
+++ b/source/scripts/tif__02010ad2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02010AD2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(180)
+GetOwningQuest().SetCurrentStageID(180)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02010ada.psc b/source/scripts/tif__02010ada.psc
index 32034483..a8f2e113 100644
--- a/source/scripts/tif__02010ada.psc
+++ b/source/scripts/tif__02010ada.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02010ADA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(850)
+GetOwningQuest().SetCurrentStageID(850)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02010b58.psc b/source/scripts/tif__02010b58.psc
index e8470837..7a488f7c 100644
--- a/source/scripts/tif__02010b58.psc
+++ b/source/scripts/tif__02010b58.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02010B58 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(160)
+GetOwningQuest().SetCurrentStageID(160)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02010c07.psc b/source/scripts/tif__02010c07.psc
index 1d9b7197..73d00650 100644
--- a/source/scripts/tif__02010c07.psc
+++ b/source/scripts/tif__02010c07.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02010C07 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(90)
+GetOwningQuest().SetCurrentStageID(90)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02010c1d.psc b/source/scripts/tif__02010c1d.psc
index 645cfd9a..02da1de2 100644
--- a/source/scripts/tif__02010c1d.psc
+++ b/source/scripts/tif__02010c1d.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02010C1D Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02010c1f.psc b/source/scripts/tif__02010c1f.psc
index bb0bd0a2..29053a05 100644
--- a/source/scripts/tif__02010c1f.psc
+++ b/source/scripts/tif__02010c1f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02010C1F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(95)
+GetOwningQuest().SetCurrentStageID(95)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02011a0e.psc b/source/scripts/tif__02011a0e.psc
index 3c3b0574..84f5276b 100644
--- a/source/scripts/tif__02011a0e.psc
+++ b/source/scripts/tif__02011a0e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02011A0E Extends TopicInfo Hidden
 Function Fragment_1(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(290)
+GetOwningQuest().SetCurrentStageID(290)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02011dd9.psc b/source/scripts/tif__02011dd9.psc
index 96577cef..a269fbdd 100644
--- a/source/scripts/tif__02011dd9.psc
+++ b/source/scripts/tif__02011dd9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02011DD9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(890)
+GetOwningQuest().SetCurrentStageID(890)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02011ddb.psc b/source/scripts/tif__02011ddb.psc
index 70034829..2ec12487 100644
--- a/source/scripts/tif__02011ddb.psc
+++ b/source/scripts/tif__02011ddb.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02011DDB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(900)
+GetOwningQuest().SetCurrentStageID(900)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02011deb.psc b/source/scripts/tif__02011deb.psc
index eb7db3e6..3527c325 100644
--- a/source/scripts/tif__02011deb.psc
+++ b/source/scripts/tif__02011deb.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02011DEB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(910)
+GetOwningQuest().SetCurrentStageID(910)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02011dff.psc b/source/scripts/tif__02011dff.psc
index 9390d700..a4cc9a7c 100644
--- a/source/scripts/tif__02011dff.psc
+++ b/source/scripts/tif__02011dff.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02011DFF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(920)
+GetOwningQuest().SetCurrentStageID(920)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02011ec4.psc b/source/scripts/tif__02011ec4.psc
index 19d44c47..73bb4255 100644
--- a/source/scripts/tif__02011ec4.psc
+++ b/source/scripts/tif__02011ec4.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02011EC4 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(190)
+GetOwningQuest().SetCurrentStageID(190)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02011ec7.psc b/source/scripts/tif__02011ec7.psc
index 0c9c7d0c..87fc3ec2 100644
--- a/source/scripts/tif__02011ec7.psc
+++ b/source/scripts/tif__02011ec7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02011EC7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(190)
+GetOwningQuest().SetCurrentStageID(190)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02011ed7.psc b/source/scripts/tif__02011ed7.psc
index b457a6fc..6e311ad4 100644
--- a/source/scripts/tif__02011ed7.psc
+++ b/source/scripts/tif__02011ed7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02011ED7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(200)
+GetOwningQuest().SetCurrentStageID(200)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02011ee2.psc b/source/scripts/tif__02011ee2.psc
index bec5760e..58bd36eb 100644
--- a/source/scripts/tif__02011ee2.psc
+++ b/source/scripts/tif__02011ee2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02011EE2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(220)
+GetOwningQuest().SetCurrentStageID(220)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02011ee7.psc b/source/scripts/tif__02011ee7.psc
index ec14ec59..228b37f1 100644
--- a/source/scripts/tif__02011ee7.psc
+++ b/source/scripts/tif__02011ee7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02011EE7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(210)
+GetOwningQuest().SetCurrentStageID(210)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02012841.psc b/source/scripts/tif__02012841.psc
index 82203bc4..39eb8ad9 100644
--- a/source/scripts/tif__02012841.psc
+++ b/source/scripts/tif__02012841.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02012841 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(470)
+GetOwningQuest().SetCurrentStageID(470)
 _00E_FS_NQ02_MuseumVar.SetValue(0.0)
 ;END CODE
 EndFunction
diff --git a/source/scripts/tif__020131da.psc b/source/scripts/tif__020131da.psc
index 134ed53a..bb666348 100644
--- a/source/scripts/tif__020131da.psc
+++ b/source/scripts/tif__020131da.psc
@@ -6,7 +6,7 @@ Scriptname TIF__020131DA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(930)
+GetOwningQuest().SetCurrentStageID(930)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__020131f3.psc b/source/scripts/tif__020131f3.psc
index 0d6b5b3b..496d4ece 100644
--- a/source/scripts/tif__020131f3.psc
+++ b/source/scripts/tif__020131f3.psc
@@ -6,7 +6,7 @@ Scriptname TIF__020131F3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(940)
+GetOwningQuest().SetCurrentStageID(940)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02013c20.psc b/source/scripts/tif__02013c20.psc
index da6e8f61..8a848847 100644
--- a/source/scripts/tif__02013c20.psc
+++ b/source/scripts/tif__02013c20.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02013C20 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(480)
+GetOwningQuest().SetCurrentStageID(480)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02013c24.psc b/source/scripts/tif__02013c24.psc
index ac6260ed..026e1a5b 100644
--- a/source/scripts/tif__02013c24.psc
+++ b/source/scripts/tif__02013c24.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02013C24 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(485)
+GetOwningQuest().SetCurrentStageID(485)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02013c2c.psc b/source/scripts/tif__02013c2c.psc
index 8c781211..74952202 100644
--- a/source/scripts/tif__02013c2c.psc
+++ b/source/scripts/tif__02013c2c.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02013C2C Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(490)
+GetOwningQuest().SetCurrentStageID(490)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02013c34.psc b/source/scripts/tif__02013c34.psc
index 9f8a1074..ffd5904f 100644
--- a/source/scripts/tif__02013c34.psc
+++ b/source/scripts/tif__02013c34.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02013C34 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(495)
+GetOwningQuest().SetCurrentStageID(495)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02013c3e.psc b/source/scripts/tif__02013c3e.psc
index 64d4e295..9dd6619b 100644
--- a/source/scripts/tif__02013c3e.psc
+++ b/source/scripts/tif__02013c3e.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02013C3E Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(500)
+GetOwningQuest().SetCurrentStageID(500)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__020159e9.psc b/source/scripts/tif__020159e9.psc
index f20be25a..ec194cd3 100644
--- a/source/scripts/tif__020159e9.psc
+++ b/source/scripts/tif__020159e9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__020159E9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(980)
+GetOwningQuest().SetCurrentStageID(980)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02015a1a.psc b/source/scripts/tif__02015a1a.psc
index 2fe37d07..e59a0831 100644
--- a/source/scripts/tif__02015a1a.psc
+++ b/source/scripts/tif__02015a1a.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02015A1A Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(270)
+GetOwningQuest().SetCurrentStageID(270)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02016dd7.psc b/source/scripts/tif__02016dd7.psc
index 868fba3a..9c3746fe 100644
--- a/source/scripts/tif__02016dd7.psc
+++ b/source/scripts/tif__02016dd7.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02016DD7 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(1000)
+GetOwningQuest().SetCurrentStageID(1000)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__020177ed.psc b/source/scripts/tif__020177ed.psc
index 196b5336..1e394ffb 100644
--- a/source/scripts/tif__020177ed.psc
+++ b/source/scripts/tif__020177ed.psc
@@ -6,7 +6,7 @@ Scriptname TIF__020177ED Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(520)
+GetOwningQuest().SetCurrentStageID(520)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__020181d0.psc b/source/scripts/tif__020181d0.psc
index 3404a23c..9cfa2d23 100644
--- a/source/scripts/tif__020181d0.psc
+++ b/source/scripts/tif__020181d0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__020181D0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(1020)
+GetOwningQuest().SetCurrentStageID(1020)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__020181d1.psc b/source/scripts/tif__020181d1.psc
index 5429079c..89fd4fd1 100644
--- a/source/scripts/tif__020181d1.psc
+++ b/source/scripts/tif__020181d1.psc
@@ -6,7 +6,7 @@ Scriptname TIF__020181D1 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(1020)
+GetOwningQuest().SetCurrentStageID(1020)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__020195ec.psc b/source/scripts/tif__020195ec.psc
index 9206d857..34042f59 100644
--- a/source/scripts/tif__020195ec.psc
+++ b/source/scripts/tif__020195ec.psc
@@ -6,7 +6,7 @@ Scriptname TIF__020195EC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(330)
+GetOwningQuest().SetCurrentStageID(330)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__020195ee.psc b/source/scripts/tif__020195ee.psc
index 2cda3b1d..9f7338aa 100644
--- a/source/scripts/tif__020195ee.psc
+++ b/source/scripts/tif__020195ee.psc
@@ -6,7 +6,7 @@ Scriptname TIF__020195EE Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(310)
+GetOwningQuest().SetCurrentStageID(310)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02019faf.psc b/source/scripts/tif__02019faf.psc
index 6cbb806a..b5c22289 100644
--- a/source/scripts/tif__02019faf.psc
+++ b/source/scripts/tif__02019faf.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02019FAF Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(530)
+GetOwningQuest().SetCurrentStageID(530)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__02019fb2.psc b/source/scripts/tif__02019fb2.psc
index 8963371f..5b7eeb80 100644
--- a/source/scripts/tif__02019fb2.psc
+++ b/source/scripts/tif__02019fb2.psc
@@ -6,7 +6,7 @@ Scriptname TIF__02019FB2 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(540)
+GetOwningQuest().SetCurrentStageID(540)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0201a9ca.psc b/source/scripts/tif__0201a9ca.psc
index 9d90ba8b..fb30f1f1 100644
--- a/source/scripts/tif__0201a9ca.psc
+++ b/source/scripts/tif__0201a9ca.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0201A9CA Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(350)
+GetOwningQuest().SetCurrentStageID(350)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0201a9cc.psc b/source/scripts/tif__0201a9cc.psc
index 88112643..f59c3301 100644
--- a/source/scripts/tif__0201a9cc.psc
+++ b/source/scripts/tif__0201a9cc.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0201A9CC Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(360)
+GetOwningQuest().SetCurrentStageID(360)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0201a9eb.psc b/source/scripts/tif__0201a9eb.psc
index 7d30d817..db483884 100644
--- a/source/scripts/tif__0201a9eb.psc
+++ b/source/scripts/tif__0201a9eb.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0201A9EB Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(500)
+GetOwningQuest().SetCurrentStageID(500)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0201a9f0.psc b/source/scripts/tif__0201a9f0.psc
index 0119348f..d805892a 100644
--- a/source/scripts/tif__0201a9f0.psc
+++ b/source/scripts/tif__0201a9f0.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0201A9F0 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(370)
+GetOwningQuest().SetCurrentStageID(370)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0201db37.psc b/source/scripts/tif__0201db37.psc
index 4826d311..b380a220 100644
--- a/source/scripts/tif__0201db37.psc
+++ b/source/scripts/tif__0201db37.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0201DB37 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(560)
+GetOwningQuest().SetCurrentStageID(560)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0201db3f.psc b/source/scripts/tif__0201db3f.psc
index 36d62152..b0b3d15e 100644
--- a/source/scripts/tif__0201db3f.psc
+++ b/source/scripts/tif__0201db3f.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0201DB3F Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(570)
+GetOwningQuest().SetCurrentStageID(570)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0201f9a8.psc b/source/scripts/tif__0201f9a8.psc
index 965ff1d7..ad052f5f 100644
--- a/source/scripts/tif__0201f9a8.psc
+++ b/source/scripts/tif__0201f9a8.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0201F9A8 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(390)
+GetOwningQuest().SetCurrentStageID(390)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0201f9c9.psc b/source/scripts/tif__0201f9c9.psc
index 29e8aa6e..f40c784b 100644
--- a/source/scripts/tif__0201f9c9.psc
+++ b/source/scripts/tif__0201f9c9.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0201F9C9 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(400)
+GetOwningQuest().SetCurrentStageID(400)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/tif__0201f9d5.psc b/source/scripts/tif__0201f9d5.psc
index 4ed57902..b33f462e 100644
--- a/source/scripts/tif__0201f9d5.psc
+++ b/source/scripts/tif__0201f9d5.psc
@@ -6,7 +6,7 @@ Scriptname TIF__0201F9D5 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-GetOwningQuest().SetStage(410)
+GetOwningQuest().SetCurrentStageID(410)
 ;END CODE
 EndFunction
 ;END FRAGMENT
diff --git a/source/scripts/webdestructiblescript.psc b/source/scripts/webdestructiblescript.psc
index 7cd2253a..cbdbf505 100644
--- a/source/scripts/webdestructiblescript.psc
+++ b/source/scripts/webdestructiblescript.psc
@@ -30,7 +30,7 @@ Event OnDestructionStageChanged(int aiOldStage, int aiCurrentStage)
 	
 	if(aiCurrentStage == 1)
 		if(myQuest)
-			myQuest.setStage(myQuestStageOnFirstStage)
+			myQuest.SetCurrentStageID(myQuestStageOnFirstStage)
 			;if there is a scene to start, then start the scene
 		endif
 		
@@ -58,7 +58,7 @@ Event OnDestructionStageChanged(int aiOldStage, int aiCurrentStage)
 		
 		;if there is a quest to manipulate, then set the stage
 		if(myQuest)
-			myQuest.setStage(myQuestStageOnDestroyed)
+			myQuest.SetCurrentStageID(myQuestStageOnDestroyed)
 		endif
 		
 		;if there is a scene to start, then start the scene