pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-07 07:12:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix Strings::Money Missing Conditions. (#2383)

Browse Source 
Noudess pointed out we were missing CSP, CP, and SP options in these conditions.
This commit is contained in:
Kinglykrab 2022-08-21 15:00:02 -04:00 committed by GitHub
parent 3f9df40c3c
commit b108828502
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/strings.cpp
View File

@ -343,6 +343,14 @@ std::string Strings::Money(uint32 platinum, uint32 gold, uint32 silver, uint32 c
Strings::Commify(std::to_string(copper)) Strings::Commify(std::to_string(copper))
); );
} }
else if (copper && silver && !gold && platinum) { // CSP
money_string = fmt::format(
"{} Platinum, {} Silver, and {} Copper",
Strings::Commify(std::to_string(platinum)),
Strings::Commify(std::to_string(silver)),
Strings::Commify(std::to_string(copper))
);
}
else if (copper && silver && gold && !platinum) { // CSG else if (copper && silver && gold && !platinum) { // CSG
money_string = fmt::format( money_string = fmt::format(
"{} Gold, {} Silver, and {} Copper", "{} Gold, {} Silver, and {} Copper",
@ -351,6 +359,13 @@ std::string Strings::Money(uint32 platinum, uint32 gold, uint32 silver, uint32 c
Strings::Commify(std::to_string(copper)) Strings::Commify(std::to_string(copper))
); );
} }
else if (copper && !silver && !gold && platinum) { // CP
money_string = fmt::format(
"{} Platinum and {} Copper",
Strings::Commify(std::to_string(platinum)),
Strings::Commify(std::to_string(copper))
);
}
else if (copper && silver && !gold && !platinum) { // CS else if (copper && silver && !gold && !platinum) { // CS
money_string = fmt::format( money_string = fmt::format(
"{} Silver and {} Copper", "{} Silver and {} Copper",
@ -366,6 +381,13 @@ std::string Strings::Money(uint32 platinum, uint32 gold, uint32 silver, uint32 c
Strings::Commify(std::to_string(silver)) Strings::Commify(std::to_string(silver))
); );
} }
else if (!copper && silver && !gold && platinum) { // SP
money_string = fmt::format(
"{} Platinum and {} Silver",
Strings::Commify(std::to_string(platinum)),
Strings::Commify(std::to_string(silver))
);
}
else if (!copper && silver && gold && !platinum) { // SG else if (!copper && silver && gold && !platinum) { // SG
money_string = fmt::format( money_string = fmt::format(
"{} Gold and {} Silver", "{} Gold and {} Silver",