mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 11:23:51 +00:00
Code Issues Releases Wiki Activity

AI now continue to hit you.

Browse source 
TODO: change the way time is handled
This commit is contained in:
gus 2013-09-28 21:17:06 +02:00
parent 2537384c50
commit 83a375b55d
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/openmw/mwmechanics/aicombat.cpp
View file

@ -14,7 +14,7 @@ namespace MWMechanics
{ {
AiCombat::AiCombat(const std::string &targetId) AiCombat::AiCombat(const std::string &targetId)
:mTargetId(targetId) :mTargetId(targetId),mStartingSecond(0)
{ {
} }
@ -28,7 +28,7 @@ namespace MWMechanics
MWMechanics::DrawState_ state = MWWorld::Class::get(actor).getNpcStats(actor).getDrawState(); MWMechanics::DrawState_ state = MWWorld::Class::get(actor).getNpcStats(actor).getDrawState();
if (state == MWMechanics::DrawState_Spell || state == MWMechanics::DrawState_Nothing) if (state == MWMechanics::DrawState_Spell || state == MWMechanics::DrawState_Nothing)
MWWorld::Class::get(actor).getNpcStats(actor).setDrawState(MWMechanics::DrawState_Weapon); MWWorld::Class::get(actor).getNpcStats(actor).setDrawState(MWMechanics::DrawState_Weapon);
MWWorld::Class::get(actor).getCreatureStats(actor).setAttackingOrSpell(true); //MWWorld::Class::get(actor).getCreatureStats(actor).setAttackingOrSpell(true);
ESM::Position pos = actor.getRefData().getPosition(); ESM::Position pos = actor.getRefData().getPosition();
const ESM::Pathgrid *pathgrid = const ESM::Pathgrid *pathgrid =
@ -59,7 +59,7 @@ namespace MWMechanics
mPathFinder.buildPath(start, dest, pathgrid, xCell, yCell, true); mPathFinder.buildPath(start, dest, pathgrid, xCell, yCell, true);
mPathFinder.checkPathCompleted(pos.pos[0],pos.pos[1],pos.pos[2]) mPathFinder.checkPathCompleted(pos.pos[0],pos.pos[1],pos.pos[2]);
float zAngle = mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]); float zAngle = mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]);
std::cout << zAngle; std::cout << zAngle;
@ -71,6 +71,17 @@ namespace MWMechanics
if((dest.mX - start.mX)*(dest.mX - start.mX)+(dest.mY - start.mY)*(dest.mY - start.mY)+(dest.mZ - start.mZ)*(dest.mZ - start.mZ) if((dest.mX - start.mX)*(dest.mX - start.mX)+(dest.mY - start.mY)*(dest.mY - start.mY)+(dest.mZ - start.mZ)*(dest.mZ - start.mZ)
< range*range) < range*range)
{ {
MWWorld::TimeStamp time = MWBase::Environment::get().getWorld()->getTimeStamp();
if(mStartingSecond == 0)
{
MWWorld::Class::get(actor).getCreatureStats(actor).setAttackingOrSpell(false);
mStartingSecond = ((time.getHour() - int(time.getHour())) * 100);
}
else if( ((time.getHour() - int(time.getHour())) * 100) - mStartingSecond > 1)
{
MWWorld::Class::get(actor).getCreatureStats(actor).setAttackingOrSpell(true);
mStartingSecond = 0;
}
MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 0; MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 0;
//MWWorld::Class::get(actor).getCreatureStats(actor).setAttackingOrSpell(!MWWorld::Class::get(actor).getCreatureStats(actor).getAttackingOrSpell()); //MWWorld::Class::get(actor).getCreatureStats(actor).setAttackingOrSpell(!MWWorld::Class::get(actor).getCreatureStats(actor).getAttackingOrSpell());
} }

1
apps/openmw/mwmechanics/aicombat.hpp
View file

@ -33,6 +33,7 @@ namespace MWMechanics
std::string mTargetId; std::string mTargetId;
PathFinder mPathFinder; PathFinder mPathFinder;
unsigned int mStartingSecond;
}; };
} }