From 295f461fdde19256aee6f94f2ed8d83ce6fe26a4 Mon Sep 17 00:00:00 2001 From: talamortis Date: Sun, 22 Jul 2018 00:37:43 +0100 Subject: [PATCH] Added the commands into a sub table Now .npc set faction temp (id) .npc set faction original .npc set faction perm (id) --- src/server/scripts/Commands/cs_npc.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index ea5250fff..8ba71a12c 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -130,13 +130,19 @@ public: { "stop", SEC_GAMEMASTER, false, &HandleNpcUnFollowCommand, "" }, { "", SEC_GAMEMASTER, false, &HandleNpcFollowCommand, "" } }; + + static std::vector npcFactionCommandTable = + { + { "Permanent", SEC_ADMINISTRATOR, false, &HandleNpcSetFactionIdCommand, "" }, + { "Temp", SEC_ADMINISTRATOR, false, &HandleNpcSetFactionTempIdCommand, "" }, + { "Original", SEC_ADMINISTRATOR, false, &HandleNpcSetOriginalFaction, "" } + }; + static std::vector npcSetCommandTable = { { "allowmove", SEC_ADMINISTRATOR, false, &HandleNpcSetAllowMovementCommand, "" }, { "entry", SEC_ADMINISTRATOR, false, &HandleNpcSetEntryCommand, "" }, - { "factionid", SEC_ADMINISTRATOR, false, &HandleNpcSetFactionIdCommand, "" }, - { "factiontempid", SEC_ADMINISTRATOR, false, &HandleNpcSetFactionTempIdCommand, "" }, - { "originalFaction",SEC_ADMINISTRATOR, false, &HandleNpcSetOriginalFaction, "" }, + { "faction", SEC_ADMINISTRATOR, false, nullptr, "", npcFactionCommandTable}, { "flag", SEC_ADMINISTRATOR, false, &HandleNpcSetFlagCommand, "" }, { "level", SEC_ADMINISTRATOR, false, &HandleNpcSetLevelCommand, "" }, { "link", SEC_ADMINISTRATOR, false, &HandleNpcSetLinkCommand, "" },