Skip to content

Highlander Mode #154

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

Open
darkshade9 wants to merge 7 commits into
base: aqtion-alpha
Choose a base branch
from
Open

Highlander Mode #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9bd6604
Highlander Mode
darkshade9 Dec 6, 2023
9165842
Set a limit on how many players per team in highlander mode
darkshade9 Dec 6, 2023
d2494b4
Turning bots off forcibly if highlander is on
darkshade9 Dec 6, 2023
7f589b0
Added a team size check, highlander limiter
darkshade9 Dec 8, 2023
3dd9b96
Forgot to save g_local
darkshade9 Dec 8, 2023
1750f5f
Unequip client if they choose their already-equipped weapon
darkshade9 Dec 11, 2023
fec1380
Merge branch 'aqtion-alpha' into gamemode/highlander
darkshade9 Dec 19, 2023
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
1 change: 1 addition & 0 deletions source/a_menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ void PMenu_Close (edict_t * ent)

memset(&ent->client->menu, 0, sizeof(ent->client->menu));
ent->client->layout = LAYOUT_NONE;
ent->client->curr_menu = MENU_NONE;
}

void PMenu_Update (edict_t * ent)
Expand Down
190 changes: 185 additions & 5 deletions source/a_team.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ edict_t *NS_potential_spawns[MAX_TEAMS][MAX_SPAWNS];
edict_t *NS_used_farteamplay_spawns[MAX_TEAMS][MAX_SPAWNS];
int NS_randteam;
// </TNG:Freud>
weapon_status_t weapon_status[WEAPON_MAX][MAX_TEAMS];

void CreditsMenu (edict_t * ent, pmenu_t * p);
static transparent_list_t transparentList[MAX_CLIENTS];
Expand Down Expand Up @@ -588,6 +589,9 @@ void LeaveTeams (edict_t * ent, pmenu_t * p)

void SelectWeapon2(edict_t *ent, pmenu_t *p)
{
if (highlander->value && !Highlander_Check(ent, MP5_NUM))
return;

ent->client->pers.chosenWeapon = GET_ITEM(MP5_NUM);
PMenu_Close(ent);
if(!item_kit_mode->value){
Expand All @@ -600,6 +604,9 @@ void SelectWeapon2(edict_t *ent, pmenu_t *p)

void SelectWeapon3(edict_t *ent, pmenu_t *p)
{
if (highlander->value && !Highlander_Check(ent, M3_NUM))
return;

ent->client->pers.chosenWeapon = GET_ITEM(M3_NUM);
PMenu_Close(ent);
if(!item_kit_mode->value){
Expand All @@ -612,6 +619,9 @@ void SelectWeapon3(edict_t *ent, pmenu_t *p)

void SelectWeapon4(edict_t *ent, pmenu_t *p)
{
if (highlander->value && !Highlander_Check(ent, HC_NUM))
return;

ent->client->pers.chosenWeapon = GET_ITEM(HC_NUM);
PMenu_Close(ent);
if(!item_kit_mode->value){
Expand All @@ -624,6 +634,9 @@ void SelectWeapon4(edict_t *ent, pmenu_t *p)

void SelectWeapon5(edict_t *ent, pmenu_t *p)
{
if (highlander->value && !Highlander_Check(ent, SNIPER_NUM))
return;

ent->client->pers.chosenWeapon = GET_ITEM(SNIPER_NUM);
PMenu_Close(ent);
if(!item_kit_mode->value){
Expand All @@ -636,6 +649,9 @@ void SelectWeapon5(edict_t *ent, pmenu_t *p)

void SelectWeapon6(edict_t *ent, pmenu_t *p)
{
if (highlander->value && !Highlander_Check(ent, M4_NUM))
return;

ent->client->pers.chosenWeapon = GET_ITEM(M4_NUM);
PMenu_Close(ent);
if(!item_kit_mode->value){
Expand All @@ -648,6 +664,9 @@ void SelectWeapon6(edict_t *ent, pmenu_t *p)

void SelectWeapon0(edict_t *ent, pmenu_t *p)
{
if (highlander->value && !Highlander_Check(ent, KNIFE_NUM))
return;

ent->client->pers.chosenWeapon = GET_ITEM(KNIFE_NUM);
PMenu_Close(ent);
if(!item_kit_mode->value){
Expand All @@ -660,6 +679,9 @@ void SelectWeapon0(edict_t *ent, pmenu_t *p)

void SelectWeapon9(edict_t *ent, pmenu_t *p)
{
if (highlander->value && !Highlander_Check(ent, DUAL_NUM))
return;

ent->client->pers.chosenWeapon = GET_ITEM(DUAL_NUM);
PMenu_Close(ent);
if(!item_kit_mode->value){
Expand All @@ -670,6 +692,13 @@ void SelectWeapon9(edict_t *ent, pmenu_t *p)
unicastSound(ent, gi.soundindex("weapons/mk23slide.wav"), 1.0);
}

void UnequipWeapon(edict_t *ent)
{
ent->client->pers.chosenWeapon = NULL;
PMenu_Close(ent);
unicastSound(ent, gi.soundindex("weapons/swish.wav"), 1.0);
}

void SelectItem1(edict_t *ent, pmenu_t *p)
{
ent->client->pers.chosenItem = GET_ITEM(KEV_NUM);
Expand Down Expand Up @@ -1120,6 +1149,7 @@ pmenu_t pmitemmenu[] = {
void OpenPMItemMenu(edict_t *ent)
{
PMenu_Open(ent, pmitemmenu, 2, sizeof(pmitemmenu) / sizeof(pmenu_t));
ent->client->curr_menu = MENU_PMITEM;
}

//End PaTMaN's jmod add
Expand All @@ -1129,6 +1159,7 @@ void VotingMenu (edict_t * ent, pmenu_t * p)
{
PMenu_Close (ent);
vShowMenu (ent, "");
ent->client->curr_menu = MENU_VOTING;
}
//AQ2:TNG END

Expand Down Expand Up @@ -1164,6 +1195,7 @@ void CreditsMenu (edict_t * ent, pmenu_t * p)
{
PMenu_Close (ent);
PMenu_Open (ent, creditsmenu, 4, sizeof (creditsmenu) / sizeof (pmenu_t));
ent->client->curr_menu = MENU_CREDITS;
unicastSound(ent, gi.soundindex("world/elv.wav"), 1.0);
}

Expand Down Expand Up @@ -1361,6 +1393,36 @@ int TP_GetTeamFromArg(const char *name)
return -1;
}

qboolean TeamSizeLimiter(edict_t *ent, int teamNum, int teamSize)
{
// // Count number of players on each team
// int team1count = 0;
// int team2count = 0;
// int team3count = 0;
// int i;
// for (i = 0; i < maxclients->value; i++) {
// edict_t *player = &g_edicts[i + 1];
// if (!player->inuse || !player->client)
// continue;
// if (player->client->resp.team == TEAM1)
// team1count++;
// else if (player->client->resp.team == TEAM2)
// team2count++;
// else if (player->client->resp.team == TEAM3)
// team3count++;
// }
// Check if the desired team size exceeds the maximum allowed size
if (highlander->value) {
if ((teamNum == TEAM1 && level.teamcount[TEAM1] >= teamSize) ||
(teamNum == TEAM2 && level.teamcount[TEAM2] >= teamSize) ||
(teamNum == TEAM3 && level.teamcount[TEAM3] >= teamSize)) {
gi.cprintf(ent, PRINT_HIGH, "Highlander Mode: Cannot join team %s: Max players per team is %i\n", TeamName(teamNum), teamSize);
return false;
}
}
return true;
}

void Team_f (edict_t * ent)
{
char *t;
Expand Down Expand Up @@ -1433,6 +1495,7 @@ void JoinTeam (edict_t * ent, int desired_team, int skip_menuclose)
if (!skip_menuclose)
PMenu_Close (ent);


oldTeam = ent->client->resp.team;
if (oldTeam == desired_team || ent->client->pers.mvdspec)
return;
Expand Down Expand Up @@ -1463,11 +1526,24 @@ void JoinTeam (edict_t * ent, int desired_team, int skip_menuclose)
}
}
}


if (highlander->value){
int i;
for (i = TEAM1; i < TEAM_TOP; i++) {
if (!TeamSizeLimiter(ent, i, HIGHLANDER_MAX_PLAYERS)) {
return;
}
}
}

MM_LeftTeam( ent );

a = (oldTeam == NOTEAM) ? "joined" : "changed to";

// Team count update
level.teamcount[ent->client->resp.team]--;
level.teamcount[desired_team]++;

ent->client->resp.team = desired_team;
s = Info_ValueForKey (ent->client->pers.userinfo, "skin");
AssignSkin(ent, s, false);
Expand Down Expand Up @@ -1552,6 +1628,7 @@ void LeaveTeam (edict_t * ent)

MM_LeftTeam( ent );

level.teamcount[ent->client->resp.team]--;
if (esp->value)
EspLeaderLeftTeam ( ent );

Expand Down Expand Up @@ -1644,6 +1721,7 @@ void OpenItemMenu (edict_t * ent)
}

PMenu_Open(ent, itemmenu, 4, sizeof(itemmenu) / sizeof(pmenu_t));
ent->client->curr_menu = MENU_ITEMS;
return;
}
}
Expand Down Expand Up @@ -1678,6 +1756,7 @@ void OpenItemKitMenu (edict_t * ent)
}

PMenu_Open(ent, itemkitmenu, 4, sizeof(itemkitmenu) / sizeof(pmenu_t));
ent->client->curr_menu = MENU_ITEMKITS;
return;
}

Expand All @@ -1689,6 +1768,7 @@ void OpenWeaponMenu (edict_t * ent)
if (use_randoms->value)
{
PMenu_Open(ent, randmenu, 4, sizeof(randmenu) / sizeof(pmenu_t));
ent->client->curr_menu = MENU_RANDOM;
return;
}

Expand All @@ -1711,9 +1791,20 @@ void OpenWeaponMenu (edict_t * ent)
if (!WPF_ALLOWED(menuEntry->itemNum))
continue;

weapmenu[pos].text = menu_itemnames[menuEntry->itemNum];
weapmenu[pos].SelectFunc = menuEntry->SelectFunc;
char *weaponName = menu_itemnames[menu_items[i].itemNum];
if (ent->client->pers.chosenWeapon && ent->client->pers.chosenWeapon->typeNum == menu_items[i].itemNum) {
char *modifiedWeaponName = (char *)malloc(sizeof(char) * 32); // Dynamically allocate memory
snprintf(modifiedWeaponName, 32, "@%s", weaponName);
weaponName = modifiedWeaponName;
}

weapmenu[pos].text = weaponName;
weapmenu[pos].SelectFunc = menu_items[i].SelectFunc;
pos++;
// If weaponName was modified, free the allocated memory
if (ent->client->pers.chosenWeapon && ent->client->pers.chosenWeapon->typeNum == menu_items[i].itemNum) {
free(weaponName);
}
}

if (pos > 4)
Expand All @@ -1725,6 +1816,7 @@ void OpenWeaponMenu (edict_t * ent)
}

PMenu_Open(ent, weapmenu, 4, sizeof(weapmenu) / sizeof(pmenu_t));
ent->client->curr_menu = MENU_WEAPONS;
return;
}
}
Expand Down Expand Up @@ -1839,6 +1931,7 @@ void OpenJoinMenu (edict_t * ent)
UpdateJoinMenu();

PMenu_Open (ent, joinmenu, 11 /* magic for Auto-join menu item */, sizeof (joinmenu) / sizeof (pmenu_t));
ent->client->curr_menu = MENU_TEAM;
}

void gib_die( edict_t *self, edict_t *inflictor, edict_t *attacker, int damage, vec3_t point ); // g_misc
Expand Down Expand Up @@ -2232,9 +2325,13 @@ static void SpawnPlayers(void)

// make sure teamplay spawners always have some weapon, warmup starts only after weapon selected
if (!ent->client->pers.chosenWeapon) {
if (WPF_ALLOWED(MP5_NUM)) {
if (!highlander->value){
ent->client->pers.chosenWeapon = GET_ITEM(MP5_NUM); // Highlander mode removes default MP5
} else if (WPF_ALLOWED(MP5_NUM) && !highlander->value) {
ent->client->pers.chosenWeapon = GET_ITEM(MP5_NUM);
} else if (WPF_ALLOWED(MK23_NUM)) {
}

if (WPF_ALLOWED(MK23_NUM)) {
ent->client->pers.chosenWeapon = GET_ITEM(MK23_NUM);
} else if (WPF_ALLOWED(KNIFE_NUM)) {
ent->client->pers.chosenWeapon = GET_ITEM(KNIFE_NUM);
Expand Down Expand Up @@ -4140,6 +4237,89 @@ void NS_SetupTeamSpawnPoints ()
}
}

qboolean Highlander_Check(edict_t *ent, int weaponNum)
{
char *playername = ent->client->pers.netname;
gitem_t *chosenWeapon = ent->client->pers.chosenWeapon;
qboolean available = false;
qboolean weaponChange = false;
int i, j = 0;

// gi.dprintf("Is weapon available: %d\n", weapon_status[weaponNum].available);
// gi.dprintf("Which team owns it: %d\n", weapon_status[weaponNum].team);
// if (owner != NULL && owner->client->pers.netname != NULL)
// gi.dprintf("Which player owns it: %s\n", owner->client->pers.netname);
// gi.dprintf("Which team wants it: %d\n", ent->client->resp.team);
// gi.dprintf("Which player wants it: %s\n", playername);

// Run a check for availability
for (i = 0; i < WEAPON_MAX; i++) {
for (j = 0; j < TEAM_TOP; j++) {
// If the weapon has an owner in the current team, update its availability
if (weapon_status[i][j].owner != NULL) {
available = false;
} else {
available = true;
}
}
}

// If the player had a different weapon and is selecting this one, and it's available, return true,
// and release the previous weapon so that it made be selectable by another member of this team
if (ent->client->pers.chosenWeapon != NULL && available) {
weapon_status[ent->client->pers.chosenWeapon->typeNum][ent->client->resp.team].owner = NULL;
//gi.cprintf(ent, PRINT_HIGH, "Highlander Mode: %s selected %d, releasing %d\n", ent->client->pers.netname, weaponNum, ent->client->pers.chosenWeapon->typeNum);
weapon_status[weaponNum][ent->client->resp.team].owner = ent;
weaponChange = true;
}

if (available){
gi.cprintf(ent, PRINT_HIGH, "Highlander Mode: That weapon is available, selecting it\n");
gi.dprintf("Highlander Mode: That weapon is available, selecting it\n");
weapon_status[weaponNum][ent->client->resp.team].owner = ent;
weaponChange = true;
}

gi.dprintf("Owner team: %d\n", weapon_status[weaponNum][ent->client->resp.team].owner->client->resp.team);
gi.dprintf("Ent team: %d\n", ent->client->resp.team);
// The expectation is that the weapon is available always, unless it's owned by another player on your team
if (weapon_status[weaponNum][ent->client->resp.team].owner != ent &&
weapon_status[weaponNum][ent->client->resp.team].owner->client->resp.team == ent->client->resp.team &&
!available) {
gi.cprintf(ent, PRINT_HIGH, "Highlander Mode: That weapon is not available, %s owns it, select another\n", weapon_status[weaponNum][ent->client->resp.team].owner->client->pers.netname);
gi.cprintf(weapon_status[weaponNum][ent->client->resp.team].owner, PRINT_HIGH, "%s wants your weapon!\n", playername);
return false;
}

// If the player already selected this weapon, unequip it
if (ent->client->pers.chosenWeapon != NULL && ent->client->pers.chosenWeapon->typeNum == weaponNum) {
gi.cprintf(ent, PRINT_HIGH, "Highlander Mode: Unequipping weapon to make it available to others\n");
weapon_status[ent->client->pers.chosenWeapon->typeNum][ent->client->resp.team].owner = NULL;
UnequipWeapon(ent);
}

if (weaponChange){

// Attempt to auto-refresh the menu:

// for (int i = 0; i < maxclients->value; i++) {
// edict_t *ent = g_edicts + 1 + i;

// if (!ent->inuse || !ent->client || ent->is_bot)
// continue;

// if (ent->client->layout == LAYOUT_MENU && ent->client->curr_menu == MENU_WEAPONS) {
// gi.dprintf("Refreshing menu for %s, they were in menu %d\n", ent->client->pers.netname, ent->client->curr_menu);
// PMenu_Close(ent);
// PMenu_Open(ent, weapmenu, 4, sizeof(weapmenu) / sizeof(pmenu_t));
// }
// }
return true;
}

return false;
}

/*
Simple function that just returns the opposite team number
Obviously, do not use this for 3team functions
Expand Down
Loading