pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Commands] Cleanup #flymode Command. (#1845)

Browse Source 
- Cleanup message and logic.
- Add GetFlyModeName() and GetFlyModeMap() helper methods.
- Cleanup #npcedit flymode to use helper methods.
This commit is contained in:
Kinglykrab 2021-11-27 21:39:54 -05:00 committed by GitHub
parent 5ab9b941e2
commit ba5bb09af7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 84 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/emu_constants.cpp
View File

@ -197,3 +197,28 @@ std::string EQ::constants::GetLanguageName(int language_id)
}
return std::string();
}
const std::map<uint8, std::string>& EQ::constants::GetFlyModeMap()
{
static const std::map<uint8, std::string> flymode_map = {
{ EQ::constants::GravityBehavior::Ground, "Ground" },
{ EQ::constants::GravityBehavior::Flying, "Flying" },
{ EQ::constants::GravityBehavior::Levitating, "Levitating" },
{ EQ::constants::GravityBehavior::Water, "Water" },
{ EQ::constants::GravityBehavior::Floating, "Floating" },
{ EQ::constants::GravityBehavior::LevitateWhileRunning, "Levitating While Running" },
};
return flymode_map;
}
std::string EQ::constants::GetFlyModeName(uint8 flymode_id)
{
if (
flymode_id >= GravityBehavior::Ground &&
flymode_id <= GravityBehavior::LevitateWhileRunning
) {
auto flymodes = EQ::constants::GetFlyModeMap();
return flymodes[flymode_id];
}
return std::string();
}

12
common/emu_constants.h
View File

@ -220,12 +220,24 @@ namespace EQ
stanceBurnAE
};
enum GravityBehavior : uint8 {
Ground,
Flying,
Levitating,
Water,
Floating,
LevitateWhileRunning
};
const char *GetStanceName(StanceType stance_type);
int ConvertStanceTypeToIndex(StanceType stance_type);
extern const std::map<int, std::string>& GetLanguageMap();
std::string GetLanguageName(int language_id);
extern const std::map<uint8, std::string>& GetFlyModeMap();
std::string GetFlyModeName(uint8 flymode_id);
const int STANCE_TYPE_FIRST = stancePassive;
const int STANCE_TYPE_LAST = stanceBurnAE;
const int STANCE_TYPE_COUNT = stanceBurnAE;

68
zone/gm_commands/flymode.cpp
View File

@ -2,39 +2,45 @@
void command_flymode(Client *c, const Seperator *sep)
{
Mob *t = c;
if (strlen(sep->arg[1]) == 1 && sep->IsNumber(1) && atoi(sep->arg[1]) >= 0 && atoi(sep->arg[1]) <= 5) {
if (c->GetTarget()) {
t = c->GetTarget();
}
int fm = atoi(sep->arg[1]);
t->SetFlyMode(static_cast<GravityBehavior>(fm));
t->SendAppearancePacket(AT_Levitate, fm);
if (sep->arg[1][0] == '0') {
c->Message(Chat::White, "Setting %s to Grounded", t->GetName());
}
else if (sep->arg[1][0] == '1') {
c->Message(Chat::White, "Setting %s to Flying", t->GetName());
}
else if (sep->arg[1][0] == '2') {
c->Message(Chat::White, "Setting %s to Levitating", t->GetName());
}
else if (sep->arg[1][0] == '3') {
c->Message(Chat::White, "Setting %s to In Water", t->GetName());
}
else if (sep->arg[1][0] == '4') {
c->Message(Chat::White, "Setting %s to Floating(Boat)", t->GetName());
}
else if (sep->arg[1][0] == '5') {
c->Message(Chat::White, "Setting %s to Levitating While Running", t->GetName());
}
int arguments = sep->argnum;
if (!arguments || !sep->IsNumber(1)) {
return;
}
else {
c->Message(Chat::White, "#flymode [0/1/2/3/4/5]");
Mob *target = c;
if (c->GetTarget()) {
target = c->GetTarget();
}
auto flymode_id = std::stoul(sep->arg[1]);
if (
flymode_id < EQ::constants::GravityBehavior::Ground &&
flymode_id > EQ::constants::GravityBehavior::LevitateWhileRunning
) {
c->Message(Chat::White, "Usage:: #flymode [Flymode ID]");
c->Message(Chat::White, "0 = Ground, 1 = Flying, 2 = Levitating, 3 = Water, 4 = Floating, 5 = Levitating While Running");
return;
}
target->SetFlyMode(static_cast<GravityBehavior>(flymode_id));
target->SendAppearancePacket(AT_Levitate, flymode_id);
c->Message(
Chat::White,
fmt::format(
"Fly Mode for {} is now {} ({}).",
(
c == target ?
"yourself" :
fmt::format(
"{} ({})",
target->GetCleanName(),
target->GetID()
)
),
EQ::constants::GetFlyModeName(flymode_id),
flymode_id
).c_str()
);
}

32
zone/gm_commands/npcedit.cpp
View File

@ -153,7 +153,7 @@ void command_npcedit(Client *c, const Seperator *sep)
);
c->Message(
Chat::White,
"#npcedit flymode - Sets an NPC's flymode [0 = Ground, 1 = Flying, 2 = Levitating, 3 = Water, 4 = Floating, 5 = Levitating While Running]"
"#npcedit flymode - Sets an NPC's Fly Mode [0 = Ground, 1 = Flying, 2 = Levitating, 3 = Water, 4 = Floating, 5 = Levitating While Running]"
);
c->Message(
Chat::White,
@ -1271,29 +1271,17 @@ void command_npcedit(Client *c, const Seperator *sep)
}
if (strcasecmp(sep->arg[1], "flymode") == 0) {
auto flymode_id = atoi(sep->arg[2]);
std::string flymode_name = "Unknown";
if (flymode_id == GravityBehavior::Ground) {
flymode_name = "Ground";
}
else if (flymode_id == GravityBehavior::Flying) {
flymode_name = "Flying";
}
else if (flymode_id == GravityBehavior::Levitating) {
flymode_name = "Levitating";
}
else if (flymode_id == GravityBehavior::Water) {
flymode_name = "Water";
}
else if (flymode_id == GravityBehavior::Floating) {
flymode_name = "Floating";
}
else if (flymode_id == GravityBehavior::LevitateWhileRunning) {
flymode_name = "Levitating While Running";
}
auto flymode_id = static_cast<uint8>(std::stoul(sep->arg[2]));
std::string flymode_name = EQ::constants::GetFlyModeName(flymode_id);
c->Message(
Chat::Yellow,
fmt::format("NPC ID {} is now using Fly Mode {} ({}).", npc_id, flymode_name, flymode_id).c_str());
fmt::format(
"NPC ID {} is now using Fly Mode {} ({}).",
npc_id,
flymode_name,
flymode_id
).c_str()
);
std::string query = fmt::format("UPDATE npc_types SET flymode = {} WHERE id = {}", flymode_id, npc_id);
content_db.QueryDatabase(query);
return;