mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-13 06:21:28 +00:00
[Cleanup] Remove Strings::Commify from all identifier values (#3528)
# Notes - Removes commification from unique identifiers.
This commit is contained in:
parent
00a8a0cf88
commit
2dc2bac456
@ -11750,7 +11750,7 @@ void Client::ShowSpells(Client* c, ShowSpellType show_spell_type)
|
|||||||
"{}. {} ({})",
|
"{}. {} ({})",
|
||||||
index,
|
index,
|
||||||
GetSpellName(spell_id),
|
GetSpellName(spell_id),
|
||||||
Strings::Commify(spell_id)
|
spell_id
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,9 +39,9 @@ void GlobalLootManager::ShowZoneGlobalLoot(Client *c) const
|
|||||||
global_loot_table += DialogueWindow::TableRow(
|
global_loot_table += DialogueWindow::TableRow(
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"{}{}{}",
|
"{}{}{}",
|
||||||
DialogueWindow::TableCell(Strings::Commify(e.GetID())),
|
DialogueWindow::TableCell(std::to_string(e.GetID())),
|
||||||
DialogueWindow::TableCell(e.GetDescription()),
|
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(
|
global_loot_table += DialogueWindow::TableRow(
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"{}{}{}",
|
"{}{}{}",
|
||||||
DialogueWindow::TableCell(Strings::Commify(e.GetID())),
|
DialogueWindow::TableCell(std::to_string(e.GetID())),
|
||||||
DialogueWindow::TableCell(e.GetDescription()),
|
DialogueWindow::TableCell(e.GetDescription()),
|
||||||
DialogueWindow::TableCell(Strings::Commify(e.GetLootTableID()))
|
DialogueWindow::TableCell(std::to_string(e.GetLootTableID()))
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,7 +10,7 @@ void FindAA(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"AA {} | {}",
|
"AA {} | {}",
|
||||||
Strings::Commify(aa_id),
|
aa_id,
|
||||||
aa_name
|
aa_name
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
@ -22,7 +22,7 @@ void FindAA(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"AA ID {} was not found.",
|
"AA ID {} was not found.",
|
||||||
Strings::Commify(aa_id)
|
aa_id
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -51,7 +51,7 @@ void FindAA(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"AA {} | {}",
|
"AA {} | {}",
|
||||||
Strings::Commify(a.first),
|
a.first,
|
||||||
aa_name
|
aa_name
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
|
|||||||
@ -12,7 +12,7 @@ void FindCharacter(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Character ID {} does not exist or is invalid.",
|
"Character ID {} does not exist or is invalid.",
|
||||||
Strings::Commify(character_id)
|
character_id
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -23,7 +23,7 @@ void FindCharacter(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Character ID {} | {}",
|
"Character ID {} | {}",
|
||||||
Strings::Commify(character_id),
|
character_id,
|
||||||
e.name
|
e.name
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
|
|||||||
@ -13,7 +13,7 @@ void FindCurrency(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"There is no currency with an item ID of {}.",
|
"There is no currency with an item ID of {}.",
|
||||||
Strings::Commify(item_id)
|
item_id
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -26,7 +26,7 @@ void FindCurrency(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Item ID {} does not exist.",
|
"Item ID {} does not exist.",
|
||||||
Strings::Commify(item_id)
|
item_id
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@ void FindFaction(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Faction {} | {}",
|
"Faction {} | {}",
|
||||||
Strings::Commify(faction_id),
|
faction_id,
|
||||||
faction_name
|
faction_name
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
@ -22,7 +22,7 @@ void FindFaction(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Faction ID {} was not found.",
|
"Faction ID {} was not found.",
|
||||||
Strings::Commify(faction_id)
|
faction_id
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ void FindFaction(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Faction {} | {}",
|
"Faction {} | {}",
|
||||||
Strings::Commify(faction_id),
|
faction_id,
|
||||||
faction_name
|
faction_name
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
|
|||||||
@ -104,7 +104,7 @@ void FindItem(Client *c, const Seperator *sep)
|
|||||||
"{} | {} ({})",
|
"{} | {} ({})",
|
||||||
summon_links,
|
summon_links,
|
||||||
database.CreateItemLink(e),
|
database.CreateItemLink(e),
|
||||||
Strings::Commify(item->ID)
|
item->ID
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -47,7 +47,7 @@ void FindNPCType(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"NPC {} | {}{}",
|
"NPC {} | {}{}",
|
||||||
Strings::Commify(row[0]),
|
row[0],
|
||||||
row[1],
|
row[1],
|
||||||
(
|
(
|
||||||
can_spawn_npcs ?
|
can_spawn_npcs ?
|
||||||
|
|||||||
@ -19,7 +19,7 @@ void FindRecipe(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Recipe ID {} could not be found.",
|
"Recipe ID {} could not be found.",
|
||||||
Strings::Commify(recipe_id)
|
recipe_id
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
@ -29,7 +29,7 @@ void FindRecipe(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Recipe {} | {}{}",
|
"Recipe {} | {}{}",
|
||||||
Strings::Commify(recipe_id),
|
recipe_id,
|
||||||
l[0].name,
|
l[0].name,
|
||||||
(
|
(
|
||||||
can_view_recipes ?
|
can_view_recipes ?
|
||||||
|
|||||||
@ -16,7 +16,7 @@ void FindSpell(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Spell ID {} was not found.",
|
"Spell ID {} was not found.",
|
||||||
Strings::Commify(spell_id)
|
spell_id
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -27,7 +27,7 @@ void FindSpell(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Spell {} | {}",
|
"Spell {} | {}",
|
||||||
Strings::Commify(spell_id),
|
spell_id,
|
||||||
spells[spell_id].name
|
spells[spell_id].name
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
@ -53,7 +53,7 @@ void FindSpell(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Spell {} | {}{}",
|
"Spell {} | {}{}",
|
||||||
Strings::Commify(spell_id),
|
spell_id,
|
||||||
spell_name,
|
spell_name,
|
||||||
(
|
(
|
||||||
can_cast_spells ?
|
can_cast_spells ?
|
||||||
|
|||||||
@ -18,7 +18,7 @@ void FindTask(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Task ID {} was not found.",
|
"Task ID {} was not found.",
|
||||||
Strings::Commify(task_id)
|
task_id
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -29,7 +29,7 @@ void FindTask(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Task {} | {}",
|
"Task {} | {}",
|
||||||
Strings::Commify(task_id),
|
task_id,
|
||||||
task_name
|
task_name
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
@ -52,7 +52,7 @@ void FindTask(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Task {} | {}{}",
|
"Task {} | {}{}",
|
||||||
Strings::Commify(t.first),
|
t.first,
|
||||||
task_name,
|
task_name,
|
||||||
(
|
(
|
||||||
can_assign_tasks ?
|
can_assign_tasks ?
|
||||||
|
|||||||
@ -25,7 +25,7 @@ void command_npcedit(Client *c, const Seperator *sep)
|
|||||||
auto npc_id = t->GetNPCTypeID();
|
auto npc_id = t->GetNPCTypeID();
|
||||||
auto npc_id_string = fmt::format(
|
auto npc_id_string = fmt::format(
|
||||||
"NPC ID {}",
|
"NPC ID {}",
|
||||||
Strings::Commify(std::to_string(npc_id))
|
npc_id
|
||||||
);
|
);
|
||||||
|
|
||||||
auto n = NpcTypesRepository::FindOne(content_db, npc_id);
|
auto n = NpcTypesRepository::FindOne(content_db, npc_id);
|
||||||
|
|||||||
@ -26,7 +26,7 @@ void ShowGroupInfo(Client *c, const Seperator *sep)
|
|||||||
|
|
||||||
popup_table += DialogueWindow::TableRow(
|
popup_table += DialogueWindow::TableRow(
|
||||||
DialogueWindow::TableCell("Group ID") +
|
DialogueWindow::TableCell("Group ID") +
|
||||||
DialogueWindow::TableCell(Strings::Commify(g->GetID()))
|
DialogueWindow::TableCell(std::to_string(g->GetID()))
|
||||||
);
|
);
|
||||||
|
|
||||||
popup_table += DialogueWindow::TableRow(
|
popup_table += DialogueWindow::TableRow(
|
||||||
|
|||||||
@ -27,7 +27,7 @@ void ShowRecipe(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Recipe ID {} has no entries or could not be found.",
|
"Recipe ID {} has no entries or could not be found.",
|
||||||
Strings::Commify(recipe_id)
|
recipe_id
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
@ -37,7 +37,7 @@ void ShowRecipe(Client *c, const Seperator *sep)
|
|||||||
Chat::White,
|
Chat::White,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Recipe {} | {}",
|
"Recipe {} | {}",
|
||||||
Strings::Commify(recipe_id),
|
recipe_id,
|
||||||
r[0].name
|
r[0].name
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
|
|||||||
@ -34,7 +34,7 @@ void ShowTimers(Client *c, const Seperator *sep)
|
|||||||
const uint32 remaining_time = e.second->GetRemainingTime();
|
const uint32 remaining_time = e.second->GetRemainingTime();
|
||||||
if (remaining_time) {
|
if (remaining_time) {
|
||||||
popup_table += DialogueWindow::TableRow(
|
popup_table += DialogueWindow::TableRow(
|
||||||
DialogueWindow::TableCell(Strings::Commify(e.first)) +
|
DialogueWindow::TableCell(std::to_string(e.first)) +
|
||||||
DialogueWindow::TableCell(Strings::SecondsToTime(remaining_time))
|
DialogueWindow::TableCell(Strings::SecondsToTime(remaining_time))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -63,7 +63,7 @@ void ShowZoneLoot(Client *c, const Seperator *sep)
|
|||||||
"{}. {} ({}) {}",
|
"{}. {} ({}) {}",
|
||||||
loot_number,
|
loot_number,
|
||||||
linker.GenerateLink(),
|
linker.GenerateLink(),
|
||||||
Strings::Commify(i->item_id),
|
i->item_id,
|
||||||
npc_link
|
npc_link
|
||||||
).c_str()
|
).c_str()
|
||||||
);
|
);
|
||||||
|
|||||||
@ -63,8 +63,8 @@ void command_spawneditmass(Client *c, const Seperator *sep)
|
|||||||
Chat::Yellow,
|
Chat::Yellow,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
"Spawn2 ID: {} NPC ID: {} Name: {} Respawn Time: {} ({})",
|
"Spawn2 ID: {} NPC ID: {} Name: {} Respawn Time: {} ({})",
|
||||||
Strings::Commify(spawn2_id),
|
spawn2_id,
|
||||||
Strings::Commify(npc_id),
|
npc_id,
|
||||||
npc_name,
|
npc_name,
|
||||||
Strings::SecondsToTime(Strings::ToInt(respawn_time)),
|
Strings::SecondsToTime(Strings::ToInt(respawn_time)),
|
||||||
Strings::Commify(respawn_time)
|
Strings::Commify(respawn_time)
|
||||||
|
|||||||
@ -2105,7 +2105,7 @@ void Mob::SendStatsWindow(Client* c, bool use_window)
|
|||||||
"{}: {}{}{}",
|
"{}: {}{}{}",
|
||||||
!faction_name.empty() ? faction_name : "Unknown Faction",
|
!faction_name.empty() ? faction_name : "Unknown Faction",
|
||||||
sign,
|
sign,
|
||||||
Strings::Commify(f.second),
|
f.second,
|
||||||
DialogueWindow::Break(1)
|
DialogueWindow::Break(1)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -3475,7 +3475,7 @@ void Mob::ShowBuffs(Client* c) {
|
|||||||
"{}{}{}{}{}",
|
"{}{}{}{}{}",
|
||||||
DialogueWindow::TableCell(std::to_string(i)),
|
DialogueWindow::TableCell(std::to_string(i)),
|
||||||
DialogueWindow::TableCell(GetSpellName(spell_id)),
|
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(is_permanent ? "Permanent" : time),
|
||||||
DialogueWindow::TableCell(std::to_string(buffs[i].hit_number))
|
DialogueWindow::TableCell(std::to_string(buffs[i].hit_number))
|
||||||
)
|
)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user