From e194f44ffdc65b2c6229cd89a50d051855cfad46 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Fri, 1 Jun 2018 11:40:04 +0200
Subject: [PATCH] Fix Enforcer not being autoselected on pistol start. Made
 "custom color" the default choice for HUD.

---
 cvarinfo.txt         | 2 +-
 zscript/utcommon.zsc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cvarinfo.txt b/cvarinfo.txt
index 64474d2..11b7961 100644
--- a/cvarinfo.txt
+++ b/cvarinfo.txt
@@ -3,7 +3,7 @@ user bool flak_showmenu = true;
 server bool flak_pulsereload = false;
 server bool flak_enforcerreload = false;
 user bool flak_redeemerreadout = true;
-user int flak_colorprefs = 0;
+user int flak_colorprefs = 2;
 user color flak_colorcustom = "00 80 ff";
 user int flak_opacity = 15;	// UT's opacity is 1 <-> 16 in steps of 1 (default 15)
 				// 16 means fully opaque, everything else is just additive with gradually lowering alpha
diff --git a/zscript/utcommon.zsc b/zscript/utcommon.zsc
index af59eee..a34b578 100644
--- a/zscript/utcommon.zsc
+++ b/zscript/utcommon.zsc
@@ -5,10 +5,10 @@ Class UTPlayer : DoomPlayer
 
 	Default
 	{
-		Player.StartItem "MiniAmmo", 30;
 		Player.StartItem "Enforcer";
 		Player.StartItem "Translocator";
 		Player.StartItem "ImpactHammer";
+		Player.StartItem "MiniAmmo", 30;
 		Player.DamageScreenColor "FF 00 00", 1.0;
 		Player.ViewHeight 46;
 	}