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

- Cleanup message and logic.
- Add GetFlyModeName() and GetFlyModeMap() helper methods.
- Cleanup #npcedit flymode to use helper methods.

common/emu_constants.cpp

@@ -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();
+}

common/emu_constants.h

@@ -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;

zone/gm_commands/flymode.cpp

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

zone/gm_commands/npcedit.cpp

@@ -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]);
+		auto flymode_id = static_cast<uint8>(std::stoul(sep->arg[2]));
-		std::string flymode_name = "Unknown";
+		std::string flymode_name = EQ::constants::GetFlyModeName(flymode_id);
-		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";
-		}
 		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;