Final changes for 1.0.5:

- Solve sprite conflict between DT and Doomreal flak cannons.
 - Remove Enhanced Shock Rifle spawn for Heretic's Mace.

zscript/flakcannon.zsc

@@ -580,8 +580,8 @@ Class FlakSlug : Actor
 		}
 		Wait;
 	Death:
-		EXP2 A 0 A_FlakExplode();
-		EXP2 ABCDEFGHIJKLMNOPQR 1 BRIGHT;
+		FLEX A 0 A_FlakExplode();
+		FLEX ABCDEFGHIJKLMNOPQR 1 BRIGHT;
 		Stop;
 	}
 }

zscript/utcommon.zsc

@@ -2980,12 +2980,7 @@ Class UTMainHandler : EventHandler
 			if ( Random[Replacements](0,1) ) e.Replacement = 'Minigun';
 			else e.Replacement = 'SniperRifle';
 		}
-		else if ( e.Replacee == 'BFG9000' ) e.Replacement = 'WarheadLauncher';
-		else if ( e.Replacee == 'Mace' )
-		{
-			if ( (!deathmatch || flak_dmsshock) && !Random[Replacements](0,6) ) e.Replacement = 'EnhancedShockRifle';
-			else e.Replacement = 'WarheadLauncher';
-		}
+		else if ( (e.Replacee == 'BFG9000') || (e.Replacee == 'Mace') ) e.Replacement = 'WarheadLauncher';
 		else if ( (e.Replacee == 'Clip') || (e.Replacee == 'GoldWandAmmo') || (e.Replacee == 'GoldWandHefty') ) e.Replacement = 'EClip';
 		else if ( (e.Replacee == 'ClipBox') )
 		{