YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-03-12 05:22:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix weapon_sniper.

Browse Source
This commit is contained in:
Night Owl 2018-01-25 23:27:55 +05:00
parent 481f56a566
commit 8ba397db4c
3 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cl_dll/ev_hldm.cpp
View File

@ -1862,16 +1862,16 @@ void EV_FireSniper( event_args_t *args )
break; break;
} }
V_PunchAxis( 0, -10.0 ); V_PunchAxis( 0, gEngfuncs.pfnRandomFloat( -12.0, 2.0 ) );
} }
switch( gEngfuncs.pfnRandomLong( 0, 1 ) ) switch( gEngfuncs.pfnRandomLong( 0, 1 ) )
{ {
case 0: case 0:
gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/sniper_fire1.wav", gEngfuncs.pfnRandomFloat( 0.8, 0.9 ), ATTN_NORM, 0, PITCH_NORM ); gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/sniper_fire1.wav", 1.0, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 15 ) );
break; break;
case 1: case 1:
gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/sniper_fire2.wav", gEngfuncs.pfnRandomFloat( 0.8, 0.9 ), ATTN_NORM, 0, PITCH_NORM ); gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/sniper_fire2.wav", 1.0, ATTN_NORM, 0, 94 + gEngfuncs.pfnRandomLong( 0, 15 ) );
break; break;
} }

2
dlls/combat.cpp
View File

@ -1537,7 +1537,7 @@ Vector CBaseEntity::FireBulletsPlayer( ULONG cShots, Vector vecSrc, Vector vecDi
pEntity->TraceAttack( pevAttacker, gSkillData.plrDmg357, vecDir, &tr, DMG_BULLET ); pEntity->TraceAttack( pevAttacker, gSkillData.plrDmg357, vecDir, &tr, DMG_BULLET );
break; break;
case BULLET_PLAYER_SNIPER: case BULLET_PLAYER_SNIPER:
pEntity->TraceAttack( pevAttacker, gSkillData.plrDmg357 * 4, vecDir, &tr, DMG_BULLET ); pEntity->TraceAttack( pevAttacker, gSkillData.plrDmg357 * 1.5, vecDir, &tr, DMG_BULLET );
break; break;
case BULLET_NONE: // FIX case BULLET_NONE: // FIX
pEntity->TraceAttack( pevAttacker, 50, vecDir, &tr, DMG_CLUB ); pEntity->TraceAttack( pevAttacker, 50, vecDir, &tr, DMG_CLUB );

48
dlls/visitors/sniper.cpp
View File

@ -81,7 +81,11 @@ void CSniper::Precache(void)
PRECACHE_MODEL("models/w_sniperclip.mdl"); PRECACHE_MODEL("models/w_sniperclip.mdl");
PRECACHE_SOUND("items/9mmclip1.wav"); PRECACHE_SOUND("items/9mmclip1.wav");
PRECACHE_SOUND("weapons/sniper_fire1.wav");
PRECACHE_SOUND("weapons/sniper_fire2.wav");
PRECACHE_SOUND("weapons/sniper_reload1.wav"); PRECACHE_SOUND("weapons/sniper_reload1.wav");
PRECACHE_SOUND("weapons/zoom.wav");
PRECACHE_SOUND("weapons/scout_bolt.wav"); PRECACHE_SOUND("weapons/scout_bolt.wav");
PRECACHE_SOUND("weapons/scout_clipin.wav"); PRECACHE_SOUND("weapons/scout_clipin.wav");
PRECACHE_SOUND("weapons/scout_clipout.wav"); PRECACHE_SOUND("weapons/scout_clipout.wav");
@ -103,7 +107,7 @@ void CSniper::Holster(int skiplocal /* = 0 */)
SecondaryAttack(); SecondaryAttack();
} }
m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 1.0; m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 0.5;
m_flTimeWeaponIdle = UTIL_SharedRandomFloat(m_pPlayer->random_seed, 10, 15); m_flTimeWeaponIdle = UTIL_SharedRandomFloat(m_pPlayer->random_seed, 10, 15);
} }
@ -121,28 +125,26 @@ void CSniper::SecondaryAttack(void)
} }
m_flNextSecondaryAttack = 0.75; m_flNextSecondaryAttack = 0.75;
EMIT_SOUND_DYN( ENT( m_pPlayer->pev ), CHAN_STATIC, "weapons/zoom.wav", 1, ATTN_NORM, 0, RANDOM_LONG( 100, 150 ) );
} }
void CSniper::PrimaryAttack() void CSniper::PrimaryAttack()
{ {
if( FBitSet( m_pPlayer->m_afButtonLast, IN_ATTACK ) )
return;
// don't fire underwater // don't fire underwater
if (m_pPlayer->pev->waterlevel == 3) if (m_pPlayer->pev->waterlevel == 3)
{ {
PlayEmptySound(); PlayEmptySound();
m_flNextPrimaryAttack = 0.15; m_flNextPrimaryAttack = m_flNextSecondaryAttack = 0.15;
return; return;
} }
if (m_iClip <= 0) if (m_iClip <= 0)
{ {
if (!m_fFireOnEmpty) PlayEmptySound();
Reload(); m_flNextPrimaryAttack = m_flNextSecondaryAttack = 0.2;
else
{
EMIT_SOUND(ENT(m_pPlayer->pev), CHAN_WEAPON, "weapons/357_cock1.wav", 0.8, ATTN_NORM);
m_flNextPrimaryAttack = 0.15;
}
return; return;
} }
@ -174,25 +176,33 @@ void CSniper::PrimaryAttack()
PLAYBACK_EVENT_FULL(flags, m_pPlayer->edict(), m_usFireSniper, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, vecDir.x, vecDir.y, 0, 0, 0, 0); PLAYBACK_EVENT_FULL(flags, m_pPlayer->edict(), m_usFireSniper, 0.0, (float *)&g_vecZero, (float *)&g_vecZero, vecDir.x, vecDir.y, 0, 0, 0, 0);
m_flNextPrimaryAttack = (46.0 / 35.0); if( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] > 0 || m_iClip > 0 )
m_flTimeWeaponIdle = UTIL_SharedRandomFloat(m_pPlayer->random_seed, 10, 15); m_flNextPrimaryAttack = 1.5;
else
{
m_flNextPrimaryAttack = 2.75;
m_flNextSecondaryAttack = 0.75;
}
if( m_iClip > 0 )
m_flTimeWeaponIdle = 2.5;
else
m_flTimeWeaponIdle = 1.75;
} }
void CSniper::Reload(void) void CSniper::Reload(void)
{ {
if (m_pPlayer->ammo_357 <= 0) if( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] <= 0 || m_iClip == SNIPER_MAX_CLIP )
return; return;
int iResult = DefaultReload(SNIPER_MAX_CLIP, SNIPER_RELOAD, 2.25); int iResult = DefaultReload(SNIPER_MAX_CLIP, SNIPER_RELOAD, 2.25);
if (iResult) if (iResult)
{ {
if (m_pPlayer->pev->fov != 0) if( m_fInZoom )
{ SecondaryAttack();
m_fInZoom = FALSE; EMIT_SOUND_DYN( ENT( m_pPlayer->pev ), CHAN_ITEM, "weapons/sniper_reload1.wav", RANDOM_FLOAT( 0.9, 1.0 ), ATTN_NORM, 0, 93 + RANDOM_LONG( 0, 15 ) );
m_pPlayer->pev->fov = m_pPlayer->m_iFOV = 0; // 0 means reset to default fov
}
} }
} }
@ -206,7 +216,7 @@ void CSniper::WeaponIdle(void)
if (m_flTimeWeaponIdle > UTIL_WeaponTimeBase()) if (m_flTimeWeaponIdle > UTIL_WeaponTimeBase())
return; return;
m_flTimeWeaponIdle = (9.0 / 16.0); m_flTimeWeaponIdle = UTIL_SharedRandomFloat(m_pPlayer->random_seed, 10, 15);
SendWeaponAnim(SNIPER_IDLE1, UseDecrement() ? 1 : 0); SendWeaponAnim(SNIPER_IDLE1, UseDecrement() ? 1 : 0);
} }