summaryrefslogtreecommitdiffstats
path: root/src/Mobs
diff options
context:
space:
mode:
Diffstat (limited to 'src/Mobs')
-rw-r--r--src/Mobs/Guardian.cpp9
-rw-r--r--src/Mobs/Ocelot.h7
-rw-r--r--src/Mobs/Squid.cpp34
-rw-r--r--src/Mobs/Wolf.cpp2
-rw-r--r--src/Mobs/Wolf.h101
5 files changed, 84 insertions, 69 deletions
diff --git a/src/Mobs/Guardian.cpp b/src/Mobs/Guardian.cpp
index 3dbec9928..f36f98ea8 100644
--- a/src/Mobs/Guardian.cpp
+++ b/src/Mobs/Guardian.cpp
@@ -42,20 +42,11 @@ void cGuardian::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
// that is not where the entity currently resides (FS #411)
Vector3d Pos = GetPosition();
- // TODO: Not a real behavior, but cool :D
int RelY = FloorC(Pos.y);
if ((RelY < 0) || (RelY >= cChunkDef::Height))
{
return;
}
- int RelX = FloorC(Pos.x) - a_Chunk.GetPosX() * cChunkDef::Width;
- int RelZ = FloorC(Pos.z) - a_Chunk.GetPosZ() * cChunkDef::Width;
- BLOCKTYPE BlockType;
- if (a_Chunk.UnboundedRelGetBlockType(RelX, RelY, RelZ, BlockType) && !IsBlockWater(BlockType) && !IsOnFire())
- {
- // Burn for 10 ticks, then decide again
- StartBurning(10);
- }
super::Tick(a_Dt, a_Chunk);
}
diff --git a/src/Mobs/Ocelot.h b/src/Mobs/Ocelot.h
index 59b4f25af..75758a973 100644
--- a/src/Mobs/Ocelot.h
+++ b/src/Mobs/Ocelot.h
@@ -2,6 +2,7 @@
#pragma once
#include "PassiveMonster.h"
+#include "../UUID.h"
@@ -40,14 +41,14 @@ public:
bool IsTame (void) const override { return m_IsTame; }
bool IsBegging (void) const { return m_IsBegging; }
AString GetOwnerName (void) const { return m_OwnerName; }
- AString GetOwnerUUID (void) const { return m_OwnerUUID; }
+ cUUID GetOwnerUUID (void) const { return m_OwnerUUID; }
eCatType GetOcelotType (void) const { return m_CatType; }
// Set functions
void SetIsSitting (bool a_IsSitting) { m_IsSitting = a_IsSitting; }
void SetIsTame (bool a_IsTame) { m_IsTame = a_IsTame; }
void SetIsBegging (bool a_IsBegging) { m_IsBegging = a_IsBegging; }
- void SetOwner (const AString & a_NewOwnerName, const AString & a_NewOwnerUUID)
+ void SetOwner (const AString & a_NewOwnerName, const cUUID & a_NewOwnerUUID)
{
m_OwnerName = a_NewOwnerName;
m_OwnerUUID = a_NewOwnerUUID;
@@ -66,7 +67,7 @@ protected:
/** Only check for a nearby player holding the breeding items every 23 ticks. */
int m_CheckPlayerTickCount;
AString m_OwnerName;
- AString m_OwnerUUID;
+ cUUID m_OwnerUUID;
} ;
diff --git a/src/Mobs/Squid.cpp b/src/Mobs/Squid.cpp
index 00cc07e14..8ae688a1b 100644
--- a/src/Mobs/Squid.cpp
+++ b/src/Mobs/Squid.cpp
@@ -46,13 +46,35 @@ void cSquid::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
{
return;
}
- int RelX = FloorC(Pos.x) - a_Chunk.GetPosX() * cChunkDef::Width;
- int RelZ = FloorC(Pos.z) - a_Chunk.GetPosZ() * cChunkDef::Width;
- BLOCKTYPE BlockType;
- if (a_Chunk.UnboundedRelGetBlockType(RelX, RelY, RelZ, BlockType) && !IsBlockWater(BlockType) && !IsOnFire())
+
+ if (!IsSubmerged())
+ {
+ if (m_AirLevel <= 0)
+ {
+ // Runs the air tick timer to check whether the squid should be damaged
+ if (m_AirTickTimer <= 0)
+ {
+ // Damage squid
+ TakeDamage(dtSuffocating, nullptr, 1, 1, 0);
+ // Reset timer
+ m_AirTickTimer = DROWNING_TICKS;
+ }
+ else
+ {
+ m_AirTickTimer--;
+ }
+ }
+ else
+ {
+ // Reduce air supply
+ m_AirLevel--;
+ }
+ }
+ else
{
- // Burn for 10 ticks, then decide again
- StartBurning(10);
+ // Set the air back to maximum
+ m_AirLevel = MAX_AIR_LEVEL;
+ m_AirTickTimer = DROWNING_TICKS;
}
super::Tick(a_Dt, a_Chunk);
diff --git a/src/Mobs/Wolf.cpp b/src/Mobs/Wolf.cpp
index d7ecb3d47..243507855 100644
--- a/src/Mobs/Wolf.cpp
+++ b/src/Mobs/Wolf.cpp
@@ -117,7 +117,7 @@ void cWolf::NotifyAlliesOfFight(cPawn * a_Opponent)
-void cWolf::ReceiveNearbyFightInfo(AString a_PlayerID, cPawn * a_Opponent, bool a_IsPlayerInvolved)
+void cWolf::ReceiveNearbyFightInfo(const cUUID & a_PlayerID, cPawn * a_Opponent, bool a_IsPlayerInvolved)
{
if (
(a_Opponent == nullptr) || IsSitting() || (!IsTame()) ||
diff --git a/src/Mobs/Wolf.h b/src/Mobs/Wolf.h
index 120e10942..07d0b5f27 100644
--- a/src/Mobs/Wolf.h
+++ b/src/Mobs/Wolf.h
@@ -2,6 +2,7 @@
#pragma once
#include "PassiveAggressiveMonster.h"
+#include "../UUID.h"
class cEntity;
@@ -9,62 +10,62 @@ class cEntity;
class cWolf :
- public cPassiveAggressiveMonster
+ public cPassiveAggressiveMonster
{
- typedef cPassiveAggressiveMonster super;
+ typedef cPassiveAggressiveMonster super;
public:
- cWolf(void);
-
- CLASS_PROTODEF(cWolf)
-
- void NotifyAlliesOfFight(cPawn * a_Opponent);
- virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
- virtual void OnRightClicked(cPlayer & a_Player) override;
- virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
- virtual void TickFollowPlayer();
- //virtual bool Attack(std::chrono::milliseconds a_Dt) override;
-
- // Get functions
- bool IsSitting (void) const override { return m_IsSitting; }
- bool IsTame (void) const override { return m_IsTame; }
- bool IsBegging (void) const { return m_IsBegging; }
- bool IsAngry (void) const { return m_IsAngry; }
- AString GetOwnerName (void) const { return m_OwnerName; }
- AString GetOwnerUUID (void) const { return m_OwnerUUID; }
- int GetCollarColor(void) const { return m_CollarColor; }
-
- // Set functions
- void SetIsSitting (bool a_IsSitting) { m_IsSitting = a_IsSitting; }
- void SetIsTame (bool a_IsTame) { m_IsTame = a_IsTame; }
- void SetIsBegging (bool a_IsBegging) { m_IsBegging = a_IsBegging; }
- void SetIsAngry (bool a_IsAngry) { m_IsAngry = a_IsAngry; }
- void SetCollarColor(int a_CollarColor) { m_CollarColor = a_CollarColor; }
- void SetOwner (const AString & a_NewOwnerName, const AString & a_NewOwnerUUID)
- {
- m_OwnerName = a_NewOwnerName;
- m_OwnerUUID = a_NewOwnerUUID;
- }
-
- /** Notfies the wolf of a nearby fight.
- The wolf may then decide to attack a_Opponent.
- If a_IsPlayer is true, then the player whose ID is a_PlayerID is fighting a_Opponent
- If false, then a wolf owned by the player whose ID is a_PlayerID is fighting a_Opponent
- @param a_PlayerID The ID of the fighting player, or the ID of the owner whose wolf is fighting.
- @param a_Opponent The opponent who is being faught.
- @param a_IsPlayerInvolved Whether the fighter a player or a wolf. */
- void ReceiveNearbyFightInfo(AString a_PlayerID, cPawn * a_Opponent, bool a_IsPlayerInvolved);
+ cWolf(void);
+
+ CLASS_PROTODEF(cWolf)
+
+ void NotifyAlliesOfFight(cPawn * a_Opponent);
+ virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override;
+ virtual void OnRightClicked(cPlayer & a_Player) override;
+ virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override;
+ virtual void TickFollowPlayer();
+ virtual bool Attack(std::chrono::milliseconds a_Dt) override;
+
+ // Get functions
+ bool IsSitting (void) const override { return m_IsSitting; }
+ bool IsTame (void) const override { return m_IsTame; }
+ bool IsBegging (void) const { return m_IsBegging; }
+ bool IsAngry (void) const { return m_IsAngry; }
+ AString GetOwnerName (void) const { return m_OwnerName; }
+ cUUID GetOwnerUUID (void) const { return m_OwnerUUID; }
+ int GetCollarColor(void) const { return m_CollarColor; }
+
+ // Set functions
+ void SetIsSitting (bool a_IsSitting) { m_IsSitting = a_IsSitting; }
+ void SetIsTame (bool a_IsTame) { m_IsTame = a_IsTame; }
+ void SetIsBegging (bool a_IsBegging) { m_IsBegging = a_IsBegging; }
+ void SetIsAngry (bool a_IsAngry) { m_IsAngry = a_IsAngry; }
+ void SetCollarColor(int a_CollarColor) { m_CollarColor = a_CollarColor; }
+ void SetOwner (const AString & a_NewOwnerName, const cUUID & a_NewOwnerUUID)
+ {
+ m_OwnerName = a_NewOwnerName;
+ m_OwnerUUID = a_NewOwnerUUID;
+ }
+
+ /** Notfies the wolf of a nearby fight.
+ The wolf may then decide to attack a_Opponent.
+ If a_IsPlayerInvolved is true, then the player whose UUID is a_PlayerUUID is fighting a_Opponent
+ If false, then a wolf owned by the player whose UUID is a_PlayerUUID is fighting a_Opponent
+ @param a_PlayerUUID The UUID of the fighting player, or the UUID of the owner whose wolf is fighting.
+ @param a_Opponent The opponent who is being faught.
+ @param a_IsPlayerInvolved Whether the fighter a player or a wolf. */
+ void ReceiveNearbyFightInfo(const cUUID & a_PlayerUUID, cPawn * a_Opponent, bool a_IsPlayerInvolved);
protected:
- bool m_IsSitting;
- bool m_IsTame;
- bool m_IsBegging;
- bool m_IsAngry;
- AString m_OwnerName;
- AString m_OwnerUUID;
- int m_CollarColor;
- int m_NotificationCooldown;
+ bool m_IsSitting;
+ bool m_IsTame;
+ bool m_IsBegging;
+ bool m_IsAngry;
+ AString m_OwnerName;
+ cUUID m_OwnerUUID;
+ int m_CollarColor;
+ int m_NotificationCooldown;
} ;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 09:14:02 +0100