From: Mario Date: Sat, 11 Mar 2017 01:00:18 +0000 (+1000) Subject: Sync overkill balance with default balance updates X-Git-Tag: xonotic-v0.8.2~88 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ec19468c30124226a6716522ca55543f1900f1a4;p=xonotic%2Fxonotic-data.pk3dir.git Sync overkill balance with default balance updates --- diff --git a/bal-wep-overkill.cfg b/bal-wep-overkill.cfg index 82609a76c..c90efc348 100644 --- a/bal-wep-overkill.cfg +++ b/bal-wep-overkill.cfg @@ -1,8 +1,8 @@ // {{{ #1: Blaster set g_balance_blaster_primary_animtime 0.2 -set g_balance_blaster_primary_damage 25 +set g_balance_blaster_primary_damage 20 set g_balance_blaster_primary_delay 0 -set g_balance_blaster_primary_edgedamage 12.5 +set g_balance_blaster_primary_edgedamage 10 set g_balance_blaster_primary_force 300 set g_balance_blaster_primary_force_zscale 1.25 set g_balance_blaster_primary_lifetime 5 @@ -43,8 +43,6 @@ set g_balance_shotgun_primary_spread 0.07 set g_balance_shotgun_reload_ammo 50 set g_balance_shotgun_reload_time 2 set g_balance_shotgun_secondary 1 -set g_balance_shotgun_secondary_alt_animtime 0.2 -set g_balance_shotgun_secondary_alt_refire 1.2 set g_balance_shotgun_secondary_animtime 1.15 set g_balance_shotgun_secondary_damage 70 set g_balance_shotgun_secondary_force 200 @@ -58,6 +56,8 @@ set g_balance_shotgun_secondary_melee_swing_up 30 set g_balance_shotgun_secondary_melee_time 0.15 set g_balance_shotgun_secondary_melee_traces 10 set g_balance_shotgun_secondary_refire 1.25 +set g_balance_shotgun_secondary_alt_animtime 0.2 +set g_balance_shotgun_secondary_alt_refire 1.2 set g_balance_shotgun_switchdelay_drop 0.2 set g_balance_shotgun_switchdelay_raise 0.2 set g_balance_shotgun_weaponreplace "" @@ -193,7 +193,7 @@ set g_balance_electro_primary_force 200 set g_balance_electro_primary_lifetime 5 set g_balance_electro_primary_midaircombo_explode 1 set g_balance_electro_primary_midaircombo_interval 0.1 -set g_balance_electro_primary_midaircombo_radius 150 +set g_balance_electro_primary_midaircombo_radius 0 set g_balance_electro_primary_radius 100 set g_balance_electro_primary_refire 0.6 set g_balance_electro_primary_speed 2500 @@ -218,9 +218,9 @@ set g_balance_electro_secondary_refire2 1.6 set g_balance_electro_secondary_speed 1000 set g_balance_electro_secondary_speed_up 200 set g_balance_electro_secondary_speed_z 0 -set g_balance_electro_secondary_spread 0.04 +set g_balance_electro_secondary_spread 0 set g_balance_electro_secondary_stick 0 -set g_balance_electro_secondary_touchexplode 0 +set g_balance_electro_secondary_touchexplode 1 set g_balance_electro_switchdelay_drop 0.2 set g_balance_electro_switchdelay_raise 0.2 set g_balance_electro_weaponreplace "" @@ -233,8 +233,8 @@ set g_balance_crylink_primary_ammo 3 set g_balance_crylink_primary_animtime 0.3 set g_balance_crylink_primary_bouncedamagefactor 0.5 set g_balance_crylink_primary_bounces 1 -set g_balance_crylink_primary_damage 12 -set g_balance_crylink_primary_edgedamage 6 +set g_balance_crylink_primary_damage 10 +set g_balance_crylink_primary_edgedamage 5 set g_balance_crylink_primary_force -50 set g_balance_crylink_primary_joindelay 0.1 set g_balance_crylink_primary_joinexplode 1 @@ -243,7 +243,7 @@ set g_balance_crylink_primary_joinexplode_edgedamage 0 set g_balance_crylink_primary_joinexplode_force 0 set g_balance_crylink_primary_joinexplode_radius 0 set g_balance_crylink_primary_joinspread 0.2 -set g_balance_crylink_primary_linkexplode 1 +set g_balance_crylink_primary_linkexplode 0 set g_balance_crylink_primary_middle_fadetime 5 set g_balance_crylink_primary_middle_lifetime 5 set g_balance_crylink_primary_other_fadetime 5 @@ -260,9 +260,9 @@ set g_balance_crylink_secondary_ammo 2 set g_balance_crylink_secondary_animtime 0.2 set g_balance_crylink_secondary_bouncedamagefactor 0.5 set g_balance_crylink_secondary_bounces 0 -set g_balance_crylink_secondary_damage 10 -set g_balance_crylink_secondary_edgedamage 5 -set g_balance_crylink_secondary_force -250 +set g_balance_crylink_secondary_damage 8 +set g_balance_crylink_secondary_edgedamage 4 +set g_balance_crylink_secondary_force -200 set g_balance_crylink_secondary_joindelay 0 set g_balance_crylink_secondary_joinexplode 0 set g_balance_crylink_secondary_joinexplode_damage 0 @@ -343,7 +343,7 @@ set g_balance_hagar_primary_lifetime 5 set g_balance_hagar_primary_radius 65 set g_balance_hagar_primary_refire 0.16667 set g_balance_hagar_primary_speed 2200 -set g_balance_hagar_primary_spread 0.03 +set g_balance_hagar_primary_spread 0 set g_balance_hagar_reload_ammo 0 set g_balance_hagar_reload_time 2 set g_balance_hagar_secondary 1 @@ -368,7 +368,7 @@ set g_balance_hagar_secondary_load_spread_bias 0.5 set g_balance_hagar_secondary_radius 80 set g_balance_hagar_secondary_refire 0.5 set g_balance_hagar_secondary_speed 2000 -set g_balance_hagar_secondary_spread 0.05 +set g_balance_hagar_secondary_spread 0 set g_balance_hagar_switchdelay_drop 0.2 set g_balance_hagar_switchdelay_raise 0.2 set g_balance_hagar_weaponreplace "" @@ -399,9 +399,9 @@ set g_balance_devastator_remote_damage 70 set g_balance_devastator_remote_edgedamage 35 set g_balance_devastator_remote_force 300 set g_balance_devastator_remote_jump_damage 70 -set g_balance_devastator_remote_jump_force 0 +set g_balance_devastator_remote_jump_force 450 set g_balance_devastator_remote_jump_radius 0 -set g_balance_devastator_remote_jump_velocity_z_add 400 +set g_balance_devastator_remote_jump_velocity_z_add 0 set g_balance_devastator_remote_jump_velocity_z_max 1500 set g_balance_devastator_remote_jump_velocity_z_min 400 set g_balance_devastator_remote_radius 110 @@ -435,6 +435,7 @@ set g_balance_porto_weaponthrowable 1 // {{{ #12: Vaporizer set g_balance_vaporizer_primary_ammo 10 set g_balance_vaporizer_primary_animtime 0.3 +set g_balance_vaporizer_primary_damage 150 set g_balance_vaporizer_primary_refire 1 set g_balance_vaporizer_reload_ammo 0 set g_balance_vaporizer_reload_time 0 @@ -443,7 +444,7 @@ set g_balance_vaporizer_secondary_animtime 0.2 set g_balance_vaporizer_secondary_damage 25 set g_balance_vaporizer_secondary_delay 0 set g_balance_vaporizer_secondary_edgedamage 12.5 -set g_balance_vaporizer_secondary_force 300 +set g_balance_vaporizer_secondary_force 400 set g_balance_vaporizer_secondary_lifetime 5 set g_balance_vaporizer_secondary_radius 70 set g_balance_vaporizer_secondary_refire 0.7 @@ -455,7 +456,7 @@ set g_balance_vaporizer_switchdelay_raise 0.2 set g_balance_vaporizer_weaponreplace "" set g_balance_vaporizer_weaponstart 0 set g_balance_vaporizer_weaponstartoverride -1 -set g_balance_vaporizer_weaponthrowable 0 +set g_balance_vaporizer_weaponthrowable 1 // }}} // {{{ #13: Grappling Hook set g_balance_hook_primary_ammo 5 @@ -676,23 +677,23 @@ set g_balance_seeker_weaponthrowable 1 // }}} // {{{ #19: Shockwave (MUTATOR WEAPON) set g_balance_shockwave_blast_animtime 0.3 -set g_balance_shockwave_blast_damage 20 +set g_balance_shockwave_blast_damage 40 set g_balance_shockwave_blast_distance 1000 set g_balance_shockwave_blast_edgedamage 0 -set g_balance_shockwave_blast_force 200 +set g_balance_shockwave_blast_force 15 set g_balance_shockwave_blast_force_forwardbias 50 -set g_balance_shockwave_blast_force_zscale 2 +set g_balance_shockwave_blast_force_zscale 1 set g_balance_shockwave_blast_jump_damage 20 set g_balance_shockwave_blast_jump_edgedamage 0 -set g_balance_shockwave_blast_jump_force 300 -set g_balance_shockwave_blast_jump_force_velocitybias 0 -set g_balance_shockwave_blast_jump_force_zscale 1.25 +set g_balance_shockwave_blast_jump_force 100 +set g_balance_shockwave_blast_jump_force_velocitybias 1 +set g_balance_shockwave_blast_jump_force_zscale 1 set g_balance_shockwave_blast_jump_multiplier_accuracy 0.5 set g_balance_shockwave_blast_jump_multiplier_distance 0.5 set g_balance_shockwave_blast_jump_multiplier_min 0 set g_balance_shockwave_blast_jump_radius 150 -set g_balance_shockwave_blast_multiplier_accuracy 0.5 -set g_balance_shockwave_blast_multiplier_distance 0.5 +set g_balance_shockwave_blast_multiplier_accuracy 0.45 +set g_balance_shockwave_blast_multiplier_distance 0.2 set g_balance_shockwave_blast_multiplier_min 0 set g_balance_shockwave_blast_refire 0.75 set g_balance_shockwave_blast_splash_damage 15 @@ -726,26 +727,31 @@ set g_balance_shockwave_weaponstartoverride -1 set g_balance_shockwave_weaponthrowable 0 // }}} // {{{ #20: Arc -set g_balance_arc_beam_ammo 4 -set g_balance_arc_beam_animtime 0.2 +set g_balance_arc_beam_ammo 6 +set g_balance_arc_beam_animtime 0.1 set g_balance_arc_beam_botaimlifetime 0 set g_balance_arc_beam_botaimspeed 0 -set g_balance_arc_beam_damage 115 +set g_balance_arc_beam_damage 100 set g_balance_arc_beam_degreespersegment 1 set g_balance_arc_beam_distancepersegment 0 set g_balance_arc_beam_falloff_halflifedist 0 set g_balance_arc_beam_falloff_maxdist 0 set g_balance_arc_beam_falloff_mindist 0 -set g_balance_arc_beam_force 900 -set g_balance_arc_beam_healing_amax 100 +set g_balance_arc_beam_force 600 +set g_balance_arc_beam_healing_amax 0 set g_balance_arc_beam_healing_aps 50 set g_balance_arc_beam_healing_hmax 150 set g_balance_arc_beam_healing_hps 50 -set g_balance_arc_beam_heat 1 +set g_balance_arc_cooldown 2.5 +set g_balance_arc_cooldown_release 0 +set g_balance_arc_overheat_max 5 +set g_balance_arc_overheat_min 3 +set g_balance_arc_beam_heat 0 +set g_balance_arc_burst_heat 5 set g_balance_arc_beam_maxangle 10 set g_balance_arc_beam_nonplayerdamage 80 set g_balance_arc_beam_range 1000 -set g_balance_arc_beam_refire 0.5 +set g_balance_arc_beam_refire 0.25 set g_balance_arc_beam_returnspeed 8 set g_balance_arc_beam_tightness 0.5 set g_balance_arc_bolt 0 @@ -753,24 +759,19 @@ set g_balance_arc_bolt_ammo 1 set g_balance_arc_bolt_damage 25 set g_balance_arc_bolt_damageforcescale 0 set g_balance_arc_bolt_edgedamage 12.5 -set g_balance_arc_bolt_force 100 +set g_balance_arc_bolt_force 120 set g_balance_arc_bolt_health 15 set g_balance_arc_bolt_lifetime 5 set g_balance_arc_bolt_radius 65 set g_balance_arc_bolt_refire 0.16667 -set g_balance_arc_bolt_speed 2200 -set g_balance_arc_bolt_spread 0.03 +set g_balance_arc_bolt_speed 2300 +set g_balance_arc_bolt_spread 0 set g_balance_arc_burst_ammo 15 set g_balance_arc_burst_damage 250 set g_balance_arc_burst_healing_aps 100 set g_balance_arc_burst_healing_hps 100 -set g_balance_arc_burst_heat 4 -set g_balance_arc_cooldown 2.5 -set g_balance_arc_cooldown_release 1 -set g_balance_arc_overheat_max 5 -set g_balance_arc_overheat_min 3 -set g_balance_arc_switchdelay_drop 0.3 -set g_balance_arc_switchdelay_raise 0.3 +set g_balance_arc_switchdelay_drop 0.2 +set g_balance_arc_switchdelay_raise 0.2 set g_balance_arc_weaponreplace "" set g_balance_arc_weaponstart 0 set g_balance_arc_weaponstartoverride -1 diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 4c5889fba..2e7ae5fa7 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -351,6 +351,7 @@ void cvar_changes_init() BADCVAR("sv_precacheplayermodels"); BADCVAR("sv_stepheight"); BADCVAR("sv_timeout"); + BADCVAR("sv_weapons_modeloverride"); BADPREFIX("crypto_"); BADPREFIX("gameversion_"); BADPREFIX("g_chat_");