[nexuiz-commits] r6370 - in trunk: data/qcsrc/server data/scripts misc/netradiant-NexuizPack/nexuiz.game/data

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-30 07:11:07 -0400 (Mon, 30 Mar 2009)
New Revision: 6370

Modified:
   trunk/data/qcsrc/server/t_items.qc
   trunk/data/scripts/entities.def
   trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
Log:
make jetpack and fuel regenerator have the powerup respawn time (mapper can override it anyway if he insists)


Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2009-03-30 11:05:04 UTC (rev 6369)
+++ trunk/data/qcsrc/server/t_items.qc	2009-03-30 11:11:07 UTC (rev 6370)
@@ -1308,17 +1308,17 @@
 {
 	if(!self.ammo_fuel)
 		self.ammo_fuel = g_pickup_fuel;
-	StartItem ("models/items/g_fuel.md3", "misc/itempickup.wav", g_pickup_respawntime_medium, "Fuel", IT_FUEL, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_LOW);
+	StartItem ("models/items/g_fuel.md3", "misc/itempickup.wav", g_pickup_respawntime_ammo, "Fuel", IT_FUEL, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_LOW);
 }
 
 void spawnfunc_item_fuel_regen(void)
 {
-	StartItem ("models/items/g_fuelregen.md3", "misc/itempickup.wav", g_pickup_respawntime_medium, "Fuel regenerator", IT_FUEL_REGEN, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_LOW);
+	StartItem ("models/items/g_fuelregen.md3", "misc/itempickup.wav", g_pickup_respawntime_powerup, "Fuel regenerator", IT_FUEL_REGEN, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_LOW);
 }
 
 void spawnfunc_item_jetpack(void)
 {
 	if(!self.ammo_fuel)
 		self.ammo_fuel = g_pickup_fuel_jetpack;
-	StartItem ("models/items/g_jetpack.md3", "misc/itempickup.wav", g_pickup_respawntime_medium, "Jet pack", IT_JETPACK, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_LOW);
+	StartItem ("models/items/g_jetpack.md3", "misc/itempickup.wav", g_pickup_respawntime_powerup, "Jet pack", IT_JETPACK, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_LOW);
 }

Modified: trunk/data/scripts/entities.def
===================================================================
--- trunk/data/scripts/entities.def	2009-03-30 11:05:04 UTC (rev 6369)
+++ trunk/data/scripts/entities.def	2009-03-30 11:11:07 UTC (rev 6370)
@@ -1472,7 +1472,7 @@
 /*QUAKED item_fuel_regen (1 .3 1) (-30 -30 0) (30 30 32) FLOATING
 Fuel regenerator
 -------- KEYS --------
-respawntime: time till it respawns (default: 15)
+respawntime: time till it respawns (default: 120)
 team: out of items with the same value here, only one (random one) will spawn. Useful to put multiple items on one spot.
 cnt: weight of this item for random selection using "team". Set to a lower value for items you want to see less likely.
 -------- SPAWNFLAGS --------
@@ -1485,7 +1485,7 @@
 Jetpack
 -------- KEYS --------
 ammo_fuel: fuel units gained by this item (if unset, g_pickup_fuel_jetpack is used)
-respawntime: time till it respawns (default: 15)
+respawntime: time till it respawns (default: 120)
 team: out of items with the same value here, only one (random one) will spawn. Useful to put multiple items on one spot.
 cnt: weight of this item for random selection using "team". Set to a lower value for items you want to see less likely.
 -------- SPAWNFLAGS --------

Modified: trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
===================================================================
--- trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def	2009-03-30 11:05:04 UTC (rev 6369)
+++ trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def	2009-03-30 11:11:07 UTC (rev 6370)
@@ -1472,7 +1472,7 @@
 /*QUAKED item_fuel_regen (1 .3 1) (-30 -30 0) (30 30 32) FLOATING
 Fuel regenerator
 -------- KEYS --------
-respawntime: time till it respawns (default: 15)
+respawntime: time till it respawns (default: 120)
 team: out of items with the same value here, only one (random one) will spawn. Useful to put multiple items on one spot.
 cnt: weight of this item for random selection using "team". Set to a lower value for items you want to see less likely.
 -------- SPAWNFLAGS --------
@@ -1485,7 +1485,7 @@
 Jetpack
 -------- KEYS --------
 ammo_fuel: fuel units gained by this item (if unset, g_pickup_fuel_jetpack is used)
-respawntime: time till it respawns (default: 15)
+respawntime: time till it respawns (default: 120)
 team: out of items with the same value here, only one (random one) will spawn. Useful to put multiple items on one spot.
 cnt: weight of this item for random selection using "team". Set to a lower value for items you want to see less likely.
 -------- SPAWNFLAGS --------