X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=balanceXPM.cfg;h=bb0416a3418daac9523bfc87c806ba0c4054d29c;hb=21d34f671bf0ca8d6ac6844dd4316fe5f619176e;hp=4d2fd05f6905a9f69c1606c8cb2c9fcef166b9c7;hpb=537d8808693064ac2d5c17ac72926f85cd2147f7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index 4d2fd05f6..bb0416a34 100644
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -1,28 +1,3 @@
-// {{{ weapon replacement
-// NOTE: this only replaces weapons on the map
-// use g_start_weapon_* to also replace the on-startup weapons!
-// example: g_weaponreplace_nex "nex minstanex", then Nexes become MinstaNexes 50% of the times
-// set the cvars to "0" to totally disable a weapon
-set g_weaponreplace_laser ""
-set g_weaponreplace_shotgun "uzi"
-set g_weaponreplace_uzi "shotgun"
-set g_weaponreplace_grenadelauncher ""
-set g_weaponreplace_electro ""
-set g_weaponreplace_crylink ""
-set g_weaponreplace_nex ""
-set g_weaponreplace_hagar ""
-set g_weaponreplace_rocketlauncher ""
-set g_weaponreplace_porto ""
-set g_weaponreplace_minstanex ""
-set g_weaponreplace_hook 0
-set g_weaponreplace_hlac 0
-set g_weaponreplace_campingrifle 0
-set g_weaponreplace_tuba ""
-set g_weaponreplace_fireball 0
-set g_weaponreplace_seeker 0
-set sv_q3acompat_machineshotgunswap 0
-// }}}
-
 // {{{ starting gear
 set g_start_weapon_laser -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
 set g_start_weapon_shotgun -2 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
@@ -77,6 +52,8 @@ set g_balance_nix_ammoincr_fuel 2
 // }}}
 
 // {{{ pickup items
+set g_pickup_ammo_anyway 0
+set g_pickup_weapons_anyway 0
 set g_pickup_shells 10
 set g_pickup_shells_max 30
 set g_pickup_nails 30
@@ -90,20 +67,28 @@ set g_pickup_fuel_jetpack 50
 set g_pickup_fuel_max 999
 set g_pickup_armorsmall 5
 set g_pickup_armorsmall_max 200
+set g_pickup_armorsmall_anyway 0
 set g_pickup_armormedium 25
 set g_pickup_armormedium_max 200
+set g_pickup_armormedium_anyway 0
 set g_pickup_armorbig 50
 set g_pickup_armorbig_max 200
+set g_pickup_armorbig_anyway 0
 set g_pickup_armorlarge 100
 set g_pickup_armorlarge_max 200
+set g_pickup_armorlarge_anyway 0
 set g_pickup_healthsmall 5
 set g_pickup_healthsmall_max 200
+set g_pickup_healthsmall_anyway 0
 set g_pickup_healthmedium 25
 set g_pickup_healthmedium_max 100
+set g_pickup_healthmedium_anyway 0
 set g_pickup_healthlarge 50
 set g_pickup_healthlarge_max 100
+set g_pickup_healthlarge_anyway 0
 set g_pickup_healthmega 100
 set g_pickup_healthmega_max 200
+set g_pickup_healthmega_anyway 0
 set g_pickup_respawntime_short 30
 set g_pickup_respawntime_medium 30
 set g_pickup_respawntime_long 30
@@ -248,8 +233,8 @@ set g_balance_laser_secondary_shotangle 0
 set g_balance_laser_secondary_delay 0
 // }}}
 // {{{ shotgun
-set g_balance_shotgun_primary_bullets 36
-set g_balance_shotgun_primary_damage 3
+set g_balance_shotgun_primary_bullets 25
+set g_balance_shotgun_primary_damage 4
 set g_balance_shotgun_primary_force 10
 set g_balance_shotgun_primary_spread 0.18
 set g_balance_shotgun_primary_refire 1
@@ -275,8 +260,8 @@ set g_balance_uzi_first_force 50
 set g_balance_uzi_first_spread 0.007
 set g_balance_uzi_first_refire 0.15
 set g_balance_uzi_first_ammo 1
-set g_balance_uzi_sustained_damage 7
-set g_balance_uzi_sustained_force 30
+set g_balance_uzi_sustained_damage 5
+set g_balance_uzi_sustained_force 10
 set g_balance_uzi_sustained_spread 0.02
 set g_balance_uzi_sustained_refire 0.1
 set g_balance_uzi_sustained_ammo 1
@@ -392,10 +377,10 @@ set g_balance_crylink_secondary_line_lifetime 2 // range: 35000 full, fades to 7
 set g_balance_crylink_secondary_line_fadetime 2
 // }}}
 // {{{ nex
-set g_balance_nex_damage 100
+set g_balance_nex_damage 80
 set g_balance_nex_force 200
 set g_balance_nex_refire 1.25
-set g_balance_nex_animtime 0.8
+set g_balance_nex_animtime 1.25
 set g_balance_nex_ammo 5
 set g_balance_nex_damagefalloff_mindist 1000
 set g_balance_nex_damagefalloff_maxdist 3000
@@ -533,6 +518,7 @@ set g_balance_campingrifle_primary_animtime 0.7
 set g_balance_campingrifle_primary_ammo 10
 set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu
 set g_balance_campingrifle_primary_burstcost 0.35 // require same cooldown as secondary, note it's smaller than primary refire time
+set g_balance_campingrifle_primary_bullethail 0
 set g_balance_campingrifle_secondary_damage 15
 set g_balance_campingrifle_secondary_headshotaddeddamage 25
 set g_balance_campingrifle_secondary_spread 0.02
@@ -544,6 +530,7 @@ set g_balance_campingrifle_secondary_animtime 0.1
 set g_balance_campingrifle_secondary_ammo 4
 set g_balance_campingrifle_secondary_bulletconstant 130 // 18.3qu
 set g_balance_campingrifle_secondary_burstcost 0.35
+set g_balance_campingrifle_secondary_bullethail 0
 // }}}
 // {{{ tuba
 set g_balance_tuba_refire 0.05