diff --git a/Tools/MirandaDialogCreator.jar b/Tools/MirandaDialogCreator.jar new file mode 100644 index 00000000..bf27b886 Binary files /dev/null and b/Tools/MirandaDialogCreator.jar differ diff --git a/Tools/Redefix/Doppelt.txt b/Tools/Redefix/Doppelt.txt new file mode 100644 index 00000000..f5e3576a --- /dev/null +++ b/Tools/Redefix/Doppelt.txt @@ -0,0 +1,5 @@ +DIA_Herold_Announce_04_00 +DIA_Herold_Announce_04_02 +DIA_Herold_Announce_04_09 +DIA_Herold_Announce_04_09 +TRIA_GROUP_06_Kelsava_02 diff --git a/Tools/Redefix/Settings.xml b/Tools/Redefix/Settings.xml new file mode 100644 index 00000000..8208d7a4 --- /dev/null +++ b/Tools/Redefix/Settings.xml @@ -0,0 +1,18 @@ + + + C:\DGvM + C:\DGvM\_work\Data\Scripts\Content\Gothic.src + OU + False + True + True + 123|False|False|False + 2 + False + + + 15 + 1 + 30 + 0 + \ No newline at end of file diff --git a/Tools/Redefix/Wavs/Redefix_WAV_1.wav b/Tools/Redefix/Wavs/Redefix_WAV_1.wav new file mode 100644 index 00000000..92f06716 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_1.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_10.wav b/Tools/Redefix/Wavs/Redefix_WAV_10.wav new file mode 100644 index 00000000..153d0ba9 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_10.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_11.wav b/Tools/Redefix/Wavs/Redefix_WAV_11.wav new file mode 100644 index 00000000..05c205e8 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_11.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_12.wav b/Tools/Redefix/Wavs/Redefix_WAV_12.wav new file mode 100644 index 00000000..7c60f41d Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_12.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_13.wav b/Tools/Redefix/Wavs/Redefix_WAV_13.wav new file mode 100644 index 00000000..638d8840 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_13.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_14.wav b/Tools/Redefix/Wavs/Redefix_WAV_14.wav new file mode 100644 index 00000000..ea191324 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_14.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_15.wav b/Tools/Redefix/Wavs/Redefix_WAV_15.wav new file mode 100644 index 00000000..37ff16bf Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_15.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_16.wav b/Tools/Redefix/Wavs/Redefix_WAV_16.wav new file mode 100644 index 00000000..15e0a0fb Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_16.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_17.wav b/Tools/Redefix/Wavs/Redefix_WAV_17.wav new file mode 100644 index 00000000..2fafbe7e Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_17.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_18.wav b/Tools/Redefix/Wavs/Redefix_WAV_18.wav new file mode 100644 index 00000000..6cf2095a Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_18.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_19.wav b/Tools/Redefix/Wavs/Redefix_WAV_19.wav new file mode 100644 index 00000000..12846f03 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_19.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_2.wav b/Tools/Redefix/Wavs/Redefix_WAV_2.wav new file mode 100644 index 00000000..4c66026f Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_2.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_20.wav b/Tools/Redefix/Wavs/Redefix_WAV_20.wav new file mode 100644 index 00000000..2249a685 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_20.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_21.wav b/Tools/Redefix/Wavs/Redefix_WAV_21.wav new file mode 100644 index 00000000..c0f3d059 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_21.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_22.wav b/Tools/Redefix/Wavs/Redefix_WAV_22.wav new file mode 100644 index 00000000..d0855024 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_22.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_23.wav b/Tools/Redefix/Wavs/Redefix_WAV_23.wav new file mode 100644 index 00000000..059abe3c Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_23.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_24.wav b/Tools/Redefix/Wavs/Redefix_WAV_24.wav new file mode 100644 index 00000000..e62124be Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_24.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_25.wav b/Tools/Redefix/Wavs/Redefix_WAV_25.wav new file mode 100644 index 00000000..9ae294ac Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_25.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_26.wav b/Tools/Redefix/Wavs/Redefix_WAV_26.wav new file mode 100644 index 00000000..d889f90a Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_26.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_27.wav b/Tools/Redefix/Wavs/Redefix_WAV_27.wav new file mode 100644 index 00000000..953d034f Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_27.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_28.wav b/Tools/Redefix/Wavs/Redefix_WAV_28.wav new file mode 100644 index 00000000..030dbdf3 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_28.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_29.wav b/Tools/Redefix/Wavs/Redefix_WAV_29.wav new file mode 100644 index 00000000..24d26f16 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_29.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_3.wav b/Tools/Redefix/Wavs/Redefix_WAV_3.wav new file mode 100644 index 00000000..9e446704 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_3.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_30.wav b/Tools/Redefix/Wavs/Redefix_WAV_30.wav new file mode 100644 index 00000000..1120ad30 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_30.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_4.wav b/Tools/Redefix/Wavs/Redefix_WAV_4.wav new file mode 100644 index 00000000..945265a7 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_4.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_5.wav b/Tools/Redefix/Wavs/Redefix_WAV_5.wav new file mode 100644 index 00000000..3b66a491 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_5.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_6.wav b/Tools/Redefix/Wavs/Redefix_WAV_6.wav new file mode 100644 index 00000000..b51422b8 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_6.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_7.wav b/Tools/Redefix/Wavs/Redefix_WAV_7.wav new file mode 100644 index 00000000..f4ad1818 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_7.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_8.wav b/Tools/Redefix/Wavs/Redefix_WAV_8.wav new file mode 100644 index 00000000..df20d633 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_8.wav differ diff --git a/Tools/Redefix/Wavs/Redefix_WAV_9.wav b/Tools/Redefix/Wavs/Redefix_WAV_9.wav new file mode 100644 index 00000000..a3f21706 Binary files /dev/null and b/Tools/Redefix/Wavs/Redefix_WAV_9.wav differ diff --git a/_work/Data/Scripts/Content/Story/B_Story/miscFuncs.d b/_work/Data/Scripts/Content/Story/B_Story/miscFuncs.d index 4b3ec72c..509275d8 100644 --- a/_work/Data/Scripts/Content/Story/B_Story/miscFuncs.d +++ b/_work/Data/Scripts/Content/Story/B_Story/miscFuncs.d @@ -1655,6 +1655,8 @@ func void ZS_RitualLevelchange () { var C_NPC Kelsava; Kelsava = Hlp_GetNpc(KDF_1409_Kelsava); var C_NPC Thirala; Thirala = Hlp_GetNpc(KDW_14009_Thirala); var C_NPC Fyneia; Fyneia = Hlp_GetNpc(VLK_4007_Fyneia); + + //AI_StopProcessInfos(hero); //TRIA_Cam("RITUALCAM"); AI_PlayAni (Kelsava,"T_PRACTICEMAGIC5"); AI_PlayAni (Kelsava,"T_PRACTICEMAGIC5"); @@ -1692,7 +1694,7 @@ func void startRitualChange() { Npc_ClearAIQueue(KDF_1409_Kelsava); Npc_ClearAIQueue(KDW_14009_Thirala); Npc_ClearAIQueue(VLK_4007_Fyneia); - AI_StartState(hero, ZS_RitualLevelchange, 1, ""); + AI_StartState(KDF_1409_Kelsava, ZS_RitualLevelchange, 1, ""); }; var int Autosave_Counter; @@ -1719,6 +1721,8 @@ func void ZS_RitualLevelchange2 () { var C_NPC Thirala; Thirala = Hlp_GetNpc(KDW_14009_Thirala); var C_NPC Fyneia; Fyneia = Hlp_GetNpc(VLK_4007_Fyneia); var C_NPC Zaphina; Zaphina = Hlp_GetNpc(BAU_241_Zaphina); + + AI_StopProcessInfos(self); //TRIA_Cam("RITUALCAM"); AI_AlignToWP(Kelsava); AI_AlignToWP(Thirala); @@ -1791,7 +1795,7 @@ func void startRitualChange2() { Npc_ClearAIQueue(KDW_14009_Thirala); Npc_ClearAIQueue(VLK_4007_Fyneia); Npc_ClearAIQueue(BAU_241_Zaphina); - AI_StartState(hero, ZS_RitualLevelchange2, 1, ""); + AI_StartState(KDF_1409_Kelsava, ZS_RitualLevelchange2, 1, ""); }; @@ -1861,6 +1865,7 @@ func void ChangeLevel_ZW () { func void ChangeLevel_ZW2 () { changedWorldAftVid = TRUE; + AI_StopProcessInfos(hero); AI_Function_SS(self, ChangeLevel, "MAHLENDUR\MAHLENDUR.ZEN", "NW_TROLLAREA_RITUAL_06"); AI_StopProcessInfos(hero); }; diff --git a/_work/Data/Scripts/Content/Story/Dialoge/DIA_KDF_1409_Kelsava.D b/_work/Data/Scripts/Content/Story/Dialoge/DIA_KDF_1409_Kelsava.D index e08f84ed..60bd9bcb 100644 --- a/_work/Data/Scripts/Content/Story/Dialoge/DIA_KDF_1409_Kelsava.D +++ b/_work/Data/Scripts/Content/Story/Dialoge/DIA_KDF_1409_Kelsava.D @@ -675,7 +675,7 @@ func void KDF_1409_Kelsava_doTheRitual2_Info() AI_TurnToNPC(hero, self); AI_TurnToNPC(self, hero); AI_StopProcessInfos(self); - startRitualChange(); + AI_Function(self, startRitualChange); }; // ************************************************** diff --git a/_work/Data/Scripts/Content/Story/Dialoge/TRIA_GROUP.d b/_work/Data/Scripts/Content/Story/Dialoge/TRIA_GROUP.d index 81c3933d..5de2e365 100644 --- a/_work/Data/Scripts/Content/Story/Dialoge/TRIA_GROUP.d +++ b/_work/Data/Scripts/Content/Story/Dialoge/TRIA_GROUP.d @@ -547,7 +547,7 @@ func void TRIA_GROUP_05_info() AI_StopProcessInfos(self); - AI_Function(hero, startRitualChange2); + AI_Function(self, startRitualChange2); groupWentWorld = TRUE; }; @@ -742,5 +742,5 @@ func void TRIA_GROUP_07_info() TRIA_Finish(); AI_StopProcessInfos(self); - AI_Function(hero, startRitualChange2); + AI_Function(self, startRitualChange2); }; \ No newline at end of file diff --git a/_work/Data/Scripts/_compiled/FIGHT.DAT b/_work/Data/Scripts/_compiled/FIGHT.DAT index 0e6103ac..3acab3c6 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 aa387c63..fb7f23da 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 f5a7312b..904904df 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 d747faf0..5a37e929 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 c7bff29f..956b837d 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 5a569acd..5872efcc 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 c119547b..2a098e69 100644 Binary files a/_work/Data/Scripts/_compiled/VISUALFX.DAT and b/_work/Data/Scripts/_compiled/VISUALFX.DAT differ diff --git a/miranda/Kelsava.dia b/miranda/Kelsava.dia index 6c4ab8a2..361cd05d 100644 --- a/miranda/Kelsava.dia +++ b/miranda/Kelsava.dia @@ -289,7 +289,7 @@ conddia: doTheRitual1 !AI_TurnToNPC(hero, self); !AI_TurnToNPC(self, hero); $END -!startRitualChange(); +!AI_Function(self, startRitualChange); info: youreBack conddia: NONE_10000_Hueter, hesGone