diff --git a/achievements.lst b/achievements.lst index 0c4835dfa..02ee63068 100644 --- a/achievements.lst +++ b/achievements.lst @@ -13,7 +13,7 @@ allcoll,-1,no,any allitems,30,yes,nothexen allkills,30,yes,nothexen allsecrets,30,yes,nothexen -#allweapons,-21,yes,any +#allweapons,-20,yes,any anom,10,yes,any anone,0,no,any #ara,100,yes,any diff --git a/cvarinfo.base b/cvarinfo.base index 32d5aa20a..7da4c513d 100644 --- a/cvarinfo.base +++ b/cvarinfo.base @@ -123,6 +123,7 @@ nosave bool swwm_voicelog = false; // adds player voicelines to the message log nosave bool swwm_skipskill = false; // skips skill confirmations nosave bool swwm_hudtrimammo = false; // only show ammo for owned weapons nosave bool swwm_hudmugshot = true; // show an animated mugshot in the hud +nosave bool swwm_nointroex = false; // does not play the "explosions" intro sequence // minimap settings nosave bool swwm_mm_enable = true; // show a minimap below the score counter diff --git a/language.def_menu b/language.def_menu index 272c1f1b8..27f2e3aa0 100644 --- a/language.def_menu +++ b/language.def_menu @@ -209,6 +209,7 @@ SWWM_VOICELOG = "Log Player Comments"; SWWM_SKIPSKILL = "Skip Skill Confirmation"; SWWM_HUDTRIMAMMO = "Trim Ammo List"; SWWM_HUDMUGSHOT = "Face In HUD"; +SWWM_NOINTROEX = "Skip Intro Explosions"; SWWM_MM_ENABLE = "Show Minimap"; SWWM_MM_MISSILES = "Projectiles In Minimap"; SWWM_MM_COLORSET = "Minimap Color Set"; @@ -348,6 +349,7 @@ TOOLTIP_SWWM_VOICELOG = "Subtitled player comments will be saved to the Messages TOOLTIP_SWWM_SKIPSKILL = "Skips confirmation of skill selection, if you get tired of seeing it every time."; TOOLTIP_SWWM_HUDTRIMAMMO = "Only shows ammo for currently carried weapons in the HUD."; TOOLTIP_SWWM_HUDMUGSHOT = "Shows the Demolitionist's face in the HUD, for a more classic touch."; +TOOLTIP_SWWM_NOINTROEX = "Skips the explosion sequence over the original titlepic."; TOOLTIP_SWWMMINIMAPMENU = "Configure the minimap."; TOOLTIP_SWWMACHIEVEMENTMENU = "View your achievements."; TOOLTIP_SWWM_MM_ENABLE = "Displays a minimap under the score counter."; diff --git a/language.es_menu b/language.es_menu index 186c2d68e..a11685b10 100644 --- a/language.es_menu +++ b/language.es_menu @@ -208,6 +208,7 @@ SWWM_VOICELOG = "Registrar Comentarios de Jugador"; SWWM_SKIPSKILL = "Saltar Confirmación de Dificultad"; SWWM_HUDTRIMAMMO = "Recortar Lista de Munición"; SWWM_HUDMUGSHOT = "Rostro en el HUD"; +SWWM_NOINTROEX = "Saltar Intro de Explosiones"; SWWM_MM_ENABLE = "Mostrar Minimapa"; SWWM_MM_MISSILES = "Proyectiles en Minimapa"; SWWM_MM_COLORSET = "Set de Colores de Minimapa"; @@ -352,6 +353,7 @@ TOOLTIP_SWWM_VOICELOG = "Los comentarios de jugador subtitulados se guardarán e TOOLTIP_SWWM_SKIPSKILL = "Salta la confirmación de selección de dificultad, si te has cansado de verla todo el tiempo."; TOOLTIP_SWWM_HUDTRIMAMMO = "Muestra solo la munición de las armas obtenidas en el HUD."; TOOLTIP_SWWM_HUDMUGSHOT = "Muestra el rostro de la Demolicionista en el HUD, para un toque más clásico."; +TOOLTIP_SWWM_NOINTROEX = "Salta la secuencia de explosiones sobre la imagen de título original."; TOOLTIP_SWWMMINIMAPMENU = "Configura el minimapa."; TOOLTIP_SWWMACHIEVEMENTMENU = "Revisa tus logros."; TOOLTIP_SWWM_MM_ENABLE = "Muestra un minimapa bajo el contador de puntuación."; diff --git a/language.version b/language.version index bd20d7b6a..f4b538146 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r178 \cu(Thu 14 Jul 20:39:14 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r178 \cu(2022-07-14 20:39:14)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r179 \cu(Fri 15 Jul 08:05:08 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r179 \cu(2022-07-15 08:05:08)\c-"; diff --git a/menudef.txt b/menudef.txt index a348bc33e..20826dbbc 100644 --- a/menudef.txt +++ b/menudef.txt @@ -173,6 +173,7 @@ OptionMenu "SWWMOptionMenu" Option "$SWWM_NOINTERTIPS", "swwm_nointertips", "YesNo" Option "$SWWM_INTERMUSIC", "swwm_intermusic", "YesNo" } + Option "$SWWM_NOINTROEX", "swwm_nointroex", "YesNo" Option "$SWWM_FUZZ", "swwm_fuzz", "YesNo" IfGame(Doom, Heretic) { diff --git a/zscript/menu/swwm_title.zsc b/zscript/menu/swwm_title.zsc index 81bd3a7d1..8a56b2863 100644 --- a/zscript/menu/swwm_title.zsc +++ b/zscript/menu/swwm_title.zsc @@ -64,7 +64,7 @@ Class SWWMTitleStuff : EventHandler } if ( !smk[i].bInit ) continue; if ( (smk[i].frame == 0) && (titletimer < -20 ) ) - S_StartSound("title/explo",CHAN_WEAPON,CHANF_UI|CHANF_OVERLAP,1.,ATTN_NONE,FRandom[UIStuff](.95,1.05)); + S_StartSound("title/explo",CHAN_WEAPON,CHANF_UI|CHANF_OVERLAP,.35,ATTN_NONE,FRandom[UIStuff](.95,1.05)); smk[i].frame++; } } @@ -109,6 +109,7 @@ Class SWWMTitleStuff : EventHandler shnd.titlefirst = true; } } + if ( swwm_nointroex && (titletimer >= -300) && (titletimer < 0) ) titletimer = 0; if ( titletimer == -250 ) { if ( gameinfo.gametype&GAME_Hexen ) S_ChangeMusic("HEXEN");