From: terencehill <piuntn@gmail.com>
Date: Tue, 13 Sep 2016 11:27:37 +0000 (+0200)
Subject: Assault: when the first round ends show the message "Objective destroyed in X minutes... 
X-Git-Tag: xonotic-v0.8.2~389^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ead7778895696bab9476b05cf382dab9c3ac2f23;p=xonotic%2Fxonotic-data.pk3dir.git

Assault: when the first round ends show the message "Objective destroyed in X minutes" and block the game for 5 seconds before starting the other round in order to show objective destruction
---

diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc
index b9f7b36a9..81cc3bec2 100644
--- a/qcsrc/common/notifications/all.inc
+++ b/qcsrc/common/notifications/all.inc
@@ -505,6 +505,7 @@
 
     MSG_CENTER_NOTIF(ASSAULT_ATTACKING,                 1,      0, 0, "",               CPID_ASSAULT_ROLE,      "0 0",  _("^BGYou are attacking!"), "")
     MSG_CENTER_NOTIF(ASSAULT_DEFENDING,                 1,      0, 0, "",               CPID_ASSAULT_ROLE,      "0 0",  _("^BGYou are defending!"), "")
+    MSG_CENTER_NOTIF(ASSAULT_OBJ_DESTROYED,             1,      0, 1, "f1time",         CPID_ASSAULT_ROLE,      "0 0",  _("^BGObjective destroyed in ^F4%s^BG!"), "")
 
     MSG_CENTER_NOTIF(COUNTDOWN_BEGIN,                   1,      0, 0, "",               CPID_ROUND,             "2 0",  _("^F4Begin!"), "")
     MSG_CENTER_NOTIF(COUNTDOWN_GAMESTART,               1,      0, 1, "",               CPID_ROUND,             "1 f1", _("^F4Game starts in ^COUNT"), "")
diff --git a/qcsrc/server/mutators/mutator/gamemode_assault.qc b/qcsrc/server/mutators/mutator/gamemode_assault.qc
index 10a8f644f..6b31dbf2f 100644
--- a/qcsrc/server/mutators/mutator/gamemode_assault.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_assault.qc
@@ -1,6 +1,7 @@
 #include "gamemode_assault.qh"
 
 .entity sprite;
+#define AS_ROUND_DELAY 5
 
 // random functions
 void assault_objective_use(entity this, entity actor, entity trigger)
@@ -213,14 +214,27 @@ void assault_new_round(entity this)
 	});
 
 	// reset the level with a countdown
-	cvar_set("timelimit", ftos(ceil(time - game_starttime) / 60));
+	cvar_set("timelimit", ftos(ceil(time - AS_ROUND_DELAY - game_starttime) / 60));
 	ReadyRestart_force(); // sets game_starttime
 }
 
+entity as_round;
+.entity ent_winning;
+void as_round_think()
+{
+	gameover = false;
+	assault_new_round(as_round.ent_winning);
+	delete(as_round);
+	as_round = NULL;
+}
+
 // Assault winning condition: If the attackers triggered a round end (by fulfilling all objectives)
 // they win. Otherwise the defending team wins once the timelimit passes.
 int WinningCondition_Assault()
 {
+	if(as_round)
+		return WINNING_NO;
+
 	WinningConditionHelper(NULL); // set worldstatus
 
 	int status = WINNING_NO;
@@ -240,7 +254,7 @@ int WinningCondition_Assault()
 	{
 		if(ent.winning)	// round end has been triggered by attacking team
 		{
-			bprint("ASSAULT: round completed...\n");
+			bprint("Assault: round completed.\n");
 			SetWinners(team, assault_attacker_team);
 
 			TeamScore_AddToTeam(assault_attacker_team, ST_ASSAULT_OBJECTIVES, 666 - TeamScore_AddToTeam(assault_attacker_team, ST_ASSAULT_OBJECTIVES, 0));
@@ -251,7 +265,17 @@ int WinningCondition_Assault()
 			}
 			else
 			{
-				assault_new_round(ent);
+				Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_ASSAULT_OBJ_DESTROYED, ceil(time - game_starttime));
+				as_round = new(as_round);
+				as_round.think = as_round_think;
+				as_round.ent_winning = ent;
+				as_round.nextthink = time + AS_ROUND_DELAY;
+				gameover = true;
+
+				// make sure timelimit isn't hit while the game is blocked
+				if(autocvar_timelimit > 0)
+				if(time + AS_ROUND_DELAY >= game_starttime + autocvar_timelimit * 60)
+					cvar_set("timelimit", ftos(autocvar_timelimit + AS_ROUND_DELAY / 60));
 			}
 		}
 	}