sound (self, CHAN_TRIGGER, "misc/itemrespawn.wav", VOL_BASE, ATTN_NORM); // play respawn sound\r
setorigin (self, self.origin);\r
\r
- //pointparticles(particleeffectnum("item_respawn"), self.origin + self.mins_z * '0 0 1' + '0 0 48', '0 0 0', 1);\r
pointparticles(particleeffectnum("item_respawn"), self.origin + 0.5 * (self.mins + self.maxs), '0 0 0', 1);\r
}\r
\r
void Item_ScheduleRespawn(entity e)\r
{\r
Item_Show(e, 0);\r
- Item_ScheduleRespawnIn(e, ITEM_RESPAWNTIME(e));\r
+ if(e.respawntime > 0) // if respawntime is -1, this item does not respawn\r
+ Item_ScheduleRespawnIn(e, ITEM_RESPAWNTIME(e));\r
+ else\r
+ remove(e);\r
}\r
\r
void Item_ScheduleInitialRespawn(entity e)\r
if(!Item_GiveTo(self, other))\r
return;\r
\r
+ other.last_pickup = time;\r
+\r
pointparticles(particleeffectnum("item_pickup"), self.origin, '0 0 0', 1);\r
\r
if (self.classname == "droppedweapon")\r
\r
weaponsInMap |= weaponid;\r
\r
- if(g_lms || g_ca)\r
+ if(g_lms)\r
{\r
startitem_failed = TRUE;\r
remove(self);\r
self.max_health = g_pickup_healthlarge_max;\r
if(!self.health)\r
self.health = g_pickup_healthlarge;\r
- StartItem ("models/items/g_h50.md3", "misc/mediumhealth.wav", g_pickup_respawntime_medium, g_pickup_respawntimejitter_medium, "50 Health", IT_25HP, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_MID);\r
+ StartItem ("models/items/g_h50.md3", "misc/largehealth.wav", g_pickup_respawntime_medium, g_pickup_respawntimejitter_medium, "50 Health", IT_25HP, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_MID);\r
}\r
\r
void spawnfunc_item_health_mega (void) {\r
}\r
POSTGIVE_VALUE(e, strength_finished, 1, "misc/powerup.wav", "misc/poweroff.wav");\r
POSTGIVE_VALUE(e, invincible_finished, 1, "misc/powerup_shield.wav", "misc/poweroff.wav");\r
- POSTGIVE_VALUE_ROT(e, ammo_fuel, 1, pauserotfuel_finished, cvar("g_balance_pause_fuel_rot"), pauseregen_finished, cvar("g_balance_pause_fuel_regen"), "misc/itempickup.wav", string_null);\r
- POSTGIVE_VALUE_ROT(e, armorvalue, 1, pauserotarmor_finished, cvar("g_balance_pause_armor_rot"), pauseregen_finished, cvar("g_balance_pause_health_regen"), "misc/armor25.wav", string_null);\r
- POSTGIVE_VALUE_ROT(e, health, 1, pauserothealth_finished, cvar("g_balance_pause_health_rot"), pauseregen_finished, cvar("g_balance_pause_health_regen"), "misc/megahealth.wav", string_null);\r
+ POSTGIVE_VALUE_ROT(e, ammo_fuel, 1, pauserotfuel_finished, cvar("g_balance_pause_fuel_rot"), pauseregenhealth_finished, cvar("g_balance_pause_fuel_regen"), "misc/itempickup.wav", string_null);\r
+ POSTGIVE_VALUE_ROT(e, armorvalue, 1, pauserotarmor_finished, cvar("g_balance_pause_armor_rot"), pauseregenarmor_finished, cvar("g_balance_pause_armor_regen"), "misc/armor25.wav", string_null);\r
+ POSTGIVE_VALUE_ROT(e, health, 1, pauserothealth_finished, cvar("g_balance_pause_health_rot"), pauseregenhealth_finished, cvar("g_balance_pause_health_regen"), "misc/megahealth.wav", string_null);\r
\r
if(e.strength_finished <= 0)\r
e.strength_finished = 0;\r