Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-25 16:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat banana (#1917)

Browse Source
This commit is contained in:
David Markowitz
2025-10-19 12:00:14 -07:00
committed by GitHub
parent 281d9762ef
commit a70c365c23
4 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dScripts/ai/GF/GfBanana.cpp
View File

@@ -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) {

22
dScripts/ai/GF/GfBananaCluster.cpp
View File

@@ -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);
}

1
dScripts/ai/GF/GfBananaCluster.h
View File

@@ -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;
};