mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 13:36:40 +00:00
Code Issues Releases Wiki Activity

Streamline hit/follow animation key construction

Browse source
This commit is contained in:
Alexei Kotov 2022-08-09 14:17:30 +03:00
parent 2e112847be
commit 1b3baa812a
1 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1689,35 +1689,23 @@ bool CharacterController::updateWeaponState()
playSwishSound(0.0f);
}
if(mAttackType == "shoot")
{
start = mAttackType+" min hit";
stop = mAttackType+" release";
}
else
{
start = mAttackType+" min hit";
stop = mAttackType+" hit";
}
std::string hit = mAttackType == "shoot" ? "release" : "hit";
start = mAttackType + " min hit";
stop = mAttackType + ' ' + hit;
mUpperBodyState = UpperBodyState::AttackHit;
break;
}
case UpperBodyState::AttackHit:
if(mAttackType == "shoot")
start = "follow start";
stop = "follow stop";
if (mAttackType != "shoot")
{
start = mAttackType+" follow start";
stop = mAttackType+" follow stop";
}
else
{
float str = mAttackStrength;
start = mAttackType+((str < 0.5f) ? " small follow start"
: (str < 1.0f) ? " medium follow start"
: " large follow start");
stop = mAttackType+((str < 0.5f) ? " small follow stop"
: (str < 1.0f) ? " medium follow stop"
: " large follow stop");
std::string strength = mAttackStrength < 0.5f ? "small" : mAttackStrength < 1.f ? "medium" : "large";
start = strength + ' ' + start;
stop = strength + ' ' + stop;
}
start = mAttackType + ' ' + start;
stop = mAttackType + ' ' + stop;
mUpperBodyState = UpperBodyState::AttackEnd;
break;
default: