Merge branch 'bones_was_here/hlac_speed' into 'master'

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

diff --git a/balance-xdf.cfg b/balance-xdf.cfg
index 562506283c44ad965d5d7d0f641a96a910aa11d3..94e98a6461ccc1f85ded776b3bd7685f9c6f71ad 100644 (file)
--- a/balance-xdf.cfg
+++ b/balance-xdf.cfg
@@ -1,4 +1,5 @@
 g_mod_balance XDF
+testing_disable
 
 // {{{ starting gear
 set g_balance_health_start 100
@@ -24,6 +25,22 @@ set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 200
+set g_ca_start_armor 200
+set g_ca_start_ammo_shells 60
+set g_ca_start_ammo_nails 320
+set g_ca_start_ammo_rockets 160
+set g_ca_start_ammo_cells 180
+set g_ca_start_ammo_plasma 180
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 100
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 60
+set g_ft_start_ammo_nails 320
+set g_ft_start_ammo_rockets 160
+set g_ft_start_ammo_cells 180
+set g_ft_start_ammo_plasma 180
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
 set g_lms_start_ammo_shells 60
@@ -49,8 +66,8 @@ set g_balance_nix_ammoincr_fuel 2
 // }}}
 
 // {{{ pickup items
-set g_pickup_ammo_anyway 1
-set g_pickup_weapons_anyway 1
+set g_pickup_ammo_anyway 0
+set g_pickup_weapons_anyway 0
 set g_pickup_shells 15
 set g_pickup_shells_weapon 15
 set g_pickup_shells_max 60
@@ -72,28 +89,28 @@ set g_pickup_fuel_jetpack 100
 set g_pickup_fuel_max 100
 set g_pickup_armorsmall 5
 set g_pickup_armorsmall_max 200
-set g_pickup_armorsmall_anyway 1
+set g_pickup_armorsmall_anyway 0
 set g_pickup_armormedium 25
 set g_pickup_armormedium_max 200
-set g_pickup_armormedium_anyway 1
+set g_pickup_armormedium_anyway 0
 set g_pickup_armorbig 50
 set g_pickup_armorbig_max 200
-set g_pickup_armorbig_anyway 1
+set g_pickup_armorbig_anyway 0
 set g_pickup_armormega 100
 set g_pickup_armormega_max 200
-set g_pickup_armormega_anyway 1
+set g_pickup_armormega_anyway 0
 set g_pickup_healthsmall 5
 set g_pickup_healthsmall_max 200
-set g_pickup_healthsmall_anyway 1
+set g_pickup_healthsmall_anyway 0
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 200
-set g_pickup_healthmedium_anyway 1
+set g_pickup_healthmedium_anyway 0
 set g_pickup_healthbig 50
 set g_pickup_healthbig_max 200
-set g_pickup_healthbig_anyway 1
+set g_pickup_healthbig_anyway 0
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
-set g_pickup_healthmega_anyway 1
+set g_pickup_healthmega_anyway 0
 set g_pickup_respawntime_short 0.1
 set g_pickup_respawntime_medium 0.1
 set g_pickup_respawntime_long 0.1
@@ -101,6 +118,7 @@ set g_pickup_respawntime_powerup 0.1
 set g_pickup_respawntime_weapon 0.1
 set g_pickup_respawntime_superweapon 0.1
 set g_pickup_respawntime_ammo 0.1
+set g_pickup_respawntime_initial_random 2
 set g_pickup_respawntimejitter_short 0
 set g_pickup_respawntimejitter_medium 0
 set g_pickup_respawntimejitter_long 0
@@ -184,6 +202,7 @@ set g_balance_falldamage_deadminspeed 250
 set g_balance_falldamage_minspeed 900
 set g_balance_falldamage_factor 0.20
 set g_balance_falldamage_maxdamage 40
+set g_balance_falldamage_onlyvertical 0
 set g_balance_damagepush_speedfactor 2.5
 set g_balance_contents_damagerate 0.2 // ticrate interval for applying damage with playerdamage/projectiledamage
 set g_balance_contents_drowndelay 10 // time under water before a player begins drowning
@@ -198,7 +217,13 @@ set g_maxpushtime 8.0 "timeout for kill credit when your damage knocks someone i
 
 // {{{ powerups
 set g_balance_powerup_invincible_takedamage 0.33 // only 1/3rd damage is taken
+set g_balance_powerup_invincible_takeforce 0.33
 set g_balance_powerup_invincible_time 30
+set g_balance_powerup_invisibility_alpha 0.15
+set g_balance_powerup_invisibility_time 30
+set g_balance_powerup_speed_attackrate 0.8
+set g_balance_powerup_speed_highspeed 1.5
+set g_balance_powerup_speed_time 30
 set g_balance_powerup_strength_damage 3
 set g_balance_powerup_strength_force 3
 set g_balance_powerup_strength_time 30
@@ -238,4 +263,8 @@ set g_balance_portal_health 200 // these get recharged whenever the portal is us
 set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
 // }}}
 
+// {{{ hlac
+// hlac projectile settings are supposed to match the blaster, make sure they match when updating the blaster balance
+// }}}
+
 exec bal-wep-xdf.cfg