]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 25 Jun 2010 18:43:06 +0000 (21:43 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 25 Jun 2010 18:43:06 +0000 (21:43 +0300)
Conflicts:
balance.cfg

1  2 
balance.cfg

diff --combined balance.cfg
index 8c531589276b83be5d8ad9f72a5003264d90b418,156b69aed586e61776ebd45bc3dc5ee7035f6e99..e824e271ba095c3aa0063f6de66215e74e805bc0
@@@ -16,21 -16,21 +16,21 @@@ set g_start_weapon_campingrifle -1 "0 
  set g_start_weapon_tuba -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
  set g_start_weapon_fireball -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
  set g_start_weapon_seeker -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
- set g_balance_health_start 100
+ set g_balance_health_start 150
  set g_balance_armor_start 0
- set g_start_ammo_shells 45
+ set g_start_ammo_shells 40
  set g_start_ammo_nails 0
  set g_start_ammo_rockets 0
  set g_start_ammo_cells 0
  set g_start_ammo_fuel 0
- set g_warmup_start_health 200 "starting values when being in warmup-stage"
+ set g_warmup_start_health 250 "starting values when being in warmup-stage"
  set g_warmup_start_armor 100 "starting values when being in warmup-stage"
  set g_warmup_start_ammo_shells 50 "starting values when being in warmup-stage"
  set g_warmup_start_ammo_nails 150 "starting values when being in warmup-stage"
  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 200
+ set g_lms_start_health 250
  set g_lms_start_armor 100
  set g_lms_start_ammo_shells 50
  set g_lms_start_ammo_nails 150
@@@ -54,40 -54,40 +54,40 @@@ set g_balance_nix_ammoincr_fuel 
  // {{{ pickup items
  set g_pickup_ammo_anyway 0
  set g_pickup_weapons_anyway 0
- set g_pickup_shells 30
- set g_pickup_shells_max 120
+ set g_pickup_shells 15
+ set g_pickup_shells_max 999
  set g_pickup_nails 80
- set g_pickup_nails_max 400
- set g_pickup_rockets 30
- set g_pickup_rockets_max 120
- set g_pickup_cells 50
- set g_pickup_cells_max 200
+ set g_pickup_nails_max 999
+ set g_pickup_rockets 15
+ set g_pickup_rockets_max 999
+ set g_pickup_cells 25
+ set g_pickup_cells_max 999
  set g_pickup_fuel 25
  set g_pickup_fuel_jetpack 50
  set g_pickup_fuel_max 999
- set g_pickup_armorsmall 10
- set g_pickup_armorsmall_max 100
+ 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 100
+ set g_pickup_armormedium_max 999
  set g_pickup_armormedium_anyway 0
  set g_pickup_armorbig 50
- set g_pickup_armorbig_max 100
+ set g_pickup_armorbig_max 999
  set g_pickup_armorbig_anyway 0
  set g_pickup_armorlarge 100
- set g_pickup_armorlarge_max 100
+ set g_pickup_armorlarge_max 999
  set g_pickup_armorlarge_anyway 0
- set g_pickup_healthsmall 10
- set g_pickup_healthsmall_max 200
+ 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 200
+ set g_pickup_healthmedium_max 999
  set g_pickup_healthmedium_anyway 0
  set g_pickup_healthlarge 50
- set g_pickup_healthlarge_max 200
+ set g_pickup_healthlarge_max 999
  set g_pickup_healthlarge_anyway 0
  set g_pickup_healthmega 100
- set g_pickup_healthmega_max 200
+ set g_pickup_healthmega_max 999
  set g_pickup_healthmega_anyway 0
  set g_pickup_respawntime_short 15
  set g_pickup_respawntime_medium 20
@@@ -104,23 -104,23 +104,23 @@@ set g_pickup_respawntimejitter_ammo 
  // }}}
  
  // {{{ regen/rot
- set g_balance_health_regen 0
- set g_balance_health_regenlinear 5
+ set g_balance_health_regen 0.1
+ set g_balance_health_regenlinear 0
  set g_balance_pause_health_regen 5
  set g_balance_pause_health_regen_spawn 0
- set g_balance_health_rot 0
- set g_balance_health_rotlinear 5
- set g_balance_pause_health_rot 3
- set g_balance_pause_health_rot_spawn 1
+ 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_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
+ set g_balance_armor_rot 0.1
  set g_balance_armor_rotlinear 0
- set g_balance_pause_armor_rot 1
- set g_balance_pause_armor_rot_spawn 1
+ set g_balance_pause_armor_rot 5
+ set g_balance_pause_armor_rot_spawn 10
  set g_balance_armor_regenstable 100
  set g_balance_armor_rotstable 100
  set g_balance_armor_limit 999
@@@ -156,8 -156,8 +156,8 @@@ set g_projectiles_newton_style 
  // 2: relative velocity projectiles, but aim is precorrected so projectiles hit the crosshair (note: strafe rockets then are SLOWER than ones shot while standing, happens in 1 too when aiming correctly which is hard)
  // 3: absolute velocity + player velocity component in shot direction (note: does NOT yield the right relative velocity, but may be good enough, but it is somewhat prone to sniper rockets)
  // 4: just add the player velocity length to the absolute velocity (tZork's sniper rockets)
- set g_projectiles_newton_style_2_minfactor 0.8
- set g_projectiles_newton_style_2_maxfactor 1.5
+ set g_projectiles_newton_style_2_minfactor 0.7
+ set g_projectiles_newton_style_2_maxfactor 5
  set g_projectiles_spread_style 0
  // possible values:
  // 0: forward + solid sphere (like Quake) - varies velocity
@@@ -188,7 -188,7 +188,7 @@@ set g_balance_powerup_strength_selfforc
  set g_jetpack_antigravity 0.8 "factor of gravity compensation of the jetpack"
  set g_jetpack_acceleration_side 1200 "acceleration of the jetpack in xy direction"
  set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (note: you have to factor in gravity here, if antigravity is not 1)"
- set g_jetpack_maxspeed_side 1200 "max speed of the jetpack in xy direction"
+ set g_jetpack_maxspeed_side 1500 "max speed of the jetpack in xy direction"
  set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction"
  set g_jetpack_fuel 8 "fuel per second for jetpack"
  set g_jetpack_attenuation 2 "jetpack sound attenuation"
@@@ -206,11 -206,11 +206,11 @@@ set g_balance_grapplehook_health 13
  
  // {{{ weapon properties
  // {{{ laser
- set g_balance_laser_primary_damage 25
+ 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 12000
+ set g_balance_laser_primary_speed 9000
  set g_balance_laser_primary_spread 0
  set g_balance_laser_primary_refire 0.7
  set g_balance_laser_primary_animtime 0.3
@@@ -219,84 -219,81 +219,84 @@@ set g_balance_laser_primary_shotangle 
  set g_balance_laser_primary_delay 0.03
  set g_balance_laser_gauntlet 0
  set g_balance_laser_secondary 0 // when 1, a secondary laser mode exists
- set g_balance_laser_secondary_damage 25
+ set g_balance_laser_secondary_damage 35
  set g_balance_laser_secondary_edgedamage 10
  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_speed 9000
  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_shotangle -90
+ set g_balance_laser_secondary_shotangle 0
  set g_balance_laser_secondary_delay 0
  // }}}
  // {{{ shotgun
  set g_balance_shotgun_primary_bullets 6
- set g_balance_shotgun_primary_damage 8
- set g_balance_shotgun_primary_force 0
- set g_balance_shotgun_primary_spread 0.11
+ set g_balance_shotgun_primary_damage 9
+ set g_balance_shotgun_primary_force 60
+ set g_balance_shotgun_primary_spread 0.07
  set g_balance_shotgun_primary_refire 0.5
  set g_balance_shotgun_primary_animtime 0.2
  set g_balance_shotgun_primary_ammo 1
- set g_balance_shotgun_primary_speed 8000
+ set g_balance_shotgun_primary_speed 12000
  set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
  set g_balance_shotgun_secondary 1
  set g_balance_shotgun_secondary_bullets 6
- set g_balance_shotgun_secondary_damage 8
- set g_balance_shotgun_secondary_force 0
- set g_balance_shotgun_secondary_spread 0.17
+ set g_balance_shotgun_secondary_damage 9
+ set g_balance_shotgun_secondary_force 60
+ set g_balance_shotgun_secondary_spread 0.1
  set g_balance_shotgun_secondary_refire 1.35
  set g_balance_shotgun_secondary_animtime 0.2
  set g_balance_shotgun_secondary_ammo 1
- set g_balance_shotgun_secondary_speed 8000
+ set g_balance_shotgun_secondary_speed 12000
  set g_balance_shotgun_secondary_bulletconstant 75 // 3.8qu
  // }}}
  // {{{ uzi
  set g_balance_uzi_first 1
- set g_balance_uzi_first_damage 12
- set g_balance_uzi_first_force 0
+ 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.15
+ set g_balance_uzi_first_refire 0.2
  set g_balance_uzi_first_ammo 1
- set g_balance_uzi_sustained_damage 7
- set g_balance_uzi_sustained_force 0
+ set g_balance_uzi_sustained_damage 15
+ set g_balance_uzi_sustained_force 27
  set g_balance_uzi_sustained_spread 0.05
- set g_balance_uzi_sustained_refire 0.075
+ 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_primary2secondary 0
- set g_balance_grenadelauncher_primary_damage 50
 +set g_balance_grenadelauncher_primary_sticky 0
+ set g_balance_grenadelauncher_primary_damage 70
  set g_balance_grenadelauncher_primary_edgedamage 38
  set g_balance_grenadelauncher_primary_force 400
  set g_balance_grenadelauncher_primary_radius 140
- set g_balance_grenadelauncher_primary_speed 2200
- set g_balance_grenadelauncher_primary_speed_up 220
+ set g_balance_grenadelauncher_primary_speed 2000
+ set g_balance_grenadelauncher_primary_speed_up 200
  set g_balance_grenadelauncher_primary_speed_z 0
  set g_balance_grenadelauncher_primary_spread 0
  set g_balance_grenadelauncher_primary_lifetime 30
 +set g_balance_grenadelauncher_primary_lifetime2 1
  set g_balance_grenadelauncher_primary_refire 0.8
  set g_balance_grenadelauncher_primary_animtime 0.3
  set g_balance_grenadelauncher_primary_ammo 2
- set g_balance_grenadelauncher_secondary_damage 60
 +set g_balance_grenadelauncher_primary_health 25
+ 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_radius 140
  set g_balance_grenadelauncher_secondary_speed 1400
- set g_balance_grenadelauncher_secondary_speed_up 150
+ set g_balance_grenadelauncher_secondary_speed_up 200
  set g_balance_grenadelauncher_secondary_speed_z 0
  set g_balance_grenadelauncher_secondary_spread 0
- set g_balance_grenadelauncher_secondary_lifetime 1
+ set g_balance_grenadelauncher_secondary_lifetime 2.5
  set g_balance_grenadelauncher_secondary_refire 0.7
  set g_balance_grenadelauncher_secondary_animtime 0.3
  set g_balance_grenadelauncher_secondary_ammo 2
- set g_balance_grenadelauncher_secondary_health 70
+ set g_balance_grenadelauncher_secondary_health 10
  set g_balance_grenadelauncher_secondary_damageforcescale 4
  set g_balance_grenadelauncher_secondary_bouncefactor 0.5
  set g_balance_grenadelauncher_secondary_bouncestop 0.075
@@@ -323,15 -320,15 +323,15 @@@ set g_balance_electro_secondary_speed 9
  set g_balance_electro_secondary_speed_up 200
  set g_balance_electro_secondary_speed_z 0
  set g_balance_electro_secondary_spread 0
- set g_balance_electro_secondary_lifetime 2.5
- set g_balance_electro_secondary_refire 0.2
- set g_balance_electro_secondary_refire2 1
- set g_balance_electro_secondary_animtime 0.2
+ set g_balance_electro_secondary_lifetime 5
+ set g_balance_electro_secondary_refire 0.3
+ set g_balance_electro_secondary_refire2 0
+ set g_balance_electro_secondary_animtime 0.3
  set g_balance_electro_secondary_ammo 2
  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_combo_damage 50
+ set g_balance_electro_secondary_count 1
+ set g_balance_electro_combo_damage 80
  set g_balance_electro_combo_edgedamage 0
  set g_balance_electro_combo_force 200
  set g_balance_electro_combo_radius 250
@@@ -339,12 -336,12 +339,12 @@@ set g_balance_electro_combo_comboradiu
  set g_balance_electro_combo_speed 2000
  // }}}
  // {{{ crylink
- set g_balance_crylink_primary_damage 14
+ set g_balance_crylink_primary_damage 18
  set g_balance_crylink_primary_edgedamage 0
  set g_balance_crylink_primary_force -55
  set g_balance_crylink_primary_radius 80
  set g_balance_crylink_primary_speed 7000
- set g_balance_crylink_primary_spread 0.01
+ set g_balance_crylink_primary_spread 0.03
  set g_balance_crylink_primary_shots 4
  set g_balance_crylink_primary_bounces 1
  set g_balance_crylink_primary_refire 0.4
@@@ -360,17 -357,17 +360,17 @@@ 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 10
+ set g_balance_crylink_secondary_damage 18
  set g_balance_crylink_secondary_edgedamage 0
- set g_balance_crylink_secondary_force -40
- set g_balance_crylink_secondary_radius 10
- set g_balance_crylink_secondary_speed 4000
- set g_balance_crylink_secondary_spread 0.01
- set g_balance_crylink_secondary_shots 3
+ set g_balance_crylink_secondary_force -55
+ set g_balance_crylink_secondary_radius 3
+ set g_balance_crylink_secondary_speed 7000
+ set g_balance_crylink_secondary_spread 0.08
+ set g_balance_crylink_secondary_shots 7
  set g_balance_crylink_secondary_bounces 0
- set g_balance_crylink_secondary_refire 0.1
- set g_balance_crylink_secondary_animtime 0.1
- set g_balance_crylink_secondary_ammo 1
+ 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_bouncedamagefactor 0.5
  
  set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
@@@ -395,43 -392,43 +395,43 @@@ 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 0
- set g_balance_hagar_primary_force 50
- set g_balance_hagar_primary_radius 70
- set g_balance_hagar_primary_spread 0.05
- set g_balance_hagar_primary_speed 2400
+ set g_balance_hagar_primary_damage 37
+ set g_balance_hagar_primary_edgedamage 15
+ set g_balance_hagar_primary_force 100
+ set g_balance_hagar_primary_radius 65
+ 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_secondary 1
- set g_balance_hagar_secondary_damage 20
- set g_balance_hagar_secondary_edgedamage 10
- set g_balance_hagar_secondary_force 50
- set g_balance_hagar_secondary_radius 90
- set g_balance_hagar_secondary_spread 0.05
- set g_balance_hagar_secondary_speed 2000
- set g_balance_hagar_secondary_lifetime_min 0.1
- set g_balance_hagar_secondary_lifetime_rand 0.05
- set g_balance_hagar_secondary_refire 0.1
- set g_balance_hagar_secondary_ammo 0.5
+ set g_balance_hagar_secondary_damage 37
+ set g_balance_hagar_secondary_edgedamage 15
+ set g_balance_hagar_secondary_force 100
+ set g_balance_hagar_secondary_radius 65
+ set g_balance_hagar_secondary_spread 0.015
+ set g_balance_hagar_secondary_speed 1400
+ set g_balance_hagar_secondary_lifetime_min 30
+ set g_balance_hagar_secondary_lifetime_rand 0
+ set g_balance_hagar_secondary_refire 0.15
+ set g_balance_hagar_secondary_ammo 1
  // }}}
  // {{{ rocketlauncher
- set g_balance_rocketlauncher_damage 80
+ set g_balance_rocketlauncher_damage 105
  set g_balance_rocketlauncher_edgedamage 40
  set g_balance_rocketlauncher_force 600
- set g_balance_rocketlauncher_radius 100
- set g_balance_rocketlauncher_speed 1600
- set g_balance_rocketlauncher_speedaccel 1600
- set g_balance_rocketlauncher_speedstart 1000
+ set g_balance_rocketlauncher_radius 150
+ set g_balance_rocketlauncher_speed 850
+ set g_balance_rocketlauncher_speedaccel 0
+ set g_balance_rocketlauncher_speedstart 850
  set g_balance_rocketlauncher_lifetime 30
- set g_balance_rocketlauncher_refire 1.2
+ set g_balance_rocketlauncher_refire 1
  set g_balance_rocketlauncher_animtime 0.3
  set g_balance_rocketlauncher_ammo 3
  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_detonatedelay 0.2 // 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 90 // 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
@@@ -451,12 -448,12 +451,12 @@@ set g_balance_portal_health 200 // thes
  set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
  // }}}
  // {{{ hook
- set g_balance_hook_primary_fuel 2 // hook monkeys set 0
+ set g_balance_hook_primary_fuel 5 // hook monkeys set 0
  set g_balance_hook_primary_refire 0 // hook monkeys set 0
  set g_balance_hook_primary_animtime 0.3 // good shoot anim
  set g_balance_hook_primary_hooked_time_max 0 // infinite
  set g_balance_hook_primary_hooked_time_free 2 // 2s being hooked are free
- set g_balance_hook_primary_hooked_fuel 3 // fuel per second hooked
+ set g_balance_hook_primary_hooked_fuel 5 // fuel per second hooked
  set g_balance_hook_secondary_damage 25 // not much
  set g_balance_hook_secondary_edgedamage 5 // not much
  set g_balance_hook_secondary_radius 500 // LOTS
@@@ -573,7 -570,7 +573,7 @@@ set g_balance_fireball_secondary_damage
  set g_balance_fireball_secondary_damagetime 5
  set g_balance_fireball_secondary_force 100
  set g_balance_fireball_secondary_laserburntime 0.5
- set g_balance_fireball_secondary_laserdamage 30
+ set g_balance_fireball_secondary_laserdamage 50
  set g_balance_fireball_secondary_laseredgedamage 20
  set g_balance_fireball_secondary_laserradius 110
  set g_balance_fireball_secondary_lifetime 7