Skip to content

SERVER: Add ability to put Ray Gun Mk II in Mystery Box #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MotoLegacy merged 2 commits into from
Jan 24, 2026
Merged

SERVER: Add ability to put Ray Gun Mk II in Mystery Box #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b696af9
SERVER: Add ability to put Ray Gun Mk II in Mystery Box
MotoLegacy Jan 24, 2026
75672be
Mk II should not be enabled by default
MotoLegacy Jan 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/server/defs/custom.qc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 6 additions & 0 deletions source/server/entities/mystery_box.qc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions source/shared/weapon_stats.qc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down