Merge branch 'master' into Mirio/balance
authorMario <mario@smbclan.net>
Sat, 31 Dec 2016 00:54:39 +0000 (10:54 +1000)
committerMario <mario@smbclan.net>
Sat, 31 Dec 2016 00:54:39 +0000 (10:54 +1000)
1  2 
bal-wep-xonotic.cfg
bal-wep-xpm.cfg

diff --combined bal-wep-xonotic.cfg
index 8d70876901f7da76e45d8f9f1e05a877e2dcbea5,57b632be48c98ac1bfef777c1deb0773f4d8ab36..898c3b3924a7d0b97f80eb9b478268e652576e03
@@@ -1,8 -1,8 +1,8 @@@
  // {{{ #1: Blaster
  set g_balance_blaster_primary_animtime 0.2
 -set g_balance_blaster_primary_damage 25
 +set g_balance_blaster_primary_damage 20
  set g_balance_blaster_primary_delay 0
 -set g_balance_blaster_primary_edgedamage 12.5
 +set g_balance_blaster_primary_edgedamage 10
  set g_balance_blaster_primary_force 300
  set g_balance_blaster_primary_force_zscale 1.25
  set g_balance_blaster_primary_lifetime 5
@@@ -75,7 -75,7 +75,7 @@@ set g_balance_machinegun_burst_speed 
  set g_balance_machinegun_first 1
  set g_balance_machinegun_first_ammo 1
  set g_balance_machinegun_first_damage 14
 -set g_balance_machinegun_first_force 5
 +set g_balance_machinegun_first_force 3
  set g_balance_machinegun_first_refire 0.125
  set g_balance_machinegun_first_spread 0.03
  set g_balance_machinegun_mode 1
@@@ -87,7 -87,7 +87,7 @@@ set g_balance_machinegun_spread_max 0.0
  set g_balance_machinegun_spread_min 0.02
  set g_balance_machinegun_sustained_ammo 1
  set g_balance_machinegun_sustained_damage 10
 -set g_balance_machinegun_sustained_force 5
 +set g_balance_machinegun_sustained_force 3
  set g_balance_machinegun_sustained_refire 0.1
  set g_balance_machinegun_sustained_spread 0.03
  set g_balance_machinegun_switchdelay_drop 0.2
@@@ -193,7 -193,7 +193,7 @@@ set g_balance_electro_primary_force 20
  set g_balance_electro_primary_lifetime 5
  set g_balance_electro_primary_midaircombo_explode 1
  set g_balance_electro_primary_midaircombo_interval 0.1
- set g_balance_electro_primary_midaircombo_radius 150
+ set g_balance_electro_primary_midaircombo_radius 0
  set g_balance_electro_primary_radius 100
  set g_balance_electro_primary_refire 0.6
  set g_balance_electro_primary_speed 2500
@@@ -218,7 -218,8 +218,8 @@@ set g_balance_electro_secondary_refire
  set g_balance_electro_secondary_speed 1000
  set g_balance_electro_secondary_speed_up 200
  set g_balance_electro_secondary_speed_z 0
- set g_balance_electro_secondary_spread 0.04
+ set g_balance_electro_secondary_spread 0
+ set g_balance_electro_secondary_stick 0
  set g_balance_electro_secondary_touchexplode 1
  set g_balance_electro_switchdelay_drop 0.2
  set g_balance_electro_switchdelay_raise 0.2
@@@ -232,8 -233,8 +233,8 @@@ set g_balance_crylink_primary_ammo 
  set g_balance_crylink_primary_animtime 0.3
  set g_balance_crylink_primary_bouncedamagefactor 0.5
  set g_balance_crylink_primary_bounces 1
 -set g_balance_crylink_primary_damage 12
 -set g_balance_crylink_primary_edgedamage 6
 +set g_balance_crylink_primary_damage 10
 +set g_balance_crylink_primary_edgedamage 5
  set g_balance_crylink_primary_force -50
  set g_balance_crylink_primary_joindelay 0.1
  set g_balance_crylink_primary_joinexplode 1
@@@ -242,7 -243,7 +243,7 @@@ set g_balance_crylink_primary_joinexplo
  set g_balance_crylink_primary_joinexplode_force 0
  set g_balance_crylink_primary_joinexplode_radius 0
  set g_balance_crylink_primary_joinspread 0.2
 -set g_balance_crylink_primary_linkexplode 0
 +set g_balance_crylink_primary_linkexplode 1
  set g_balance_crylink_primary_middle_fadetime 5
  set g_balance_crylink_primary_middle_lifetime 5
  set g_balance_crylink_primary_other_fadetime 5
@@@ -259,9 -260,9 +260,9 @@@ set g_balance_crylink_secondary_ammo 
  set g_balance_crylink_secondary_animtime 0.2
  set g_balance_crylink_secondary_bouncedamagefactor 0.5
  set g_balance_crylink_secondary_bounces 0
 -set g_balance_crylink_secondary_damage 10
 -set g_balance_crylink_secondary_edgedamage 5
 -set g_balance_crylink_secondary_force -250
 +set g_balance_crylink_secondary_damage 8
 +set g_balance_crylink_secondary_edgedamage 4
 +set g_balance_crylink_secondary_force -200
  set g_balance_crylink_secondary_joindelay 0
  set g_balance_crylink_secondary_joinexplode 0
  set g_balance_crylink_secondary_joinexplode_damage 0
@@@ -324,8 -325,8 +325,8 @@@ set g_balance_vortex_secondary_damagefa
  set g_balance_vortex_secondary_damagefalloff_mindist 0
  set g_balance_vortex_secondary_force 0
  set g_balance_vortex_secondary_refire 0
- set g_balance_vortex_switchdelay_drop 0.25
- set g_balance_vortex_switchdelay_raise 0.25
+ set g_balance_vortex_switchdelay_drop 0.2
+ set g_balance_vortex_switchdelay_raise 0.2
  set g_balance_vortex_weaponreplace ""
  set g_balance_vortex_weaponstart 0
  set g_balance_vortex_weaponstartoverride -1
@@@ -367,7 -368,7 +368,7 @@@ set g_balance_hagar_secondary_load_spre
  set g_balance_hagar_secondary_radius 80
  set g_balance_hagar_secondary_refire 0.5
  set g_balance_hagar_secondary_speed 2000
- set g_balance_hagar_secondary_spread 0.05
+ set g_balance_hagar_secondary_spread 0
  set g_balance_hagar_switchdelay_drop 0.2
  set g_balance_hagar_switchdelay_raise 0.2
  set g_balance_hagar_weaponreplace ""
@@@ -398,8 -399,9 +399,9 @@@ set g_balance_devastator_remote_damage 
  set g_balance_devastator_remote_edgedamage 35
  set g_balance_devastator_remote_force 300
  set g_balance_devastator_remote_jump_damage 70
+ set g_balance_devastator_remote_jump_force 450
  set g_balance_devastator_remote_jump_radius 0
- set g_balance_devastator_remote_jump_velocity_z_add 400
+ set g_balance_devastator_remote_jump_velocity_z_add 0
  set g_balance_devastator_remote_jump_velocity_z_max 1500
  set g_balance_devastator_remote_jump_velocity_z_min 400
  set g_balance_devastator_remote_radius 110
@@@ -454,7 -456,7 +456,7 @@@ set g_balance_vaporizer_switchdelay_rai
  set g_balance_vaporizer_weaponreplace ""
  set g_balance_vaporizer_weaponstart 0
  set g_balance_vaporizer_weaponstartoverride -1
- set g_balance_vaporizer_weaponthrowable 0
+ set g_balance_vaporizer_weaponthrowable 1
  // }}}
  // {{{ #13: Grappling Hook
  set g_balance_hook_primary_ammo 5
@@@ -675,23 -677,23 +677,23 @@@ set g_balance_seeker_weaponthrowable 
  // }}}
  // {{{ #19: Shockwave (MUTATOR WEAPON)
  set g_balance_shockwave_blast_animtime 0.3
- set g_balance_shockwave_blast_damage 20
+ set g_balance_shockwave_blast_damage 40
  set g_balance_shockwave_blast_distance 1000
  set g_balance_shockwave_blast_edgedamage 0
- set g_balance_shockwave_blast_force 200
+ set g_balance_shockwave_blast_force 15
  set g_balance_shockwave_blast_force_forwardbias 50
- set g_balance_shockwave_blast_force_zscale 2
+ set g_balance_shockwave_blast_force_zscale 1
  set g_balance_shockwave_blast_jump_damage 20
  set g_balance_shockwave_blast_jump_edgedamage 0
- set g_balance_shockwave_blast_jump_force 300
- set g_balance_shockwave_blast_jump_force_velocitybias 0
- set g_balance_shockwave_blast_jump_force_zscale 1.25
+ set g_balance_shockwave_blast_jump_force 100
+ set g_balance_shockwave_blast_jump_force_velocitybias 1
+ set g_balance_shockwave_blast_jump_force_zscale 1
  set g_balance_shockwave_blast_jump_multiplier_accuracy 0.5
  set g_balance_shockwave_blast_jump_multiplier_distance 0.5
  set g_balance_shockwave_blast_jump_multiplier_min 0
  set g_balance_shockwave_blast_jump_radius 150
- set g_balance_shockwave_blast_multiplier_accuracy 0.5
- set g_balance_shockwave_blast_multiplier_distance 0.5
+ set g_balance_shockwave_blast_multiplier_accuracy 0.45
+ set g_balance_shockwave_blast_multiplier_distance 0.2
  set g_balance_shockwave_blast_multiplier_min 0
  set g_balance_shockwave_blast_refire 0.75
  set g_balance_shockwave_blast_splash_damage 15
@@@ -726,16 -728,16 +728,16 @@@ set g_balance_shockwave_weaponthrowabl
  // }}}
  // {{{ #20: Arc
  set g_balance_arc_beam_ammo 6
- set g_balance_arc_beam_animtime 0.2
+ set g_balance_arc_beam_animtime 0.1
  set g_balance_arc_beam_botaimlifetime 0
  set g_balance_arc_beam_botaimspeed 0
- set g_balance_arc_beam_damage 115
+ set g_balance_arc_beam_damage 100
  set g_balance_arc_beam_degreespersegment 1
  set g_balance_arc_beam_distancepersegment 0
  set g_balance_arc_beam_falloff_halflifedist 0
  set g_balance_arc_beam_falloff_maxdist 0
  set g_balance_arc_beam_falloff_mindist 0
- set g_balance_arc_beam_force 900
+ set g_balance_arc_beam_force 600
  set g_balance_arc_beam_healing_amax 0
  set g_balance_arc_beam_healing_aps 50
  set g_balance_arc_beam_healing_hmax 150
@@@ -744,8 -746,8 +746,8 @@@ set g_balance_arc_cooldown 2.
  set g_balance_arc_cooldown_release 0
  set g_balance_arc_overheat_max 5
  set g_balance_arc_overheat_min 3
- set g_balance_arc_beam_heat 0.75
- set g_balance_arc_burst_heat 4
+ set g_balance_arc_beam_heat 0
+ set g_balance_arc_burst_heat 5
  set g_balance_arc_beam_maxangle 10
  set g_balance_arc_beam_nonplayerdamage 80
  set g_balance_arc_beam_range 1000
@@@ -762,7 -764,7 +764,7 @@@ set g_balance_arc_bolt_health 1
  set g_balance_arc_bolt_lifetime 5
  set g_balance_arc_bolt_radius 65
  set g_balance_arc_bolt_refire 0.16667
- set g_balance_arc_bolt_speed 2200
+ set g_balance_arc_bolt_speed 2300
  set g_balance_arc_bolt_spread 0
  set g_balance_arc_burst_ammo 15
  set g_balance_arc_burst_damage 250
diff --combined bal-wep-xpm.cfg
index 8d70876901f7da76e45d8f9f1e05a877e2dcbea5,57b632be48c98ac1bfef777c1deb0773f4d8ab36..898c3b3924a7d0b97f80eb9b478268e652576e03
@@@ -1,8 -1,8 +1,8 @@@
  // {{{ #1: Blaster
  set g_balance_blaster_primary_animtime 0.2
 -set g_balance_blaster_primary_damage 25
 +set g_balance_blaster_primary_damage 20
  set g_balance_blaster_primary_delay 0
 -set g_balance_blaster_primary_edgedamage 12.5
 +set g_balance_blaster_primary_edgedamage 10
  set g_balance_blaster_primary_force 300
  set g_balance_blaster_primary_force_zscale 1.25
  set g_balance_blaster_primary_lifetime 5
@@@ -75,7 -75,7 +75,7 @@@ set g_balance_machinegun_burst_speed 
  set g_balance_machinegun_first 1
  set g_balance_machinegun_first_ammo 1
  set g_balance_machinegun_first_damage 14
 -set g_balance_machinegun_first_force 5
 +set g_balance_machinegun_first_force 3
  set g_balance_machinegun_first_refire 0.125
  set g_balance_machinegun_first_spread 0.03
  set g_balance_machinegun_mode 1
@@@ -87,7 -87,7 +87,7 @@@ set g_balance_machinegun_spread_max 0.0
  set g_balance_machinegun_spread_min 0.02
  set g_balance_machinegun_sustained_ammo 1
  set g_balance_machinegun_sustained_damage 10
 -set g_balance_machinegun_sustained_force 5
 +set g_balance_machinegun_sustained_force 3
  set g_balance_machinegun_sustained_refire 0.1
  set g_balance_machinegun_sustained_spread 0.03
  set g_balance_machinegun_switchdelay_drop 0.2
@@@ -193,7 -193,7 +193,7 @@@ set g_balance_electro_primary_force 20
  set g_balance_electro_primary_lifetime 5
  set g_balance_electro_primary_midaircombo_explode 1
  set g_balance_electro_primary_midaircombo_interval 0.1
- set g_balance_electro_primary_midaircombo_radius 150
+ set g_balance_electro_primary_midaircombo_radius 0
  set g_balance_electro_primary_radius 100
  set g_balance_electro_primary_refire 0.6
  set g_balance_electro_primary_speed 2500
@@@ -218,7 -218,8 +218,8 @@@ set g_balance_electro_secondary_refire
  set g_balance_electro_secondary_speed 1000
  set g_balance_electro_secondary_speed_up 200
  set g_balance_electro_secondary_speed_z 0
- set g_balance_electro_secondary_spread 0.04
+ set g_balance_electro_secondary_spread 0
+ set g_balance_electro_secondary_stick 0
  set g_balance_electro_secondary_touchexplode 1
  set g_balance_electro_switchdelay_drop 0.2
  set g_balance_electro_switchdelay_raise 0.2
@@@ -232,8 -233,8 +233,8 @@@ set g_balance_crylink_primary_ammo 
  set g_balance_crylink_primary_animtime 0.3
  set g_balance_crylink_primary_bouncedamagefactor 0.5
  set g_balance_crylink_primary_bounces 1
 -set g_balance_crylink_primary_damage 12
 -set g_balance_crylink_primary_edgedamage 6
 +set g_balance_crylink_primary_damage 10
 +set g_balance_crylink_primary_edgedamage 5
  set g_balance_crylink_primary_force -50
  set g_balance_crylink_primary_joindelay 0.1
  set g_balance_crylink_primary_joinexplode 1
@@@ -242,7 -243,7 +243,7 @@@ set g_balance_crylink_primary_joinexplo
  set g_balance_crylink_primary_joinexplode_force 0
  set g_balance_crylink_primary_joinexplode_radius 0
  set g_balance_crylink_primary_joinspread 0.2
 -set g_balance_crylink_primary_linkexplode 0
 +set g_balance_crylink_primary_linkexplode 1
  set g_balance_crylink_primary_middle_fadetime 5
  set g_balance_crylink_primary_middle_lifetime 5
  set g_balance_crylink_primary_other_fadetime 5
@@@ -259,9 -260,9 +260,9 @@@ set g_balance_crylink_secondary_ammo 
  set g_balance_crylink_secondary_animtime 0.2
  set g_balance_crylink_secondary_bouncedamagefactor 0.5
  set g_balance_crylink_secondary_bounces 0
 -set g_balance_crylink_secondary_damage 10
 -set g_balance_crylink_secondary_edgedamage 5
 -set g_balance_crylink_secondary_force -250
 +set g_balance_crylink_secondary_damage 8
 +set g_balance_crylink_secondary_edgedamage 4
 +set g_balance_crylink_secondary_force -200
  set g_balance_crylink_secondary_joindelay 0
  set g_balance_crylink_secondary_joinexplode 0
  set g_balance_crylink_secondary_joinexplode_damage 0
@@@ -324,8 -325,8 +325,8 @@@ set g_balance_vortex_secondary_damagefa
  set g_balance_vortex_secondary_damagefalloff_mindist 0
  set g_balance_vortex_secondary_force 0
  set g_balance_vortex_secondary_refire 0
- set g_balance_vortex_switchdelay_drop 0.25
- set g_balance_vortex_switchdelay_raise 0.25
+ set g_balance_vortex_switchdelay_drop 0.2
+ set g_balance_vortex_switchdelay_raise 0.2
  set g_balance_vortex_weaponreplace ""
  set g_balance_vortex_weaponstart 0
  set g_balance_vortex_weaponstartoverride -1
@@@ -367,7 -368,7 +368,7 @@@ set g_balance_hagar_secondary_load_spre
  set g_balance_hagar_secondary_radius 80
  set g_balance_hagar_secondary_refire 0.5
  set g_balance_hagar_secondary_speed 2000
- set g_balance_hagar_secondary_spread 0.05
+ set g_balance_hagar_secondary_spread 0
  set g_balance_hagar_switchdelay_drop 0.2
  set g_balance_hagar_switchdelay_raise 0.2
  set g_balance_hagar_weaponreplace ""
@@@ -398,8 -399,9 +399,9 @@@ set g_balance_devastator_remote_damage 
  set g_balance_devastator_remote_edgedamage 35
  set g_balance_devastator_remote_force 300
  set g_balance_devastator_remote_jump_damage 70
+ set g_balance_devastator_remote_jump_force 450
  set g_balance_devastator_remote_jump_radius 0
- set g_balance_devastator_remote_jump_velocity_z_add 400
+ set g_balance_devastator_remote_jump_velocity_z_add 0
  set g_balance_devastator_remote_jump_velocity_z_max 1500
  set g_balance_devastator_remote_jump_velocity_z_min 400
  set g_balance_devastator_remote_radius 110
@@@ -454,7 -456,7 +456,7 @@@ set g_balance_vaporizer_switchdelay_rai
  set g_balance_vaporizer_weaponreplace ""
  set g_balance_vaporizer_weaponstart 0
  set g_balance_vaporizer_weaponstartoverride -1
- set g_balance_vaporizer_weaponthrowable 0
+ set g_balance_vaporizer_weaponthrowable 1
  // }}}
  // {{{ #13: Grappling Hook
  set g_balance_hook_primary_ammo 5
@@@ -675,23 -677,23 +677,23 @@@ set g_balance_seeker_weaponthrowable 
  // }}}
  // {{{ #19: Shockwave (MUTATOR WEAPON)
  set g_balance_shockwave_blast_animtime 0.3
- set g_balance_shockwave_blast_damage 20
+ set g_balance_shockwave_blast_damage 40
  set g_balance_shockwave_blast_distance 1000
  set g_balance_shockwave_blast_edgedamage 0
- set g_balance_shockwave_blast_force 200
+ set g_balance_shockwave_blast_force 15
  set g_balance_shockwave_blast_force_forwardbias 50
- set g_balance_shockwave_blast_force_zscale 2
+ set g_balance_shockwave_blast_force_zscale 1
  set g_balance_shockwave_blast_jump_damage 20
  set g_balance_shockwave_blast_jump_edgedamage 0
- set g_balance_shockwave_blast_jump_force 300
- set g_balance_shockwave_blast_jump_force_velocitybias 0
- set g_balance_shockwave_blast_jump_force_zscale 1.25
+ set g_balance_shockwave_blast_jump_force 100
+ set g_balance_shockwave_blast_jump_force_velocitybias 1
+ set g_balance_shockwave_blast_jump_force_zscale 1
  set g_balance_shockwave_blast_jump_multiplier_accuracy 0.5
  set g_balance_shockwave_blast_jump_multiplier_distance 0.5
  set g_balance_shockwave_blast_jump_multiplier_min 0
  set g_balance_shockwave_blast_jump_radius 150
- set g_balance_shockwave_blast_multiplier_accuracy 0.5
- set g_balance_shockwave_blast_multiplier_distance 0.5
+ set g_balance_shockwave_blast_multiplier_accuracy 0.45
+ set g_balance_shockwave_blast_multiplier_distance 0.2
  set g_balance_shockwave_blast_multiplier_min 0
  set g_balance_shockwave_blast_refire 0.75
  set g_balance_shockwave_blast_splash_damage 15
@@@ -726,16 -728,16 +728,16 @@@ set g_balance_shockwave_weaponthrowabl
  // }}}
  // {{{ #20: Arc
  set g_balance_arc_beam_ammo 6
- set g_balance_arc_beam_animtime 0.2
+ set g_balance_arc_beam_animtime 0.1
  set g_balance_arc_beam_botaimlifetime 0
  set g_balance_arc_beam_botaimspeed 0
- set g_balance_arc_beam_damage 115
+ set g_balance_arc_beam_damage 100
  set g_balance_arc_beam_degreespersegment 1
  set g_balance_arc_beam_distancepersegment 0
  set g_balance_arc_beam_falloff_halflifedist 0
  set g_balance_arc_beam_falloff_maxdist 0
  set g_balance_arc_beam_falloff_mindist 0
- set g_balance_arc_beam_force 900
+ set g_balance_arc_beam_force 600
  set g_balance_arc_beam_healing_amax 0
  set g_balance_arc_beam_healing_aps 50
  set g_balance_arc_beam_healing_hmax 150
@@@ -744,8 -746,8 +746,8 @@@ set g_balance_arc_cooldown 2.
  set g_balance_arc_cooldown_release 0
  set g_balance_arc_overheat_max 5
  set g_balance_arc_overheat_min 3
- set g_balance_arc_beam_heat 0.75
- set g_balance_arc_burst_heat 4
+ set g_balance_arc_beam_heat 0
+ set g_balance_arc_burst_heat 5
  set g_balance_arc_beam_maxangle 10
  set g_balance_arc_beam_nonplayerdamage 80
  set g_balance_arc_beam_range 1000
@@@ -762,7 -764,7 +764,7 @@@ set g_balance_arc_bolt_health 1
  set g_balance_arc_bolt_lifetime 5
  set g_balance_arc_bolt_radius 65
  set g_balance_arc_bolt_refire 0.16667
- set g_balance_arc_bolt_speed 2200
+ set g_balance_arc_bolt_speed 2300
  set g_balance_arc_bolt_spread 0
  set g_balance_arc_burst_ammo 15
  set g_balance_arc_burst_damage 250