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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-30 04:54:16 -0400 (Mon, 30 Mar 2009)
New Revision: 6360

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/cl_physics.qc
   trunk/data/qcsrc/server/constants.qh
   trunk/data/qcsrc/server/g_world.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
fix the remaining bugs in fuel support

now we need item models, and items that do:

- "fuel":
  - increase ammo_fuel
  - set pauserotfuel_finished

- "jetpack":
  - increase ammo_fuel
  - set pauserotfuel_finished
  - add IT_JETPACK to the items


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-03-30 08:39:32 UTC (rev 6359)
+++ trunk/data/defaultNexuiz.cfg	2009-03-30 08:54:16 UTC (rev 6360)
@@ -24,7 +24,7 @@
 seta g_configversion 0	"Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
 
 // default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default 11669b91ec9e0214a0e0ac37a3573c1a
+set cvar_check_default 0a85f4f85d37e7ea2ef371e9459df7cb
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible
@@ -1423,7 +1423,7 @@
 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)"
 set g_jetpack_maxspeed_side 1500 "max speed of the jetpack in xy direction"
 set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction"
-set g_jetpack_fuel 3 "fuel per second for jetpack" 
+set g_jetpack_fuel 5 "fuel per second for jetpack" 
 
 set g_balance_fuel_regen 0.1 "fuel regeneration (only applies if the player owns IT_FUEL_REGEN)"
 set g_balance_fuel_rot 0.1
@@ -1431,7 +1431,8 @@
 set g_balance_fuel_rotlinear 0
 set g_balance_fuel_stable 100
 set g_balance_fuel_limit 999
-set g_balance_fuel_start 100
+set g_balance_fuel_start 0
+set g_balance_pause_fuel_regen 1
 
 set cl_effects_lightningarc_simple 0
 set cl_effects_lightningarc_segmentlength 64

Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-03-30 08:39:32 UTC (rev 6359)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-03-30 08:54:16 UTC (rev 6360)
@@ -760,6 +760,7 @@
 			self.armorvalue = start_armorvalue;
 			self.weapons = start_weapons;
 		}
+		self.ammo_fuel = start_fuel;
 		self.items = start_items;
 		self.switchweapon = w_getbestweapon(self);
 		self.cnt = self.switchweapon;

Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc	2009-03-30 08:39:32 UTC (rev 6359)
+++ trunk/data/qcsrc/server/cl_physics.qc	2009-03-30 08:54:16 UTC (rev 6360)
@@ -683,8 +683,8 @@
 			self.flags &~= FL_ONGROUND;
 			self.items |= IT_USING_JETPACK;
 
-			// jetpack also inhibits health regeneration!
-			self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_pause_health_regen"));
+			// jetpack also inhibits health regeneration, but only for 1 second
+			self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_pause_fuel_regen"));
 		}
 	}
 	else if (self.flags & FL_ONGROUND)

Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh	2009-03-30 08:39:32 UTC (rev 6359)
+++ trunk/data/qcsrc/server/constants.qh	2009-03-30 08:54:16 UTC (rev 6360)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "11669b91ec9e0214a0e0ac37a3573c1a";
+string CVAR_CHECK_DEFAULT = "0a85f4f85d37e7ea2ef371e9459df7cb";
 string CVAR_CHECK_WEAPONS = "6dd73b6c78519153d50f876be23bfe77";
 
 float	FALSE					= 0;

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2009-03-30 08:39:32 UTC (rev 6359)
+++ trunk/data/qcsrc/server/g_world.qc	2009-03-30 08:54:16 UTC (rev 6360)
@@ -587,8 +587,8 @@
 	
 	addstat(STAT_STRENGTH_FINISHED, AS_FLOAT, strength_finished);
 	addstat(STAT_INVINCIBLE_FINISHED, AS_FLOAT, invincible_finished);
-
 	addstat(STAT_PRESSED_KEYS, AS_FLOAT, pressedkeys);
+	addstat(STAT_FUEL, AS_INT, ammo_fuel);
 
 	next_pingtime = time + 5;
 	InitializeEntity(self, cvar_changes_init, INITPRIO_CVARS);

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-03-30 08:39:32 UTC (rev 6359)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-03-30 08:54:16 UTC (rev 6360)
@@ -735,6 +735,7 @@
 float warmup_start_ammo_cells;
 float warmup_start_health;
 float warmup_start_armorvalue;
+float start_fuel;
 float g_weapon_stay;
 
 entity get_weaponinfo(float w);
@@ -753,6 +754,7 @@
 	start_ammo_rockets = 0;
 	start_ammo_cells = 0;
 	start_health = cvar("g_balance_health_start");
+	start_fuel = cvar("g_balance_fuel_start");
 	start_armorvalue = cvar("g_balance_armor_start");
 
 	g_weaponarena = 0;
@@ -952,6 +954,7 @@
 		g_grappling_hook = 0; // these two can't coexist, as they use the same button
 		start_items |= IT_JETPACK;
 		start_items |= IT_FUEL_REGEN;
+		start_fuel = max(start_fuel, cvar("g_balance_fuel_stable"));
 	}
 
 	if(g_weapon_stay == 2)