Now update all the balance configs with the new cvars

diff --git a/balance25.cfg b/balance25.cfg
index 27ced6b82acebc204bab731e26ff8477e765a1e6..7a45ad60dcff6c422c62bee5da1eddb43d53139f 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -228,26 +228,39 @@ set g_balance_grapplehook_damagedbycontents 0
 
 // {{{ weapon properties
 // {{{ laser
-set g_balance_laser_oldprimary 1
+set g_balance_laser_melee_animtime 0.3
+set g_balance_laser_melee_damage 80
+set g_balance_laser_melee_delay 0.25
+set g_balance_laser_melee_force 200
+set g_balance_laser_melee_multihit 1
+set g_balance_laser_melee_no_doubleslap 1
+set g_balance_laser_melee_nonplayerdamage 40
+set g_balance_laser_melee_range 120
+set g_balance_laser_melee_refire 1.25
+set g_balance_laser_melee_swing_side 120
+set g_balance_laser_melee_swing_up 30
+set g_balance_laser_melee_time 0.15
+set g_balance_laser_melee_traces 10
+
+set g_balance_laser_primary 1 // 0 = shockwave attack, 1 = projectile primary
 set g_balance_laser_primary_damage 35
 set g_balance_laser_primary_edgedamage 10
 set g_balance_laser_primary_force 400
 set g_balance_laser_primary_radius 70
 set g_balance_laser_primary_speed 9000
 set g_balance_laser_primary_spread 0
-set g_balance_laser_primary_spread_max 100
-set g_balance_laser_primary_spread_min 20
 set g_balance_laser_primary_refire 0.7
 set g_balance_laser_primary_animtime 0.3
 set g_balance_laser_primary_lifetime 30
-set g_balance_laser_primary_multiplier_min 0.5
-set g_balance_laser_primary_multiplier_accuracy 0.5
-set g_balance_laser_primary_multiplier_distance 0.5
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0.05
 set g_balance_laser_primary_force_zscale 1
 set g_balance_laser_primary_force_velocitybias 0
 set g_balance_laser_primary_force_other_scale 1
+
+set g_balance_laser_reload_ammo 0 //default: 6
+set g_balance_laser_reload_time 2
+
 set g_balance_laser_secondary 0 // 0 = switch away to last used weapon, 1 = projectile secondary, 2 = melee secondary
 set g_balance_laser_secondary_damage 35
 set g_balance_laser_secondary_edgedamage 10
@@ -258,23 +271,37 @@ set g_balance_laser_secondary_spread 0
 set g_balance_laser_secondary_refire 0.7
 set g_balance_laser_secondary_animtime 0.3
 set g_balance_laser_secondary_lifetime 30
-set g_balance_laser_secondary_melee_delay 0.25 // 0.35 was too slow
-set g_balance_laser_secondary_melee_range 120
-set g_balance_laser_secondary_melee_swing_side 120
-set g_balance_laser_secondary_melee_swing_up 30
-set g_balance_laser_secondary_melee_time 0.15
-set g_balance_laser_secondary_melee_traces 10
-set g_balance_laser_secondary_melee_no_doubleslap 1
-set g_balance_laser_secondary_melee_nonplayerdamage 40
-set g_balance_laser_secondary_melee_multihit 1
-set g_balance_laser_secondary_damage 80
 set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 set g_balance_laser_secondary_force_zscale 1
 set g_balance_laser_secondary_force_velocitybias 0
 set g_balance_laser_secondary_force_other_scale 1
-set g_balance_laser_reload_ammo 0 //default: 6
-set g_balance_laser_reload_time 2
+
+set g_balance_laser_shockwave_damage 20
+set g_balance_laser_shockwave_distance 2000
+set g_balance_laser_shockwave_edgedamage 0
+set g_balance_laser_shockwave_force 250
+set g_balance_laser_shockwave_jump_damage 20
+set g_balance_laser_shockwave_jump_edgedamage 0
+set g_balance_laser_shockwave_jump_force 300
+set g_balance_laser_shockwave_jump_force_velocitybias 0
+set g_balance_laser_shockwave_jump_force_zscale 1.25
+set g_balance_laser_shockwave_jump_multiplier_accuracy 0.5
+set g_balance_laser_shockwave_jump_multiplier_distance 0.5
+set g_balance_laser_shockwave_jump_multiplier_min 0
+set g_balance_laser_shockwave_jump_radius 150
+set g_balance_laser_shockwave_multiplier_accuracy 0.5
+set g_balance_laser_shockwave_multiplier_distance 0.5
+set g_balance_laser_shockwave_multiplier_min 0
+set g_balance_laser_shockwave_splash_damage 15
+set g_balance_laser_shockwave_splash_edgedamage 0
+set g_balance_laser_shockwave_splash_force 100
+set g_balance_laser_shockwave_splash_multiplier_accuracy 0.5
+set g_balance_laser_shockwave_splash_multiplier_distance 0.5
+set g_balance_laser_shockwave_splash_multiplier_min 0
+set g_balance_laser_shockwave_splash_radius 70
+set g_balance_laser_shockwave_spread_max 100
+set g_balance_laser_shockwave_spread_min 20
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 6

diff --git a/balanceFruitieX.cfg b/balanceFruitieX.cfg
index 90e9ed79de9c76a500df4535018520d1d10977f3..219ea0f315df3b4c3817766f963d2f80c3158543 100644 (file)
--- a/balanceFruitieX.cfg
+++ b/balanceFruitieX.cfg
@@ -228,26 +228,39 @@ set g_balance_grapplehook_damagedbycontents 0
 
 // {{{ weapon properties
 // {{{ laser
-set g_balance_laser_oldprimary 1
+set g_balance_laser_melee_animtime 0.3
+set g_balance_laser_melee_damage 80
+set g_balance_laser_melee_delay 0.25
+set g_balance_laser_melee_force 200
+set g_balance_laser_melee_multihit 1
+set g_balance_laser_melee_no_doubleslap 1
+set g_balance_laser_melee_nonplayerdamage 40
+set g_balance_laser_melee_range 120
+set g_balance_laser_melee_refire 1.25
+set g_balance_laser_melee_swing_side 120
+set g_balance_laser_melee_swing_up 30
+set g_balance_laser_melee_time 0.15
+set g_balance_laser_melee_traces 10
+
+set g_balance_laser_primary 1 // 0 = shockwave attack, 1 = projectile primary
 set g_balance_laser_primary_damage 20 // dps 33, hope that's not too high
 set g_balance_laser_primary_edgedamage 20
 set g_balance_laser_primary_force 150 // this looks insanely low, but actually isn't with zscale and velocitybias
 set g_balance_laser_primary_radius 60
 set g_balance_laser_primary_speed 5000
 set g_balance_laser_primary_spread 0
-set g_balance_laser_primary_spread_max 100
-set g_balance_laser_primary_spread_min 20
 set g_balance_laser_primary_refire 0.6
 set g_balance_laser_primary_animtime 0.4
 set g_balance_laser_primary_lifetime 5
-set g_balance_laser_primary_multiplier_min 0.5
-set g_balance_laser_primary_multiplier_accuracy 0.5
-set g_balance_laser_primary_multiplier_distance 0.5
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0
 set g_balance_laser_primary_force_zscale 2 // 300 upforce
 set g_balance_laser_primary_force_velocitybias 0.3
 set g_balance_laser_primary_force_other_scale 2.5 // force 375 when pushing others around
+
+set g_balance_laser_reload_ammo 0 //default: 6
+set g_balance_laser_reload_time 2
+
 set g_balance_laser_secondary 0 // 0 = switch away to last used weapon, 1 = projectile secondary, 2 = melee secondary
 set g_balance_laser_secondary_damage 200 // dps
 set g_balance_laser_secondary_edgedamage 0
@@ -258,23 +271,37 @@ set g_balance_laser_secondary_spread 0
 set g_balance_laser_secondary_refire 0.066
 set g_balance_laser_secondary_animtime 0.066
 set g_balance_laser_secondary_lifetime 0
-set g_balance_laser_secondary_melee_delay 0.25 // 0.35 was too slow
-set g_balance_laser_secondary_melee_range 120
-set g_balance_laser_secondary_melee_swing_side 120
-set g_balance_laser_secondary_melee_swing_up 30
-set g_balance_laser_secondary_melee_time 0.15
-set g_balance_laser_secondary_melee_traces 10
-set g_balance_laser_secondary_melee_no_doubleslap 1
-set g_balance_laser_secondary_melee_nonplayerdamage 40
-set g_balance_laser_secondary_melee_multihit 1
-set g_balance_laser_secondary_damage 80
 set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 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 0
-set g_balance_laser_reload_ammo 0 //default: 6
-set g_balance_laser_reload_time 2
+
+set g_balance_laser_shockwave_damage 20
+set g_balance_laser_shockwave_distance 2000
+set g_balance_laser_shockwave_edgedamage 0
+set g_balance_laser_shockwave_force 250
+set g_balance_laser_shockwave_jump_damage 20
+set g_balance_laser_shockwave_jump_edgedamage 0
+set g_balance_laser_shockwave_jump_force 300
+set g_balance_laser_shockwave_jump_force_velocitybias 0
+set g_balance_laser_shockwave_jump_force_zscale 1.25
+set g_balance_laser_shockwave_jump_multiplier_accuracy 0.5
+set g_balance_laser_shockwave_jump_multiplier_distance 0.5
+set g_balance_laser_shockwave_jump_multiplier_min 0
+set g_balance_laser_shockwave_jump_radius 150
+set g_balance_laser_shockwave_multiplier_accuracy 0.5
+set g_balance_laser_shockwave_multiplier_distance 0.5
+set g_balance_laser_shockwave_multiplier_min 0
+set g_balance_laser_shockwave_splash_damage 15
+set g_balance_laser_shockwave_splash_edgedamage 0
+set g_balance_laser_shockwave_splash_force 100
+set g_balance_laser_shockwave_splash_multiplier_accuracy 0.5
+set g_balance_laser_shockwave_splash_multiplier_distance 0.5
+set g_balance_laser_shockwave_splash_multiplier_min 0
+set g_balance_laser_shockwave_splash_radius 70
+set g_balance_laser_shockwave_spread_max 100
+set g_balance_laser_shockwave_spread_min 20
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 18

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index 9bfe7d9285ac9f46725b239bedd9765bdbf516a9..8fc4cc639ccd7e580b04776e756f225f6370482b 100644 (file)
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -228,53 +228,80 @@ set g_balance_grapplehook_damagedbycontents 1
 
 // {{{ weapon properties
 // {{{ laser
-set g_balance_laser_oldprimary 0
-set g_balance_laser_primary_damage 20
-set g_balance_laser_primary_edgedamage 0
+set g_balance_laser_melee_animtime 0.3
+set g_balance_laser_melee_damage 80
+set g_balance_laser_melee_delay 0.25
+set g_balance_laser_melee_force 200
+set g_balance_laser_melee_multihit 1
+set g_balance_laser_melee_no_doubleslap 1
+set g_balance_laser_melee_nonplayerdamage 40
+set g_balance_laser_melee_range 120
+set g_balance_laser_melee_refire 1.25
+set g_balance_laser_melee_swing_side 120
+set g_balance_laser_melee_swing_up 30
+set g_balance_laser_melee_time 0.15
+set g_balance_laser_melee_traces 10
+
+set g_balance_laser_primary 1 // 0 = shockwave attack, 1 = projectile primary
+set g_balance_laser_primary_damage 25
+set g_balance_laser_primary_edgedamage 12.5
 set g_balance_laser_primary_force 300
-set g_balance_laser_primary_radius 2000
+set g_balance_laser_primary_radius 70
 set g_balance_laser_primary_speed 6000
 set g_balance_laser_primary_spread 0
-set g_balance_laser_primary_spread_max 100
-set g_balance_laser_primary_spread_min 20
 set g_balance_laser_primary_refire 0.7
 set g_balance_laser_primary_animtime 0.2
 set g_balance_laser_primary_lifetime 5
-set g_balance_laser_primary_multiplier_min 0
-set g_balance_laser_primary_multiplier_accuracy 0.5
-set g_balance_laser_primary_multiplier_distance 0.5
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0
 set g_balance_laser_primary_force_zscale 1.25
 set g_balance_laser_primary_force_velocitybias 0
 set g_balance_laser_primary_force_other_scale 1
-set g_balance_laser_secondary 2 // 0 = switch away to last used weapon, 1 = projectile secondary, 2 = melee secondary
-set g_balance_laser_secondary_damage 80
+
+set g_balance_laser_reload_ammo 0 //default: 6
+set g_balance_laser_reload_time 2
+
+set g_balance_laser_secondary 0 // 0 = switch away to last used weapon, 1 = projectile secondary, 2 = melee secondary
+set g_balance_laser_secondary_damage 25
 set g_balance_laser_secondary_edgedamage 12.5
-set g_balance_laser_secondary_force 200
+set g_balance_laser_secondary_force 400
 set g_balance_laser_secondary_radius 70
 set g_balance_laser_secondary_speed 12000
 set g_balance_laser_secondary_spread 0
-set g_balance_laser_secondary_refire 1.25
-set g_balance_laser_secondary_animtime 0.3
+set g_balance_laser_secondary_refire 0.7
+set g_balance_laser_secondary_animtime 0.2
 set g_balance_laser_secondary_lifetime 5
-set g_balance_laser_secondary_melee_delay 0.25 // 0.35 was too slow
-set g_balance_laser_secondary_melee_range 120
-set g_balance_laser_secondary_melee_swing_side 120
-set g_balance_laser_secondary_melee_swing_up 30
-set g_balance_laser_secondary_melee_time 0.15
-set g_balance_laser_secondary_melee_traces 10
-set g_balance_laser_secondary_melee_no_doubleslap 1
-set g_balance_laser_secondary_melee_nonplayerdamage 40
-set g_balance_laser_secondary_melee_multihit 1
-set g_balance_laser_secondary_damage 80
 set g_balance_laser_secondary_shotangle -90
 set g_balance_laser_secondary_delay 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_reload_ammo 0 //default: 6
-set g_balance_laser_reload_time 2
+
+set g_balance_laser_shockwave_damage 20
+set g_balance_laser_shockwave_distance 2000
+set g_balance_laser_shockwave_edgedamage 0
+set g_balance_laser_shockwave_force 250
+set g_balance_laser_shockwave_jump_damage 20
+set g_balance_laser_shockwave_jump_edgedamage 0
+set g_balance_laser_shockwave_jump_force 300
+set g_balance_laser_shockwave_jump_force_velocitybias 0
+set g_balance_laser_shockwave_jump_force_zscale 1.25
+set g_balance_laser_shockwave_jump_multiplier_accuracy 0.5
+set g_balance_laser_shockwave_jump_multiplier_distance 0.5
+set g_balance_laser_shockwave_jump_multiplier_min 0
+set g_balance_laser_shockwave_jump_radius 150
+set g_balance_laser_shockwave_multiplier_accuracy 0.5
+set g_balance_laser_shockwave_multiplier_distance 0.5
+set g_balance_laser_shockwave_multiplier_min 0
+set g_balance_laser_shockwave_splash_damage 15
+set g_balance_laser_shockwave_splash_edgedamage 0
+set g_balance_laser_shockwave_splash_force 100
+set g_balance_laser_shockwave_splash_multiplier_accuracy 0.5
+set g_balance_laser_shockwave_splash_multiplier_distance 0.5
+set g_balance_laser_shockwave_splash_multiplier_min 0
+set g_balance_laser_shockwave_splash_radius 70
+set g_balance_laser_shockwave_spread_max 100
+set g_balance_laser_shockwave_spread_min 20
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 14

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index e391a74ca71b7fbae5cc8caefee3a33463e06651..4fe95a6904514bb5993eb54aa435b119d6565b16 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -228,53 +228,80 @@ set g_balance_grapplehook_damagedbycontents 1
 
 // {{{ weapon properties
 // {{{ laser
-set g_balance_laser_oldprimary 0
-set g_balance_laser_primary_damage 20
-set g_balance_laser_primary_edgedamage 0
+set g_balance_laser_melee_animtime 0.3
+set g_balance_laser_melee_damage 80
+set g_balance_laser_melee_delay 0.25
+set g_balance_laser_melee_force 200
+set g_balance_laser_melee_multihit 1
+set g_balance_laser_melee_no_doubleslap 1
+set g_balance_laser_melee_nonplayerdamage 40
+set g_balance_laser_melee_range 120
+set g_balance_laser_melee_refire 1.25
+set g_balance_laser_melee_swing_side 120
+set g_balance_laser_melee_swing_up 30
+set g_balance_laser_melee_time 0.15
+set g_balance_laser_melee_traces 10
+
+set g_balance_laser_primary 0 // 0 = shockwave attack, 1 = projectile primary
+set g_balance_laser_primary_damage 25
+set g_balance_laser_primary_edgedamage 12.5
 set g_balance_laser_primary_force 300
-set g_balance_laser_primary_radius 2000
+set g_balance_laser_primary_radius 70
 set g_balance_laser_primary_speed 6000
 set g_balance_laser_primary_spread 0
-set g_balance_laser_primary_spread_max 100
-set g_balance_laser_primary_spread_min 20
 set g_balance_laser_primary_refire 0.7
 set g_balance_laser_primary_animtime 0.2
 set g_balance_laser_primary_lifetime 5
-set g_balance_laser_primary_multiplier_min 0
-set g_balance_laser_primary_multiplier_accuracy 0.5
-set g_balance_laser_primary_multiplier_distance 0.5
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0
 set g_balance_laser_primary_force_zscale 1.25
 set g_balance_laser_primary_force_velocitybias 0
 set g_balance_laser_primary_force_other_scale 1
+
+set g_balance_laser_reload_ammo 0 //default: 6
+set g_balance_laser_reload_time 2
+
 set g_balance_laser_secondary 2 // 0 = switch away to last used weapon, 1 = projectile secondary, 2 = melee secondary
-set g_balance_laser_secondary_damage 80
+set g_balance_laser_secondary_damage 25
 set g_balance_laser_secondary_edgedamage 12.5
-set g_balance_laser_secondary_force 200
+set g_balance_laser_secondary_force 400
 set g_balance_laser_secondary_radius 70
 set g_balance_laser_secondary_speed 12000
 set g_balance_laser_secondary_spread 0
-set g_balance_laser_secondary_refire 1.25
-set g_balance_laser_secondary_animtime 0.3
+set g_balance_laser_secondary_refire 0.7
+set g_balance_laser_secondary_animtime 0.2
 set g_balance_laser_secondary_lifetime 5
-set g_balance_laser_secondary_melee_delay 0.25 // 0.35 was too slow
-set g_balance_laser_secondary_melee_range 120
-set g_balance_laser_secondary_melee_swing_side 120
-set g_balance_laser_secondary_melee_swing_up 30
-set g_balance_laser_secondary_melee_time 0.15
-set g_balance_laser_secondary_melee_traces 10
-set g_balance_laser_secondary_melee_no_doubleslap 1
-set g_balance_laser_secondary_melee_nonplayerdamage 40
-set g_balance_laser_secondary_melee_multihit 1
-set g_balance_laser_secondary_damage 80
 set g_balance_laser_secondary_shotangle -90
 set g_balance_laser_secondary_delay 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_reload_ammo 0 //default: 6
-set g_balance_laser_reload_time 2
+
+set g_balance_laser_shockwave_damage 20
+set g_balance_laser_shockwave_distance 2000
+set g_balance_laser_shockwave_edgedamage 0
+set g_balance_laser_shockwave_force 250
+set g_balance_laser_shockwave_jump_damage 20
+set g_balance_laser_shockwave_jump_edgedamage 0
+set g_balance_laser_shockwave_jump_force 300
+set g_balance_laser_shockwave_jump_force_velocitybias 0
+set g_balance_laser_shockwave_jump_force_zscale 1.25
+set g_balance_laser_shockwave_jump_multiplier_accuracy 0.5
+set g_balance_laser_shockwave_jump_multiplier_distance 0.5
+set g_balance_laser_shockwave_jump_multiplier_min 0
+set g_balance_laser_shockwave_jump_radius 150
+set g_balance_laser_shockwave_multiplier_accuracy 0.5
+set g_balance_laser_shockwave_multiplier_distance 0.5
+set g_balance_laser_shockwave_multiplier_min 0
+set g_balance_laser_shockwave_splash_damage 15
+set g_balance_laser_shockwave_splash_edgedamage 0
+set g_balance_laser_shockwave_splash_force 100
+set g_balance_laser_shockwave_splash_multiplier_accuracy 0.5
+set g_balance_laser_shockwave_splash_multiplier_distance 0.5
+set g_balance_laser_shockwave_splash_multiplier_min 0
+set g_balance_laser_shockwave_splash_radius 70
+set g_balance_laser_shockwave_spread_max 100
+set g_balance_laser_shockwave_spread_min 20
 // }}}
 // {{{ shotgun
 set g_balance_shotgun_primary_bullets 14