]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 6 Oct 2010 08:29:41 +0000 (10:29 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 6 Oct 2010 08:29:41 +0000 (10:29 +0200)
1  2 
balanceLeeStricklin.cfg

diff --combined balanceLeeStricklin.cfg
index 2ccca9fccc09f994f41df2669ccc6e44bcbfb898,c1ff936126ba31177bac603eb64366dd10bc250f..8a0ae6c46224929acbb9574496eb204d40f22db6
@@@ -246,7 -246,7 +246,7 @@@ set g_balance_laser_secondary_gauntlet 
  // {{{ shotgun
  set g_balance_shotgun_primary_bullets 5
  set g_balance_shotgun_primary_damage 12
 -set g_balance_shotgun_primary_force 60
 +set g_balance_shotgun_primary_force 40
  set g_balance_shotgun_primary_spread 0.08
  set g_balance_shotgun_primary_refire 0.5
  set g_balance_shotgun_primary_animtime 0.2
@@@ -266,11 -266,11 +266,11 @@@ set g_balance_shotgun_secondary_animtim
  // {{{ uzi
  set g_balance_uzi_first 1
  set g_balance_uzi_first_damage 26
 -set g_balance_uzi_first_force 50
 +set g_balance_uzi_first_force -30
  set g_balance_uzi_first_spread 0.01
  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_damage 17
  set g_balance_uzi_sustained_force 27
  set g_balance_uzi_sustained_spread 0.05
  set g_balance_uzi_sustained_refire 0.1
@@@ -279,11 -279,10 +279,10 @@@ set g_balance_uzi_speed 1800
  set g_balance_uzi_bulletconstant 300 // 13.1qu
  // }}}
  // {{{ mortar
- set g_balance_grenadelauncher_primary2secondary 0
- set g_balance_grenadelauncher_primary_sticky 0
+ set g_balance_grenadelauncher_primary_type 0
  set g_balance_grenadelauncher_primary_damage 65
  set g_balance_grenadelauncher_primary_edgedamage 35
 -set g_balance_grenadelauncher_primary_force 400
 +set g_balance_grenadelauncher_primary_force 310
  set g_balance_grenadelauncher_primary_radius 140
  set g_balance_grenadelauncher_primary_speed 2000
  set g_balance_grenadelauncher_primary_speed_up 200
@@@ -295,10 -294,15 +294,15 @@@ set g_balance_grenadelauncher_primary_r
  set g_balance_grenadelauncher_primary_animtime 0.3
  set g_balance_grenadelauncher_primary_ammo 2
  set g_balance_grenadelauncher_primary_health 72
- set g_balance_grenadelauncher_secondary_sticky 0
+ set g_balance_grenadelauncher_primary_damageforcescale 0
+ set g_balance_grenadelauncher_primary_bouncefactor 0.7
+ set g_balance_grenadelauncher_primary_bouncestop 0.12
+ set g_balance_grenadelauncher_primary_remote_minbouncecnt 0
+ set g_balance_grenadelauncher_secondary_type 1
  set g_balance_grenadelauncher_secondary_damage 65
  set g_balance_grenadelauncher_secondary_edgedamage 35
 -set g_balance_grenadelauncher_secondary_force 400
 +set g_balance_grenadelauncher_secondary_force 320
  set g_balance_grenadelauncher_secondary_radius 140
  set g_balance_grenadelauncher_secondary_speed 1400
  set g_balance_grenadelauncher_secondary_speed_up 200
@@@ -313,25 -317,26 +317,26 @@@ set g_balance_grenadelauncher_secondary
  set g_balance_grenadelauncher_secondary_damageforcescale 0
  set g_balance_grenadelauncher_secondary_bouncefactor 0.7
  set g_balance_grenadelauncher_secondary_bouncestop 0.12
+ set g_balance_grenadelauncher_secondary_remote_detonateprimary 0
  // }}}
  // {{{ electro
  set g_balance_electro_lightning 0
 -set g_balance_electro_primary_damage 80
 -set g_balance_electro_primary_edgedamage 0
 -set g_balance_electro_primary_force 550
 +set g_balance_electro_primary_damage 55
 +set g_balance_electro_primary_edgedamage 5
 +set g_balance_electro_primary_force 267
  set g_balance_electro_primary_force_up 125
  set g_balance_electro_primary_radius 150
  set g_balance_electro_primary_comboradius 75
  set g_balance_electro_primary_speed 2000
  set g_balance_electro_primary_spread 0
  set g_balance_electro_primary_lifetime 30
 -set g_balance_electro_primary_refire 0.6
 -set g_balance_electro_primary_animtime 0.74
 +set g_balance_electro_primary_refire 0.78
 +set g_balance_electro_primary_animtime 0.4
  set g_balance_electro_primary_ammo 2
  set g_balance_electro_primary_range 800
 -set g_balance_electro_primary_falloff_mindist 255 // 0.3 * radius
 +set g_balance_electro_primary_falloff_mindist 255
  set g_balance_electro_primary_falloff_maxdist 850
 -set g_balance_electro_primary_falloff_halflifedist 425
 +set g_balance_electro_primary_falloff_halflifedist 0
  set g_balance_electro_secondary_damage 60
  set g_balance_electro_secondary_edgedamage 0
  set g_balance_electro_secondary_force 200
@@@ -356,7 -361,7 +361,7 @@@ set g_balance_electro_combo_comboradiu
  set g_balance_electro_combo_speed 400
  // }}}
  // {{{ crylink
 -set g_balance_crylink_primary_damage 16
 +set g_balance_crylink_primary_damage 23
  set g_balance_crylink_primary_edgedamage 0
  set g_balance_crylink_primary_force -55
  set g_balance_crylink_primary_radius 80
@@@ -366,7 -371,7 +371,7 @@@ set g_balance_crylink_primary_shots 
  set g_balance_crylink_primary_bounces 2
  set g_balance_crylink_primary_refire 0.4
  set g_balance_crylink_primary_animtime 0.30008
 -set g_balance_crylink_primary_ammo 1
 +set g_balance_crylink_primary_ammo 3
  set g_balance_crylink_primary_bouncedamagefactor 0.2
  
  set g_balance_crylink_primary_middle_lifetime 5 // range: 10000 full, fades to 20000
@@@ -377,7 -382,7 +382,7 @@@ set g_balance_crylink_primary_other_lif
  set g_balance_crylink_primary_other_fadetime 0.25
  
  set g_balance_crylink_secondary 1
 -set g_balance_crylink_secondary_damage 12
 +set g_balance_crylink_secondary_damage 19
  set g_balance_crylink_secondary_edgedamage 0
  set g_balance_crylink_secondary_force -55
  set g_balance_crylink_secondary_radius 3
@@@ -387,7 -392,7 +392,7 @@@ set g_balance_crylink_secondary_shots 
  set g_balance_crylink_secondary_bounces 0
  set g_balance_crylink_secondary_refire 0.5
  set g_balance_crylink_secondary_animtime 0.3
 -set g_balance_crylink_secondary_ammo 2
 +set g_balance_crylink_secondary_ammo 3
  set g_balance_crylink_secondary_bouncedamagefactor 0.5
  
  set g_balance_crylink_secondary_middle_lifetime 5 // range: 10000 full, fades to 10000
@@@ -396,11 -401,11 +401,11 @@@ set g_balance_crylink_secondary_line_li
  set g_balance_crylink_secondary_line_fadetime 2
  // }}}
  // {{{ nex
 -set g_balance_nex_primary_ammo 7
 +set g_balance_nex_primary_ammo 13
  set g_balance_nex_primary_animtime 0.3
 -set g_balance_nex_primary_damage 140
 +set g_balance_nex_primary_damage 78
  set g_balance_nex_primary_force 600
 -set g_balance_nex_primary_refire 1.5
 +set g_balance_nex_primary_refire 1.505
  set g_balance_nex_primary_damagefalloff_mindist 9999999
  set g_balance_nex_primary_damagefalloff_maxdist 9999999
  set g_balance_nex_primary_damagefalloff_halflife 9999999
@@@ -416,6 -421,10 +421,10 @@@ set g_balance_nex_secondary_damagefallo
  set g_balance_nex_secondary_damagefalloff_maxdist 9999999
  set g_balance_nex_secondary_damagefalloff_halflife 9999999
  set g_balance_nex_secondary_damagefalloff_forcehalflife 9999999
+ set g_balance_nex_velocitydependent_halflife 0
+ set g_balance_nex_velocitydependent_minspeed 400
+ set g_balance_nex_velocitydependent_maxspeed 1000
  // }}}
  // {{{ minstanex
  set g_balance_minstanex_refire 1
@@@ -425,13 -434,13 +434,13 @@@ set g_balance_minstanex_ammo 1
  // {{{ hagar
  set g_balance_hagar_primary_damage 43
  set g_balance_hagar_primary_edgedamage 15
 -set g_balance_hagar_primary_force 100
 +set g_balance_hagar_primary_force 94
  set g_balance_hagar_primary_radius 70
  set g_balance_hagar_primary_spread 0.010
  set g_balance_hagar_primary_speed 3000
  set g_balance_hagar_primary_lifetime 30
  set g_balance_hagar_primary_refire 0.15
 -set g_balance_hagar_primary_ammo 1
 +set g_balance_hagar_primary_ammo 2
  set g_balance_hagar_secondary 1
  set g_balance_hagar_secondary_damage 43
  set g_balance_hagar_secondary_edgedamage 15
@@@ -442,12 -451,12 +451,12 @@@ set g_balance_hagar_secondary_speed 140
  set g_balance_hagar_secondary_lifetime_min 5
  set g_balance_hagar_secondary_lifetime_rand 0
  set g_balance_hagar_secondary_refire 0.15
 -set g_balance_hagar_secondary_ammo 1
 +set g_balance_hagar_secondary_ammo 2
  // }}}
  // {{{ rocketlauncher
 -set g_balance_rocketlauncher_damage 130
 -set g_balance_rocketlauncher_edgedamage 50
 -set g_balance_rocketlauncher_force 597
 +set g_balance_rocketlauncher_damage 65
 +set g_balance_rocketlauncher_edgedamage 25
 +set g_balance_rocketlauncher_force 360
  set g_balance_rocketlauncher_radius 185
  set g_balance_rocketlauncher_speed 900
  set g_balance_rocketlauncher_speedaccel 0
@@@ -455,11 -464,11 +464,11 @@@ set g_balance_rocketlauncher_speedstar
  set g_balance_rocketlauncher_lifetime 30
  set g_balance_rocketlauncher_refire 1
  set g_balance_rocketlauncher_animtime 0.3
 -set g_balance_rocketlauncher_ammo 3
 +set g_balance_rocketlauncher_ammo 7
  set g_balance_rocketlauncher_health 40
  set g_balance_rocketlauncher_damageforcescale 4
  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 140 // max degrees per second
 +set g_balance_rocketlauncher_guiderate 65 // 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
@@@ -508,7 -517,7 +517,7 @@@ set g_balance_hlac_primary_spread_max 0
  set g_balance_hlac_primary_spread_add 0.0045
  set g_balance_hlac_primary_spread_crouchmod 0.25
  
 -set g_balance_hlac_primary_damage 19
 +set g_balance_hlac_primary_damage 17
  set g_balance_hlac_primary_edgedamage 10
  set g_balance_hlac_primary_force 45
  set g_balance_hlac_primary_radius 70
@@@ -517,7 -526,7 +526,7 @@@ set g_balance_hlac_primary_lifetime 
  
  set g_balance_hlac_primary_refire 0.1
  set g_balance_hlac_primary_animtime 0.3
 -set g_balance_hlac_primary_ammo 1
 +set g_balance_hlac_primary_ammo 3
  
  set g_balance_hlac_secondary 1
  set g_balance_hlac_secondary_spread 0.15
@@@ -532,7 -541,7 +541,7 @@@ set g_balance_hlac_secondary_lifetime 
  
  set g_balance_hlac_secondary_refire 1
  set g_balance_hlac_secondary_animtime 0.3
 -set g_balance_hlac_secondary_ammo 10
 +set g_balance_hlac_secondary_ammo 11
  set g_balance_hlac_secondary_shots 6
  // }}}
  // {{{ campingrifle