pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-16 21:12:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Commands] npc_edit faction and #setfaction duplicate and incorrect. (#3577)

Browse Source 
* [Commands] npc_edit faction and #setfaction duplicate and incorrect.

* Fix assignment
This commit is contained in:
Paul Coene 2023-09-02 21:21:48 -04:00 committed by GitHub
parent ca933fce45
commit a64425ebe6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
zone/gm_commands/npcedit.cpp
View File

@ -339,24 +339,33 @@ void command_npcedit(Client *c, const Seperator *sep)
}
} else if (!strcasecmp(sep->arg[1], "faction")) {
if (sep->IsNumber(2)) {
auto faction_id = Strings::ToInt(sep->arg[2]);
auto faction_name = content_db.GetFactionName(faction_id);
n.npc_faction_id = faction_id;
d = fmt::format(
"{} is now using Faction {}.",
npc_id_string,
(
!faction_name.empty() ?
fmt::format(
"{} ({})",
faction_name,
faction_id
) :
Strings::Commify(sep->arg[2])
)
);
auto npc_faction_id = Strings::ToInt(sep->arg[2]);
const NPCFactionList* cf = content_db.GetNPCFactionEntry(npc_faction_id);
if (cf) {
auto faction_id = cf->primaryfaction;
auto faction_name = content_db.GetFactionName(faction_id);
n.npc_faction_id = npc_faction_id;
d = fmt::format(
"{} is now using Faction {}.",
npc_id_string,
(
!faction_name.empty() ?
fmt::format(
"{} ({})",
faction_name,
faction_id
) :
Strings::Commify(sep->arg[2])
)
);
}
else {
c->Message(Chat::White, "Need to provide a valid, existing, npc_faction_id");
return;
}
} else {
c->Message(Chat::White, "Usage: #npcedit faction [Faction ID] - Sets an NPC's Faction ID");
c->Message(Chat::White, "Usage: #npcedit faction [npc_faction_id] - Sets an NPC's npc Faction ID (not primary faction) but lookup into table.");
return;
}
} else if (!strcasecmp(sep->arg[1], "adventure_template_id")) {

2
zone/gm_commands/set.cpp
View File

@ -13,7 +13,6 @@
#include "set/endurance.cpp"
#include "set/endurance_full.cpp"
#include "set/exp.cpp"
#include "set/faction.cpp"
#include "set/flymode.cpp"
#include "set/frozen.cpp"
#include "set/gender.cpp"
@ -80,7 +79,6 @@ void command_set(Client *c, const Seperator *sep)
Cmd{.cmd = "endurance", .u = "endurance [Amount]", .fn = SetEndurance, .a = {"#setendurance"}},
Cmd{.cmd = "endurance_full", .u = "endurance_full", .fn = SetEnduranceFull, .a = {"#endurance"}},
Cmd{.cmd = "exp", .u = "exp [aa|exp] [Amount]", .fn = SetEXP, .a = {"#setxp"}},
Cmd{.cmd = "faction", .u = "faction [Faction ID]", .fn = SetFaction, .a = {"#setfaction"}},
Cmd{.cmd = "flymode", .u = "flymode [Flymode ID]", .fn = SetFlymode, .a = {"#flymode"}},
Cmd{.cmd = "frozen", .u = "frozen [on|off]", .fn = SetFrozen, .a = {"#freeze", "#unfreeze"}},
Cmd{.cmd = "gender", .u = "gender [Gender ID]", .fn = SetGender, .a = {"#gender"}},

54
zone/gm_commands/set/faction.cpp
View File

@ -1,54 +0,0 @@
#include "../../client.h"
void SetFaction(Client *c, const Seperator *sep)
{
const auto arguments = sep->argnum;
if (arguments < 2 || !sep->IsNumber(2)) {
c->Message(Chat::White, "Usage: #set faction [Faction ID]");
return;
}
if (
!c->GetTarget() ||
(
c->GetTarget() &&
c->GetTarget()->IsClient()
)
) {
c->Message(Chat::White, "You must target an NPC to use this command.");
return;
}
NPC* t = c->GetTarget()->CastToNPC();
const uint32 npc_id = t->GetNPCTypeID();
const int faction_id = Strings::ToInt(sep->arg[2]);
const std::string& faction_name = content_db.GetFactionName(faction_id);
if (faction_name.empty()) {
c->Message(
Chat::White,
"Invalid Faction ID, please specify a valid Faction ID."
);
return;
}
c->Message(
Chat::White,
fmt::format(
"Faction Changed | Name: {} ({}) Faction: {} ({}).",
t->GetCleanName(),
npc_id,
content_db.GetFactionName(faction_id),
faction_id
).c_str()
);
const std::string &query = fmt::format(
"UPDATE npc_types SET npc_faction_id = {} WHERE id = {}",
faction_id,
npc_id
);
content_db.QueryDatabase(query);
}