Merge pull request #129 from nzp-team/cypress_8p

GLOBAL: Implement 8 player support, custom games, game mode support

Author: MotoLegacy

progs/menu.src

@@ -23,6 +23,8 @@ menu_aces.qc     // Accessibility Menu
 menu_cred.qc     // Credits Menu
 menu_load.qc     // Loading Screen
 menu_coop.qc     // Co-op Menu
+menu_gset.qc     // Game Settings
+menu_loby.qc     // Lobby Menu
 
 main.qc
 #endlist

progs/ssqc.src

@@ -79,6 +79,11 @@ ai/zombie_core.qc
 ai/crawler_core.qc
 ai/dog_core.qc
 utilities/map_compatibility.qc
+gamemodes/gun_game.qc
+gamemodes/hardcore.qc
+gamemodes/wild_west.qc
+gamemodes/sticks_and_stones.qc
+gamemodes/core.qc
 #ifdef QUAKEC_TEST
 tests/test_math.qc
 tests/test_perksacola.qc

source/client/defs/custom.qc

@@ -47,6 +47,8 @@ float useprint_weapon;
 float useprint_cost;
 float useprint_time;
 
+float active_gamemode;
+
 float bettyprompt_time;
 
 float hud_maxammo_endtime;
@@ -67,11 +69,13 @@ float broadcast_num;
 
 string character_name;
 
+#define MAX_REVIVE_ICONS	16
+
 var struct revive_s {
 	float draw;
 	float timer;
 	float state;
-} revive_icons[4]; // MAX_CLIENTS
+} revive_icons[MAX_REVIVE_ICONS];
 
 float weaponframetime;
 float weapon2frametime;

source/client/hud.qc

@@ -553,10 +553,10 @@ void() HUD_Rounds =
 			}
 		}
 
-		Draw_String([3 + GetUltraWideOffset(), g_height/2 + 24], chaptertitle, [12, 12], [1, 1, 1], localpha, 0);
-		Draw_String([3 + GetUltraWideOffset(), g_height/2 + 36], location, [12, 12], [1, 1, 1], localpha, 0);
-		Draw_String([3 + GetUltraWideOffset(), g_height/2 + 48], date, [12, 12], [1, 1, 1], localpha, 0);
-		Draw_String([3 + GetUltraWideOffset(), g_height/2 + 60], person, [12, 12], [1, 1, 1], localpha, 0);
+		Draw_String([g_width - 3 - GetUltraWideOffset() - getTextWidth(chaptertitle, 12), g_height/2 + 48], chaptertitle, [12, 12], [1, 1, 1], localpha, 0);
+		Draw_String([g_width - 3 - GetUltraWideOffset() - getTextWidth(location, 12), g_height/2 + 60], location, [12, 12], [1, 1, 1], localpha, 0);
+		Draw_String([g_width - 3 - GetUltraWideOffset() - getTextWidth(date, 12), g_height/2 + 72], date, [12, 12], [1, 1, 1], localpha, 0);
+		Draw_String([g_width - 3 - GetUltraWideOffset() - getTextWidth(person, 12), g_height/2 + 84], person, [12, 12], [1, 1, 1], localpha, 0);
 	}
 
 	if (rounds_change == 1)//this is the rounds icon at the middle of the screen
@@ -1095,7 +1095,7 @@ void() HUD_Useprint =
 			usestring = "The Power must be Activated first";
 			break;
 		case 9://perk
-			usestring = strcat("Hold  ",usespace, " to buy ", GetPerkName(useprint_weapon));
+			usestring = strcat("Hold  ",usespace, " to buy ", GetItemName(useprint_weapon));
 			usecost = strcat("[Cost: ", ftos(useprint_cost), "]");
 			break;
 		case 10://turn on power
@@ -1135,14 +1135,27 @@ void() HUD_Useprint =
 			usestring = strcat("Hold  ", usespace, " to End the Game");
 			usecost = strcat("[Cost: ", ftos(useprint_cost), "]");
 			break;
+		case 21: // Magic disabled
+			usestring = "...";
+			break;
+		case 22: // Jugger-Nog (NIGHTMARE)
+			usestring = "It doesn't seem to be working..";
+			break;
+		case 23: // Tactical Nuke (Gun Game)
+			usestring = strcat("Hold ", usespace, " to Drop the Nuke");
+			break;
 		default:
 			usestring = "This should not happen you dum fuck"; //yikes
 			break;
 	}
 
 	print_width = getTextWidth(usestring, 12);
 	x = (g_width - print_width)/2;
-	HUD_DrawStringWithBackdrop([x, g_height/2 + 65, 0], usestring, [12, 12, 0], [1, 1, 1], 1, 0);
+
+	if (useprint_type == 22)
+		HUD_DrawStringWithBackdrop([x, g_height/2 + 65, 0], usestring, [12, 12, 0], [1, 0, 0], 1, 0);
+	else
+		HUD_DrawStringWithBackdrop([x, g_height/2 + 65, 0], usestring, [12, 12, 0], [1, 1, 1], 1, 0);
 
 	// Draw "Cost" text.
 	if (usecost != "") {
@@ -1643,6 +1656,12 @@ void() HUD_Broadcast =
 		case CSQC_BROADCAST_REVIVINGPLAYER:
 			broadcast_msg = strcat("Reviving ", broadcast_name);
 			break;
+		case CSQC_BROADCAST_GUNGAMEADVANCEMENT:
+			broadcast_msg = strcat(broadcast_name, " reached a new tier!");
+			break;
+		case CSQC_BROADCAST_GUNGAMEWINNER:
+			broadcast_msg = strcat(broadcast_name, " can Activate the Nuke!");
+			break;
 		case CSQC_BROADCAST_NONE:
 			broadcast_msg = "";
 			break;
@@ -2044,6 +2063,25 @@ void() HUD_Spectator =
 	drawfill([5, 60], [240, 3], [0.3, 0.3, 0.3], 1, 0);
 }
 
+void() HUD_GunGame =
+{
+	drawfill([g_width/2 - 318, 4], [636, 45], [0, 0, 0], cvar("cl_textopacity"), 0);
+
+	string weapon_id = "";
+	string point_info = "";
+
+	if (getstatf(STAT_GUNGAME_IDX) >= 100) {
+		weapon_id = "You've passed all weapons!";
+		point_info = "The Winner can choose to End the Game";
+	} else {
+		weapon_id = sprintf("%s [%d/32]", GetWeaponName(getstatf(STAT_ACTIVEWEAPON)), getstatf(STAT_GUNGAME_IDX) + 1);
+		point_info = sprintf("[%d] Score until next Weapon", getstatf(STAT_GUNGAME_SCOREGOAL) - getstatf(STAT_TOTALSCORE));
+	}
+
+	Draw_String([g_width/2 - getTextWidth(weapon_id, 18)/2, 8], weapon_id, [18, 18], [1, 1, 1], 1, 0);
+	Draw_String([g_width/2 - getTextWidth(point_info, 12)/2, 30], point_info, [12, 12], [1, 1, 0], 1, 0);
+}
+
 void() HUD_PlayerNames =
 {
 	for (float i = 7; i >= 0; i = i - 1) {
@@ -2262,6 +2300,54 @@ void() HUD_DrawElementsForWaypointMode =
 	HUD_PlayerDebugInfo();
 };
 
+//
+// HUD_DrawElementsForHardcorePlayer()
+// Heads-Up Display draw logic during Hardcore mode.
+//
+void() HUD_DrawElementsForHardcorePlayer =
+{
+	// We shouldn't draw anything during the game intro fade.
+	if (screenflash_color == SCREENFLASH_COLOR_BLACK && screenflash_duration > time) {
+		HUD_Screenflash();
+		return;
+	}
+
+	// Blood filter on screen to indicate health.
+	HUD_Health();
+
+	// If the scoreboard is open, only draw it and nothing else.
+	if (score_show) {
+		HUD_Scores();
+		return;
+	}
+	// Additionally, bail here if cl_cinematic is set.
+	else if (cvar("cl_cinematic")) {
+		return;
+	}
+
+	// Being scoped-in hides all low-priority elements.
+	if (getstatf(STAT_WEAPONZOOM) != 2 || zoom_2_time >= time) {
+		// Draws all player's points.
+		HUD_Points();
+	}
+
+	// Visual hit Feedback. 
+	HUD_Hitmark();
+
+	// Black/White/etc. total screen flashes.
+	HUD_Screenflash();
+
+	//
+	// Everything below should always have maximum priority.
+	//
+
+	// Revive indicator for Players in Last Stand.
+	HUD_ReviveIcons();
+
+	// "X" needs to be revived, or other important messages.
+	HUD_Broadcast();
+};
+
 //
 // HUD_DrawElementsForPlayer()
 // Heads-Up Display draw logic during normal play.
@@ -2329,6 +2415,11 @@ void() HUD_DrawElementsForPlayer =
 		// Bouncing Betty tutorial.		
 		HUD_BouncingBetty();
 
+		switch(active_gamemode) {
+			case GAMEMODE_GUNGAME: HUD_GunGame(); break;
+			default: break;
+		}
+
 		// Revive status progress bar.
 		HUD_Progressbar();
 	}
@@ -2398,6 +2489,14 @@ void() HUD_DrawElements =
 		return;
 	}
 
+	//
+	// Hardcore Mode has a more limited HUD
+	//
+	if (active_gamemode == GAMEMODE_HARDCORE) {
+		HUD_DrawElementsForHardcorePlayer();
+		return;
+	}
+
 	//
 	// Standard Play
 	//

source/client/main.qc

@@ -24,7 +24,6 @@
 		Boston, MA  02111-1307, USA
 
 */
-
 float need_vid_reload;
 
 void() ToggleMenu =
@@ -461,6 +460,7 @@ noref void(float isnew) CSQC_Ent_Update =
 		if (isnew == TRUE) {
 			self.classname = "item_powerup";
 			self.solid = SOLID_NOT;
+			self.effects = EF_FULLBRIGHT;
 			self.predraw = PU_PreDraw;
 			self.drawmask = MASK_ENGINE;
 		}
@@ -1074,6 +1074,9 @@ noref void() CSQC_Parse_Event =
 			if (cvar("in_rumbleenabled"))
 				gp_rumble(last_input_deviceid, low_frequency, high_frequency, duration);
 			break;
+		case CSQC_EVENT_SETGAMEMODE:
+			active_gamemode = readbyte();
+			break;
 		case EVENT_WEAPONRECOIL:
 			local vector rec;
             rec_x = readcoord()/5;
@@ -1161,8 +1164,35 @@ noref void() CSQC_Parse_Event =
 			date = readstring();
 			person = readstring();
 
-			if (chaptertitle == "")
-				chaptertitle = "'Nazi Zombies'";
+			switch(active_gamemode) {
+				case GAMEMODE_CLASSIC: 
+					if (chaptertitle == "")
+						chaptertitle = "'Nazi Zombies'";
+					break;
+				case GAMEMODE_GUNGAME:
+					chaptertitle = "GUN GAME";
+					location = "Cycle all Weapons to WIN!";
+					date = "";
+					person = "";
+					break;
+				case GAMEMODE_HARDCORE:
+					chaptertitle = "HARDCORE";
+					break;
+				case GAMEMODE_STICKSNSTONES:
+					chaptertitle = "STICKS & STONES";
+					location = "Ballistic Knife FTW!";
+					date = "";
+					person = "";
+					break;
+				case GAMEMODE_WILDWEST:
+					chaptertitle = "WILD WEST";
+					location = "It's a stand-off!";
+					date = "";
+					person = "";
+					break;
+				default:
+					break;
+			}
 			break;
 		case EVENT_PLAYERUPDATE:
 			player_count = readbyte();

source/client/view_model.qc

@@ -176,11 +176,11 @@ void(entity viewent) ViewModel_Animate =
         // make sure to update the HUD.
         if (getmodelindex(GetWeaponModel(getstatf(STAT_ACTIVEWEAPON), false)) == viewent.modelindex)
             HUD_Change_time = time + 7;
-
-        // Update the skin.
-        viewent.skin = getstatf(STAT_WEAPONSKIN);
     }
 
+    // Update the skin.
+    viewent.skin = getstatf(STAT_WEAPONSKIN);
+
     // Server requested a frame change
     if (new_frame != viewent.frame) {
         viewent.frame2 = viewent.frame;

source/menu/defs/menu_defs.qc

@@ -8,7 +8,9 @@ string menu_background;
 float menu_changetime;
 float menu_starttime;
 
+string current_selected_bsp;
 
+float last_map_menu;
 float current_menu;
 float running_platform;
 
@@ -56,11 +58,14 @@ enum {
     MENU_BINDINGS,
     MENU_ACCESSIBILITY,
     MENU_CREDITS,
-    MENU_PAUSE
+    MENU_PAUSE,
+    MENU_LOBBY,
+    MENU_GAMESETTINGS
 };
 
 #define MENU_SND_NAVIGATE 	0
 #define MENU_SND_ENTER 		1
+#define MENU_SND_BEEP       2
 void(float type) Menu_PlaySound;
 
 #ifdef MENU
@@ -73,6 +78,8 @@ void() Menu_Coop_Browse;
 void() Menu_Coop_Direct;
 void() Menu_Coop_Create;
 void() Menu_Credits;
+void() Menu_Lobby;
+void() Menu_GameSettings;
 
 #else
 
@@ -108,6 +115,12 @@ string(string next_id) Menu_Coop_GetPreviousButton;
 string(string prev_id) Menu_Maps_GetNextButton;
 string(string next_id) Menu_Maps_GetPreviousButton;
 
+string(string prev_id) Menu_Lobby_GetNextButton;
+string(string next_id) Menu_Lobby_GetPreviousButton;
+
+string(string prev_id) Menu_GameSettings_GetNextButton;
+string(string next_id) Menu_GameSettings_GetPreviousButton;
+
 #else
 
 string(string prev_id) Menu_Pause_GetNextButton;