Minor tweaks to the weapons and menu UI

src/client/hud.qc

@@ -355,12 +355,12 @@ HUD_DrawArmor(void)
 		HUD_DrawNums(pl.armor, pos + [40, 0], pSeatLocal->m_flArmorAlpha, g_hud_color);
 	} else {
 		drawsubpic(
-			pos + [-72,-14],
+			pos + [0,-14],
 			[32,16],
 			g_hud7_spr,
 			[spr_armor[0], spr_armor[1]],
 			[spr_armor[2], spr_armor[3]],
-			[1,0,0],
+			g_hud_color,
 			pSeatLocal->m_flArmorAlpha,
 			DRAWFLAG_ADDITIVE
 		);

src/server/progs.src

@@ -26,7 +26,6 @@ defs.h
 ../../../valve/src/server/item_suit.qc
 ../../../valve/src/server/item_healthkit.qc
 ../../../valve/src/server/item_battery.qc
-../../../valve/src/server/item_weaponbox.qc
 ../../../valve/src/server/world_items.qc
 ../../../valve/src/server/xen_spore_small.qc
 ../../../valve/src/server/xen_spore_medium.qc

src/server/server.qc

@@ -17,8 +17,6 @@
 void
 Game_InitRules(void)
 {	
-	forceinfokey(world, "ctf", "0");
-
 	if (cvar("sv_playerslots") == 1 || cvar("coop") == 1) {
 		g_grMode = spawn(HLSingleplayerRules);
 	} else {

src/shared/items.h

@@ -15,17 +15,17 @@
  */
 
 #define ITEM_CROWBAR		0x00000001i
-#define ITEM_GLOCK		0x00000002i
-#define ITEM_PYTHON		0x00000004i
-#define ITEM_MP5		0x00000008i
-#define ITEM_CROSSBOW		0x00000010i
-#define ITEM_SHOTGUN		0x00000020i
-#define ITEM_RPG		0x00000040i
-#define ITEM_GAUSS		0x00000080i
+#define ITEM_GRAVITYGUN		0x00000002i
+#define ITEM_PISTOL		0x00000004i
+#define ITEM_357		0x00000008i
+#define ITEM_SMG1		0x00000010i
+#define ITEM_AR2		0x00000020i
+#define ITEM_SHOTGUN		0x00000040i
+#define ITEM_CROSSBOW		0x00000080i
 
-#define ITEM_EGON		0x00000100i
-#define ITEM_HORNETGUN		0x00000200i
-#define ITEM_HANDGRENADE	0x00000400i
+#define ITEM_FRAG		0x00000100i
+#define ITEM_RPG		0x00000200i
+#define ITEM_BUGBAIT	0x00000400i
 #define ITEM_TRIPMINE		0x00000800i
 #define ITEM_SATCHEL		0x00001000i
 #define ITEM_SNARK		0x00002000i

src/shared/w_357.qc

@@ -297,7 +297,7 @@ w_357_type(player pl)
 weapon_t w_357 =
 {
 	.name		= "357",
-	.id			= ITEM_PYTHON,
+	.id			= ITEM_357,
 	.slot		= 1,
 	.slot_pos	= 1,
 	.weight		= 15,

src/shared/w_ar2.qc

@@ -260,7 +260,7 @@ w_ar2_type(player pl)
 weapon_t w_ar2 =
 {
 	.name		= "hornet",
-	.id			= ITEM_HORNETGUN,
+	.id			= ITEM_AR2,
 	.slot		= 2,
 	.slot_pos	= 1,
 	.weight		= 10,

src/shared/w_bugbait.qc

@@ -259,7 +259,7 @@ w_bugbait_type(player pl)
 weapon_t w_bugbait =
 {
 	.name		= "grenade",
-	.id			= ITEM_HANDGRENADE,
+	.id			= ITEM_BUGBAIT,
 	.slot		= 5,
 	.slot_pos	= 0,
 	.weight		= 5,

src/shared/w_frag.qc

@@ -240,7 +240,7 @@ w_frag_type(player pl)
 weapon_t w_frag =
 {
 	.name		= "grenade",
-	.id			= ITEM_HANDGRENADE,
+	.id			= ITEM_FRAG,
 	.slot		= 4,
 	.slot_pos	= 0,
 	.weight		= 5,

src/shared/w_gravitygun.qc

@@ -258,7 +258,7 @@ w_gravitygun_type(player pl)
 weapon_t w_gravitygun =
 {
 	.name		= "egon",
-	.id			= ITEM_EGON,
+	.id			= ITEM_GRAVITYGUN,
 	.slot		= 0,
 	.slot_pos	= 1,
 	.weight		= 15,

src/shared/w_pistol.qc

@@ -340,7 +340,7 @@ w_pistol_type(player pl)
 weapon_t w_pistol =
 {
 	.name		= "9mmhandgun",
-	.id			= ITEM_GLOCK,
+	.id			= ITEM_PISTOL,
 	.slot		= 1,
 	.slot_pos	= 0,
 	.weight		= 10,

src/shared/w_smg1.qc

@@ -364,7 +364,7 @@ w_smg1_type(player pl)
 weapon_t w_smg1 =
 {
 	.name		= "9mmAR",
-	.id			= ITEM_MP5,
+	.id			= ITEM_SMG1,
 	.slot		= 2,
 	.slot_pos	= 0,
 	.weight		= 15,

zpak001.pk3dir/gfx/background.mat

@@ -0,0 +1,5 @@
+{
+	{
+		map "materials/Console/background01.vtf"
+	}
+}

zpak001.pk3dir/scripts/ui_style.txt

@@ -0,0 +1,3 @@
+COLOR=76 88 68
+FG_COLOR=255 255 255
+ALPHA=255