From 5eadf772f358d47a18e137ce773b63f187a1871f Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sat, 19 Nov 2011 23:17:13 +0200 Subject: [PATCH] Always clear the armor of a dead player. Also tweak the balancing a bit more --- data/balanceVT.cfg | 6 +++--- data/qcsrc/server/g_damage.qc | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg index 16a42206..5dee25a7 100644 --- a/data/balanceVT.cfg +++ b/data/balanceVT.cfg @@ -87,7 +87,7 @@ set g_balance_health_limit 200 set g_balance_armor_regenstable 100 set g_balance_armor_rotstable 100 set g_balance_armor_limit 100 -set g_balance_armor_blockpercent 0.4 +set g_balance_armor_blockpercent 0.3 set g_balance_fuel_regen 0.1 "fuel regeneration (only applies if the player owns IT_FUEL_REGEN)" set g_balance_fuel_regenlinear 0 set g_balance_pause_fuel_regen 2 // other than this, fuel uses the health regen counter @@ -217,7 +217,7 @@ set g_balance_vore_regurgitate_predator_punchangle 12 "your view gets tilted by set g_balance_vore_regurgitate_predator_punchangle_item 6 "your view gets tilted by this amount when regurgitating an item" set g_balance_vore_regurgitate_prey_punchvector 50 "your view gets lowered by this amount when getting regurgitated" set g_balance_vore_digestion_damage 3 "amount of damage applied to victims during digestion" -set g_balance_vore_digestion_damage_death 3 "amount of damage applied to dead victims during digestion" +set g_balance_vore_digestion_damage_death 4 "amount of damage applied to dead victims during digestion" set g_balance_vore_digestion_damage_item 1 "amount of damage applied to items during digestion" set g_balance_vore_digestion_limit -100 "prey can be digested down to this amount of health" set g_balance_vore_digestion_limit_regurgitate 1 "the predator automatically regurgitates prey that has reached the digestion limit" @@ -228,7 +228,7 @@ set g_balance_vore_digestion_distribute 0.1 "if enabled, digestion is reduced by set g_balance_vore_digestion_scalediff 0.5 "if enabled, digestion damage is affected by the size of the predator compared to the size of the prey by this amount" set g_balance_vore_teamheal 1 "when enabled, having a team mate in your stomach will keep healing them by this amount" set g_balance_vore_teamheal_stable 150 "maximum amount of health you can gain from a teamheal (best kept equal or less than g_balance_health_rotstable)" -set g_balance_vore_kick_damage 30 "amount of damage you can do during stomach kick" +set g_balance_vore_kick_damage 25 "amount of damage you can do during stomach kick" set g_balance_vore_kick_delay 0.6 "how many seconds must pass before you can perform another stomach kick" set g_balance_vore_kick_force 320 "predators are pushed by this amount when stomach kicked, in the direction their prey is facing" set g_balance_vore_kick_repress 0 "require pressing the fire key each kick rather than holding it down" diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index 31f86668..65e2c092 100644 --- a/data/qcsrc/server/g_damage.qc +++ b/data/qcsrc/server/g_damage.qc @@ -633,6 +633,9 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) LogDeath("accident", deathtype, targ, targ); } + // we lose all armor when we die + targ.armorvalue = 0; + targ.death_origin = targ.origin; if(targ != attacker) targ.killer_origin = attacker.origin; -- 2.39.2