Add simplified teleport fogs, for spawn-heavy maps.

Fix Silver Bullet unload anim not having FCB variant.

cvarinfo.txt

@@ -72,3 +72,4 @@ user bool swwm_funtags = true;			// replace vanilla monster names with silly one
 //server bool swwm_omnibust = false;		// TODO add wallbusting effect to all weapons
 //server bool swwm_superfuel = false;		// TODO enable unlimited fuel
 //server bool swwm_partytime = false;		// TODO killed enemies burst into confetti
+server bool swwm_simplefog = false;		// simplified teleport fogs (useful to speed up slaughterwads)

language.def_menu

@@ -110,6 +110,7 @@ SWWM_YNYKRONALERT = "Cap Ynykron Alert";
 SWWM_MENUPAUSE = "Pause on Demolitionist Menu";
 SWWM_FTITLE = "Fun Options";
 SWWM_FUNTAGS = "Monster Renaming";
+SWWM_SIMPLEFOG = "Simplified Teleport Fog";
 TOOLTIP_SWWM_VOICETYPE = "Sets the voice pack for the player.";
 TOOLTIP_SWWM_MUTEVOICE = "Control what gets muted, if you'd rather have a more silent protagonist.";
 TOOLTIP_SWWM_FLASHSTRENGTH = "Screen flashes usually happen when firing some weapons, you can lower this if these effects are harmful for you.";
@@ -165,6 +166,7 @@ TOOLTIP_SWWM_NOTRACK = "Completely disables combat tracking (responsible for hea
 TOOLTIP_SWWM_YNYKRONALERT = "By default the Ynykron wakes all monsters in the map. This may sometimes cause issues (and would destroy your framerate with huge monstercounts).";
 TOOLTIP_SWWM_MENUPAUSE = "In single player, the Demolitionist Menu by default will pause everything. You can disable this if you want a more Souls-like experience (or if you want to have a read while actively waiting for some looooooooong elevator or other timed event).";
 TOOLTIP_SWWM_FUNTAGS = "Replaces the names of various vanilla monsters with funny alternatives.";
+TOOLTIP_SWWM_SIMPLEFOG = "Replaces particle-based teleport fogs with simple sprites. Useful if they cause performance issues.";
 // knowledge base
 SWWM_COMINGSOON = "(coming soon)";
 SWWM_MISSTAB = "Mission";

language.es_menu

@@ -107,6 +107,7 @@ SWWM_YNYKRONALERT = "Limitar Alerta de Ynykron";
 SWWM_MENUPAUSE = "Pausar en Menú de Demolicionista";
 SWWM_FTITLE = "Opciones Divertidas";
 SWWM_FUNTAGS = "Renombrar Monstruos";
+SWWM_SIMPLEFOG = "Efecto de Teletransporte Simple"
 TOOLTIP_SWWM_VOICETYPE = "Selecciona el pack de voz para el jugador.";
 TOOLTIP_SWWM_MUTEVOICE = "Controla lo que se mutea, si prefieres tener un protagonista más silencioso.";
 TOOLTIP_SWWM_FLASHSTRENGTH = "Los destellos en pantalla suelen ocurrir al disparar algunas armas, puedes reducirlo si este tipo de effectos te causan malestar.";
@@ -162,6 +163,7 @@ TOOLTIP_SWWM_NOTRACK = "Desactiva completamente el rastreo de combate (responsab
 TOOLTIP_SWWM_YNYKRONALERT = "Por defecto el Ynykron alerta a todos los monstruos en el mapa. Esto puede causar problemas a veces (o destruir tus frames con números enormes de monstruos).";
 TOOLTIP_SWWM_MENUPAUSE = "En modo de un jugador, el Menú de Demolicionista por defecto paus a todo. Puedes desactivar esto si quieres una experiencia más Souls-like (o si quieres leer un poco mientras esperas activamente algun ascensor leeeeeeento o algún otro evento temporizado)."
 TOOLTIP_SWWM_FUNTAGS = "Reemplaza los nombres de monstruos vanilla por alternativas graciosas.";
+TOOLTIP_SWWM_SIMPLEFOG = "Reemplaza los efectos de teletransporte basados en partículas con simples sprites. Útil si causan problemas de rendimiento.";
 // knowledge base
 SWWM_COMINGSOON = "(próximamente)";
 SWWM_MISSTAB = "Misión";

language.version

@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \cwGZ\c- r464 (Fri  7 Aug 12:18:33 CEST 2020)";
+SWWM_MODVER="\chSWWM \cwGZ\c- r465 (Fri  7 Aug 23:17:41 CEST 2020)";

menudef.txt

@@ -75,6 +75,7 @@ OptionMenu "SWWMOptionMenu"
 	Option "$SWWM_CAPMCRANGE", "swwm_capmcrange", "YesNo"
 	Option "$SWWM_NOTRACK", "swwm_notrack", "YesNo"
 	Option "$SWWM_YNYKRONALERT", "swwm_ynykronalert", "YesNo"
+	Option "$SWWM_SIMPLEFOG", "swwm_simplefog", "YesNo"
 	StaticText " "
 	StaticText "$SWWM_ITITLE", "Gold"
 	Option "$SWWM_ARMORUSE", "swwm_autousearmor", "YesNo"

zscript/swwm_common.zsc

@@ -2133,10 +2133,14 @@ Class SWWMTeleportFog : Actor
 {
 	Default
 	{
+		RenderStyle "Add";
 		+NOGRAVITY;
 		+NOBLOCKMAP;
 		+DONTSPLASH;
 		+NOINTERACTION;
+		+FORCEXYBILLBOARD;
+		Radius .1;
+		Height 0.;
 	}
 	override void PostBeginPlay()
 	{
@@ -2144,6 +2148,7 @@ Class SWWMTeleportFog : Actor
 		SetOrigin(Vec3Offset(0,0,28),false);
 		A_StartSound("misc/teleport",CHAN_VOICE);
 		Spawn("TeleLight",pos);
+		if ( swwm_simplefog ) SetStateLabel("Simple");
 	}
 	States
 	{
@@ -2179,6 +2184,9 @@ Class SWWMTeleportFog : Actor
 			A_FadeOut(.07);
 		}
 		Wait;
+	Simple:
+		SPEX ABCDEFGHIJKLMNOPQRSTUVWXYZ[\] 1 Bright;
+		Stop;
 	}
 }
 

zscript/swwm_thiccboolet.zsc

@@ -1282,7 +1282,7 @@ Class SilverBullet : SWWMWeapon
 				invoker.dezoomstate = invoker.fcbloaded?ResolveState("Unload2"):ResolveState("Unload");
 				return ResolveState("UnZoom");
 			}
-			return ResolveState(null);
+			return A_JumpIf(invoker.fcbloaded,"Unload2");
 		}
 	Unload:
 		XZW2 A 2
@@ -1306,7 +1306,7 @@ Class SilverBullet : SWWMWeapon
 		{
 			A_PlayerReload();
 			A_StartSound("silverbullet/meleestart",CHAN_WEAPON,CHANF_OVERLAP);
-			return A_JumpIf(invoker.clipcount<=0,"UnloadEmpty");
+			return A_JumpIf(invoker.clipcount<=0,"UnloadEmpty2");
 		}
 		XZWA DEFGHI 2;
 		XZWA J 2 A_StartSound("silverbullet/magout",CHAN_WEAPON,CHANF_OVERLAP);