Skip to content
This repository has been archived by the owner on Mar 12, 2024. It is now read-only.

Commit

Permalink
[Commands] Cleanup #depopzone Command. (EQEmu#2537)
Browse files Browse the repository at this point in the history
* [Commands] Cleanup #depopzone Command.

- Cleanup messages and logic.
- Add optional `start_spawn_timers` parameter to start spawn timers of NPCs when depopped.

* Update depopzone.cpp
  • Loading branch information
Kinglykrab authored and catapultam-habeo committed Mar 27, 2023
1 parent 30802ed commit 6fcd580
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
2 changes: 1 addition & 1 deletion zone/command.cpp
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ int command_init(void)
command_add("delacct", "[accountname] - Delete an account", AccountStatus::GMLeadAdmin, command_delacct) ||
command_add("delpetition", "[petition number] - Delete a petition", AccountStatus::ApprenticeGuide, command_delpetition) ||
command_add("depop", "[Start Spawn Timer] - Depop your NPC target and optionally start their spawn timer (false by default)", AccountStatus::Guide, command_depop) ||
command_add("depopzone", "Depop the zone", AccountStatus::GMAdmin, command_depopzone) ||
command_add("depopzone", "[Start Spawn Timers] - Depop the zone and optionally start spawn timers (false by default)", AccountStatus::GMAdmin, command_depopzone) ||
command_add("devtools", "[Enable|Disable] - Manages Developer Tools (send no parameter for menu)", AccountStatus::GMMgmt, command_devtools) ||
command_add("disablerecipe", "[Recipe ID] - Disables a Recipe", AccountStatus::QuestTroupe, command_disablerecipe) ||
command_add("disarmtrap", "Analog for ldon disarm trap for the newer clients since we still don't have it working.", AccountStatus::QuestTroupe, command_disarmtrap) ||
Expand Down
17 changes: 15 additions & 2 deletions zone/gm_commands/depopzone.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,20 @@

void command_depopzone(Client *c, const Seperator *sep)
{
zone->Depop();
c->Message(Chat::White, "Zone depoped.");
auto start_spawn_timers = false;

if (sep->IsNumber(1)) {
start_spawn_timers = std::stoi(sep->arg[1]) ? true : false;
}

zone->Depop(start_spawn_timers);

c->Message(
Chat::White,
fmt::format(
"Zone depopped{}.",
start_spawn_timers ? " and spawn timers started" : ""
).c_str()
);
}

0 comments on commit 6fcd580

Please sign in to comment.