- "Damage Amount Flashes" in the HUD options added. This turns on/off…

… the display of the PLAYER'S damage flashes. Suggested by Kyle873 after a short complaint and was something I never considered as an option until now. Thanks Kyle :Kappa: - Set "Notch Detail" in HUD Options to default at "Medium [50/2%]". Having it default to "Very High [200/0.5%]" is generally too resource demanding for most people even on good PCs in big and monster heavy maps. V: - Cacodemon-type monsters no longer ShadowSplit nearly as often from Holy-elemental attacks [i.e. Diaris Bow, Raging Spirits] <.< - ZScript set to 4.1 from 3.7 :V [4.1.0 of GZDoom will now be required to use w/ Aetherius though] - Fixed a bunch of things causing deprecation warnings from the 3.7 to 4.0 jump -
LordMisfit · Apr 30, 2019 · c9cd1bc · c9cd1bc
1 parent 2ee7684
commit c9cd1bc
Show file tree

Hide file tree

Showing 10 changed files with 119 additions and 71 deletions.
diff --git a/CVARINFO.txt b/CVARINFO.txt
@@ -349,7 +349,7 @@ server int dvdsdebug_scriptdisplays = 0;
 
 server int dvds_newhud = 1;
 
-server int dvdsnewhud_hudmeternotchdetail = 1;
+server int dvdsnewhud_hudmeternotchdetail = 4;
 server int dvdsnewhud_showemptynotches = 0;
 server int dvdsnewhud_showoverlifenotches = 1;
 server int dvdsnewhud_showprimarymeters = 1;
@@ -364,6 +364,7 @@ server int dvdsnewhud_showsecondaryweapmeter = 1;
 server int dvdsnewhud_showlevelstats = 1;
 server int dvdsnewhud_hudwidth = 1440;
 server int dvdsnewhud_hudheight = 1080;
+server int dvdsnewhud_playerdmgflashes = 1;
 server float dvdsnewhud_generaltransperancy = 1.0;
 
 server int dvdsallhuds_showstatinfo = 1;

diff --git a/KEYCONF.txt b/KEYCONF.txt
@@ -30,7 +30,7 @@ alias dvds_defaultsperks "set dvds_aeonstartlvl 0; set dvds_aeonpointbonus 1; se
 
 alias dvds_defaultsvoices "set dvds_dashgruntchance 66; set dvds_jumpgruntchance 66; set dvds_levelspeechchance 66; set dvds_florahokutolol 0"
 
-alias dvds_huddefault "set dvdsnewhud_hudmeternotchdetail 1; set dvdsnewhud_showemptynotches 0; set dvdsnewhud_showoverlifenotches 1; set dvdsnewhud_showprimarymeters 1; set dvdsnewhud_showsecondarymeters 1; set dvdsnewhud_tensionmainbar 1; set dvdsnewhud_tensioncooldownbar 1; set dvdsnewhud_damageburstsratios 1; set dvdsnewhud_showquickspells 1; set dvdsnewhud_generaltransperancy 1.0; set dvdsnewhud_showsecondaryweapmeter 1; set dvdsnewhud_showlevelstats 1; set dvds_showacshudelements 1; set dvdsallhuds_showstatinfo 1; set dvdsallhuds_refreshdelay 1; set dvdsallhuds_showlevelups 1; set dvdsnewhud_hudwidth 1440; set dvdsnewhud_hudheight 1080; set dvdsnewhud_widescreenxoffset 240; set dvdsnewhud_widescreenyoffset 0; set dvdshudmsg_display_extratics 1"
+alias dvds_huddefault "set dvdsnewhud_hudmeternotchdetail 4; set dvdsnewhud_showemptynotches 0; set dvdsnewhud_showoverlifenotches 1; set dvdsnewhud_showprimarymeters 1; set dvdsnewhud_showsecondarymeters 1; set dvdsnewhud_tensionmainbar 1; set dvdsnewhud_tensioncooldownbar 1; set dvdsnewhud_damageburstsratios 1; set dvdsnewhud_showquickspells 1; set dvdsnewhud_generaltransperancy 1.0; set dvdsnewhud_showsecondaryweapmeter 1; set dvdsnewhud_showlevelstats 1; set dvds_showacshudelements 1; set dvdsallhuds_showstatinfo 1; set dvdsallhuds_refreshdelay 1; set dvdsallhuds_showlevelups 1; set dvdsnewhud_hudwidth 1440; set dvdsnewhud_hudheight 1080; set dvdsnewhud_widescreenxoffset 240; set dvdsnewhud_widescreenyoffset 0; set dvdshudmsg_display_extratics 1; set dvdsnewhud_playerdmgflashes 1"
 
 alias dvds_defaultscompletion "set dvds_oldcompletionbonuses 0;  set dvds_monsterskilledbonus 0; set dvds_itemsfoundbonus 0; set dvds_secretsfoundbonus 0;  set dvds_monsterskilledmulti 1.0; set dvds_itemsfoundmulti 1.0; set dvds_secretsfoundmulti 1.0;  set dvds_monsterskilledformulti 512; set dvds_itemsfoundformulti 384; set dvds_secretsfoundformulti 8;  set dvds_completionistbonus 0; set dvds_getcompletionbonus 0"
 

diff --git a/MENUDEF.txt b/MENUDEF.txt
@@ -701,6 +701,12 @@ OptionValue "NewHUDMeterNotchDetail"
 	10, "Low [20/5%]"
 }
 
+OptionValue "PlayerDMGFlashes"
+{
+	0, "Off"
+	1, "On"
+}
+
 OptionValue "NewHUDEmptyNotches"
 {
 	0, "Off"
@@ -1438,6 +1444,7 @@ OptionMenu "DVDS-HUDStuff"
 	Option "Ratios on Dmg/Heal Bursts?",		"dvdsnewhud_damageburstsratios",			"NewHUDDamageBurstRatios"
 	Option "2ndary Weapon Meter [HEAT/MP]",		"dvdsnewhud_showsecondaryweapmeter",		"NewHUDSecWeaponMeters"
 	Option "Level Stats",					"dvdsnewhud_showlevelstats",			"NewHUDLevelStats"
+	Option "Damage Amount Flashes",					"dvdsnewhud_playerdmgflashes",			"PlayerDMGFlashes"
 	TextField "General Transperancy Ratio",		"dvdsnewhud_generaltransperancy"
 	StaticText " "
 	Option "Show Stat Values",				"dvdsallhuds_showstatinfo",				"ALLHUDSecondaryStatInfo"

diff --git a/acs/spelllib.o b/acs/spelllib.o
diff --git a/decorate/Monsters.dec b/decorate/Monsters.dec
@@ -5774,6 +5774,7 @@ actor DSCacodemon : AetheriusMonsterZSC 26527
 			HEAD F 6
 			Goto See
 		Pain.Sceptre:
+		Pain.Holy:
 			TNT1 A 0 A_ActorShadowSplit(120,4)
 			HEAD E 3
 			HEAD E 3 
@@ -6099,6 +6100,7 @@ actor Cacolantern : DSCacodemon 5006
 			HED2 F 6
 			Goto See
 		Pain.Sceptre:
+		Pain.Holy:
 			TNT1 A 0 A_ActorShadowSplit(90,4)
 			HED2 E 3
 			HED2 E 3
@@ -6452,6 +6454,7 @@ actor Abaddon : Cacolantern 5015
 			HED3 F 6
 			Goto See
 		Pain.Sceptre:
+		Pain.Holy:
 			TNT1 A 0 A_ActorShadowSplit(60,4)
 			HED3 E 3
 			HED3 E 3
@@ -6829,6 +6832,7 @@ actor DSPainElemental : AetheriusMonsterZSC 26531
 			PAIN G 6 A_FloatPain(0,8,64)
 			Goto See
 		Pain.Sceptre:
+		Pain.Holy:
 			TNT1 A 0 A_ActorShadowSplit(60,1)
 			PAIN G 6
 			PAIN G 6 A_FloatPain(0,8,64)

diff --git a/scripts/SPELLSRC.acs b/scripts/SPELLSRC.acs
@@ -377,10 +377,6 @@ global int 21:MiscellaneousVars[]; // ***ARRAY*** For various permenant vars in
 	// [82] is the Player's YPos [for locking player during menu freezes]
 	// [83] is the Player's ZPos [for locking player during menu freezes]
 	// [84 to 85] are undefined
-	// [82] is storage for the current Shell maximum. // 1 STRSeed = 2 Shells, 1 STRLevel = 4 Shells [need backpacks to maximize use of this] [(Base) + 1024 + 800 = 1824+]
-	// [83] is storage for the current Rocket maximum. // 1 STRSeed = 1 Rocket, 1 STRLevel = 2 Rockets [need backpacks to maximize use of this] [(Base) + 512 + 400 = 912+]
-	// [84] is storage for the current Cell maximum. // 1 STRSeed = 20 Cells, 1 STRLevel = 40 Cells [need backpacks to maximize use of this] [(Base) + 10240 + 8000 = 18240+]
-	// [85] is storage for the current DiarisArrow maximum. // 1 STRSeed = 3 Arrows, 1 STRLevel = 6 Arrows [need backpacks to maximize use of this] [(Base) + 1536 + 1200 = 2736+]
 	// [86] is storage for Aeon Points Multiplier [Menu CVar]
 	// [87] is storage for Seed Multiplier [Menu CVar]
 	// [88] is storage for SceptreXP Multiplier [Menu CVar]
@@ -2389,6 +2385,7 @@ script "HUDDISPLAY" ENTER
 			int MonsterCrit;
 
 			int damageburstratios = GetCVar("dvdsnewhud_damageburstsratios");
+			int playerdmgflashes = GetCVar("dvdsnewhud_playerdmgflashes");
 			int crittimer;
 			// Damage Number Flashes
 			if (Timer() > 3)
@@ -2431,20 +2428,26 @@ script "HUDDISPLAY" ENTER
 						if (MiscellaneousVars[175] >= MaxHealthLimit) { PopupHoldDuration += 0.75; PopupFadeOutDuration += 0.5; } 
 						SetFont("DQGDMNMED"); // DQHUDFONT 
 						yposmod = 0.0; // 9.0
-						if (damageburstratios == 1)
+						if (playerdmgflashes)
 						{
-							HudMessage(d:MiscellaneousVars[173],s:" (",d:MiscellaneousVars[174],s:"%)";
-							HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_green,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
-						}
-						else
-						{
-							HudMessage(d:MiscellaneousVars[173];
-							HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_green,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							if (damageburstratios)
+							{
+								HudMessage(d:MiscellaneousVars[173],s:" (",d:MiscellaneousVars[174],s:"%)";
+								HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_green,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							}
+							else
+							{
+								HudMessage(d:MiscellaneousVars[173];
+								HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_green,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							}
 						}
 
 						SetFont("BBURHPHL");
 						yposmod = 0.0; // 1.0
-						HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_untranslated,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+						if (playerdmgflashes)
+						{
+							HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_untranslated,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+						}
 					}
 					else
 					if (MiscellaneousVars[173] < 0) // Negative Value [Damage]
@@ -2459,15 +2462,18 @@ script "HUDDISPLAY" ENTER
 						}
 						SetFont("DQGDMNMED"); // DQHUDFONT 
 						yposmod = 0.0; // 9.0
-						if (damageburstratios == 1)
-						{
-							HudMessage(d:MiscellaneousVars[173],s:" (",d:MiscellaneousVars[174],s:"%)";
-							HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_brick,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
-						}
-						else
+						if (playerdmgflashes)
 						{
-							HudMessage(d:MiscellaneousVars[173];
-							HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_brick,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							if (damageburstratios)
+							{
+								HudMessage(d:MiscellaneousVars[173],s:" (",d:MiscellaneousVars[174],s:"%)";
+								HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_brick,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							}
+							else
+							{
+								HudMessage(d:MiscellaneousVars[173];
+								HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_brick,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							}
 						}
 
 						// Damage/Heal Cloud/Bursts
@@ -2494,7 +2500,10 @@ script "HUDDISPLAY" ENTER
 								if (GetCVar("dvdsdebug_playerdmgdisplays") > 0) PrintBold(s:"Health Dmg = ",f:xposmod,s:" ",f:yposmod,s:" MonsterCrit: ",d:MonsterCrit);
 							}
 						}
-						HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_untranslated,xpos+xposmod+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+						if (playerdmgflashes)
+						{
+							HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_untranslated,xpos+xposmod+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+						}
 					}
 					if (GetCVar("dvdsdebug_playerdmgdisplays") > 0) PrintBold(s:"Health Fade Duration = ",f:PopupHoldDuration,s:" ",f:PopupFadeOutDuration);
 				}
@@ -2529,7 +2538,10 @@ script "HUDDISPLAY" ENTER
 					{
 						yposmod = 0.0; // 9.0
 						PopupHoldDuration += 0.375; PopupFadeOutDuration += 0.25;
-						HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_white,xpos+xposmod+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+						if (playerdmgflashes)
+						{
+							HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_white,xpos+xposmod+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+						}
 					}
 				}
 
@@ -2556,20 +2568,26 @@ script "HUDDISPLAY" ENTER
 						if (MiscellaneousVars[178] >= CurrentMaxArmor) { PopupHoldDuration += 0.75; PopupFadeOutDuration += 0.5; } 
 						SetFont("DQGDMNMED"); // DQHUDFONT 
 						yposmod = 0.0; // 9.0
-						if (damageburstratios == 1)
+						if (playerdmgflashes)
 						{
-							HudMessage(d:MiscellaneousVars[176],s:" (",d:MiscellaneousVars[177],s:"%)";
-							HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_gold,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
-						}
-						else
-						{
-							HudMessage(d:MiscellaneousVars[176];
-							HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_gold,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							if (damageburstratios)
+							{
+								HudMessage(d:MiscellaneousVars[176],s:" (",d:MiscellaneousVars[177],s:"%)";
+								HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_gold,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							}
+							else
+							{
+								HudMessage(d:MiscellaneousVars[176];
+								HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_gold,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							}
 						}
 
 						SetFont("BBURAPHL");
 						yposmod = 0.0; // 1.0
-						HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_untranslated,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+						if (playerdmgflashes)
+						{
+							HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_untranslated,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+						}
 					}
 					else
 					if (MiscellaneousVars[176] < 0) // Negative Value
@@ -2586,15 +2604,18 @@ script "HUDDISPLAY" ENTER
 						ypos -= 32.0;
 						SetFont("DQGDMNMED"); // DQHUDFONT 
 						yposmod = 0.0; // 9.0
-						if (damageburstratios == 1)
-						{
-							HudMessage(d:MiscellaneousVars[176],s:" (",d:MiscellaneousVars[177],s:"%)";
-							HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_darkgreen,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
-						}
-						else
+						if (playerdmgflashes)
 						{
-							HudMessage(d:MiscellaneousVars[176];
-							HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_darkgreen,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							if (damageburstratios)
+							{
+								HudMessage(d:MiscellaneousVars[176],s:" (",d:MiscellaneousVars[177],s:"%)";
+								HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_darkgreen,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							}
+							else
+							{
+								HudMessage(d:MiscellaneousVars[176];
+								HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_darkgreen,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							}
 						}
 
 						// Damage/Heal Cloud/Bursts
@@ -2619,7 +2640,10 @@ script "HUDDISPLAY" ENTER
 							}
 							PlaySound(Player1TID,"marines/armordamaged",CHAN_ITEM,1.0,0,ATTN_NORM);
 						}
-						HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_untranslated,xpos+xposmod+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+						if (playerdmgflashes)
+						{
+							HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_untranslated,xpos+xposmod+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+						}
 					}
 					if (GetCVar("dvdsdebug_playerdmgdisplays") > 0) PrintBold(s:"Armor Fade Duration = ",f:PopupHoldDuration,s:" ",f:PopupFadeOutDuration);
 				}
@@ -2647,20 +2671,26 @@ script "HUDDISPLAY" ENTER
 						if (MiscellaneousVars[238] >= CurrentMaxArmor) { PopupHoldDuration += 0.75; PopupFadeOutDuration += 0.5; } 
 						SetFont("DQGDMNMED"); // DQHUDFONT 
 						yposmod = 0.0; // 9.0
-						if (damageburstratios == 1)
-						{
-							HudMessage(d:MiscellaneousVars[236],s:" (",d:MiscellaneousVars[237],s:"%)";
-							HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_lightblue,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
-						}
-						else
+						if (playerdmgflashes)
 						{
-							HudMessage(d:MiscellaneousVars[236];
-							HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_lightblue,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							if (damageburstratios)
+							{
+								HudMessage(d:MiscellaneousVars[236],s:" (",d:MiscellaneousVars[237],s:"%)";
+								HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_lightblue,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							}
+							else
+							{
+								HudMessage(d:MiscellaneousVars[236];
+								HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_lightblue,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							}
 						}
 
 						SetFont("BBURMPHL");
 						yposmod = 0.0; // 1.0
-						HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_untranslated,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+						if (playerdmgflashes)
+						{
+							HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_untranslated,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+						}
 					}
 					else
 					if (MiscellaneousVars[236] < 0) // Negative Value
@@ -2677,15 +2707,18 @@ script "HUDDISPLAY" ENTER
 						ypos += 32.0;
 						SetFont("DQGDMNMED"); // DQHUDFONT 
 						yposmod = 0.0; // 9.0
-						if (damageburstratios == 1)
-						{
-							HudMessage(d:MiscellaneousVars[236],s:" (",d:MiscellaneousVars[237],s:"%)";
-							HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_brick,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
-						}
-						else
+						if (playerdmgflashes)
 						{
-							HudMessage(d:MiscellaneousVars[236];
-							HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_brick,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							if (damageburstratios)
+							{
+								HudMessage(d:MiscellaneousVars[236],s:" (",d:MiscellaneousVars[237],s:"%)";
+								HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_brick,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							}
+							else
+							{
+								HudMessage(d:MiscellaneousVars[236];
+								HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_brick,xpos+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+							}
 						}
 
 						// Damage/Heal Cloud/Bursts
@@ -2708,7 +2741,10 @@ script "HUDDISPLAY" ENTER
 								if (GetCVar("dvdsdebug_playerdmgdisplays") > 0) PrintBold(s:"Mana Dmg = ",f:xposmod,s:" ",f:yposmod);
 							}
 						}
-						HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_untranslated,xpos+xposmod+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+						if (playerdmgflashes)
+						{
+							HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_untranslated,xpos+xposmod+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,PopupHoldDuration,PopupFadeOutDuration,0.834);
+						}
 					}
 				}
 

diff --git a/zscript.zc b/zscript.zc
@@ -1,4 +1,4 @@
-version "3.7"
+version "4.1"
 
 #include "zscript/dvds-statusbars.zc"
 #include "zscript/dvds-eventhandlers.zc"

diff --git a/zscript/dvds-monsters.zc b/zscript/dvds-monsters.zc
@@ -372,7 +372,7 @@ class AetheriusMonsterZSC : AetheriusBaseZSC
 		//*********************************************************
 		if (((gametic + (ActorRandomBits & 15)) & 15) == 1)
 		{
-			if (self.bFRIENDLY > 0 && self.health > 0 && !(level.frozen || globalfreeze))
+			if (self.bFRIENDLY > 0 && self.health > 0 && !isFrozen())
 			{
 				let glitterheight = self.height / 2;
 				let glitterheight2 = self.height / 4;
@@ -1069,7 +1069,7 @@ class AetheriusMonsterZSC : AetheriusBaseZSC
 
 				// Final Crit Roll
 				CritRoll = random(1,512);
-				if (CritRoll <= CritChance && DVDSActor.health > 0 && !(level.frozen || globalfreeze) && dvds_monstercrits != 0) criticalhit = 1;
+				if (CritRoll <= CritChance && DVDSActor.health > 0 && !isFrozen() && dvds_monstercrits != 0) criticalhit = 1;
 				if (dvdsdebug_actordmgdisplays && dvds_monstercrits != 0) Console.Printf("    (\czActor Defensive Input [Monster Crit Rate]\c-: %d / 512 (%d) \c-, \cyActorClass: = %s\c-)", CritRoll, CritChance, ActorClass);
 
 				// Chance to RESIST a crit.
@@ -6470,7 +6470,7 @@ class AetheriusMonsterZSC : AetheriusBaseZSC
 					{
 						continue;
 					}
-					ActorIterator iter = ActorIterator.Create(targ.args[i]);
+					ActorIterator iter = Level.CreateActorIterator(targ.args[i]);
 					mo = iter.Next ();
 					if (mo == null)
 					{
@@ -6506,7 +6506,7 @@ class AetheriusMonsterZSC : AetheriusBaseZSC
 					{
 						i = (random[DragonSeek]() >> 2) % 5;
 					} while(!targ.args[i]);
-					ActorIterator iter = ActorIterator.Create(targ.args[i]);
+					ActorIterator iter = Level.CreateActorIterator(targ.args[i]);
 					tracer = iter.Next ();
 				}
 			}
@@ -6515,7 +6515,7 @@ class AetheriusMonsterZSC : AetheriusBaseZSC
 
 	void A_DragonInitFlight()
 	{
-		ActorIterator iter = ActorIterator.Create(tid);
+		ActorIterator iter = Level.CreateActorIterator(tid);
 
 		do
 		{
@@ -7180,7 +7180,7 @@ class AetheriusMonsterZSC : AetheriusBaseZSC
 
 	void A_BrainSpit(class<Actor> spawntype = null)
 	{
-		SpotState spstate = SpotState.GetSpotState();
+		SpotState spstate = Level.GetSpotState();
 		Actor targ;
 		Actor spit;
 		bool isdefault = false;