diff --git a/zone/client.cpp b/zone/client.cpp index 4c39d4c88..ab60952a3 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -11750,7 +11750,7 @@ void Client::ShowSpells(Client* c, ShowSpellType show_spell_type) "{}. {} ({})", index, GetSpellName(spell_id), - Strings::Commify(spell_id) + spell_id ).c_str() ); } diff --git a/zone/global_loot_manager.cpp b/zone/global_loot_manager.cpp index ca6401874..e9c63598f 100644 --- a/zone/global_loot_manager.cpp +++ b/zone/global_loot_manager.cpp @@ -39,9 +39,9 @@ void GlobalLootManager::ShowZoneGlobalLoot(Client *c) const global_loot_table += DialogueWindow::TableRow( fmt::format( "{}{}{}", - DialogueWindow::TableCell(Strings::Commify(e.GetID())), + DialogueWindow::TableCell(std::to_string(e.GetID())), DialogueWindow::TableCell(e.GetDescription()), - DialogueWindow::TableCell(Strings::Commify(e.GetLootTableID())) + DialogueWindow::TableCell(std::to_string(e.GetLootTableID())) ) ); } @@ -76,9 +76,9 @@ void GlobalLootManager::ShowNPCGlobalLoot(Client *c, NPC *t) const global_loot_table += DialogueWindow::TableRow( fmt::format( "{}{}{}", - DialogueWindow::TableCell(Strings::Commify(e.GetID())), + DialogueWindow::TableCell(std::to_string(e.GetID())), DialogueWindow::TableCell(e.GetDescription()), - DialogueWindow::TableCell(Strings::Commify(e.GetLootTableID())) + DialogueWindow::TableCell(std::to_string(e.GetLootTableID())) ) ); } diff --git a/zone/gm_commands/find/aa.cpp b/zone/gm_commands/find/aa.cpp index fd1ce0bd4..82e311bee 100644 --- a/zone/gm_commands/find/aa.cpp +++ b/zone/gm_commands/find/aa.cpp @@ -10,7 +10,7 @@ void FindAA(Client *c, const Seperator *sep) Chat::White, fmt::format( "AA {} | {}", - Strings::Commify(aa_id), + aa_id, aa_name ).c_str() ); @@ -22,7 +22,7 @@ void FindAA(Client *c, const Seperator *sep) Chat::White, fmt::format( "AA ID {} was not found.", - Strings::Commify(aa_id) + aa_id ).c_str() ); @@ -51,7 +51,7 @@ void FindAA(Client *c, const Seperator *sep) Chat::White, fmt::format( "AA {} | {}", - Strings::Commify(a.first), + a.first, aa_name ).c_str() ); diff --git a/zone/gm_commands/find/character.cpp b/zone/gm_commands/find/character.cpp index 9aeab28f1..fcd1b7c92 100644 --- a/zone/gm_commands/find/character.cpp +++ b/zone/gm_commands/find/character.cpp @@ -12,7 +12,7 @@ void FindCharacter(Client *c, const Seperator *sep) Chat::White, fmt::format( "Character ID {} does not exist or is invalid.", - Strings::Commify(character_id) + character_id ).c_str() ); @@ -23,7 +23,7 @@ void FindCharacter(Client *c, const Seperator *sep) Chat::White, fmt::format( "Character ID {} | {}", - Strings::Commify(character_id), + character_id, e.name ).c_str() ); diff --git a/zone/gm_commands/find/currency.cpp b/zone/gm_commands/find/currency.cpp index c7b2f6b6a..fbf640d85 100644 --- a/zone/gm_commands/find/currency.cpp +++ b/zone/gm_commands/find/currency.cpp @@ -13,7 +13,7 @@ void FindCurrency(Client *c, const Seperator *sep) Chat::White, fmt::format( "There is no currency with an item ID of {}.", - Strings::Commify(item_id) + item_id ).c_str() ); @@ -26,7 +26,7 @@ void FindCurrency(Client *c, const Seperator *sep) Chat::White, fmt::format( "Item ID {} does not exist.", - Strings::Commify(item_id) + item_id ).c_str() ); diff --git a/zone/gm_commands/find/faction.cpp b/zone/gm_commands/find/faction.cpp index f8412d013..376140928 100644 --- a/zone/gm_commands/find/faction.cpp +++ b/zone/gm_commands/find/faction.cpp @@ -10,7 +10,7 @@ void FindFaction(Client *c, const Seperator *sep) Chat::White, fmt::format( "Faction {} | {}", - Strings::Commify(faction_id), + faction_id, faction_name ).c_str() ); @@ -22,7 +22,7 @@ void FindFaction(Client *c, const Seperator *sep) Chat::White, fmt::format( "Faction ID {} was not found.", - Strings::Commify(faction_id) + faction_id ).c_str() ); @@ -48,7 +48,7 @@ void FindFaction(Client *c, const Seperator *sep) Chat::White, fmt::format( "Faction {} | {}", - Strings::Commify(faction_id), + faction_id, faction_name ).c_str() ); diff --git a/zone/gm_commands/find/item.cpp b/zone/gm_commands/find/item.cpp index aaea2638e..7963e8cb6 100644 --- a/zone/gm_commands/find/item.cpp +++ b/zone/gm_commands/find/item.cpp @@ -104,7 +104,7 @@ void FindItem(Client *c, const Seperator *sep) "{} | {} ({})", summon_links, database.CreateItemLink(e), - Strings::Commify(item->ID) + item->ID ).c_str() ); diff --git a/zone/gm_commands/find/npctype.cpp b/zone/gm_commands/find/npctype.cpp index a25bce0f0..c83be99ba 100644 --- a/zone/gm_commands/find/npctype.cpp +++ b/zone/gm_commands/find/npctype.cpp @@ -47,7 +47,7 @@ void FindNPCType(Client *c, const Seperator *sep) Chat::White, fmt::format( "NPC {} | {}{}", - Strings::Commify(row[0]), + row[0], row[1], ( can_spawn_npcs ? diff --git a/zone/gm_commands/find/recipe.cpp b/zone/gm_commands/find/recipe.cpp index 0d8b18951..41e58ab4a 100644 --- a/zone/gm_commands/find/recipe.cpp +++ b/zone/gm_commands/find/recipe.cpp @@ -19,7 +19,7 @@ void FindRecipe(Client *c, const Seperator *sep) Chat::White, fmt::format( "Recipe ID {} could not be found.", - Strings::Commify(recipe_id) + recipe_id ).c_str() ); return; @@ -29,7 +29,7 @@ void FindRecipe(Client *c, const Seperator *sep) Chat::White, fmt::format( "Recipe {} | {}{}", - Strings::Commify(recipe_id), + recipe_id, l[0].name, ( can_view_recipes ? diff --git a/zone/gm_commands/find/spell.cpp b/zone/gm_commands/find/spell.cpp index 58887f67a..ddfc83270 100644 --- a/zone/gm_commands/find/spell.cpp +++ b/zone/gm_commands/find/spell.cpp @@ -16,7 +16,7 @@ void FindSpell(Client *c, const Seperator *sep) Chat::White, fmt::format( "Spell ID {} was not found.", - Strings::Commify(spell_id) + spell_id ).c_str() ); @@ -27,7 +27,7 @@ void FindSpell(Client *c, const Seperator *sep) Chat::White, fmt::format( "Spell {} | {}", - Strings::Commify(spell_id), + spell_id, spells[spell_id].name ).c_str() ); @@ -53,7 +53,7 @@ void FindSpell(Client *c, const Seperator *sep) Chat::White, fmt::format( "Spell {} | {}{}", - Strings::Commify(spell_id), + spell_id, spell_name, ( can_cast_spells ? diff --git a/zone/gm_commands/find/task.cpp b/zone/gm_commands/find/task.cpp index 3fea5a591..5bf96894e 100644 --- a/zone/gm_commands/find/task.cpp +++ b/zone/gm_commands/find/task.cpp @@ -18,7 +18,7 @@ void FindTask(Client *c, const Seperator *sep) Chat::White, fmt::format( "Task ID {} was not found.", - Strings::Commify(task_id) + task_id ).c_str() ); @@ -29,7 +29,7 @@ void FindTask(Client *c, const Seperator *sep) Chat::White, fmt::format( "Task {} | {}", - Strings::Commify(task_id), + task_id, task_name ).c_str() ); @@ -52,7 +52,7 @@ void FindTask(Client *c, const Seperator *sep) Chat::White, fmt::format( "Task {} | {}{}", - Strings::Commify(t.first), + t.first, task_name, ( can_assign_tasks ? diff --git a/zone/gm_commands/npcedit.cpp b/zone/gm_commands/npcedit.cpp index c5aacda2b..71ca3f884 100755 --- a/zone/gm_commands/npcedit.cpp +++ b/zone/gm_commands/npcedit.cpp @@ -25,7 +25,7 @@ void command_npcedit(Client *c, const Seperator *sep) auto npc_id = t->GetNPCTypeID(); auto npc_id_string = fmt::format( "NPC ID {}", - Strings::Commify(std::to_string(npc_id)) + npc_id ); auto n = NpcTypesRepository::FindOne(content_db, npc_id); diff --git a/zone/gm_commands/show/group_info.cpp b/zone/gm_commands/show/group_info.cpp index 7aab3464c..94358c3c2 100644 --- a/zone/gm_commands/show/group_info.cpp +++ b/zone/gm_commands/show/group_info.cpp @@ -26,7 +26,7 @@ void ShowGroupInfo(Client *c, const Seperator *sep) popup_table += DialogueWindow::TableRow( DialogueWindow::TableCell("Group ID") + - DialogueWindow::TableCell(Strings::Commify(g->GetID())) + DialogueWindow::TableCell(std::to_string(g->GetID())) ); popup_table += DialogueWindow::TableRow( diff --git a/zone/gm_commands/show/recipe.cpp b/zone/gm_commands/show/recipe.cpp index 95cae95cc..9d8025a43 100644 --- a/zone/gm_commands/show/recipe.cpp +++ b/zone/gm_commands/show/recipe.cpp @@ -27,7 +27,7 @@ void ShowRecipe(Client *c, const Seperator *sep) Chat::White, fmt::format( "Recipe ID {} has no entries or could not be found.", - Strings::Commify(recipe_id) + recipe_id ).c_str() ); return; @@ -37,7 +37,7 @@ void ShowRecipe(Client *c, const Seperator *sep) Chat::White, fmt::format( "Recipe {} | {}", - Strings::Commify(recipe_id), + recipe_id, r[0].name ).c_str() ); diff --git a/zone/gm_commands/show/timers.cpp b/zone/gm_commands/show/timers.cpp index b31d8eac4..78768fb5c 100644 --- a/zone/gm_commands/show/timers.cpp +++ b/zone/gm_commands/show/timers.cpp @@ -34,7 +34,7 @@ void ShowTimers(Client *c, const Seperator *sep) const uint32 remaining_time = e.second->GetRemainingTime(); if (remaining_time) { popup_table += DialogueWindow::TableRow( - DialogueWindow::TableCell(Strings::Commify(e.first)) + + DialogueWindow::TableCell(std::to_string(e.first)) + DialogueWindow::TableCell(Strings::SecondsToTime(remaining_time)) ); } diff --git a/zone/gm_commands/show/zone_loot.cpp b/zone/gm_commands/show/zone_loot.cpp index 53222cf45..edd34b3b8 100644 --- a/zone/gm_commands/show/zone_loot.cpp +++ b/zone/gm_commands/show/zone_loot.cpp @@ -63,7 +63,7 @@ void ShowZoneLoot(Client *c, const Seperator *sep) "{}. {} ({}) {}", loot_number, linker.GenerateLink(), - Strings::Commify(i->item_id), + i->item_id, npc_link ).c_str() ); diff --git a/zone/gm_commands/spawneditmass.cpp b/zone/gm_commands/spawneditmass.cpp index 8e66d0fca..8c85e2fbc 100644 --- a/zone/gm_commands/spawneditmass.cpp +++ b/zone/gm_commands/spawneditmass.cpp @@ -63,8 +63,8 @@ void command_spawneditmass(Client *c, const Seperator *sep) Chat::Yellow, fmt::format( "Spawn2 ID: {} NPC ID: {} Name: {} Respawn Time: {} ({})", - Strings::Commify(spawn2_id), - Strings::Commify(npc_id), + spawn2_id, + npc_id, npc_name, Strings::SecondsToTime(Strings::ToInt(respawn_time)), Strings::Commify(respawn_time) diff --git a/zone/mob.cpp b/zone/mob.cpp index 03d4a4888..918a2e882 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -2105,7 +2105,7 @@ void Mob::SendStatsWindow(Client* c, bool use_window) "{}: {}{}{}", !faction_name.empty() ? faction_name : "Unknown Faction", sign, - Strings::Commify(f.second), + f.second, DialogueWindow::Break(1) ); } @@ -3475,7 +3475,7 @@ void Mob::ShowBuffs(Client* c) { "{}{}{}{}{}", DialogueWindow::TableCell(std::to_string(i)), DialogueWindow::TableCell(GetSpellName(spell_id)), - DialogueWindow::TableCell(Strings::Commify(spell_id)), + DialogueWindow::TableCell(std::to_string(spell_id)), DialogueWindow::TableCell(is_permanent ? "Permanent" : time), DialogueWindow::TableCell(std::to_string(buffs[i].hit_number)) )