From: Samual Lenks Date: Tue, 14 May 2013 18:14:55 +0000 (-0400) Subject: Fix/update configs X-Git-Tag: xonotic-v0.7.0~47^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=235b5e415b039c37a80e172a799dd4ff671f4277;p=xonotic%2Fxonotic-data.pk3dir.git Fix/update configs --- diff --git a/balance25.cfg b/balance25.cfg index 666482f4a..343891810 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -145,7 +145,6 @@ set g_balance_fuel_limit 999 // {{{ misc 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" set g_weapondamagefactor 1 "weapon damage multiplier" @@ -259,6 +258,8 @@ set g_balance_laser_secondary_gauntlet 0 set g_balance_laser_secondary_force_zscale 1 set g_balance_laser_secondary_force_velocitybias 0 set g_balance_laser_secondary_force_other_scale 1 +set g_balance_laser_switchdelay_drop 0.15 +set g_balance_laser_switchdelay_raise 0.15 set g_balance_laser_reload_ammo 0 //default: 6 set g_balance_laser_reload_time 2 // }}} @@ -286,6 +287,8 @@ set g_balance_shotgun_secondary_damage 115 set g_balance_shotgun_secondary_force 150 set g_balance_shotgun_secondary_refire 1.1 set g_balance_shotgun_secondary_animtime 1 +set g_balance_shotgun_switchdelay_drop 0.15 +set g_balance_shotgun_switchdelay_raise 0.15 set g_balance_shotgun_reload_ammo 0 //default: 5 set g_balance_shotgun_reload_time 2 // }}} @@ -320,6 +323,9 @@ set g_balance_uzi_sustained_ammo 1 set g_balance_uzi_speed 18000 set g_balance_uzi_bulletconstant 115 // 13.1qu +set g_balance_uzi_switchdelay_drop 0.15 +set g_balance_uzi_switchdelay_raise 0.15 + set g_balance_uzi_reload_ammo 0 //default: 30 set g_balance_uzi_reload_time 2 // }}} @@ -364,6 +370,9 @@ set g_balance_grenadelauncher_secondary_remote_detonateprimary 0 set g_balance_grenadelauncher_bouncefactor 0.5 set g_balance_grenadelauncher_bouncestop 0.075 +set g_balance_grenadelauncher_switchdelay_drop 0.15 +set g_balance_grenadelauncher_switchdelay_raise 0.15 + set g_balance_grenadelauncher_reload_ammo 0 //default: 12 set g_balance_grenadelauncher_reload_time 2 // }}} @@ -411,6 +420,8 @@ set g_balance_electro_combo_radius 250 set g_balance_electro_combo_comboradius 0 set g_balance_electro_combo_speed 2000 set g_balance_electro_combo_safeammocheck 0 +set g_balance_electro_switchdelay_drop 0.15 +set g_balance_electro_switchdelay_raise 0.15 set g_balance_electro_reload_ammo 0 //default: 20 set g_balance_electro_reload_time 2 // }}} @@ -471,6 +482,9 @@ set g_balance_crylink_secondary_middle_fadetime 5 set g_balance_crylink_secondary_line_lifetime 2 // range: 35000 full, fades to 70000 set g_balance_crylink_secondary_line_fadetime 2 +set g_balance_crylink_switchdelay_drop 0.15 +set g_balance_crylink_switchdelay_raise 0.15 + set g_balance_crylink_reload_ammo 0 //default: 10 set g_balance_crylink_reload_time 2 // }}} @@ -515,6 +529,9 @@ set g_balance_nex_charge_velocity_rate 0.2 set g_balance_nex_charge_minspeed 400 set g_balance_nex_charge_maxspeed 1000 +set g_balance_nex_switchdelay_drop 0.15 +set g_balance_nex_switchdelay_raise 0.15 + set g_balance_nex_reload_ammo 0 //default: 25 set g_balance_nex_reload_time 2 // }}} @@ -525,6 +542,8 @@ set g_balance_minstanex_ammo 10 set g_balance_minstanex_laser_ammo 0 set g_balance_minstanex_laser_animtime 0.3 set g_balance_minstanex_laser_refire 0.7 +set g_balance_minstanex_switchdelay_drop 0.15 +set g_balance_minstanex_switchdelay_raise 0.15 set g_balance_minstanex_reload_ammo 0 //default: 50 set g_balance_minstanex_reload_time 2 // }}} @@ -563,6 +582,8 @@ 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 +set g_balance_hagar_switchdelay_drop 0.15 +set g_balance_hagar_switchdelay_raise 0.15 set g_balance_hagar_reload_ammo 0 //default: 25 set g_balance_hagar_reload_time 2 // }}} @@ -590,6 +611,8 @@ set g_balance_rocketlauncher_remote_damage 105 set g_balance_rocketlauncher_remote_edgedamage 40 set g_balance_rocketlauncher_remote_radius 150 set g_balance_rocketlauncher_remote_force 600 +set g_balance_rocketlauncher_switchdelay_drop 0.15 +set g_balance_rocketlauncher_switchdelay_raise 0.15 set g_balance_rocketlauncher_reload_ammo 0 //default: 25 set g_balance_rocketlauncher_reload_time 2 // }}} @@ -603,6 +626,8 @@ set g_balance_porto_secondary_refire 1.5 set g_balance_porto_secondary_animtime 0.3 set g_balance_porto_secondary_speed 2000 set g_balance_porto_secondary_lifetime 30 +set g_balance_porto_switchdelay_drop 0.15 +set g_balance_porto_switchdelay_raise 0.15 set g_balance_portal_health 200 // these get recharged whenever the portal is used set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used // }}} @@ -626,7 +651,9 @@ set g_balance_hook_secondary_animtime 0.3 // good shoot anim set g_balance_hook_secondary_power 3 // effect behaves like a square function set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds set g_balance_hook_secondary_health 0 -set g_balance_hook_secondary_damageforcescale 0 +set g_balance_hook_secondary_damageforcescale 0 +set g_balance_hook_switchdelay_drop 0.15 +set g_balance_hook_switchdelay_raise 0.15 // }}} // {{{ tuba set g_balance_tuba_refire 0.05 @@ -639,6 +666,8 @@ set g_balance_tuba_edgedamage 0 set g_balance_tuba_radius 200 set g_balance_tuba_force 40 set g_balance_tuba_pitchstep 6 +set g_balance_tuba_switchdelay_drop 0.15 +set g_balance_tuba_switchdelay_raise 0.15 // }}} // {{{ fireball set g_balance_fireball_primary_animtime 0.15 @@ -675,4 +704,6 @@ set g_balance_fireball_secondary_speed 900 set g_balance_fireball_secondary_speed_up 100 set g_balance_fireball_secondary_speed_z 0 set g_balance_fireball_secondary_spread 0 +set g_balance_fireball_switchdelay_drop 0.15 +set g_balance_fireball_switchdelay_raise 0.15 // }}} diff --git a/balanceFruitieX.cfg b/balanceFruitieX.cfg index cd73187ec..ce125421f 100644 --- a/balanceFruitieX.cfg +++ b/balanceFruitieX.cfg @@ -145,7 +145,6 @@ set g_balance_fuel_limit 999 // {{{ misc set g_balance_selfdamagepercent 0.65 -set g_balance_weaponswitchdelay 0.15 set g_weaponspeedfactor 1 "weapon projectile speed multiplier" set g_weaponratefactor 1 "weapon fire rate multiplier" set g_weapondamagefactor 1 "weapon damage multiplier" @@ -259,6 +258,8 @@ set g_balance_laser_secondary_gauntlet 1 set g_balance_laser_secondary_force_zscale 1.25 set g_balance_laser_secondary_force_velocitybias 0 set g_balance_laser_secondary_force_other_scale 0 +set g_balance_laser_switchdelay_drop 0.15 +set g_balance_laser_switchdelay_raise 0.15 set g_balance_laser_reload_ammo 0 //default: 6 set g_balance_laser_reload_time 2 // }}} @@ -286,6 +287,8 @@ set g_balance_shotgun_secondary_damage 110 set g_balance_shotgun_secondary_force 150 set g_balance_shotgun_secondary_refire 1.1 set g_balance_shotgun_secondary_animtime 1 +set g_balance_shotgun_switchdelay_drop 0.15 +set g_balance_shotgun_switchdelay_raise 0.15 set g_balance_shotgun_reload_ammo 0 //default: 5 set g_balance_shotgun_reload_time 2 // }}} @@ -320,6 +323,9 @@ set g_balance_uzi_sustained_ammo 1 set g_balance_uzi_speed 18000 set g_balance_uzi_bulletconstant 115 // 13.1qu +set g_balance_uzi_switchdelay_drop 0.15 +set g_balance_uzi_switchdelay_raise 0.15 + set g_balance_uzi_reload_ammo 0 //default: 30 set g_balance_uzi_reload_time 2 // }}} @@ -364,6 +370,9 @@ set g_balance_grenadelauncher_secondary_remote_detonateprimary 0 set g_balance_grenadelauncher_bouncefactor 0.5 set g_balance_grenadelauncher_bouncestop 0.12 +set g_balance_grenadelauncher_switchdelay_drop 0.15 +set g_balance_grenadelauncher_switchdelay_raise 0.15 + set g_balance_grenadelauncher_reload_ammo 0 //default: 12 set g_balance_grenadelauncher_reload_time 2 // }}} @@ -411,6 +420,8 @@ 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_safeammocheck 1 +set g_balance_electro_switchdelay_drop 0.15 +set g_balance_electro_switchdelay_raise 0.15 set g_balance_electro_reload_ammo 0 //default: 20 set g_balance_electro_reload_time 2 // }}} @@ -471,6 +482,9 @@ set g_balance_crylink_secondary_middle_fadetime 5 set g_balance_crylink_secondary_line_lifetime 2 // range: 4000 full, fades to 8000 set g_balance_crylink_secondary_line_fadetime 0.25 +set g_balance_crylink_switchdelay_drop 0.15 +set g_balance_crylink_switchdelay_raise 0.15 + set g_balance_crylink_reload_ammo 0 //default: 10 set g_balance_crylink_reload_time 2 // }}} @@ -515,6 +529,9 @@ set g_balance_nex_charge_velocity_rate 0 set g_balance_nex_charge_minspeed 600 set g_balance_nex_charge_maxspeed 1000 +set g_balance_nex_switchdelay_drop 0.15 +set g_balance_nex_switchdelay_raise 0.15 + set g_balance_nex_reload_ammo 0 //default: 25 set g_balance_nex_reload_time 2 // }}} @@ -525,6 +542,8 @@ set g_balance_minstanex_ammo 10 set g_balance_minstanex_laser_ammo 0 set g_balance_minstanex_laser_animtime 0.3 set g_balance_minstanex_laser_refire 0.6 +set g_balance_minstanex_switchdelay_drop 0.15 +set g_balance_minstanex_switchdelay_raise 0.15 set g_balance_minstanex_reload_ammo 0 //default: 50 set g_balance_minstanex_reload_time 2 // }}} @@ -563,6 +582,8 @@ set g_balance_hagar_secondary_lifetime_min 5 set g_balance_hagar_secondary_lifetime_rand 0 set g_balance_hagar_secondary_refire 0.12 // default for _load: 0.8 set g_balance_hagar_secondary_ammo 1 +set g_balance_hagar_switchdelay_drop 0.15 +set g_balance_hagar_switchdelay_raise 0.15 set g_balance_hagar_reload_ammo 0 //default: 25 set g_balance_hagar_reload_time 2 // }}} @@ -590,6 +611,8 @@ set g_balance_rocketlauncher_remote_damage 60 set g_balance_rocketlauncher_remote_edgedamage 20 set g_balance_rocketlauncher_remote_radius 120 set g_balance_rocketlauncher_remote_force 350 +set g_balance_rocketlauncher_switchdelay_drop 0.15 +set g_balance_rocketlauncher_switchdelay_raise 0.15 set g_balance_rocketlauncher_reload_ammo 0 //default: 25 set g_balance_rocketlauncher_reload_time 2 // }}} @@ -603,6 +626,8 @@ set g_balance_porto_secondary_refire 1.5 set g_balance_porto_secondary_animtime 0.2 set g_balance_porto_secondary_speed 2000 set g_balance_porto_secondary_lifetime 5 +set g_balance_porto_switchdelay_drop 0.15 +set g_balance_porto_switchdelay_raise 0.15 set g_balance_portal_health 200 // these get recharged whenever the portal is used set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used // }}} @@ -626,7 +651,9 @@ set g_balance_hook_secondary_animtime 0.2 // good shoot anim set g_balance_hook_secondary_power 3 // effect behaves like a square function set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds set g_balance_hook_secondary_health 0 -set g_balance_hook_secondary_damageforcescale 0 +set g_balance_hook_secondary_damageforcescale 0 +set g_balance_hook_switchdelay_drop 0.15 +set g_balance_hook_switchdelay_raise 0.15 // }}} // {{{ tuba set g_balance_tuba_refire 0.05 @@ -639,6 +666,8 @@ set g_balance_tuba_edgedamage 0 set g_balance_tuba_radius 200 set g_balance_tuba_force 40 set g_balance_tuba_pitchstep 6 +set g_balance_tuba_switchdelay_drop 0.15 +set g_balance_tuba_switchdelay_raise 0.15 // }}} // {{{ fireball set g_balance_fireball_primary_animtime 0.2 @@ -675,4 +704,6 @@ set g_balance_fireball_secondary_speed 900 set g_balance_fireball_secondary_speed_up 100 set g_balance_fireball_secondary_speed_z 0 set g_balance_fireball_secondary_spread 0 +set g_balance_fireball_switchdelay_drop 0.15 +set g_balance_fireball_switchdelay_raise 0.15 // }}} diff --git a/balanceXDF.cfg b/balanceXDF.cfg index 514433c32..5745548e2 100644 --- a/balanceXDF.cfg +++ b/balanceXDF.cfg @@ -145,7 +145,6 @@ set g_balance_fuel_limit 999 // {{{ misc set g_balance_selfdamagepercent 0 -set g_balance_weaponswitchdelay 0 set g_weaponspeedfactor 1 "weapon projectile speed multiplier" set g_weaponratefactor 1 "weapon fire rate multiplier" set g_weapondamagefactor 1 "weapon damage multiplier" @@ -259,6 +258,8 @@ set g_balance_laser_secondary_gauntlet 0 set g_balance_laser_secondary_force_zscale 1.25 set g_balance_laser_secondary_force_velocitybias 0 set g_balance_laser_secondary_force_other_scale 1 +set g_balance_laser_switchdelay_drop 0 +set g_balance_laser_switchdelay_raise 0 set g_balance_laser_reload_ammo 0 //default: 6 set g_balance_laser_reload_time 2 // }}} @@ -286,6 +287,8 @@ set g_balance_shotgun_secondary_damage 80 set g_balance_shotgun_secondary_force 200 set g_balance_shotgun_secondary_refire 1.25 set g_balance_shotgun_secondary_animtime 1 +set g_balance_shotgun_switchdelay_drop 0 +set g_balance_shotgun_switchdelay_raise 0 set g_balance_shotgun_reload_ammo 0 //default: 5 set g_balance_shotgun_reload_time 2 // }}} @@ -320,6 +323,9 @@ set g_balance_uzi_sustained_ammo 1 set g_balance_uzi_speed 18000 set g_balance_uzi_bulletconstant 115 // 13.1qu +set g_balance_uzi_switchdelay_drop 0 +set g_balance_uzi_switchdelay_raise 0 + set g_balance_uzi_reload_ammo 0 //default: 30 set g_balance_uzi_reload_time 2 // }}} @@ -364,6 +370,9 @@ set g_balance_grenadelauncher_secondary_remote_detonateprimary 0 set g_balance_grenadelauncher_bouncefactor 0.5 set g_balance_grenadelauncher_bouncestop 0.075 +set g_balance_grenadelauncher_switchdelay_drop 0 +set g_balance_grenadelauncher_switchdelay_raise 0 + set g_balance_grenadelauncher_reload_ammo 0 //default: 12 set g_balance_grenadelauncher_reload_time 2 // }}} @@ -411,6 +420,8 @@ set g_balance_electro_combo_radius 175 set g_balance_electro_combo_comboradius 275 set g_balance_electro_combo_speed 2000 set g_balance_electro_combo_safeammocheck 1 +set g_balance_electro_switchdelay_drop 0 +set g_balance_electro_switchdelay_raise 0 set g_balance_electro_reload_ammo 0 //default: 20 set g_balance_electro_reload_time 2 // }}} @@ -471,6 +482,9 @@ set g_balance_crylink_secondary_middle_fadetime 5 set g_balance_crylink_secondary_line_lifetime 5 set g_balance_crylink_secondary_line_fadetime 5 +set g_balance_crylink_switchdelay_drop 0 +set g_balance_crylink_switchdelay_raise 0 + set g_balance_crylink_reload_ammo 0 //default: 10 set g_balance_crylink_reload_time 2 // }}} @@ -515,6 +529,9 @@ set g_balance_nex_charge_velocity_rate 0 set g_balance_nex_charge_minspeed 400 set g_balance_nex_charge_maxspeed 800 +set g_balance_nex_switchdelay_drop 0 +set g_balance_nex_switchdelay_raise 0 + set g_balance_nex_reload_ammo 0 //default: 25 set g_balance_nex_reload_time 2 // }}} @@ -525,6 +542,8 @@ set g_balance_minstanex_ammo 10 set g_balance_minstanex_laser_ammo 0 set g_balance_minstanex_laser_animtime 0.3 set g_balance_minstanex_laser_refire 0.7 +set g_balance_minstanex_switchdelay_drop 0 +set g_balance_minstanex_switchdelay_raise 0 set g_balance_minstanex_reload_ammo 0 //default: 50 set g_balance_minstanex_reload_time 2 // }}} @@ -563,6 +582,8 @@ set g_balance_hagar_secondary_lifetime_min 10 set g_balance_hagar_secondary_lifetime_rand 0 set g_balance_hagar_secondary_refire 0.5 set g_balance_hagar_secondary_ammo 1 +set g_balance_hagar_switchdelay_drop 0 +set g_balance_hagar_switchdelay_raise 0 set g_balance_hagar_reload_ammo 0 //default: 25 set g_balance_hagar_reload_time 2 // }}} @@ -590,6 +611,8 @@ set g_balance_rocketlauncher_remote_damage 70 set g_balance_rocketlauncher_remote_edgedamage 35 set g_balance_rocketlauncher_remote_radius 110 set g_balance_rocketlauncher_remote_force 350 +set g_balance_rocketlauncher_switchdelay_drop 0 +set g_balance_rocketlauncher_switchdelay_raise 0 set g_balance_rocketlauncher_reload_ammo 0 //default: 25 set g_balance_rocketlauncher_reload_time 2 // }}} @@ -603,6 +626,8 @@ set g_balance_porto_secondary_refire 1.5 set g_balance_porto_secondary_animtime 0.3 set g_balance_porto_secondary_speed 1000 set g_balance_porto_secondary_lifetime 5 +set g_balance_porto_switchdelay_drop 0 +set g_balance_porto_switchdelay_raise 0 set g_balance_portal_health 200 // these get recharged whenever the portal is used set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used // }}} @@ -626,7 +651,9 @@ set g_balance_hook_secondary_animtime 0.3 // good shoot anim set g_balance_hook_secondary_power 3 // effect behaves like a square function set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds set g_balance_hook_secondary_health 15 -set g_balance_hook_secondary_damageforcescale 0 +set g_balance_hook_secondary_damageforcescale 0 +set g_balance_hook_switchdelay_drop 0 +set g_balance_hook_switchdelay_raise 0 // }}} // {{{ tuba set g_balance_tuba_refire 0.05 @@ -639,6 +666,8 @@ set g_balance_tuba_edgedamage 0 set g_balance_tuba_radius 200 set g_balance_tuba_force 40 set g_balance_tuba_pitchstep 6 +set g_balance_tuba_switchdelay_drop 0 +set g_balance_tuba_switchdelay_raise 0 // }}} // {{{ fireball // this is a superweapon -- lets make it behave as one. set g_balance_fireball_primary_animtime 0.2 @@ -675,4 +704,6 @@ set g_balance_fireball_secondary_speed 900 set g_balance_fireball_secondary_speed_up 100 set g_balance_fireball_secondary_speed_z 0 set g_balance_fireball_secondary_spread 0 +set g_balance_fireball_switchdelay_drop 0 +set g_balance_fireball_switchdelay_raise 0 // }}} diff --git a/balanceXPM.cfg b/balanceXPM.cfg index 80c58c0f6..8bd086937 100644 --- a/balanceXPM.cfg +++ b/balanceXPM.cfg @@ -145,7 +145,6 @@ set g_balance_fuel_limit 999 // {{{ misc set g_balance_selfdamagepercent 0.65 -set g_balance_weaponswitchdelay 0.2 set g_weaponspeedfactor 1 "weapon projectile speed multiplier" set g_weaponratefactor 1 "weapon fire rate multiplier" set g_weapondamagefactor 1 "weapon damage multiplier" diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index ea82c365f..930c9dc1f 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -145,7 +145,6 @@ set g_balance_fuel_limit 999 // {{{ misc set g_balance_selfdamagepercent 0.65 -set g_balance_weaponswitchdelay 0.2 set g_weaponspeedfactor 1 "weapon projectile speed multiplier" set g_weaponratefactor 1 "weapon fire rate multiplier" set g_weapondamagefactor 1 "weapon damage multiplier"