Explicitly warn against unsupported IWADs.

Extend repertoire of crash sounds.

filter/doom.id/swwmgamesupported.txt

@@ -0,0 +1 @@
+Commercial Doom

filter/heretic/swwmgamesupported.txt

@@ -0,0 +1 @@
+Heretic

filter/hexen/swwmgamesupported.txt

@@ -0,0 +1 @@
+Hexen

language.def_base

@@ -194,11 +194,16 @@ QUITMSG17 = "Butt bots gonna bot.";
 QUITMSG18 = "WHO IN THEIR RIGHT MIND\nWOULD FROST A CAKE WITH THEIR BUTT?";
 QUITMSG19 = "World hard and cold,\ntiddy soft and warm.";
 // startup (don't localize)
-STARTUP1 = " ";
-STARTUP2 = "    \ck★\cf∼\c- \cvDemo-chan says\c- \cf∼\ck★\c-";
-STARTUP3 = " ";
-STARTUP4 = "  \ck★\cf∼\c- \cvTERFs can fuck off\c- \cf∼\ck★\c-";
-STARTUP5 = " ";
+STARTUP1 =
+"\n"
+"    \ck★\cf∼\c- \cvDemo-chan says\c- \cf∼\ck★\c-\n"
+"\n"
+"  \ck★\cf∼\c- \cvTERFs can fuck off\c- \cf∼\ck★\c-\n"
+"\n";
+STARTUP2 = "";
+STARTUP3 = "";
+STARTUP4 = "";
+STARTUP5 = "";
 // Re-tagged monsters
 FN_ZOMBIE_FUNN = "5";
 FN_ZOMBIE_FUN1 = "Zomb";

language.version

@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r542 \cu(Mon 14 Jun 21:43:49 CEST 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r542 \cu(2021-06-14 21:43:49)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r543 \cu(Wed 16 Jun 17:47:21 CEST 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r543 \cu(2021-06-16 17:47:21)\c-";

sndinfo.txt

@@ -1,6 +1,12 @@
 $pitchshiftrange 0
 
-crash/crash	sounds/DUCK.ogg
+crash/crash1	sounds/DUCK.ogg
+crash/crash2	sounds/BORK98.ogg
+crash/crash3	sounds/BORKXP.ogg
+crash/crash4	sounds/GNOME.ogg
+crash/crash5	sounds/RANCEMIFT.ogg
+crash/crash6	sounds/ONO.ogg
+$random crash/crash { crash/crash1 crash/crash2 crash/crash3 crash/crash4 crash/crash5 crash/crash6 }
 crash/glass	sounds/GLASSCRK.ogg
 crash/curb	sounds/CURB.ogg
 brutal/ezmodo	sounds/EASYMODO.ogg
@@ -9,6 +15,7 @@ haha/dab	sounds/DAB.ogg
 bruh		sounds/BRUH.ogg
 squeak		sounds/SQUEAK.ogg
 recordscratch	sounds/RECSCRAP.ogg
+compat/warn	sounds/UTWARN.ogg
 
 saya/giggle1	sounds/saya/saya_giggle1.ogg
 saya/giggle2	sounds/saya/saya_giggle2.ogg

zscript/compat/swwm_hdoom.zsc

@@ -28,13 +28,13 @@ Class SWWMHDoomHandler : StaticEventHandler
 			return;
 		SetRandomSeed[hdscreen](Random[hdscreen]()+consoleplayer+MSTime());
 		Console.Printf(
-			"\cx┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\n"
-			"\cx┃            \cfOh my, someone appears to be \cgH \ckO \cdR \cvN \chY \ct♥            \cx┃\n"
-			"\cx┃   \cfWell, all you'll be getting here is the power of headpats.   \cx┃\n"
-			"\cx┃  \cfIf you want Demo-chan to actually fuck some hot demon girls,  \cx┃\n"
-			"\cx┃      \cfjust go commission a porn artist or something, idk.       \cx┃\n"
-			"\cx┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛");
-		SWWMUtility.MarkAchievement('swwm_achievement_hdoom',players[consoleplayer]);
+			"\cx┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\c-\n"
+			"\cx┃            \cfOh my, someone appears to be \cgH \ckO \cdR \cvN \chY \ct♥            \cx┃\c-\n"
+			"\cx┃   \cfWell, all you'll be getting here is the power of headpats.   \cx┃\c-\n"
+			"\cx┃  \cfIf you want Demo-chan to actually fuck some hot demon girls,  \cx┃\c-\n"
+			"\cx┃      \cfjust go commission a porn artist or something, idk.       \cx┃\c-\n"
+			"\cx┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛\c-");
+		S_StartSound("compat/warn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
 	}
 
 	override void WorldLoaded( WorldEvent e )

zscript/compat/swwm_shame.zsc

@@ -31,15 +31,15 @@ Class SWWMBrutalHandler : StaticEventHandler
 			return;
 		SetRandomSeed[bdscreen](Random[bdscreen]()+consoleplayer+MSTime());
 		Console.Printf(
-			"\cx┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\n"
-			"\cx┃   \cfIf you have BD on your autoload you really shouldn't.   \cx┃\n"
-			"\cx┃  \cfIf you manually loaded it with this mod, why would you?  \cx┃\n"
-			"\cx┃         \cfThey're not compatible and never will be.         \cx┃\n"
-			"\cx┃    \cfThis mod will now shit the bed once you go in-game,    \cx┃\n"
-			"\cx┃            \cfand trust me, it's better this way.            \cx┃\n"
-			"\cx┃             \cf<See you again, have a nice day>              \cx┃\n"
-			"\cx┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛");
-		SWWMUtility.MarkAchievement('swwm_achievement_broccolidoccoli',players[consoleplayer]);
+			"\cx┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\c-\n"
+			"\cx┃   \cfIf you have BD on your autoload you really shouldn't.   \cx┃\c-\n"
+			"\cx┃  \cfIf you manually loaded it with this mod, why would you?  \cx┃\c-\n"
+			"\cx┃         \cfThey're not compatible and never will be.         \cx┃\c-\n"
+			"\cx┃    \cfThis mod will now shit the bed once you go in-game,    \cx┃\c-\n"
+			"\cx┃            \cfand trust me, it's better this way.            \cx┃\c-\n"
+			"\cx┃             \cf<See you again, have a nice day>              \cx┃\c-\n"
+			"\cx┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛\c-");
+		S_StartSound("compat/warn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
 	}
 
 	override void WorldLoaded( WorldEvent e )

zscript/dlc1/swwm_ammoitems_dlc.zsc

@@ -338,8 +338,8 @@ Class RayBolt : MagAmmo
 		Inventory.PickupMessage "$T_RAYBOLT";
 		Inventory.Icon "graphics/HUD/Icons/A_RayBolt.png";
 		MagAmmo.ParentAmmo "RayAmmo";
-		MagAmmo.ClipSize 20;
-		Inventory.MaxAmount 25;
+		MagAmmo.ClipSize 10;
+		Inventory.MaxAmount 15;
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 	}
@@ -392,9 +392,9 @@ Class RayAmmo : Ammo
 		Stamina 150000;
 		Inventory.Icon "graphics/HUD/Icons/A_RayAmmo.png";
 		Inventory.Amount 1;
-		Inventory.MaxAmount 3;
+		Inventory.MaxAmount 5;
 		Ammo.BackpackAmount 0;
-		Ammo.BackpackMaxAmount 6;
+		Ammo.BackpackMaxAmount 9;
 		Ammo.DropAmount 1;
 		+FLOATBOB;
 		FloatBobStrength 0.25;
@@ -436,7 +436,6 @@ Class RayBattery : Ammo
 		Ammo.BackpackAmount 0;
 		Ammo.BackpackMaxAmount 4;
 		Ammo.DropAmount 1;
-		+INVENTORY.IGNORESKILL;
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 		Accuracy 90;

zscript/swwm_statichandler.zsc

@@ -124,6 +124,17 @@ Class SWWMStaticHandler : StaticEventHandler
 		let cv = CVar.FindCVar('swwm_voicetype');
 		if ( types.Find(cv.GetString()) >= types.Size() )
 			cv.SetString("default");
+		// warning for unsupported
+		if ( Wads.FindLump("swwmgamesupported.txt") != -1 ) return;
+		Console.Printf(
+			"\cx┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓\c-\n"
+			"\cx┃                     \cr[\cgWARNING\cr]                     \cx┃\c-\n"
+			"\cx┃  \chSWWM \czGZ \cjis \cfNOT\cj compatible with the loaded IWAD.  \cx┃\c-\n"
+			"\cx┃    \cjOnly \cfDoom\cj, \cfHeretic\cj and \cfHexen\cj are supported.    \cx┃\c-\n"
+			"\cx┃            \cjIssues \cfCAN\cj and \cfWILL\cj happen.            \cx┃\c-\n"
+			"\cx┃               \cr[\cgYOU ARE ON YOUR OWN\cr]               \cx┃\c-\n"
+			"\cx┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛\c-");
+		S_StartSound("compat/warn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
 	}
 
 	override void ConsoleProcess( ConsoleEvent e )