r5785 - in trunk/data: . qcsrc/menu/nexuiz qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-06 09:31:33 -0500 (Fri, 06 Feb 2009)
New Revision: 5785

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/constants.qh
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
pinata


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-02-06 14:26:12 UTC (rev 5784)
+++ trunk/data/defaultNexuiz.cfg	2009-02-06 14:31:33 UTC (rev 5785)
@@ -27,7 +27,7 @@
 seta g_configversion 0
 
 // default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default 9baebeee18b375c654d6fbb2035525a6
+set cvar_check_default 65294e556aa95d3532ac684f43cdde41
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible
@@ -388,6 +388,7 @@
 set g_antilag 2	"AntiLag (0 = no AntiLag, 1 = verified client side hit scan, 2 = server side hit scan in the past, 3 = unverified client side hit scan)"
 set g_shootfromeye 0
 set g_shootfromcenter 0
+set g_pinata 0
 set g_weapon_stay 0
 set g_powerup_superhealth 1
 set g_powerup_strength 1

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c	2009-02-06 14:26:12 UTC (rev 5784)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c	2009-02-06 14:31:33 UTC (rev 5785)
@@ -84,6 +84,8 @@
 		s = strcat(s, ", Midair");
 	if(cvar("g_vampire"))
 		s = strcat(s, ", Vampire");
+	if(cvar("g_pinata"))
+		s = strcat(s, ", Pinata");
 	if(cvar("g_weapon_stay"))
 		s = strcat(s, ", Weapons stay");
 	if(cvar("g_bloodloss") > 0)
@@ -169,6 +171,8 @@
 	me.TR(me);
 		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_vampire", "Vampire"));
 	me.TR(me);
+		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_pinata", "Pinata"));
+	me.TR(me);
 		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_weapon_stay", "Weapons stay"));
 	me.TR(me);
 		s = makeNexuizSlider(80, 400, 8, "sv_gravity");

Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2009-02-06 14:26:12 UTC (rev 5784)
+++ trunk/data/qcsrc/server/cl_player.qc	2009-02-06 14:31:33 UTC (rev 5785)
@@ -252,7 +252,17 @@
 
 void SpawnThrownWeapon (vector org, float w)
 {
-	W_ThrowWeapon(randomvec() * 100 + '0 0 200', org - self.origin, FALSE);
+	if(g_pinata)
+	{
+		float j;
+		for(j = WEP_FIRST; j <= WEP_LAST; ++j)
+		{
+			if(self.weapons == self.weapons | W_WeaponBit(j))
+				W_ThrowNewWeapon(self, j, FALSE, self.origin, randomvec() * 175 + '0 0 325');
+		}
+	}
+	else
+		W_ThrowWeapon(randomvec() * 125 + '0 0 200', org - self.origin, FALSE);
 }
 
 void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)

Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh	2009-02-06 14:26:12 UTC (rev 5784)
+++ trunk/data/qcsrc/server/constants.qh	2009-02-06 14:31:33 UTC (rev 5785)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "9baebeee18b375c654d6fbb2035525a6";
+string CVAR_CHECK_DEFAULT = "65294e556aa95d3532ac684f43cdde41";
 string CVAR_CHECK_WEAPONS = "2a35f7139825257d468d22354209cf54";
 float	FALSE					= 0;
 float	TRUE					= 1;

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2009-02-06 14:26:12 UTC (rev 5784)
+++ trunk/data/qcsrc/server/defs.qh	2009-02-06 14:31:33 UTC (rev 5785)
@@ -19,7 +19,7 @@
 float ctf_score_value(string parameter);
 
 float g_dm, g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault, g_arena, g_lms, g_runematch, g_race;
-float g_cloaked, g_footsteps, g_jump_grunt, g_grappling_hook, g_laserguided_missile, g_midair, g_minstagib, g_nixnex, g_nixnex_with_laser, g_norecoil, g_vampire, g_minstagib_invis_alpha, g_bloodloss;
+float g_cloaked, g_footsteps, g_jump_grunt, g_grappling_hook, g_laserguided_missile, g_midair, g_minstagib, g_nixnex, g_nixnex_with_laser, g_pinata, g_norecoil, g_vampire, g_minstagib_invis_alpha, g_bloodloss;
 float g_warmup_limit;
 float g_warmup_allguns;
 float g_warmup_allow_timeout;

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-02-06 14:26:12 UTC (rev 5784)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-02-06 14:31:33 UTC (rev 5785)
@@ -1069,6 +1069,8 @@
 	g_pickup_healthmega                = cvar("g_pickup_healthmega");
 	g_pickup_healthmega_max            = cvar("g_pickup_healthmega_max");
 
+	g_pinata = cvar("g_pinata");
+
 	g_weapon_stay = cvar("g_weapon_stay");
 	if(!g_weapon_stay && (cvar("deathmatch") == 2))
 		g_weapon_stay = 1;