From b10882850298e36e186f2485f8f8e3adcbb5dece Mon Sep 17 00:00:00 2001 From: Kinglykrab <89047260+Kinglykrab@users.noreply.github.com> Date: Sun, 21 Aug 2022 15:00:02 -0400 Subject: [PATCH] [Bug Fix] Fix Strings::Money Missing Conditions. (#2383) Noudess pointed out we were missing CSP, CP, and SP options in these conditions. --- common/strings.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/common/strings.cpp b/common/strings.cpp index 3561e8a9c..238ed89e0 100644 --- a/common/strings.cpp +++ b/common/strings.cpp @@ -343,6 +343,14 @@ std::string Strings::Money(uint32 platinum, uint32 gold, uint32 silver, uint32 c 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 money_string = fmt::format( "{} 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)) ); } + 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 money_string = fmt::format( "{} 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)) ); } + 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 money_string = fmt::format( "{} Gold and {} Silver",