Merge branch 'master' into Mario/overkill

[xonotic/xonotic-data.pk3dir.git] / overkill.cfg

diff --git a/overkill.cfg b/overkill.cfg
index 1eff76a4a0a3093ce88b1f8540d6a61a78d0183c..ddc6e7f342273aa69f683b90c31e886c4eba8090 100644 (file)
--- a/overkill.cfg
+++ b/overkill.cfg
@@ -1,26 +1,21 @@
-g_overkill 1
-
 g_overkill_ammo_start 50
-g_overkill_ammo_max   100
+g_overkill_ammo_max 100
 g_overkill_ammo_regen 2.52
 g_overkill_superguns_builtin 0
 
 g_use_ammunition 1
-g_pickup_items 0
 sv_gibhealth 120
 g_spawnshieldtime 0.5
 
 g_balance_health_regen 0
 g_balance_health_regenlinear 100
 g_balance_health_rot 0
-g_balance_health_rotstable 200 // needs this too, else it rots towards 100 even with g_balance_health_rot 0
+g_balance_health_rotstable 200
 g_balance_armor_rotstable 0
 g_balance_armor_rotlinear 1
 g_balance_armor_rot 0
 g_balance_pause_health_regen 2
 
-// g_balance_laser_primary_force_velocitybias 1.2  // sorry i realy hate this
-
 g_balance_shotgun_primary_damage 17
 g_balance_shotgun_primary_bullets 10
 g_balance_shotgun_primary_force 80
@@ -29,7 +24,6 @@ g_balance_shotgun_primary_animtime 0.65
 g_balance_shotgun_primary_ammo 6.25
 g_balance_shotgun_reload_ammo 50
 g_balance_shotgun_reload_time 2
-g_balance_shotgun_primary_bulletconstant 3000
 
 g_balance_uzi_mode 1
 g_balance_uzi_sustained_damage 25
@@ -53,10 +47,9 @@ g_balance_hmg_sustained_spread 0.03
 g_balance_hmg_sustained_refire 0.05
 g_balance_hmg_sustained_ammo 1
 
-g_balance_hmg_speed 24000
-g_balance_hmg_bulletconstant 115 // 13.1qu
+g_balance_hmg_solidpenetration 32
 
-g_balance_hmg_reload_ammo 100 //default: 30
+g_balance_hmg_reload_ammo 100
 g_balance_hmg_reload_time 1
 
 g_balance_nex_primary_damage 100
@@ -90,14 +83,7 @@ g_balance_rpc_speedaccel 5000
 g_balance_rpc_reload_ammo 50
 g_balance_rpc_reload_time 1
 
-g_projectiles_newton_style_2_minfactor 1 // rocket will never fly below default speed, even you you move backwards
-
-g_overkill_spawnsystem 1                // Experimental spawnsystem
-g_overkill_spawnsystem_delay 2.5        // How long to wait before its OK to spawn at a player after someone just spawned at this player
-g_overkill_spawnsystem_delay_death 0    // How long to wait before its OK to spawn at a player after death 
-g_overkill_spawnsystem_check_health 1   // Only allow spawn at this player if hes health is full
-g_overkill_spawnsystem_close2death 1    // Spawn as close as possible to where we died?
-g_overkill_spawnsystem_give_nade 1      // Give nade at spawn
+g_projectiles_newton_style_2_minfactor 1 // rocket will never fly below default speed, even if you move backwards
 
 g_overkill_nade_lifetime 3.5
 g_overkill_nade_minforce 400