diff --git a/language.def_voice b/language.def_voice index 294b88236..7d397d190 100644 --- a/language.def_voice +++ b/language.def_voice @@ -471,6 +471,8 @@ SWWM_SUBS_DEFAULT_NSMOOCH = "3"; SWWM_SUBS_DEFAULT_SMOOCH1 = "Smoochies~"; SWWM_SUBS_DEFAULT_SMOOCH2 = "$$SWWM_SUBS_DEFAULT_SMOOCH1"; // all subtitles are the same here, only the sound changes SWWM_SUBS_DEFAULT_SMOOCH3 = "$$SWWM_SUBS_DEFAULT_SMOOCH1"; +// Sunlust MAP29 +SWWM_SUBS_DEFAULT_LUSTYSUNS = "Wait... What did that say?"; // Randomization ranges for other voices SWWM_DEFAULT_NGRUNT = "5"; SWWM_DEFAULT_NUSEGRUNT = "4"; diff --git a/language.es_voice b/language.es_voice index d91bc1056..1aea1a21a 100644 --- a/language.es_voice +++ b/language.es_voice @@ -411,3 +411,5 @@ SWWM_SUBS_DEFAULT_MIRROR9 = "En serio debería intentar no romper esto."; SWWM_SUBS_DEFAULT_MIRROR10 = "La verdad es que me gusta mirarme... Tampoco es que sea algo malo o tal."; // Kiss hit SWWM_SUBS_DEFAULT_SMOOCH1 = "Besitos~"; +// Sunlust MAP29 +SWWM_SUBS_DEFAULT_LUSTYSUNS = "Espera... ¿Que ponía ahí?"; diff --git a/language.version b/language.version index 3f3990f93..bee360536 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r939 \cu(Wed 23 Aug 17:25:39 CEST 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r939 \cu(2023-08-23 17:25:39)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r940 \cu(Fri 25 Aug 15:10:13 CEST 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r940 \cu(2023-08-25 15:10:13)\c-"; diff --git a/sndinfo.defvoice b/sndinfo.defvoice index 61cd9e2ea..6dcd59653 100644 --- a/sndinfo.defvoice +++ b/sndinfo.defvoice @@ -424,3 +424,4 @@ voice/default/mirror10 = "sounds/voice/default/va/demomirror10.ogg" voice/default/smooch1 = "sounds/voice/default/va/demosmooch1.ogg" voice/default/smooch2 = "sounds/voice/default/va/demosmooch2.ogg" voice/default/smooch3 = "sounds/voice/default/va/demosmooch3.ogg" +voice/default/lustysuns = "sounds/voice/default/va/demolustysuns.ogg" diff --git a/sounds/voice/default/va/demolustysuns.ogg b/sounds/voice/default/va/demolustysuns.ogg new file mode 100644 index 000000000..1ec3f5680 Binary files /dev/null and b/sounds/voice/default/va/demolustysuns.ogg differ diff --git a/zscript/handler/swwm_handler_process.zsc b/zscript/handler/swwm_handler_process.zsc index 0a1b6b570..06b417077 100644 --- a/zscript/handler/swwm_handler_process.zsc +++ b/zscript/handler/swwm_handler_process.zsc @@ -512,6 +512,11 @@ extend Class SWWMHandler rslt = true; // switching to dual gun S_StartSound(rslt?"menu/demosel":"menu/democlose",CHAN_AUTO,CHANF_UI); } + else if ( e.Name ~== "swwmlustysuns" ) + { + if ( consoleplayer != e.Args[0] ) return; + AddOneliner("lustysuns",3,15); + } // cheats go here else CheatEvent(e); } diff --git a/zscript/hud/swwm_hudextra.zsc b/zscript/hud/swwm_hudextra.zsc index d7dc86e44..d21bbf087 100644 --- a/zscript/hud/swwm_hudextra.zsc +++ b/zscript/hud/swwm_hudextra.zsc @@ -836,6 +836,8 @@ Class DSMapTitle : HUDMessageBase { if ( !bDontDeleteMe ) return true; if ( tics == 0 ) S_StartSound("misc/newarea",CHAN_VOICE,CHANF_UI,pitch:.75); // dunno why the source file is pitched up + if ( (tics == holdtics+fadeintics) && (txt == "Go Fuck Yourself") ) // Sunlust MAP29 + Eventhandler.SendNetworkEvent("swwmlustysuns",consoleplayer); return (++tics > holdtics+fadeintics+fadeouttics); }