- Fixed Bug #99 -> Mobs no longer bother you in creative mode

- refactored many things in the Monster system

git-svn-id: http://mc-server.googlecode.com/svn/trunk@112 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
lapayo94@gmail.com
2011-12-25 22:47:12 +00:00
parent adb4dbc904
commit e8f230f24e
42 changed files with 386 additions and 1238 deletions
+4 -56
View File
@@ -1,28 +1,7 @@
#include "cEnderman.h"
#include "Vector3f.h"
#include "Vector3d.h"
#include "Defines.h"
#include "cRoot.h"
#include "cWorld.h"
#include "cPickup.h"
#include "cItem.h"
#include "cMonsterConfig.h"
#include "cMCLogger.h"
#ifndef _WIN32
#include <stdlib.h> // rand()
#include <cstring>
#endif
cEnderman::cEnderman() : m_ChaseTime(999999) {
m_bBurnable = true;
m_EMPersonality = PASSIVE;
m_bPassiveAggressive = true;
//m_AttackRate = 1;
cEnderman::cEnderman()
{
m_MobType = 58;
GetMonsterConfig("Enderman");
}
@@ -33,7 +12,6 @@ cEnderman::~cEnderman()
bool cEnderman::IsA( const char* a_EntityType )
{
//LOG("IsA( cEnderman ) : %s", a_EntityType);
if( strcmp( a_EntityType, "cEnderman" ) == 0 ) return true;
return cMonster::IsA( a_EntityType );
}
@@ -41,6 +19,8 @@ bool cEnderman::IsA( const char* a_EntityType )
void cEnderman::Tick(float a_Dt)
{
cMonster::Tick(a_Dt);
//TODO Same as stated in cSkeleton
if (GetWorld()->GetWorldTime() < (12000 + 1000) ) { //if daylight
m_EMMetaState = BURNING; // BURN, BABY, BURN! >:D
}
@@ -53,35 +33,3 @@ void cEnderman::KilledBy( cEntity* a_Killer )
cMonster::KilledBy( a_Killer );
}
//What to do if in Idle State
void cEnderman::InStateIdle(float a_Dt) {
cMonster::InStateIdle(a_Dt);
}
//What to do if in Chasing State
void cEnderman::InStateChasing(float a_Dt) {
cMonster::InStateChasing(a_Dt);
m_ChaseTime += a_Dt;
if( m_Target )
{
Vector3f Pos = Vector3f( m_Pos );
Vector3f Their = Vector3f( m_Target->GetPosition() );
if( (Their - Pos).Length() <= m_AttackRange) {
cMonster::Attack(a_Dt);
}
MoveToPosition( Their + Vector3f(0, 0.65f, 0) );
} else if( m_ChaseTime > 5.f ) {
m_ChaseTime = 0;
m_EMState = IDLE;
}
}
void cEnderman::InStateEscaping(float a_Dt) {
cMonster::InStateEscaping(a_Dt);
}
void cEnderman::GetMonsterConfig(const char* pm_name) {
LOG("I am gettin my attributes: %s", pm_name);
cRoot::Get()->GetMonsterConfig()->Get()->AssignAttributes(this,pm_name);
}