[nexuiz-commits] r6368 - in trunk: data data/qcsrc/server data/scripts misc/netradiant-NexuizPack/nexuiz.game/data
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Mar 30 07:00:12 EDT 2009
Author: div0
Date: 2009-03-30 07:00:10 -0400 (Mon, 30 Mar 2009)
New Revision: 6368
Modified:
trunk/data/qcsrc/server/constants.qh
trunk/data/qcsrc/server/miscfunctions.qc
trunk/data/qcsrc/server/t_items.qc
trunk/data/scripts/entities.def
trunk/data/weapons.cfg
trunk/data/weaponsHavoc.cfg
trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
Log:
g_pickup_fuel_jetpack (make jetpack come with more fuel than a single fuel pickup)
Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh 2009-03-30 10:56:50 UTC (rev 6367)
+++ trunk/data/qcsrc/server/constants.qh 2009-03-30 11:00:10 UTC (rev 6368)
@@ -1,5 +1,5 @@
string CVAR_CHECK_DEFAULT = "779a1c2f508f65a13bad23ce1758beb8";
-string CVAR_CHECK_WEAPONS = "a370ceef5c41fcdcc46462ca3f728002";
+string CVAR_CHECK_WEAPONS = "00219e78f5d78d7d8a1600c4f4c73aa5";
float FALSE = 0;
float TRUE = 1;
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2009-03-30 10:56:50 UTC (rev 6367)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2009-03-30 11:00:10 UTC (rev 6368)
@@ -702,6 +702,7 @@
float g_pickup_cells;
float g_pickup_cells_max;
float g_pickup_fuel;
+float g_pickup_fuel_jetpack;
float g_pickup_fuel_max;
float g_pickup_armorsmall;
float g_pickup_armorsmall_max;
@@ -1089,6 +1090,7 @@
g_pickup_cells = cvar("g_pickup_cells");
g_pickup_cells_max = cvar("g_pickup_cells_max");
g_pickup_fuel = cvar("g_pickup_fuel");
+ g_pickup_fuel_jetpack = cvar("g_pickup_fuel_jetpack");
g_pickup_fuel_max = cvar("g_pickup_fuel_max");
g_pickup_armorsmall = cvar("g_pickup_armorsmall");
g_pickup_armorsmall_max = cvar("g_pickup_armorsmall_max");
Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc 2009-03-30 10:56:50 UTC (rev 6367)
+++ trunk/data/qcsrc/server/t_items.qc 2009-03-30 11:00:10 UTC (rev 6368)
@@ -1319,6 +1319,6 @@
void spawnfunc_item_jetpack(void)
{
if(!self.ammo_fuel)
- self.ammo_fuel = g_pickup_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);
}
Modified: trunk/data/scripts/entities.def
===================================================================
--- trunk/data/scripts/entities.def 2009-03-30 10:56:50 UTC (rev 6367)
+++ trunk/data/scripts/entities.def 2009-03-30 11:00:10 UTC (rev 6368)
@@ -1484,7 +1484,7 @@
/*QUAKED item_jetpack (.3 .3 1) (-30 -30 0) (30 30 32) FLOATING
Jetpack
-------- KEYS --------
-ammo_fuel: fuel units gained by this item (if unset, g_pickup_fuel is used)
+ammo_fuel: fuel units gained by this item (if unset, g_pickup_fuel_jetpack is used)
respawntime: time till it respawns (default: 15)
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.
Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg 2009-03-30 10:56:50 UTC (rev 6367)
+++ trunk/data/weapons.cfg 2009-03-30 11:00:10 UTC (rev 6368)
@@ -3,7 +3,7 @@
//
// And... don't forget to edit weaponsHavoc.cfg too.
-set cvar_check_weapons a370ceef5c41fcdcc46462ca3f728002
+set cvar_check_weapons 00219e78f5d78d7d8a1600c4f4c73aa5
// NOTE: this only replaces weapons on the map
// use g_start_weapon_* to also replace the on-startup weapons!
@@ -55,6 +55,7 @@
set g_pickup_cells 25
set g_pickup_cells_max 999
set g_pickup_fuel 25
+set g_pickup_fuel_jetpack 50
set g_pickup_fuel_max 999
set g_pickup_armorsmall 5
set g_pickup_armorsmall_max 999
Modified: trunk/data/weaponsHavoc.cfg
===================================================================
--- trunk/data/weaponsHavoc.cfg 2009-03-30 10:56:50 UTC (rev 6367)
+++ trunk/data/weaponsHavoc.cfg 2009-03-30 11:00:10 UTC (rev 6368)
@@ -1,4 +1,4 @@
-set cvar_check_weapons a370ceef5c41fcdcc46462ca3f728002
+set cvar_check_weapons 00219e78f5d78d7d8a1600c4f4c73aa5
// NOTE: this only replaces weapons on the map
// use g_start_weapon_* to also replace the on-startup weapons!
@@ -50,6 +50,7 @@
set g_pickup_cells 50
set g_pickup_cells_max 200
set g_pickup_fuel 25
+set g_pickup_fuel_jetpack 50
set g_pickup_fuel_max 999
set g_pickup_armorsmall 5
set g_pickup_armorsmall_max 200
Modified: trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
===================================================================
--- trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def 2009-03-30 10:56:50 UTC (rev 6367)
+++ trunk/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def 2009-03-30 11:00:10 UTC (rev 6368)
@@ -1455,3 +1455,41 @@
target: disable/enable all relays with this targetname when triggered
targetname: name that identifies this entity so it can be triggered
*/
+
+/*QUAKED item_fuel (.3 .3 1) (-30 -30 0) (30 30 32) FLOATING
+Jetpack fuel
+-------- KEYS --------
+ammo_fuel: fuel units gained by this item (if unset, g_pickup_fuel is used)
+respawntime: time till it respawns (default: 15)
+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 --------
+FLOATING: the item will float in air, instead of aligning to the floor by falling
+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/items/g_fuel.md3"
+*/
+
+/*QUAKED item_fuel_regen (1 .3 1) (-30 -30 0) (30 30 32) FLOATING
+Fuel regenerator
+-------- KEYS --------
+respawntime: time till it respawns (default: 15)
+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 --------
+FLOATING: the item will float in air, instead of aligning to the floor by falling
+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/items/g_fuelregen.md3"
+*/
+
+/*QUAKED item_jetpack (.3 .3 1) (-30 -30 0) (30 30 32) FLOATING
+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)
+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 --------
+FLOATING: the item will float in air, instead of aligning to the floor by falling
+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/items/g_jetpack.md3"
+*/
More information about the nexuiz-commits
mailing list