Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 12 Nov 2010 06:57:24 +0000 (07:57 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 12 Nov 2010 06:57:24 +0000 (07:57 +0100)
1  2 
balanceXonotic.cfg

diff --combined balanceXonotic.cfg
@@@ -31,12 -31,12 +31,12 @@@ set g_warmup_start_ammo_nails 150 "star
  set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
  set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
  set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
- set g_lms_start_health 250
- set g_lms_start_armor 250
+ set g_lms_start_health 200
+ set g_lms_start_armor 150
  set g_lms_start_ammo_shells 30
- set g_lms_start_ammo_nails 250
- set g_lms_start_ammo_rockets 100
- set g_lms_start_ammo_cells 200
+ set g_lms_start_ammo_nails 200
+ set g_lms_start_ammo_rockets 150
+ set g_lms_start_ammo_cells 150
  set g_lms_start_ammo_fuel 0
  set g_balance_nix_roundtime 25
  set g_balance_nix_incrtime 1.6
@@@ -264,12 -264,12 +264,12 @@@ set g_balance_shotgun_secondary_animtim
  // }}}
  // {{{ uzi
  set g_balance_uzi_first 1
- set g_balance_uzi_first_damage 18
+ set g_balance_uzi_first_damage 20
  set g_balance_uzi_first_force 35
  set g_balance_uzi_first_spread 0.03
  set g_balance_uzi_first_refire 0.2
  set g_balance_uzi_first_ammo 2
- set g_balance_uzi_sustained_damage 10
+ set g_balance_uzi_sustained_damage 12
  set g_balance_uzi_sustained_force 7.5
  set g_balance_uzi_sustained_spread 0.1
  set g_balance_uzi_sustained_refire 0.1
@@@ -294,6 -294,8 +294,6 @@@ set g_balance_grenadelauncher_primary_a
  set g_balance_grenadelauncher_primary_ammo 2
  set g_balance_grenadelauncher_primary_health 80
  set g_balance_grenadelauncher_primary_damageforcescale 0
 -set g_balance_grenadelauncher_primary_bouncefactor 0.5
 -set g_balance_grenadelauncher_primary_bouncestop 0.12
  set g_balance_grenadelauncher_primary_remote_minbouncecnt 0
  
  set g_balance_grenadelauncher_secondary_type 1
@@@ -312,10 -314,9 +312,10 @@@ set g_balance_grenadelauncher_secondary
  set g_balance_grenadelauncher_secondary_ammo 2
  set g_balance_grenadelauncher_secondary_health 40
  set g_balance_grenadelauncher_secondary_damageforcescale 0
 -set g_balance_grenadelauncher_secondary_bouncefactor 0.5
 -set g_balance_grenadelauncher_secondary_bouncestop 0.12
  set g_balance_grenadelauncher_secondary_remote_detonateprimary 0
 +
 +set g_balance_grenadelauncher_bouncefactor 0.5
 +set g_balance_grenadelauncher_bouncestop 0.12
  // }}}
  // {{{ minelayer // TODO
  set g_balance_minelayer_damage 35
@@@ -341,7 -342,7 +341,7 @@@ set g_balance_minelayer_remote_force 30
  // }}}
  // {{{ electro // TODO
  set g_balance_electro_lightning 1
- set g_balance_electro_primary_damage 90
+ set g_balance_electro_primary_damage 100
  set g_balance_electro_primary_edgedamage 0
  set g_balance_electro_primary_force 425
  set g_balance_electro_primary_force_up 125
@@@ -393,9 -394,7 +393,9 @@@ set g_balance_crylink_primary_refire 0.
  set g_balance_crylink_primary_animtime 0.4
  set g_balance_crylink_primary_ammo 2
  set g_balance_crylink_primary_bouncedamagefactor 0.2
 -set g_balance_crylink_primary_joinspeed 150
 +set g_balance_crylink_primary_joinspeed 250
 +set g_balance_crylink_primary_jointime 0
 +set g_balance_crylink_primary_linkexplode 0
  
  set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000
  set g_balance_crylink_primary_middle_fadetime 5
@@@ -416,8 -415,6 +416,8 @@@ set g_balance_crylink_secondary_animtim
  set g_balance_crylink_secondary_ammo 1
  set g_balance_crylink_secondary_bouncedamagefactor 0.5
  set g_balance_crylink_secondary_joinspeed 0
 +set g_balance_crylink_secondary_jointime 0
 +set g_balance_crylink_secondary_linkexplode 1
  
  set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000
  set g_balance_crylink_secondary_middle_fadetime 5
@@@ -437,7 -434,7 +437,7 @@@ set g_balance_nex_primary_damagefalloff
  
  set g_balance_nex_secondary 1
  set g_balance_nex_secondary_charge 1
- set g_balance_nex_secondary_charge_rate 0.1
+ set g_balance_nex_secondary_charge_rate 0.125
  set g_balance_nex_secondary_damage 0
  set g_balance_nex_secondary_force 0
  set g_balance_nex_secondary_refire 0
@@@ -455,13 -452,13 +455,13 @@@ set g_balance_nex_charge_rate 0.0
  set g_balance_nex_charge_limit 0.5
  set g_balance_nex_charge_rot_rate 0.01
  set g_balance_nex_charge_shot_multiplier 0.675
- set g_balance_nex_charge_velocity_rate 0.15
+ set g_balance_nex_charge_velocity_rate 0.2
  set g_balance_nex_charge_minspeed 400
  set g_balance_nex_charge_maxspeed 1000
  // }}}
  // {{{ minstanex
- set g_balance_minstanex_refire 1.25
- set g_balance_minstanex_animtime 1
+ set g_balance_minstanex_refire 1
+ set g_balance_minstanex_animtime 0.75
  set g_balance_minstanex_ammo 10
  // }}}
  // {{{ hagar
@@@ -506,6 -503,11 +506,6 @@@ set g_balance_rocketlauncher_guiderated
  set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
  set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in
  set g_balance_rocketlauncher_guidestop 0 // stop guiding when firing again
 -set g_balance_rocketlauncher_laserguided_speed 1000 //650
 -set g_balance_rocketlauncher_laserguided_speedaccel 0
 -set g_balance_rocketlauncher_laserguided_speedstart 1000
 -set g_balance_rocketlauncher_laserguided_turnrate 0.75 //0.5
 -set g_balance_rocketlauncher_laserguided_allow_steal 1
  set g_balance_rocketlauncher_remote_damage 50
  set g_balance_rocketlauncher_remote_edgedamage 16.5
  set g_balance_rocketlauncher_remote_radius 120