.wandertype (int, 0 - 3)
Get/Set wandertype for NPC (0 = None, [1 = Follow], 2 = Free, 3 = Box, 4 = Circle, 5 = Frozen, [6 = Flee, 7 = Pathfind]. Types 1, 6 and 7 are set primarily by code)
diff --git a/source/CResponse.cpp b/source/CResponse.cpp
index 96031ceff..118e8616e 100644
--- a/source/CResponse.cpp
+++ b/source/CResponse.cpp
@@ -242,13 +242,6 @@ bool WhichResponse( CSocket *mSock, CChar *mChar, std::string text, CChar *tChar
case TW_BUY: tResp = new CVendorBuyResponse( false, oldstrutil::upper( text )); break;
case TW_VENDORSELL: tResp = new CVendorSellResponse( true, oldstrutil::upper( text )); break;
case TW_SELL: tResp = new CVendorSellResponse( false, oldstrutil::upper( text )); break;
- case TW_VENDORVIEW: tResp = new CVendorViewResponse( true, oldstrutil::upper( text )); break;
- case TW_VIEW: tResp = new CVendorViewResponse( false, oldstrutil::upper( text )); break;
- case TW_VENDORGOLD: tResp = new CVendorGoldResponse( true, oldstrutil::upper( text )); break;
- case TW_COLLECT: [[fallthrough]];
- case TW_GOLD: tResp = new CVendorGoldResponse( false, oldstrutil::upper( text )); break;
- case TW_VENDORSTATUS: tResp = new CVendorStatusResponse( true, oldstrutil::upper( text )); break;
- case TW_STATUS: tResp = new CVendorStatusResponse( false, oldstrutil::upper( text )); break;
case TW_VENDORDISMISS: tResp = new CVendorDismissResponse( true, oldstrutil::upper( text )); break;
case TW_DISMISS: tResp = new CVendorDismissResponse( false, oldstrutil::upper( text )); break;
case TW_HOUSEBAN: tResp = new CHouseMultiResponse( TARGET_HOUSEBAN, 585 ); break;
@@ -1032,144 +1025,6 @@ bool CVendorSellResponse::Handle( CSocket *mSock, CChar *mChar, CChar *vendorNpc
return false;
}
-CVendorViewResponse::CVendorViewResponse( bool vendVal, const std::string &text ) : CBaseVendorResponse( vendVal, text )
-{
-}
-//o------------------------------------------------------------------------------------------------o
-//| Function - CVendorViewResponse::Handle()
-//o------------------------------------------------------------------------------------------------o
-//| Purpose - Handles response to players wanting to view the items a vendor has for sale
-//o------------------------------------------------------------------------------------------------o
-bool CVendorViewResponse::Handle( CSocket *mSock, [[maybe_unused]] CChar *mChar, CChar *vendorNpc )
-{
- if( vendorNpc->GetNpcAiType() == AI_PLAYERVENDOR )
- {
- CItem *pack = nullptr;
- vendorNpc->TextMessage( mSock, 385, TALK, false ); // Take a look at my goods.
- pack = vendorNpc->GetPackItem();
- if( ValidateObject( pack ))
- {
- mSock->OpenPack( pack, true );
- }
- }
- if( !saidVendor )
- return false;
-
- return true;
-}
-
-CVendorGoldResponse::CVendorGoldResponse( bool vendVal, const std::string &text ) : CBaseVendorResponse( vendVal, text )
-{
-}
-//o------------------------------------------------------------------------------------------------o
-//| Function - CVendorGoldResponse::Handle()
-//o------------------------------------------------------------------------------------------------o
-//| Purpose - Handles response to players wanting to withdraw their earnings from their vendor
-//o------------------------------------------------------------------------------------------------o
-bool CVendorGoldResponse::Handle( CSocket *mSock, [[maybe_unused]] CChar *mChar, CChar *vendorNpc )
-{
- if( vendorNpc->GetNpcAiType() == AI_PLAYERVENDOR )
- {
- CChar *mChar = mSock->CurrcharObj();
- if( mChar == vendorNpc->GetOwnerObj() )
- {
- UI32 pay = 0;
- auto give = vendorNpc->GetHoldG();
- auto earned = vendorNpc->GetHoldG();
-
- if( vendorNpc->GetHoldG() <= 0 )
- {
- vendorNpc->TextMessage( mSock, 1326, TALK, false ); // I have no gold waiting for you.
- vendorNpc->SetHoldG( 0 );
- }
- else if( vendorNpc->GetHoldG() > 0 && vendorNpc->GetHoldG() <= MAX_STACK )
- {
- if( vendorNpc->GetHoldG() > 9 )
- {
- pay = static_cast
( vendorNpc->GetHoldG() / 10 );
- give = vendorNpc->GetHoldG() - pay;
- }
- else
- {
- pay = vendorNpc->GetHoldG();
- give = 0;
- }
- vendorNpc->SetHoldG( 0 );
- }
- else
- {
- UI32 t = vendorNpc->GetHoldG() - MAX_STACK; // yank of 65 grand, then do calculations
- vendorNpc->SetHoldG( t );
- pay = 6554;
- give = 58981;
- if( t > 0 )
- {
- vendorNpc->TextMessage( mSock, 1327, TALK, false ); // You still have money left to claim.
- }
- }
- if( give )
- {
- Items->CreateScriptItem( mSock, mChar, "0x0EED", give, OT_ITEM, true );
- }
-
- // Today's purchases total %i gold. I am keeping %i gold for my self. Here is the remaining %i gold. Have a nice day.
- vendorNpc->TextMessage( mSock, 1328, TALK, 0, earned, pay, give );
- }
- else
- {
- vendorNpc->TextMessage( mSock, 1329, TALK, false ); // I don't work for you!
- }
- }
- if( !saidVendor )
- return false;
-
- return true;
-}
-
-CVendorStatusResponse::CVendorStatusResponse( bool vendVal, const std::string &text ) : CBaseVendorResponse( vendVal, text )
-{
-}
-//o------------------------------------------------------------------------------------------------o
-//| Function - CVendorStatusResponse::Handle()
-//o------------------------------------------------------------------------------------------------o
-//| Purpose - Handles response to players wanting to see the status of their vendor
-//o------------------------------------------------------------------------------------------------o
-bool CVendorStatusResponse::Handle( CSocket *mSock, [[maybe_unused]] CChar *mChar, CChar *vendorNpc )
-{
- if( vendorNpc->GetNpcAiType() == AI_PLAYERVENDOR )
- {
- CChar *mChar = mSock->CurrcharObj();
- if( mChar == vendorNpc->GetOwnerObj() )
- {
- if( vendorNpc->GetHoldG() <= 0 )
- {
- vendorNpc->TextMessage( mSock, 1326, TALK, false ); // I have no gold waiting for you.
- }
- else
- {
- UI32 pay = 0;
- if( vendorNpc->GetHoldG() > 9 )
- {
- pay = static_cast( vendorNpc->GetHoldG() / 10 );
- }
- else
- {
- pay = vendorNpc->GetHoldG();
- }
- vendorNpc->TextMessage( mSock, 1782, TALK, 0, vendorNpc->GetHoldG(), pay ); // Today's purchases total %i gold. I am keeping %i gold for my self.
- }
- }
- else
- {
- vendorNpc->TextMessage( mSock, 1329, TALK, false ); // I don't work for you!
- }
- }
- if( !saidVendor )
- return false;
-
- return true;
-}
-
CVendorDismissResponse::CVendorDismissResponse( bool vendVal, const std::string &text ) : CBaseVendorResponse( vendVal, text )
{
}
diff --git a/source/CResponse.h b/source/CResponse.h
index b1434f29b..f36095784 100644
--- a/source/CResponse.h
+++ b/source/CResponse.h
@@ -291,36 +291,6 @@ class CVendorSellResponse : public CBaseVendorResponse
virtual bool Handle( CSocket *mSock, CChar *mChar, CChar *Npc ) override;
};
-class CVendorViewResponse : public CBaseVendorResponse
-{
-public:
- CVendorViewResponse( bool vendVal, const std::string &text );
- virtual ~CVendorViewResponse()
- {
- }
- virtual bool Handle( CSocket *mSock, CChar *mChar, CChar *Npc ) override;
-};
-
-class CVendorGoldResponse : public CBaseVendorResponse
-{
-public:
- CVendorGoldResponse( bool vendVal, const std::string &text );
- virtual ~CVendorGoldResponse()
- {
- }
- virtual bool Handle( CSocket *mSock, CChar *mChar, CChar *Npc ) override;
-};
-
-class CVendorStatusResponse : public CBaseVendorResponse
-{
-public:
- CVendorStatusResponse( bool vendVal, const std::string &text );
- virtual ~CVendorStatusResponse()
- {
- }
- virtual bool Handle( CSocket *mSock, CChar *mChar, CChar *Npc ) override;
-};
-
class CVendorDismissResponse : public CBaseVendorResponse
{
public:
diff --git a/source/SEFunctions.cpp b/source/SEFunctions.cpp
index 84a67872a..562a3a5fb 100644
--- a/source/SEFunctions.cpp
+++ b/source/SEFunctions.cpp
@@ -5775,7 +5775,31 @@ JSBool SE_GetServerSetting( JSContext *cx, uintN argc, jsval *vp )
JS_SET_RVAL( cx, vp, BOOLEAN_TO_JSVAL( cwmWorldState->ServerData()->EventManagerSystem() ));
break;
case 407: // LOGINQUESTENABLED
- JS_SET_RVAL( cx, vp, BOOLEAN_TO_JSVAL( cwmWorldState->ServerData()->LoginQuestEnabled() ) );
+ JS_SET_RVAL( cx, vp, BOOLEAN_TO_JSVAL( cwmWorldState->ServerData()->LoginQuestEnabled() ));
+ break;
+ case 408: // VENDORCHARGESENABLED
+ JS_SET_RVAL( cx, vp, BOOLEAN_TO_JSVAL( cwmWorldState->ServerData()->VendorChargesEnabled() ));
+ break;
+ case 409: // VENDORBASECHARGE
+ JS_SET_RVAL( cx, vp, INT_TO_JSVAL( static_cast( cwmWorldState->ServerData()->VendorBaseCharge() )));
+ break;
+ case 410: // VENDORCHARGEHOURS
+ JS_SET_RVAL( cx, vp, INT_TO_JSVAL( static_cast( cwmWorldState->ServerData()->VendorChargeHours() )));
+ break;
+ case 411: // VENDORUSEITEMFEESENABLED
+ JS_SET_RVAL( cx, vp, BOOLEAN_TO_JSVAL( cwmWorldState->ServerData()->VendorUseItemFeesEnabled() ));
+ break;
+ case 412: // VENDORITEMFEEDIVISOR
+ JS_SET_RVAL( cx, vp, INT_TO_JSVAL( static_cast( cwmWorldState->ServerData()->VendorItemFeeDivisor() )));
+ break;
+ case 413: // VENDORITEMFEEAMOUNT
+ JS_SET_RVAL( cx, vp, INT_TO_JSVAL( static_cast( cwmWorldState->ServerData()->VendorItemFeeAmount() )));
+ break;
+ case 414: // ONLYRETURNTOBANK
+ JS_SET_RVAL( cx, vp, BOOLEAN_TO_JSVAL( cwmWorldState->ServerData()->OnlyReturnToBank() ));
+ break;
+ case 415: // VENDORMAXFUNDS
+ JS_SET_RVAL( cx, vp, INT_TO_JSVAL( static_cast( cwmWorldState->ServerData()->VendorMaxFunds() )));
break;
default:
ScriptError( cx, "GetServerSetting: Invalid server setting name provided" );
diff --git a/source/UOXJSPropertyEnums.h b/source/UOXJSPropertyEnums.h
index 7a09cc7ec..b9b27c020 100644
--- a/source/UOXJSPropertyEnums.h
+++ b/source/UOXJSPropertyEnums.h
@@ -365,6 +365,7 @@ enum CC_Properties
CCP_AITYPE,
CCP_SPLIT,
CCP_SPLITCHANCE,
+ CCP_VENDORGOLDHELD,
CCP_TRAINER,
CCP_HIRELING,
CCP_WEIGHT,
diff --git a/source/UOXJSPropertyFuncs.cpp b/source/UOXJSPropertyFuncs.cpp
index eed6afb31..1894ab6d9 100644
--- a/source/UOXJSPropertyFuncs.cpp
+++ b/source/UOXJSPropertyFuncs.cpp
@@ -2176,6 +2176,7 @@ JSBool CCharacterProps_getProperty( JSContext *cx, JSObject *obj, jsid id, jsval
case CCP_AITYPE: *vp = INT_TO_JSVAL( gPriv->GetNpcAiType() ); break;
case CCP_SPLIT: *vp = INT_TO_JSVAL( gPriv->GetSplit() ); break;
case CCP_SPLITCHANCE: *vp = INT_TO_JSVAL( gPriv->GetSplitChance() ); break;
+ case CCP_VENDORGOLDHELD:*vp = INT_TO_JSVAL( gPriv->GetHoldG() ); break;
case CCP_TRAINER: *vp = BOOLEAN_TO_JSVAL( gPriv->CanTrain() ); break;
case CCP_HIRELING: *vp = BOOLEAN_TO_JSVAL( gPriv->CanBeHired() ); break;
case CCP_WEIGHT: *vp = INT_TO_JSVAL( gPriv->GetWeight() ); break;
@@ -2694,6 +2695,7 @@ JSBool CCharacterProps_setProperty( JSContext* cx, JSObject* obj, jsid id, JSBoo
case CCP_AITYPE: gPriv->SetNPCAiType( static_cast( encaps.toInt() )); break;
case CCP_SPLIT: gPriv->SetSplit( static_cast( encaps.toInt() )); break;
case CCP_SPLITCHANCE: gPriv->SetSplitChance( static_cast( encaps.toInt() ));break;
+ case CCP_VENDORGOLDHELD:gPriv->SetHoldG( static_cast( encaps.toInt() )); break;
case CCP_HIRELING: gPriv->SetCanHire( encaps.toBool() ); break;
case CCP_TRAINER: gPriv->SetCanTrain( encaps.toBool() ); break;
case CCP_WEIGHT: gPriv->SetWeight( static_cast( encaps.toInt() )); break;
diff --git a/source/UOXJSPropertySpecs.h b/source/UOXJSPropertySpecs.h
index d274d5df3..d917f3fe8 100644
--- a/source/UOXJSPropertySpecs.h
+++ b/source/UOXJSPropertySpecs.h
@@ -384,6 +384,7 @@ inline JSPropertySpec CCharacterProps[] =
{ "aitype", CCP_AITYPE, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "split", CCP_SPLIT, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "splitchance", CCP_SPLITCHANCE, JSPROP_ENUMANDPERM, nullptr, nullptr },
+ { "vendorGoldHeld", CCP_VENDORGOLDHELD, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "hireling", CCP_HIRELING, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "trainer", CCP_TRAINER, JSPROP_ENUMANDPERM, nullptr, nullptr },
{ "weight", CCP_WEIGHT, JSPROP_ENUMANDPERM, nullptr, nullptr },
diff --git a/source/cServerData.cpp b/source/cServerData.cpp
index bea28892b..0750efdc5 100644
--- a/source/cServerData.cpp
+++ b/source/cServerData.cpp
@@ -419,6 +419,14 @@ const std::map CServerData::uox3IniCaseValue
{"SPEEDHACKTHROTTLEPENALTY", 405},
{"EVENTMANAGERSYSTEM", 406},
{"LOGINQUESTENABLED"s, 407},
+ {"VENDORCHARGESENABLED", 408},
+ {"VENDORBASECHARGE", 409},
+ {"VENDORCHARGEHOURS", 410},
+ {"VENDORUSEITEMFEESENABLED", 411},
+ {"VENDORITEMFEEDIVISOR", 412},
+ {"VENDORITEMFEEAMOUNT", 413},
+ {"ONLYRETURNTOBANK", 414},
+ {"VENDORMAXFUNDS", 415},
};
constexpr auto MAX_TRACKINGTARGETS = 128;
constexpr auto SKILLTOTALCAP = 7000;
@@ -540,8 +548,11 @@ constexpr auto BIT_HOUSEITEMSDELETEONDECAY = UI32( 112 );
constexpr auto BIT_HOUSEGRANDFATHERED = UI32( 113 );
constexpr auto BIT_SPEEDHACKDETECTION = UI32( 119 );
constexpr auto BIT_EVENTMANAGERSYSTEM = UI32( 120 );
-constexpr auto BIT_QUESTSYSTEMENABLED = UI32( 121 );
-constexpr auto BIT_LOGINQUESTENABLED = UI32( 122 );
+constexpr auto BIT_QUESTSYSTEMENABLED = UI32( 121 );
+constexpr auto BIT_LOGINQUESTENABLED = UI32( 122 );
+constexpr auto BIT_VENDORCHARGESENABLED = UI32( 123 );
+constexpr auto BIT_VENDORUSEITEMFEESENABLED = UI32( 124 );
+constexpr auto BIT_ONLYRETURNTOBANK = UI32( 125 );
// New uox3.ini format lookup
@@ -953,6 +964,16 @@ auto CServerData::ResetDefaults() -> void
AmbientFootsteps( false );
ServerCommandPrefix( '\'' );
+ // Player vendor upkeep settings
+ VendorChargesEnabled( true );
+ VendorBaseCharge( 60 );
+ VendorChargeHours( 24 );
+ VendorUseItemFeesEnabled( true );
+ VendorItemFeeDivisor( 500 );
+ VendorItemFeeAmount( 3 );
+ OnlyReturnToBank( true );
+ VendorMaxFunds( 1000000 );
+
// SPEEDUP
CheckSpawnRegionSpeed( 30 );
CheckItemsSpeed( 1.5 );
@@ -5475,6 +5496,118 @@ auto CServerData::KickOnAssistantSilence( bool nVal ) -> void
boolVals.set( BIT_KICKONASSISTANTSILENCE, nVal );
}
+//o------------------------------------------------------------------------------------------------o
+//| Function - CServerData::VendorChargesEnabled()
+//o------------------------------------------------------------------------------------------------o
+//| Purpose - Gets/Sets whether player vendors charge upkeep fees
+//o------------------------------------------------------------------------------------------------o
+auto CServerData::VendorChargesEnabled() const -> bool
+{
+ return boolVals.test( BIT_VENDORCHARGESENABLED );
+}
+auto CServerData::VendorChargesEnabled( bool newVal ) -> void
+{
+ boolVals.set( BIT_VENDORCHARGESENABLED, newVal );
+}
+
+//o------------------------------------------------------------------------------------------------o
+//| Function - CServerData::VendorBaseCharge()
+//o------------------------------------------------------------------------------------------------o
+//| Purpose - Gets/Sets the flat gold fee charged to player vendors each upkeep period
+//o------------------------------------------------------------------------------------------------o
+auto CServerData::VendorBaseCharge() const -> SI16
+{
+ return vendorBaseCharge;
+}
+auto CServerData::VendorBaseCharge( SI16 value ) -> void
+{
+ vendorBaseCharge = value;
+}
+
+//o------------------------------------------------------------------------------------------------o
+//| Function - CServerData::VendorChargeHours()
+//o------------------------------------------------------------------------------------------------o
+//| Purpose - Gets/Sets how often player vendors are charged upkeep fees, in real hours
+//o------------------------------------------------------------------------------------------------o
+auto CServerData::VendorChargeHours() const -> SI16
+{
+ return vendorChargeHours;
+}
+auto CServerData::VendorChargeHours( SI16 value ) -> void
+{
+ vendorChargeHours = value;
+}
+
+//o------------------------------------------------------------------------------------------------o
+//| Function - CServerData::VendorUseItemFeesEnabled()
+//o------------------------------------------------------------------------------------------------o
+//| Purpose - Gets/Sets whether listed item values add extra player vendor upkeep fees
+//o------------------------------------------------------------------------------------------------o
+auto CServerData::VendorUseItemFeesEnabled() const -> bool
+{
+ return boolVals.test( BIT_VENDORUSEITEMFEESENABLED );
+}
+auto CServerData::VendorUseItemFeesEnabled( bool newVal ) -> void
+{
+ boolVals.set( BIT_VENDORUSEITEMFEESENABLED, newVal );
+}
+
+//o------------------------------------------------------------------------------------------------o
+//| Function - CServerData::VendorItemFeeDivisor()
+//o------------------------------------------------------------------------------------------------o
+//| Purpose - Gets/Sets the listed item value divisor used for player vendor item fees
+//o------------------------------------------------------------------------------------------------o
+auto CServerData::VendorItemFeeDivisor() const -> SI16
+{
+ return vendorItemFeeDivisor;
+}
+auto CServerData::VendorItemFeeDivisor( SI16 value ) -> void
+{
+ vendorItemFeeDivisor = value;
+}
+
+//o------------------------------------------------------------------------------------------------o
+//| Function - CServerData::VendorItemFeeAmount()
+//o------------------------------------------------------------------------------------------------o
+//| Purpose - Gets/Sets the gold fee added per player vendor item fee divisor step
+//o------------------------------------------------------------------------------------------------o
+auto CServerData::VendorItemFeeAmount() const -> SI16
+{
+ return vendorItemFeeAmount;
+}
+auto CServerData::VendorItemFeeAmount( SI16 value ) -> void
+{
+ vendorItemFeeAmount = value;
+}
+
+//o------------------------------------------------------------------------------------------------o
+//| Function - CServerData::OnlyReturnToBank()
+//o------------------------------------------------------------------------------------------------o
+//| Purpose - Gets/Sets returned vendor belongings skip player backpack entirely
+//o------------------------------------------------------------------------------------------------o
+auto CServerData::OnlyReturnToBank() const -> bool
+{
+ return boolVals.test( BIT_ONLYRETURNTOBANK );
+}
+auto CServerData::OnlyReturnToBank( bool newVal ) -> void
+{
+ boolVals.set( BIT_ONLYRETURNTOBANK, newVal );
+}
+
+//o------------------------------------------------------------------------------------------------o
+//| Function - CServerData::VendorMaxFunds()
+//o------------------------------------------------------------------------------------------------o
+//| Purpose - Gets/Sets the Max amount of money the vendor can hold in the bank.
+//o------------------------------------------------------------------------------------------------o
+auto CServerData::VendorMaxFunds() const -> UI32
+{
+ return vendorMaxFunds;
+}
+auto CServerData::VendorMaxFunds( UI32 value ) -> void
+{
+ vendorMaxFunds = value;
+}
+
//o------------------------------------------------------------------------------------------------o
//| Function - CServerData::SaveIni()
//| Date - 02/21/2002
@@ -5842,6 +5975,17 @@ auto CServerData::SaveIni( const std::string &filename ) -> bool
ofsOutput << "PETBONDINGENABLED=" << ( PetBondingEnabled() ? 1 : 0 ) << '\n';
ofsOutput << "}" << '\n';
+ ofsOutput << '\n' << "[playervendor]" << '\n' << "{" << '\n';
+ ofsOutput << "VENDORCHARGESENABLED=" << ( VendorChargesEnabled() ? 1 : 0 ) << '\n';
+ ofsOutput << "VENDORBASECHARGE=" << VendorBaseCharge() << '\n';
+ ofsOutput << "VENDORCHARGEHOURS=" << VendorChargeHours() << '\n';
+ ofsOutput << "VENDORUSEITEMFEESENABLED=" << ( VendorUseItemFeesEnabled() ? 1 : 0 ) << '\n';
+ ofsOutput << "VENDORITEMFEEDIVISOR=" << VendorItemFeeDivisor() << '\n';
+ ofsOutput << "VENDORITEMFEEAMOUNT=" << VendorItemFeeAmount() << '\n';
+ ofsOutput << "ONLYRETURNTOBANK=" << ( OnlyReturnToBank() ? 1 : 0 ) << '\n';
+ ofsOutput << "VENDORMAXFUNDS=" << VendorMaxFunds() << '\n';
+ ofsOutput << "}" << '\n';
+
ofsOutput << '\n' << "[speedup]" << '\n' << "{" << '\n';
ofsOutput << "CHECKITEMS=" << CheckItemsSpeed() << '\n';
ofsOutput << "CHECKBOATS=" << CheckBoatSpeed() << '\n';
@@ -7587,6 +7731,31 @@ auto CServerData::HandleLine( const std::string& tag, const std::string& value )
break;
case 407: // LOGINQUESTENABLED
LoginQuestEnabled( ( static_cast( std::stoul( value, nullptr, 0 ) ) >= 1 ? true : false ) );
+ break;
+ case 408: // VENDORCHARGESENABLED
+ VendorChargesEnabled( ( static_cast( std::stoul( value, nullptr, 0 ) ) >= 1 ? true : false ) );
+ break;
+ case 409: // VENDORBASECHARGE
+ VendorBaseCharge( static_cast( std::stoi( value )));
+ break;
+ case 410: // VENDORCHARGEHOURS
+ VendorChargeHours( static_cast( std::stoi( value )));
+ break;
+ case 411: // VENDORUSEITEMFEESENABLED
+ VendorUseItemFeesEnabled( ( static_cast( std::stoul( value, nullptr, 0 ) ) >= 1 ? true : false ) );
+ break;
+ case 412: // VENDORITEMFEEDIVISOR
+ VendorItemFeeDivisor( static_cast( std::stoi( value )));
+ break;
+ case 413: // VENDORITEMFEEAMOUNT
+ VendorItemFeeAmount( static_cast( std::stoi( value )));
+ break;
+ case 414: // ONLYRETURNTOBANK
+ OnlyReturnToBank( ( static_cast( std::stoul( value, nullptr, 0 ) ) >= 1 ? true : false ) );
+ break;
+ case 415: // VENDORMAXFUNDS
+ VendorMaxFunds( static_cast( std::stoul( value, nullptr, 0 )));
+ break;
default:
rValue = false;
break;
diff --git a/source/cServerData.h b/source/cServerData.h
index 9bed4047b..030b28036 100644
--- a/source/cServerData.h
+++ b/source/cServerData.h
@@ -212,7 +212,7 @@ class CServerData
// Once over 62, bitsets are costly. std::vector has a special exception in the c++ specificaiton, to minimize wasted space for bools
// These should be updated
- std::bitset<123> boolVals; // Many values stored this way, rather than using bools.
+ std::bitset<126> boolVals; // Many values stored this way, rather than using bools.
std::bitset<64> spawnRegionsFacets; // Used to determine which facets to enable spawn regions for, set in UOX>INI
std::bitset<64> moongateFacets; // Used to determine which facets to enable moongates for, set in UOX>INI
@@ -337,6 +337,15 @@ class CServerData
UI16 petLoyaltyGainOnSuccess; // The default amount of pet loyalty gained on successful use of a pet command
UI16 petLoyaltyLossOnFailure; // The default amount of pet loyalty lost on a failed attempt to use a pet command
+ bool vendorChargesEnabled; // Master toggle for player vendor upkeep charges
+ SI16 vendorBaseCharge; // Flat fee per vendor upkeep charge period
+ SI16 vendorChargeHours; // Number of real hours between vendor upkeep charges
+ bool vendorUseItemFeesEnabled; // Add item-based upkeep fees from listed item prices
+ SI16 vendorItemFeeDivisor; // Listed item value divisor used for vendor item fees
+ SI16 vendorItemFeeAmount; // Fee added per divisor step
+ bool onlyReturnToBank; // returned vendor belongings skip player backpack entirely
+ UI32 vendorMaxFunds; // Max amount of money the vendor can hold in the bank.
+
// SpeedUp
R64 npcWalkingSpeed; // Speed at which walking NPCs move
R64 npcRunningSpeed; // Speed at which running NPCs move
@@ -1387,6 +1396,30 @@ class CServerData
auto APSDelayMaxCap() const -> UI16;
auto APSDelayMaxCap( UI16 newVal ) -> void;
+ auto VendorChargesEnabled( bool value ) -> void;
+ auto VendorChargesEnabled() const -> bool;
+
+ auto VendorBaseCharge( SI16 value ) -> void;
+ SI16 VendorBaseCharge() const;
+
+ auto VendorChargeHours( SI16 value ) -> void;
+ SI16 VendorChargeHours() const;
+
+ auto VendorUseItemFeesEnabled( bool value ) -> void;
+ auto VendorUseItemFeesEnabled() const -> bool;
+
+ auto VendorItemFeeDivisor( SI16 value ) -> void;
+ SI16 VendorItemFeeDivisor() const;
+
+ auto VendorItemFeeAmount( SI16 value ) -> void;
+ SI16 VendorItemFeeAmount() const;
+
+ auto OnlyReturnToBank( bool value ) -> void;
+ auto OnlyReturnToBank() const -> bool;
+
+ auto VendorMaxFunds( UI32 value ) -> void;
+ UI32 VendorMaxFunds() const;
+
SI16 ServerTimeDay() const;
UI08 ServerTimeHours() const;
UI08 ServerTimeMinutes() const;