X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=balanceXDF.cfg;h=41d1936193c6ce42177ccdf2bbc3f29d97bdbe67;hb=c41dd2c107ec16d58aa536f18c964c40e5f86ce2;hp=17b5e88d3d9ea8e4c718c39242387ab112be9fb2;hpb=8675941fb13c2d91b62332c58d9e9d8da6b47524;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/balanceXDF.cfg b/balanceXDF.cfg
index 17b5e88d3..41d193619 100644
--- a/balanceXDF.cfg
+++ b/balanceXDF.cfg
@@ -158,7 +158,7 @@ set g_projectiles_damage 2
 // possible values:
 // -2: absolutely no damage to projectiles (no exceptions)
 // -1: no damage other than the exceptions (electro combo, hagar join explode, ML mines)
-// 0: only damage from contents (lava/slime) or exceptions 
+// 0: only damage from contents (lava/slime) or exceptions
 // 1: only self damage or damage from contents or exceptions
 // 2: allow all damage to projectiles normally
 set g_projectiles_keep_owner 0
@@ -223,25 +223,11 @@ set g_balance_grapplehook_stretch 50
 set g_balance_grapplehook_airfriction 0.2
 set g_balance_grapplehook_health 130
 set g_balance_grapplehook_damagedbycontents 0
+set g_balance_grapplehook_refire 0.2
 // }}}
 
 // {{{ weapon properties
 // {{{ laser
-set g_balance_laser_melee_animtime 0.3
-set g_balance_laser_melee_damage 80
-set g_balance_laser_melee_delay 0.25
-set g_balance_laser_melee_force 200
-set g_balance_laser_melee_multihit 1
-set g_balance_laser_melee_no_doubleslap 1
-set g_balance_laser_melee_nonplayerdamage 40
-set g_balance_laser_melee_range 120
-set g_balance_laser_melee_refire 1.25
-set g_balance_laser_melee_swing_side 120
-set g_balance_laser_melee_swing_up 30
-set g_balance_laser_melee_time 0.15
-set g_balance_laser_melee_traces 10
-
-set g_balance_laser_primary 1 // 0 = shockwave attack, 1 = projectile primary
 set g_balance_laser_primary_damage 25
 set g_balance_laser_primary_edgedamage 12.5
 set g_balance_laser_primary_force 250
@@ -253,11 +239,11 @@ set g_balance_laser_primary_animtime 0.3
 set g_balance_laser_primary_lifetime 5
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0
+set g_balance_laser_primary_gauntlet 0
 set g_balance_laser_primary_force_zscale 1.5
 set g_balance_laser_primary_force_velocitybias 0
 set g_balance_laser_primary_force_other_scale 1
-
-set g_balance_laser_secondary 0 // 0 = switch away to last used weapon, 1 = projectile secondary, 2 = melee secondary
+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_edgedamage 12.5
 set g_balance_laser_secondary_force 400
@@ -265,43 +251,14 @@ set g_balance_laser_secondary_radius 70
 set g_balance_laser_secondary_speed 12000
 set g_balance_laser_secondary_spread 0
 set g_balance_laser_secondary_refire 0.7
-set g_balance_laser_secondary_animtime 0.2
+set g_balance_laser_secondary_animtime 0.3
 set g_balance_laser_secondary_lifetime 5
 set g_balance_laser_secondary_shotangle -90
 set g_balance_laser_secondary_delay 0
+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_shockwave_damage 20
-set g_balance_laser_shockwave_distance 2000
-set g_balance_laser_shockwave_edgedamage 0
-set g_balance_laser_shockwave_force 200
-set g_balance_laser_shockwave_force_forwardbias 50
-set g_balance_laser_shockwave_force_zscale 2
-set g_balance_laser_shockwave_jump_damage 20
-set g_balance_laser_shockwave_jump_edgedamage 0
-set g_balance_laser_shockwave_jump_force 300
-set g_balance_laser_shockwave_jump_force_velocitybias 0
-set g_balance_laser_shockwave_jump_force_zscale 1.25
-set g_balance_laser_shockwave_jump_multiplier_accuracy 0.5
-set g_balance_laser_shockwave_jump_multiplier_distance 0.5
-set g_balance_laser_shockwave_jump_multiplier_min 0
-set g_balance_laser_shockwave_jump_radius 150
-set g_balance_laser_shockwave_multiplier_accuracy 0.5
-set g_balance_laser_shockwave_multiplier_distance 0.5
-set g_balance_laser_shockwave_multiplier_min 0
-set g_balance_laser_shockwave_splash_damage 15
-set g_balance_laser_shockwave_splash_edgedamage 0
-set g_balance_laser_shockwave_splash_force 100
-set g_balance_laser_shockwave_splash_force_forwardbias 50
-set g_balance_laser_shockwave_splash_multiplier_accuracy 0.5
-set g_balance_laser_shockwave_splash_multiplier_distance 0.5
-set g_balance_laser_shockwave_splash_multiplier_min 0
-set g_balance_laser_shockwave_splash_radius 70
-set g_balance_laser_shockwave_spread_max 120
-set g_balance_laser_shockwave_spread_min 25
-
 set g_balance_laser_switchdelay_drop 0
 set g_balance_laser_switchdelay_raise 0
 set g_balance_laser_reload_ammo 0 //default: 6
@@ -315,8 +272,7 @@ set g_balance_shotgun_primary_spread 0.12
 set g_balance_shotgun_primary_refire 0.75
 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_bulletconstant 75 // 3.8qu
+set g_balance_shotgun_primary_solidpenetration 3.8
 set g_balance_shotgun_secondary 1
 set g_balance_shotgun_secondary_melee_delay 0.25 // 0.35 was too slow
 set g_balance_shotgun_secondary_melee_range 120
@@ -347,7 +303,7 @@ set g_balance_uzi_burst_animtime 0.3
 set g_balance_uzi_burst_refire 0.06		// refire between burst bullets
 set g_balance_uzi_burst_refire2 0.45	// refire after burst
 set g_balance_uzi_burst_spread 0.03
-set g_balance_uzi_burst_damage 25		
+set g_balance_uzi_burst_damage 25
 set g_balance_uzi_burst_force 20
 set g_balance_uzi_burst_ammo 3
 
@@ -364,8 +320,7 @@ set g_balance_uzi_sustained_spread 0
 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
+set g_balance_uzi_solidpenetration 13.1
 
 set g_balance_uzi_switchdelay_drop 0
 set g_balance_uzi_switchdelay_raise 0
@@ -469,7 +424,7 @@ set g_balance_electro_switchdelay_raise 0
 set g_balance_electro_reload_ammo 0 //default: 20
 set g_balance_electro_reload_time 2
 // }}}
-// {{{ crylink 
+// {{{ crylink
 set g_balance_crylink_primary_damage 12
 set g_balance_crylink_primary_edgedamage 6
 set g_balance_crylink_primary_force -50
@@ -484,7 +439,6 @@ set g_balance_crylink_primary_ammo 3
 set g_balance_crylink_primary_bouncedamagefactor 0.5
 set g_balance_crylink_primary_joindelay 0.1
 set g_balance_crylink_primary_joinspread 0.2
-set g_balance_crylink_primary_jointime 0
 set g_balance_crylink_primary_joinexplode 1
 set g_balance_crylink_primary_joinexplode_damage 0
 set g_balance_crylink_primary_joinexplode_edgedamage 0
@@ -494,7 +448,7 @@ set g_balance_crylink_primary_linkexplode 1
 
 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_other_lifetime 5 
+set g_balance_crylink_primary_other_lifetime 5
 set g_balance_crylink_primary_other_fadetime 5
 
 set g_balance_crylink_secondary 1
@@ -513,9 +467,8 @@ set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joindelay 0
 set g_balance_crylink_secondary_joinspread 0
-set g_balance_crylink_secondary_jointime 0
-set g_balance_crylink_secondary_joinexplode 0			
-set g_balance_crylink_secondary_joinexplode_damage 0	
+set g_balance_crylink_secondary_joinexplode 0
+set g_balance_crylink_secondary_joinexplode_damage 0
 set g_balance_crylink_secondary_joinexplode_edgedamage 0
 set g_balance_crylink_secondary_joinexplode_radius 0
 set g_balance_crylink_secondary_joinexplode_force 0
@@ -523,7 +476,7 @@ set g_balance_crylink_secondary_linkexplode 1
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_secondary_middle_fadetime 5
-set g_balance_crylink_secondary_line_lifetime 5 
+set g_balance_crylink_secondary_line_lifetime 5
 set g_balance_crylink_secondary_line_fadetime 5
 
 set g_balance_crylink_switchdelay_drop 0
@@ -677,7 +630,7 @@ set g_balance_portal_lifetime 15 // these get recharged whenever the portal is u
 // }}}
 // {{{ hook
 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_refire 0.2 // 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
@@ -713,7 +666,7 @@ 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. 
+// {{{ fireball // this is a superweapon -- lets make it behave as one.
 set g_balance_fireball_primary_animtime 0.2
 set g_balance_fireball_primary_bfgdamage 100
 set g_balance_fireball_primary_bfgforce 0