1 files changed, 173 insertions, 29 deletions

diff --git a/src/Items/ItemFishingRod.h b/src/Items/ItemFishingRod.h
index 87021fbd2..941ce3b71 100644
--- a/src/Items/ItemFishingRod.h
+++ b/src/Items/ItemFishingRod.h
@@ -15,6 +15,61 @@
 
 
 
+/////////////////////////////////////////////////////////////////////////////////////
+// cFloaterCallback
+class cFloaterCallback :
+	public cEntityCallback
+{
+public:
+	cFloaterCallback(void) : 
+		m_CanPickup(false),
+		m_AttachedMobID(-1)
+	{
+	}
+
+	virtual bool Item(cEntity * a_Entity) override
+	{
+		m_CanPickup = ((cFloater *)a_Entity)->CanPickup();
+		m_Pos = Vector3d(a_Entity->GetPosX(), a_Entity->GetPosY(), a_Entity->GetPosZ());
+		m_AttachedMobID = ((cFloater *)a_Entity)->GetAttachedMobID();
+		a_Entity->Destroy(true);
+		return true;
+	}
+
+	bool CanPickup(void)       const { return m_CanPickup; }
+	bool IsAttached(void)      const { return (m_AttachedMobID != -1); }
+	int GetAttachedMobID(void) const { return m_AttachedMobID; }
+	Vector3d GetPos(void)      const { return m_Pos; }
+
+protected:
+	bool m_CanPickup;
+	int m_AttachedMobID;
+	Vector3d m_Pos;
+} ;
+
+////////////////////////////////////////////////////////////////////////////
+// cSweepEntityCallback
+class cSweepEntityCallback :
+	public cEntityCallback
+{
+public:
+	cSweepEntityCallback(Vector3d a_PlayerPos) :
+	  m_PlayerPos(a_PlayerPos)
+	{
+	}
+
+	virtual bool Item(cEntity * a_Entity) override
+	{
+		Vector3d Speed = m_PlayerPos - a_Entity->GetPosition();
+		a_Entity->AddSpeed(Speed);
+		return true;
+	}
+
+protected:
+	Vector3d m_PlayerPos;
+} ;
+
+
 
 class cItemFishingRodHandler :
 	public cItemHandler
@@ -36,45 +91,134 @@ public:
 
 		if (a_Player->IsFishing())
 		{
-			class cFloaterCallback :
-				public cEntityCallback
+			cFloaterCallback FloaterInfo;
+			a_World->DoWithEntityByID(a_Player->GetFloaterID(), FloaterInfo);
+			a_Player->SetIsFishing(false);
+
+			if (FloaterInfo.IsAttached())
+			{
+				cSweepEntityCallback SweepEntity(a_Player->GetPosition());
+				a_World->DoWithEntityByID(FloaterInfo.GetAttachedMobID(), SweepEntity);
+			}
+			else if (FloaterInfo.CanPickup())
 			{
-			public:
-				cFloaterCallback(void) : 
-					m_CanPickup(false) 
+				cItems Drops;
+				int ItemCategory = a_World->GetTickRandomNumber(99);
+				if (ItemCategory <= 4) // Treasures 5%
 				{
+					int Treasure = a_World->GetTickRandomNumber(5);
+					switch (Treasure)
+					{
+						case 0:
+						{
+							Drops.Add(cItem(E_ITEM_BOW)); // TODO: Enchantments
+							break;
+						}
+						case 1:
+						{
+							Drops.Add(cItem(E_ITEM_BOOK)); // TODO: Enchanted book
+							break;
+						}
+						case 2:
+						{
+							Drops.Add(cItem(E_ITEM_FISHING_ROD, 1, a_World->GetTickRandomNumber(50))); // Fishing rod with durability. TODO: Enchantments on it
+							break;
+						}
+						case 3:
+						{
+							Drops.Add(cItem(E_ITEM_NAME_TAG));
+							break;
+						}
+						case 4:
+						{
+							Drops.Add(cItem(E_ITEM_SADDLE));
+							break;
+						}
+						case 5:
+						{
+							Drops.Add(cItem(E_BLOCK_LILY_PAD));
+							break;
+						}
+					}
 				}
-
-				bool CanPickup(void) const { return m_CanPickup; }
-				Vector3d GetPos(void) const { return m_Pos; }
-
-				virtual bool Item(cEntity * a_Entity) override
+				else if (ItemCategory <= 14)  // Junk 10%
 				{
-					m_CanPickup = ((cFloater *)a_Entity)->CanPickup();
-					m_Pos = Vector3d(a_Entity->GetPosX(), a_Entity->GetPosY(), a_Entity->GetPosZ());
-					a_Entity->Destroy(true);
-					return true;
+					int Junk = a_World->GetTickRandomNumber(70);
+					if (Junk <= 1)
+					{
+						Drops.Add(cItem(E_ITEM_DYE, 10, 0));
+					}
+					else if (Junk <= 4)
+					{
+						Drops.Add(cItem(E_ITEM_BOW, 1, a_World->GetTickRandomNumber(64)));
+					}
+					else if (Junk <= 9)
+					{
+						Drops.Add(cItem(E_ITEM_STICK));
+					}
+					else if (Junk <= 14)
+					{
+						Drops.Add(cItem(E_ITEM_STRING));
+					}
+					else if (Junk <= 22)
+					{
+						Drops.Add(cItem(E_ITEM_BOWL));
+					}
+					else if (Junk <= 30)
+					{
+						Drops.Add(cItem(E_ITEM_LEATHER));
+					}
+					else if (Junk <= 38)
+					{
+						Drops.Add(cItem(E_ITEM_LEATHER_BOOTS));
+					}
+					else if (Junk <= 46)
+					{
+						Drops.Add(cItem(E_ITEM_ROTTEN_FLESH));
+					}
+					else if (Junk <= 54)
+					{
+						Drops.Add(cItem(E_ITEM_POTIONS));
+					}
+					else if (Junk <= 62)
+					{
+						Drops.Add(cItem(E_ITEM_BONE));
+					}
+					else if (Junk <= 70)
+					{
+						Drops.Add(cItem(E_BLOCK_TRIPWIRE_HOOK));
+					}
+				}
+				else  // Fish
+				{
+					int FishType = a_World->GetTickRandomNumber(99);
+					if (FishType <= 1)  // Clownfish has a 2% chance of spawning
+					{
+						Drops.Add(cItem(E_ITEM_RAW_FISH, 1, E_META_RAW_FISH_CLOWNFISH));
+					} 
+					else if (FishType <= 12)  // Pufferfish has a 13% chance of spawning
+					{
+						Drops.Add(cItem(E_ITEM_RAW_FISH, 1, E_META_RAW_FISH_CLOWNFISH));
+					}
+					else if (FishType <= 24)
+					{
+						Drops.Add(cItem(E_ITEM_RAW_FISH, 1, E_META_RAW_FISH_SALMON));
+					}
+					else
+					{
+						Drops.Add(cItem(E_ITEM_RAW_FISH, 1, E_META_RAW_FISH_FISH));
+					}
 				}
-			protected:
-				bool m_CanPickup;
-				Vector3d m_Pos;
-			} Callbacks;
-			a_World->DoWithEntityByID(a_Player->GetFloaterID(), Callbacks);
-			a_Player->SetIsFishing(false);
 
-			if (Callbacks.CanPickup())
-			{
-				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.Length() / (FlyDirection.y * 2), FlyDirection.z);
-				// TODO: More types of pickups.
+				
+				Vector3d FloaterPos = FloaterInfo.GetPos();
+				Vector3d FlyDirection = a_Player->GetEyePosition() - FloaterPos;
+				a_World->SpawnItemPickups(Drops, FloaterPos.x, FloaterPos.y, FloaterPos.z, FlyDirection.x, FlyDirection.y + 1, FlyDirection.z);
 			}
 		}
 		else
 		{
-			cFloater * Floater = new cFloater(a_Player->GetPosX(), a_Player->GetStance(), a_Player->GetPosZ(), a_Player->GetLookVector() * 15, a_Player->GetUniqueID());
+			cFloater * Floater = new cFloater(a_Player->GetPosX(), a_Player->GetStance(), a_Player->GetPosZ(), a_Player->GetLookVector() * 15, a_Player->GetUniqueID(), 100 + a_World->GetTickRandomNumber(800) - (a_Player->GetEquippedItem().m_Enchantments.GetLevel(cEnchantments::enchLure) * 100));
 			Floater->Initialize(a_World);
 			a_Player->SetIsFishing(true, Floater->GetUniqueID());
 		}