[nexuiz-commits] r6306 - in trunk/data: . qcsrc/menu/nexuiz qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-26 12:26:25 -0400 (Thu, 26 Mar 2009)
New Revision: 6306

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/teamplay.qc
   trunk/data/qcsrc/server/w_hook.qc
Log:
make jetpack able to coexist with hook (only the weapon one); add it to the mutators dialog


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-03-26 15:47:53 UTC (rev 6305)
+++ trunk/data/defaultNexuiz.cfg	2009-03-26 16:26:25 UTC (rev 6306)
@@ -1416,7 +1416,7 @@
 seta cl_showpressedkeys	0	"Show which movement keys someone is pressing: 1 for spectating, 2 for always"
 set cl_showpressedkeys_position "1 0.8"	"1 0 would be upper right corner, 0.5 0.5 the center"
 
-set g_jetpack 0 "Jetpack mutator (experimental)"2
+set g_jetpack 0 "Jetpack mutator (uses the hook's button, can't coexist with the offhand hook, but only with the onhand one)"
 set g_jetpack_antigravity 0.8 "factor of gravity compensation of the jetpack"
 set g_jetpack_acceleration_side 1200 "acceleration of the jetpack in xy direction"
 set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (note: you have to factor in gravity here, if antigravity is not 1)"

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c	2009-03-26 15:47:53 UTC (rev 6305)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c	2009-03-26 16:26:25 UTC (rev 6306)
@@ -90,6 +90,8 @@
 		s = strcat(s, ", Weapons stay");
 	if(cvar("g_bloodloss") > 0)
 		s = strcat(s, ", Bloodloss");
+	if(cvar("g_jetpack"))
+		s = strcat(s, ", Jet pack");
 	if(s == "")
 		return "None";
 	else
@@ -181,6 +183,8 @@
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, s);
 	me.TR(me);
+		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_jetpack", "Jet pack"));
+	me.TR(me);
 		s = makeNexuizSlider(80, 400, 8, "sv_gravity");
 			s.valueDigits = 0;
 			s.valueDisplayMultiplier = 0.125; // show gravity in percent

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-03-26 15:47:53 UTC (rev 6305)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-03-26 16:26:25 UTC (rev 6306)
@@ -755,9 +755,6 @@
 	start_health = cvar("g_balance_health_start");
 	start_armorvalue = cvar("g_balance_armor_start");
 
-	if(g_jetpack)
-		g_grappling_hook = 0;
-
 	g_weaponarena = 0;
 	s = cvar_string("g_weaponarena");
 	if(s == "0")
@@ -951,10 +948,7 @@
 	}
 
 	if(g_jetpack)
-	{
-		start_weapons &~= WEPBIT_HOOK;
-		warmup_start_weapons &~= WEPBIT_HOOK;
-	}
+		g_grappling_hook = 0; // these two can't coexist, as they use the same button
 
 	if(g_weapon_stay == 2)
 	{

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2009-03-26 15:47:53 UTC (rev 6305)
+++ trunk/data/qcsrc/server/teamplay.qc	2009-03-26 16:26:25 UTC (rev 6306)
@@ -432,6 +432,8 @@
 		modifications = strcat(modifications, ", Weapons stay");
 	if(g_bloodloss > 0)
 		modifications = strcat(modifications, ", Bloodloss");
+	if(g_jetpack)
+		modifications = strcat(modifications, ", Jet pack");
 	modifications = substring(modifications, 2, strlen(modifications) - 2);
 
 	local string versionmessage;

Modified: trunk/data/qcsrc/server/w_hook.qc
===================================================================
--- trunk/data/qcsrc/server/w_hook.qc	2009-03-26 15:47:53 UTC (rev 6305)
+++ trunk/data/qcsrc/server/w_hook.qc	2009-03-26 16:26:25 UTC (rev 6306)
@@ -111,7 +111,7 @@
 	}
 	else if (req == WR_THINK)
 	{
-		if (self.BUTTON_ATCK || self.BUTTON_HOOK)
+		if (self.BUTTON_ATCK || (!g_jetpack && self.BUTTON_HOOK))
 		{
 			if(!self.hook)
 			if not(self.hook_state & HOOK_WAITING_FOR_RELEASE)
@@ -177,7 +177,7 @@
 		if (self.BUTTON_CROUCH)
 		{
 			self.hook_state &~= HOOK_PULLING;
-			if (self.BUTTON_ATCK || self.BUTTON_HOOK)
+			if (self.BUTTON_ATCK || (!g_jetpack && self.BUTTON_HOOK))
 				self.hook_state &~= HOOK_RELEASING;
 			else
 				self.hook_state |= HOOK_RELEASING;
@@ -187,7 +187,7 @@
 			self.hook_state |= HOOK_PULLING;
 			self.hook_state &~= HOOK_RELEASING;
 
-			if (self.BUTTON_ATCK || self.BUTTON_HOOK)
+			if (self.BUTTON_ATCK || (!g_jetpack && self.BUTTON_HOOK))
 			{
 				// already fired
 				if(self.hook)