Commit 059f7f64 authored by Mario's avatar Mario

Fix HMG

parent df110eb6
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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",
......
......@@ -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",
......
......@@ -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;
......
......@@ -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;
}
......
......@@ -641,6 +641,8 @@ float forbidWeaponUse()
return 1;
if(self.frozen)
return 1;
if(self.weapon_blocked)
return 1;
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment