Common Library changes.

cvarinfo.base

@@ -1,33 +1,2 @@
-// shared cvars
-nosave float kirin_flashstrength = 1.0;
-user float kirin_bumpstrength = 1.0;
-nosave int kirin_hudmargin = 10;
-nosave bool kirin_hudscale = false;
-nosave int kirin_maxshown = 4;
-nosave int kirin_maxshownbig = 10;
-nosave int kirin_maxpickup = 5;
-nosave int kirin_chatduration = 25;
-nosave int kirin_msgduration = 5;
-nosave int kirin_pickduration = 3;
-nosave bool kirin_shaders = true;
-server bool kirin_blood = true;
-server int kirin_maxblood = 400;
-server int kirin_maxgibs = 100;
-server int kirin_maxcasings = 200;
-server int kirin_maxdebris = 500;
-nosave bool kirin_fuzz = true;
-server int kirin_enemydrops = 0;
-server bool kirin_shadows = true;
-nosave int kirin_shadowdist = 2000;
-nosave int kirin_forcestats = 1;
-server int kirin_drlaskill = 3;
-server int kirin_ps_fullreset = 0;
-server int kirin_ps_resetammo = 0;
-server int kirin_ps_resetitems = 0;
-server int kirin_ps_resethealth = 0;
-nosave bool kirin_weapontooltips = true;
-nosave string kirin_tooltipshown = "";
-nosave noarchive bool kirin_tooltipnote = false;
-nosave bool kirin_mm_enable = true;
-nosave int kirin_playtime = 0;
 // mod-specific cvars
+nosave int kirin_playtime = 0;	// total playtime in seconds

language.modversion

@@ -1,3 +1,3 @@
 [default]
-KIRIN_MODVER="\cxRED STAR OF INNOCENCE\c- \cw0.1a r36 \cu(Mon 28 Feb 17:30:34 CET 2022)\c-";
-KIRIN_SHORTVER="\cw0.1a r36 \cu(2022-02-28 17:30:34)\c-";
+KIRIN_MODVER="\cxRED STAR OF INNOCENCE\c- \cw0.1a r37 \cu(Tue  1 Mar 18:52:45 CET 2022)\c-";
+KIRIN_SHORTVER="\cw0.1a r37 \cu(2022-03-01 18:52:45)\c-";

menudef.txt

@@ -1,100 +1,11 @@
-OptionValue "SWWMEnemyDropType"
-{
-	-1, "$SWWM_DROPS_NONE"
-	0, "$SWWM_DROPS_AMMO"
-	1, "$SWWM_DROPS_WEAPONS"
-}
-OptionValue "SWWMForceStats"
-{
-	0, "$SWWM_STATS_DISABLED"
-	1, "$SWWM_STATS_ALWAYS"
-	2, "$SWWM_STATS_MAPNAME"
-}
-OptionValue "SWWMDRLASkill"
-{
-	0, "$SWWM_DRLASKILL_BABY"
-	1, "$SWWM_DRLASKILL_EASY"
-	2, "$SWWM_DRLASKILL_NORMAL"
-	3, "$SWWM_DRLASKILL_HARD"
-	4, "$SWWM_DRLASKILL_NIGHTMARE"
-	5, "$SWWM_DRLASKILL_TECHNOPHOBIA"
-	6, "$SWWM_DRLASKILL_ARMAGEDDON"
-	7, "$SWWM_DRLASKILL_ADAPTIVE"
-}
-OptionValue "SWWMPistolStart"
-{
-	0, "$TXT_NO"
-	1, "$SWWM_PISTOLSTART_MAP"
-	2, "$SWWM_PISTOLSTART_CLUSTER"
-}
-OptionValue "SWWMHUDScale"
-{
-	0, "$SWWM_TFITSCALE"
-	1, "$SWWM_LFITSCALE"
-}
-OptionMenu "KirinOptionMenu"
-{
-	Class "SWWMOptionMenu"
-	Title "$KIRIN_MTITLE"
-
-	SafeCommand "$SWWM_CRESET", "event swwmresetcvars"
-	StaticText " "
-
-	StaticText "$SWWM_PTITLE", "Orange"
-	SWWMPlayTime "$SWWM_PLAYTIME", "kirin_playtime"
-	StaticText " "
-	StaticText "$SWWM_OTITLE", "Orange"
-	Option "$SWWM_SHADERS", "kirin_shaders", "YesNo"
-	Slider "$SWWM_FLASH", "kirin_flashstrength", 0.0, 1.0, 0.1, 1
-	Slider "$SWWM_BUMP", "kirin_bumpstrength", 0.0, 1.0, 0.1, 1
-	Option "$SWWM_MM_ENABLE", "kirin_mm_enable", "YesNo"
-	Option "$SWWM_FORCESTATS", "kirin_forcestats", "SWWMForceStats"
-	Slider "$SWWM_HUDMARGIN", "kirin_hudmargin", 0, 40, 1, 0
-	Option "$SWWM_HUDSCALE", "kirin_hudscale", "SWWMHudScale"
-	Slider "$SWWM_MAXMSG", "kirin_maxshown", 1, 10, 1, 0
-	Slider "$SWWM_MAXMSGBIG", "kirin_maxshownbig", 1, 20, 1, 0
-	Slider "$SWWM_MAXPICK", "kirin_maxpickup", 1, 10, 1, 0
-	Slider "$SWWM_CHATLEN", "kirin_chatduration", 1, 30, 1, 0
-	Slider "$SWWM_MSGLEN", "kirin_msgduration", 1, 30, 1, 0
-	Slider "$SWWM_PICKLEN", "kirin_pickduration", 1, 30, 1, 0
-	Option "$SWWM_FUZZ", "kirin_fuzz", "YesNo"
-	StaticText " "
-	StaticText "$SWWM_ETITLE", "Orange"
-	Option "$SWWM_SHADOWS", "kirin_shadows", "YesNo"
-	ScaleSlider "$SWWM_SHADOWDIST", "kirin_shadowdist", -1, 4000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED"
-	Option "$SWWM_BLOOD", "kirin_blood", "YesNo"
-	ScaleSlider "$SWWM_MAXBLOOD", "kirin_maxblood", -1, 1000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED"
-	ScaleSlider "$SWWM_MAXGIBS", "kirin_maxgibs", -1, 1000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED"
-	ScaleSlider "$SWWM_MAXCASINGS", "kirin_maxcasings", -1, 1000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED"
-	ScaleSlider "$SWWM_MAXDEBRIS", "kirin_maxdebris", -1, 1000, 1, "$SWWM_NONE", "$SWWM_UNLIMITED"
-	SafeCommand "$SWWM_CLEARFX", "netevent swwmcleareffects"
-	StaticText " "
-	StaticText "$SWWM_BTITLE", "Orange"
-	Option "$SWWM_PS_FULLRESET", "kirin_ps_fullreset", "SWWMPistolStart"
-	Option "$SWWM_PS_RESETAMMO", "kirin_ps_resetammo", "SWWMPistolStart"
-	Option "$SWWM_PS_RESETITEMS", "kirin_ps_resetitems", "SWWMPistolStart"
-	Option "$SWWM_PS_RESETHEALTH", "kirin_ps_resethealth", "SWWMPistolStart"
-	Option "$SWWM_ENEMYDROPS", "kirin_enemydrops", "SWWMEnemyDropType"
-	StaticText " "
-	StaticText "$SWWM_ITITLE", "Orange"
-	Option "$SWWM_WEAPONTOOLTIPS", "kirin_weapontooltips", "YesNo"
-	SafeCommand "$SWWM_RESETTOOLTIPS", "event swwmresettooltips"
-	IfGame(Doom)
-	{
-		StaticText " "
-		StaticText "$SWWM_MCTITLE", "Orange"
-		Option "$SWWM_DRLASKILL", "kirin_drlaskill", "SWWMDRLASkill"
-	}
-
-}
 AddOptionMenu "OptionsMenu"
 {
-	Submenu "$KIRIN_MTITLE", "KirinOptionMenu"
+	Submenu "$KIRIN_MTITLE", "SWWMOptionMenu"
 	Submenu "$KIRIN_MCREDS", "KirinCreditsMenu"
 }
 AddOptionMenu "OptionsMenuSimple"
 {
-	Submenu "$KIRIN_MTITLE", "KirinOptionMenu"
+	Submenu "$KIRIN_MTITLE", "SWWMOptionMenu"
 	Submenu "$KIRIN_MCREDS", "KirinCreditsMenu"
 }
 ListMenu "MainMenu"

zscript.txt

@@ -39,6 +39,7 @@ const SWWMMAXVIPAMOUNT = 1;
 #include "zscript/handler/swwm_handler_process.zsc"
 #include "zscript/handler/swwm_handler_queues.zsc"
 #include "zscript/handler/swwm_handler_replacements.zsc"
+#include "zscript/handler/swwm_handler_shaders.zsc"
 #include "zscript/handler/swwm_handler_worldload.zsc"
 #include "zscript/handler/swwm_handler_worldthings.zsc"
 // menu code

zscript/handler/kirin_handler_shaders.zsc

@@ -2,12 +2,31 @@
 
 extend Class SWWMHandler
 {
-	private ui void RenderShaders( RenderEvent e )
+	private ui bool RenderModShaders( RenderEvent e, PlayerInfo p, PlayerPawn mo )
 	{
+		let deva = AngeryPower(mo.FindInventory("AngeryPower"));
+		if ( deva )
+		{
+			Shader.SetEnabled(p,"DevastationShader",true);
+			Shader.SetUniform1f(p,"DevastationShader","timer",(gametic+e.FracTic)/GameTicRate);
+			double xstrastr = 1.+max(0,deva.lastpulse-(gametic+e.Fractic))/35.;
+			Shader.SetUniform1f(p,"DevastationShader","xtrastr",xstrastr**2.);
+		}
+		else Shader.SetEnabled(p,"DevastationShader",false);
+		let coat = BarrierPower(mo.FindInventory("BarrierPower"));
+		if ( coat )
+		{
+			Shader.SetEnabled(p,"BarrierShader",true);
+			Shader.SetUniform1f(p,"BarrierShader","timer",(gametic+e.FracTic)/GameTicRate);
+		}
+		else Shader.SetEnabled(p,"BarrierShader",false);
+		return !!coat;
 	}
 
-	static clearscope void ClearAllShaders( PlayerInfo p, bool noscope = false )
+	static clearscope void ClearAllModShaders( PlayerInfo p, bool noscope )
 	{
+		Shader.SetEnabled(p,"BarrierShader",false);
+		Shader.SetEnabled(p,"DevastationShader",false);
 		// make sure titlemap shaders get disabled just in case
 		Shader.SetEnabled(players[consoleplayer],"kirinsigil1",false);
 		Shader.SetEnabled(players[consoleplayer],"kirinsigil2",false);

zscript/menu/kirin_inter.zsc

@@ -143,7 +143,7 @@ Class KirinStatScreen : SWWMStatScreen
 	override void drawSWWMBg()
 	{
 		double GameSecs = (bcnt+FracTic)/GameTicRate;
-		if ( kirin_fuzz )
+		if ( swwm_fuzz )
 		{
 			if ( !bgtex ) bgtex = TexMan.CheckForTexture("graphics/tempbg.png",TexMan.Type_Any);
 			Vector2 tsize = TexMan.GetScaledSize(bgtex);

zscript/menu/kirin_title.zsc

@@ -223,7 +223,7 @@ Class KirinTitleStuff : EventHandler
 			}
 			return;
 		}
-		if ( kirin_fuzz )
+		if ( swwm_fuzz )
 		{
 			if ( !bgtex ) bgtex = TexMan.CheckForTexture("graphics/tempbg.png",TexMan.Type_Any);
 			Vector2 tsize = TexMan.GetScaledSize(bgtex);