[Commands] Cleanup #camerashake Command. (#1787)

- Cleanup message and logic.
- Fix ConvertSecondsToTime logic for milliseconds.
- Add ConvertMillisecondsToTime inline function.
This commit is contained in:
Kinglykrab
2021-11-21 10:03:20 -05:00
committed by GitHub
parent 7154d5b841
commit 40edefa6f4
7 changed files with 50 additions and 21 deletions
+19 -2
View File
@@ -1021,9 +1021,26 @@ std::vector<std::string> GetBadWords()
};
}
std::string ConvertSecondsToTime(int duration)
std::string ConvertSecondsToTime(int duration, bool is_milliseconds)
{
int timer_length = duration;
if (duration <= 0) {
return "Unknown";
}
if (is_milliseconds && duration < 1000) {
return fmt::format(
"{} Millisecond{}",
duration,
duration != 1 ? "s" : ""
);
}
int timer_length = (
is_milliseconds ?
static_cast<int>(std::ceil(static_cast<float>(duration) / 1000.0f)) :
duration
);
int days = int(timer_length / 86400000);
timer_length %= 86400000;
int hours = int(timer_length / 3600);
+4 -1
View File
@@ -45,7 +45,10 @@ std::vector<std::string> wrap(std::vector<std::string> &src, std::string charact
std::string implode(std::string glue, std::vector<std::string> src);
std::string convert2digit(int n, std::string suffix);
std::string numberToWords(unsigned long long int n);
std::string ConvertSecondsToTime(int duration);
std::string ConvertSecondsToTime(int duration, bool is_milliseconds = false);
inline std::string ConvertMillisecondsToTime(int duration) {
return ConvertSecondsToTime(duration, true);
}
// For converstion of numerics into English
// Used for grid nodes, as NPC names remove numerals.