X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=balanceSamual.cfg;h=4b4a91c624cd70aaedffaf1ae7c7fb44784f8e0f;hb=7b4c329;hp=0561151bbf65fee85b62123d566c6bfa7fa7b2d1;hpb=19b6e4fe0563a322e4f2295d4c535933a9834f09;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 0561151bb..4b4a91c62 100644
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -56,14 +56,19 @@ set g_balance_nix_ammoincr_fuel 2
 set g_pickup_ammo_anyway 1
 set g_pickup_weapons_anyway 1
 set g_pickup_shells 30
+set g_pickup_shells_weapon 30
 set g_pickup_shells_max 120
 set g_pickup_nails 80
+set g_pickup_nails_weapon 80
 set g_pickup_nails_max 400
 set g_pickup_rockets 30
+set g_pickup_rockets_weapon 30
 set g_pickup_rockets_max 120
 set g_pickup_cells 50
+set g_pickup_cells_weapon 50
 set g_pickup_cells_max 200
 set g_pickup_fuel 25
+set g_pickup_fuel_weapon 25
 set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 999
 set g_pickup_armorsmall 10
@@ -424,6 +429,8 @@ set g_balance_nex_primary_damagefalloff_halflife 1500
 set g_balance_nex_primary_damagefalloff_forcehalflife 1500
 
 set g_balance_nex_secondary 0
+set g_balance_nex_secondary_charge 0
+set g_balance_nex_secondary_charge_rate 0.1
 set g_balance_nex_secondary_damage 90
 set g_balance_nex_secondary_force 300
 set g_balance_nex_secondary_refire 1.5
@@ -434,10 +441,15 @@ set g_balance_nex_secondary_damagefalloff_maxdist 3000
 set g_balance_nex_secondary_damagefalloff_halflife 1500
 set g_balance_nex_secondary_damagefalloff_forcehalflife 1500
 
-set g_balance_nex_velocitydependent_halflife 0
-set g_balance_nex_velocitydependent_minspeed 400
-set g_balance_nex_velocitydependent_maxspeed 1000
-set g_balance_nex_velocitydependent_falloff_rate 0.001
+set g_balance_nex_charge 0
+set g_balance_nex_charge_mindmg 40
+set g_balance_nex_charge_start 0
+set g_balance_nex_charge_rate 0.1
+set g_balance_nex_charge_limit 0.5
+set g_balance_nex_charge_shot_multiplier 0.5
+set g_balance_nex_charge_velocity_rate 0.2
+set g_balance_nex_charge_minspeed 400
+set g_balance_nex_charge_maxspeed 1000
 // }}}
 // {{{ minstanex
 set g_balance_minstanex_refire 1