From: Mario <zacjardine@y7mail.com>
Date: Sat, 13 Dec 2014 11:26:13 +0000 (+1100)
Subject: Fix HMG
X-Git-Tag: xonotic-v0.8.0~70^2~12
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=059f7f64d7c7bc3d80340fbeae6e9e2b1ee7126b;ds=sidebyside

Fix HMG
---

diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg
index 0e9db81688..c3fefe39da 100644
--- a/bal-wep-nexuiz25.cfg
+++ b/bal-wep-nexuiz25.cfg
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
-set g_balance_hmg_ammo 0
-set g_balance_hmg_damage 0
-set g_balance_hmg_force 0
-set g_balance_hmg_refire 0
+set g_balance_hmg_ammo 1
+set g_balance_hmg_damage 10
+set g_balance_hmg_force 5
+set g_balance_hmg_refire 0.05
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32
diff --git a/bal-wep-overkill.cfg b/bal-wep-overkill.cfg
index ab18a5d894..934cf46a5b 100644
--- a/bal-wep-overkill.cfg
+++ b/bal-wep-overkill.cfg
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
-set g_balance_hmg_ammo 0
-set g_balance_hmg_damage 0
-set g_balance_hmg_force 0
-set g_balance_hmg_refire 0
+set g_balance_hmg_ammo 1
+set g_balance_hmg_damage 10
+set g_balance_hmg_force 5
+set g_balance_hmg_refire 0.05
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32
diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg
index 82549c8a44..c0cb54aa31 100644
--- a/bal-wep-samual.cfg
+++ b/bal-wep-samual.cfg
@@ -760,10 +760,10 @@ set g_balance_shotgun_weaponstartoverride -1
 set g_balance_shotgun_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
-set g_balance_hmg_ammo 0
-set g_balance_hmg_damage 0
-set g_balance_hmg_force 0
-set g_balance_hmg_refire 0
+set g_balance_hmg_ammo 1
+set g_balance_hmg_damage 10
+set g_balance_hmg_force 5
+set g_balance_hmg_refire 0.05
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32
diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg
index be087a5d7e..f65891c9f7 100644
--- a/bal-wep-xdf.cfg
+++ b/bal-wep-xdf.cfg
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
-set g_balance_hmg_ammo 0
-set g_balance_hmg_damage 0
-set g_balance_hmg_force 0
-set g_balance_hmg_refire 0
+set g_balance_hmg_ammo 1
+set g_balance_hmg_damage 10
+set g_balance_hmg_force 5
+set g_balance_hmg_refire 0.05
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32
diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index e061e6920f..2e6d10e7b1 100644
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
-set g_balance_hmg_ammo 0
-set g_balance_hmg_damage 0
-set g_balance_hmg_force 0
-set g_balance_hmg_refire 0
+set g_balance_hmg_ammo 1
+set g_balance_hmg_damage 10
+set g_balance_hmg_force 5
+set g_balance_hmg_refire 0.05
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32
diff --git a/bal-wep-xpm.cfg b/bal-wep-xpm.cfg
index e061e6920f..2e6d10e7b1 100644
--- a/bal-wep-xpm.cfg
+++ b/bal-wep-xpm.cfg
@@ -762,10 +762,10 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
-set g_balance_hmg_ammo 0
-set g_balance_hmg_damage 0
-set g_balance_hmg_force 0
-set g_balance_hmg_refire 0
+set g_balance_hmg_ammo 1
+set g_balance_hmg_damage 10
+set g_balance_hmg_force 5
+set g_balance_hmg_refire 0.05
 set g_balance_hmg_reload_ammo 120
 set g_balance_hmg_reload_time 1
 set g_balance_hmg_solidpenetration 32
diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index b928aa512a..216940009d 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1029,6 +1029,7 @@ void HUD_Ammo(void)
 	float i;
 	float infinite_ammo = (getstati(STAT_ITEMS, 0, 24) & IT_UNLIMITED_WEAPON_AMMO);
 	row = column = 0;
+	if(!infinite_ammo)
 	if(autocvar_hud_panel_ammo_onlycurrent)
 	{
 		if(autocvar__hud_configure)
diff --git a/qcsrc/common/weapons/w_hmg.qc b/qcsrc/common/weapons/w_hmg.qc
index ecc5791ed3..69777c4c2c 100644
--- a/qcsrc/common/weapons/w_hmg.qc
+++ b/qcsrc/common/weapons/w_hmg.qc
@@ -6,7 +6,7 @@ REGISTER_WEAPON(
 /* impulse	 */ 3,
 /* flags	 */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_SUPERWEAPON,
 /* rating	 */ BOT_PICKUP_RATING_HIGH,
-/* color     */ '1 1 0',
+/* color     */ '0.5 0.5 0',
 /* modelname */ "ok_hmg",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairuzi 0.6",
diff --git a/qcsrc/common/weapons/w_rpc.qc b/qcsrc/common/weapons/w_rpc.qc
index c6d68de3b1..81e1144434 100644
--- a/qcsrc/common/weapons/w_rpc.qc
+++ b/qcsrc/common/weapons/w_rpc.qc
@@ -6,7 +6,7 @@ REGISTER_WEAPON(
 /* impulse	 */ 7,
 /* flags	 */ WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_SUPERWEAPON,
 /* rating	 */ BOT_PICKUP_RATING_HIGH,
-/* color     */ '1 1 0',
+/* color     */ '0.5 0.5 0',
 /* modelname */ "ok_rl",
 /* simplemdl */ "foobar",
 /* crosshair */ "gfx/crosshairrocketlauncher 0.5875",
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 6cfeb82ae5..f20f07047a 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -843,7 +843,6 @@ float autocvar_g_overkill_powerups_replace;
 float autocvar_g_overkill_superguns_respawn_time;
 float autocvar_g_overkill_100h_anyway;
 float autocvar_g_overkill_100a_anyway;
-float autocvar_g_overkill_ammo_start;
 float autocvar_g_overkill_ammo_charge;
 float autocvar_g_overkill_ammo_charge_notice;
 float autocvar_g_overkill_ammo_charge_limit;
diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc
index ecef7ceac1..8f94177a84 100644
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@ -284,9 +284,6 @@ MUTATOR_HOOKFUNCTION(ok_StartItems)
 	start_items |= IT_UNLIMITED_WEAPON_AMMO;
 	start_weapons = warmup_start_weapons = ok_start_items;
 
-	start_ammo_nails = start_ammo_cells = start_ammo_shells = start_ammo_rockets =
-	warmup_start_ammo_nails = warmup_start_ammo_cells = warmup_start_ammo_shells = warmup_start_ammo_rockets = autocvar_g_overkill_ammo_start;
-
 	return FALSE;
 }
 
diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 13123a4601..762f9a0e3d 100644
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -641,6 +641,8 @@ float forbidWeaponUse()
 		return 1;
 	if(self.frozen)
 		return 1;
+	if(self.weapon_blocked)
+		return 1;
 	return 0;
 }