From: Mario <zacjardine@y7mail.com>
Date: Wed, 3 Dec 2014 03:08:30 +0000 (+1100)
Subject: Make balances match
X-Git-Tag: xonotic-v0.8.0~122^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21100fc13f482f6d30de55c0e16190cb03bccbb6;p=xonotic%2Fxonotic-data.pk3dir.git

Make balances match
---

diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg
index c488dbdb9..b9252cba5 100644
--- a/balance-xonotic.cfg
+++ b/balance-xonotic.cfg
@@ -108,8 +108,8 @@ set g_balance_health_regen 0.08
 set g_balance_health_regenlinear 0.5
 set g_balance_pause_health_regen 5
 set g_balance_pause_health_regen_spawn 0
-set g_balance_health_rot 0.04
-set g_balance_health_rotlinear 0.75
+set g_balance_health_rot 0.02
+set g_balance_health_rotlinear 1
 set g_balance_pause_health_rot 1
 set g_balance_pause_health_rot_spawn 5
 set g_balance_health_regenstable 100
@@ -117,14 +117,14 @@ set g_balance_health_rotstable 100
 set g_balance_health_limit 999
 set g_balance_armor_regen 0
 set g_balance_armor_regenlinear 0
-set g_balance_armor_rot 0.04
-set g_balance_armor_rotlinear 0.75
+set g_balance_armor_rot 0.02
+set g_balance_armor_rotlinear 1
 set g_balance_pause_armor_rot 1
 set g_balance_pause_armor_rot_spawn 5
 set g_balance_armor_regenstable 100
 set g_balance_armor_rotstable 100
 set g_balance_armor_limit 999
-set g_balance_armor_blockpercent 0.6
+set g_balance_armor_blockpercent 0.7
 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
@@ -148,7 +148,7 @@ set g_balance_firetransfer_time 0.9
 set g_balance_firetransfer_damage 0.8
 set g_throughfloor_damage 0.75
 set g_throughfloor_force 0.75
-set g_projectiles_damage 2
+set g_projectiles_damage -2
 // possible values:
 // -2: absolutely no damage to projectiles (no exceptions)
 // -1: no damage other than the exceptions (electro combo, hagar join explode, ML mines)
@@ -156,7 +156,7 @@ set g_projectiles_damage 2
 // 1: only self damage or damage from contents or exceptions
 // 2: allow all damage to projectiles normally
 set g_projectiles_keep_owner 0
-set g_projectiles_newton_style 2
+set g_projectiles_newton_style 0
 // possible values:
 // 0: absolute velocity projectiles (like Quake)
 // 1: relative velocity projectiles, "Newtonian" (like Tribes 2)
@@ -188,7 +188,7 @@ set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone i
 // }}}
 
 // {{{ powerups
-set g_balance_powerup_invincible_takedamage 0.25 // only 1/4th damage is taken
+set g_balance_powerup_invincible_takedamage 0.33 // only 1/4th damage is taken
 set g_balance_powerup_invincible_time 30
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3
diff --git a/balance-xpm.cfg b/balance-xpm.cfg
index c07c52727..776a97c45 100644
--- a/balance-xpm.cfg
+++ b/balance-xpm.cfg
@@ -93,7 +93,7 @@ set g_pickup_respawntime_long 30
 set g_pickup_respawntime_powerup 120
 set g_pickup_respawntime_weapon 10
 set g_pickup_respawntime_superweapon 120
-set g_pickup_respawntime_ammo 15
+set g_pickup_respawntime_ammo 10
 set g_pickup_respawntimejitter_short 0
 set g_pickup_respawntimejitter_medium 0
 set g_pickup_respawntimejitter_long 0