From 3c670cb5a048eea6edf618d9558ccc0206ac88c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Borz=C3=AC?= Date: Mon, 8 Feb 2021 23:45:00 +0100 Subject: [PATCH] fix(DB/Commands): align core and DB (#4479) --- .../updates/pending_db_world/rev_1612704403809446000.sql | 9 +++++++++ src/server/scripts/Commands/cs_instance.cpp | 4 ++-- src/server/scripts/Commands/cs_modify.cpp | 4 ++-- src/server/scripts/Commands/cs_npc.cpp | 6 +++--- src/server/scripts/Commands/cs_reset.cpp | 2 +- src/server/scripts/Commands/cs_server.cpp | 6 +++--- 6 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1612704403809446000.sql diff --git a/data/sql/updates/pending_db_world/rev_1612704403809446000.sql b/data/sql/updates/pending_db_world/rev_1612704403809446000.sql new file mode 100644 index 000000000..77c9ac615 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1612704403809446000.sql @@ -0,0 +1,9 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1612704403809446000'); + +UPDATE `command` SET `security` = 1 WHERE `name` = 'gm'; +UPDATE `command` SET `security` = 2 WHERE `name` IN ('gm list', 'gm visible'); +UPDATE `command` SET `security` = 3 WHERE `name` IN ('cometome', 'wpgps'); + +INSERT IGNORE INTO `command` (`name`, `security`, `help`) VALUES +('bank', 2, 'Syntax: .bank Show your bank inventory.'), +('debug Mod32Value', 3, 'Syntax: .debug Mod32Value #field #value Add #value to field #field of your character.'); diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp index 7fee96a1b..12328d5be 100644 --- a/src/server/scripts/Commands/cs_instance.cpp +++ b/src/server/scripts/Commands/cs_instance.cpp @@ -30,10 +30,10 @@ public: static std::vector instanceCommandTable = { { "listbinds", SEC_MODERATOR, false, &HandleInstanceListBindsCommand, "" }, - { "unbind", SEC_MODERATOR, false, &HandleInstanceUnbindCommand, "" }, + { "unbind", SEC_GAMEMASTER, false, &HandleInstanceUnbindCommand, "" }, { "stats", SEC_MODERATOR, true, &HandleInstanceStatsCommand, "" }, { "savedata", SEC_ADMINISTRATOR, false, &HandleInstanceSaveDataCommand, "" }, - { "setbossstate", SEC_MODERATOR, true, &HandleInstanceSetBossStateCommand, "" }, + { "setbossstate", SEC_GAMEMASTER, true, &HandleInstanceSetBossStateCommand, "" }, { "getbossstate", SEC_MODERATOR, true, &HandleInstanceGetBossStateCommand, "" } }; diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 3d77b47d8..1248c91b5 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -63,8 +63,8 @@ public: static std::vector morphCommandTable = { - { "reset", SEC_GAMEMASTER, false, &HandleMorphResetCommand, "" }, - { "target", SEC_GAMEMASTER, false, &HandleMorphTargetCommand, "" } + { "reset", SEC_MODERATOR, false, &HandleMorphResetCommand, "" }, + { "target", SEC_MODERATOR, false, &HandleMorphTargetCommand, "" } }; static std::vector commandTable = diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 2da722230..6a76cc507 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -162,14 +162,14 @@ public: { "info", SEC_MODERATOR, false, &HandleNpcInfoCommand, "" }, { "near", SEC_GAMEMASTER, false, &HandleNpcNearCommand, "" }, { "move", SEC_ADMINISTRATOR, false, &HandleNpcMoveCommand, "" }, - { "playemote", SEC_ADMINISTRATOR, false, &HandleNpcPlayEmoteCommand, "" }, + { "playemote", SEC_GAMEMASTER, false, &HandleNpcPlayEmoteCommand, "" }, { "say", SEC_GAMEMASTER, false, &HandleNpcSayCommand, "" }, { "textemote", SEC_GAMEMASTER, false, &HandleNpcTextEmoteCommand, "" }, { "whisper", SEC_GAMEMASTER, false, &HandleNpcWhisperCommand, "" }, { "yell", SEC_GAMEMASTER, false, &HandleNpcYellCommand, "" }, { "tame", SEC_GAMEMASTER, false, &HandleNpcTameCommand, "" }, - { "add", SEC_GAMEMASTER, false, nullptr, "", npcAddCommandTable }, - { "delete", SEC_GAMEMASTER, false, nullptr, "", npcDeleteCommandTable }, + { "add", SEC_ADMINISTRATOR, false, nullptr, "", npcAddCommandTable }, + { "delete", SEC_ADMINISTRATOR, false, nullptr, "", npcDeleteCommandTable }, { "follow", SEC_GAMEMASTER, false, nullptr, "", npcFollowCommandTable }, { "set", SEC_ADMINISTRATOR, false, nullptr, "", npcSetCommandTable } }; diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index 880dbcb1c..d6b4bba7a 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -28,7 +28,7 @@ public: { static std::vector resetCommandTable = { - { "achievements", SEC_ADMINISTRATOR, true, &HandleResetAchievementsCommand, "" }, + { "achievements", SEC_CONSOLE, true, &HandleResetAchievementsCommand, "" }, { "honor", SEC_ADMINISTRATOR, true, &HandleResetHonorCommand, "" }, { "level", SEC_ADMINISTRATOR, true, &HandleResetLevelCommand, "" }, { "spells", SEC_ADMINISTRATOR, true, &HandleResetSpellsCommand, "" }, diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp index 3d43bc327..fd2a5d706 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -58,15 +58,15 @@ public: { "loglevel", SEC_CONSOLE, true, &HandleServerSetLogLevelCommand, "" }, { "logfilelevel", SEC_CONSOLE, true, &HandleServerSetLogFileLevelCommand, "" }, { "motd", SEC_ADMINISTRATOR, true, &HandleServerSetMotdCommand, "" }, - { "closed", SEC_ADMINISTRATOR, true, &HandleServerSetClosedCommand, "" } + { "closed", SEC_CONSOLE, true, &HandleServerSetClosedCommand, "" } }; static std::vector serverCommandTable = { { "corpses", SEC_GAMEMASTER, true, &HandleServerCorpsesCommand, "" }, { "exit", SEC_CONSOLE, true, &HandleServerExitCommand, "" }, - { "idlerestart", SEC_ADMINISTRATOR, true, nullptr, "", serverIdleRestartCommandTable }, - { "idleshutdown", SEC_ADMINISTRATOR, true, nullptr, "", serverIdleShutdownCommandTable }, + { "idlerestart", SEC_CONSOLE, true, nullptr, "", serverIdleRestartCommandTable }, + { "idleshutdown", SEC_CONSOLE, true, nullptr, "", serverIdleShutdownCommandTable }, { "info", SEC_PLAYER, true, &HandleServerInfoCommand, "" }, { "motd", SEC_PLAYER, true, &HandleServerMotdCommand, "" }, { "restart", SEC_ADMINISTRATOR, true, nullptr, "", serverRestartCommandTable },