Code: void CDisc::DiscTouch ( CBaseEntity *pOther )
{
// Push players backwards
if ( pOther->IsPlayer() )
{
if ( ((CBaseEntity*)m_hOwner) == pOther )
{
if (m_fDontTouchOwner < gpGlobals->time)
{
// Play catch sound
EMIT_SOUND_DYN( pOther->edict(), CHAN_WEAPON, "items/gunpickup2.wav", 1.0, ATTN_NORM, 0, 98 + RANDOM_LONG(0,3));
ReturnToThrower();
}
return;
}
else if ( m_fDontTouchEnemies < gpGlobals->time)
{
if ( pev->team != pOther->pev->team )
{
((CBasePlayer*)pOther)->m_LastHitGroup = HITGROUP_GENERIC;
// Do freeze seperately so you can freeze and shatter a person with a single shot
if ( m_iPowerupFlags & POW_FREEZE && ((CBasePlayer*)pOther)->m_iFrozen == FALSE )
{
// Freeze the player and make them glow blue
EMIT_SOUND_DYN( pOther->edict(), CHAN_WEAPON, "weapons/electro5.wav", 1.0, ATTN_NORM, 0, 98 + RANDOM_LONG(0,3));
((CBasePlayer*)pOther)->Freeze();
// If it's not a decap, return now. If it's a decap, continue to shatter
if ( !m_bDecapitate )
{
m_fDontTouchEnemies = gpGlobals->time + 2.0;
return;
}
}
// Decap or push
if (m_bDecapitate)
{
// Decapitate!
if ( m_bTeleported )
((CBasePlayer*)pOther)->m_flLastDiscHitTeleport = gpGlobals->time;
((CBasePlayer*)pOther)->Decapitate( ((CBaseEntity*)m_hOwner)->pev );
m_fDontTouchEnemies = gpGlobals->time + 0.5;
}
else
{
// Play thwack sound
switch( RANDOM_LONG(0,2) )
{
case 0:
EMIT_SOUND_DYN( pOther->edict(), CHAN_ITEM, "weapons/cbar_hitbod1.wav", 1.0, ATTN_NORM, 0, 98 + RANDOM_LONG(0,3));
break;
case 1:
EMIT_SOUND_DYN( pOther->edict(), CHAN_ITEM, "weapons/cbar_hitbod2.wav", 1.0, ATTN_NORM, 0, 98 + RANDOM_LONG(0,3));
break;
case 2:
EMIT_SOUND_DYN( pOther->edict(), CHAN_ITEM, "weapons/cbar_hitbod3.wav", 1.0, ATTN_NORM, 0, 98 + RANDOM_LONG(0,3));
break;
}
// Push the player
Vector vecDir = pev->velocity.Normalize();
pOther->pev->flags &= ~FL_ONGROUND;
((CBasePlayer*)pOther)->m_vecHitVelocity = vecDir * DISC_PUSH_MULTIPLIER;
// Shield flash only if the player isnt frozen
if ( ((CBasePlayer*)pOther)->m_iFrozen == false )
{
pOther->pev->renderfx = kRenderFxGlowShell;
pOther->pev->rendercolor.x = 255;
pOther->pev->renderamt = 150;
}
((CBasePlayer*)pOther)->m_hLastPlayerToHitMe = m_hOwner;
((CBasePlayer*)pOther)->m_flLastDiscHit = gpGlobals->time;
((CBasePlayer*)pOther)->m_flLastDiscBounces = m_iBounces;
if ( m_bTeleported )
((CBasePlayer*)pOther)->m_flLastDiscHitTeleport = gpGlobals->time;
m_fDontTouchEnemies = gpGlobals->time + 2.0;
}
}
}
}
Hmm. Seems to me that the else if ( m_fDontTouchEnemies < gpGlobals->time) also needs to check if a player is dead, since they shouldn't be touched either. Don't know if that has been cured already?:)
out of curiosity, could someone actually send me the updated code so I know what you are all working with:P
Posts: 651
Threads: 121
Joined: Feb 2003
Reputation:
0
netniV,
I will zip up the Windows version of the Ricochet code and make it available
here. Since everyone who has posted probably has the SDK, I will only zip the ricochet directory and below on "Multiplayer Source" since there have been no changes to date on the common files.
Look for that later tonight or tomorrow.
desNotes
And what about the above bit of code? :-D
Posts: 758
Threads: 46
Joined: Feb 2003
Reputation:
0
netniv, what's a respawn kill? also, how do you hit dead bodies in dm for extra points? i don't play much dm, so i don't really know...i suspect these are easy fixes.
i think what you want to do is in the statement (about 1/4 of the way down your code snippet):
if ( pev->team != pOther->pev->team )
{...
you would want:
if ((pev->team != pOther->pev->team) && (pOther->IsAlive()))
{...
is that right? please pm me. thnx.
Posts: 2,453
Threads: 614
Joined: Jan 2003
Reputation:
0
In DM when you get a decap kill and then hit them again with a push disk thats how you get the extra points.
Is there a way of getting rid of the body right away or making it move down into the pad right away after decap so that the persons disc just go over them.
As to respawn killing what about just making the person so that discs pass through them for say 3 or 4 seconds. This way it gives them time to fully respawn and start moving.
Only problem I can see with this is the person can be passed through what happens if a person or a disc is in them when they turn solid?
Posts: 758
Threads: 46
Joined: Feb 2003
Reputation:
0
thanks for the info gwars.
yeah, i personally would rather see a player get like "vaporized" when decapped. that's probably what i would do for ricochet2. sort of like have them turn into a field of energy which quickly diminishes and have a heavily processed "aaarghhh!!!" voice sample triggered which would trail/morph into a robotic sounding hiss. anyways, i believe that code snippet i posted would fix the "extra pt" problem so i'm going to implement it and test it tonight.
my idea is why not have the player all of a sudden fade out like a ghost when decapped? i think that's possible...but geez, i don't know. i would have to see if the hl engine would allow me to do that. that's one good thing i like about the female model actually...she goes right on her back when decapped.
as far as your idea on the respawn kill...i don't like it much just because when a player spawned, everyone else would be at a disadvantage. unless you made it so the player couldn't fire to for a couple seconds too. i would like to get more feedback before i fix something like that.
Posts: 758
Threads: 46
Joined: Feb 2003
Reputation:
0
i was going to post this under a new topic, but i think it's more fitting here:
i fixed the whole "getting extra points off the dead and decapitated in dm" thing...using the code snipet i posted above in red. however, it is exactly the same logic and idea as netniv was suggesting (equivalent because their is no real need for the nested 'if' statement that i placed the new condition in...doesn't hurt anything though in terms of cycles of course).
to reiterate, if you want to get rid of people exploiting the dead in dm, do this ^_^:
just comment out the original function DiscTouch() belonging to the CDisc class in "disc_weapon_disc.cpp" (as shown in the first post in this thread), and place this modified function directly below it (you could just modify that small chunk of code but be careful in case you want to revert):
void CDisc::DiscTouch ( CBaseEntity *pOther )
{
// Push players backwards
if ( pOther->IsPlayer() )
{
if ( ((CBaseEntity*)m_hOwner) == pOther )
{
if (m_fDontTouchOwner < gpGlobals->time)
{
// Play catch sound
EMIT_SOUND_DYN( pOther->edict(), CHAN_WEAPON, "items/gunpickup2.wav", 1.0, ATTN_NORM, 0, 98 + RANDOM_LONG(0,3));
ReturnToThrower();
}
return;
}
else if ( m_fDontTouchEnemies < gpGlobals->time)
{
// .ASM - netniV's solution to the "extra point" exploit
if ( (pev->team != pOther->pev->team) && (pOther->IsAlive()) ) // end .ASM
{
((CBasePlayer*)pOther)->m_LastHitGroup = HITGROUP_GENERIC;
// Do freeze seperately so you can freeze and shatter a person with a single shot
if ( m_iPowerupFlags & POW_FREEZE && ((CBasePlayer*)pOther)->m_iFrozen == FALSE )
{
// Freeze the player and make them glow blue
EMIT_SOUND_DYN( pOther->edict(), CHAN_WEAPON, "weapons/electro5.wav", 1.0, ATTN_NORM, 0, 98 + RANDOM_LONG(0,3));
((CBasePlayer*)pOther)->Freeze();
// If it's not a decap, return now. If it's a decap, continue to shatter
if ( !m_bDecapitate )
{
m_fDontTouchEnemies = gpGlobals->time + 2.0;
return;
}
}
// Decap or push
if (m_bDecapitate)
{
// Decapitate!
if ( m_bTeleported )
((CBasePlayer*)pOther)->m_flLastDiscHitTeleport = gpGlobals->time;
((CBasePlayer*)pOther)->Decapitate( ((CBaseEntity*)m_hOwner)->pev );
m_fDontTouchEnemies = gpGlobals->time + 0.5;
}
else
{
// Play thwack sound
switch( RANDOM_LONG(0,2) )
{
case 0:
EMIT_SOUND_DYN( pOther->edict(), CHAN_ITEM, "weapons/cbar_hitbod1.wav", 1.0, ATTN_NORM, 0, 98 + RANDOM_LONG(0,3));
break;
case 1:
EMIT_SOUND_DYN( pOther->edict(), CHAN_ITEM, "weapons/cbar_hitbod2.wav", 1.0, ATTN_NORM, 0, 98 + RANDOM_LONG(0,3));
break;
case 2:
EMIT_SOUND_DYN( pOther->edict(), CHAN_ITEM, "weapons/cbar_hitbod3.wav", 1.0, ATTN_NORM, 0, 98 + RANDOM_LONG(0,3));
break;
}
// Push the player
Vector vecDir = pev->velocity.Normalize();
pOther->pev->flags &= ~FL_ONGROUND;
((CBasePlayer*)pOther)->m_vecHitVelocity = vecDir * DISC_PUSH_MULTIPLIER;
// Shield flash only if the player isnt frozen
if ( ((CBasePlayer*)pOther)->m_iFrozen == false )
{
pOther->pev->renderfx = kRenderFxGlowShell;
pOther->pev->rendercolor.x = 255;
pOther->pev->renderamt = 150;
}
((CBasePlayer*)pOther)->m_hLastPlayerToHitMe = m_hOwner;
((CBasePlayer*)pOther)->m_flLastDiscHit = gpGlobals->time;
((CBasePlayer*)pOther)->m_flLastDiscBounces = m_iBounces;
if ( m_bTeleported )
((CBasePlayer*)pOther)->m_flLastDiscHitTeleport = gpGlobals->time;
m_fDontTouchEnemies = gpGlobals->time + 2.0;
}
}
}
}
That's pretty much what I thought... though I'm a code efficiency freak so I tend to merge 'if' statements if it's all part of the same block:)
|
