From: z411 Date: Thu, 2 Dec 2021 20:45:56 +0000 (-0300) Subject: Added cvar for default loot lifetime and using it for dropped powerups X-Git-Tag: xonotic-v0.8.5~273^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F943%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Added cvar for default loot lifetime and using it for dropped powerups --- diff --git a/qcsrc/common/mutators/mutator/powerups/sv_powerups.qc b/qcsrc/common/mutators/mutator/powerups/sv_powerups.qc index f1326c97c..e7bbeeb69 100644 --- a/qcsrc/common/mutators/mutator/powerups/sv_powerups.qc +++ b/qcsrc/common/mutators/mutator/powerups/sv_powerups.qc @@ -112,7 +112,7 @@ void powerups_DropItem(entity this, StatusEffects effect) // If the timer is frozen, the item will stay on the floor for 20 secs (same as weapons), // otherwise it'll disappear after the timer runs out. - float time_to_live = (autocvar_g_powerups_drop_ondeath == 2 ? autocvar_g_powerups_drop_expire_time : timeleft); + float time_to_live = (autocvar_g_powerups_drop_ondeath == 2 ? autocvar_g_items_dropped_lifetime : timeleft); // TODO: items cannot hold their "item field" yet, so we need to list all the powerups here! switch(item) diff --git a/qcsrc/common/mutators/mutator/powerups/sv_powerups.qh b/qcsrc/common/mutators/mutator/powerups/sv_powerups.qh index cd30dfeca..b7f3b8e40 100644 --- a/qcsrc/common/mutators/mutator/powerups/sv_powerups.qh +++ b/qcsrc/common/mutators/mutator/powerups/sv_powerups.qh @@ -6,7 +6,6 @@ int autocvar_g_powerups; int autocvar_g_powerups_drop_ondeath; -float autocvar_g_powerups_drop_expire_time; bool autocvar_g_powerups_stack; REGISTER_MUTATOR(powerups, true); diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc index db9b3fece..c4e2353d8 100644 --- a/qcsrc/server/items/items.qc +++ b/qcsrc/server/items/items.qc @@ -981,7 +981,7 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default // Savage: remove thrown items after a certain period of time ("garbage collection") setthink(this, RemoveItem); - this.nextthink = time + 20; + this.nextthink = time + autocvar_g_items_dropped_lifetime; this.takedamage = DAMAGE_YES; this.event_damage = Item_Damage; diff --git a/qcsrc/server/items/items.qh b/qcsrc/server/items/items.qh index ff2d13843..1515a5267 100644 --- a/qcsrc/server/items/items.qh +++ b/qcsrc/server/items/items.qh @@ -6,6 +6,7 @@ float autocvar_g_balance_superweapons_time; bool autocvar_g_fullbrightitems; float autocvar_g_items_mindist; float autocvar_g_items_maxdist; +float autocvar_g_items_dropped_lifetime; int autocvar_g_pickup_items; bool autocvar_g_nodepthtestitems; #define autocvar_g_weapon_stay cvar("g_weapon_stay") diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc index 043c5d8d2..8c0382d33 100644 --- a/qcsrc/server/world.qc +++ b/qcsrc/server/world.qc @@ -461,8 +461,7 @@ void cvar_changes_init() BADCVAR("g_physics_clientselect"); BADCVAR("g_pinata"); BADCVAR("g_powerups"); - BADCVAR("g_powerups_dropondeath"); - BADCVAR("g_powerups_dropondeath_ttl"); + BADCVAR("g_powerups_drop_ondeath"); BADCVAR("g_player_brightness"); BADCVAR("g_rocket_flying"); BADCVAR("g_rocket_flying_disabledelays"); diff --git a/xonotic-server.cfg b/xonotic-server.cfg index 7234e81af..45266e819 100644 --- a/xonotic-server.cfg +++ b/xonotic-server.cfg @@ -199,7 +199,6 @@ set g_weapon_stay 0 "1: ghost weapons can be picked up but give no ammo, thrown set g_weapon_throwable 1 "if set to 1, weapons can be dropped" set g_powerups -1 "if set to 0 no powerups will spawn, if 1 they will spawn in all game modes, -1 is game mode default" set g_powerups_drop_ondeath 0 "players will drop their powerups on death (1 = timer continues, 2 = timer freezes until picked up)" -set g_powerups_drop_expire_time 25 "seconds before a dropped powerup disappears if its timer is frozen" set g_powerups_stack 0 "enables stacking of powerup timers when picking up a powerup you already have; otherwise timer is reset to the time granted by the item, if greater than the time you currently have" set g_powerups_strength 1 "allow strength powerups to spawn" set g_powerups_shield 1 "allow shield powerups to spawn" @@ -233,6 +232,7 @@ set g_maplist_sizes_count_bots 1 "include the number of bots currently in the se set g_items_mindist 4000 "starting distance for the fading of items" set g_items_maxdist 4500 "maximum distance at which an item can be viewed, after which it will be invisible" +set g_items_dropped_lifetime 20 "default lifetime for dropped items unless explicitly overriden (ie. flags)" set g_grab_range 200 "distance at which dragable objects can be grabbed"