diff --git a/language.version b/language.version index 12fff15aa..e674b4a63 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r943 \cu(Fri 25 Aug 23:53:16 CEST 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r943 \cu(2023-08-25 23:53:16)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r944 \cu(Sat 26 Aug 18:41:52 CEST 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r944 \cu(2023-08-26 18:41:52)\c-"; diff --git a/zscript/hud/swwm_dialogue.zsc b/zscript/hud/swwm_dialogue.zsc index c32625fa7..92fe2d045 100644 --- a/zscript/hud/swwm_dialogue.zsc +++ b/zscript/hud/swwm_dialogue.zsc @@ -258,6 +258,13 @@ Class SWWMDialogues abstract msg.delay = 40; StatusBar.AttachMessage(msg,-1232); break; + } + } + private static ui void StartSeq_SubC( int dlg ) + { + SWWMDirectMessage msg, msg2; + switch ( dlg ) + { case SWWMDLG_GREET: msg = new("SWWMDirectMessage").Init(StringTable.Localize("$SWWM_SAYASNAME"),StringTable.Localize("$SWWM_SAYANAME"),"Saya"); msg.seqname = "SAYAGREETA"; @@ -438,6 +445,13 @@ Class SWWMDialogues abstract msg.nextmsg = msg2; msg.nextdirect = true; break; + } + } + private static ui void StartSeq_SubD( int dlg ) + { + SWWMDirectMessage msg, msg2; + switch ( dlg ) + { case SWWMDLG_FIGHTER: msg = new("SWWMDirectMessage").Init(StringTable.Localize("$SWWM_SAYASNAME"),StringTable.Localize("$SWWM_SAYANAME"),"Saya"); msg.seqname = "SAYAFIGHTER"; @@ -506,6 +520,13 @@ Class SWWMDialogues abstract msg.nextmsg = msg2; msg.nextdirect = true; break; + } + } + private static ui void StartSeq_SubE( int dlg ) + { + SWWMDirectMessage msg, msg2; + switch ( dlg ) + { case SWWMDLG_BLIGHT: msg = new("SWWMDirectMessage").Init(StringTable.Localize("$SWWM_SAYASNAME"),StringTable.Localize("$SWWM_SAYANAME"),"Saya"); msg.seqname = "SAYABLIGHTA"; @@ -605,7 +626,7 @@ Class SWWMDialogues abstract break; } } - private static ui void StartSeq_SubC( int dlg ) + private static ui void StartSeq_SubF( int dlg ) { SWWMDirectMessage msg, msg2; switch ( dlg ) @@ -754,6 +775,13 @@ Class SWWMDialogues abstract msg.nextmsg = msg2; msg.nextdirect = true; break; + } + } + private static ui void StartSeq_SubG( int dlg ) + { + SWWMDirectMessage msg, msg2; + switch ( dlg ) + { case SWWMDLG_CHEATS: msg = new("SWWMDirectMessage").Init(StringTable.Localize("$SWWM_ZNVSNAME"),StringTable.Localize("$SWWM_ZNVNAME"),"Znv"); msg.seqname = "ZNVTXT"; @@ -883,7 +911,7 @@ Class SWWMDialogues abstract break; } } - private static ui void StartSeq_SubD( int dlg ) + private static ui void StartSeq_SubH( int dlg ) { SWWMDirectMessage msg, msg2; switch ( dlg ) @@ -1022,8 +1050,12 @@ Class SWWMDialogues abstract { if ( swwm_nomapmsg ) return; if ( dlg < SWWMDLG_MAW ) StartSeq_SubA(dlg); - else if ( dlg < SWWMDLG_PUZZLE1 ) StartSeq_SubB(dlg); - else if ( dlg < SWWMDLG_FOOL ) StartSeq_SubC(dlg); - else StartSeq_SubD(dlg); + else if ( dlg < SWWMDLG_GREET ) StartSeq_SubB(dlg); + else if ( dlg < SWWMDLG_FIGHTER ) StartSeq_SubC(dlg); + else if ( dlg < SWWMDLG_BLIGHT ) StartSeq_SubD(dlg); + else if ( dlg < SWWMDLG_PUZZLE1 ) StartSeq_SubE(dlg); + else if ( dlg < SWWMDLG_CHEATS ) StartSeq_SubF(dlg); + else if ( dlg < SWWMDLG_FOOL ) StartSeq_SubG(dlg); + else StartSeq_SubH(dlg); } }