X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=balance-xpm.cfg;h=ebfceb2c4d6d89d736f051176ad2274ea7986e0d;hb=79656c882fc0326ff4f5216c20380b05d5ac06ea;hp=4b3cfb91d2fe5fe7dbaa007ff3b32a13b0085c17;hpb=e98ed192eac2c7983d5395418f3e9396024fa9ba;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/balance-xpm.cfg b/balance-xpm.cfg
index 4b3cfb91d..ebfceb2c4 100644
--- a/balance-xpm.cfg
+++ b/balance-xpm.cfg
@@ -1,4 +1,5 @@
 g_mod_balance XPM
+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 100
+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
@@ -32,6 +49,22 @@ set g_lms_start_ammo_rockets 160
 set g_lms_start_ammo_cells 180
 set g_lms_start_ammo_plasma 180
 set g_lms_start_ammo_fuel 0
+set g_mayhem_start_health 200
+set g_mayhem_start_armor 200
+set g_mayhem_start_ammo_shells 60
+set g_mayhem_start_ammo_nails 320
+set g_mayhem_start_ammo_rockets 160
+set g_mayhem_start_ammo_cells 180
+set g_mayhem_start_ammo_plasma 180
+set g_mayhem_start_ammo_fuel 0
+set g_tmayhem_start_health 200
+set g_tmayhem_start_armor 200
+set g_tmayhem_start_ammo_shells 60
+set g_tmayhem_start_ammo_nails 320
+set g_tmayhem_start_ammo_rockets 160
+set g_tmayhem_start_ammo_cells 180
+set g_tmayhem_start_ammo_plasma 180
+set g_tmayhem_start_ammo_fuel 0
 set g_balance_nix_roundtime 25
 set g_balance_nix_incrtime 1.6
 set g_balance_nix_ammo_shells 60
@@ -94,20 +127,31 @@ set g_pickup_healthbig_anyway 0
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
 set g_pickup_healthmega_anyway 0
-set g_pickup_respawntime_short 15
-set g_pickup_respawntime_medium 20
-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 10
-set g_pickup_respawntimejitter_short 0
-set g_pickup_respawntimejitter_medium 0
-set g_pickup_respawntimejitter_long 0
+set g_pickup_respawntime_armor_small 15
+set g_pickup_respawntime_armor_medium 20
+set g_pickup_respawntime_armor_big 30
+set g_pickup_respawntime_armor_mega 30
+set g_pickup_respawntime_health_small 15
+set g_pickup_respawntime_health_medium 15
+set g_pickup_respawntime_health_big 20
+set g_pickup_respawntime_health_mega 30
+set g_pickup_respawntime_initial_random 1
 set g_pickup_respawntimejitter_powerup 0
 set g_pickup_respawntimejitter_weapon 0
 set g_pickup_respawntimejitter_superweapon 10
 set g_pickup_respawntimejitter_ammo 0
+set g_pickup_respawntimejitter_armor_small 0
+set g_pickup_respawntimejitter_armor_medium 0
+set g_pickup_respawntimejitter_armor_big 0
+set g_pickup_respawntimejitter_armor_mega 0
+set g_pickup_respawntimejitter_health_small 0
+set g_pickup_respawntimejitter_health_medium 0
+set g_pickup_respawntimejitter_health_big 0
+set g_pickup_respawntimejitter_health_mega 0
 // }}}
 
 // {{{ regen/rot
@@ -121,7 +165,7 @@ set g_balance_pause_health_rot 1
 set g_balance_pause_health_rot_spawn 5
 set g_balance_health_regenstable 100
 set g_balance_health_rotstable 100
-set g_balance_health_limit 999
+set g_balance_health_limit 200
 set g_balance_armor_regen 0
 set g_balance_armor_regenlinear 0
 set g_balance_armor_rot 0.02
@@ -130,7 +174,7 @@ 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_limit 200
 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
@@ -141,7 +185,7 @@ set g_balance_pause_fuel_rot 5
 set g_balance_pause_fuel_rot_spawn 10
 set g_balance_fuel_regenstable 50
 set g_balance_fuel_rotstable 100
-set g_balance_fuel_limit 999
+set g_balance_fuel_limit 100
 // }}}
 
 // {{{ misc
@@ -184,6 +228,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 +243,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 +289,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
 // }}}
 
-exec bal-wep-xpm.cfg
+// {{{ hlac
+// hlac projectile settings are supposed to match the blaster, make sure they match when updating the blaster balance
+// }}}
+
+exec bal-wep-xonotic.cfg