mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-05 09:15:33 +00:00
Code Issues Releases Wiki Activity

Handle spell-casting animation sequences

Browse source
This commit is contained in:
Chris Robinson 2013-07-23 07:30:54 -07:00
parent 4d157cb19a
commit 17282c69b1
2 changed files with 51 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
apps/openmw/mwmechanics/character.cpp
View file

@ -298,6 +298,7 @@ void CharacterController::updatePtr(const MWWorld::Ptr &ptr)
bool CharacterController::updateNpcState() bool CharacterController::updateNpcState()
{ {
const MWWorld::Class &cls = MWWorld::Class::get(mPtr); const MWWorld::Class &cls = MWWorld::Class::get(mPtr);
CreatureStats &crstats = cls.getCreatureStats(mPtr);
NpcStats &stats = cls.getNpcStats(mPtr); NpcStats &stats = cls.getNpcStats(mPtr);
WeaponType weaptype = WeapType_None; WeaponType weaptype = WeapType_None;
MWWorld::InventoryStore &inv = cls.getInventoryStore(mPtr); MWWorld::InventoryStore &inv = cls.getInventoryStore(mPtr);
@ -411,16 +412,41 @@ bool CharacterController::updateNpcState()
float complete; float complete;
bool animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete); bool animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
if(cls.getCreatureStats(mPtr).getAttackingOrSpell()) if(crstats.getAttackingOrSpell())
{ {
if(mUpperBodyState == UpperCharState_WeapEquiped && mWeaponType != WeapType_PickProbe) if(mUpperBodyState == UpperCharState_WeapEquiped)
{
if(mWeaponType == WeapType_Spell)
{
const std::string spellid = crstats.getSpells().getSelectedSpell();
if(!spellid.empty())
{
const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
const ESM::Spell *spell = store.get<ESM::Spell>().find(spellid);
switch(spell->mEffects.mList.at(0).mRange)
{
case 0: mAttackType = "self"; break;
case 1: mAttackType = "touch"; break;
case 2: mAttackType = "target"; break;
default: mAttackType = ""; break;
}
mAnimation->play(mCurrentWeapon, Priority_Weapon,
MWRender::Animation::Group_UpperBody, true,
weapSpeed, mAttackType+" start", mAttackType+" stop",
0.0f, 0);
mUpperBodyState = UpperCharState_CastingSpell;
}
}
else if(mWeaponType != WeapType_PickProbe)
{ {
if(mWeaponType == WeapType_Crossbow || mWeaponType == WeapType_BowAndArrow || if(mWeaponType == WeapType_Crossbow || mWeaponType == WeapType_BowAndArrow ||
mWeaponType == WeapType_ThowWeapon) mWeaponType == WeapType_ThowWeapon)
mAttackType = "shoot"; mAttackType = "shoot";
else else
{ {
int attackType = cls.getCreatureStats(mPtr).getAttackType(); int attackType = crstats.getAttackType();
if(isWeapon && Settings::Manager::getBool("best attack", "Game")) if(isWeapon && Settings::Manager::getBool("best attack", "Game"))
attackType = getBestAttack(weapon->get<ESM::Weapon>()->mBase); attackType = getBestAttack(weapon->get<ESM::Weapon>()->mBase);
@ -439,6 +465,7 @@ bool CharacterController::updateNpcState()
mUpperBodyState = UpperCharState_StartToMinAttack; mUpperBodyState = UpperCharState_StartToMinAttack;
} }
} }
}
else if(mUpperBodyState == UpperCharState_MinAttackToMaxAttack) else if(mUpperBodyState == UpperCharState_MinAttackToMaxAttack)
{ {
mAnimation->disable(mCurrentWeapon); mAnimation->disable(mCurrentWeapon);
@ -452,7 +479,8 @@ bool CharacterController::updateNpcState()
if(!animPlaying) if(!animPlaying)
{ {
if(mUpperBodyState == UpperCharState_EquipingWeap || if(mUpperBodyState == UpperCharState_EquipingWeap ||
mUpperBodyState == UpperCharState_FollowStartToFollowStop) mUpperBodyState == UpperCharState_FollowStartToFollowStop ||
mUpperBodyState == UpperCharState_CastingSpell)
mUpperBodyState = UpperCharState_WeapEquiped; mUpperBodyState = UpperCharState_WeapEquiped;
else if(mUpperBodyState == UpperCharState_UnEquipingWeap) else if(mUpperBodyState == UpperCharState_UnEquipingWeap)
mUpperBodyState = UpperCharState_Nothing; mUpperBodyState = UpperCharState_Nothing;

3
apps/openmw/mwmechanics/character.hpp
View file

@ -104,7 +104,8 @@ enum UpperBodyCharacterState {
UpperCharState_MinAttackToMaxAttack, UpperCharState_MinAttackToMaxAttack,
UpperCharState_MaxAttackToMinHit, UpperCharState_MaxAttackToMinHit,
UpperCharState_MinHitToHit, UpperCharState_MinHitToHit,
UpperCharState_FollowStartToFollowStop UpperCharState_FollowStartToFollowStop,
UpperCharState_CastingSpell
}; };
class CharacterController class CharacterController