[nexuiz-commits] r7518 - in trunk: Docs data/scripts misc/netradiant-NexuizPack/nexuiz.game/data

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2009-08-25 16:20:59 -0400 (Tue, 25 Aug 2009)
New Revision: 7518

Modified:
   trunk/Docs/eventlog.txt
   trunk/Docs/mapping.txt
   trunk/Docs/scorelog.txt
   trunk/data/scripts/entities.def
   trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
Log:
teams order patch by terencehill


Modified: trunk/Docs/eventlog.txt
===================================================================
--- trunk/Docs/eventlog.txt	2009-08-25 20:05:49 UTC (rev 7517)
+++ trunk/Docs/eventlog.txt	2009-08-25 20:20:59 UTC (rev 7518)
@@ -71,8 +71,8 @@
     1 = No Team (Domination)
     5 = Red Team
    14 = Blue Team
+   13 = Yellow Team
    10 = Pink Team
-   13 = Yellow Team
 
 label flags:
    !! = primary sorting key

Modified: trunk/Docs/mapping.txt
===================================================================
--- trunk/Docs/mapping.txt	2009-08-25 20:05:49 UTC (rev 7517)
+++ trunk/Docs/mapping.txt	2009-08-25 20:20:59 UTC (rev 7518)
@@ -147,8 +147,9 @@
 
 In order to get Domination working well in your map, you need to place dom_team
 and dom_controlpoint entites. You *must* have at least 3 dom_team entities - 2
-minimum teams and one blank one (empty netname and no team). You can have up
-to 4 teams (5 dom_team entities).
+minimum teams and one blank one (empty netname and no team). You can have up to
+4 teams (5 dom_team entities), and remember: if you set 3 teams, the third team
+must be the yellow one, according to the team order.
 
 Dom Team
 --------
@@ -199,20 +200,18 @@
 "model" "models/domination/dom_red.md3"
 }
 {
-"classname" "dom_team"
-"netname" "^6Pink Team"
-"cnt" "9"
+"netname" "^3Yellow Team"
+"cnt" "12"
 "noise" ""
 "noise1" "domination/claim.wav"
-"model" "models/domination/dom_pink.md3"
+"model" "models/domination/dom_yellow.md3"
 }
 {
-"classname" "dom_team"
-"netname" "^3Yellow Team"
-"cnt" "12"
+"netname" "^6Pink Team"
+"cnt" "9"
 "noise" ""
 "noise1" "domination/claim.wav"
-"model" "models/domination/dom_yellow.md3"
+"model" "models/domination/dom_pink.md3"
 }
 {
 "classname" "dom_controlpoint"
@@ -253,7 +252,7 @@
 
 
 As you can see in the example, there are 5 dom_team ents: one blank, Red, Blue,
-Pink and Yellow. Each control point has a different message (giving it a
+Yellow and Pink. Each control point has a different message (giving it a
 special name), and the one in the hallways gives 3 frags every 5 seconds
 instead of just one, making it more valuable.
 

Modified: trunk/Docs/scorelog.txt
===================================================================
--- trunk/Docs/scorelog.txt	2009-08-25 20:05:49 UTC (rev 7517)
+++ trunk/Docs/scorelog.txt	2009-08-25 20:20:59 UTC (rev 7518)
@@ -35,8 +35,8 @@
 team colors:
    Red Team	=  5
    Blue Team	= 14
+   Yellow Team	= 13
    Pink Team	= 10
-   Yellow Team	= 13
 
    other team numbers may appear in free for all games
 

Modified: trunk/data/scripts/entities.def
===================================================================
--- trunk/data/scripts/entities.def	2009-08-25 20:05:49 UTC (rev 7517)
+++ trunk/data/scripts/entities.def	2009-08-25 20:20:59 UTC (rev 7518)
@@ -1628,8 +1628,8 @@
 GOAL_TOUCHPLAYER: The trigger also affects ball-carrying players (the ball is then auto-dropped)
 */
 
-/*QUAKED nexball_bluegoal (1 0 1) ?
-Pink goal. Defended by the pink team. Needs red, blue and pink goals on the map to work.
+/*QUAKED nexball_pinkgoal (1 0 1) ?
+Pink goal. Defended by the pink team. Needs red, blue and yellow goals on the map to work.
 -------- KEYS --------
 noise: sound played when a point is scored
 -------- SPAWNFLAGS --------

Modified: trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
===================================================================
--- trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def	2009-08-25 20:05:49 UTC (rev 7517)
+++ trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def	2009-08-25 20:20:59 UTC (rev 7518)
@@ -1628,8 +1628,8 @@
 GOAL_TOUCHPLAYER: The trigger also affects ball-carrying players (the ball is then auto-dropped)
 */
 
-/*QUAKED nexball_bluegoal (1 0 1) ?
-Pink goal. Defended by the pink team. Needs red, blue and pink goals on the map to work.
+/*QUAKED nexball_pinkgoal (1 0 1) ?
+Pink goal. Defended by the pink team. Needs red, blue and yellow goals on the map to work.
 -------- KEYS --------
 noise: sound played when a point is scored
 -------- SPAWNFLAGS --------