mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-31 09:06:46 +00:00
[Cleanup] Cleanup #show currencies Command (#3693)
* [Cleanup] Cleanup #show currencies Command # Notes - Cleans up messages. - Adds `AA Points` as a viewable currency. - Adds an enum for `MoneyTypes` and `MoneySubtypes` so we're not using magic numbers for `GetMoney` anymore. - Converts money amounts to `uint64`. * Update currencies.cpp * Update currencies.cpp
This commit is contained in:
@@ -3,34 +3,34 @@
|
||||
|
||||
void ShowCurrencies(Client *c, const Seperator *sep)
|
||||
{
|
||||
auto t = c;
|
||||
Client *t = c;
|
||||
if (c->GetTarget() && c->GetTarget()->IsClient()) {
|
||||
t = c->GetTarget()->CastToClient();
|
||||
}
|
||||
|
||||
const uint32 platinum = (
|
||||
t->GetMoney(3, 0) +
|
||||
t->GetMoney(3, 1) +
|
||||
t->GetMoney(3, 2) +
|
||||
t->GetMoney(3, 3)
|
||||
const uint64 platinum = (
|
||||
t->GetMoney(MoneyTypes::Platinum, MoneySubtypes::Personal) +
|
||||
t->GetMoney(MoneyTypes::Platinum, MoneySubtypes::Bank) +
|
||||
t->GetMoney(MoneyTypes::Platinum, MoneySubtypes::Cursor) +
|
||||
t->GetMoney(MoneyTypes::Platinum, MoneySubtypes::SharedBank)
|
||||
);
|
||||
|
||||
const uint32 gold = (
|
||||
t->GetMoney(2, 0) +
|
||||
t->GetMoney(2, 1) +
|
||||
t->GetMoney(2, 2)
|
||||
const uint64 gold = (
|
||||
t->GetMoney(MoneyTypes::Gold, MoneySubtypes::Personal) +
|
||||
t->GetMoney(MoneyTypes::Gold, MoneySubtypes::Bank) +
|
||||
t->GetMoney(MoneyTypes::Gold, MoneySubtypes::Cursor)
|
||||
);
|
||||
|
||||
const uint32 silver = (
|
||||
t->GetMoney(1, 0) +
|
||||
t->GetMoney(1, 1) +
|
||||
t->GetMoney(1, 2)
|
||||
const uint64 silver = (
|
||||
t->GetMoney(MoneyTypes::Silver, MoneySubtypes::Personal) +
|
||||
t->GetMoney(MoneyTypes::Silver, MoneySubtypes::Bank) +
|
||||
t->GetMoney(MoneyTypes::Silver, MoneySubtypes::Cursor)
|
||||
);
|
||||
|
||||
const uint32 copper = (
|
||||
t->GetMoney(0, 0) +
|
||||
t->GetMoney(0, 1) +
|
||||
t->GetMoney(0, 2)
|
||||
const uint64 copper = (
|
||||
t->GetMoney(MoneyTypes::Copper, MoneySubtypes::Personal) +
|
||||
t->GetMoney(MoneyTypes::Copper, MoneySubtypes::Bank) +
|
||||
t->GetMoney(MoneyTypes::Copper, MoneySubtypes::Cursor)
|
||||
);
|
||||
|
||||
std::string currency_table;
|
||||
@@ -79,9 +79,9 @@ void ShowCurrencies(Client *c, const Seperator *sep)
|
||||
for (const auto& a : zone->AlternateCurrencies) {
|
||||
const uint32 currency_value = t->GetAlternateCurrencyValue(a.id);
|
||||
if (currency_value) {
|
||||
const auto* d = database.GetItem(a.item_id);
|
||||
const auto *item = database.GetItem(a.item_id);
|
||||
currency_table += DialogueWindow::TableRow(
|
||||
DialogueWindow::TableCell(d->Name) +
|
||||
DialogueWindow::TableCell(item->Name) +
|
||||
DialogueWindow::TableCell(Strings::Commify(currency_value))
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user