From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 12 Aug 2019 20:43:38 +0000 (+0200)
Subject: restore old armor / physics in OK
X-Git-Tag: xonotic-v0.8.5~1385^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=95db8ea0f5be268a9201f52b65bb39c9f1bae90d;p=xonotic%2Fxonotic-data.pk3dir.git

restore old armor / physics in OK
---

diff --git a/balance-overkill.cfg b/balance-overkill.cfg
index 18d862d74..0e929ee74 100644
--- a/balance-overkill.cfg
+++ b/balance-overkill.cfg
@@ -25,7 +25,7 @@ set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
 set g_lms_start_health 200
-set g_lms_start_armor 200
+set g_lms_start_armor 100
 set g_lms_start_ammo_shells 60
 set g_lms_start_ammo_nails 320
 set g_lms_start_ammo_rockets 160
@@ -131,7 +131,7 @@ set g_balance_pause_armor_rot 5
 set g_balance_pause_armor_rot_spawn 5
 set g_balance_armor_regenstable 100
 set g_balance_armor_rotstable 0
-set g_balance_armor_limit 200
+set g_balance_armor_limit 100
 set g_balance_armor_blockpercent 0.6
 set g_balance_fuel_regen 0.1 "fuel regeneration (only applies if the player owns IT_FUEL_REGEN)"
 set g_balance_fuel_regenlinear 0
diff --git a/mutators.cfg b/mutators.cfg
index 01e3a120a..6c2b80c71 100644
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -54,14 +54,14 @@ set g_instagib_friendlypush 1 "allow pushing teammates with the vaporizer primar
 // ==========
 //  overkill
 // ==========
-set g_overkill 0 "internal cvar, to enable overkill, use  `exec ruleset-overkill.cfg`"
+set g_overkill 0 "internal cvar, to enable overkill, use `exec ruleset-overkill.cfg`"
 set g_overkill_weapons 0 "Whether to enable overkill weapons outside of overkill ruleset."
 
-set g_overkill_powerups_replace 1
-set g_overkill_itemwaypoints 1
+set g_overkill_powerups_replace 1 "replace strength shield and with HMG and RPC"
+set g_overkill_itemwaypoints 1 "show waypoints with timer before health and armor spawns"
 set g_overkill_filter_healthmega 0
-set g_overkill_filter_armormedium 0
-set g_overkill_filter_armorbig 0
+set g_overkill_filter_armormedium 1
+set g_overkill_filter_armorbig 1
 set g_overkill_filter_armormega 0
 
 
diff --git a/physicsOverkill.cfg b/physicsOverkill.cfg
index a6f36a77e..67d02a776 100644
--- a/physicsOverkill.cfg
+++ b/physicsOverkill.cfg
@@ -1,7 +1,7 @@
 g_mod_physics Overkill
 
 sv_gravity 800
-sv_maxspeed 400
+sv_maxspeed 360
 sv_maxairspeed 360
 
 sv_stopspeed 100
@@ -40,7 +40,7 @@ sv_aircontrol_penalty 180
 sv_aircontrol_power 2
 sv_aircontrol_backwards 0
 sv_aircontrol_sidewards 0
-sv_airspeedlimit_nonqw 900
+sv_airspeedlimit_nonqw 800
 sv_warsowbunny_turnaccel 0
 sv_warsowbunny_accel 0.1593
 sv_warsowbunny_topspeed 925
diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qh b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qh
index 79e5dd3c5..63e3c19ef 100644
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qh
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qh
@@ -2,8 +2,8 @@
 
 string autocvar_g_overkill;
 bool autocvar_g_overkill_filter_healthmega;
-bool autocvar_g_overkill_filter_armormedium;
-bool autocvar_g_overkill_filter_armorbig;
+bool autocvar_g_overkill_filter_armormedium = true;
+bool autocvar_g_overkill_filter_armorbig = true;
 bool autocvar_g_overkill_filter_armormega;
 
 .float ok_item;
diff --git a/ruleset-overkill.cfg b/ruleset-overkill.cfg
index 0b1e304fe..8972fb6cb 100644
--- a/ruleset-overkill.cfg
+++ b/ruleset-overkill.cfg
@@ -39,6 +39,4 @@ set g_spawn_near_teammate_ignore_spawnpoint 1
 set g_spawnshieldtime 0.5
 set g_respawn_delay_forced 2
 
-set g_lms_start_armor 100
-
 g_buffs_resistance_blockpercent 0.5