X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=balanceFruitieX.cfg;h=99d458d1d75275c639a7e730b6daf59eb1646df2;hp=52ac863829ab78d6ed47416679ef00fe0fc340e5;hb=e50147b927b712e54fdefaefbd49c135fd706bfe;hpb=8675941fb13c2d91b62332c58d9e9d8da6b47524

diff --git a/balanceFruitieX.cfg b/balanceFruitieX.cfg
index 52ac86382..99d458d1d 100644
--- a/balanceFruitieX.cfg
+++ b/balanceFruitieX.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 20 // dps 33, hope that's not too high
 set g_balance_laser_primary_edgedamage 20
 set g_balance_laser_primary_force 150 // this looks insanely low, but actually isn't with zscale and velocitybias
@@ -253,11 +239,11 @@ set g_balance_laser_primary_animtime 0.4
 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 2 // 300 upforce
 set g_balance_laser_primary_force_velocitybias 0.3
 set g_balance_laser_primary_force_other_scale 2.5 // force 375 when pushing others around
-
-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 200 // dps
 set g_balance_laser_secondary_edgedamage 0
 set g_balance_laser_secondary_force 1300
@@ -269,39 +255,10 @@ set g_balance_laser_secondary_animtime 0.066
 set g_balance_laser_secondary_lifetime 0
 set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
+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_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 1.5
-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 100
-set g_balance_laser_shockwave_spread_min 20
-
 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
@@ -315,8 +272,7 @@ set g_balance_shotgun_primary_spread 0.16 // LOG: changed from 0.18 -> 0.16 to c
 set g_balance_shotgun_primary_refire 1
 set g_balance_shotgun_primary_animtime 0.3
 set g_balance_shotgun_primary_ammo 1
-set g_balance_shotgun_primary_speed 12000
-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
@@ -364,8 +320,7 @@ set g_balance_uzi_sustained_spread 0.06
 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.15
 set g_balance_uzi_switchdelay_raise 0.15
@@ -469,36 +424,6 @@ set g_balance_electro_switchdelay_raise 0.15
 set g_balance_electro_reload_ammo 0 //default: 20
 set g_balance_electro_reload_time 2
 // }}}
-// {{{ lightning
-set g_balance_lightning_primary_ammo 5
-set g_balance_lightning_primary_animtime 0.2
-set g_balance_lightning_primary_damage 100
-set g_balance_lightning_primary_edgedamage 0
-set g_balance_lightning_primary_falloff_mindist 0
-set g_balance_lightning_primary_falloff_maxdist 0
-set g_balance_lightning_primary_falloff_halflifedist 0
-set g_balance_lightning_primary_force 425
-set g_balance_lightning_primary_lifetime 0
-set g_balance_lightning_primary_radius 850
-set g_balance_lightning_primary_range 800
-set g_balance_lightning_primary_refire 0.4
-set g_balance_lightning_primary_speed 0
-set g_balance_lightning_primary_spread 0
-set g_balance_lightning_secondary_ammo 5
-set g_balance_lightning_secondary_animtime 0.5
-set g_balance_lightning_secondary_damage 100
-set g_balance_lightning_secondary_damageforcescale 4
-set g_balance_lightning_secondary_edgedamage 80
-set g_balance_lightning_secondary_flyingdamage 1
-set g_balance_lightning_secondary_flyingforce -80
-set g_balance_lightning_secondary_flyingradius 200
-set g_balance_lightning_secondary_force -200
-set g_balance_lightning_secondary_health 1
-set g_balance_lightning_secondary_lifetime 30
-set g_balance_lightning_secondary_radius 300
-set g_balance_lightning_secondary_refire 5
-set g_balance_lightning_secondary_speed 600
-// }}}
 // {{{ crylink
 set g_balance_crylink_primary_damage 7 // LOG: 10 -> 7
 set g_balance_crylink_primary_edgedamage 4 // LOG: 6 -> 4
@@ -514,7 +439,6 @@ set g_balance_crylink_primary_ammo 2
 set g_balance_crylink_primary_bouncedamagefactor 0.2
 set g_balance_crylink_primary_joindelay 0
 set g_balance_crylink_primary_joinspread 0.2
-set g_balance_crylink_primary_jointime 0.1
 set g_balance_crylink_primary_joinexplode 0
 set g_balance_crylink_primary_joinexplode_damage 0
 set g_balance_crylink_primary_joinexplode_edgedamage 0
@@ -543,9 +467,8 @@ set g_balance_crylink_secondary_ammo 3 // LOG: 2 -> 3
 set g_balance_crylink_secondary_bouncedamagefactor 0.4 // LOG: 0.2 -> 0.4
 set g_balance_crylink_secondary_joindelay 0
 set g_balance_crylink_secondary_joinspread 0.2
-set g_balance_crylink_secondary_jointime 0.1
-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
@@ -707,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.2 // 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