r2434 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue May 1 04:29:34 EDT 2007
Author: div0
Date: 2007-05-01 04:29:34 -0400 (Tue, 01 May 2007)
New Revision: 2434
Modified:
trunk/data/qcsrc/server/clientcommands.qc
trunk/data/qcsrc/server/constants.qh
trunk/data/qcsrc/server/domination.qc
trunk/data/qcsrc/server/g_world.qc
trunk/data/qcsrc/server/keyhunt.qc
trunk/data/qcsrc/server/teamplay.qc
Log:
try to swap yellow/pink teams
Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc 2007-05-01 08:13:40 UTC (rev 2433)
+++ trunk/data/qcsrc/server/clientcommands.qc 2007-05-01 08:29:34 UTC (rev 2434)
@@ -345,15 +345,15 @@
SV_ChangeTeam( COLOR_TEAM1 - 1 );
} else if( argv(1) == "blue" ) {
SV_ChangeTeam( COLOR_TEAM2 - 1 );
+ } else if( argv(1) == "yellow" ) {
+ SV_ChangeTeam( COLOR_TEAM3 - 1 );
} else if( argv(1) == "pink" ) {
- SV_ChangeTeam( COLOR_TEAM3 - 1 );
- } else if( argv(1) == "yellow" ) {
SV_ChangeTeam( COLOR_TEAM4 - 1 );
} else if( argv(1) == "auto" ) {
self.team = -1;
JoinBestTeam( self, 0 );
} else {
- sprint( self, strcat( "selectteam none/red/blue/pink/yellow/auto - \"", argv(1), "\" not recognised\n" ) );
+ sprint( self, strcat( "selectteam none/red/blue/yellow/pink/auto - \"", argv(1), "\" not recognised\n" ) );
}
} else if(argv(0) == "ready") {
if(cvar("sv_ready_restart"))
Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh 2007-05-01 08:13:40 UTC (rev 2433)
+++ trunk/data/qcsrc/server/constants.qh 2007-05-01 08:29:34 UTC (rev 2434)
@@ -220,7 +220,7 @@
float COLOR_TEAM1 = 5; // red
float COLOR_TEAM2 = 14; // blue
-float COLOR_TEAM3 = 10; // pink
-float COLOR_TEAM4 = 13; // yellow
+float COLOR_TEAM3 = 13; // yellow
+float COLOR_TEAM4 = 10; // pink
float NUM_PLAYERSKINS_TEAMPLAY = 3;
Modified: trunk/data/qcsrc/server/domination.qc
===================================================================
--- trunk/data/qcsrc/server/domination.qc 2007-05-01 08:13:40 UTC (rev 2433)
+++ trunk/data/qcsrc/server/domination.qc 2007-05-01 08:29:34 UTC (rev 2434)
@@ -547,9 +547,9 @@
dom_spawnteam("Red", COLOR_TEAM1-1, "models/domination/dom_red.md3", 0, "domination/claim.wav", "", "Red team has captured a control point");
dom_spawnteam("Blue", COLOR_TEAM2-1, "models/domination/dom_blue.md3", 0, "domination/claim.wav", "", "Blue team has captured a control point");
if(numteams > 2)
- dom_spawnteam("Pink", COLOR_TEAM3-1, "models/domination/dom_pink.md3", 0, "domination/claim.wav", "", "Pink team has captured a control point");
+ dom_spawnteam("Yellow", COLOR_TEAM3-1, "models/domination/dom_yellow.md3", 0, "domination/claim.wav", "", "Yellow team has captured a control point");
if(numteams > 3)
- dom_spawnteam("Yellow", COLOR_TEAM4-1, "models/domination/dom_yellow.md3", 0, "domination/claim.wav", "", "Yellow team has captured a control point");
+ dom_spawnteam("Pink", COLOR_TEAM4-1, "models/domination/dom_pink.md3", 0, "domination/claim.wav", "", "Pink team has captured a control point");
dom_spawnteam("", 0, "models/domination/dom_unclaimed.md3", 0, "", "", "");
};
@@ -593,8 +593,8 @@
// so we don't even know yet if this map is set up for domination...
precache_model("models/domination/dom_red.md3");
precache_model("models/domination/dom_blue.md3");
+ precache_model("models/domination/dom_yellow.md3");
precache_model("models/domination/dom_pink.md3");
- precache_model("models/domination/dom_yellow.md3");
precache_model("models/domination/dom_unclaimed.md3");
precache_sound("domination/claim.wav");
e = spawn();
Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc 2007-05-01 08:13:40 UTC (rev 2433)
+++ trunk/data/qcsrc/server/g_world.qc 2007-05-01 08:29:34 UTC (rev 2434)
@@ -1450,8 +1450,8 @@
{
PrintScoreboardFor(e, "Red", "^1", COLOR_TEAM1);
PrintScoreboardFor(e, "Blue", "^4", COLOR_TEAM2);
- PrintScoreboardFor(e, "Pink", "^6", COLOR_TEAM3);
- PrintScoreboardFor(e, "Yellow", "^3", COLOR_TEAM4);
+ PrintScoreboardFor(e, "Yellow", "^3", COLOR_TEAM3);
+ PrintScoreboardFor(e, "Pink", "^6", COLOR_TEAM4);
}
else
{
Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc 2007-05-01 08:13:40 UTC (rev 2433)
+++ trunk/data/qcsrc/server/keyhunt.qc 2007-05-01 08:29:34 UTC (rev 2434)
@@ -33,8 +33,8 @@
if(t == e) return kh_sprite_friend;
if(t == COLOR_TEAM1) return kh_sprite_red;
if(t == COLOR_TEAM2) return kh_sprite_blue;
- if(t == COLOR_TEAM3) return kh_sprite_pink;
- if(t == COLOR_TEAM4) return kh_sprite_yellow;
+ if(t == COLOR_TEAM3) return kh_sprite_yellow;
+ if(t == COLOR_TEAM4) return kh_sprite_pink;
return 0;
}
@@ -220,13 +220,13 @@
key.colormod = '0.10 0.10 1.73';
break;
case COLOR_TEAM3:
+ key.netname = "^3yellow key";
+ key.colormod = '1.22 1.22 0.10';
+ break;
+ case COLOR_TEAM4:
key.netname = "^6pink key";
key.colormod = '1.22 0.10 1.22';
break;
- case COLOR_TEAM4:
- key.netname = "^3yellow key";
- key.colormod = '1.22 1.22 0.10';
- break;
default:
key.netname = "NETGIER key";
key.colormod = '1.00 1.00 1.00';
@@ -629,8 +629,8 @@
precache_model("models/sprites/keycarrier-friend.sp2");
precache_model("models/sprites/keycarrier-red.sp2");
precache_model("models/sprites/keycarrier-blue.sp2");
+ precache_model("models/sprites/keycarrier-yellow.sp2");
precache_model("models/sprites/keycarrier-pink.sp2");
- precache_model("models/sprites/keycarrier-yellow.sp2");
precache_model("models/keyhunt/key3.md3");
// setup variables
Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc 2007-05-01 08:13:40 UTC (rev 2433)
+++ trunk/data/qcsrc/server/teamplay.qc 2007-05-01 08:29:34 UTC (rev 2434)
@@ -45,9 +45,9 @@
if(t == COLOR_TEAM2)
return "Blue Team";
if(t == COLOR_TEAM3)
+ return "Yellow Team";
+ if(t == COLOR_TEAM4)
return "Pink Team";
- if(t == COLOR_TEAM4)
- return "Yellow Team";
return "Neutral Team";
}
string ColoredTeamName(float t)
@@ -58,9 +58,9 @@
if(t == COLOR_TEAM2)
return "^4Blue Team^7";
if(t == COLOR_TEAM3)
+ return "^3Yellow Team^7";
+ if(t == COLOR_TEAM4)
return "^6Pink Team^7";
- if(t == COLOR_TEAM4)
- return "^3Yellow Team^7";
return "Neutral Team";
}
string TeamNoName(float t)
@@ -71,9 +71,9 @@
if(t == 2)
return "Blue Team";
if(t == 3)
+ return "Yellow Team";
+ if(t == 4)
return "Pink Team";
- if(t == 4)
- return "Yellow Team";
return "Neutral Team";
}
More information about the nexuiz-commits
mailing list