From 2d3be778bdcb6318405a681a75c4a185af928dc1 Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 30 Mar 2009 11:00:10 +0000 Subject: [PATCH] g_pickup_fuel_jetpack (make jetpack come with more fuel than a single fuel pickup) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6368 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/constants.qh | 2 +- data/qcsrc/server/miscfunctions.qc | 2 + data/qcsrc/server/t_items.qc | 2 +- data/scripts/entities.def | 2 +- data/weapons.cfg | 3 +- data/weaponsHavoc.cfg | 3 +- .../nexuiz.game/data/entities.def | 38 +++++++++++++++++++ 7 files changed, 47 insertions(+), 5 deletions(-) diff --git a/data/qcsrc/server/constants.qh b/data/qcsrc/server/constants.qh index 931a3f1ec..5042d009b 100644 --- a/data/qcsrc/server/constants.qh +++ b/data/qcsrc/server/constants.qh @@ -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; diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 4fa84e8f4..1ab406dbe 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -702,6 +702,7 @@ float g_pickup_rockets_max; 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 @@ void readlevelcvars(void) 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"); diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc index d670234cc..921ef50b3 100644 --- a/data/qcsrc/server/t_items.qc +++ b/data/qcsrc/server/t_items.qc @@ -1319,6 +1319,6 @@ void spawnfunc_item_fuel_regen(void) 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); } diff --git a/data/scripts/entities.def b/data/scripts/entities.def index 8c2e5c078..b903c60b1 100644 --- a/data/scripts/entities.def +++ b/data/scripts/entities.def @@ -1484,7 +1484,7 @@ 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 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. diff --git a/data/weapons.cfg b/data/weapons.cfg index 0d30df937..072268b1b 100644 --- a/data/weapons.cfg +++ b/data/weapons.cfg @@ -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_rockets_max 999 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 diff --git a/data/weaponsHavoc.cfg b/data/weaponsHavoc.cfg index e7a9adb2a..f356f695e 100644 --- a/data/weaponsHavoc.cfg +++ b/data/weaponsHavoc.cfg @@ -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_rockets_max 120 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 diff --git a/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def b/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def index 150e6bb66..b903c60b1 100644 --- a/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def +++ b/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def @@ -1455,3 +1455,41 @@ Disables a trigger_relay temporarily (until triggered again) 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" +*/ -- 2.39.2