Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-02 10:53:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(pets): place the taming minigame where live did

Browse Source 
Issue 547. The minigame put the player a guessed distance from wherever
the pet had wandered to, in the direction of the player, which often
left bricks off screen or the whole minigame over a drop.

In the 2014 live captures the positions are the same for every try at
the same pet: the pet's destination is where it spawned, and the player
is teleported exactly 12 units along the direction the pet spawned
facing, turned to face the pet. This matches the spawner in the level
file for the Pet Ranch cat (spawned facing -43.4 degrees, player placed
at spawn + (-8.24, 8.73) facing 136.6 degrees) and holds for the
doberman, buffalo, triceratops, rabbit and the script spawned panda.
The pet is now put back on that spot and the player placed that way; the
heights come from the navmesh when there is one.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-27 08:38:59 -05:00
parent 4b13c98fb4
commit 6819c67068
2 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
dGame/dComponents/PetComponent.cpp
View File

@@ -175,43 +175,30 @@ void PetComponent::OnUse(Entity* originator) {
return;
}
const auto petPosition = m_Parent->GetPosition();
const auto originatorPosition = originator->GetPosition();
m_Parent->SetRotation(QuatUtils::LookAt(petPosition, originatorPosition));
float interactionDistance = m_Parent->GetVar<float>(u"interaction_distance");
if (interactionDistance <= 0) {
interactionDistance = 15;
// Where live put the minigame (2014 captures, the same for every try at a pet): the pet goes back to where it
// spawned, facing the way it spawned, and the player is teleported 12 units in front of it, facing the pet.
if (m_StartPosition == NiPoint3Constant::ZERO) {
m_StartPosition = m_Parent->GetPosition();
m_StartRotation = m_Parent->GetRotation();
}
auto position = originatorPosition;
constexpr float TAMING_PLAYER_DISTANCE = 12.0f;
NiPoint3 forward = QuatUtils::Forward(QuatUtils::LookAt(m_Parent->GetPosition(), originator->GetPosition()));
auto petPosition = m_StartPosition;
auto forward = QuatUtils::Forward(m_StartRotation);
forward.y = 0;
forward = forward.SquaredLength() > 0.0f ? forward.Unitize() : NiPoint3Constant::UNIT_Z;
auto position = petPosition + forward * TAMING_PLAYER_DISTANCE;
if (dpWorld::IsLoaded()) {
NiPoint3 attempt = petPosition + forward * interactionDistance;
NiPoint3 nearestPoint = dpWorld::GetNavMesh()->NearestPoint(attempt);
while (std::abs(nearestPoint.y - petPosition.y) > 4 && interactionDistance > 10) {
const NiPoint3 forward = QuatUtils::Forward(m_Parent->GetRotation());
attempt = originatorPosition + forward * interactionDistance;
nearestPoint = dpWorld::GetNavMesh()->NearestPoint(attempt);
interactionDistance -= 0.5f;
}
position = nearestPoint;
} else {
position = petPosition + forward * interactionDistance;
petPosition.y = dpWorld::GetNavMesh()->GetHeightAtPoint(petPosition);
position.y = dpWorld::GetNavMesh()->GetHeightAtPoint(position);
}
auto rotation = QuatUtils::LookAt(position, petPosition);
const auto rotation = QuatUtils::AxisAngle(NiPoint3Constant::UNIT_Y, glm::pi<float>()) * m_StartRotation;
m_Parent->SetPosition(petPosition);
m_Parent->SetRotation(m_StartRotation);
{
GameMessages::NotifyPetTamingMinigame msg;
@@ -265,6 +252,7 @@ void PetComponent::OnUse(Entity* originator) {
void PetComponent::Update(float deltaTime) {
if (m_StartPosition == NiPoint3Constant::ZERO) {
m_StartPosition = m_Parent->GetPosition();
m_StartRotation = m_Parent->GetRotation();
}
if (m_Owner == LWOOBJID_EMPTY) {