X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=balanceXPM.cfg;h=4f5562a8075fc9b31da36145a2906865647449da;hp=8012967ad73d324c181202296550e76605601d6e;hb=a6429c18eca824a5eff9995cd01672c23d39f61a;hpb=94579b4c440f739c1203ea5e546d3fcadb884c51

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index 8012967ad7..4f5562a807 100644
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -145,7 +145,6 @@ set g_balance_fuel_limit 999
 
 // {{{ misc
 set g_balance_selfdamagepercent 0.65
-set g_balance_weaponswitchdelay 0.2
 set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
 set g_weaponratefactor 1 "weapon fire rate multiplier"
 set g_weapondamagefactor 1 "weapon damage multiplier"
@@ -240,7 +239,7 @@ set g_balance_laser_primary_lifetime 5
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0
 set g_balance_laser_primary_gauntlet 0
-set g_balance_laser_primary_force_zscale 1.25
+set g_balance_laser_primary_force_zscale 1.2
 set g_balance_laser_primary_force_velocitybias 0
 set g_balance_laser_primary_force_other_scale 1
 set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
@@ -259,6 +258,8 @@ set g_balance_laser_secondary_gauntlet 0
 set g_balance_laser_secondary_force_zscale 1.25
 set g_balance_laser_secondary_force_velocitybias 0
 set g_balance_laser_secondary_force_other_scale 1
+set g_balance_laser_switchdelay_drop 0.15
+set g_balance_laser_switchdelay_raise 0.15
 set g_balance_laser_reload_ammo 0 //default: 6
 set g_balance_laser_reload_time 2
 // }}}
@@ -286,6 +287,8 @@ set g_balance_shotgun_secondary_damage 80
 set g_balance_shotgun_secondary_force 200
 set g_balance_shotgun_secondary_refire 1.25
 set g_balance_shotgun_secondary_animtime 1
+set g_balance_shotgun_switchdelay_drop 0.2
+set g_balance_shotgun_switchdelay_raise 0.2
 set g_balance_shotgun_reload_ammo 0 //default: 5
 set g_balance_shotgun_reload_time 2
 // }}}
@@ -320,6 +323,9 @@ set g_balance_uzi_sustained_ammo 1
 set g_balance_uzi_speed 18000
 set g_balance_uzi_bulletconstant 115 // 13.1qu
 
+set g_balance_uzi_switchdelay_drop 0.2
+set g_balance_uzi_switchdelay_raise 0.2
+
 set g_balance_uzi_reload_ammo 60 //default: 30
 set g_balance_uzi_reload_time 2
 // }}}
@@ -364,6 +370,9 @@ set g_balance_grenadelauncher_secondary_remote_detonateprimary 0
 set g_balance_grenadelauncher_bouncefactor 0.5
 set g_balance_grenadelauncher_bouncestop 0.075
 
+set g_balance_grenadelauncher_switchdelay_drop 0.2
+set g_balance_grenadelauncher_switchdelay_raise 0.2
+
 set g_balance_grenadelauncher_reload_ammo 0 //default: 12
 set g_balance_grenadelauncher_reload_time 2
 // }}}
@@ -411,6 +420,8 @@ set g_balance_electro_combo_radius 150
 set g_balance_electro_combo_comboradius 300
 set g_balance_electro_combo_speed 2000
 set g_balance_electro_combo_safeammocheck 1
+set g_balance_electro_switchdelay_drop 0.2
+set g_balance_electro_switchdelay_raise 0.2
 set g_balance_electro_reload_ammo 0 //default: 20
 set g_balance_electro_reload_time 2
 // }}}
@@ -429,7 +440,6 @@ set g_balance_crylink_primary_ammo 3
 set g_balance_crylink_primary_bouncedamagefactor 0.5
 set g_balance_crylink_primary_joindelay 0.1
 set g_balance_crylink_primary_joinspread 0.2
-set g_balance_crylink_primary_jointime 0
 set g_balance_crylink_primary_joinexplode 1
 set g_balance_crylink_primary_joinexplode_damage 0
 set g_balance_crylink_primary_joinexplode_edgedamage 0
@@ -445,7 +455,7 @@ set g_balance_crylink_primary_other_fadetime 5
 set g_balance_crylink_secondary 1
 set g_balance_crylink_secondary_damage 10
 set g_balance_crylink_secondary_edgedamage 5
-set g_balance_crylink_secondary_force -150
+set g_balance_crylink_secondary_force -250
 set g_balance_crylink_secondary_radius 100
 set g_balance_crylink_secondary_speed 3000
 set g_balance_crylink_secondary_spread 0.01
@@ -458,7 +468,6 @@ set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joindelay 0
 set g_balance_crylink_secondary_joinspread 0
-set g_balance_crylink_secondary_jointime 0
 set g_balance_crylink_secondary_joinexplode 0			
 set g_balance_crylink_secondary_joinexplode_damage 0	
 set g_balance_crylink_secondary_joinexplode_edgedamage 0
@@ -471,6 +480,9 @@ set g_balance_crylink_secondary_middle_fadetime 5
 set g_balance_crylink_secondary_line_lifetime 5 
 set g_balance_crylink_secondary_line_fadetime 5
 
+set g_balance_crylink_switchdelay_drop 0.2
+set g_balance_crylink_switchdelay_raise 0.2
+
 set g_balance_crylink_reload_ammo 0 //default: 10
 set g_balance_crylink_reload_time 2
 // }}}
@@ -478,7 +490,7 @@ set g_balance_crylink_reload_time 2
 set g_balance_nex_primary_damage 80
 set g_balance_nex_primary_force 400
 set g_balance_nex_primary_refire 1.5
-set g_balance_nex_primary_animtime 0.5
+set g_balance_nex_primary_animtime 0.6
 set g_balance_nex_primary_ammo 6
 set g_balance_nex_primary_damagefalloff_mindist 0 // 1000    For tZork ;3
 set g_balance_nex_primary_damagefalloff_maxdist 0 // 3000
@@ -515,6 +527,9 @@ set g_balance_nex_charge_velocity_rate 0
 set g_balance_nex_charge_minspeed 400
 set g_balance_nex_charge_maxspeed 800
 
+set g_balance_nex_switchdelay_drop 0.3
+set g_balance_nex_switchdelay_raise 0.25
+
 set g_balance_nex_reload_ammo 0 //default: 25
 set g_balance_nex_reload_time 2
 // }}}
@@ -525,6 +540,8 @@ set g_balance_minstanex_ammo 10
 set g_balance_minstanex_laser_ammo 0
 set g_balance_minstanex_laser_animtime 0.3
 set g_balance_minstanex_laser_refire 0.7
+set g_balance_minstanex_switchdelay_drop 0.2
+set g_balance_minstanex_switchdelay_raise 0.2
 set g_balance_minstanex_reload_ammo 0 //default: 50
 set g_balance_minstanex_reload_time 2
 // }}}
@@ -536,7 +553,7 @@ set g_balance_hagar_primary_health 15
 set g_balance_hagar_primary_damageforcescale 0
 set g_balance_hagar_primary_radius 65
 set g_balance_hagar_primary_spread 0.03
-set g_balance_hagar_primary_speed 2200
+set g_balance_hagar_primary_speed 2500
 set g_balance_hagar_primary_lifetime 5
 set g_balance_hagar_primary_refire 0.16667 // 6 rockets per second
 set g_balance_hagar_primary_ammo 1
@@ -548,7 +565,7 @@ set g_balance_hagar_secondary_load_spread_bias 0.5
 set g_balance_hagar_secondary_load_max 4
 set g_balance_hagar_secondary_load_hold 4
 set g_balance_hagar_secondary_load_releasedeath 0
-set g_balance_hagar_secondary_load_abort 1
+set g_balance_hagar_secondary_load_abort 0
 set g_balance_hagar_secondary_load_linkexplode 0
 set g_balance_hagar_secondary_load_animtime 0.2
 set g_balance_hagar_secondary_damage 40
@@ -563,13 +580,15 @@ set g_balance_hagar_secondary_lifetime_min 10
 set g_balance_hagar_secondary_lifetime_rand 0
 set g_balance_hagar_secondary_refire 0.5
 set g_balance_hagar_secondary_ammo 1
+set g_balance_hagar_switchdelay_drop 0.2
+set g_balance_hagar_switchdelay_raise 0.2
 set g_balance_hagar_reload_ammo 0 //default: 25
 set g_balance_hagar_reload_time 2
 // }}}
 // {{{ rocketlauncher
 set g_balance_rocketlauncher_damage 80
 set g_balance_rocketlauncher_edgedamage 40
-set g_balance_rocketlauncher_force 400
+set g_balance_rocketlauncher_force 450
 set g_balance_rocketlauncher_radius 110
 set g_balance_rocketlauncher_speed 1300
 set g_balance_rocketlauncher_speedaccel 1300
@@ -590,6 +609,8 @@ set g_balance_rocketlauncher_remote_damage 70
 set g_balance_rocketlauncher_remote_edgedamage 35
 set g_balance_rocketlauncher_remote_radius 110
 set g_balance_rocketlauncher_remote_force 400
+set g_balance_rocketlauncher_switchdelay_drop 0.2
+set g_balance_rocketlauncher_switchdelay_raise 0.2
 set g_balance_rocketlauncher_reload_ammo 0 //default: 25
 set g_balance_rocketlauncher_reload_time 2
 // }}}
@@ -603,6 +624,8 @@ set g_balance_porto_secondary_refire 1.5
 set g_balance_porto_secondary_animtime 0.3
 set g_balance_porto_secondary_speed 1000
 set g_balance_porto_secondary_lifetime 5
+set g_balance_porto_switchdelay_drop 0.2
+set g_balance_porto_switchdelay_raise 0.2
 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
 // }}}
@@ -626,7 +649,9 @@ set g_balance_hook_secondary_animtime 0.3 // good shoot anim
 set g_balance_hook_secondary_power 3 // effect behaves like a square function
 set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds
 set g_balance_hook_secondary_health 15
-set g_balance_hook_secondary_damageforcescale 0 
+set g_balance_hook_secondary_damageforcescale 0
+set g_balance_hook_switchdelay_drop 0.2
+set g_balance_hook_switchdelay_raise 0.2
 // }}}
 // {{{ tuba
 set g_balance_tuba_refire 0.05
@@ -639,9 +664,11 @@ set g_balance_tuba_edgedamage 0
 set g_balance_tuba_radius 200
 set g_balance_tuba_force 40
 set g_balance_tuba_pitchstep 6
+set g_balance_tuba_switchdelay_drop 0.2
+set g_balance_tuba_switchdelay_raise 0.2
 // }}}
 // {{{ fireball // this is a superweapon -- lets make it behave as one. 
-set g_balance_fireball_primary_animtime 0.4
+set g_balance_fireball_primary_animtime 0.2
 set g_balance_fireball_primary_bfgdamage 100
 set g_balance_fireball_primary_bfgforce 0
 set g_balance_fireball_primary_bfgradius 1000
@@ -675,4 +702,6 @@ set g_balance_fireball_secondary_speed 900
 set g_balance_fireball_secondary_speed_up 100
 set g_balance_fireball_secondary_speed_z 0
 set g_balance_fireball_secondary_spread 0
+set g_balance_fireball_switchdelay_drop 0.2
+set g_balance_fireball_switchdelay_raise 0.2
 // }}}