pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Commands] Cleanup #stun Command. (#1749)

Browse Source 
* [Commands] Cleanup #stun Command.
- Cleanup message.
- Add ConvertSecondsToTime() to string_util.h and convert Quest API Methods to use helper.

* Add days to ConvertSecondsToTime() and cleanup logic.

* Cleanup.

* Typo.

* Cleanup.

* Cleanup.
This commit is contained in:
Kinglykrab
2021-11-14 14:05:44 -05:00
committed by GitHub
parent 90bcc5f03c
commit ddcb184183
4 changed files with 201 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/string_util.cpp
+144
View File
@@ -15,6 +15,7 @@
*/
#include "string_util.h"
#include <fmt/format.h>
#include <algorithm>
#include <cctype>
@@ -1019,3 +1020,146 @@ std::vector<std::string> GetBadWords()
"zoophilia"
};
}
std::string ConvertSecondsToTime(int duration)
{
int timer_length = duration;
int days = int(timer_length / 86400000);
timer_length %= 86400000;
int hours = int(timer_length / 3600);
timer_length %= 3600;
int minutes = int(timer_length / 60);
timer_length %= 60;
int seconds = timer_length;
std::string time_string = "Unknown";
std::string day_string = (days == 1 ? "Day" : "Days");
std::string hour_string = (hours == 1 ? "Hour" : "Hours");
std::string minute_string = (minutes == 1 ? "Minute" : "Minutes");
std::string second_string = (seconds == 1 ? "Second" : "Seconds");
if (days && hours && minutes && seconds) { // DHMS
time_string = fmt::format(
"{} {}, {} {}, {} {}, and {} {}",
days,
day_string,
hours,
hour_string,
minutes,
minute_string,
seconds,
second_string
);
} else if (days && hours && minutes && !seconds) { // DHM
time_string = fmt::format(
"{} {}, {} {}, and {} {}",
days,
day_string,
hours,
hour_string,
minutes,
minute_string
);
} else if (days && hours && !minutes && seconds) { // DHS
time_string = fmt::format(
"{} {}, {} {}, and {} {}",
days,
day_string,
hours,
hour_string,
seconds,
second_string
);
} else if (days && hours && !minutes && !seconds) { // DH
time_string = fmt::format(
"{} {} and {} {}",
days,
day_string,
hours,
hour_string
);
} else if (days && !hours && minutes && seconds) { // DMS
time_string = fmt::format(
"{} {}, {} {}, and {} {}",
days,
day_string,
minutes,
minute_string,
seconds,
second_string
);
} else if (days && !hours && minutes && !seconds) { // DM
time_string = fmt::format(
"{} {} and {} {}",
days,
day_string,
minutes,
minute_string
);
} else if (days && !hours && !minutes && seconds) { // DS
time_string = fmt::format(
"{} {} and {} {}",
days,
day_string,
seconds,
second_string
);
} else if (days && !hours && !minutes && !seconds) { // D
time_string = fmt::format(
"{} {}",
days,
day_string
);
} else if (!days && hours && minutes && seconds) { // HMS
time_string = fmt::format(
"{} {}, {} {}, and {} {}",
hours,
hour_string,
minutes,
minute_string,
seconds,
second_string
);
} else if (!days && hours && minutes && !seconds) { // HM
time_string = fmt::format(
"{} {} and {} {}",
hours,
hour_string,
minutes,
minute_string
);
} else if (!days && hours && !minutes && seconds) { // HS
time_string = fmt::format(
"{} {} and {} {}",
hours,
hour_string,
seconds,
second_string
);
} else if (!days && hours && !minutes && !seconds) { // H
time_string = fmt::format(
"{} {}",
hours,
hour_string
);
} else if (!days && !hours && minutes && seconds) { // MS
time_string = fmt::format(
"{} {} and {} {}",
minutes,
minute_string,
seconds,
second_string
);
} else if (!days && !hours && minutes && !seconds) { // M
time_string = fmt::format(
"{} {}",
minutes,
minute_string
);
} else if (!days && !hours && !minutes && seconds) { // S
time_string = fmt::format(
"{} {}",
seconds,
second_string
);
}
return time_string;
}
common/string_util.h
+1
View File
@@ -45,6 +45,7 @@ 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);
// For converstion of numerics into English
// Used for grid nodes, as NPC names remove numerals.