fix: Make pets behave more accurately to Live #1305
Conversation
aronwk-aaron
changed the title
… something" This reverts commit 071c022.
|
I'm pretty happy with where this is functionality-wise. Opening this for review. |
|
never-mind, still needs some extra time in the oven |
There was a problem hiding this comment.
only 1 required change regarding OnUse vs EntityEnter. aside from that the pr looks good, though there are a lot of changes to its hard to try and think of all implications of the changes, but i know you're testing this a lot and theres not too much to check so it should be a-ok.
| @@ -258,8 +316,7 @@ void PetComponent::OnUse(Entity* originator) { | |||
| GameMessages::SendNotifyPetTamingPuzzleSelected(originator->GetObjectID(), bricks, originator->GetSystemAddress()); | |||
|
|
|||
| m_Tamer = originator->GetObjectID(); | |||
| SetStatus(5); | |||
| Game::entityManager->SerializeEntity(m_Parent); | |||
There was a problem hiding this comment.
Is this being serialized elsewhere in here to let clients know of the change?
There was a problem hiding this comment.
let me do some testing to verify
| @@ -3593,6 +3606,33 @@ void GameMessages::SendBouncerActiveStatus(LWOOBJID objectId, bool bActive, cons | |||
| SEND_PACKET; | |||
| } | |||
|
|
|||
| void GameMessages::SendRequestClientBounce(const LWOOBJID objectId, const LWOOBJID bounceTargetId, const NiPoint3& bounceTargetPos, const NiPoint3& bouncedObjLinVel, const LWOOBJID& requestSourceId, const bool bAllBounced, const bool bAllowClientOverload, const SystemAddress& sysAddr) { | |||
There was a problem hiding this comment.
A bit of a note: I'm not sure how to test this with multiple players on my own. I can verify it works for one only.
There was a problem hiding this comment.
you can launch multiple game clients on your computer at once to test this, if you're physically unable to I can test it
| @@ -3547,7 +3560,7 @@ void GameMessages::SendShowPetActionButton(const LWOOBJID objectId, const ePetAb | |||
| bitStream.Write(petAbility); | |||
| bitStream.Write(bShow); | |||
|
|
|||
| if (sysAddr == UNASSIGNED_SYSTEM_ADDRESS) SEND_PACKET_BROADCAST; | |||
| if (sysAddr == UNASSIGNED_SYSTEM_ADDRESS) SEND_PACKET_BROADCAST; // TODO: Don't think this should ever be broadcasted, need to confirm | |||
There was a problem hiding this comment.
Also, is this comment accurate?
Working on making the pets behave more like they did in live. Want to fix #536, #984, and #1241. As of this draft's posting, I have very roughly managed to get the treasure dig behavior prompt to appear as in Live. Still need to work on cleaning up the code and getting the functionality nailed-down better.
2023-11-18.18-32-01_output.mp4