r5960 - in branches/nexuiz-2.0: . data data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-24 15:30:02 -0500 (Tue, 24 Feb 2009)
New Revision: 5960

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc
   branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
   branches/nexuiz-2.0/data/weapons.cfg
Log:
r5956 | div0 | 2009-02-24 21:09:32 +0100 (Tue, 24 Feb 2009) | 2 lines
minstanex animtime 0.3
r5957 | div0 | 2009-02-24 21:23:10 +0100 (Tue, 24 Feb 2009) | 2 lines
try to fix mutator list
r5958 | div0 | 2009-02-24 21:26:35 +0100 (Tue, 24 Feb 2009) | 2 lines
couldn't use that one :P
r5959 | div0 | 2009-02-24 21:28:39 +0100 (Tue, 24 Feb 2009) | 2 lines
fix nixnex :(

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-02-24 20:28:39 UTC (rev 5959)
+++ branches/nexuiz-2.0/.patchsets	2009-02-24 20:30:02 UTC (rev 5960)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5949,5952-5954
+revisions_applied = 1-5949,5952-5959

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc	2009-02-24 20:28:39 UTC (rev 5959)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc	2009-02-24 20:30:02 UTC (rev 5960)
@@ -398,6 +398,7 @@
 	{
 		if(j == WEP_LASER && g_nixnex_with_laser)
 			continue;
+		e = get_weaponinfo(j);
 		if(!e.weapons) // skip dummies
 			continue;
 		RandomSelection_Add(world, j, 1, 0);

Modified: branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc	2009-02-24 20:28:39 UTC (rev 5959)
+++ branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc	2009-02-24 20:30:02 UTC (rev 5960)
@@ -365,7 +365,7 @@
 
 void PrintWelcomeMessage(entity pl)
 {
-	string s, mutator, modifications, motd;
+	string s, modifications, motd;
 
 	if(self.cvar_scr_centertime == 0) return;
 	if((time - self.jointime) > cvar("welcome_message_time")
@@ -404,56 +404,40 @@
 	}
 
 :normal
+	modifications = "";
 	if(g_minstagib)
-		mutator = "^2Minstagib ^1";
-	else if(g_weaponarena)
-		mutator = "^2", g_weaponarena_list, " Arena ^1";
-	else if(g_nixnex)
-		mutator = "^2No Items Nexuiz ^1";
+		modifications = strcat(modifications, ", MinstaGib");
+	if(g_nixnex)
+		modifications = strcat(modifications, ", NixNex");
+	if(g_weaponarena)
+		modifications = strcat(modifications, ", ", g_weaponarena_list, " Arena");
+	if(cvar("sv_gravity") < 800)
+		modifications = strcat(modifications, ", Low gravity");
+	if(g_cloaked)
+		modifications = strcat(modifications, ", Cloaked");
+	if(g_footsteps)
+		modifications = strcat(modifications, ", Steps");
+	if(g_grappling_hook)
+		modifications = strcat(modifications, ", Hook");
+	if(g_laserguided_missile)
+		modifications = strcat(modifications, ", LG missiles");
+	if(g_midair)
+		modifications = strcat(modifications, ", Midair");
+	if(g_vampire)
+		modifications = strcat(modifications, ", Vampire");
+	if(g_pinata)
+		modifications = strcat(modifications, ", Pinata");
+	if(g_weapon_stay)
+		modifications = strcat(modifications, ", Weapons stay");
+	if(g_bloodloss > 0)
+		modifications = strcat(modifications, ", Bloodloss");
+	modifications = substring(modifications, 2, strlen(modifications) - 2);
 
-	if(g_cloaked) {
-		// to protect against unheedingly made changes
-		if (modifications) {
-			modifications = strcat(modifications, ", ");
-		}
-		modifications = "cloaked";
-	}
-	if(g_footsteps) {
-		if (modifications) {
-			modifications = strcat(modifications, ", ");
-		}
-		modifications = strcat(modifications, "footsteps");
-	}
-	if(g_midair) {
-		if (modifications) {
-			modifications = strcat(modifications, ", ");
-		}
-		modifications = strcat(modifications, "midair");
-	}
-	if(g_vampire) {
-		if (modifications) {
-			modifications = strcat(modifications, ", ");
-		}
-		modifications = strcat(modifications, "vampire");
-	}
-	if(g_laserguided_missile) {
-		if (modifications) {
-			modifications = strcat(modifications, ", ");
-		}
-		modifications = strcat(modifications, "laser guided missiles");
-	}
-	if(cvar("sv_gravity") < 800) {
-		if (modifications) {
-			modifications = strcat(modifications, ", ");
-		}
-		modifications = strcat(modifications, "low gravity");
-	}
-
 	local string versionmessage;
 	versionmessage = GetClientVersionMessage();
 
 	s = strcat(s, NEWLINES, "This is Nexuiz ", cvar_string("g_nexuizversion"), "\n", versionmessage);
-	s = strcat(s, "^8\n\nmatch type is ^1", mutator, gamemode_name, "^8\n");
+	s = strcat(s, "^8\n\nmatch type is ^1", gamemode_name, "^8\n");
 
 	if(modifications != "")
 		s = strcat(s, "^8\nactive modifications: ^3", modifications, "^8\n");

Modified: branches/nexuiz-2.0/data/weapons.cfg
===================================================================
--- branches/nexuiz-2.0/data/weapons.cfg	2009-02-24 20:28:39 UTC (rev 5959)
+++ branches/nexuiz-2.0/data/weapons.cfg	2009-02-24 20:30:02 UTC (rev 5960)
@@ -199,7 +199,7 @@
 set g_balance_nex_ammo 5
 
 set g_balance_minstanex_refire 1
-set g_balance_minstanex_animtime 0.8 // almost no combos
+set g_balance_minstanex_animtime 0.3
 set g_balance_minstanex_ammo 10
 
 set g_balance_hagar_primary_damage 37