josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Commands:

Browse Source 
* Add remove support for disable command
* Add quest disables support
* Add check for no existent entry
* Fix problems with flags 0
* Fix code style
This commit is contained in:
Vincent-Michael
2012-08-05 02:02:35 +02:00
parent f9cb4280bd
commit cc0ff69ca4
6 changed files with 277 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/world/2012_08_05_00_world_trinity_string.sql
+5
View File
@@ -0,0 +1,5 @@
DELETE FROM `trinity_string` WHERE `entry` IN (5032,5033,5034);
INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`) VALUES
(5032,'No battleground found!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(5033,'No achievement criteria found!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(5034,'No outdoor PvP found!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
sql/updates/world/2012_08_05_01_world_command.sql
+19
View File
@@ -0,0 +1,19 @@
DELETE FROM `command` WHERE `name` IN (
'disable add quest','disable add map','disable add battleground','disable add achievement_criteria','disable add spell','disable add outdoorpvp','disable add vmap',
'disable remove quest','disable remove map','disable remove battleground','disable remove achievement_criteria','disable remove spell','disable remove outdoorpvp','disable remove vmap'
);
INSERT INTO `command` (`name`,`security`,`help`) VALUES
('disable add quest',3,'Syntax: .disable add quest $entry $flag $comment'),
('disable add map',3,'Syntax: .disable add map $entry $flag $comment'),
('disable add battleground',3,'Syntax: .disable add battleground $entry $flag $comment'),
('disable add achievement_criteria',3,'Syntax: .disable add achievement_criteria $entry $flag $comment'),
('disable add spell',3,'Syntax: .disable add spell $entry $flag $comment'),
('disable add outdoorpvp',3,'Syntax: .disable add outdoorpvp $entry $flag $comment'),
('disable add vmap',3,'Syntax: .disable add vmap $entry $flag $comment'),
('disable remove quest',3,'Syntax: .disable remove quest $entry'),
('disable remove map',3,'Syntax: .disable remove map $entry'),
('disable remove battleground',3,'Syntax: .disable remove battleground $entry'),
('disable remove achievement_criteria',3,'Syntax: .disable remove achievement_criteria $entry'),
('disable remove spell',3,'Syntax: .disable remove spell $entry'),
('disable remove outdoorpvp',3,'Syntax: .disable remove outdoorpvp $entry'),
('disable remove vmap',3,'Syntax: .disable remove vmap $entry');
src/server/game/Miscellaneous/Language.h
+4 -1
View File
@@ -957,7 +957,10 @@ enum TrinityStrings
LANG_COMMAND_LOOKUP_MAX_RESULTS = 5029, LANG_COMMAND_LOOKUP_MAX_RESULTS = 5029,
LANG_FLEE = 5030, LANG_FLEE = 5030,
LANG_NPCINFO_AIINFO = 5031, LANG_NPCINFO_AIINFO = 5031,
// Room for more Trinity strings 5032-9999 LANG_COMMAND_NO_BATTLEGROUND_FOUND = 5032,
LANG_COMMAND_NO_ACHIEVEMENT_CRITERIA_FOUND = 5033,
LANG_COMMAND_NO_OUTDOOR_PVP_FORUND = 5034,
// Room for more Trinity strings 5035-9999
// Level requirement notifications // Level requirement notifications
LANG_SAY_REQ = 6604, LANG_SAY_REQ = 6604,
src/server/scripts/Commands/cs_disable.cpp
+240 -64
View File
@@ -26,6 +26,7 @@ EndScriptData */
#include "ObjectMgr.h" #include "ObjectMgr.h"
#include "Chat.h" #include "Chat.h"
#include "DisableMgr.h" #include "DisableMgr.h"
#include "OutdoorPvP.h"
class disable_commandscript : public CommandScript class disable_commandscript : public CommandScript
{ {
@@ -34,56 +35,230 @@ public:
ChatCommand* GetCommands() const ChatCommand* GetCommands() const
{ {
static ChatCommand removeDisableCommandTable[] =
{
{ "spell", SEC_ADMINISTRATOR, true, &HandleRemoveDisableSpellCommand, "", NULL },
{ "quest", SEC_ADMINISTRATOR, true, &HandleRemoveDisableQuestCommand, "", NULL },
{ "map", SEC_ADMINISTRATOR, true, &HandleRemoveDisableMapCommand, "", NULL },
{ "battleground", SEC_ADMINISTRATOR, true, &HandleRemoveDisableBattlegroundCommand, "", NULL },
{ "achievement_criteria", SEC_ADMINISTRATOR, true, &HandleRemoveDisableAchievementCriteriaCommand, "", NULL },
{ "outdoorpvp", SEC_ADMINISTRATOR, true, &HandleRemoveDisableOutdoorPvPCommand, "", NULL },
{ "vmap", SEC_ADMINISTRATOR, true, &HandleRemoveDisableVmapCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
static ChatCommand addDisableCommandTable[] =
{
{ "spell", SEC_ADMINISTRATOR, true, &HandleAddDisableSpellCommand, "", NULL },
{ "quest", SEC_ADMINISTRATOR, true, &HandleAddDisableQuestCommand, "", NULL },
{ "map", SEC_ADMINISTRATOR, true, &HandleAddDisableMapCommand, "", NULL },
{ "battleground", SEC_ADMINISTRATOR, true, &HandleAddDisableBattlegroundCommand, "", NULL },
{ "achievement_criteria", SEC_ADMINISTRATOR, true, &HandleAddDisableAchievementCriteriaCommand, "", NULL },
{ "outdoorpvp", SEC_ADMINISTRATOR, true, &HandleAddDisableOutdoorPvPCommand, "", NULL },
{ "vmap", SEC_ADMINISTRATOR, true, &HandleAddDisableVmapCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
};
static ChatCommand disableCommandTable[] = static ChatCommand disableCommandTable[] =
{ {
{ "spell", SEC_GAMEMASTER, false, &HandleDisableSpellCommand, "", NULL }, { "add", SEC_ADMINISTRATOR, true, NULL, "", addDisableCommandTable },
{ "map", SEC_GAMEMASTER, false, &HandleDisableMapCommand, "", NULL }, { "remove", SEC_ADMINISTRATOR, true, NULL, "", removeDisableCommandTable },
{ "battleground", SEC_GAMEMASTER, false, &HandleDisableBattlegroundCommand, "", NULL }, { NULL, 0, false, NULL, "", NULL }
{ "achievement_criteria", SEC_GAMEMASTER, false, &HandleDisableAchievementCriteriaCommand, "", NULL },
{ "outdoorpvp", SEC_GAMEMASTER, false, &HandleDisableOutdoorPvPCommand, "", NULL },
{ "vmap", SEC_GAMEMASTER, false, &HandleDisableVmapCommand, "", NULL },
{ NULL, 0, false, NULL, "", NULL }
}; };
static ChatCommand commandTable[] = static ChatCommand commandTable[] =
{ {
{ "disable", SEC_GAMEMASTER, false, NULL, "", disableCommandTable }, { "disable", SEC_ADMINISTRATOR, false, NULL, "", disableCommandTable },
{ NULL, 0, false, NULL, "", NULL } { NULL, 0, false, NULL, "", NULL }
}; };
return commandTable; return commandTable;
} }
static bool HandleAddDisables(ChatHandler* handler, char const* args, uint8 disableType)
static void HandleDisables(ChatHandler* handler, char const* args, uint8 disableType)
{ {
char* cEntry = strtok((char*)args, " "); char* entryStr = strtok((char*)args, " ");
if (!cEntry || !atoi(cEntry)) if (!entryStr || !atoi(entryStr))
return false;
char* flagsStr = strtok(NULL, " ");
uint8 flags = flagsStr ? uint8(atoi(flagsStr)) : 0;
char* commentStr = strtok(NULL, "");
if (!commentStr)
return false;
std::string disableComment = commentStr;
uint32 entry = uint32(atoi(entryStr));
std::string disableTypeStr = "";
switch (disableType)
{ {
handler->SendSysMessage("No entry specified."); case DISABLE_TYPE_SPELL:
return; {
if (!sSpellMgr->GetSpellInfo(entry))
{
handler->PSendSysMessage(LANG_COMMAND_NOSPELLFOUND);
handler->SetSentErrorMessage(true);
return false;
}
disableTypeStr = "spell";
break;
}
case DISABLE_TYPE_QUEST:
{
if (!sObjectMgr->GetQuestTemplate(entry))
{
handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
handler->SetSentErrorMessage(true);
return false;
}
disableTypeStr = "quest";
break;
}
case DISABLE_TYPE_MAP:
{
if (!sMapStore.LookupEntry(entry))
{
handler->PSendSysMessage(LANG_COMMAND_NOMAPFOUND);
handler->SetSentErrorMessage(true);
return false;
}
disableTypeStr = "map";
break;
}
case DISABLE_TYPE_BATTLEGROUND:
{
if (!sBattlemasterListStore.LookupEntry(entry))
{
handler->PSendSysMessage(LANG_COMMAND_NO_BATTLEGROUND_FOUND);
handler->SetSentErrorMessage(true);
return false;
}
disableTypeStr = "battleground";
break;
}
case DISABLE_TYPE_ACHIEVEMENT_CRITERIA:
{
if (!sAchievementCriteriaStore.LookupEntry(entry))
{
handler->PSendSysMessage(LANG_COMMAND_NO_ACHIEVEMENT_CRITERIA_FOUND);
handler->SetSentErrorMessage(true);
return false;
}
disableTypeStr = "achievement criteria";
break;
}
case DISABLE_TYPE_OUTDOORPVP:
{
if (entry > MAX_OUTDOORPVP_TYPES)
{
handler->PSendSysMessage(LANG_COMMAND_NO_OUTDOOR_PVP_FORUND);
handler->SetSentErrorMessage(true);
return false;
}
disableTypeStr = "outdoorpvp";
break;
}
case DISABLE_TYPE_VMAP:
{
if (!sMapStore.LookupEntry(entry))
{
handler->PSendSysMessage(LANG_COMMAND_NOMAPFOUND);
handler->SetSentErrorMessage(true);
return false;
}
disableTypeStr = "vmap";
break;
}
default:
break;
} }
char* cFlags = strtok(NULL, " "); PreparedStatement* stmt = NULL;
if (!cFlags || !atoi(cFlags)) stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_DISABLES);
stmt->setUInt32(0, entry);
stmt->setUInt8(1, disableType);
PreparedQueryResult result = WorldDatabase.Query(stmt);
if (result)
{ {
handler->SendSysMessage("No flags specified."); handler->PSendSysMessage("This %s (Id: %u) is already disabled.", disableTypeStr.c_str(), entry);
return; handler->SetSentErrorMessage(true);
return false;
} }
char* cComment = strtok(NULL, ""); stmt = WorldDatabase.GetPreparedStatement(WORLD_INS_DISABLES);
if (!cComment) stmt->setUInt32(0, entry);
{ stmt->setUInt8(1, disableType);
handler->SendSysMessage("No comment specified."); stmt->setUInt16(2, flags);
return; stmt->setString(3, disableComment);
} WorldDatabase.Execute(stmt);
std::string entryStr = cEntry; handler->PSendSysMessage("Add Disabled %s (Id: %u) for reason %s", disableTypeStr.c_str(), entry, disableComment.c_str());
std::string disableComment = cComment; return true;
uint32 entry = (uint32)atoi(cEntry); }
uint8 flags = atoi(cFlags);
static bool HandleAddDisableSpellCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
return HandleAddDisables(handler, args, DISABLE_TYPE_SPELL);
}
static bool HandleAddDisableQuestCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
return HandleAddDisables(handler, args, DISABLE_TYPE_QUEST);
}
static bool HandleAddDisableMapCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
return HandleAddDisables(handler, args, DISABLE_TYPE_MAP);
}
static bool HandleAddDisableBattlegroundCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
return HandleAddDisables(handler, args, DISABLE_TYPE_BATTLEGROUND);
}
static bool HandleAddDisableAchievementCriteriaCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
return HandleAddDisables(handler, args, DISABLE_TYPE_ACHIEVEMENT_CRITERIA);
}
static bool HandleAddDisableOutdoorPvPCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
HandleAddDisables(handler, args, DISABLE_TYPE_OUTDOORPVP);
return true;
}
static bool HandleAddDisableVmapCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
return HandleAddDisables(handler, args, DISABLE_TYPE_VMAP);
}
static bool HandleRemoveDisables(ChatHandler* handler, char const* args, uint8 disableType)
{
char* entryStr = strtok((char*)args, " ");
if (!entryStr || !atoi(entryStr))
return false;
uint32 entry = uint32(atoi(entryStr));
std::string disableTypeStr = ""; std::string disableTypeStr = "";
@@ -92,6 +267,9 @@ public:
case DISABLE_TYPE_SPELL: case DISABLE_TYPE_SPELL:
disableTypeStr = "spell"; disableTypeStr = "spell";
break; break;
case DISABLE_TYPE_QUEST:
disableTypeStr = "quest";
break;
case DISABLE_TYPE_MAP: case DISABLE_TYPE_MAP:
disableTypeStr = "map"; disableTypeStr = "map";
break; break;
@@ -109,84 +287,82 @@ public:
break; break;
} }
PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_DISABLES); PreparedStatement* stmt = NULL;
stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_DISABLES);
stmt->setUInt32(0, entry); stmt->setUInt32(0, entry);
stmt->setUInt8(1, disableType); stmt->setUInt8(1, disableType);
PreparedQueryResult result = WorldDatabase.Query(stmt); PreparedQueryResult result = WorldDatabase.Query(stmt);
if (!result)
if (result)
{ {
handler->PSendSysMessage("This %s (id %u) is already disabled.", disableTypeStr.c_str(), entry); handler->PSendSysMessage("This %s (Id: %u) is not disabled.", disableTypeStr.c_str(), entry);
return; handler->SetSentErrorMessage(true);
return false;
} }
PreparedStatement* stmt2 = WorldDatabase.GetPreparedStatement(WORLD_INS_DISABLES); stmt = WorldDatabase.GetPreparedStatement(WORLD_DEL_DISABLES);
stmt2->setUInt32(0, entry); stmt->setUInt32(0, entry);
stmt2->setUInt8(1, disableType); stmt->setUInt8(1, disableType);
stmt2->setUInt16(2, flags); WorldDatabase.Execute(stmt);
stmt2->setString(3, disableComment);
WorldDatabase.Execute(stmt2);
handler->PSendSysMessage("Disabled %s %u for reason %s", disableTypeStr.c_str(), entry, disableComment.c_str());
return;
handler->PSendSysMessage("Remove Disabled %s (Id: %u)", disableTypeStr.c_str(), entry);
return true;
} }
static bool HandleDisableSpellCommand(ChatHandler* handler, char const* args) static bool HandleRemoveDisableSpellCommand(ChatHandler* handler, char const* args)
{ {
if (!*args) if (!*args)
return false; return false;
HandleDisables(handler, args, DISABLE_TYPE_SPELL); return HandleRemoveDisables(handler, args, DISABLE_TYPE_SPELL);
return true;
} }
static bool HandleDisableMapCommand(ChatHandler* handler, char const* args) static bool HandleRemoveDisableQuestCommand(ChatHandler* handler, char const* args)
{ {
if (!*args) if (!*args)
return false; return false;
HandleDisables(handler, args, DISABLE_TYPE_MAP); return HandleRemoveDisables(handler, args, DISABLE_TYPE_QUEST);
return true;
} }
static bool HandleDisableBattlegroundCommand(ChatHandler* handler, char const* args) static bool HandleRemoveDisableMapCommand(ChatHandler* handler, char const* args)
{ {
if (!*args) if (!*args)
return false; return false;
HandleDisables(handler, args, DISABLE_TYPE_BATTLEGROUND); return HandleAddDisables(handler, args, DISABLE_TYPE_MAP);
return true;
} }
static bool HandleDisableAchievementCriteriaCommand(ChatHandler* handler, char const* args) static bool HandleRemoveDisableBattlegroundCommand(ChatHandler* handler, char const* args)
{ {
if (!*args) if (!*args)
return false; return false;
HandleDisables(handler, args, DISABLE_TYPE_ACHIEVEMENT_CRITERIA); return HandleRemoveDisables(handler, args, DISABLE_TYPE_BATTLEGROUND);
return true;
} }
static bool HandleDisableOutdoorPvPCommand(ChatHandler* handler, char const* args) static bool HandleRemoveDisableAchievementCriteriaCommand(ChatHandler* handler, char const* args)
{ {
if (!*args) if (!*args)
return false; return false;
HandleDisables(handler, args, DISABLE_TYPE_OUTDOORPVP); return HandleRemoveDisables(handler, args, DISABLE_TYPE_ACHIEVEMENT_CRITERIA);
return true;
} }
static bool HandleDisableVmapCommand(ChatHandler* handler, char const* args) static bool HandleRemoveDisableOutdoorPvPCommand(ChatHandler* handler, char const* args)
{ {
if (!*args) if (!*args)
return false; return false;
HandleDisables(handler, args, DISABLE_TYPE_VMAP); return HandleRemoveDisables(handler, args, DISABLE_TYPE_OUTDOORPVP);
return true;
} }
static bool HandleRemoveDisableVmapCommand(ChatHandler* handler, char const* args)
{
if (!*args)
return false;
return HandleRemoveDisables(handler, args, DISABLE_TYPE_VMAP);
}
}; };
void AddSC_disable_commandscript() void AddSC_disable_commandscript()
src/server/shared/Database/Implementation/WorldDatabase.cpp
+2 -1
View File
@@ -89,5 +89,6 @@ void WorldDatabaseConnection::DoPrepareStatements()
PREPARE_STATEMENT(WORLD_DEL_GAME_EVENT_MODEL_EQUIP, "DELETE FROM game_event_model_equip WHERE guid = ?", CONNECTION_ASYNC); PREPARE_STATEMENT(WORLD_DEL_GAME_EVENT_MODEL_EQUIP, "DELETE FROM game_event_model_equip WHERE guid = ?", CONNECTION_ASYNC);
PREPARE_STATEMENT(WORLD_INS_GAMEOBJECT, "INSERT INTO gameobject (guid, id, map, spawnMask, phaseMask, position_x, position_y, position_z, orientation, rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC); PREPARE_STATEMENT(WORLD_INS_GAMEOBJECT, "INSERT INTO gameobject (guid, id, map, spawnMask, phaseMask, position_x, position_y, position_z, orientation, rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC);
PREPARE_STATEMENT(WORLD_INS_DISABLES, "INSERT INTO disables (entry, sourceType, flags, comment) VALUES (?, ?, ?, ?)", CONNECTION_ASYNC); PREPARE_STATEMENT(WORLD_INS_DISABLES, "INSERT INTO disables (entry, sourceType, flags, comment) VALUES (?, ?, ?, ?)", CONNECTION_ASYNC);
PREPARE_STATEMENT(WORLD_SEL_DISABLES, "SELECT entry FROM disables WHERE entry = ? AND sourceType = ? AND flags > 0", CONNECTION_SYNCH); PREPARE_STATEMENT(WORLD_SEL_DISABLES, "SELECT entry FROM disables WHERE entry = ? AND sourceType = ?", CONNECTION_SYNCH);
PREPARE_STATEMENT(WORLD_DEL_DISABLES, "DELETE FROM disables WHERE entry = ? AND sourceType = ?", CONNECTION_ASYNC);
} }
src/server/shared/Database/Implementation/WorldDatabase.h
+1
View File
@@ -111,6 +111,7 @@ enum WorldDatabaseStatements
WORLD_INS_GAMEOBJECT, WORLD_INS_GAMEOBJECT,
WORLD_SEL_DISABLES, WORLD_SEL_DISABLES,
WORLD_INS_DISABLES, WORLD_INS_DISABLES,
WORLD_DEL_DISABLES,
MAX_WORLDDATABASE_STATEMENTS, MAX_WORLDDATABASE_STATEMENTS,
}; };