X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=bal-wep-xonotic.cfg;h=0632af8da595799902684af57fbcb8738cbe1554;hb=96f4632cf97f1ca9cb56beefefbf6a613e4a7d9c;hp=2e3867936b9b1d0a4871fe04ab27f6e49bd1e959;hpb=834112a3052c7d7d33cd85d1112007c7f99d27c8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 2e3867936..0632af8da 100644
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -10,8 +10,6 @@ set g_balance_blaster_primary_refire 0.7
 set g_balance_blaster_primary_shotangle 0
 set g_balance_blaster_primary_speed 6000
 set g_balance_blaster_primary_spread 0
-set g_balance_blaster_reload_ammo 0
-set g_balance_blaster_reload_time 0
 set g_balance_blaster_secondary 0
 set g_balance_blaster_secondary_animtime 0.2
 set g_balance_blaster_secondary_damage 25
@@ -31,6 +29,7 @@ set g_balance_blaster_weaponstart 1
 set g_balance_blaster_weaponstartoverride -1
 // }}}
 // {{{ #2: Shockwave
+set g_balance_shockwave_blast_animtime 0.3
 set g_balance_shockwave_blast_damage 20
 set g_balance_shockwave_blast_distance 2000
 set g_balance_shockwave_blast_edgedamage 0
@@ -49,6 +48,7 @@ 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_min 0
+set g_balance_shockwave_blast_refire 0.75
 set g_balance_shockwave_blast_splash_damage 15
 set g_balance_shockwave_blast_splash_edgedamage 0
 set g_balance_shockwave_blast_splash_force 100
@@ -72,19 +72,6 @@ set g_balance_shockwave_melee_swing_side 120
 set g_balance_shockwave_melee_swing_up 30
 set g_balance_shockwave_melee_time 0.15
 set g_balance_shockwave_melee_traces 10
-set g_balance_shockwave_pellets_ammo 1
-set g_balance_shockwave_pellets_animtime 0.3
-set g_balance_shockwave_pellets_bulletconstant 75
-set g_balance_shockwave_pellets_bullets 14
-set g_balance_shockwave_pellets_damage 4
-set g_balance_shockwave_pellets_force 15
-set g_balance_shockwave_pellets_refire 0.75
-set g_balance_shockwave_pellets_speed 8000
-set g_balance_shockwave_pellets_spread 0.12
-set g_balance_shockwave_primary 1
-set g_balance_shockwave_reload_ammo 0
-set g_balance_shockwave_reload_time 0
-set g_balance_shockwave_secondary 1
 set g_balance_shockwave_switchdelay_drop 0.2
 set g_balance_shockwave_switchdelay_raise 0.2
 set g_balance_shockwave_weaponreplace ""
@@ -92,36 +79,35 @@ set g_balance_shockwave_weaponstart 1
 set g_balance_shockwave_weaponstartoverride -1
 // }}}
 // {{{ #3: Machine Gun
-set g_balance_uzi_bulletconstant 115
-set g_balance_uzi_burst 3
-set g_balance_uzi_burst_ammo 3
-set g_balance_uzi_burst_animtime 0.3
-set g_balance_uzi_burst_refire 0.06
-set g_balance_uzi_burst_refire2 0.45
-set g_balance_uzi_burst_speed 0
-set g_balance_uzi_first 1
-set g_balance_uzi_first_ammo 1
-set g_balance_uzi_first_damage 14
-set g_balance_uzi_first_force 5
-set g_balance_uzi_first_refire 0.125
-set g_balance_uzi_first_spread 0.03
-set g_balance_uzi_mode 1
-set g_balance_uzi_reload_ammo 60
-set g_balance_uzi_reload_time 2
-set g_balance_uzi_speed 18000
-set g_balance_uzi_spread_add 0.012
-set g_balance_uzi_spread_max 0.05
-set g_balance_uzi_spread_min 0.02
-set g_balance_uzi_sustained_ammo 1
-set g_balance_uzi_sustained_damage 10
-set g_balance_uzi_sustained_force 5
-set g_balance_uzi_sustained_refire 0.1
-set g_balance_uzi_sustained_spread 0.03
-set g_balance_uzi_switchdelay_drop 0.2
-set g_balance_uzi_switchdelay_raise 0.2
-set g_balance_uzi_weaponreplace ""
-set g_balance_uzi_weaponstart 0
-set g_balance_uzi_weaponstartoverride -1
+set g_balance_machinegun_burst 3
+set g_balance_machinegun_burst_ammo 3
+set g_balance_machinegun_burst_animtime 0.3
+set g_balance_machinegun_burst_refire 0.06
+set g_balance_machinegun_burst_refire2 0.45
+set g_balance_machinegun_burst_speed 0
+set g_balance_machinegun_first 1
+set g_balance_machinegun_first_ammo 1
+set g_balance_machinegun_first_damage 14
+set g_balance_machinegun_first_force 5
+set g_balance_machinegun_first_refire 0.125
+set g_balance_machinegun_first_spread 0.03
+set g_balance_machinegun_mode 1
+set g_balance_machinegun_reload_ammo 60
+set g_balance_machinegun_reload_time 2
+set g_balance_machinegun_solidpenetration 13.1
+set g_balance_machinegun_spread_add 0.012
+set g_balance_machinegun_spread_max 0.05
+set g_balance_machinegun_spread_min 0.02
+set g_balance_machinegun_sustained_ammo 1
+set g_balance_machinegun_sustained_damage 10
+set g_balance_machinegun_sustained_force 5
+set g_balance_machinegun_sustained_refire 0.1
+set g_balance_machinegun_sustained_spread 0.03
+set g_balance_machinegun_switchdelay_drop 0.2
+set g_balance_machinegun_switchdelay_raise 0.2
+set g_balance_machinegun_weaponreplace "arc"
+set g_balance_machinegun_weaponstart 0
+set g_balance_machinegun_weaponstartoverride -1
 // }}}
 // {{{ #4: Mortar
 set g_balance_mortar_bouncefactor 0.5
@@ -260,8 +246,6 @@ set g_balance_arc_primary_falloff_mindist 0
 set g_balance_arc_primary_force 0
 set g_balance_arc_primary_range 0
 set g_balance_arc_primary_refire 0
-set g_balance_arc_reload_ammo 0
-set g_balance_arc_reload_time 0
 set g_balance_arc_secondary_ammo 0
 set g_balance_arc_switchdelay_drop 0
 set g_balance_arc_switchdelay_raise 0
@@ -329,47 +313,47 @@ set g_balance_crylink_weaponstart 0
 set g_balance_crylink_weaponstartoverride -1
 // }}}
 // {{{ #9: Vortex
-set g_balance_nex_charge 1
-set g_balance_nex_charge_animlimit 0.5
-set g_balance_nex_charge_limit 1
-set g_balance_nex_charge_maxspeed 800
-set g_balance_nex_charge_mindmg 40
-set g_balance_nex_charge_minspeed 400
-set g_balance_nex_charge_rate 0.4
-set g_balance_nex_charge_rot_pause 0
-set g_balance_nex_charge_rot_rate 0
-set g_balance_nex_charge_shot_multiplier 0
-set g_balance_nex_charge_start 0.5
-set g_balance_nex_charge_velocity_rate 0
-set g_balance_nex_primary_ammo 6
-set g_balance_nex_primary_animtime 0.6
-set g_balance_nex_primary_damage 80
-set g_balance_nex_primary_damagefalloff_forcehalflife 0
-set g_balance_nex_primary_damagefalloff_halflife 0
-set g_balance_nex_primary_damagefalloff_maxdist 0
-set g_balance_nex_primary_damagefalloff_mindist 0
-set g_balance_nex_primary_force 400
-set g_balance_nex_primary_refire 1.5
-set g_balance_nex_reload_ammo 0
-set g_balance_nex_reload_time 2
-set g_balance_nex_secondary 0
-set g_balance_nex_secondary_ammo 2
-set g_balance_nex_secondary_animtime 0
-set g_balance_nex_secondary_chargepool 0
-set g_balance_nex_secondary_chargepool_pause_regen 1
-set g_balance_nex_secondary_chargepool_regen 0.15
-set g_balance_nex_secondary_damage 0
-set g_balance_nex_secondary_damagefalloff_forcehalflife 0
-set g_balance_nex_secondary_damagefalloff_halflife 0
-set g_balance_nex_secondary_damagefalloff_maxdist 0
-set g_balance_nex_secondary_damagefalloff_mindist 0
-set g_balance_nex_secondary_force 0
-set g_balance_nex_secondary_refire 0
-set g_balance_nex_switchdelay_drop 0.3
-set g_balance_nex_switchdelay_raise 0.25
-set g_balance_nex_weaponreplace ""
-set g_balance_nex_weaponstart 0
-set g_balance_nex_weaponstartoverride -1
+set g_balance_vortex_charge 1
+set g_balance_vortex_charge_animlimit 0.5
+set g_balance_vortex_charge_limit 1
+set g_balance_vortex_charge_maxspeed 800
+set g_balance_vortex_charge_mindmg 40
+set g_balance_vortex_charge_minspeed 400
+set g_balance_vortex_charge_rate 0.4
+set g_balance_vortex_charge_rot_pause 0
+set g_balance_vortex_charge_rot_rate 0
+set g_balance_vortex_charge_shot_multiplier 0
+set g_balance_vortex_charge_start 0.5
+set g_balance_vortex_charge_velocity_rate 0
+set g_balance_vortex_primary_ammo 6
+set g_balance_vortex_primary_animtime 0.6
+set g_balance_vortex_primary_damage 80
+set g_balance_vortex_primary_damagefalloff_forcehalflife 0
+set g_balance_vortex_primary_damagefalloff_halflife 0
+set g_balance_vortex_primary_damagefalloff_maxdist 0
+set g_balance_vortex_primary_damagefalloff_mindist 0
+set g_balance_vortex_primary_force 400
+set g_balance_vortex_primary_refire 1.5
+set g_balance_vortex_reload_ammo 0
+set g_balance_vortex_reload_time 2
+set g_balance_vortex_secondary 0
+set g_balance_vortex_secondary_ammo 2
+set g_balance_vortex_secondary_animtime 0
+set g_balance_vortex_secondary_chargepool 0
+set g_balance_vortex_secondary_chargepool_pause_regen 1
+set g_balance_vortex_secondary_chargepool_regen 0.15
+set g_balance_vortex_secondary_damage 0
+set g_balance_vortex_secondary_damagefalloff_forcehalflife 0
+set g_balance_vortex_secondary_damagefalloff_halflife 0
+set g_balance_vortex_secondary_damagefalloff_maxdist 0
+set g_balance_vortex_secondary_damagefalloff_mindist 0
+set g_balance_vortex_secondary_force 0
+set g_balance_vortex_secondary_refire 0
+set g_balance_vortex_switchdelay_drop 0.3
+set g_balance_vortex_switchdelay_raise 0.25
+set g_balance_vortex_weaponreplace ""
+set g_balance_vortex_weaponstart 0
+set g_balance_vortex_weaponstartoverride -1
 // }}}
 // {{{ #10: Hagar
 set g_balance_hagar_primary_ammo 1
@@ -451,8 +435,6 @@ set g_balance_porto_primary_animtime 0.3
 set g_balance_porto_primary_lifetime 5
 set g_balance_porto_primary_refire 1.5
 set g_balance_porto_primary_speed 1000
-set g_balance_porto_reload_ammo 0
-set g_balance_porto_reload_time 0
 set g_balance_porto_secondary 1
 set g_balance_porto_secondary_animtime 0.3
 set g_balance_porto_secondary_lifetime 5
@@ -465,28 +447,28 @@ set g_balance_porto_weaponstart 0
 set g_balance_porto_weaponstartoverride -1
 // }}}
 // {{{ #13: Vaporizer
-set g_balance_minstanex_primary_ammo 10
-set g_balance_minstanex_primary_animtime 0.3
-set g_balance_minstanex_primary_refire 1
-set g_balance_minstanex_reload_ammo 0
-set g_balance_minstanex_reload_time 0
-set g_balance_minstanex_secondary_ammo 0
-set g_balance_minstanex_secondary_animtime 0.3
-set g_balance_minstanex_secondary_damage 0
-set g_balance_minstanex_secondary_delay 0
-set g_balance_minstanex_secondary_edgedamage 0
-set g_balance_minstanex_secondary_force 300
-set g_balance_minstanex_secondary_lifetime 5
-set g_balance_minstanex_secondary_radius 70
-set g_balance_minstanex_secondary_refire 0.7
-set g_balance_minstanex_secondary_shotangle 0
-set g_balance_minstanex_secondary_speed 6000
-set g_balance_minstanex_secondary_spread 0
-set g_balance_minstanex_switchdelay_drop 0.2
-set g_balance_minstanex_switchdelay_raise 0.2
-set g_balance_minstanex_weaponreplace ""
-set g_balance_minstanex_weaponstart 0
-set g_balance_minstanex_weaponstartoverride -1
+set g_balance_vaporizer_primary_ammo 10
+set g_balance_vaporizer_primary_animtime 0.3
+set g_balance_vaporizer_primary_refire 1
+set g_balance_vaporizer_reload_ammo 0
+set g_balance_vaporizer_reload_time 0
+set g_balance_vaporizer_secondary_ammo 0
+set g_balance_vaporizer_secondary_animtime 0.3
+set g_balance_vaporizer_secondary_damage 0
+set g_balance_vaporizer_secondary_delay 0
+set g_balance_vaporizer_secondary_edgedamage 0
+set g_balance_vaporizer_secondary_force 300
+set g_balance_vaporizer_secondary_lifetime 5
+set g_balance_vaporizer_secondary_radius 70
+set g_balance_vaporizer_secondary_refire 0.7
+set g_balance_vaporizer_secondary_shotangle 0
+set g_balance_vaporizer_secondary_speed 6000
+set g_balance_vaporizer_secondary_spread 0
+set g_balance_vaporizer_switchdelay_drop 0.2
+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
 // }}}
 // {{{ #14: Grappling Hook
 set g_balance_hook_primary_ammo 5
@@ -495,9 +477,6 @@ set g_balance_hook_primary_hooked_ammo 5
 set g_balance_hook_primary_hooked_time_free 2
 set g_balance_hook_primary_hooked_time_max 0
 set g_balance_hook_primary_refire 0
-set g_balance_hook_reload_ammo 0
-set g_balance_hook_reload_time 0
-set g_balance_hook_secondary_ammo 30
 set g_balance_hook_secondary_animtime 0.3
 set g_balance_hook_secondary_damage 25
 set g_balance_hook_secondary_damageforcescale 0
@@ -560,8 +539,6 @@ set g_balance_tuba_edgedamage 0
 set g_balance_tuba_force 40
 set g_balance_tuba_radius 200
 set g_balance_tuba_refire 0.05
-set g_balance_tuba_reload_ammo 0
-set g_balance_tuba_reload_time 0
 set g_balance_tuba_switchdelay_drop 0.2
 set g_balance_tuba_switchdelay_raise 0.2
 set g_balance_tuba_weaponreplace ""
@@ -572,15 +549,13 @@ set g_balance_tuba_weaponstartoverride -1
 set g_balance_rifle_bursttime 0
 set g_balance_rifle_primary_ammo 10
 set g_balance_rifle_primary_animtime 0.4
-set g_balance_rifle_primary_bulletconstant 110
 set g_balance_rifle_primary_bullethail 0
 set g_balance_rifle_primary_burstcost 0
 set g_balance_rifle_primary_damage 80
 set g_balance_rifle_primary_force 100
-set g_balance_rifle_primary_lifetime 5
 set g_balance_rifle_primary_refire 1.2
 set g_balance_rifle_primary_shots 1
-set g_balance_rifle_primary_speed 40000
+set g_balance_rifle_primary_solidpenetration 62.2
 set g_balance_rifle_primary_spread 0
 set g_balance_rifle_primary_tracer 1
 set g_balance_rifle_reload_ammo 80
@@ -588,16 +563,14 @@ set g_balance_rifle_reload_time 2
 set g_balance_rifle_secondary 1
 set g_balance_rifle_secondary_ammo 10
 set g_balance_rifle_secondary_animtime 0.3
-set g_balance_rifle_secondary_bulletconstant 110
 set g_balance_rifle_secondary_bullethail 0
 set g_balance_rifle_secondary_burstcost 0
 set g_balance_rifle_secondary_damage 20
 set g_balance_rifle_secondary_force 50
-set g_balance_rifle_secondary_lifetime 5
 set g_balance_rifle_secondary_refire 0.9
 set g_balance_rifle_secondary_reload 0
 set g_balance_rifle_secondary_shots 4
-set g_balance_rifle_secondary_speed 20000
+set g_balance_rifle_secondary_solidpenetration 15.5
 set g_balance_rifle_secondary_spread 0.04
 set g_balance_rifle_secondary_tracer 0
 set g_balance_rifle_switchdelay_drop 0.2
@@ -626,8 +599,6 @@ set g_balance_fireball_primary_refire 2
 set g_balance_fireball_primary_refire2 0
 set g_balance_fireball_primary_speed 1200
 set g_balance_fireball_primary_spread 0
-set g_balance_fireball_reload_ammo 0
-set g_balance_fireball_reload_time 0
 set g_balance_fireball_secondary_animtime 0.3
 set g_balance_fireball_secondary_damage 40
 set g_balance_fireball_secondary_damageforcescale 4
@@ -707,3 +678,34 @@ set g_balance_seeker_weaponreplace ""
 set g_balance_seeker_weaponstart 0
 set g_balance_seeker_weaponstartoverride -1
 // }}}
+// {{{ #20: Shotgun (MUTATOR WEAPON)
+set g_balance_shotgun_primary_ammo 1
+set g_balance_shotgun_primary_animtime 0.2
+set g_balance_shotgun_primary_bullets 14
+set g_balance_shotgun_primary_damage 4
+set g_balance_shotgun_primary_force 15
+set g_balance_shotgun_primary_refire 0.75
+set g_balance_shotgun_primary_solidpenetration 3.8
+set g_balance_shotgun_primary_spread 0.12
+set g_balance_shotgun_reload_ammo 0
+set g_balance_shotgun_reload_time 2
+set g_balance_shotgun_secondary 1
+set g_balance_shotgun_secondary_animtime 1
+set g_balance_shotgun_secondary_damage 80
+set g_balance_shotgun_secondary_force 200
+set g_balance_shotgun_secondary_melee_delay 0.25
+set g_balance_shotgun_secondary_melee_multihit 1
+set g_balance_shotgun_secondary_melee_no_doubleslap 1
+set g_balance_shotgun_secondary_melee_nonplayerdamage 40
+set g_balance_shotgun_secondary_melee_range 120
+set g_balance_shotgun_secondary_melee_swing_side 120
+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_switchdelay_drop 0.2
+set g_balance_shotgun_switchdelay_raise 0.2
+set g_balance_shotgun_weaponreplace ""
+set g_balance_shotgun_weaponstart 0
+set g_balance_shotgun_weaponstartoverride -1
+// }}}