From 6ce1038f1a0339feb884fd9a1cc2e79467ae1474 Mon Sep 17 00:00:00 2001 From: Lyberta Date: Wed, 12 Apr 2017 10:00:01 +0300 Subject: [PATCH] Survival: Better attacker ammo pickup. --- .../mutators/mutator/gamemode_survival.qc | 10 ++++++++-- survival.cfg | 18 ++++++++++-------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/qcsrc/server/mutators/mutator/gamemode_survival.qc b/qcsrc/server/mutators/mutator/gamemode_survival.qc index b8fb599c3..b128f5afc 100644 --- a/qcsrc/server/mutators/mutator/gamemode_survival.qc +++ b/qcsrc/server/mutators/mutator/gamemode_survival.qc @@ -97,6 +97,10 @@ int autocvar_g_surv_cannon_fodder_start_armor; /// spawn. int autocvar_g_surv_cannon_fodder_num_random_start_weapons; +/// \brief How much health do attackers get when they pickup ammo. +int autocvar_g_surv_attacker_pickup_ammo_health; +/// \brief How much armor do attackers get when they pickup ammo. +int autocvar_g_surv_attacker_pickup_ammo_armor; /// \brief How many health do defenders get when they pickup small health. int autocvar_g_surv_defender_pickup_health_small; /// \brief How many health do defenders get when they pickup medium health. @@ -1715,8 +1719,10 @@ MUTATOR_HOOKFUNCTION(surv, ItemTouch) case "item_cells": case "droppedweapon": { - GivePlayerHealth(player, g_pickup_healthmedium); - GivePlayerArmor(player, g_pickup_armormedium); + GivePlayerHealth(player, + autocvar_g_surv_attacker_pickup_ammo_health); + GivePlayerArmor(player, + autocvar_g_surv_attacker_pickup_ammo_armor); return MUT_ITEMTOUCH_CONTINUE; } } diff --git a/survival.cfg b/survival.cfg index aaefffd58..3faededb7 100644 --- a/survival.cfg +++ b/survival.cfg @@ -42,14 +42,16 @@ set g_surv_cannon_fodder_start_armor 0 "How much armor does cannon fodder get du set g_surv_cannon_fodder_num_random_start_weapons 2 "Number of weapons that can be randomly given to cannon fodder during spawn" set g_surv_cannon_fodder_random_start_weapons "machinegun mortar electro crylink vortex hagar devastator" "Weapons that can be randomly given to cannon fodder during spawn" -set g_surv_defender_pickup_health_small 0 "How many health do defenders get when they pickup small health" -set g_surv_defender_pickup_health_medium 0 "How many health do defenders get when they pickup medium health" -set g_surv_defender_pickup_health_big 0 "How many health do defenders get when they pickup big health" -set g_surv_defender_pickup_health_mega 0 "How many health do defenders get when they pickup mega health" -set g_surv_defender_pickup_armor_small 0 "How many armor do defenders get when they pickup small armor" -set g_surv_defender_pickup_armor_medium 0 "How many armor do defenders get when they pickup medium armor" -set g_surv_defender_pickup_armor_big 0 "How many armor do defenders get when they pickup big armor" -set g_surv_defender_pickup_armor_mega 0 "How many armor do defenders get when they pickup mega armor" +set g_surv_attacker_pickup_ammo_health 25 "How much health do attackers get when they pickup ammo" +set g_surv_attacker_pickup_ammo_armor 25 "How much armor do attackers get when they pickup ammo" +set g_surv_defender_pickup_health_small 0 "How much health do defenders get when they pickup small health" +set g_surv_defender_pickup_health_medium 0 "How much health do defenders get when they pickup medium health" +set g_surv_defender_pickup_health_big 0 "How much health do defenders get when they pickup big health" +set g_surv_defender_pickup_health_mega 0 "How much health do defenders get when they pickup mega health" +set g_surv_defender_pickup_armor_small 0 "How much armor do defenders get when they pickup small armor" +set g_surv_defender_pickup_armor_medium 0 "How much armor do defenders get when they pickup medium armor" +set g_surv_defender_pickup_armor_big 0 "How much armor do defenders get when they pickup big armor" +set g_surv_defender_pickup_armor_mega 0 "How much armor do defenders get when they pickup mega armor" set g_surv_defender_pickup_shells_small 6 "How many shells do defenders get when they pickup small health/armor" set g_surv_defender_pickup_shells_medium 15 "How many shells do defenders get when they pickup medium health/armor" set g_surv_defender_pickup_shells_big 30 "How many shells do defenders get when they pickup big health/armor" -- 2.39.5