diff --git a/_work/Data/Scripts/Content/Story/B_Story/miscFuncs.d b/_work/Data/Scripts/Content/Story/B_Story/miscFuncs.d index 6eebf736..097a3d7c 100644 --- a/_work/Data/Scripts/Content/Story/B_Story/miscFuncs.d +++ b/_work/Data/Scripts/Content/Story/B_Story/miscFuncs.d @@ -1702,7 +1702,7 @@ var int Autosave_Counter; var int Autosave_Blocker; var int saveSlot; -FUNC VOID B_Autosave() +FUNC VOID Mahlendur_Autosave() { saveSlot = 0; const int CGameManager__Write_Savegame = 4367056; //0x42A2D0 @@ -1821,7 +1821,6 @@ func void ZS_Bekher_Teleport() { }; - func void BlackScreenStart() { const int blendAdded = 0; //MEM_InfoBox("BlackScreenStart aufgerufen!"); @@ -1850,8 +1849,10 @@ func void PlayScreenBlend2() { ScreenFadeExt(500, 500, 7000); }; + func void MonologWeltenwechsel() { Set_MainSubtitleCondition(false, false); + Npc_ClearAIQueue(hero); AI_StandUpQuick(hero); AI_Function(hero, PlayScreenBlend); AI_Output (hero, hero, "MONOLOG_WECHSEL_01"); //Oooor... Mein Schädel... @@ -1899,7 +1900,7 @@ func void startChangeLevel_ZW2 () { TRIA_Finish(); _TRIA_Finish(); end; - PrintS("Dialogzustand beendet!"); + //PrintS("Dialogzustand beendet!"); changedWorldAftVid = TRUE; //AI_StartState(hero, ChangeLevel_ZW2, 1, ""); AI_Teleport(hero, "WP_LVLCHANGE_000"); diff --git a/_work/Data/Scripts/Content/Story/B_Story/miscFuncs2.d b/_work/Data/Scripts/Content/Story/B_Story/miscFuncs2.d index f980fbce..aa4dea32 100644 --- a/_work/Data/Scripts/Content/Story/B_Story/miscFuncs2.d +++ b/_work/Data/Scripts/Content/Story/B_Story/miscFuncs2.d @@ -29,7 +29,7 @@ func void startCutscene_Bekher () { && (trigAct == FALSE)) { //AI_Teleport(Bekher, "ZW_WP_003"); //PrintS("Trigger aktiviert und richtiger NPC!"); - B_Autosave(); + Mahlendur_Autosave(); Npc_SetAttitude(other, Wld_GetGuildAttitude(other.guild, self.guild)); AI_PlayAni(Bekher, "T_STAND_2_SUCKENERGY_VICTIM"); AI_Wait(Bekher, 3); diff --git a/_work/Data/Scripts/Content/Story/Dialoge/TRIA_GROUP.d b/_work/Data/Scripts/Content/Story/Dialoge/TRIA_GROUP.d index e3e9a136..83923631 100644 --- a/_work/Data/Scripts/Content/Story/Dialoge/TRIA_GROUP.d +++ b/_work/Data/Scripts/Content/Story/Dialoge/TRIA_GROUP.d @@ -506,7 +506,7 @@ func int TRIA_GROUP_05_cond() func void TRIA_GROUP_05_info() { - B_Autosave(); + Mahlendur_Autosave(); var C_NPC Thirala; Thirala = Hlp_GetNpc(KDW_14009_Thirala); var C_NPC Zaphina; Zaphina = Hlp_GetNpc(BAU_241_Zaphina); diff --git a/_work/Data/Scripts/Content/Story/Dialoge/TRIA_GROUP_ZW.d b/_work/Data/Scripts/Content/Story/Dialoge/TRIA_GROUP_ZW.d index 037de810..75262aa9 100644 --- a/_work/Data/Scripts/Content/Story/Dialoge/TRIA_GROUP_ZW.d +++ b/_work/Data/Scripts/Content/Story/Dialoge/TRIA_GROUP_ZW.d @@ -36,6 +36,7 @@ func void TRIA_GROUP_ZW_01_info() TRIA_Start(); TRIA_Next(Bekher); + AI_Output(self, other, "TRIA_GROUP_ZW_01_BEKHER_01"); //Dann habt ihr es also tatsächlich geschafft. AI_RemoveWeapon(self); AI_TurnToNpc(hero, Bekher); diff --git a/_work/Data/Scripts/_compiled/FIGHT.DAT b/_work/Data/Scripts/_compiled/FIGHT.DAT index ec9017c4..95d4f0ff 100644 Binary files a/_work/Data/Scripts/_compiled/FIGHT.DAT and b/_work/Data/Scripts/_compiled/FIGHT.DAT differ diff --git a/_work/Data/Scripts/_compiled/GOTHIC.DAT b/_work/Data/Scripts/_compiled/GOTHIC.DAT index 851a65be..af13a5fd 100644 Binary files a/_work/Data/Scripts/_compiled/GOTHIC.DAT and b/_work/Data/Scripts/_compiled/GOTHIC.DAT differ diff --git a/_work/Data/Scripts/_compiled/MENU.DAT b/_work/Data/Scripts/_compiled/MENU.DAT index 8cc5cedf..50df4cfd 100644 Binary files a/_work/Data/Scripts/_compiled/MENU.DAT and b/_work/Data/Scripts/_compiled/MENU.DAT differ diff --git a/_work/Data/Scripts/_compiled/MUSIC.DAT b/_work/Data/Scripts/_compiled/MUSIC.DAT index 875a5d3f..80f5bde0 100644 Binary files a/_work/Data/Scripts/_compiled/MUSIC.DAT and b/_work/Data/Scripts/_compiled/MUSIC.DAT differ diff --git a/_work/Data/Scripts/_compiled/PARTICLEFX.DAT b/_work/Data/Scripts/_compiled/PARTICLEFX.DAT index 264bde92..ae880b3e 100644 Binary files a/_work/Data/Scripts/_compiled/PARTICLEFX.DAT and b/_work/Data/Scripts/_compiled/PARTICLEFX.DAT differ diff --git a/_work/Data/Scripts/_compiled/SFX.DAT b/_work/Data/Scripts/_compiled/SFX.DAT index 30c40b88..b8e7eca2 100644 Binary files a/_work/Data/Scripts/_compiled/SFX.DAT and b/_work/Data/Scripts/_compiled/SFX.DAT differ diff --git a/_work/Data/Scripts/_compiled/VISUALFX.DAT b/_work/Data/Scripts/_compiled/VISUALFX.DAT index 5e6197e8..5ba22b56 100644 Binary files a/_work/Data/Scripts/_compiled/VISUALFX.DAT and b/_work/Data/Scripts/_compiled/VISUALFX.DAT differ diff --git a/_work/tools/zSpy/zSPYdefault.cfg b/_work/tools/zSpy/zSPYdefault.cfg index 9f820ac7..725df57a 100644 Binary files a/_work/tools/zSpy/zSPYdefault.cfg and b/_work/tools/zSpy/zSPYdefault.cfg differ