New map clear track courtesy of Bouncy.

credits.txt

@@ -22,7 +22,7 @@ Most of the work here is original, but there are some notable exceptions:
  - Intermission theme, "Dragony", also by Teque (very comfy music considering the rest of his repertoire).
  - Startup/credits theme, "Hidden Tune #242", also by Teque too (super comfy music, ideal for this use).
  - Kinsie's Test Map theme, "Hypercardish 1.1", ALSO TOO by Teque (seems nice for such an use I guess).
- - "Calm" theme taken from .flow, by lol (really damn good Yume Nikki fangame, by the way).
+ - Clear theme, "Solitary Apprehension", by BouncyTEM (made specifically for the mod).
  - The anti-BD feature uses art and music by IOSYS, art was edited into the Doom palette.
  - The crash handler uses a short clip of the Curb Your Enthusiasm theme.
  - Tewi font by lucy (https://github.com/lucy/tewi-font). Modified to add gradients and drop shadow.

cvarinfo.txt

@@ -88,7 +88,7 @@ nosave bool swwm_rageshader = false;		// alternate ragekit shader for people wit
 server bool swwm_uncapalert = false;		// all noise alerts have infinite range
 nosave int swwm_damagetarget = 1;		// conditional healthbar hiding (1 - hide until damage is first taken, 2 - hide if at full health)
 server int swwm_strictuntouchable = 0;		// untouchable bonus ends... (1 - even if your armor absorbed all the damage, 2 - if you get hit by anything PERIOD)
-server int swwm_silencemap = 0;			// silences the map when all kills/items/secrets are achieved (2 - play calm music)
+server bool swwm_silencemap = false;		// silences the map when all kills/items/secrets are achieved
 nosave int swwm_shadowdist = 2000;		// max distance beyond which blob shadows are no longer rendered, helps performance
 server bool swwm_swapweapons = true;		// [DLC1] allows carrying only one weapon in each slot (excluding starter melee)
 nosave int swwm_forcestats = 0;			// always shows level stats on the HUD, not just when the automap is open (2 - also show map name, otherwise only stats)

language.def_menu

@@ -138,9 +138,6 @@ SWWM_UNTOUCHABLE_HEALTH = "Health Decrease";
 SWWM_UNTOUCHABLE_ARMOR = "Armor Decrease";
 SWWM_UNTOUCHABLE_ANYHIT = "Any Hit";
 SWWM_SILENCEMAP = "Cleared Map Music";
-SWWM_SILENCE_KEEP = "Don't Change";
-SWWM_SILENCE_SILENT = "Silence";
-SWWM_SILENCE_CALM = "Calm Track";
 SWWM_SHADOWDIST = "Shadow Distance";
 SWWM_SWAPWEAPONS = "Weapon Swapping";
 SWWM_FORCESTATS = "Always Show Map Stats";
@@ -312,7 +309,7 @@ TOOLTIP_SWWM_UNCAPALERT = "If enabled, all weapons and projectiles will have inf
 TOOLTIP_SWWM_COLLECTANIMKEY = "Play special first person animations when picking up keys.";
 TOOLTIP_SWWM_DAMAGETARGET = "Select when targetter healthbars should be shown.";
 TOOLTIP_SWWM_STRICTUNTOUCHABLE = "By default, the \"Untouchable\" bonus is active until you take direct damage. If you feel this isn't strict enough, you can also make it end if armor absorbs the damage, or, for extra strictness, on ANY hit, even while invulnerable.";
-TOOLTIP_SWWM_SILENCEMAP = "Chooses whether you want music to stop when you 100% a map. A third option is available which switches to a soothing calm track from a game you may recognize if you know me well.";
+TOOLTIP_SWWM_SILENCEMAP = "Chooses whether you want music to stop when you 100% a map.";
 TOOLTIP_SWWM_SHADOWDIST = "Maximum distance at which to show blob shadows. May help performance.";
 TOOLTIP_SWWM_SWAPWEAPONS = "Allow only one weapon per slot (excluding Deep Impact). Disable if you'd rather ignore this puny attempt at balance.";
 TOOLTIP_SWWM_FORCESTATS = "Shows map statistics in the HUD even when the automap isn't open.";

language.es_menu

@@ -138,9 +138,6 @@ SWWM_UNTOUCHABLE_HEALTH = "Baja de Salud";
 SWWM_UNTOUCHABLE_ARMOR = "Baja de Armadura";
 SWWM_UNTOUCHABLE_ANYHIT = "Cualquier Golpe";
 SWWM_SILENCEMAP = "Música de Mapa Despejado";
-SWWM_SILENCE_KEEP = "No Cambiar";
-SWWM_SILENCE_SILENT = "Silencio";
-SWWM_SILENCE_CALM = "Tema Tranquilo";
 SWWM_SHADOWDIST = "Distancia de Sombras";
 SWWM_SWAPWEAPONS = "Alternado de Armas";
 SWWM_FORCESTATS = "Mostrar Siempre Estadísticas de Mapa";
@@ -311,7 +308,7 @@ TOOLTIP_SWWM_UNCAPALERT = "Si se activa, todas las armas y proyectiles tendrán
 TOOLTIP_SWWM_COLLECTANIMKEY = "Muestra animaciones especiales en primera persona al recoger llaves.";
 TOOLTIP_SWWM_DAMAGETARGET = "Selecciona cuando deben mostrarse las barras de vida.";
 TOOLTIP_SWWM_STRICTUNTOUCHABLE = "Por defecto, el bonus \"Intocable\" permanece activo hasta que recibas daño directo. Si sientes que esto no es suficientemente estricto, también puedes hacer que termine si la armadura absorbe el daño, o, para mayor severidad, con CUALQUIER golpe, incluso siendo invulnerable.";
-TOOLTIP_SWWM_SILENCEMAP = "Elige si quieres que la música se detenga cuando completas un mapa al 100%. Hay una tercera opción disponible que cambiará a un relajante tema tranquilo de un juego que podrás reconocer si me conoces bien.";
+TOOLTIP_SWWM_SILENCEMAP = "Elige si quieres que la música se detenga cuando completas un mapa al 100%.";
 TOOLTIP_SWWM_SHADOWDIST = "Distancia máxima a la que mostrar sombras. Puede ayudar al rendimiento.";
 TOOLTIP_SWWM_SWAPWEAPONS = "Permite solo un arma por puesto (excluyendo Deep Impact). Desactiva si prefieres ignorar este intento inútil de balance.";
 TOOLTIP_SWWM_FORCESTATS = "Muestra estadísticas de mapa en el HUD incluso cuando el automapa no está abierto.";

language.version

@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r550 \cu(Mon 21 Jun 09:57:44 CEST 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r550 \cu(2021-06-21 09:57:44)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r551 \cu(Mon 21 Jun 20:54:54 CEST 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r551 \cu(2021-06-21 20:54:54)\c-";

menudef.txt

@@ -30,12 +30,6 @@ OptionValue "SWWMUntouchableStrictness"
 	1, "$SWWM_UNTOUCHABLE_ARMOR"
 	2, "$SWWM_UNTOUCHABLE_ANYHIT"
 }
-OptionValue "SWWMSilenceMap"
-{
-	0, "$SWWM_SILENCE_KEEP"
-	1, "$SWWM_SILENCE_SILENT"
-	2, "$SWWM_SILENCE_CALM"
-}
 OptionValue "SWWMForceStats"
 {
 	0, "$SWWM_STATS_DISABLED"
@@ -134,7 +128,7 @@ OptionMenu "SWWMOptionMenu"
 	Option "$SWWM_INTERART", "swwm_interart", "YesNo"
 	Option "$SWWM_INTERMUSIC", "swwm_intermusic", "YesNo"
 	Option "$SWWM_FUZZ", "swwm_fuzz", "YesNo"
-	Option "$SWWM_SILENCEMAP", "swwm_silencemap", "SWWMSilenceMap"
+	Option "$SWWM_SILENCEMAP", "swwm_silencemap", "YesNo"
 	Option "$SWWM_FILTERACHIEVEMENTS", "swwm_filterachievements", "SWWMFilterAchievements"
 	StaticText " "
 	StaticText "$SWWM_ETITLE", "Blue"

zscript/handler/swwm_handler_worldtick.zsc

@@ -13,7 +13,8 @@ extend Class SWWMHandler
 	bool mnotify;
 	bool allkills, allitems, allsecrets;
 	bool mapclear;
-	int mapclearagain, restartmus;
+	int mapclearagain, restartmus, startmus;
+	double musvol;
 	String lastmus;
 	int lastorder;
 	bool lastloop;
@@ -137,26 +138,37 @@ extend Class SWWMHandler
 		if ( (level.total_secrets <= 0) && (level.total_items <= 0) && (level.total_monsters <= 0) ) return;
 		if ( mapclear )
 		{
-			if ( (swwm_silencemap == 1) && (musplaying.name != "") )
+			if ( swwm_silencemap )
 			{
-				lastmus = musplaying.name;
-				lastorder = musplaying.baseorder;
-				lastloop = musplaying.loop;
-				S_ChangeMusic("",force:true);
-			}
-			else if ( (swwm_silencemap > 1) && (musplaying.name != "music/olg.ogg") )
-			{
-				lastmus = musplaying.name;
-				lastorder = musplaying.baseorder;
-				lastloop = musplaying.loop;
-				S_ChangeMusic("music/olg.ogg",force:true);
+				if ( (musplaying.name != "music/nomusic.ogg") && (musplaying.name != "music/solitary.ogg") )
+				{
+					lastmus = musplaying.name;
+					lastorder = musplaying.baseorder;
+					lastloop = musplaying.loop;
+					S_ChangeMusic((startmus>0)?"music/nomusic.ogg":"music/solitary.ogg",force:true);
+					SetMusicVolume((startmus>0)?1.:musvol);
+				}
+				if ( startmus > 0 ) startmus--;
+				else if ( startmus == 0 )
+				{
+					startmus = -1;
+					S_ChangeMusic("music/solitary.ogg",force:true);
+					SetMusicVolume(.002);
+					musvol = .002;
+				}
+				else if ( musvol < 1. )
+				{
+					musvol = clamp(musvol+.002,0.,1.);
+					SetMusicVolume(musvol);
+				}
 			}
 			if ( (level.found_secrets < level.total_secrets) || (level.found_items < level.total_items) || (level.killed_monsters < level.total_monsters) )
 			{
-				if ( swwm_silencemap > 0 )
+				if ( swwm_silencemap )
 				{
 					restartmus = 25;
-					S_ChangeMusic("",force:true);
+					S_ChangeMusic("music/nomusic.ogg",force:true);
+					SetMusicVolume(1.);
 				}
 				S_StartSound("recordscratch",CHAN_VOICE,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
 				mapclear = false;
@@ -174,8 +186,11 @@ extend Class SWWMHandler
 		lastmus = musplaying.name;
 		lastorder = musplaying.baseorder;
 		lastloop = musplaying.loop;
-		if ( swwm_silencemap == 1 ) S_ChangeMusic("",force:true);
-		else if ( swwm_silencemap > 1 ) S_ChangeMusic("music/olg.ogg",force:true);
+		if ( swwm_silencemap )
+		{
+			S_ChangeMusic("music/nomusic.ogg",force:true);
+			startmus = 500;
+		}
 		for ( int i=0; i<MAXPLAYERS; i++ )
 		{
 			if ( !playeringame[i] || !players[i].mo ) continue;

zscript/menu/swwm_credits.zsc

@@ -169,7 +169,7 @@ Class SWWMCreditsMenu : GenericMenu
 		cassets.Push(new("SWWMCreditsEntry").Init(sfnt,"SiFi270","$SWWM_ASSKEEN"));
 		cassets.Push(new("SWWMCreditsEntry").Init(sfnt,"Nash","WidePix"));
 		cmusic.Push(new("SWWMCreditsEntry").Init(sfnt,"Teque","Traumatic State\nDragony\nHidden Tune #242\nHypercardish 1.1"));
-		cmusic.Push(new("SWWMCreditsEntry").Init(sfnt,"lol","olg.mp3"));
+		cmusic.Push(new("SWWMCreditsEntry").Init(sfnt,"BouncyTEM","Solitary Apprehension"));
 		cfanart.Push(new("SWWMCreditsEntry").Init(sfnt,"Substance20 (@S20TBL)"));
 		cfanart.Push(new("SWWMCreditsEntry").Init(sfnt,"Captain J (@Jho7835)"));
 		cfanart.Push(new("SWWMCreditsEntry").Init(sfnt,"Redead-ITA"));