pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 04:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Commands] Consolidate #set-like commands into a singular #set command (#3486)

Browse Source 
* First push

* Final push.

* Consolidate zone commands in to one.

* Update command.cpp

* Remove debug messages.

* Test

* Add support for sub command status levels.

* Update command.cpp

* Update client.cpp

* Update database_update_manifest.cpp

* Update version.h

* Update item.cpp

* Update version.h

* Update database_update_manifest.cpp

* Fix command arguments.

* Help message.

* Update command.cpp

* Do DB injection/deletion

* Indent

* Update server_locked.cpp

* Update set.cpp

* Lock aliases

* Update command_subsettings_repository.h

* Update set.cpp

* Fix

---------

Co-authored-by: Akkadius <akkadius1@gmail.com>
This commit is contained in:
Alex King
2023-07-15 01:37:51 -04:00
committed by GitHub
parent e55f9b9d27
commit f25e37d0c5
136 changed files with 3582 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/gm_commands/find/currency.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
void FindCurrency(Client *c, const Seperator *sep)
{
const auto can_summon_items = c->Admin() >= GetCommandStatus(c, "summonitem");
const auto can_summon_items = c->Admin() >= GetCommandStatus("summonitem");
if (sep->IsNumber(2)) {
const auto item_id = Strings::ToUnsignedInt(sep->arg[2]);
zone/gm_commands/find/item.cpp
+8 -3
View File
@@ -71,7 +71,11 @@ void FindItem(Client *c, const Seperator *sep)
auto found_count = 0;
for (const auto& e : l) {
const auto* item = database.GetItem(e);
const auto item = database.GetItem(e);
if (!item) {
continue;
}
std::string summon_links = Saylink::Silent(
fmt::format(
"#si {}",
@@ -97,9 +101,10 @@ void FindItem(Client *c, const Seperator *sep)
c->Message(
Chat::White,
fmt::format(
"{} | {}",
"{} | {} ({})",
summon_links,
database.CreateItemLink(e)
database.CreateItemLink(e),
Strings::Commify(item->ID)
).c_str()
);
zone/gm_commands/find/npctype.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ void FindNPCType(Client *c, const Seperator *sep)
return;
}
const auto can_spawn_npcs = c->Admin() >= GetCommandStatus(c, "#npctypespawn");
const auto can_spawn_npcs = c->Admin() >= GetCommandStatus("#npctypespawn");
auto found_count = 0;
zone/gm_commands/find/recipe.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
void FindRecipe(Client *c, const Seperator *sep)
{
const auto can_view_recipes = c->Admin() >= GetCommandStatus(c, "viewrecipe");
const auto can_view_recipes = c->Admin() >= GetCommandStatus("viewrecipe");
if (sep->IsNumber(2)) {
const auto recipe_id = static_cast<uint16>(Strings::ToUnsignedInt(sep->arg[2]));
zone/gm_commands/find/spell.cpp
+1 -1
View File
@@ -7,7 +7,7 @@ void FindSpell(Client *c, const Seperator *sep)
return;
}
const auto can_cast_spells = c->Admin() >= GetCommandStatus(c, "castspell");
const auto can_cast_spells = c->Admin() >= GetCommandStatus("castspell");
if (sep->IsNumber(2)) {
const auto spell_id = Strings::ToUnsignedInt(sep->arg[2]);
zone/gm_commands/find/task.cpp
+1 -1
View File
@@ -7,7 +7,7 @@ void FindTask(Client *c, const Seperator *sep)
return;
}
const auto can_assign_tasks = c->Admin() >= GetCommandStatus(c, "task");
const auto can_assign_tasks = c->Admin() >= GetCommandStatus("task");
if (sep->IsNumber(2)) {
const auto task_id = Strings::ToUnsignedInt(sep->arg[2]);
zone/gm_commands/find/zone.cpp
+3 -3
View File
@@ -19,7 +19,7 @@ void FindZone(Client *c, const Seperator *sep)
);
search_string = Expansion::ExpansionName[Strings::ToInt(sep->arg[3])];
search_type = "Expansion";
search_type = "expansion";
} else if (is_id_search) {
query += fmt::format(
"zoneidnumber = {}",
@@ -27,7 +27,7 @@ void FindZone(Client *c, const Seperator *sep)
);
search_string = sep->arg[2];
search_type = "Expansion";
search_type = "ID";
} else if (is_short_name_search) {
query += fmt::format(
"LOWER(`long_name`) LIKE '%%{}%%' OR LOWER(`short_name`) LIKE '%%{}%%'",
@@ -36,7 +36,7 @@ void FindZone(Client *c, const Seperator *sep)
);
search_string = sep->argplus[2];
search_type = "Expansion";
search_type = "name";
}
query += " ORDER BY `zoneidnumber` ASC LIMIT 50";