summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.cpp25
-rw-r--r--src/Entities/Floater.cpp185
-rw-r--r--src/Entities/Floater.h19
-rw-r--r--src/Entities/Player.cpp70
-rw-r--r--src/Entities/Player.h3
5 files changed, 273 insertions, 29 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 8fcdcc82f..8a74c9da4 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -13,6 +13,7 @@
#include "../Bindings/PluginManager.h"
#include "../Tracer.h"
#include "Minecart.h"
+#include "Player.h"
@@ -239,10 +240,14 @@ void cEntity::TakeDamage(eDamageType a_DamageType, cEntity * a_Attacker, int a_R
TDI.Attacker = a_Attacker;
TDI.RawDamage = a_RawDamage;
TDI.FinalDamage = a_FinalDamage;
- Vector3d Heading;
- Heading.x = sin(GetRotation());
- Heading.y = 0.4; // TODO: adjust the amount of "up" knockback when testing
- Heading.z = cos(GetRotation());
+
+ Vector3d Heading(0, 0, 0);
+ if (a_Attacker != NULL)
+ {
+ Heading = a_Attacker->GetLookVector() * (a_Attacker->IsSprinting() ? 10 : 8);
+ }
+ Heading.y = 2;
+
TDI.Knockback = Heading * a_KnockbackAmount;
DoTakeDamage(TDI);
}
@@ -297,6 +302,16 @@ void cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
return;
}
+ if ((a_TDI.Attacker != NULL) && (a_TDI.Attacker->IsPlayer()))
+ {
+ // IsOnGround() only is false if the player is moving downwards
+ if (!((cPlayer *)a_TDI.Attacker)->IsOnGround()) // TODO: Better damage increase, and check for enchantments (and use magic critical instead of plain)
+ {
+ a_TDI.FinalDamage += 2;
+ m_World->BroadcastEntityAnimation(*this, 4); // Critical hit
+ }
+ }
+
m_Health -= (short)a_TDI.FinalDamage;
// TODO: Apply damage to armor
@@ -306,6 +321,8 @@ void cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
m_Health = 0;
}
+ AddSpeed(a_TDI.Knockback * 2);
+
m_World->BroadcastEntityStatus(*this, ENTITY_STATUS_HURT);
if (m_Health <= 0)
diff --git a/src/Entities/Floater.cpp b/src/Entities/Floater.cpp
index ac7a82f91..dfe77f059 100644
--- a/src/Entities/Floater.cpp
+++ b/src/Entities/Floater.cpp
@@ -1,6 +1,8 @@
#include "Globals.h"
+#include "../BoundingBox.h"
+#include "../Chunk.h"
#include "Floater.h"
#include "Player.h"
#include "../ClientHandle.h"
@@ -9,11 +11,103 @@
-cFloater::cFloater(double a_X, double a_Y, double a_Z, Vector3d a_Speed, int a_PlayerID) :
- cEntity(etFloater, a_X, a_Y, a_Z, 0.98, 0.98),
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// cFloaterEntityCollisionCallback
+class cFloaterEntityCollisionCallback :
+ public cEntityCallback
+{
+public:
+ cFloaterEntityCollisionCallback(cFloater * a_Floater, const Vector3d & a_Pos, const Vector3d & a_NextPos) :
+ m_Floater(a_Floater),
+ m_Pos(a_Pos),
+ m_NextPos(a_NextPos),
+ m_MinCoeff(1),
+ m_HitEntity(NULL)
+ {
+ }
+ virtual bool Item(cEntity * a_Entity) override
+ {
+ if (!a_Entity->IsMob()) // Floaters can only pull mobs not other entities.
+ {
+ return false;
+ }
+
+ cBoundingBox EntBox(a_Entity->GetPosition(), a_Entity->GetWidth() / 2, a_Entity->GetHeight());
+
+ double LineCoeff;
+ char Face;
+ EntBox.Expand(m_Floater->GetWidth() / 2, m_Floater->GetHeight() / 2, m_Floater->GetWidth() / 2);
+ if (!EntBox.CalcLineIntersection(m_Pos, m_NextPos, LineCoeff, Face))
+ {
+ // No intersection whatsoever
+ return false;
+ }
+
+ if (LineCoeff < m_MinCoeff)
+ {
+ // The entity is closer than anything we've stored so far, replace it as the potential victim
+ m_MinCoeff = LineCoeff;
+ m_HitEntity = a_Entity;
+ }
+
+ // Don't break the enumeration, we want all the entities
+ return false;
+ }
+
+ /// Returns the nearest entity that was hit, after the enumeration has been completed
+ cEntity * GetHitEntity(void) const { return m_HitEntity; }
+
+ /// Returns true if the callback has encountered a true hit
+ bool HasHit(void) const { return (m_MinCoeff < 1); }
+
+protected:
+ cFloater * m_Floater;
+ const Vector3d & m_Pos;
+ const Vector3d & m_NextPos;
+ double m_MinCoeff; // The coefficient of the nearest hit on the Pos line
+
+ // Although it's bad(tm) to store entity ptrs from a callback, we can afford it here, because the entire callback
+ // is processed inside the tick thread, so the entities won't be removed in between the calls and the final processing
+ cEntity * m_HitEntity; // The nearest hit entity
+} ;
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// cFloaterCheckEntityExist
+class cFloaterCheckEntityExist :
+ public cEntityCallback
+{
+public:
+ cFloaterCheckEntityExist(void) :
+ m_EntityExists(false)
+ {
+ }
+
+ bool Item(cEntity * a_Entity) override
+ {
+ m_EntityExists = true;
+ return false;
+ }
+
+ bool DoesExist(void) const { return m_EntityExists; }
+protected:
+ bool m_EntityExists;
+} ;
+
+
+
+
+
+cFloater::cFloater(double a_X, double a_Y, double a_Z, Vector3d a_Speed, int a_PlayerID, int a_CountDownTime) :
+ cEntity(etFloater, a_X, a_Y, a_Z, 0.2, 0.2),
m_PickupCountDown(0),
m_PlayerID(a_PlayerID),
- m_CanPickupItem(false)
+ m_CanPickupItem(false),
+ m_CountDownTime(a_CountDownTime),
+ m_AttachedMobID(-1)
{
SetSpeed(a_Speed);
}
@@ -36,21 +130,49 @@ void cFloater::Tick(float a_Dt, cChunk & a_Chunk)
HandlePhysics(a_Dt, a_Chunk);
if (IsBlockWater(m_World->GetBlock((int) GetPosX(), (int) GetPosY(), (int) GetPosZ())) && m_World->GetBlockMeta((int) GetPosX(), (int) GetPosY(), (int) GetPosZ()) == 0)
{
- if ((!m_CanPickupItem) && (m_World->GetTickRandomNumber(100) == 0))
- {
- SetPosY(GetPosY() - 1);
- m_CanPickupItem = true;
- m_PickupCountDown = 20;
- LOGD("Floater %i can be picked up", GetUniqueID());
- }
- else
+ if ((!m_CanPickupItem) && (m_AttachedMobID == -1)) // Check if you can't already pickup a fish and if the floater isn't attached to a mob.
{
- SetSpeedY(0.7);
+ if (m_CountDownTime <= 0)
+ {
+ m_World->BroadcastSoundEffect("random.splash", (int) floor(GetPosX() * 8), (int) floor(GetPosY() * 8), (int) floor(GetPosZ() * 8), 1, 1);
+ SetPosY(GetPosY() - 1);
+ m_CanPickupItem = true;
+ m_PickupCountDown = 20;
+ m_CountDownTime = 100 + m_World->GetTickRandomNumber(800);
+ LOGD("Floater %i can be picked up", GetUniqueID());
+ }
+ else if (m_CountDownTime == 20) // Calculate the position where the particles should spawn and start producing them.
+ {
+ LOGD("Started producing particles for floater %i", GetUniqueID());
+ m_ParticlePos.Set(GetPosX() + (-4 + m_World->GetTickRandomNumber(8)), GetPosY(), GetPosZ() + (-4 + m_World->GetTickRandomNumber(8)));
+ m_World->BroadcastParticleEffect("splash", (float) m_ParticlePos.x, (float) m_ParticlePos.y, (float) m_ParticlePos.z, 0, 0, 0, 0, 15);
+ }
+ else if (m_CountDownTime < 20)
+ {
+ m_ParticlePos = (m_ParticlePos + (GetPosition() - m_ParticlePos) / 6);
+ m_World->BroadcastParticleEffect("splash", (float) m_ParticlePos.x, (float) m_ParticlePos.y, (float) m_ParticlePos.z, 0, 0, 0, 0, 15);
+ }
+
+ m_CountDownTime--;
+ if (m_World->GetHeight((int) GetPosX(), (int) GetPosZ()) == (int) GetPosY())
+ {
+ if (m_World->IsWeatherWet() && m_World->GetTickRandomNumber(3) == 0) // 25% chance of an extra countdown when being rained on.
+ {
+ m_CountDownTime--;
+ }
+ }
+ else // if the floater is underground it has a 50% chance of not decreasing the countdown.
+ {
+ if (m_World->GetTickRandomNumber(1) == 0)
+ {
+ m_CountDownTime++;
+ }
+ }
}
+ SetSpeedY(0.7);
}
- SetSpeedX(GetSpeedX() * 0.95);
- SetSpeedZ(GetSpeedZ() * 0.95);
- if (CanPickup())
+
+ if (CanPickup()) // Make sure the floater "loses its fish"
{
m_PickupCountDown--;
if (m_PickupCountDown == 0)
@@ -59,9 +181,38 @@ void cFloater::Tick(float a_Dt, cChunk & a_Chunk)
LOGD("The fish is gone. Floater %i can not pick an item up.", GetUniqueID());
}
}
- BroadcastMovementUpdate();
-}
+ if ((GetSpeed().Length() > 4) && (m_AttachedMobID == -1))
+ {
+ cFloaterEntityCollisionCallback Callback(this, GetPosition(), GetPosition() + GetSpeed() / 20);
+
+ a_Chunk.ForEachEntity(Callback);
+ if (Callback.HasHit())
+ {
+ AttachTo(Callback.GetHitEntity());
+ Callback.GetHitEntity()->TakeDamage(*this); // TODO: the player attacked the mob not the floater.
+ m_AttachedMobID = Callback.GetHitEntity()->GetUniqueID();
+ }
+ }
+ cFloaterCheckEntityExist EntityCallback;
+ m_World->DoWithEntityByID(m_PlayerID, EntityCallback);
+ if (!EntityCallback.DoesExist()) // The owner doesn't exist anymore. Destroy the floater entity.
+ {
+ Destroy(true);
+ }
+ if (m_AttachedMobID != -1)
+ {
+ m_World->DoWithEntityByID(m_AttachedMobID, EntityCallback); // The mob the floater was attached to doesn't exist anymore.
+ if (!EntityCallback.DoesExist())
+ {
+ m_AttachedMobID = -1;
+ }
+ }
+
+ SetSpeedX(GetSpeedX() * 0.95);
+ SetSpeedZ(GetSpeedZ() * 0.95);
+ BroadcastMovementUpdate();
+} \ No newline at end of file
diff --git a/src/Entities/Floater.h b/src/Entities/Floater.h
index 9bc5039f8..4bbe3f352 100644
--- a/src/Entities/Floater.h
+++ b/src/Entities/Floater.h
@@ -14,16 +14,27 @@ class cFloater :
public:
- cFloater(double a_X, double a_Y, double a_Z, Vector3d a_Speed, int a_PlayerID);
+ cFloater(double a_X, double a_Y, double a_Z, Vector3d a_Speed, int a_PlayerID, int a_CountDownTime);
virtual void SpawnOn(cClientHandle & a_Client) override;
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
- bool CanPickup(void) const { return m_CanPickupItem; }
+ bool CanPickup(void) const { return m_CanPickupItem; }
+ int GetOwnerID(void) const { return m_PlayerID; }
+ int GetAttachedMobID(void) const { return m_AttachedMobID; }
protected:
- Vector3d m_Speed;
+ // Position
+ Vector3d m_ParticlePos;
+
+ // Bool needed to check if you can get a fish.
+ bool m_CanPickupItem;
+
+ // Countdown times
int m_PickupCountDown;
+ int m_CountDownTime;
+
+ // Entity IDs
int m_PlayerID;
- bool m_CanPickupItem;
+ int m_AttachedMobID;
} ; \ No newline at end of file
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 8f30cd4cc..67d5a47ef 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -240,6 +240,11 @@ void cPlayer::Tick(float a_Dt, cChunk & a_Chunk)
HandleFood();
}
+ if (m_IsFishing)
+ {
+ HandleFloater();
+ }
+
// Send Player List (Once per m_LastPlayerListTime/1000 ms)
cTimer t1;
if (m_LastPlayerListTime + cPlayer::PLAYER_LIST_TIME_MS <= t1.GetNowTime())
@@ -247,6 +252,11 @@ void cPlayer::Tick(float a_Dt, cChunk & a_Chunk)
m_World->SendPlayerList(this);
m_LastPlayerListTime = t1.GetNowTime();
}
+
+ if (IsFlying())
+ {
+ m_LastGroundHeight = (float)GetPosY();
+ }
}
@@ -447,10 +457,16 @@ void cPlayer::SetTouchGround(bool a_bTouchGround)
if (m_LastJumpHeight > m_LastGroundHeight) Damage++;
m_LastJumpHeight = (float)GetPosY();
- if ((Damage > 0) && (!IsGameModeCreative()))
+ if (Damage > 0)
{
- TakeDamage(dtFalling, NULL, Damage, Damage, 0);
- }
+ if (!IsGameModeCreative())
+ {
+ TakeDamage(dtFalling, NULL, Damage, Damage, 0);
+ }
+
+ // Mojang uses floor() to get X and Z positions, instead of just casting it to an (int)
+ GetWorld()->BroadcastSoundParticleEffect(2006, (int)floor(GetPosX()), (int)GetPosY() - 1, (int)floor(GetPosZ()), Damage /* Used as particle effect speed modifier */);
+ }
m_LastGroundHeight = (float)GetPosY();
}
@@ -804,6 +820,22 @@ void cPlayer::KilledBy(cEntity * a_Killer)
m_Inventory.Clear();
m_World->SpawnItemPickups(Pickups, GetPosX(), GetPosY(), GetPosZ(), 10);
SaveToDisk(); // Save it, yeah the world is a tough place !
+
+ if (a_Killer == NULL)
+ {
+ GetWorld()->BroadcastChat(Printf("%s[DEATH] %s%s was killed by environmental damage", cChatColor::Red.c_str(), cChatColor::White.c_str(), GetName().c_str()));
+ }
+ else if (a_Killer->IsPlayer())
+ {
+ GetWorld()->BroadcastChat(Printf("%s[DEATH] %s%s was killed by %s", cChatColor::Red.c_str(), cChatColor::White.c_str(), GetName().c_str(), ((cPlayer *)a_Killer)->GetName().c_str()));
+ }
+ else
+ {
+ AString KillerClass = a_Killer->GetClass();
+ KillerClass.erase(KillerClass.begin()); // Erase the 'c' of the class (e.g. "cWitch" -> "Witch")
+
+ GetWorld()->BroadcastChat(Printf("%s[DEATH] %s%s was killed by a %s", cChatColor::Red.c_str(), cChatColor::White.c_str(), GetName().c_str(), KillerClass.c_str()));
+ }
}
@@ -974,6 +1006,12 @@ void cPlayer::SetGameMode(eGameMode a_GameMode)
m_GameMode = a_GameMode;
m_ClientHandle->SendGameMode(a_GameMode);
+
+ if (!IsGameModeCreative())
+ {
+ SetFlying(false);
+ SetCanFly(false);
+ }
}
@@ -1289,7 +1327,7 @@ AString cPlayer::GetColor(void) const
{
if ( m_Color != '-' )
{
- return cChatColor::MakeColor( m_Color );
+ return cChatColor::Color + m_Color;
}
if ( m_Groups.size() < 1 )
@@ -1781,6 +1819,30 @@ void cPlayer::HandleFood(void)
+void cPlayer::HandleFloater()
+{
+ if (GetEquippedItem().m_ItemType == E_ITEM_FISHING_ROD)
+ {
+ return;
+ }
+ class cFloaterCallback :
+ public cEntityCallback
+ {
+ public:
+ virtual bool Item(cEntity * a_Entity) override
+ {
+ a_Entity->Destroy(true);
+ return true;
+ }
+ } Callback;
+ m_World->DoWithEntityByID(m_FloaterID, Callback);
+ SetIsFishing(false);
+}
+
+
+
+
+
void cPlayer::ApplyFoodExhaustionFromMovement()
{
if (IsGameModeCreative())
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 241eb3050..0a3f50d19 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -466,6 +466,9 @@ protected:
/// Called in each tick to handle food-related processing
void HandleFood(void);
+
+ /// Called in each tick if the player is fishing to make sure the floater dissapears when the player doesn't have a fishing rod as equipped item.
+ void HandleFloater(void);
/// Called in each tick to handle air-related processing i.e. drowning
void HandleAir();
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 12:50:16 +0100