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
zone/command.cpp
+55 -14
View File
@@ -9291,21 +9291,62 @@ void command_setcrystals(Client *c, const Seperator *sep)
void command_stun(Client *c, const Seperator *sep)
{
Mob *t=c->CastToMob();
uint32 duration;
if(sep->arg[1][0])
{
duration = atoi(sep->arg[1]);
if(c->GetTarget())
t=c->GetTarget();
if(t->IsClient())
t->CastToClient()->Stun(duration);
else
t->CastToNPC()->Stun(duration);
int arguments = sep->argnum;
if (!arguments || !sep->IsNumber(1)) {
c->Message(Chat::White, "Usage: #stun [Duration]");
return;
}
else
c->Message(Chat::White, "Usage: #stun [duration]");
Mob* target = c;
int duration = static_cast<int>(std::min(std::stoll(sep->arg[1]), (long long) 2000000000));
if (duration < 0) {
duration = 0;
}
if (c->GetTarget()) {
target = c->GetTarget();
if (target->IsClient()) {
target->CastToClient()->Stun(duration);
} else if (target->IsNPC()) {
target->CastToNPC()->Stun(duration);
}
} else {
c->Stun(duration);
}
std::string stun_message = (
duration ?
fmt::format(
"You stunned {} for {}.",
(
c == target ?
"yourself" :
fmt::format(
"{} ({})",
target->GetCleanName(),
target->GetID()
)
),
ConvertSecondsToTime(duration)
) :
fmt::format(
"You unstunned {}.",
(
c == target ?
"yourself" :
fmt::format(
"{} ({})",
target->GetCleanName(),
target->GetID()
)
)
)
);
c->Message(
Chat::White,
stun_message.c_str()
);
}
zone/questmgr.cpp
+1 -26
View File
@@ -3353,32 +3353,7 @@ EQ::ItemInstance *QuestManager::CreateItem(uint32 item_id, int16 charges, uint32
}
std::string QuestManager::secondstotime(int duration) {
int timer_length = duration;
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 hour_string = (hours == 1 ? "Hour" : "Hours");
std::string minute_string = (minutes == 1 ? "Minute" : "Minutes");
std::string second_string = (seconds == 1 ? "Second" : "Seconds");
if (hours > 0 && minutes > 0 && seconds > 0) {
time_string = fmt::format("{} {}, {} {}, and {} {}", hours, hour_string, minutes, minute_string, seconds, second_string);
} else if (hours > 0 && minutes > 0 && seconds == 0) {
time_string = fmt::format("{} {} and {} {}", hours, hour_string, minutes, minute_string);
} else if (hours > 0 && minutes == 0 && seconds > 0) {
time_string = fmt::format("{} {} and {} {}", hours, hour_string, seconds, second_string);
} else if (hours > 0 && minutes == 0 && seconds == 0) {
time_string = fmt::format("{} {}", hours, hour_string);
} else if (hours == 0 && minutes > 0 && seconds > 0) {
time_string = fmt::format("{} {} and {} {}", minutes, minute_string, seconds, second_string);
} else if (hours == 0 && minutes > 0 && seconds == 0) {
time_string = fmt::format("{} {}", minutes, minute_string);
} else if (hours == 0 && minutes == 0 && seconds > 0) {
time_string = fmt::format("{} {}", seconds, second_string);
}
return time_string;
return ConvertSecondsToTime(duration);
}
std::string QuestManager::gethexcolorcode(std::string color_name) {