]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into tzork/balance-tzork
authorunknown <jm@.(none)>
Thu, 11 Nov 2010 22:12:00 +0000 (23:12 +0100)
committerunknown <jm@.(none)>
Thu, 11 Nov 2010 22:12:00 +0000 (23:12 +0100)
Conflicts:
balancetZork.cfg

1  2 
balance25.cfg
balanceLeeStricklin.cfg
balanceNexSVN.cfg
balanceSamual.cfg
balanceTest.cfg
balanceXonotic.cfg
balancetZork.cfg

diff --combined balance25.cfg
index 1427df5d7484d406d45df152145ecddf19a2538c,dbf2c8ea1d3a68b070ed1dfbd5e96cff0b900b91..8569fc85cb6240133a48e224d72b607655f9138e
@@@ -263,17 -263,6 +263,17 @@@ set g_balance_shotgun_secondary_refire 
  set g_balance_shotgun_secondary_animtime 1
  // }}}
  // {{{ uzi
 +set g_balance_uzi_mode 0                              // Activates varible spread for sustained & burst mode secondary
 +set g_balance_uzi_spread_min 0.02
 +set g_balance_uzi_spread_max 0.6
 +set g_balance_uzi_spread_add 0.012
 +set g_balance_uzi_burst 0                             // # of bullets in a burst (if set to 2 or more)
 +set g_balance_uzi_burst_refire 0.05           // refire between burst bullets
 +set g_balance_uzi_burst_refire2 0.75  // refire after burst
 +set g_balance_uzi_burst_spread 0.04
 +set g_balance_uzi_burst_damage 18             
 +set g_balance_uzi_burst_force 50
 +set g_balance_uzi_burst_ammo 3
  set g_balance_uzi_first 1
  set g_balance_uzi_first_damage 30
  set g_balance_uzi_first_force 50
@@@ -384,8 -373,6 +384,8 @@@ set g_balance_electro_secondary_ammo 
  set g_balance_electro_secondary_health 5
  set g_balance_electro_secondary_damageforcescale 4
  set g_balance_electro_secondary_count 1
 +set g_balance_electro_secondary_bouncefactor 1
 +set g_balance_electro_secondary_bouncestop 0
  set g_balance_electro_combo_damage 80
  set g_balance_electro_combo_edgedamage 0
  set g_balance_electro_combo_force 200
@@@ -407,6 -394,8 +407,8 @@@ set g_balance_crylink_primary_animtime 
  set g_balance_crylink_primary_ammo 2
  set g_balance_crylink_primary_bouncedamagefactor 0.5
  set g_balance_crylink_primary_joinspeed 0
+ set g_balance_crylink_primary_jointime 0
+ set g_balance_crylink_primary_linkexplode 1
  
  set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000
  set g_balance_crylink_primary_middle_fadetime 5
@@@ -427,6 -416,8 +429,8 @@@ set g_balance_crylink_secondary_animtim
  set g_balance_crylink_secondary_ammo 2
  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: 35000 full, fades to 70000
  set g_balance_crylink_secondary_middle_fadetime 5
@@@ -463,7 -454,6 +467,7 @@@ set g_balance_nex_charge_start 
  set g_balance_nex_charge_rate 0.1
  set g_balance_nex_charge_limit 0.5
  set g_balance_nex_charge_rot_rate 0
 +set g_balance_nex_charge_rot_pause 0 // Dont rot down untill this long after release of charge button
  set g_balance_nex_charge_shot_multiplier 0.5
  set g_balance_nex_charge_velocity_rate 0.2
  set g_balance_nex_charge_minspeed 400
diff --combined balanceLeeStricklin.cfg
index 4317a9da6ece1effccb5dc0ca6fe7edcd7da264f,fa2c255a3cf69480d8e5ac67162565254b638c15..144843191f709f244104b692d41e577c2a12ab71
@@@ -274,17 -274,6 +274,17 @@@ set g_balance_shotgun_secondary_refire 
  set g_balance_shotgun_secondary_animtime 1
  // }}}
  // {{{ uzi
 +set g_balance_uzi_mode 0                              // Activates varible spread for sustained & burst mode secondary
 +set g_balance_uzi_spread_min 0.02
 +set g_balance_uzi_spread_max 0.6
 +set g_balance_uzi_spread_add 0.012
 +set g_balance_uzi_burst 0                             // # of bullets in a burst (if set to 2 or more)
 +set g_balance_uzi_burst_refire 0.05           // refire between burst bullets
 +set g_balance_uzi_burst_refire2 0.75  // refire after burst
 +set g_balance_uzi_burst_spread 0.04
 +set g_balance_uzi_burst_damage 18             
 +set g_balance_uzi_burst_force 50
 +set g_balance_uzi_burst_ammo 3
  set g_balance_uzi_first 1
  set g_balance_uzi_first_damage 26
  set g_balance_uzi_first_force -30
@@@ -395,8 -384,6 +395,8 @@@ set g_balance_electro_secondary_ammo 
  set g_balance_electro_secondary_health 10
  set g_balance_electro_secondary_damageforcescale 4
  set g_balance_electro_secondary_count 3
 +set g_balance_electro_secondary_bouncefactor 1
 +set g_balance_electro_secondary_bouncestop 0
  set g_balance_electro_combo_damage 70
  set g_balance_electro_combo_edgedamage 0
  set g_balance_electro_combo_force 200
@@@ -418,6 -405,8 +418,8 @@@ set g_balance_crylink_primary_animtime 
  set g_balance_crylink_primary_ammo 3
  set g_balance_crylink_primary_bouncedamagefactor 0.2
  set g_balance_crylink_primary_joinspeed 0
+ set g_balance_crylink_primary_jointime 0
+ set g_balance_crylink_primary_linkexplode 1
  
  set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000
  set g_balance_crylink_primary_middle_fadetime 5
@@@ -438,6 -427,8 +440,8 @@@ set g_balance_crylink_secondary_animtim
  set g_balance_crylink_secondary_ammo 3
  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
@@@ -474,7 -465,6 +478,7 @@@ set g_balance_nex_charge_start 
  set g_balance_nex_charge_rate 0.1
  set g_balance_nex_charge_limit 0.5
  set g_balance_nex_charge_rot_rate 0
 +set g_balance_nex_charge_rot_pause 0 // Dont rot down untill this long after release of charge button
  set g_balance_nex_charge_shot_multiplier 0.5
  set g_balance_nex_charge_velocity_rate 0.2
  set g_balance_nex_charge_minspeed 400
diff --combined balanceNexSVN.cfg
index f3b1495726bd7a01f290bf3ad19b71ffd21670fd,cd8cb05d59e2c0d1d8089dc986a66ac2efd0204b..59c506c6abc0ea9624c0a07dc8cb413240867afc
@@@ -263,17 -263,6 +263,17 @@@ set g_balance_shotgun_secondary_refire 
  set g_balance_shotgun_secondary_animtime 1
  // }}}
  // {{{ uzi
 +set g_balance_uzi_mode 0                              // Activates varible spread for sustained & burst mode secondary
 +set g_balance_uzi_spread_min 0.02
 +set g_balance_uzi_spread_max 0.6
 +set g_balance_uzi_spread_add 0.012
 +set g_balance_uzi_burst 0                             // # of bullets in a burst (if set to 2 or more)
 +set g_balance_uzi_burst_refire 0.05           // refire between burst bullets
 +set g_balance_uzi_burst_refire2 0.75  // refire after burst
 +set g_balance_uzi_burst_spread 0.04
 +set g_balance_uzi_burst_damage 18             
 +set g_balance_uzi_burst_force 50
 +set g_balance_uzi_burst_ammo 3
  set g_balance_uzi_first 1
  set g_balance_uzi_first_damage 30
  set g_balance_uzi_first_force 50
@@@ -383,8 -372,6 +383,8 @@@ set g_balance_electro_secondary_ammo 
  set g_balance_electro_secondary_health 5
  set g_balance_electro_secondary_damageforcescale 4
  set g_balance_electro_secondary_count 1
 +set g_balance_electro_secondary_bouncefactor 1
 +set g_balance_electro_secondary_bouncestop 0
  set g_balance_electro_combo_damage 80
  set g_balance_electro_combo_edgedamage 0
  set g_balance_electro_combo_force 200
@@@ -406,6 -393,8 +406,8 @@@ set g_balance_crylink_primary_animtime 
  set g_balance_crylink_primary_ammo 2
  set g_balance_crylink_primary_bouncedamagefactor 0.5
  set g_balance_crylink_primary_joinspeed 0
+ set g_balance_crylink_primary_jointime 0
+ set g_balance_crylink_primary_linkexplode 1
  
  set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000
  set g_balance_crylink_primary_middle_fadetime 5
@@@ -426,6 -415,8 +428,8 @@@ set g_balance_crylink_secondary_animtim
  set g_balance_crylink_secondary_ammo 2
  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: 35000 full, fades to 70000
  set g_balance_crylink_secondary_middle_fadetime 5
@@@ -462,7 -453,6 +466,7 @@@ set g_balance_nex_charge_start 
  set g_balance_nex_charge_rate 0.1
  set g_balance_nex_charge_limit 0.5
  set g_balance_nex_charge_rot_rate 0
 +set g_balance_nex_charge_rot_pause 0 // Dont rot down untill this long after release of charge button
  set g_balance_nex_charge_shot_multiplier 0.5
  set g_balance_nex_charge_velocity_rate 0.2
  set g_balance_nex_charge_minspeed 400
diff --combined balanceSamual.cfg
index 6e105fb991efc3312f02e76e57148cc8abba9606,94ec2627930222be44fa214fd7c6848d2c14d370..555c231d5e323516ee3065d1c2f21a3ee17e094f
@@@ -263,17 -263,6 +263,17 @@@ set g_balance_shotgun_secondary_refire 
  set g_balance_shotgun_secondary_animtime 1
  // }}}
  // {{{ uzi
 +set g_balance_uzi_mode 0                              // Activates varible spread for sustained & burst mode secondary
 +set g_balance_uzi_spread_min 0.02
 +set g_balance_uzi_spread_max 0.6
 +set g_balance_uzi_spread_add 0.012
 +set g_balance_uzi_burst 0                             // # of bullets in a burst (if set to 2 or more)
 +set g_balance_uzi_burst_refire 0.05           // refire between burst bullets
 +set g_balance_uzi_burst_refire2 0.75  // refire after burst
 +set g_balance_uzi_burst_spread 0.04
 +set g_balance_uzi_burst_damage 18             
 +set g_balance_uzi_burst_force 50
 +set g_balance_uzi_burst_ammo 3
  set g_balance_uzi_first 1
  set g_balance_uzi_first_damage 12
  set g_balance_uzi_first_force 5
@@@ -384,8 -373,6 +384,8 @@@ set g_balance_electro_secondary_ammo 
  set g_balance_electro_secondary_health 5
  set g_balance_electro_secondary_damageforcescale 4
  set g_balance_electro_secondary_count 3
 +set g_balance_electro_secondary_bouncefactor 1
 +set g_balance_electro_secondary_bouncestop 0
  set g_balance_electro_combo_damage 50
  set g_balance_electro_combo_edgedamage 0
  set g_balance_electro_combo_force 200
@@@ -407,6 -394,8 +407,8 @@@ set g_balance_crylink_primary_animtime 
  set g_balance_crylink_primary_ammo 2
  set g_balance_crylink_primary_bouncedamagefactor 0.5
  set g_balance_crylink_primary_joinspeed 0
+ set g_balance_crylink_primary_jointime 0
+ set g_balance_crylink_primary_linkexplode 1
  
  set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000
  set g_balance_crylink_primary_middle_fadetime 5
@@@ -427,6 -416,8 +429,8 @@@ set g_balance_crylink_secondary_animtim
  set g_balance_crylink_secondary_ammo 2
  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: 35000 full, fades to 70000
  set g_balance_crylink_secondary_middle_fadetime 5
@@@ -463,7 -454,6 +467,7 @@@ set g_balance_nex_charge_start 
  set g_balance_nex_charge_rate 0.1
  set g_balance_nex_charge_limit 0.5
  set g_balance_nex_charge_rot_rate 0
 +set g_balance_nex_charge_rot_pause 0 // Dont rot down untill this long after release of charge button
  set g_balance_nex_charge_shot_multiplier 0.5
  set g_balance_nex_charge_velocity_rate 0.2
  set g_balance_nex_charge_minspeed 400
diff --combined balanceTest.cfg
index dfae960420e96949bfd4aaf12bc9a30bf6955309,37cc8be55ee4404a726827e6411ca998d0a06ee3..8abc27fe8644e06b4bd557152405ffe007de7e94
@@@ -263,17 -263,6 +263,17 @@@ set g_balance_shotgun_secondary_refire 
  set g_balance_shotgun_secondary_animtime 1
  // }}}
  // {{{ uzi
 +set g_balance_uzi_mode 0                              // Activates varible spread for sustained & burst mode secondary
 +set g_balance_uzi_spread_min 0.02
 +set g_balance_uzi_spread_max 0.6
 +set g_balance_uzi_spread_add 0.012
 +set g_balance_uzi_burst 0                             // # of bullets in a burst (if set to 2 or more)
 +set g_balance_uzi_burst_refire 0.05           // refire between burst bullets
 +set g_balance_uzi_burst_refire2 0.75  // refire after burst
 +set g_balance_uzi_burst_spread 0.04
 +set g_balance_uzi_burst_damage 18             
 +set g_balance_uzi_burst_force 50
 +set g_balance_uzi_burst_ammo 3
  set g_balance_uzi_first 1
  set g_balance_uzi_first_damage 30
  set g_balance_uzi_first_force 50
@@@ -384,8 -373,6 +384,8 @@@ set g_balance_electro_secondary_ammo 
  set g_balance_electro_secondary_health 10
  set g_balance_electro_secondary_damageforcescale 4
  set g_balance_electro_secondary_count 3
 +set g_balance_electro_secondary_bouncefactor 1
 +set g_balance_electro_secondary_bouncestop 0
  set g_balance_electro_combo_damage 60
  set g_balance_electro_combo_edgedamage 0
  set g_balance_electro_combo_force 80
@@@ -406,7 -393,9 +406,9 @@@ set g_balance_crylink_primary_refire 
  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
@@@ -426,7 -415,9 +428,9 @@@ set g_balance_crylink_secondary_refire 
  set g_balance_crylink_secondary_animtime 0.15
  set g_balance_crylink_secondary_ammo 1
  set g_balance_crylink_secondary_bouncedamagefactor 0.5
- set g_balance_crylink_secondary_joinspeed 150
+ set g_balance_crylink_secondary_joinspeed 250
+ set g_balance_crylink_secondary_jointime 0
+ set g_balance_crylink_secondary_linkexplode 0
  
  set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000
  set g_balance_crylink_secondary_middle_fadetime 5
@@@ -463,7 -454,6 +467,7 @@@ set g_balance_nex_charge_start 
  set g_balance_nex_charge_rate 0.35
  set g_balance_nex_charge_limit 0.5
  set g_balance_nex_charge_rot_rate 0
 +set g_balance_nex_charge_rot_pause 0 // Dont rot down untill this long after release of charge button
  set g_balance_nex_charge_shot_multiplier 0
  set g_balance_nex_charge_velocity_rate 0
  set g_balance_nex_charge_minspeed 400
diff --combined balanceXonotic.cfg
index 8c4ad5529e3e8f9a33a137f576be428571843e4a,2b2c16e6654efd8dd2d904543ebc1b57c10cb063..eb72b126d652b1969484b6cf93824ee91c81b0b9
@@@ -263,17 -263,6 +263,17 @@@ set g_balance_shotgun_secondary_refire 
  set g_balance_shotgun_secondary_animtime 1
  // }}}
  // {{{ uzi
 +set g_balance_uzi_mode 0                              // Activates varible spread for sustained & burst mode secondary
 +set g_balance_uzi_spread_min 0.02
 +set g_balance_uzi_spread_max 0.6
 +set g_balance_uzi_spread_add 0.012
 +set g_balance_uzi_burst 0                             // # of bullets in a burst (if set to 2 or more)
 +set g_balance_uzi_burst_refire 0.05           // refire between burst bullets
 +set g_balance_uzi_burst_refire2 0.75  // refire after burst
 +set g_balance_uzi_burst_spread 0.04
 +set g_balance_uzi_burst_damage 18             
 +set g_balance_uzi_burst_force 50
 +set g_balance_uzi_burst_ammo 3
  set g_balance_uzi_first 1
  set g_balance_uzi_first_damage 18
  set g_balance_uzi_first_force 35
@@@ -384,8 -373,6 +384,8 @@@ set g_balance_electro_secondary_ammo 
  set g_balance_electro_secondary_health 10
  set g_balance_electro_secondary_damageforcescale 4
  set g_balance_electro_secondary_count 3
 +set g_balance_electro_secondary_bouncefactor 1
 +set g_balance_electro_secondary_bouncestop 0
  set g_balance_electro_combo_damage 40
  set g_balance_electro_combo_edgedamage 0
  set g_balance_electro_combo_force 80
@@@ -406,7 -393,9 +406,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
@@@ -427,6 -416,8 +429,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
@@@ -463,7 -454,6 +467,7 @@@ set g_balance_nex_charge_start 0.
  set g_balance_nex_charge_rate 0.05
  set g_balance_nex_charge_limit 0.5
  set g_balance_nex_charge_rot_rate 0.01
 +set g_balance_nex_charge_rot_pause 0 // Dont rot down untill this long after release of charge button
  set g_balance_nex_charge_shot_multiplier 0.675
  set g_balance_nex_charge_velocity_rate 0.15
  set g_balance_nex_charge_minspeed 400
diff --combined balancetZork.cfg
index 0386e1dd5bb6f3c3400908db00a0e7f5e3a245cb,56ea71c184e93a1630b750b60d2704b8ee817804..4de12ee5c52d5b34aaa141caa4144557c37f790f
@@@ -55,67 -55,52 +55,67 @@@ set g_balance_nix_ammoincr_fuel 
  // {{{ pickup items
  set g_pickup_ammo_anyway 1
  set g_pickup_weapons_anyway 1
 +
  set g_pickup_shells 20
  set g_pickup_shells_weapon 10
 -set g_pickup_shells_max 45
 -set g_pickup_nails 120
 +set g_pickup_shells_max 50
 +
 +set g_pickup_nails 60
  set g_pickup_nails_weapon 60
  set g_pickup_nails_max 300
 +
  set g_pickup_rockets 25
  set g_pickup_rockets_weapon 15
  set g_pickup_rockets_max 150
 +
  set g_pickup_cells 30
  set g_pickup_cells_weapon 20
 -set g_pickup_cells_max 200
 +set g_pickup_cells_max 300
 +
  set g_pickup_fuel 25
  set g_pickup_fuel_weapon 15
  set g_pickup_fuel_jetpack 50
  set g_pickup_fuel_max 999
 +
  set g_pickup_armorsmall 5
  set g_pickup_armorsmall_max 999
  set g_pickup_armorsmall_anyway 0
 +
  set g_pickup_armormedium 25
 -set g_pickup_armormedium_max 999
 +set g_pickup_armormedium_max 100
  set g_pickup_armormedium_anyway 0
 +
  set g_pickup_armorbig 50
 -set g_pickup_armorbig_max 999
 +set g_pickup_armorbig_max 150
  set g_pickup_armorbig_anyway 0
 +
  set g_pickup_armorlarge 100
  set g_pickup_armorlarge_max 999
  set g_pickup_armorlarge_anyway 0
 +
  set g_pickup_healthsmall 5
  set g_pickup_healthsmall_max 999
  set g_pickup_healthsmall_anyway 0
 +
  set g_pickup_healthmedium 25
 -set g_pickup_healthmedium_max 999
 +set g_pickup_healthmedium_max 100
  set g_pickup_healthmedium_anyway 0
 +
  set g_pickup_healthlarge 50
 -set g_pickup_healthlarge_max 999
 +set g_pickup_healthlarge_max 150
  set g_pickup_healthlarge_anyway 0
 +
  set g_pickup_healthmega 100
  set g_pickup_healthmega_max 999
  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 5
 -set g_pickup_respawntime_ammo 25
 +set g_pickup_respawntime_weapon 20
 +set g_pickup_respawntime_ammo 15
 +
  set g_pickup_respawntimejitter_short 0
  set g_pickup_respawntimejitter_medium 0
  set g_pickup_respawntimejitter_long 0
@@@ -130,18 -115,18 +130,18 @@@ set g_balance_health_regenlinear 
  set g_balance_pause_health_regen 5
  set g_balance_pause_health_regen_spawn 0
  set g_balance_health_rot 0.1
 -set g_balance_health_rotlinear 0
 -set g_balance_pause_health_rot 5
 -set g_balance_pause_health_rot_spawn 10
 +set g_balance_health_rotlinear 2.5
 +set g_balance_pause_health_rot 4
 +set g_balance_pause_health_rot_spawn 8
  set g_balance_health_regenstable 100
  set g_balance_health_rotstable 100
  set g_balance_health_limit 999
  set g_balance_armor_regen 0
  set g_balance_armor_regenlinear 0
  set g_balance_armor_rot 0.1
 -set g_balance_armor_rotlinear 0
 -set g_balance_pause_armor_rot 5
 -set g_balance_pause_armor_rot_spawn 10
 +set g_balance_armor_rotlinear 2.5
 +set g_balance_pause_armor_rot 4
 +set g_balance_pause_armor_rot_spawn 8
  set g_balance_armor_regenstable 100
  set g_balance_armor_rotstable 100
  set g_balance_armor_limit 999
@@@ -151,15 -136,15 +151,15 @@@ set g_balance_fuel_regenlinear 
  set g_balance_pause_fuel_regen 2 // other than this, fuel uses the health regen counter
  set g_balance_fuel_rot 0.05
  set g_balance_fuel_rotlinear 0
 -set g_balance_pause_fuel_rot 5
 -set g_balance_pause_fuel_rot_spawn 10
 +set g_balance_pause_fuel_rot 4
 +set g_balance_pause_fuel_rot_spawn 8
  set g_balance_fuel_regenstable 50
  set g_balance_fuel_rotstable 100
  set g_balance_fuel_limit 999
  // }}}
  
  // {{{ misc
 -set g_balance_selfdamagepercent 0.65
 +set g_balance_selfdamagepercent 0.6
  set g_balance_weaponswitchdelay 0.15
  set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
  set g_weaponratefactor 1 "weapon fire rate multiplier"
@@@ -191,15 -176,15 +191,15 @@@ set g_projectiles_spread_style 
  // 7: forward + circle with (1-r)(2-r) falloff
  set g_balance_falldamage_deadminspeed 150
  set g_balance_falldamage_minspeed 800
 -set g_balance_falldamage_factor 0.20
 -set g_balance_falldamage_maxdamage 15
 +set g_balance_falldamage_factor 0.02 // maxspeed = minspeed + maxdamage / factor = 4550
 +set g_balance_falldamage_maxdamage 75
  // }}}
  
  // {{{ powerups
  set g_balance_powerup_invincible_takedamage 0.3
  set g_balance_powerup_invincible_time 30
  set g_balance_powerup_strength_damage 3
 -set g_balance_powerup_strength_force 4
 +set g_balance_powerup_strength_force 3
  set g_balance_powerup_strength_time 30
  set g_balance_powerup_strength_selfdamage 1.5
  set g_balance_powerup_strength_selfforce 1.5
@@@ -227,11 -212,11 +227,11 @@@ set g_balance_grapplehook_health 13
  
  // {{{ weapon properties
  // {{{ laser
 -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 270
 +set g_balance_laser_primary_damage 20 
 +set g_balance_laser_primary_edgedamage 10
 +set g_balance_laser_primary_force 230
  set g_balance_laser_primary_radius 60
 -set g_balance_laser_primary_speed 4000
 +set g_balance_laser_primary_speed 9000
  set g_balance_laser_primary_spread 0
  set g_balance_laser_primary_refire 0.6
  set g_balance_laser_primary_animtime 0.6
@@@ -239,7 -224,7 +239,7 @@@ set g_balance_laser_primary_lifetime 
  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
 +set g_balance_laser_primary_force_zscale 1.2
  set g_balance_laser_primary_force_velocitybias 0
  set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
  set g_balance_laser_secondary_damage 35
@@@ -260,7 -245,7 +260,7 @@@ set g_balance_laser_secondary_force_vel
  // {{{ shotgun
  set g_balance_shotgun_primary_bullets 10
  set g_balance_shotgun_primary_damage 5
 -set g_balance_shotgun_primary_force 60
 +set g_balance_shotgun_primary_force 5
  set g_balance_shotgun_primary_spread 0.07
  set g_balance_shotgun_primary_refire 0.8
  set g_balance_shotgun_primary_animtime 0.2
@@@ -277,42 -262,26 +277,42 @@@ set g_balance_shotgun_secondary_force 1
  set g_balance_shotgun_secondary_refire 1.1
  set g_balance_shotgun_secondary_animtime 1
  // }}}
 +
  // {{{ uzi
 +set g_balance_uzi_mode 1                              // Activates varible spread for sustained & burst mode secondary
 +set g_balance_uzi_spread_min 0.02
 +set g_balance_uzi_spread_max 0.6
 +set g_balance_uzi_spread_add 0.008
 +
 +set g_balance_uzi_burst 3                             // # of bullets in a burst (if set to 2 or more)
 +set g_balance_uzi_burst_refire 0.05           // refire between burst bullets
 +set g_balance_uzi_burst_refire2 0.4   // refire after burst
 +set g_balance_uzi_burst_spread 0.03
 +set g_balance_uzi_burst_damage 18             // 90 dps (but 90 dmg deliverd in .25s)
 +set g_balance_uzi_burst_force 50
 +set g_balance_uzi_burst_ammo 3
 +
  set g_balance_uzi_first 1
  set g_balance_uzi_first_damage 30
  set g_balance_uzi_first_force 50
  set g_balance_uzi_first_spread 0.015
 -set g_balance_uzi_first_refire 0.3
 +set g_balance_uzi_first_refire 0.2
  set g_balance_uzi_first_ammo 1
 -set g_balance_uzi_sustained_damage 15
 -set g_balance_uzi_sustained_force 10
 -set g_balance_uzi_sustained_spread 0.08
 +
 +set g_balance_uzi_sustained_damage 14 // 120 dps
 +set g_balance_uzi_sustained_force 12
 +set g_balance_uzi_sustained_spread 0.02
  set g_balance_uzi_sustained_refire 0.1
  set g_balance_uzi_sustained_ammo 1
 +
  set g_balance_uzi_speed 18000
  set g_balance_uzi_bulletconstant 115 // 13.1qu
  // }}}
  // {{{ mortar
  set g_balance_grenadelauncher_primary_type 0
 -set g_balance_grenadelauncher_primary_damage 60
 -set g_balance_grenadelauncher_primary_edgedamage 38
 -set g_balance_grenadelauncher_primary_force 400
 +set g_balance_grenadelauncher_primary_damage 50
 +set g_balance_grenadelauncher_primary_edgedamage 30
 +set g_balance_grenadelauncher_primary_force 250
  set g_balance_grenadelauncher_primary_radius 140
  set g_balance_grenadelauncher_primary_speed 2000
  set g_balance_grenadelauncher_primary_speed_up 200
@@@ -328,9 -297,9 +328,9 @@@ set g_balance_grenadelauncher_primary_d
  set g_balance_grenadelauncher_primary_remote_minbouncecnt 0
  
  set g_balance_grenadelauncher_secondary_type 1
 -set g_balance_grenadelauncher_secondary_damage 70
 -set g_balance_grenadelauncher_secondary_edgedamage 38
 -set g_balance_grenadelauncher_secondary_force 400
 +set g_balance_grenadelauncher_secondary_damage 60
 +set g_balance_grenadelauncher_secondary_edgedamage 35
 +set g_balance_grenadelauncher_secondary_force 300
  set g_balance_grenadelauncher_secondary_radius 140
  set g_balance_grenadelauncher_secondary_speed 1400
  set g_balance_grenadelauncher_secondary_speed_up 200
@@@ -371,72 -340,69 +371,73 @@@ set g_balance_minelayer_remote_radius 2
  set g_balance_minelayer_remote_force 300
  // }}}
  // {{{ electro
 -set g_balance_electro_lightning 1
 -set g_balance_electro_primary_damage 110
 +set g_balance_electro_lightning 0
 +set g_balance_electro_primary_damage 35
  set g_balance_electro_primary_edgedamage 0
 -set g_balance_electro_primary_force 425
 -set g_balance_electro_primary_force_up 125
 -set g_balance_electro_primary_radius 850
 -set g_balance_electro_primary_comboradius 150
 -set g_balance_electro_primary_speed 0
 +set g_balance_electro_primary_force 150
 +set g_balance_electro_primary_force_up 0
 +set g_balance_electro_primary_radius 155
 +set g_balance_electro_primary_comboradius 0
 +set g_balance_electro_primary_speed 2000
  set g_balance_electro_primary_spread 0
 -set g_balance_electro_primary_lifetime 0
 -set g_balance_electro_primary_refire 0.4
 -set g_balance_electro_primary_animtime 0.03333333
 -set g_balance_electro_primary_ammo 7
 -set g_balance_electro_primary_range 800
 +set g_balance_electro_primary_lifetime 30
 +set g_balance_electro_primary_refire 0.65
 +set g_balance_electro_primary_animtime 0.3
 +set g_balance_electro_primary_ammo 2
 +set g_balance_electro_primary_range 0
  set g_balance_electro_primary_falloff_mindist 255 // 0.3 * radius
  set g_balance_electro_primary_falloff_maxdist 850
  set g_balance_electro_primary_falloff_halflifedist 425
  
  set g_balance_electro_secondary_damage 25
  set g_balance_electro_secondary_edgedamage 0
 -set g_balance_electro_secondary_force 100
 -set g_balance_electro_secondary_radius 100
 -set g_balance_electro_secondary_speed 500
 +set g_balance_electro_secondary_force 50
 +set g_balance_electro_secondary_radius 25
 +set g_balance_electro_secondary_speed 750
  set g_balance_electro_secondary_speed_up 150
  set g_balance_electro_secondary_speed_z 0
 -set g_balance_electro_secondary_spread 0.08
 -set g_balance_electro_secondary_lifetime 3.5
 +set g_balance_electro_secondary_spread 0.025
 +set g_balance_electro_secondary_lifetime 5
  set g_balance_electro_secondary_refire 0.1
  set g_balance_electro_secondary_refire2 2
 -set g_balance_electro_secondary_animtime 0.2
 +set g_balance_electro_secondary_animtime 0.15
  set g_balance_electro_secondary_ammo 2
  set g_balance_electro_secondary_health 10
 -set g_balance_electro_secondary_damageforcescale 4
 +set g_balance_electro_secondary_damageforcescale 2
  set g_balance_electro_secondary_count 3
 -set g_balance_electro_combo_damage 60
 -set g_balance_electro_combo_edgedamage 0
 -set g_balance_electro_combo_force 80
 +set g_balance_electro_secondary_bouncefactor 0.5
 +set g_balance_electro_secondary_bouncestop 0.01
 +
 +set g_balance_electro_combo_damage 80
 +set g_balance_electro_combo_edgedamage 10
 +set g_balance_electro_combo_force 150
  set g_balance_electro_combo_radius 250
  set g_balance_electro_combo_comboradius 0
 -set g_balance_electro_combo_speed 400
 +set g_balance_electro_combo_speed 1000
  // }}}
  // {{{ crylink
 -set g_balance_crylink_primary_damage 5
 -set g_balance_crylink_primary_edgedamage 2.5
 -set g_balance_crylink_primary_force 25
 +set g_balance_crylink_primary_damage 20
 +set g_balance_crylink_primary_edgedamage 5
 +set g_balance_crylink_primary_force 50
  set g_balance_crylink_primary_radius 50
 -set g_balance_crylink_primary_speed 2500
 -set g_balance_crylink_primary_spread 0.04
 -set g_balance_crylink_primary_shots 12
 +set g_balance_crylink_primary_speed 2000
 +set g_balance_crylink_primary_spread 0.075
 +set g_balance_crylink_primary_shots 4
  set g_balance_crylink_primary_bounces 1
  set g_balance_crylink_primary_refire 1
  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 2000
- set g_balance_crylink_primary_joinboost 2
+ set g_balance_crylink_primary_joinspeed 0
+ set g_balance_crylink_primary_jointime 0
+ set g_balance_crylink_secondary_linkexplode 1
  
 -set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000
 +set g_balance_crylink_primary_middle_lifetime 5 
  set g_balance_crylink_primary_middle_fadetime 5
  set g_balance_crylink_primary_other_lifetime 2 // range: 800 full, fades to 1300
  set g_balance_crylink_primary_other_fadetime 0.25
  
 +
  set g_balance_crylink_secondary 1
  set g_balance_crylink_secondary_damage 2
  set g_balance_crylink_secondary_edgedamage 0
@@@ -450,7 -416,9 +451,9 @@@ set g_balance_crylink_secondary_refire 
  set g_balance_crylink_secondary_animtime 0.15
  set g_balance_crylink_secondary_ammo 1
  set g_balance_crylink_secondary_bouncedamagefactor 0.5
- set g_balance_crylink_secondary_joinspeed 1000
+ set g_balance_crylink_secondary_joinspeed 0
+ set g_balance_crylink_secondary_jointime 0
+ set g_balance_crylink_primary_linkexplode 1
  
  set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000
  set g_balance_crylink_secondary_middle_fadetime 5
@@@ -458,7 -426,7 +461,7 @@@ set g_balance_crylink_secondary_line_li
  set g_balance_crylink_secondary_line_fadetime 2
  // }}}
  // {{{ nex
 -set g_balance_nex_primary_damage 100
 +set g_balance_nex_primary_damage 110
  set g_balance_nex_primary_force 600
  set g_balance_nex_primary_refire 0.75
  set g_balance_nex_primary_animtime 0.3
@@@ -470,7 -438,7 +473,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.7
 +set g_balance_nex_secondary_charge_rate 0.6
  set g_balance_nex_secondary_damage 100
  set g_balance_nex_secondary_force 600
  set g_balance_nex_secondary_refire 1.5
@@@ -486,8 -454,7 +489,8 @@@ set g_balance_nex_charge_mindmg 1
  set g_balance_nex_charge_start 0
  set g_balance_nex_charge_rate 0.35
  set g_balance_nex_charge_limit 0.5
 -set g_balance_nex_charge_rot_rate 0
 +set g_balance_nex_charge_rot_rate 0.1
 +set g_balance_nex_charge_rot_pause 1 // Dont rot down untill this long after release of charge button
  set g_balance_nex_charge_shot_multiplier 0
  set g_balance_nex_charge_velocity_rate 0
  set g_balance_nex_charge_minspeed 400
@@@ -499,14 -466,14 +502,14 @@@ set g_balance_minstanex_animtime 0.
  set g_balance_minstanex_ammo 10
  // }}}
  // {{{ hagar
 -set g_balance_hagar_primary_damage 30
 -set g_balance_hagar_primary_edgedamage 15
 -set g_balance_hagar_primary_force 50
 -set g_balance_hagar_primary_radius 65
 +set g_balance_hagar_primary_damage 25
 +set g_balance_hagar_primary_edgedamage 5
 +set g_balance_hagar_primary_force 70
 +set g_balance_hagar_primary_radius 60
  set g_balance_hagar_primary_spread 0.010
 -set g_balance_hagar_primary_speed 3000
 +set g_balance_hagar_primary_speed 2500
  set g_balance_hagar_primary_lifetime 30
 -set g_balance_hagar_primary_refire 0.15
 +set g_balance_hagar_primary_refire 0.2
  set g_balance_hagar_primary_ammo 1
  set g_balance_hagar_secondary 1
  set g_balance_hagar_secondary_damage 30
@@@ -521,21 -488,21 +524,21 @@@ set g_balance_hagar_secondary_refire 0.
  set g_balance_hagar_secondary_ammo 1
  // }}}
  // {{{ rocketlauncher // TODO
 -set g_balance_rocketlauncher_damage 110
 +set g_balance_rocketlauncher_damage 120
  set g_balance_rocketlauncher_edgedamage 25
  set g_balance_rocketlauncher_force 350
 -set g_balance_rocketlauncher_radius 125
 -set g_balance_rocketlauncher_speed 1000
 +set g_balance_rocketlauncher_radius 130
 +set g_balance_rocketlauncher_speed 900
  set g_balance_rocketlauncher_speedaccel 0
 -set g_balance_rocketlauncher_speedstart 1000
 -set g_balance_rocketlauncher_lifetime 5
 -set g_balance_rocketlauncher_refire 1
 +set g_balance_rocketlauncher_speedstart 900
 +set g_balance_rocketlauncher_lifetime 9
 +set g_balance_rocketlauncher_refire 1.2
  set g_balance_rocketlauncher_animtime 0.4
  set g_balance_rocketlauncher_ammo 3
  set g_balance_rocketlauncher_health 10
  set g_balance_rocketlauncher_damageforcescale 0
  set g_balance_rocketlauncher_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
 -set g_balance_rocketlauncher_guiderate 45 // max degrees per second
 +set g_balance_rocketlauncher_guiderate 25 // max degrees per second
  set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
  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
@@@ -611,13 -578,13 +614,13 @@@ set g_balance_campingrifle_reloadtime 
  set g_balance_campingrifle_auto_reload_after_changing_weapons 0
  set g_balance_campingrifle_bursttime 0
  set g_balance_campingrifle_primary_tracer 1
 -set g_balance_campingrifle_primary_damage 75
 -set g_balance_campingrifle_primary_headshotaddeddamage 75
 +set g_balance_campingrifle_primary_damage 50
 +set g_balance_campingrifle_primary_headshotaddeddamage 90
  set g_balance_campingrifle_primary_spread 0
  set g_balance_campingrifle_primary_force 2
  set g_balance_campingrifle_primary_speed 40000
  set g_balance_campingrifle_primary_lifetime 5
 -set g_balance_campingrifle_primary_refire 1.5
 +set g_balance_campingrifle_primary_refire 0.5
  set g_balance_campingrifle_primary_animtime 0.6
  set g_balance_campingrifle_primary_ammo 10
  set g_balance_campingrifle_primary_bulletconstant 110 // 62.2qu
@@@ -652,7 -619,7 +655,7 @@@ set g_balance_tuba_force 4
  // {{{ fireball
  set g_balance_fireball_primary_ammo 40
  set g_balance_fireball_primary_animtime 0.15
 -set g_balance_fireball_primary_bfgdamage 100
 +set g_balance_fireball_primary_bfgdamage 150
  set g_balance_fireball_primary_bfgforce 0
  set g_balance_fireball_primary_bfgradius 1000
  set g_balance_fireball_primary_damage 200
@@@ -706,8 -673,8 +709,8 @@@ set g_balance_seeker_missile_accel 1.0
  set g_balance_seeker_missile_ammo 2
  set g_balance_seeker_missile_animtime 0.3
  set g_balance_seeker_missile_count 4
 -set g_balance_seeker_missile_damage 40
 -set g_balance_seeker_missile_damageforcescale 4
 +set g_balance_seeker_missile_damage 50
 +set g_balance_seeker_missile_damageforcescale 2
  set g_balance_seeker_missile_decel 0.9
  set g_balance_seeker_missile_delay 0.25
  set g_balance_seeker_missile_edgedamage 10
@@@ -736,7 -703,7 +739,7 @@@ set g_balance_seeker_tag_animtime 0.
  set g_balance_seeker_tag_damageforcescale 4
  set g_balance_seeker_tag_health 5
  set g_balance_seeker_tag_lifetime 15
 -set g_balance_seeker_tag_refire 0.7
 +set g_balance_seeker_tag_refire 1
  set g_balance_seeker_tag_speed 9000
  set g_balance_seeker_tag_spread 0
  // End new seeker