X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fdomination.qc;h=a6cc9a88de0ac6d9f90f0775f3673d01d94c753f;hb=22cb4c947fe09c39d4ff0a3cdb629225b92c5c5c;hp=de18bfdd5c0a2e97b8ec5b1ea9c88e97ae4eca76;hpb=bd9b670cca7d94ed61720b5d5231bef96f00ef52;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/domination.qc b/qcsrc/server/domination.qc
index de18bfdd5..a6cc9a88d 100644
--- a/qcsrc/server/domination.qc
+++ b/qcsrc/server/domination.qc
@@ -21,6 +21,29 @@ Note: The only teams who can use dom control points are identified by spawnfunc_
 .entity sprite;
 .float captime;
 
+// pps: points per second
+.float dom_total_pps;
+.float dom_pps_red;
+.float dom_pps_blue;
+.float dom_pps_yellow;
+.float dom_pps_pink;
+float total_pps;
+float pps_red;
+float pps_blue;
+float pps_yellow;
+float pps_pink;
+void set_dom_state(entity e)
+{
+	// BIG ugly hack to make stat sending work
+	e.dom_total_pps = total_pps;
+	e.dom_pps_red = pps_red;
+	e.dom_pps_blue = pps_blue;
+	if(c3 >= 0)
+		e.dom_pps_yellow = pps_yellow;
+	if(c4 >= 0)
+		e.dom_pps_pink = pps_pink;
+}
+
 void() dom_controlpoint_setup;
 
 void LogDom(string mode, float team_before, entity actor)
@@ -86,9 +109,9 @@ void dompoint_captured ()
 
 	if (head.noise != "")
 		if(self.enemy)
-			sound(self.enemy, CHAN_AUTO, head.noise, VOL_BASE, ATTN_NORM);
+			sound(self.enemy, CH_TRIGGER, head.noise, VOL_BASE, ATTN_NORM);
 		else
-			sound(self, CHAN_TRIGGER, head.noise, VOL_BASE, ATTN_NORM);
+			sound(self, CH_TRIGGER_SINGLE, head.noise, VOL_BASE, ATTN_NORM);
 	if (head.noise1 != "")
 		play2all(head.noise1);
 
@@ -107,25 +130,57 @@ void dompoint_captured ()
 	self.delay = old_delay;
 	self.team = old_team;
 
+	switch(self.team)
+	{
+		// "fix" pps when slightly under 0 because of approximation errors
+		case COLOR_TEAM1:
+			pps_red -= (points/wait_time);
+			if (pps_red < 0) pps_red = 0;
+			break;
+		case COLOR_TEAM2:
+			pps_blue -= (points/wait_time);
+			if (pps_blue < 0) pps_blue = 0;
+			break;
+		case COLOR_TEAM3:
+			pps_yellow -= (points/wait_time);
+			if (pps_yellow < 0) pps_yellow = 0;
+			break;
+		case COLOR_TEAM4:
+			pps_pink -= (points/wait_time);
+			if (pps_pink < 0) pps_pink = 0;
+	}
+
 	switch(self.goalentity.team)
 	{
+		// "fix" pps when slightly over total_pps because of approximation errors
 		case COLOR_TEAM1:
+			pps_red += (points/wait_time);
+			if (pps_red > total_pps) pps_red = total_pps;
 			WaypointSprite_UpdateSprites(self.sprite, "dom-red", "", "");
 			break;
 		case COLOR_TEAM2:
+			pps_blue += (points/wait_time);
+			if (pps_blue > total_pps) pps_blue = total_pps;
 			WaypointSprite_UpdateSprites(self.sprite, "dom-blue", "", "");
 			break;
 		case COLOR_TEAM3:
+			pps_yellow += (points/wait_time);
+			if (pps_yellow > total_pps) pps_yellow = total_pps;
 			WaypointSprite_UpdateSprites(self.sprite, "dom-yellow", "", "");
 			break;
 		case COLOR_TEAM4:
+			pps_pink += (points/wait_time);
+			if (pps_pink > total_pps) pps_pink = total_pps;
 			WaypointSprite_UpdateSprites(self.sprite, "dom-pink", "", "");
-			break;
 	}
+
 	WaypointSprite_UpdateTeamRadar(self.sprite, RADARICON_DOMPOINT, colormapPaletteColor(self.goalentity.team - 1, 0));
 	WaypointSprite_Ping(self.sprite);
 
 	self.captime = time;
+
+	FOR_EACH_REALCLIENT(head)
+		set_dom_state(head);
 };
 
 void AnimateDomPoint()
@@ -305,11 +360,23 @@ void dom_controlpoint_setup()
 	if(!self.message)
 		self.message = " has captured a control point";
 
-	if(!self.DOMPOINTFRAGS)
+	if(self.DOMPOINTFRAGS <= 0)
 		self.DOMPOINTFRAGS = 1;
-	if(!self.wait)
+	if(self.wait <= 0)
 		self.wait = 5;
 
+	float points, waittime;
+	if (autocvar_g_domination_point_rate)
+		points = autocvar_g_domination_point_rate;
+	else
+		points = self.frags;
+	if (autocvar_g_domination_point_amt)
+		waittime = autocvar_g_domination_point_amt;
+	else
+		waittime = self.wait;
+
+	total_pps += points/waittime;
+
 	if(!self.t_width)
 		self.t_width = 0.02; // frame animation rate
 	if(!self.t_length)
@@ -325,8 +392,7 @@ void dom_controlpoint_setup()
 	droptofloor();
 
 	waypoint_spawnforitem(self);
-	WaypointSprite_SpawnFixed("dom-neut", self.origin + '0 0 32', self, sprite);
-	WaypointSprite_UpdateTeamRadar(self.sprite, RADARICON_DOMPOINT, '0 1 1');
+	WaypointSprite_SpawnFixed("dom-neut", self.origin + '0 0 32', self, sprite, RADARICON_DOMPOINT, '0 1 1');
 };
 
 
@@ -641,5 +707,11 @@ void dom_init()
 	precache_model("models/domination/dom_unclaimed.md3");
 	precache_sound("domination/claim.wav");
 	InitializeEntity(world, dom_delayedinit, INITPRIO_GAMETYPE);
+
+	addstat(STAT_DOM_TOTAL_PPS, AS_FLOAT, dom_total_pps);
+	addstat(STAT_DOM_PPS_RED, AS_FLOAT, dom_pps_red);
+	addstat(STAT_DOM_PPS_BLUE, AS_FLOAT, dom_pps_blue);
+	if(c3 >= 0) addstat(STAT_DOM_PPS_YELLOW, AS_FLOAT, dom_pps_yellow);
+	if(c4 >= 0) addstat(STAT_DOM_PPS_PINK, AS_FLOAT, dom_pps_pink);
 };