From 3dc3e5eca7358a09c7be412b6b735cd38a3eced3 Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Sat, 2 Nov 2013 20:45:51 +0100 Subject: Zombies and Skeletons don't walk into the sun anymore. --- source/Mobs/Skeleton.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'source/Mobs/Skeleton.cpp') diff --git a/source/Mobs/Skeleton.cpp b/source/Mobs/Skeleton.cpp index 37a724848..3ca3ebbf7 100644 --- a/source/Mobs/Skeleton.cpp +++ b/source/Mobs/Skeleton.cpp @@ -3,6 +3,8 @@ #include "Skeleton.h" #include "../World.h" +#include "../Entities/ProjectileEntity.h" +#include "../Entities/Entity.h" @@ -28,3 +30,16 @@ void cSkeleton::GetDrops(cItems & a_Drops, cEntity * a_Killer) + +void cSkeleton::MoveToPosition(const Vector3f & a_Position) +{ + m_Destination = a_Position; + + // If the destination is in the sun and if it is not night AND the skeleton isn't on fire then block the movement. + if ((m_World->GetBlockSkyLight((int) a_Position.x, (int) a_Position.y, (int) a_Position.z) == 15) && (m_World->GetTimeOfDay() < 13187) && !IsOnFire()) + { + m_bMovingToDestination = false; + return; + } + m_bMovingToDestination = true; +} \ No newline at end of file -- cgit v1.2.3 From 6f0f620cf85337ee6175ab599a52cf3ff0e2d5c9 Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Sat, 2 Nov 2013 21:32:55 +0100 Subject: Skeleton.cpp doesn't have to load ProjectileEntity.h and Entity.h. --- source/Mobs/Skeleton.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'source/Mobs/Skeleton.cpp') diff --git a/source/Mobs/Skeleton.cpp b/source/Mobs/Skeleton.cpp index 3ca3ebbf7..578b5eb67 100644 --- a/source/Mobs/Skeleton.cpp +++ b/source/Mobs/Skeleton.cpp @@ -3,9 +3,6 @@ #include "Skeleton.h" #include "../World.h" -#include "../Entities/ProjectileEntity.h" -#include "../Entities/Entity.h" - -- cgit v1.2.3 From 7cfcfc5f398f133f339a4dd8c87b5e02d8043fd3 Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Mon, 4 Nov 2013 21:46:56 +0100 Subject: Skeleton, Ghast and Blaze's projectile code is now in their respective class. --- source/Mobs/Skeleton.cpp | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'source/Mobs/Skeleton.cpp') diff --git a/source/Mobs/Skeleton.cpp b/source/Mobs/Skeleton.cpp index 578b5eb67..6a1068337 100644 --- a/source/Mobs/Skeleton.cpp +++ b/source/Mobs/Skeleton.cpp @@ -33,10 +33,37 @@ void cSkeleton::MoveToPosition(const Vector3f & a_Position) m_Destination = a_Position; // If the destination is in the sun and if it is not night AND the skeleton isn't on fire then block the movement. - if ((m_World->GetBlockSkyLight((int) a_Position.x, (int) a_Position.y, (int) a_Position.z) == 15) && (m_World->GetTimeOfDay() < 13187) && !IsOnFire()) + if (!IsOnFire() && m_World->GetTimeOfDay() < 13187 && m_World->GetBlockSkyLight((int) a_Position.x, (int) a_Position.y, (int) a_Position.z) == 15) { m_bMovingToDestination = false; return; } m_bMovingToDestination = true; +} + + + + +void cSkeleton::Attack(float a_Dt) +{ + m_AttackInterval += a_Dt * m_AttackRate; + + if (m_Target != NULL && m_AttackInterval > 3.0) + { + // Setting this higher gives us more wiggle room for attackrate + Vector3d Speed = GetLookVector() * 20; + Speed.y = Speed.y + 1; + cArrowEntity * Arrow = new cArrowEntity(this, GetPosX(), GetPosY() + 1, GetPosZ(), Speed); + if (Arrow == NULL) + { + return; + } + if (!Arrow->Initialize(m_World)) + { + delete Arrow; + return; + } + m_World->BroadcastSpawnEntity(*Arrow); + m_AttackInterval = 0.0; + } } \ No newline at end of file -- cgit v1.2.3 From c84bd79eff56865f4754f22313c3a4c970b6aa3f Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Tue, 5 Nov 2013 16:24:54 +0100 Subject: Fixed indentation. --- source/Mobs/Skeleton.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'source/Mobs/Skeleton.cpp') diff --git a/source/Mobs/Skeleton.cpp b/source/Mobs/Skeleton.cpp index 6a1068337..509c2191e 100644 --- a/source/Mobs/Skeleton.cpp +++ b/source/Mobs/Skeleton.cpp @@ -44,6 +44,7 @@ void cSkeleton::MoveToPosition(const Vector3f & a_Position) + void cSkeleton::Attack(float a_Dt) { m_AttackInterval += a_Dt * m_AttackRate; -- cgit v1.2.3