r3233 - in trunk/data: models/sprites qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-23 03:45:18 -0500 (Wed, 23 Jan 2008)
New Revision: 3233

Added:
   trunk/data/models/sprites/ons-cp-dfnd-blue.sp2
   trunk/data/models/sprites/ons-cp-dfnd-red.sp2
Modified:
   trunk/data/models/sprites/make-sprites.sh
   trunk/data/qcsrc/server/mode_onslaught.qc
Log:
also specially treat control points that are attackable by the enemy and thus need to be defended


Modified: trunk/data/models/sprites/make-sprites.sh
===================================================================
--- trunk/data/models/sprites/make-sprites.sh	2008-01-23 08:34:46 UTC (rev 3232)
+++ trunk/data/models/sprites/make-sprites.sh	2008-01-23 08:45:18 UTC (rev 3233)
@@ -134,3 +134,5 @@
 sprite ons-cp-atck-neut   000000 ffff00 "CONTROL POINT"
 sprite ons-cp-atck-red    ff0000 ffff00 "CONTROL POINT"
 sprite ons-cp-atck-blue   0000ff ffff00 "CONTROL POINT"
+sprite ons-cp-dfnd-red    ff0000 00ffff "CONTROL POINT"
+sprite ons-cp-dfnd-blue   0000ff 00ffff "CONTROL POINT"

Added: trunk/data/models/sprites/ons-cp-dfnd-blue.sp2
===================================================================
(Binary files differ)


Property changes on: trunk/data/models/sprites/ons-cp-dfnd-blue.sp2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/models/sprites/ons-cp-dfnd-red.sp2
===================================================================
(Binary files differ)


Property changes on: trunk/data/models/sprites/ons-cp-dfnd-red.sp2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- trunk/data/qcsrc/server/mode_onslaught.qc	2008-01-23 08:34:46 UTC (rev 3232)
+++ trunk/data/qcsrc/server/mode_onslaught.qc	2008-01-23 08:45:18 UTC (rev 3233)
@@ -11,6 +11,7 @@
 
 float ons_sprite_cp_red, ons_sprite_cp_blue, ons_sprite_cp_neut;
 float ons_sprite_cp_atck_red, ons_sprite_cp_atck_blue, ons_sprite_cp_atck_neut;
+float ons_sprite_cp_dfnd_red, ons_sprite_cp_dfnd_blue;
 float ons_sprite_gen_red, ons_sprite_gen_blue, ons_sprite_gen_shielded;
 
 void() onslaught_updatelinks =
@@ -262,6 +263,7 @@
 }
 
 float onslaught_controlpoint_attackable(entity cp, float t)
+// -2: SAME TEAM, attackable by enemy!
 // -1: SAME TEAM!
 // 0:  off limits
 // 1:  attack it
@@ -279,7 +281,12 @@
 	{
 		// if there's already an icon built, nothing happens
 		if(cp.team == t)
+		{
+			a = onslaught_controlpoint_can_be_linked(cp, COLOR_TEAM1 + COLOR_TEAM2 - t);
+			if(a) // attackable by enemy?
+				return -2; // EMERGENCY!
 			return -1;
+		}
 		// we know it can be linked, so no need to check
 		// but...
 		a = onslaught_controlpoint_can_be_linked(cp, t);
@@ -449,6 +456,13 @@
 			else
 				return ons_sprite_cp_atck_neut;
 		}
+		else if(a == -2) // DEFEND THIS ONE NOW
+		{
+			if(self.owner.team == COLOR_TEAM1)
+				return ons_sprite_cp_dfnd_red;
+			else if(self.owner.team == COLOR_TEAM2)
+				return ons_sprite_cp_dfnd_blue;
+		}
 		else if(self.owner.team == e.team || a == -1 || a == 1) // own point, or fire at it
 		{
 			if(self.owner.team == COLOR_TEAM1)
@@ -499,6 +513,12 @@
 		precache_model("models/sprites/ons-cp-neut.sp2");
 		setmodel(self, "models/sprites/ons-cp-neut.sp2");
 		ons_sprite_cp_neut = self.modelindex;
+		precache_model("models/sprites/ons-cp-dfnd-blue.sp2");
+		setmodel(self, "models/sprites/ons-cp-dfnd-blue.sp2");
+		ons_sprite_cp_dfnd_blue = self.modelindex;
+		precache_model("models/sprites/ons-cp-dfnd-red.sp2");
+		setmodel(self, "models/sprites/ons-cp-dfnd-red.sp2");
+		ons_sprite_cp_dfnd_red = self.modelindex;
 		precache_model("models/sprites/ons-cp-atck-blue.sp2");
 		setmodel(self, "models/sprites/ons-cp-atck-blue.sp2");
 		ons_sprite_cp_atck_blue = self.modelindex;