From a70c365c23b93d3af08c18e98c24fbe1e65feff8 Mon Sep 17 00:00:00 2001
From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
Date: Sun, 19 Oct 2025 12:00:14 -0700
Subject: [PATCH] feat banana (#1917)

---
 dGame/dUtilities/Loot.cpp          |  2 ++
 dScripts/ai/GF/GfBanana.cpp        | 36 +++++++++---------------------
 dScripts/ai/GF/GfBananaCluster.cpp | 22 ++++++++++++++++++
 dScripts/ai/GF/GfBananaCluster.h   |  1 +
 4 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/dGame/dUtilities/Loot.cpp b/dGame/dUtilities/Loot.cpp
index 0b88f5af..d9384db8 100644
--- a/dGame/dUtilities/Loot.cpp
+++ b/dGame/dUtilities/Loot.cpp
@@ -365,6 +365,7 @@ void DropLoot(Entity* player, const LWOOBJID source, const std::map<LOT, LootDro
 			lootMsg.spawnPos = spawnPosition;
 			lootMsg.sourceID = source;
 			lootMsg.item = LOT_NULL;
+			CalcFinalDropPos(lootMsg);
 			lootMsg.Send();
 			const auto* const memberEntity = Game::entityManager->GetEntity(member);
 			if (memberEntity) lootMsg.Send(memberEntity->GetSystemAddress());
@@ -377,6 +378,7 @@ void DropLoot(Entity* player, const LWOOBJID source, const std::map<LOT, LootDro
 		lootMsg.spawnPos = spawnPosition;
 		lootMsg.sourceID = source;
 		lootMsg.item = LOT_NULL;
+		CalcFinalDropPos(lootMsg);
 		lootMsg.Send();
 		lootMsg.Send(player->GetSystemAddress());
 	}
diff --git a/dScripts/ai/GF/GfBanana.cpp b/dScripts/ai/GF/GfBanana.cpp
index 93741d24..0b436396 100644
--- a/dScripts/ai/GF/GfBanana.cpp
+++ b/dScripts/ai/GF/GfBanana.cpp
@@ -55,36 +55,20 @@ void GfBanana::OnHit(Entity* self, Entity* attacker) {
 
 		return;
 	}
+	bananaEntity->Smash(LWOOBJID_EMPTY, eKillType::SILENT);
 
-	bananaEntity->SetPosition(bananaEntity->GetPosition() - NiPoint3Constant::UNIT_Y * 8);
-
-	auto* bananaDestroyable = bananaEntity->GetComponent<DestroyableComponent>();
-
-	bananaDestroyable->SetHealth(0);
-
-	bananaDestroyable->Smash(attacker->GetObjectID());
-
-	/*
-	auto position = self->GetPosition();
 	const auto rotation = self->GetRotation();
-
-	position.y += 12;
-	position.x -= rotation.GetRightVector().x * 5;
-	position.z -= rotation.GetRightVector().z * 5;
-
-	EntityInfo info {};
-
-	info.pos = position;
-	info.rot = rotation;
+	EntityInfo info{};
 	info.lot = 6718;
+	info.pos = self->GetPosition();
+	info.pos.y += 12;
+	info.pos.x -= QuatUtils::Right(rotation).x * 5;
+	info.pos.z -= QuatUtils::Right(rotation).z * 5;
+	info.rot = rotation;
 	info.spawnerID = self->GetObjectID();
-
-	auto* entity = Game::entityManager->CreateEntity(info);
-
-	Game::entityManager->ConstructEntity(entity, UNASSIGNED_SYSTEM_ADDRESS);
-	*/
-
-	Game::entityManager->SerializeEntity(self);
+	info.settings = { new LDFData<uint32_t>(u"motionType", 5) };
+	auto* const newEn = Game::entityManager->CreateEntity(info, nullptr, self);
+	Game::entityManager->ConstructEntity(newEn);
 }
 
 void GfBanana::OnTimerDone(Entity* self, std::string timerName) {
diff --git a/dScripts/ai/GF/GfBananaCluster.cpp b/dScripts/ai/GF/GfBananaCluster.cpp
index 6e5e91db..f461c761 100644
--- a/dScripts/ai/GF/GfBananaCluster.cpp
+++ b/dScripts/ai/GF/GfBananaCluster.cpp
@@ -1,5 +1,9 @@
 #include "GfBananaCluster.h"
 #include "Entity.h"
+#include "dpWorld.h"
+#include "dNavMesh.h"
+#include "Loot.h"
+#include "DestroyableComponent.h"
 
 void GfBananaCluster::OnStartup(Entity* self) {
 	self->AddTimer("startup", 100);
@@ -10,3 +14,21 @@ void GfBananaCluster::OnTimerDone(Entity* self, std::string timerName) {
 		self->ScheduleKillAfterUpdate(nullptr);
 	}
 }
+
+// Hack in banana loot dropping from tree area since it seemed to do that in live for some reason
+void GfBananaCluster::OnHit(Entity* self, Entity* attacker) {
+	auto* parentEntity = self->GetParentEntity();
+	GameMessages::GetPosition posMsg{};
+	if (parentEntity) {
+		posMsg.target = parentEntity->GetObjectID();
+	}
+	posMsg.Send();
+
+	const auto rotation = parentEntity ? parentEntity->GetRotation() : self->GetRotation();
+
+	if (dpWorld::GetNavMesh()) posMsg.pos.y = dpWorld::GetNavMesh()->GetHeightAtPoint(posMsg.pos) + 3.0f;
+	else posMsg.pos = posMsg.pos - (NiPoint3Constant::UNIT_Y * 8);
+	posMsg.pos.x -= QuatUtils::Right(rotation).x * 5;
+	posMsg.pos.z -= QuatUtils::Right(rotation).z * 5;
+	self->SetPosition(posMsg.pos);
+}
diff --git a/dScripts/ai/GF/GfBananaCluster.h b/dScripts/ai/GF/GfBananaCluster.h
index 81bb8b0b..ceff708c 100644
--- a/dScripts/ai/GF/GfBananaCluster.h
+++ b/dScripts/ai/GF/GfBananaCluster.h
@@ -7,4 +7,5 @@ public:
 	void OnStartup(Entity* self) override;
 
 	void OnTimerDone(Entity* self, std::string timerName) override;
+	void OnHit(Entity* self, Entity* attacker) override;
 };