fix: a property is rented only with the level's required mission

LWOPropertyVendorComponent::onCheckUseRequirements (0x00c2e210) lets a
player use the property guard only when the level's
property_required_mission (LoadConfigData 0x00c2e550) is finished. The
server opened the vendor and rented the property on any request.

The guard is now not opened without the mission, and a rent request
without it is answered with PropertyRentalResponse code 9, which
onPropertyRentalResponse (0x00c56d70) shows as "you failed to rent" with
UGG_PROPRENT_Dont_have_achievement. A mission that was finished and is
being repeated counts, as in the client's list of finished missions. A
guard without the key asks for nothing.

The six property maps name missions 768, 872, 873, 874, 1293 and 1322.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-11-10 15:28:18 -06:00
parent 53968599d2
commit baf8b24ad1
4 changed files with 153 additions and 0 deletions

View File

@@ -10,14 +10,32 @@
#include "Logger.h"
#include "PropertyManagementComponent.h"
#include "UserManager.h"
#include "Mission.h"
#include "MissionComponent.h"
PropertyVendorComponent::PropertyVendorComponent(Entity* parent, const int32_t componentID) : Component(parent, componentID) {
RegisterMsg(&PropertyVendorComponent::OnRequestUse);
}
uint32_t PropertyVendorComponent::GetRequiredMission() const {
return m_Parent->GetVarAs<uint32_t>(u"property_required_mission");
}
bool PropertyVendorComponent::MayRent(Entity& player) const {
const auto required = GetRequiredMission();
if (required == 0) return true;
const auto* const missions = player.GetComponent<MissionComponent>();
const auto* const mission = missions ? missions->GetMission(required) : nullptr;
// The client asks its list of finished missions: one that was completed and is repeated counts as well
return mission != nullptr && (mission->IsComplete() || mission->GetCompletions() > 0);
}
bool PropertyVendorComponent::OnRequestUse(GameMessages::RequestUseEvent& event) {
if (event.msg.IsMissionChoice()) return false;
auto* const originator = event.user;
// LWOPropertyVendorComponent::onCheckUseRequirements (0x00c2e210): no use without the level's mission
if (!MayRent(*originator)) return true;
if (PropertyManagementComponent::Instance() == nullptr) return true;
OnQueryPropertyData(originator, originator->GetSystemAddress());
@@ -41,6 +59,15 @@ void PropertyVendorComponent::OnQueryPropertyData(Entity* originator, const Syst
}
void PropertyVendorComponent::OnBuyFromVendor(Entity* originator, const bool confirmed, const LOT lot, const uint32_t count) {
if (!MayRent(*originator)) {
LOG("Player %llu rents a property without mission %u", originator->GetObjectID(), GetRequiredMission());
GameMessages::PropertyRentalResponse refused;
refused.target = m_Parent->GetObjectID();
refused.code = RENTAL_MISSING_ACHIEVEMENT;
refused.Send(originator->GetSystemAddress());
return;
}
if (PropertyManagementComponent::Instance() == nullptr) return;
if (PropertyManagementComponent::Instance()->Claim(originator->GetObjectID()) == false) {

View File

@@ -34,4 +34,16 @@ public:
* @param count unused
*/
void OnBuyFromVendor(Entity* originator, bool confirmed, LOT lot, uint32_t count);
// PropertyRentalResponse code the client shows as "you failed to rent" with UGG_PROPRENT_Dont_have_achievement
// (LWOPropertyVendorComponent::onPropertyRentalResponse 0x00c56d70; 0 is a rented property)
static constexpr uint32_t RENTAL_MISSING_ACHIEVEMENT = 9;
// The level's property_required_mission (LWOPropertyVendorComponent::LoadConfigData 0x00c2e550), 0 without one
uint32_t GetRequiredMission() const;
// Whether the player has finished the level's property_required_mission, which the client asks for before the
// vendor can be used (LWOPropertyVendorComponent::onCheckUseRequirements 0x00c2e210). A vendor without the key
// asks for nothing here.
bool MayRent(Entity& player) const;
};