From 86bfed735e28fe86ec40e89e59eb868c4a0a9b19 Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Thu, 19 Dec 2013 17:32:06 +0100 Subject: Added cFloater class. --- src/Entities/Entity.h | 3 +++ src/Entities/Floater.cpp | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ src/Entities/Floater.h | 29 ++++++++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 src/Entities/Floater.cpp create mode 100644 src/Entities/Floater.h diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index 8d1692c98..7107a4a13 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -75,6 +75,7 @@ public: etTNT, etProjectile, etExpOrb, + etFloater, // Common variations etMob = etMonster, // DEPRECATED, use etMonster instead! @@ -129,6 +130,8 @@ public: bool IsBoat (void) const { return (m_EntityType == etBoat); } bool IsTNT (void) const { return (m_EntityType == etTNT); } bool IsProjectile (void) const { return (m_EntityType == etProjectile); } + bool IsExpOrb (void) const { return (m_EntityType == etExpOrb); } + bool IsFloater (void) const { return (m_EntityType == etFloater); } /// Returns true if the entity is of the specified class or a subclass (cPawn's IsA("cEntity") returns true) virtual bool IsA(const char * a_ClassName) const; diff --git a/src/Entities/Floater.cpp b/src/Entities/Floater.cpp new file mode 100644 index 000000000..ebbf72b63 --- /dev/null +++ b/src/Entities/Floater.cpp @@ -0,0 +1,58 @@ +#include "Globals.h" + +#include "Floater.h" +#include "Player.h" +#include "../Clienthandle.h" + +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), + m_PlayerID(a_PlayerID), + m_CanPickupItem(false), + m_PickupCountDown(0) +{ + SetSpeed(a_Speed); +} + + + + + +void cFloater::SpawnOn(cClientHandle & a_Client) +{ + a_Client.SendSpawnObject(*this, 90, m_PlayerID, 0, 0); +} + + + + + +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()))) + { + if (m_World->GetTickRandomNumber(100) == 0) + { + SetSpeedY(-1); + m_CanPickupItem = true; + m_PickupCountDown = 20; + LOGD("Floater %i can be picked up", GetUniqueID()); + } + else + { + SetSpeedY(1); + } + } + SetSpeedX(GetSpeedX() * 0.95); + SetSpeedZ(GetSpeedZ() * 0.95); + if (CanPickup()) + { + m_PickupCountDown--; + if (m_PickupCountDown == 0) + { + m_CanPickupItem = false; + LOGD("The fish is gone. Floater %i can not pick an item up.", GetUniqueID()); + } + } + BroadcastMovementUpdate(); +} \ No newline at end of file diff --git a/src/Entities/Floater.h b/src/Entities/Floater.h new file mode 100644 index 000000000..9bc5039f8 --- /dev/null +++ b/src/Entities/Floater.h @@ -0,0 +1,29 @@ + +#pragma once + +#include "Entity.h" + + + + + +class cFloater : + public cEntity +{ + typedef cFloater super; + +public: + + cFloater(double a_X, double a_Y, double a_Z, Vector3d a_Speed, int a_PlayerID); + + virtual void SpawnOn(cClientHandle & a_Client) override; + virtual void Tick(float a_Dt, cChunk & a_Chunk) override; + + bool CanPickup(void) const { return m_CanPickupItem; } + +protected: + Vector3d m_Speed; + int m_PickupCountDown; + int m_PlayerID; + bool m_CanPickupItem; +} ; \ No newline at end of file -- cgit v1.2.3 From 3d70d7198dbd2b9f71a9cf37bd0cf985495e6b00 Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Thu, 19 Dec 2013 17:33:21 +0100 Subject: Implented IsFishing, SetIsFishing and GetFloaterID(). --- src/Entities/Player.cpp | 2 ++ src/Entities/Player.h | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 7e7d77433..577a33ad9 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -65,6 +65,8 @@ cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName) , m_IsSubmerged(false) , m_IsFlying(false) , m_CanFly(false) + , m_IsFishing(false) + , m_FloaterID(-1) , m_EatingFinishTick(-1) , m_IsChargingBow(false) , m_BowCharge(0) diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 59e941040..74da857e8 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -253,6 +253,14 @@ public: /// Returns true if the player is currently flying. bool IsFlying(void) const { return m_IsFlying; } + + /// returns true if the player has thrown out a floater. + bool IsFishing(void) const { return m_IsFishing; } + + void SetIsFishing(bool a_IsFishing, int a_FloaterID = -1) { m_IsFishing = a_IsFishing; m_FloaterID = a_FloaterID; } + + int GetFloaterID(void) const { return m_FloaterID; } + // tolua_end /// Starts eating the currently equipped item. Resets the eating timer and sends the proper animation packet @@ -429,6 +437,7 @@ protected: bool m_IsFlying; bool m_IsSwimming; bool m_IsSubmerged; + bool m_IsFishing; bool m_CanFly; // If this is true the player can fly. Even if he is not in creative. @@ -445,6 +454,7 @@ protected: bool m_IsChargingBow; int m_BowCharge; + int m_FloaterID; virtual void Destroyed(void); -- cgit v1.2.3 From d9c8ae37cf332d4be93b7727f0c1899f40362aef Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Thu, 19 Dec 2013 17:34:03 +0100 Subject: Implented cItemFishingRodHandler. --- src/Items/ItemFishingRod.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++ src/Items/ItemHandler.cpp | 2 ++ 2 files changed, 65 insertions(+) create mode 100644 src/Items/ItemFishingRod.h diff --git a/src/Items/ItemFishingRod.h b/src/Items/ItemFishingRod.h new file mode 100644 index 000000000..722c48c04 --- /dev/null +++ b/src/Items/ItemFishingRod.h @@ -0,0 +1,63 @@ + +// ItemFishingRod.h + +// Declares the various fishing rod ItemHandlers + + + + + +#pragma once + +#include "../Entities/Floater.h" +#include "../Entities/Entity.h" + + + + + +class cItemFishingRodHandler : + public cItemHandler +{ + typedef cItemHandler super; + +public: + cItemFishingRodHandler(int a_ItemType) : + super(a_ItemType) + { + } + + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override + { + if (a_Player->IsFishing()) + { + class Callbacks : public cEntityCallback + { + public: + bool CanPickup; + virtual bool Item(cEntity * a_Entity) override + { + CanPickup = ((cFloater *)a_Entity)->CanPickup(); + a_Entity->Destroy(true); + return true; + } + Callbacks(void) : CanPickup(false) {} + } Callback; + a_World->DoWithEntityByID(a_Player->GetFloaterID(), Callback); + a_Player->SetIsFishing(false); + if (Callback.CanPickup) + { + a_Player->SendMessage("TODO: Spawn Items."); + // TODO: Pickups if fishing went correct. + } + + } + else + { + cFloater * Floater = new cFloater(a_Player->GetPosX(), a_Player->GetStance(), a_Player->GetPosZ(), a_Player->GetLookVector() * 5, a_Player->GetUniqueID()); + Floater->Initialize(a_World); + a_Player->SetIsFishing(true, Floater->GetUniqueID()); + } + return true; + } +} ; \ No newline at end of file diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp index 23b9a86d4..250e21dc4 100644 --- a/src/Items/ItemHandler.cpp +++ b/src/Items/ItemHandler.cpp @@ -17,6 +17,7 @@ #include "ItemComparator.h" #include "ItemDoor.h" #include "ItemDye.h" +#include "ItemFishingRod.h" #include "ItemFlowerPot.h" #include "ItemFood.h" #include "ItemHoe.h" @@ -100,6 +101,7 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType) case E_ITEM_EGG: return new cItemEggHandler(); case E_ITEM_ENDER_PEARL: return new cItemEnderPearlHandler(); case E_ITEM_FIREWORK_ROCKET: return new cItemFireworkHandler(); + case E_ITEM_FISHING_ROD: return new cItemFishingRodHandler(a_ItemType); case E_ITEM_FLINT_AND_STEEL: return new cItemLighterHandler(a_ItemType); case E_ITEM_FLOWER_POT: return new cItemFlowerPotHandler(a_ItemType); case E_ITEM_NETHER_WART: return new cItemNetherWartHandler(a_ItemType); -- cgit v1.2.3 From 4a028986838948eeca0f61aefd281b6386c5dda5 Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Thu, 19 Dec 2013 17:46:12 +0100 Subject: Added the Floater files to MCServer.vcproj --- VC2008/MCServer.vcproj | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index 5b756f3b6..cb9867450 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -1358,6 +1358,14 @@ RelativePath="..\src\Entities\FallingBlock.h" > + + + + @@ -2566,6 +2574,10 @@ RelativePath="..\src\items\ItemDye.h" > + + -- cgit v1.2.3 From 018c65b4e3d1e5674e3134281ced640b0e85871f Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Thu, 19 Dec 2013 22:16:15 +0100 Subject: You can get fish from fishing :D. Only one type of fish though. --- src/Items/ItemFishingRod.h | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/src/Items/ItemFishingRod.h b/src/Items/ItemFishingRod.h index 722c48c04..91c0e9638 100644 --- a/src/Items/ItemFishingRod.h +++ b/src/Items/ItemFishingRod.h @@ -11,7 +11,7 @@ #include "../Entities/Floater.h" #include "../Entities/Entity.h" - +#include "../Item.h" @@ -31,30 +31,45 @@ public: { if (a_Player->IsFishing()) { - class Callbacks : public cEntityCallback + class cFloaterCallback : + public cEntityCallback { public: - bool CanPickup; + cFloaterCallback(void) : + m_CanPickup(false) + { + } + + bool CanPickup(void) const { return m_CanPickup; } + Vector3d GetPos(void) const { return m_Pos; } + virtual bool Item(cEntity * a_Entity) override { - CanPickup = ((cFloater *)a_Entity)->CanPickup(); + m_CanPickup = ((cFloater *)a_Entity)->CanPickup(); + m_Pos = Vector3d(a_Entity->GetPosX(), a_Entity->GetPosY(), a_Entity->GetPosZ()); a_Entity->Destroy(true); return true; } - Callbacks(void) : CanPickup(false) {} - } Callback; - a_World->DoWithEntityByID(a_Player->GetFloaterID(), Callback); + protected: + bool m_CanPickup; + Vector3d m_Pos; + } Callbacks; + a_World->DoWithEntityByID(a_Player->GetFloaterID(), Callbacks); a_Player->SetIsFishing(false); - if (Callback.CanPickup) + + if (Callbacks.CanPickup()) { - a_Player->SendMessage("TODO: Spawn Items."); - // TODO: Pickups if fishing went correct. + cItems Drops; + Drops.Add(cItem(E_ITEM_RAW_FISH)); + Vector3d FloaterPos(Callbacks.GetPos()); + Vector3d FlyDirection(a_Player->GetPosition() - FloaterPos); + a_World->SpawnItemPickups(Drops, FloaterPos.x, FloaterPos.y, FloaterPos.z, FlyDirection.x, FlyDirection.y, FlyDirection.z); + // TODO: More types of pickups. } - } else { - cFloater * Floater = new cFloater(a_Player->GetPosX(), a_Player->GetStance(), a_Player->GetPosZ(), a_Player->GetLookVector() * 5, a_Player->GetUniqueID()); + cFloater * Floater = new cFloater(a_Player->GetPosX(), a_Player->GetStance(), a_Player->GetPosZ(), a_Player->GetLookVector() * 7, a_Player->GetUniqueID()); Floater->Initialize(a_World); a_Player->SetIsFishing(true, Floater->GetUniqueID()); } -- cgit v1.2.3 From 32d117a4988a55d8968fcc483d6d5614ef6c04dd Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Thu, 19 Dec 2013 22:18:05 +0100 Subject: The floater now actualy dives under water. --- src/Entities/Floater.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Entities/Floater.cpp b/src/Entities/Floater.cpp index ebbf72b63..c467961c6 100644 --- a/src/Entities/Floater.cpp +++ b/src/Entities/Floater.cpp @@ -33,7 +33,7 @@ void cFloater::Tick(float a_Dt, cChunk & a_Chunk) { if (m_World->GetTickRandomNumber(100) == 0) { - SetSpeedY(-1); + SetPosY(GetPosY() - 1); m_CanPickupItem = true; m_PickupCountDown = 20; LOGD("Floater %i can be picked up", GetUniqueID()); -- cgit v1.2.3 From a1ce0a6d73f5d13e1c4391ecec87f6c814f4cf55 Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Thu, 19 Dec 2013 22:44:10 +0100 Subject: Fixed #include in Floater.cpp. --- src/Entities/Floater.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Entities/Floater.cpp b/src/Entities/Floater.cpp index c467961c6..1aa0413d9 100644 --- a/src/Entities/Floater.cpp +++ b/src/Entities/Floater.cpp @@ -2,7 +2,7 @@ #include "Floater.h" #include "Player.h" -#include "../Clienthandle.h" +#include "../ClientHandle.h" 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), -- cgit v1.2.3