Merge branch 'master' into martin-t/overkill

diff --git a/bal-wep-overkill.cfg b/bal-wep-overkill.cfg
index 8c6432264c1fcdc8cf57488d3dc5a44fe786ab67..f423417f83b854c752b8640871580c9142886b78 100644 (file)
--- a/bal-wep-overkill.cfg
+++ b/bal-wep-overkill.cfg
@@ -81,7 +81,7 @@ set g_balance_machinegun_first_spread 0.03
 set g_balance_machinegun_mode 1
 set g_balance_machinegun_reload_ammo 30
 set g_balance_machinegun_reload_time 1.5
-set g_balance_machinegun_solidpenetration 13.1
+set g_balance_machinegun_solidpenetration 63
 set g_balance_machinegun_spread_add 0.012
 set g_balance_machinegun_spread_max 0.05
 set g_balance_machinegun_spread_min 0

diff --git a/balance-overkill.cfg b/balance-overkill.cfg
index da17e0afeb099d8cdd3664890f6cca351d208e43..381eb51d7ba3d19948ad83cd5d3acfbb838fd828 100644 (file)
--- a/balance-overkill.cfg
+++ b/balance-overkill.cfg
@@ -64,7 +64,7 @@ set g_pickup_fuel_weapon 50
 set g_pickup_fuel_jetpack 100
 set g_pickup_fuel_max 100
 set g_pickup_armorsmall 5
-set g_pickup_armorsmall_max 20
+set g_pickup_armorsmall_max 100
 set g_pickup_armorsmall_anyway 1
 set g_pickup_armormedium 25
 set g_pickup_armormedium_max 100

diff --git a/defaultOverkill.cfg b/defaultOverkill.cfg
index 29fb2bf12782f02de96f0911d6865e9e4c1f3d1e..cbeaa0a0be3d03a2485527e6235fb3c0401dcf44 100644 (file)
--- a/defaultOverkill.cfg
+++ b/defaultOverkill.cfg
@@ -1,6 +1,6 @@
-// ================
-//  Overkill Mode
-// ================
+// ==============
+//  Overkill Mod
+// ==============
 
 exec defaultXonotic.cfg
 exec balance-overkill.cfg
@@ -8,8 +8,24 @@ exec physicsOverkill.cfg
 
 // general gameplay
 set g_overkill 1
+set g_fullbrightplayers 1
+set g_respawn_ghosts 0
+
 set g_nades 1
+set g_nades_nade_small 1
+set g_nades_spread 0
+set g_nades_nade_refire 10
+set g_nades_nade_newton_style 2
+
 set g_dodging 1
 set sv_dodging_wall_dodging 1
+
 set g_spawn_near_teammate 1
 set g_spawn_near_teammate_ignore_spawnpoint 1
+set g_spawnshieldtime 0.5
+set g_ctf_respawn_delay_small 2
+set g_ctf_respawn_delay_large 2
+
+set g_lms_start_armor 100
+
+//set sv_itemstime 2 // TODO enable this after there's an option to disable the panel to keep only waypoints

diff --git a/mutators.cfg b/mutators.cfg
index 229fd3a6de74aff12302f78875015c726818b48f..d078494899004d591cb01ffad0c5c68acb14fa4d 100644 (file)
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -191,7 +191,7 @@ set g_nades_nade_damage 225
 set g_nades_nade_edgedamage 90
 set g_nades_nade_radius 300
 set g_nades_nade_force 650
-set g_nades_nade_newton_style 0
+set g_nades_nade_newton_style 0 "0 is absolute, 1 is relative (takes into account player speed), 2 is something in between"
 set g_nades_nade_type 1 "Type of the off-hand grenade. 1:normal 2:napalm 3:ice 4:translocate 5:spawn 6:heal 7:pokenade 8:entrap"
 
 seta cl_nade_timer 1 "show a visual timer for nades, 1 = only circle, 2 = circle with text"