From d98f08a8899d422ae8851dbcb0308716351f775b Mon Sep 17 00:00:00 2001 From: fruitiex Date: Tue, 25 Aug 2009 20:20:59 +0000 Subject: [PATCH] teams order patch by terencehill git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7518 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- Docs/eventlog.txt | 2 +- Docs/mapping.txt | 21 +++++++++---------- Docs/scorelog.txt | 2 +- data/scripts/entities.def | 4 ++-- .../nexuiz.game/data/entities.def | 4 ++-- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Docs/eventlog.txt b/Docs/eventlog.txt index e55198b41..12f46d038 100644 --- a/Docs/eventlog.txt +++ b/Docs/eventlog.txt @@ -71,8 +71,8 @@ team colors: 1 = No Team (Domination) 5 = Red Team 14 = Blue Team - 10 = Pink Team 13 = Yellow Team + 10 = Pink Team label flags: !! = primary sorting key diff --git a/Docs/mapping.txt b/Docs/mapping.txt index 7c8c48fb6..3146c0185 100644 --- a/Docs/mapping.txt +++ b/Docs/mapping.txt @@ -147,8 +147,9 @@ graphics card LOVES images of such dimension. 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 @@ Here is an example entry in a .ent file that includes colored text and 3 teams: "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 @@ Here is an example entry in a .ent file that includes colored text and 3 teams: 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. diff --git a/Docs/scorelog.txt b/Docs/scorelog.txt index b4fd03832..b894bd696 100644 --- a/Docs/scorelog.txt +++ b/Docs/scorelog.txt @@ -35,8 +35,8 @@ example: team colors: Red Team = 5 Blue Team = 14 - Pink Team = 10 Yellow Team = 13 + Pink Team = 10 other team numbers may appear in free for all games diff --git a/data/scripts/entities.def b/data/scripts/entities.def index 471732841..6e9875bd6 100644 --- a/data/scripts/entities.def +++ b/data/scripts/entities.def @@ -1628,8 +1628,8 @@ noise: sound played when a point is scored 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 -------- diff --git a/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def b/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def index 471732841..6e9875bd6 100644 --- a/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def +++ b/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def @@ -1628,8 +1628,8 @@ noise: sound played when a point is scored 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 -------- -- 2.39.2