From 850e996b71a92e293ea2bc89c21ef6a339d9ef1c Mon Sep 17 00:00:00 2001 From: nytmyr <53322305+nytmyr@users.noreply.github.com> Date: Wed, 22 Jan 2025 16:41:48 -0600 Subject: [PATCH] Cleanup command format changes, remove hardcoded class IDs in examples. --- zone/bot_commands/behind_mob.cpp | 15 +++++++------ zone/bot_commands/blocked_buffs.cpp | 21 +++++++----------- zone/bot_commands/bot.cpp | 23 ++++++++------------ zone/bot_commands/copy_settings.cpp | 13 ++--------- zone/bot_commands/default_settings.cpp | 10 ++++----- zone/bot_commands/depart.cpp | 3 +-- zone/bot_commands/discipline.cpp | 5 +---- zone/bot_commands/distance_ranged.cpp | 4 +--- zone/bot_commands/sit_hp_percent.cpp | 5 +++-- zone/bot_commands/sit_in_combat.cpp | 5 +++-- zone/bot_commands/sit_mana_percent.cpp | 5 +++-- zone/bot_commands/spell_aggro_checks.cpp | 20 +++++++---------- zone/bot_commands/spell_engaged_priority.cpp | 20 +++++++---------- zone/bot_commands/spell_holds.cpp | 10 ++------- zone/bot_commands/spell_idle_priority.cpp | 20 +++++++---------- zone/bot_commands/spell_max_hp_pct.cpp | 10 ++------- zone/bot_commands/spell_max_mana_pct.cpp | 10 ++------- zone/bot_commands/spell_max_thresholds.cpp | 10 ++------- zone/bot_commands/spell_min_hp_pct.cpp | 10 ++------- zone/bot_commands/spell_min_mana_pct.cpp | 10 ++------- zone/bot_commands/spell_min_thresholds.cpp | 20 +++++++---------- zone/bot_commands/spell_pursue_priority.cpp | 20 +++++++---------- zone/bot_commands/spell_target_count.cpp | 10 ++------- zone/gm_commands/spell_holds.cpp | 8 +++---- 24 files changed, 101 insertions(+), 186 deletions(-) diff --git a/zone/bot_commands/behind_mob.cpp b/zone/bot_commands/behind_mob.cpp index 5de7571f1..be7e417df 100644 --- a/zone/bot_commands/behind_mob.cpp +++ b/zone/bot_commands/behind_mob.cpp @@ -12,18 +12,19 @@ void bot_command_behind_mob(Client* c, const Seperator* sep) BotCommandHelpParams p; p.description = { "Toggles whether or not bots will stay behind the mob during combat." }; - p.example_format = { - fmt::format("{} [value] [actionable]", sep->arg[0]) - }; - p.examples_one = { + p.example_format = { fmt::format("{} [value] [actionable]", sep->arg[0]) }; + p.examples_one = + { "To set Monks to stay behind the mob:", - fmt::format("{} 1 byclass 7", sep->arg[0]) + fmt::format("{} 1 byclass {}", sep->arg[0], Class::Monk) }; - p.examples_two = { + p.examples_two = + { "To force all bots to stay behind mobs:", fmt::format("{} 1 spawned", sep->arg[0]) }; - p.examples_three = { + p.examples_three = + { "To check the behind mob status of all bots:", fmt::format("{} current spawned", sep->arg[0]) }; diff --git a/zone/bot_commands/blocked_buffs.cpp b/zone/bot_commands/blocked_buffs.cpp index 8cb539604..c37bada86 100644 --- a/zone/bot_commands/blocked_buffs.cpp +++ b/zone/bot_commands/blocked_buffs.cpp @@ -19,18 +19,19 @@ void bot_command_blocked_buffs(Client* c, const Seperator* sep) p.description = { "Allows you to set, view and wipe blocked buffs for the selected bots." }; p.notes = { "- You can 'set' spells to be blocked, 'remove' spells from the blocked list, 'list' the current blocked spells or 'wipe' the entire list." }; - p.example_format = { - fmt::format("{} [add [ID] | remove [ID] | list | wipe] [actionable, default: target]", sep->arg[0]) - }; - p.examples_one = { + p.example_format = { fmt::format("{} [add [ID] | remove [ID] | list | wipe] [actionable, default: target]", sep->arg[0]) }; + p.examples_one = + { "To add Courage(Spell ID #202) to the targeted bot's blocked list:", fmt::format("{} add 202", sep->arg[0]) }; - p.examples_two = { + p.examples_two = + { "To view the targeted bot's blocked buff list:", fmt::format("{} list", sep->arg[0]) }; - p.examples_three = { + p.examples_three = + { "To wipe all Warriors bots' blocked buff list:", fmt::format( "{} wipe byclass {}", sep->arg[0], Class::Warrior) }; @@ -243,13 +244,7 @@ void bot_command_blocked_pet_buffs(Client* c, const Seperator* sep) "- You can 'set' spells to be blocked, 'remove' spells from the blocked list, 'list' the current blocked spells or 'wipe' the entire list.", "- This controls whether or not any pet the selected bot(s) own will prevent certain beneficial buffs from landing on them." }; - p.example_format = - { - fmt::format( - "{} [add [ID] | remove [ID] | list | wipe] [actionable, default: target]" - , sep->arg[0] - ) - }; + p.example_format = { fmt::format("{} [add [ID] | remove [ID] | list | wipe] [actionable, default: target]", sep->arg[0]) }; p.examples_one = { "To add Courage (Spell ID #202) to the targeted bot's blocked list:", diff --git a/zone/bot_commands/bot.cpp b/zone/bot_commands/bot.cpp index e91c5eb32..3a5e32676 100644 --- a/zone/bot_commands/bot.cpp +++ b/zone/bot_commands/bot.cpp @@ -486,9 +486,7 @@ void bot_command_follow_distance(Client *c, const Seperator *sep) fmt::format("[Default]: {}", RuleI(Bots, MaxFollowDistance)), fmt::format("- You must use a value between 1 and {}.", RuleI(Bots, MaxFollowDistance)) }; - p.example_format = { - fmt::format("{} [reset]/[set [value]] [actionable]", sep->arg[0]) - }; + p.example_format = { fmt::format("{} [reset]/[set [value]] [actionable]", sep->arg[0]) }; p.examples_one = { "To set all bots to follow at a distance of 25:", fmt::format("{} set 25 spawned", sep->arg[0]) @@ -1157,7 +1155,8 @@ void bot_command_stance(Client *c, const Seperator *sep) BotCommandHelpParams p; p.description = { "Change a bot's stance to control the way it behaves." }; - p.notes = { + p.notes = + { "- Changing a stance will reset all settings to match that stance type.", "- Any changes made will only save to that stance for future use.", fmt::format( @@ -1221,15 +1220,10 @@ void bot_command_stance(Client *c, const Seperator *sep) Stance::AEBurn ) }; - - p.example_format = { - fmt::format( "{} [current | value: {}-{}]", - sep->arg[0], - Stance::Passive, - Stance::AEBurn - ) - }; - p.examples_one = { + p.example_format = + { fmt::format( "{} [current | value]", sep->arg[0]) }; + p.examples_one = + { "To set all bots to BurnAE:", fmt::format("{} {} spawned {}", sep->arg[0], @@ -1237,7 +1231,8 @@ void bot_command_stance(Client *c, const Seperator *sep) Class::ShadowKnight ) }; - p.examples_two = { + p.examples_two = + { "To set all Shadowknights to Aggressive:", fmt::format("{} {} byclass {}", sep->arg[0], diff --git a/zone/bot_commands/copy_settings.cpp b/zone/bot_commands/copy_settings.cpp index 058385c3b..12d6d0b2d 100644 --- a/zone/bot_commands/copy_settings.cpp +++ b/zone/bot_commands/copy_settings.cpp @@ -19,20 +19,11 @@ void bot_command_copy_settings(Client* c, const Seperator* sep) { "- You can put a spell type ID or shortname after any option except [all], [misc] and [spellsettings] to restore that specifc spell type only" }; - p.example_format = - { - fmt::format( - "{} [from] [to] [option]" - , sep->arg[0] - ) - }; + p.example_format = { fmt::format("{} [from] [to] [option]", sep->arg[0]) }; p.examples_one = { "To copy all settings from BotA to BotB:", - fmt::format( - "{} BotA BotB all", - sep->arg[0] - ) + fmt::format("{} BotA BotB all", sep->arg[0]) }; p.examples_two = { diff --git a/zone/bot_commands/default_settings.cpp b/zone/bot_commands/default_settings.cpp index de09a2ee2..7186335e2 100644 --- a/zone/bot_commands/default_settings.cpp +++ b/zone/bot_commands/default_settings.cpp @@ -13,16 +13,14 @@ void bot_command_default_settings(Client* c, const Seperator* sep) p.description = { "Restores a bot's setting(s) to defaults" }; p.notes = { "- You can put a spell type ID or shortname after any option except [all], [misc] and [spellsettings] to restore that specifc spell type only"}; - p.example_format = - { - fmt::format("{} [option] [actionable]", sep->arg[0]) - }; + p.example_format = { fmt::format("{} [option] [actionable]", sep->arg[0]) }; p.examples_one = { "To restore delays for Clerics:", fmt::format( - "{} delays byclass 2", - sep->arg[0] + "{} delays byclass {}", + sep->arg[0], + Class::Cleric ) }; p.examples_two = diff --git a/zone/bot_commands/depart.cpp b/zone/bot_commands/depart.cpp index 39cb1bffd..88b2d7a07 100644 --- a/zone/bot_commands/depart.cpp +++ b/zone/bot_commands/depart.cpp @@ -21,8 +21,7 @@ void bot_command_depart(Client* c, const Seperator* sep) p.examples_one = { "To tell everyone to list their portable locations:", - fmt::format( - "{} list spawned", + fmt::format("{} list spawned", sep->arg[0] ) }; diff --git a/zone/bot_commands/discipline.cpp b/zone/bot_commands/discipline.cpp index 0d372bf06..8246b1406 100644 --- a/zone/bot_commands/discipline.cpp +++ b/zone/bot_commands/discipline.cpp @@ -16,10 +16,7 @@ void bot_command_discipline(Client* c, const Seperator* sep) "Tells applicable bots to use the specified disciplines." }; p.notes = { "Aside from Lay On Hands and Harm Touch, you will need to know the spell ID of the discipline to tell a bot to attempt to use it." }; - p.example_format = - { - fmt::format("{} [aggressive | defensive | spell ID] [actionable, default: spawned]", sep->arg[0]) - }; + p.example_format = { fmt::format("{} [aggressive | defensive | spell ID] [actionable, default: spawned]", sep->arg[0]) }; p.examples_one = { "To tell all bots to use an aggressive discipline:", diff --git a/zone/bot_commands/distance_ranged.cpp b/zone/bot_commands/distance_ranged.cpp index 7a3d2108b..1c7857daa 100644 --- a/zone/bot_commands/distance_ranged.cpp +++ b/zone/bot_commands/distance_ranged.cpp @@ -18,9 +18,7 @@ void bot_command_distance_ranged(Client* c, const Seperator* sep) "- Casters will never go closer than their maximum melee range.", "- Throwing bots will never get closer than the minimum value for ranged to work, or beyond the range of their items." }; - p.example_format = { - fmt::format("{} [value] [actionable]", sep->arg[0]) - }; + p.example_format = { fmt::format("{} [value] [actionable]", sep->arg[0]) }; p.examples_one = { "To set Wizards to a range of 100:", fmt::format( diff --git a/zone/bot_commands/sit_hp_percent.cpp b/zone/bot_commands/sit_hp_percent.cpp index 0c4208191..0843aa5b9 100644 --- a/zone/bot_commands/sit_hp_percent.cpp +++ b/zone/bot_commands/sit_hp_percent.cpp @@ -17,8 +17,9 @@ void bot_command_sit_hp_percent(Client* c, const Seperator* sep) { "To set Clerics to sit at 45% HP:", fmt::format( - "{} 45 byclass 2", - sep->arg[0] + "{} 45 byclass {}", + sep->arg[0], + Class::Cleric ) }; p.examples_two = diff --git a/zone/bot_commands/sit_in_combat.cpp b/zone/bot_commands/sit_in_combat.cpp index cfe868662..07a2f917e 100644 --- a/zone/bot_commands/sit_in_combat.cpp +++ b/zone/bot_commands/sit_in_combat.cpp @@ -17,8 +17,9 @@ void bot_command_sit_in_combat(Client* c, const Seperator* sep) { "To set Clerics to sit in combat:", fmt::format( - "{} 1 byclass 2", - sep->arg[0] + "{} 1 byclass {}", + sep->arg[0], + Class::Cleric ) }; p.examples_two = diff --git a/zone/bot_commands/sit_mana_percent.cpp b/zone/bot_commands/sit_mana_percent.cpp index 26e43a3be..e85d976c8 100644 --- a/zone/bot_commands/sit_mana_percent.cpp +++ b/zone/bot_commands/sit_mana_percent.cpp @@ -17,8 +17,9 @@ void bot_command_sit_mana_percent(Client* c, const Seperator* sep) { "To set Clerics to sit at 45% Mana:", fmt::format( - "{} 45 byclass 2", - sep->arg[0] + "{} 45 byclass {}", + sep->arg[0], + Class::Cleric ) }; p.examples_two = diff --git a/zone/bot_commands/spell_aggro_checks.cpp b/zone/bot_commands/spell_aggro_checks.cpp index 274718e5a..2c5b92aaf 100644 --- a/zone/bot_commands/spell_aggro_checks.cpp +++ b/zone/bot_commands/spell_aggro_checks.cpp @@ -14,14 +14,8 @@ void bot_command_spell_aggro_checks(Client* c, const Seperator* sep) p.description = { "Toggles whether or not bots will cast a spell type if they think it will get them aggro." }; p.example_format = { - fmt::format( - "{} [Type Shortname] [value] [actionable]" - , sep->arg[0] - ), - fmt::format( - "{} [Type ID] [value] [actionable]" - , sep->arg[0] - ) + fmt::format("{} [Type Shortname] [value] [actionable]", sep->arg[0]), + fmt::format("{} [Type ID] [value] [actionable]", sep->arg[0]) }; p.examples_one = { @@ -41,14 +35,16 @@ void bot_command_spell_aggro_checks(Client* c, const Seperator* sep) { "To set Shadowknights to ignore aggro checks on snares:", fmt::format( - "{} {} 0 byclass 5", + "{} {} 0 byclass {}", sep->arg[0], - c->GetSpellTypeShortNameByID(BotSpellTypes::Snare) + c->GetSpellTypeShortNameByID(BotSpellTypes::Snare), + Class::ShadowKnight ), fmt::format( - "{} {} 0 byclass 5", + "{} {} 0 byclass {}", sep->arg[0], - BotSpellTypes::Snare + BotSpellTypes::Snare, + Class::ShadowKnight ) }; p.examples_three = diff --git a/zone/bot_commands/spell_engaged_priority.cpp b/zone/bot_commands/spell_engaged_priority.cpp index c87e18acd..3621c6c6b 100644 --- a/zone/bot_commands/spell_engaged_priority.cpp +++ b/zone/bot_commands/spell_engaged_priority.cpp @@ -19,27 +19,23 @@ void bot_command_spell_engaged_priority(Client* c, const Seperator* sep) }; p.example_format = { - fmt::format( - "{} [Type Shortname] [value] [actionable]" - , sep->arg[0] - ), - fmt::format( - "{} [Type ID] [value] [actionable]" - , sep->arg[0] - ) + fmt::format("{} [Type Shortname] [value] [actionable]", sep->arg[0]), + fmt::format("{} [Type ID] [value] [actionable]", sep->arg[0]) }; p.examples_one = { "To set all Shaman to cast slows first:", fmt::format( - "{} {} 1 byclass 10", + "{} {} 1 byclass {}", sep->arg[0], - c->GetSpellTypeShortNameByID(BotSpellTypes::Slow) + c->GetSpellTypeShortNameByID(BotSpellTypes::Slow), + Class::Shaman ), fmt::format( - "{} {} 1 byclass 10", + "{} {} 1 byclass {}", sep->arg[0], - BotSpellTypes::Slow + BotSpellTypes::Slow, + Class::Shaman ) }; p.examples_two = diff --git a/zone/bot_commands/spell_holds.cpp b/zone/bot_commands/spell_holds.cpp index ad374163b..b7ad108ae 100644 --- a/zone/bot_commands/spell_holds.cpp +++ b/zone/bot_commands/spell_holds.cpp @@ -15,14 +15,8 @@ void bot_command_spell_holds(Client* c, const Seperator* sep) p.notes = { "- All pet types are based off the pet owner's setting when a pet is the target" }; p.example_format = { - fmt::format( - "{} [Type Shortname] [value] [actionable]" - , sep->arg[0] - ), - fmt::format( - "{} [Type ID] [value] [actionable]" - , sep->arg[0] - ) + fmt::format("{} [Type Shortname] [value] [actionable]", sep->arg[0]), + fmt::format("{} [Type ID] [value] [actionable]", sep->arg[0]) }; p.examples_one = { diff --git a/zone/bot_commands/spell_idle_priority.cpp b/zone/bot_commands/spell_idle_priority.cpp index 5310d189e..830cd8f3b 100644 --- a/zone/bot_commands/spell_idle_priority.cpp +++ b/zone/bot_commands/spell_idle_priority.cpp @@ -19,27 +19,23 @@ void bot_command_spell_idle_priority(Client* c, const Seperator* sep) }; p.example_format = { - fmt::format( - "{} [Type Shortname] [value] [actionable]" - , sep->arg[0] - ), - fmt::format( - "{} [Type ID] [value] [actionable]" - , sep->arg[0] - ) + fmt::format("{} [Type Shortname] [value] [actionable]", sep->arg[0]), + fmt::format("{} [Type ID] [value] [actionable]", sep->arg[0]) }; p.examples_one = { "To set all Clerics to cast fast heals third:", fmt::format( - "{} {} 3 byclass 2", + "{} {} 3 byclass {}", sep->arg[0], - c->GetSpellTypeShortNameByID(BotSpellTypes::FastHeals) + c->GetSpellTypeShortNameByID(BotSpellTypes::FastHeals), + Class::Cleric ), fmt::format( - "{} {} 3 byclass 2", + "{} {} 3 byclass {}", sep->arg[0], - BotSpellTypes::FastHeals + BotSpellTypes::FastHeals, + Class::Cleric ) }; p.examples_two = diff --git a/zone/bot_commands/spell_max_hp_pct.cpp b/zone/bot_commands/spell_max_hp_pct.cpp index 450030dad..c1a9d43b3 100644 --- a/zone/bot_commands/spell_max_hp_pct.cpp +++ b/zone/bot_commands/spell_max_hp_pct.cpp @@ -14,14 +14,8 @@ void bot_command_spell_max_hp_pct(Client* c, const Seperator* sep) p.description = { "Controls at what health percentage a bot will start casting different spell types." }; p.example_format = { - fmt::format( - "{} [Type Shortname] [value] [actionable]" - , sep->arg[0] - ), - fmt::format( - "{} [Type ID] [value] [actionable]" - , sep->arg[0] - ) + fmt::format("{} [Type Shortname] [value] [actionable]", sep->arg[0]), + fmt::format("{} [Type ID] [value] [actionable]", sep->arg[0]) }; p.examples_one = { diff --git a/zone/bot_commands/spell_max_mana_pct.cpp b/zone/bot_commands/spell_max_mana_pct.cpp index 1d554fc1b..38c78a7e4 100644 --- a/zone/bot_commands/spell_max_mana_pct.cpp +++ b/zone/bot_commands/spell_max_mana_pct.cpp @@ -14,14 +14,8 @@ void bot_command_spell_max_mana_pct(Client* c, const Seperator* sep) p.description = { "Controls at what mana percentage a bot will stop casting different spell types." }; p.example_format = { - fmt::format( - "{} [Type Shortname] [value] [actionable]" - , sep->arg[0] - ), - fmt::format( - "{} [Type ID] [value] [actionable]" - , sep->arg[0] - ) + fmt::format("{} [Type Shortname] [value] [actionable]", sep->arg[0]), + fmt::format("{} [Type ID] [value] [actionable]", sep->arg[0]) }; p.examples_one = { diff --git a/zone/bot_commands/spell_max_thresholds.cpp b/zone/bot_commands/spell_max_thresholds.cpp index 13cd6e635..7aaeeceb4 100644 --- a/zone/bot_commands/spell_max_thresholds.cpp +++ b/zone/bot_commands/spell_max_thresholds.cpp @@ -21,14 +21,8 @@ void bot_command_spell_max_thresholds(Client* c, const Seperator* sep) }; p.example_format = { - fmt::format( - "{} [Type Shortname] [value] [actionable]" - , sep->arg[0] - ), - fmt::format( - "{} [Type ID] [value] [actionable]" - , sep->arg[0] - ) + fmt::format("{} [Type Shortname] [value] [actionable]", sep->arg[0]), + fmt::format("{} [Type ID] [value] [actionable]", sep->arg[0]) }; p.examples_one = { diff --git a/zone/bot_commands/spell_min_hp_pct.cpp b/zone/bot_commands/spell_min_hp_pct.cpp index 5ee69b996..64a1531fc 100644 --- a/zone/bot_commands/spell_min_hp_pct.cpp +++ b/zone/bot_commands/spell_min_hp_pct.cpp @@ -14,14 +14,8 @@ void bot_command_spell_min_hp_pct(Client* c, const Seperator* sep) p.description = { "Controls at what health percentage a bot will stop casting different spell types." }; p.example_format = { - fmt::format( - "{} [Type Shortname] [value] [actionable]" - , sep->arg[0] - ), - fmt::format( - "{} [Type ID] [value] [actionable]" - , sep->arg[0] - ) + fmt::format("{} [Type Shortname] [value] [actionable]", sep->arg[0]), + fmt::format("{} [Type ID] [value] [actionable]", sep->arg[0]) }; p.examples_one = { diff --git a/zone/bot_commands/spell_min_mana_pct.cpp b/zone/bot_commands/spell_min_mana_pct.cpp index 3c760d82e..f99539c58 100644 --- a/zone/bot_commands/spell_min_mana_pct.cpp +++ b/zone/bot_commands/spell_min_mana_pct.cpp @@ -14,14 +14,8 @@ void bot_command_spell_min_mana_pct(Client* c, const Seperator* sep) p.description = { "Controls at what mana percentage a bot will stop casting different spell types." }; p.example_format = { - fmt::format( - "{} [Type Shortname] [value] [actionable]" - , sep->arg[0] - ), - fmt::format( - "{} [Type ID] [value] [actionable]" - , sep->arg[0] - ) + fmt::format("{} [Type Shortname] [value] [actionable]", sep->arg[0]), + fmt::format("{} [Type ID] [value] [actionable]", sep->arg[0]) }; p.examples_one = { diff --git a/zone/bot_commands/spell_min_thresholds.cpp b/zone/bot_commands/spell_min_thresholds.cpp index 606fe5b1b..fdd30c0b9 100644 --- a/zone/bot_commands/spell_min_thresholds.cpp +++ b/zone/bot_commands/spell_min_thresholds.cpp @@ -21,14 +21,8 @@ void bot_command_spell_min_thresholds(Client* c, const Seperator* sep) }; p.example_format = { - fmt::format( - "{} [Type Shortname] [value] [actionable]" - , sep->arg[0] - ), - fmt::format( - "{} [Type ID] [value] [actionable]" - , sep->arg[0] - ) + fmt::format("{} [Type Shortname] [value] [actionable]", sep->arg[0]), + fmt::format("{} [Type ID] [value] [actionable]", sep->arg[0]) }; p.examples_one = { @@ -48,14 +42,16 @@ void bot_command_spell_min_thresholds(Client* c, const Seperator* sep) { "To set all Druids to stop casting DoTs at 15%:", fmt::format( - "{} {} 15 byclass 6", + "{} {} 15 byclass {}", sep->arg[0], - c->GetSpellTypeShortNameByID(BotSpellTypes::DOT) + c->GetSpellTypeShortNameByID(BotSpellTypes::DOT), + Class::Druid ), fmt::format( - "{} {} 15 byclass 6", + "{} {} 15 byclass {}", sep->arg[0], - BotSpellTypes::DOT + BotSpellTypes::DOT, + Class::Druid ) }; p.examples_three = diff --git a/zone/bot_commands/spell_pursue_priority.cpp b/zone/bot_commands/spell_pursue_priority.cpp index 51725ba94..eeba9792c 100644 --- a/zone/bot_commands/spell_pursue_priority.cpp +++ b/zone/bot_commands/spell_pursue_priority.cpp @@ -19,14 +19,8 @@ void bot_command_spell_pursue_priority(Client* c, const Seperator* sep) }; p.example_format = { - fmt::format( - "{} [Type Shortname] [value] [actionable]" - , sep->arg[0] - ), - fmt::format( - "{} [Type ID] [value] [actionable]" - , sep->arg[0] - ) + fmt::format("{} [Type Shortname] [value] [actionable]", sep->arg[0]), + fmt::format("{} [Type ID] [value] [actionable]", sep->arg[0]) }; p.examples_one = { @@ -46,14 +40,16 @@ void bot_command_spell_pursue_priority(Client* c, const Seperator* sep) { "To set all Shaman to not cast cures:", fmt::format( - "{} {} 0 byclass 10", + "{} {} 0 byclass {}", sep->arg[0], - c->GetSpellTypeShortNameByID(BotSpellTypes::Cure) + c->GetSpellTypeShortNameByID(BotSpellTypes::Cure), + Class::Shaman ), fmt::format( - "{} {} 0 byclass 10", + "{} {} 0 byclass {}", sep->arg[0], - BotSpellTypes::Cure + BotSpellTypes::Cure, + Class::Shaman ) }; p.examples_three = diff --git a/zone/bot_commands/spell_target_count.cpp b/zone/bot_commands/spell_target_count.cpp index 536719d6e..c14167846 100644 --- a/zone/bot_commands/spell_target_count.cpp +++ b/zone/bot_commands/spell_target_count.cpp @@ -14,14 +14,8 @@ void bot_command_spell_target_count(Client* c, const Seperator* sep) p.description = { "Decides how many eligible targets are required for an AE or group spell to cast by spell type." }; p.example_format = { - fmt::format( - "{} [Type Shortname] [value] [actionable]" - , sep->arg[0] - ), - fmt::format( - "{} [Type ID] [value] [actionable]" - , sep->arg[0] - ) + fmt::format("{} [Type Shortname] [value] [actionable]", sep->arg[0]), + fmt::format("{} [Type ID] [value] [actionable]", sep->arg[0]) }; p.examples_one = { diff --git a/zone/gm_commands/spell_holds.cpp b/zone/gm_commands/spell_holds.cpp index a50bc957e..be0c9cbca 100644 --- a/zone/gm_commands/spell_holds.cpp +++ b/zone/gm_commands/spell_holds.cpp @@ -21,12 +21,12 @@ void command_spell_holds(Client *c, const Seperator *sep) p.example_format = { fmt::format( - "{} [Type Shortname] [value]" - , sep->arg[0] + "{} [Type Shortname] [value]", + sep->arg[0] ), fmt::format( - "{} [Type ID] [value]" - , sep->arg[0] + "{} [Type ID] [value]", + sep->arg[0] ) }; p.examples_one =