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

feat: optional property rent

Browse Source 
Off unless property_rent_enabled is on. Each property world's rent comes from its PropertyTemplate
row (minimumPrice every rentDuration x durationType; Block Yard is free), unless the new Property
Rent dashboard page sets another price or period (property_rent_manage). Rent is taken from the
owner's coins shortly after their character loads, with a mail receipt; unpaid rent is mailed and,
after property_rent_grace_days, makes the property private until it is paid, like live. The
property management component refuses public or best friends privacy while rent is overdue and a
property world that loads overdue makes itself private. Property game messages are unchanged.

Fixes #943

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-26 23:29:57 -05:00
parent b2403b09ea
commit 680615ba9f
31 changed files with 784 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dDatabase/GameDatabase/SQLite/SQLiteDatabase.h
View File

@@ -199,6 +199,15 @@ public:
std::vector<ZoneLimit> GetZoneLimits() override;
void SetZoneLimit(const ZoneLimit& limit) override;
void DeleteZoneLimit(uint32_t zoneId) override;
// IPropertyRent
std::vector<RentRate> GetPropertyRentRates() override;
void SetPropertyRentRate(const RentRate& rate) override;
bool DeletePropertyRentRate(uint32_t mapId) override;
std::vector<OwnedProperty> GetPropertiesOfOwner(LWOOBJID ownerId) override;
int64_t GetPropertyRentDue(LWOOBJID propertyId) override;
void SetPropertyRent(LWOOBJID propertyId, int64_t amount, int64_t due) override;
void SetPropertyPrivacy(LWOOBJID propertyId, int32_t privacyOption) override;
// IContraband
std::vector<ContrabandItem> GetContrabandItems() override;
void SetContrabandItem(const ContrabandItem& item) override;

1
dDatabase/GameDatabase/SQLite/Tables/CMakeLists.txt
View File

@@ -19,6 +19,7 @@ set(DDATABASES_DATABASES_SQLITE_TABLES_SOURCES
"LiveOps.cpp"
"FeaturedProperties.cpp"
"Contraband.cpp"
"PropertyRent.cpp"
"MessageCaptures.cpp"
"ChatLog.cpp"
"RelatedData.cpp"

45
dDatabase/GameDatabase/SQLite/Tables/PropertyRent.cpp Normal file
View File

@@ -0,0 +1,45 @@
#include "SQLiteDatabase.h"
std::vector<IPropertyRent::RentRate> SQLiteDatabase::GetPropertyRentRates() {
std::vector<RentRate> rates;
auto [_, result] = ExecuteSelect("SELECT * FROM property_rent_rates ORDER BY map_id;");
for (; !result.eof(); result.nextRow()) {
rates.push_back({ static_cast<uint32_t>(result.getIntField("map_id")), result.getInt64Field("price"), result.getIntField("period_days"),
result.getStringField("updated_by"), result.getInt64Field("updated_at") });
}
return rates;
}
void SQLiteDatabase::SetPropertyRentRate(const RentRate& rate) {
ExecuteInsert(
"INSERT INTO property_rent_rates (map_id, price, period_days, updated_by, updated_at) VALUES (?, ?, ?, ?, ?) "
"ON CONFLICT(map_id) DO UPDATE SET price = excluded.price, period_days = excluded.period_days, updated_by = excluded.updated_by, updated_at = excluded.updated_at;",
rate.mapId, rate.price, rate.periodDays, rate.updatedBy, rate.updatedAt);
}
bool SQLiteDatabase::DeletePropertyRentRate(uint32_t mapId) {
return ExecuteUpdate("DELETE FROM property_rent_rates WHERE map_id = ?;", mapId) > 0;
}
std::vector<IPropertyRent::OwnedProperty> SQLiteDatabase::GetPropertiesOfOwner(LWOOBJID ownerId) {
std::vector<OwnedProperty> properties;
auto [_, result] = ExecuteSelect("SELECT id, zone_id, privacy_option, rent_due, name FROM properties WHERE owner_id = ? ORDER BY id;", ownerId);
for (; !result.eof(); result.nextRow()) {
properties.push_back({ result.getInt64Field("id"), static_cast<uint32_t>(result.getIntField("zone_id")), result.getIntField("privacy_option"),
result.getInt64Field("rent_due"), result.getStringField("name") });
}
return properties;
}
int64_t SQLiteDatabase::GetPropertyRentDue(LWOOBJID propertyId) {
auto [_, result] = ExecuteSelect("SELECT rent_due FROM properties WHERE id = ? LIMIT 1;", propertyId);
return result.eof() ? 0 : result.getInt64Field("rent_due");
}
void SQLiteDatabase::SetPropertyRent(LWOOBJID propertyId, int64_t amount, int64_t due) {
ExecuteUpdate("UPDATE properties SET rent_amount = ?, rent_due = ? WHERE id = ?;", amount, due, propertyId);
}
void SQLiteDatabase::SetPropertyPrivacy(LWOOBJID propertyId, int32_t privacyOption) {
ExecuteUpdate("UPDATE properties SET privacy_option = ? WHERE id = ?;", privacyOption, propertyId);
}