X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=balanceXPM.cfg;h=2da131c96cbf13ea93f6b300ecb0b3b2ee2267bc;hp=a15f060d0f269e15068c836360fb39b888181480;hb=e52c92b8ba22924be19d8458fb1dd0cb7cfe11c7;hpb=5eb33d999861a22adacb08d808421351b3291163

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index a15f060d0..2da131c96 100644
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -1,3 +1,5 @@
+g_mod_balance XPM
+
 // {{{ 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 -1 "0 = never provide the weapon, 1 = always provide the weapon, -1 = game mode default, -2 = provide the weapon in ca and lms"
@@ -73,28 +75,28 @@ set g_pickup_fuel_jetpack 100
 set g_pickup_fuel_max 100
 set g_pickup_armorsmall 5
 set g_pickup_armorsmall_max 200
-set g_pickup_armorsmall_anyway 1
+set g_pickup_armorsmall_anyway 0
 set g_pickup_armormedium 25
-set g_pickup_armormedium_max 200
-set g_pickup_armormedium_anyway 1
+set g_pickup_armormedium_max 100
+set g_pickup_armormedium_anyway 0
 set g_pickup_armorbig 50
-set g_pickup_armorbig_max 200
-set g_pickup_armorbig_anyway 1
+set g_pickup_armorbig_max 100
+set g_pickup_armorbig_anyway 0
 set g_pickup_armorlarge 100
 set g_pickup_armorlarge_max 200
-set g_pickup_armorlarge_anyway 1
+set g_pickup_armorlarge_anyway 0
 set g_pickup_healthsmall 5
 set g_pickup_healthsmall_max 200
-set g_pickup_healthsmall_anyway 1
+set g_pickup_healthsmall_anyway 0
 set g_pickup_healthmedium 25
-set g_pickup_healthmedium_max 200
-set g_pickup_healthmedium_anyway 1
+set g_pickup_healthmedium_max 100
+set g_pickup_healthmedium_anyway 0
 set g_pickup_healthlarge 50
-set g_pickup_healthlarge_max 200
-set g_pickup_healthlarge_anyway 1
+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 1
+set g_pickup_healthmega_anyway 0
 set g_pickup_respawntime_short 15
 set g_pickup_respawntime_medium 20
 set g_pickup_respawntime_long 30
@@ -116,7 +118,7 @@ set g_balance_health_regen 0.08
 set g_balance_health_regenlinear 0.5
 set g_balance_pause_health_regen 5
 set g_balance_pause_health_regen_spawn 0
-set g_balance_health_rot 0.04
+set g_balance_health_rot 0.03
 set g_balance_health_rotlinear 0.75
 set g_balance_pause_health_rot 1
 set g_balance_pause_health_rot_spawn 5
@@ -125,7 +127,7 @@ set g_balance_health_rotstable 100
 set g_balance_health_limit 999
 set g_balance_armor_regen 0
 set g_balance_armor_regenlinear 0
-set g_balance_armor_rot 0.04
+set g_balance_armor_rot 0.03
 set g_balance_armor_rotlinear 0.75
 set g_balance_pause_armor_rot 1
 set g_balance_pause_armor_rot_spawn 5
@@ -147,7 +149,7 @@ set g_balance_fuel_limit 999
 
 // {{{ misc
 set g_balance_selfdamagepercent 0.65
-set g_balance_weaponswitchdelay 0.15
+set g_balance_weaponswitchdelay 0.2
 set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
 set g_weaponratefactor 1 "weapon fire rate multiplier"
 set g_weapondamagefactor 1 "weapon damage multiplier"
@@ -238,7 +240,7 @@ set g_balance_laser_primary_radius 70
 set g_balance_laser_primary_speed 6000
 set g_balance_laser_primary_spread 0
 set g_balance_laser_primary_refire 0.7
-set g_balance_laser_primary_animtime 0.3
+set g_balance_laser_primary_animtime 0.2
 set g_balance_laser_primary_lifetime 5
 set g_balance_laser_primary_shotangle 0
 set g_balance_laser_primary_delay 0
@@ -254,7 +256,7 @@ 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.3
+set g_balance_laser_secondary_animtime 0.2
 set g_balance_laser_secondary_lifetime 5
 set g_balance_laser_secondary_shotangle -90
 set g_balance_laser_secondary_delay 0
@@ -404,12 +406,12 @@ set g_balance_electro_primary_edgedamage 20
 set g_balance_electro_primary_force 200
 set g_balance_electro_primary_force_up 0
 set g_balance_electro_primary_radius 100
-set g_balance_electro_primary_comboradius 150
+set g_balance_electro_primary_comboradius 200
 set g_balance_electro_primary_speed 2500
 set g_balance_electro_primary_spread 0
 set g_balance_electro_primary_lifetime 5
 set g_balance_electro_primary_refire 0.6
-set g_balance_electro_primary_animtime 0.1
+set g_balance_electro_primary_animtime 0.3
 set g_balance_electro_primary_ammo 4
 set g_balance_electro_primary_range 0
 set g_balance_electro_primary_falloff_mindist 255 // 0.3 * radius
@@ -419,10 +421,10 @@ set g_balance_electro_secondary_damage 40
 set g_balance_electro_secondary_edgedamage 20
 set g_balance_electro_secondary_force 50
 set g_balance_electro_secondary_radius 150
-set g_balance_electro_secondary_speed 900
+set g_balance_electro_secondary_speed 1000
 set g_balance_electro_secondary_speed_up 200
 set g_balance_electro_secondary_speed_z 0
-set g_balance_electro_secondary_spread 0.05
+set g_balance_electro_secondary_spread 0.04
 set g_balance_electro_secondary_lifetime 3
 set g_balance_electro_secondary_refire 0.2
 set g_balance_electro_secondary_refire2 1.5
@@ -432,22 +434,22 @@ set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_damageforcescale 4
 set g_balance_electro_secondary_damagedbycontents 1
 set g_balance_electro_secondary_count 3
-set g_balance_electro_secondary_bouncefactor 0.4
+set g_balance_electro_secondary_bouncefactor 0.3
 set g_balance_electro_secondary_bouncestop 0.05
 set g_balance_electro_combo_damage 50
 set g_balance_electro_combo_edgedamage 25
 set g_balance_electro_combo_force 120
 set g_balance_electro_combo_radius 175
-set g_balance_electro_combo_comboradius 275
+set g_balance_electro_combo_comboradius 300
 set g_balance_electro_combo_speed 2000
-set g_balance_electro_combo_safeammocheck 0
+set g_balance_electro_combo_safeammocheck 1
 set g_balance_electro_reload_ammo 0 //default: 20
 set g_balance_electro_reload_time 2
 // }}}
 // {{{ crylink 
-set g_balance_crylink_primary_damage 10
-set g_balance_crylink_primary_edgedamage 5
-set g_balance_crylink_primary_force -55
+set g_balance_crylink_primary_damage 12
+set g_balance_crylink_primary_edgedamage 6
+set g_balance_crylink_primary_force -60
 set g_balance_crylink_primary_radius 80
 set g_balance_crylink_primary_speed 2000
 set g_balance_crylink_primary_spread 0.08
@@ -507,7 +509,7 @@ set g_balance_crylink_reload_time 2
 set g_balance_nex_primary_damage 90
 set g_balance_nex_primary_force 400
 set g_balance_nex_primary_refire 1.5
-set g_balance_nex_primary_animtime 0.45
+set g_balance_nex_primary_animtime 0.4
 set g_balance_nex_primary_ammo 6
 set g_balance_nex_primary_damagefalloff_mindist 0 // 1000    For tZork ;3
 set g_balance_nex_primary_damagefalloff_maxdist 0 // 3000
@@ -564,7 +566,7 @@ set g_balance_hagar_primary_force 100
 set g_balance_hagar_primary_health 15
 set g_balance_hagar_primary_damageforcescale 0
 set g_balance_hagar_primary_radius 65
-set g_balance_hagar_primary_spread 0.04
+set g_balance_hagar_primary_spread 0.03
 set g_balance_hagar_primary_speed 2200
 set g_balance_hagar_primary_lifetime 5
 set g_balance_hagar_primary_refire 0.16667 // 6 rockets per second
@@ -605,7 +607,7 @@ set g_balance_rocketlauncher_speedaccel 1300
 set g_balance_rocketlauncher_speedstart 1000
 set g_balance_rocketlauncher_lifetime 10
 set g_balance_rocketlauncher_refire 1.1
-set g_balance_rocketlauncher_animtime 0.35
+set g_balance_rocketlauncher_animtime 0.4
 set g_balance_rocketlauncher_ammo 4
 set g_balance_rocketlauncher_health 30 // 30 // 5 hitpoints above maximum laser value -- this way lasers can't blow it up, but grenadelauncher still can most the time.
 set g_balance_rocketlauncher_damageforcescale 1 // low damage force scale so that it can still be affected by other hits, but not so much that it does a 90 degree turn
@@ -627,6 +629,11 @@ set g_balance_porto_primary_refire 1.5
 set g_balance_porto_primary_animtime 0.3
 set g_balance_porto_primary_speed 1000
 set g_balance_porto_primary_lifetime 5
+set g_balance_porto_secondary 1
+set g_balance_porto_secondary_refire 1.5
+set g_balance_porto_secondary_animtime 0.3
+set g_balance_porto_secondary_speed 1000
+set g_balance_porto_secondary_lifetime 5
 set g_balance_portal_health 200 // these get recharged whenever the portal is used
 set g_balance_portal_lifetime 15 // these get recharged whenever the portal is used
 // }}}
@@ -736,8 +743,7 @@ set g_balance_tuba_force 40
 set g_balance_tuba_pitchstep 6
 // }}}
 // {{{ fireball // this is a superweapon -- lets make it behave as one. 
-set g_balance_fireball_primary_ammo 20
-set g_balance_fireball_primary_animtime 0.2
+set g_balance_fireball_primary_animtime 0.4
 set g_balance_fireball_primary_bfgdamage 100
 set g_balance_fireball_primary_bfgforce 0
 set g_balance_fireball_primary_bfgradius 1000
@@ -756,7 +762,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_secondary_ammo 5
 set g_balance_fireball_secondary_animtime 0.3
 set g_balance_fireball_secondary_damage 40
 set g_balance_fireball_secondary_damageforcescale 4
@@ -772,8 +777,6 @@ set g_balance_fireball_secondary_speed 900
 set g_balance_fireball_secondary_speed_up 100
 set g_balance_fireball_secondary_speed_z 0
 set g_balance_fireball_secondary_spread 0
-set g_balance_fireball_reload_ammo 0 //default: 100
-set g_balance_fireball_reload_time 2
 // }}}
 // {{{ seeker
 set g_balance_seeker_type 1 // 0 = old seeker, 1 = new seeker. THIS IS A TEMPORARY CVAR FOR TESTING, will be removed later.