Merge branch 'TimePath/cleanup'

[xonotic/xonotic-data.pk3dir.git] / balance-xpm.cfg

diff --git a/balance-xpm.cfg b/balance-xpm.cfg
index 7a310da1a84d76d87b27f5cc072c096e2c390e02..a99044add9757a9e03474911c400b3ef0d6badde 100644 (file)
--- a/balance-xpm.cfg
+++ b/balance-xpm.cfg
@@ -1,4 +1,4 @@
-g_mod_balance Xonotic
+g_mod_balance XPM
 
 // {{{ starting gear
 set g_balance_health_start 100
@@ -93,11 +93,11 @@ 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
-set g_pickup_respawntimejitter_powerup 30
+set g_pickup_respawntimejitter_powerup 0
 set g_pickup_respawntimejitter_weapon 0
 set g_pickup_respawntimejitter_superweapon 10
 set g_pickup_respawntimejitter_ammo 0
@@ -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.03
-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.03
-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,14 +148,14 @@ 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 1
+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)
 // 0: only damage from contents (lava/slime) or exceptions
 // 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_keep_owner 1
 set g_projectiles_newton_style 0
 // possible values:
 // 0: absolute velocity projectiles (like Quake)
@@ -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/3rd damage is taken
 set g_balance_powerup_invincible_time 30
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3
@@ -218,6 +218,15 @@ set g_balance_grapplehook_airfriction 0.2
 set g_balance_grapplehook_health 50
 set g_balance_grapplehook_damagedbycontents 1
 set g_balance_grapplehook_refire 0.2
+set g_balance_grapplehook_nade_time 0.7
+set g_balance_grapplehook_crouchslide 0
+set g_balance_grapplehook_gravity 0
+set g_balance_grapplehook_pull_frozen 0
 // }}}
 
-exec bal-wep-xonotic.cfg
+// {{{ port-o-launch
+set g_balance_portal_health 200 // these get recharged whenever the portal is used
+set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
+// }}}
+
+exec bal-wep-xpm.cfg