From b696af9c637ea84ed4b25d4c321a4fa4b7dd2215 Mon Sep 17 00:00:00 2001 From: cypress Date: Sat, 24 Jan 2026 12:04:22 -0800 Subject: [PATCH 1/2] SERVER: Add ability to put Ray Gun Mk II in Mystery Box --- source/server/defs/custom.qc | 2 +- source/server/entities/mystery_box.qc | 1 + source/shared/weapon_stats.qc | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source/server/defs/custom.qc b/source/server/defs/custom.qc index 17b9c07..bce7c2c 100644 --- a/source/server/defs/custom.qc +++ b/source/server/defs/custom.qc @@ -507,7 +507,7 @@ string game_modifier_hellhound_fog_color; string game_modifier_default_fog_color; // Mystery Box -#define MAX_BOX_WEAPONS 27 +#define MAX_BOX_WEAPONS 28 .float boxstatus; .entity boxweapon; diff --git a/source/server/entities/mystery_box.qc b/source/server/entities/mystery_box.qc index 9a1dc8a..0cd27dd 100644 --- a/source/server/entities/mystery_box.qc +++ b/source/server/entities/mystery_box.qc @@ -757,6 +757,7 @@ float MBOX_GetWeaponIDFromMB1(float mbox_id) = case 24: return W_TYPE; case 25: return W_MP5K; case 26: return W_SPRING; + case 27: return W_RAYMK2; default: return W_COLT; } return W_COLT; diff --git a/source/shared/weapon_stats.qc b/source/shared/weapon_stats.qc index 76f9a1a..8955900 100644 --- a/source/shared/weapon_stats.qc +++ b/source/shared/weapon_stats.qc @@ -5278,6 +5278,7 @@ float(string weapon) WepDef_GetWeaponIDFromName = case "wunderwaffe": return W_TESLA; case "mp5k": return W_MP5K; case "springfield": return W_SPRING; + case "ray_gun_2": return W_RAYMK2; default: return W_NOWEP; } return W_COLT; From 75672be8f3d5780649c962d05ca629953ccc5392 Mon Sep 17 00:00:00 2001 From: cypress Date: Sat, 24 Jan 2026 12:06:39 -0800 Subject: [PATCH 2/2] Mk II should not be enabled by default --- source/server/entities/mystery_box.qc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/server/entities/mystery_box.qc b/source/server/entities/mystery_box.qc index 0cd27dd..c778450 100644 --- a/source/server/entities/mystery_box.qc +++ b/source/server/entities/mystery_box.qc @@ -959,6 +959,11 @@ void() MBOX_LoadData = mystery_box_weapons[i].weapon_id = MBOX_GetWeaponIDFromMB1(i); mystery_box_weapons[i].allowed = true; mystery_box_weapons[i].rarity = -1; + + // .. except the Mk II + if (mystery_box_weapons[i].weapon_id == W_RAYMK2) { + mystery_box_weapons[i].allowed = false; + } } // Precache it all.