q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 10:20:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ptitSeb/Serious-Engine

Browse Source
This commit is contained in:
ptitSeb 2016-04-07 15:20:20 +02:00
commit 6cc2a36a34
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Sources/EntitiesMP/Devil.es Normal file → Executable file
View File

@ -1568,7 +1568,7 @@ procedures:
} }
InflictHoofDamage( DEVIL_HIT_HOOF_OFFSET); InflictHoofDamage( DEVIL_HIT_HOOF_OFFSET);
autowait(GetModelObject()->GetAnimLength(DEVIL_ANIM_ATTACKCLOSE-1.4f)-_pTimer->TickQuantum); autowait(GetModelObject()->GetAnimLength(DEVIL_ANIM_ATTACKCLOSE)-1.4f-_pTimer->TickQuantum); // misplaced ) here ???
return EReturn(); return EReturn();
}; };
@ -1599,7 +1599,7 @@ procedures:
case DAP_PLAYER_HUNT: case DAP_PLAYER_HUNT:
if( _pTimer->CurrentTick()-m_tmLastAngry > 10.0f) if( _pTimer->CurrentTick()-m_tmLastAngry > 10.0f)
{ {
m_fAttackFireTime = 7.5+FRnd()*5; m_fAttackFireTime = 7.5f+FRnd()*5.0f;
m_tmLastAngry = _pTimer->CurrentTick(); m_tmLastAngry = _pTimer->CurrentTick();
SelectRandomAnger(); SelectRandomAnger();
jump Angry(); jump Angry();
@ -1715,7 +1715,7 @@ procedures:
FLOAT3D vShooting = GetPlacement().pl_PositionVector; FLOAT3D vShooting = GetPlacement().pl_PositionVector;
FLOAT3D vTarget = m_penEnemy->GetPlacement().pl_PositionVector; FLOAT3D vTarget = m_penEnemy->GetPlacement().pl_PositionVector;
FLOAT fDistanceFactor = 1.0f-ClampUp( (vShooting-vTarget).Length()/250.0f, 1.0f); FLOAT fDistanceFactor = 1.0f-ClampUp( (vShooting-vTarget).Length()/250.0f, 1.0f);
fWantedPitch = 20-fDistanceFactor*50.0f; fWantedPitch = 20.0f-fDistanceFactor*50.0f;
} }
CAttachmentModelObject &amo = *GetModelObject()->GetAttachmentModel(m_iAttID); CAttachmentModelObject &amo = *GetModelObject()->GetAttachmentModel(m_iAttID);
@ -2028,7 +2028,7 @@ procedures:
autowait( m_tmLastPause); autowait( m_tmLastPause);
// fire one guided projectile // fire one guided projectile
ShootProjectile(PRT_DEVIL_GUIDED_PROJECTILE, MAGIC_PROJECTILE_EXIT, ShootProjectile(PRT_DEVIL_GUIDED_PROJECTILE, MAGIC_PROJECTILE_EXIT,
ANGLE3D( AngleDeg(10.0f*Cos(m_iFiredProjectiles*360.0/6.0f)), -AngleDeg(20.0f*Sin(m_iFiredProjectiles*180.0/6.0f)), 0)); ANGLE3D( AngleDeg(10.0f*Cos(m_iFiredProjectiles*360.0f/6.0f)), -AngleDeg(20.0f*Sin(m_iFiredProjectiles*180.0f/6.0f)), 0));
PlayWeaponSound( SOUND_ATTACK_BREATH_FIRE); PlayWeaponSound( SOUND_ATTACK_BREATH_FIRE);
autowait(0.8f-m_tmLastPause); autowait(0.8f-m_tmLastPause);
@ -2244,9 +2244,9 @@ procedures:
SetHealth(5000); SetHealth(5000);
} }
m_fMaxHealth = BOSS_HEALTH; m_fMaxHealth = BOSS_HEALTH;
m_fBlowUpAmount = 1e6; m_fBlowUpAmount = 1e6f;
m_fBodyParts = 6; m_fBodyParts = 6.0f;
m_fDamageWounded = 1e9; m_fDamageWounded = 1e9f;
en_fDensity = 2500.0f; en_fDensity = 2500.0f;
m_bHasUpperWeapons = FALSE; m_bHasUpperWeapons = FALSE;
m_bRenderElectricity = FALSE; m_bRenderElectricity = FALSE;