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..c778450 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; @@ -958,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. 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;