Whitespace is the root of all evil (version 2)
This commit is contained in:
@@ -182,7 +182,7 @@ extern int main(int argc, char **argv)
|
|||||||
else
|
else
|
||||||
sLog->outError(LOG_FILTER_AUTHSERVER, "Can't set used processors (hex): %x", curAff);
|
sLog->outError(LOG_FILTER_AUTHSERVER, "Can't set used processors (hex): %x", curAff);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Prio = ConfigMgr::GetBoolDefault("ProcessPriority", false);
|
bool Prio = ConfigMgr::GetBoolDefault("ProcessPriority", false);
|
||||||
@@ -193,7 +193,7 @@ extern int main(int argc, char **argv)
|
|||||||
sLog->outInfo(LOG_FILTER_AUTHSERVER, "The auth server process priority class has been set to HIGH");
|
sLog->outInfo(LOG_FILTER_AUTHSERVER, "The auth server process priority class has been set to HIGH");
|
||||||
else
|
else
|
||||||
sLog->outError(LOG_FILTER_AUTHSERVER, "Can't set auth server process priority class.");
|
sLog->outError(LOG_FILTER_AUTHSERVER, "Can't set auth server process priority class.");
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -229,7 +229,7 @@ LoginDatabase.WorkerThreads = 1
|
|||||||
# Default: 0 - Default. Each type that has no config will
|
# Default: 0 - Default. Each type that has no config will
|
||||||
# rely on this one. Core will create this logger
|
# rely on this one. Core will create this logger
|
||||||
# (disabled) if it's not configured
|
# (disabled) if it's not configured
|
||||||
# 7 - Network input/output,
|
# 7 - Network input/output,
|
||||||
# 30 - Authserver
|
# 30 - Authserver
|
||||||
#
|
#
|
||||||
# Logger.name.Level
|
# Logger.name.Level
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ void LoadGameObjectModelList()
|
|||||||
|
|
||||||
fclose(model_list_file);
|
fclose(model_list_file);
|
||||||
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u GameObject models in %u ms", uint32(model_list.size()), GetMSTimeDiffToNow(oldMSTime));
|
sLog->outInfo(LOG_FILTER_GENERAL, ">> Loaded %u GameObject models in %u ms", uint32(model_list.size()), GetMSTimeDiffToNow(oldMSTime));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GameObjectModel::~GameObjectModel()
|
GameObjectModel::~GameObjectModel()
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ public:
|
|||||||
ChatCommand* GetCommands() const
|
ChatCommand* GetCommands() const
|
||||||
{
|
{
|
||||||
static ChatCommand castCommandTable[] =
|
static ChatCommand castCommandTable[] =
|
||||||
{
|
{
|
||||||
{ "back", SEC_ADMINISTRATOR, false, &HandleCastBackCommand, "", NULL },
|
{ "back", SEC_ADMINISTRATOR, false, &HandleCastBackCommand, "", NULL },
|
||||||
{ "dist", SEC_ADMINISTRATOR, false, &HandleCastDistCommand, "", NULL },
|
{ "dist", SEC_ADMINISTRATOR, false, &HandleCastDistCommand, "", NULL },
|
||||||
{ "self", SEC_ADMINISTRATOR, false, &HandleCastSelfCommand, "", NULL },
|
{ "self", SEC_ADMINISTRATOR, false, &HandleCastSelfCommand, "", NULL },
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ public:
|
|||||||
{ "levelup", SEC_ADMINISTRATOR, false, &HandleLevelUpCommand, "", NULL },
|
{ "levelup", SEC_ADMINISTRATOR, false, &HandleLevelUpCommand, "", NULL },
|
||||||
{ "pdump", SEC_ADMINISTRATOR, true, NULL, "", pdumpCommandTable },
|
{ "pdump", SEC_ADMINISTRATOR, true, NULL, "", pdumpCommandTable },
|
||||||
{ NULL, 0, false, NULL, "", NULL }
|
{ NULL, 0, false, NULL, "", NULL }
|
||||||
};
|
};
|
||||||
return commandTable;
|
return commandTable;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -112,14 +112,14 @@ public:
|
|||||||
if (!normalizePlayerName(searchString))
|
if (!normalizePlayerName(searchString))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHAR_DEL_INFO_BY_NAME);
|
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHAR_DEL_INFO_BY_NAME);
|
||||||
stmt->setString(0, searchString);
|
stmt->setString(0, searchString);
|
||||||
result = CharacterDatabase.Query(stmt);
|
result = CharacterDatabase.Query(stmt);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHAR_DEL_INFO);
|
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHAR_DEL_INFO);
|
||||||
result = CharacterDatabase.Query(stmt);
|
result = CharacterDatabase.Query(stmt);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,7 +137,7 @@ public:
|
|||||||
|
|
||||||
// account name will be empty for not existed account
|
// account name will be empty for not existed account
|
||||||
AccountMgr::GetName(info.accountId, info.accountName);
|
AccountMgr::GetName(info.accountId, info.accountName);
|
||||||
info.deleteDate = time_t(fields[3].GetUInt32());
|
info.deleteDate = time_t(fields[3].GetUInt32());
|
||||||
foundList.push_back(info);
|
foundList.push_back(info);
|
||||||
}
|
}
|
||||||
while (result->NextRow());
|
while (result->NextRow());
|
||||||
|
|||||||
@@ -14,27 +14,27 @@
|
|||||||
* You should have received a copy of the GNU General Public License along
|
* You should have received a copy of the GNU General Public License along
|
||||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* ScriptData
|
/* ScriptData
|
||||||
Name: disable_commandscript
|
Name: disable_commandscript
|
||||||
%Complete: 100
|
%Complete: 100
|
||||||
Comment: All disable related commands
|
Comment: All disable related commands
|
||||||
Category: commandscripts
|
Category: commandscripts
|
||||||
EndScriptData */
|
EndScriptData */
|
||||||
|
|
||||||
#include "ScriptMgr.h"
|
#include "ScriptMgr.h"
|
||||||
#include "ObjectMgr.h"
|
#include "ObjectMgr.h"
|
||||||
#include "Chat.h"
|
#include "Chat.h"
|
||||||
#include "DisableMgr.h"
|
#include "DisableMgr.h"
|
||||||
|
|
||||||
class disable_commandscript : public CommandScript
|
class disable_commandscript : public CommandScript
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
disable_commandscript() : CommandScript("disable_commandscript") { }
|
disable_commandscript() : CommandScript("disable_commandscript") { }
|
||||||
|
|
||||||
ChatCommand* GetCommands() const
|
ChatCommand* GetCommands() const
|
||||||
{
|
{
|
||||||
|
|
||||||
static ChatCommand disableCommandTable[] =
|
static ChatCommand disableCommandTable[] =
|
||||||
{
|
{
|
||||||
{ "spell", SEC_GAMEMASTER, false, &HandleDisableSpellCommand, "", NULL },
|
{ "spell", SEC_GAMEMASTER, false, &HandleDisableSpellCommand, "", NULL },
|
||||||
@@ -45,7 +45,7 @@ public:
|
|||||||
{ "vmap", SEC_GAMEMASTER, false, &HandleDisableVmapCommand, "", NULL },
|
{ "vmap", SEC_GAMEMASTER, false, &HandleDisableVmapCommand, "", NULL },
|
||||||
{ NULL, 0, false, NULL, "", NULL }
|
{ NULL, 0, false, NULL, "", NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
static ChatCommand commandTable[] =
|
static ChatCommand commandTable[] =
|
||||||
{
|
{
|
||||||
{ "disable", SEC_GAMEMASTER, false, NULL, "", disableCommandTable },
|
{ "disable", SEC_GAMEMASTER, false, NULL, "", disableCommandTable },
|
||||||
@@ -53,8 +53,8 @@ public:
|
|||||||
};
|
};
|
||||||
return commandTable;
|
return commandTable;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void HandleDisables(ChatHandler* handler, char const* args, uint8 disableType)
|
static void HandleDisables(ChatHandler* handler, char const* args, uint8 disableType)
|
||||||
{
|
{
|
||||||
char* cEntry = strtok((char*)args, " ");
|
char* cEntry = strtok((char*)args, " ");
|
||||||
@@ -63,30 +63,30 @@ public:
|
|||||||
handler->SendSysMessage("No entry specified.");
|
handler->SendSysMessage("No entry specified.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
char* cFlags = strtok(NULL, " ");
|
char* cFlags = strtok(NULL, " ");
|
||||||
if (!cFlags || !atoi(cFlags))
|
if (!cFlags || !atoi(cFlags))
|
||||||
{
|
{
|
||||||
handler->SendSysMessage("No flags specified.");
|
handler->SendSysMessage("No flags specified.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
char* cComment = strtok(NULL, "");
|
char* cComment = strtok(NULL, "");
|
||||||
if (!cComment)
|
if (!cComment)
|
||||||
{
|
{
|
||||||
handler->SendSysMessage("No comment specified.");
|
handler->SendSysMessage("No comment specified.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string entryStr = cEntry;
|
std::string entryStr = cEntry;
|
||||||
std::string disableComment = cComment;
|
std::string disableComment = cComment;
|
||||||
uint32 entry = (uint32)atoi(cEntry);
|
uint32 entry = (uint32)atoi(cEntry);
|
||||||
uint8 flags = atoi(cFlags);
|
uint8 flags = atoi(cFlags);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
std::string disableTypeStr = "";
|
std::string disableTypeStr = "";
|
||||||
|
|
||||||
switch (disableType)
|
switch (disableType)
|
||||||
{
|
{
|
||||||
case DISABLE_TYPE_SPELL:
|
case DISABLE_TYPE_SPELL:
|
||||||
@@ -108,87 +108,87 @@ public:
|
|||||||
disableTypeStr = "vmap";
|
disableTypeStr = "vmap";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_DISABLES);
|
PreparedStatement* 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 already disabled.", disableTypeStr.c_str(), entry);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
PreparedStatement* stmt2 = WorldDatabase.GetPreparedStatement(WORLD_INS_DISABLES);
|
PreparedStatement* stmt2 = WorldDatabase.GetPreparedStatement(WORLD_INS_DISABLES);
|
||||||
stmt2->setUInt32(0, entry);
|
stmt2->setUInt32(0, entry);
|
||||||
stmt2->setUInt8(1, disableType);
|
stmt2->setUInt8(1, disableType);
|
||||||
stmt2->setUInt16(2, flags);
|
stmt2->setUInt16(2, flags);
|
||||||
stmt2->setString(3, disableComment);
|
stmt2->setString(3, disableComment);
|
||||||
WorldDatabase.Execute(stmt2);
|
WorldDatabase.Execute(stmt2);
|
||||||
|
|
||||||
handler->PSendSysMessage("Disabled %s %u for reason %s", disableTypeStr.c_str(), entry, disableComment.c_str());
|
handler->PSendSysMessage("Disabled %s %u for reason %s", disableTypeStr.c_str(), entry, disableComment.c_str());
|
||||||
return;
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool HandleDisableSpellCommand(ChatHandler* handler, char const* args)
|
static bool HandleDisableSpellCommand(ChatHandler* handler, char const* args)
|
||||||
{
|
{
|
||||||
if (!*args)
|
if (!*args)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
HandleDisables(handler, args, DISABLE_TYPE_SPELL);
|
HandleDisables(handler, args, DISABLE_TYPE_SPELL);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool HandleDisableMapCommand(ChatHandler* handler, char const* args)
|
static bool HandleDisableMapCommand(ChatHandler* handler, char const* args)
|
||||||
{
|
{
|
||||||
if (!*args)
|
if (!*args)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
HandleDisables(handler, args, DISABLE_TYPE_MAP);
|
HandleDisables(handler, args, DISABLE_TYPE_MAP);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool HandleDisableBattlegroundCommand(ChatHandler* handler, char const* args)
|
static bool HandleDisableBattlegroundCommand(ChatHandler* handler, char const* args)
|
||||||
{
|
{
|
||||||
if (!*args)
|
if (!*args)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
HandleDisables(handler, args, DISABLE_TYPE_BATTLEGROUND);
|
HandleDisables(handler, args, DISABLE_TYPE_BATTLEGROUND);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool HandleDisableAchievementCriteriaCommand(ChatHandler* handler, char const* args)
|
static bool HandleDisableAchievementCriteriaCommand(ChatHandler* handler, char const* args)
|
||||||
{
|
{
|
||||||
if (!*args)
|
if (!*args)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
HandleDisables(handler, args, DISABLE_TYPE_ACHIEVEMENT_CRITERIA);
|
HandleDisables(handler, args, DISABLE_TYPE_ACHIEVEMENT_CRITERIA);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool HandleDisableOutdoorPvPCommand(ChatHandler* handler, char const* args)
|
static bool HandleDisableOutdoorPvPCommand(ChatHandler* handler, char const* args)
|
||||||
{
|
{
|
||||||
if (!*args)
|
if (!*args)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
HandleDisables(handler, args, DISABLE_TYPE_OUTDOORPVP);
|
HandleDisables(handler, args, DISABLE_TYPE_OUTDOORPVP);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool HandleDisableVmapCommand(ChatHandler* handler, char const* args)
|
static bool HandleDisableVmapCommand(ChatHandler* handler, char const* args)
|
||||||
{
|
{
|
||||||
if (!*args)
|
if (!*args)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
HandleDisables(handler, args, DISABLE_TYPE_VMAP);
|
HandleDisables(handler, args, DISABLE_TYPE_VMAP);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
void AddSC_disable_commandscript()
|
void AddSC_disable_commandscript()
|
||||||
{
|
{
|
||||||
new disable_commandscript();
|
new disable_commandscript();
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ public:
|
|||||||
};
|
};
|
||||||
return commandTable;
|
return commandTable;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** \brief GM command level 3 - Create a guild.
|
/** \brief GM command level 3 - Create a guild.
|
||||||
*
|
*
|
||||||
* This command allows a GM (level 3) to create a guild.
|
* This command allows a GM (level 3) to create a guild.
|
||||||
|
|||||||
@@ -222,7 +222,7 @@ public:
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool HandleLookupEventCommand(ChatHandler* handler, char const* args)
|
static bool HandleLookupEventCommand(ChatHandler* handler, char const* args)
|
||||||
{
|
{
|
||||||
if (!*args)
|
if (!*args)
|
||||||
@@ -660,7 +660,7 @@ public:
|
|||||||
{
|
{
|
||||||
QuestStatus status = target->GetQuestStatus(qInfo->GetQuestId());
|
QuestStatus status = target->GetQuestStatus(qInfo->GetQuestId());
|
||||||
|
|
||||||
switch (status)
|
switch (status)
|
||||||
{
|
{
|
||||||
case QUEST_STATUS_COMPLETE:
|
case QUEST_STATUS_COMPLETE:
|
||||||
statusStr = handler->GetTrinityString(LANG_COMMAND_QUEST_COMPLETE);
|
statusStr = handler->GetTrinityString(LANG_COMMAND_QUEST_COMPLETE);
|
||||||
@@ -708,7 +708,7 @@ public:
|
|||||||
{
|
{
|
||||||
QuestStatus status = target->GetQuestStatus(qInfo->GetQuestId());
|
QuestStatus status = target->GetQuestStatus(qInfo->GetQuestId());
|
||||||
|
|
||||||
switch (status)
|
switch (status)
|
||||||
{
|
{
|
||||||
case QUEST_STATUS_COMPLETE:
|
case QUEST_STATUS_COMPLETE:
|
||||||
statusStr = handler->GetTrinityString(LANG_COMMAND_QUEST_COMPLETE);
|
statusStr = handler->GetTrinityString(LANG_COMMAND_QUEST_COMPLETE);
|
||||||
@@ -1315,7 +1315,7 @@ public:
|
|||||||
static bool HandleLookupPlayerEmailCommand(ChatHandler* handler, char const* args)
|
static bool HandleLookupPlayerEmailCommand(ChatHandler* handler, char const* args)
|
||||||
{
|
{
|
||||||
if (!*args)
|
if (!*args)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
std::string email = strtok((char*)args, " ");
|
std::string email = strtok((char*)args, " ");
|
||||||
char* limitStr = strtok(NULL, " ");
|
char* limitStr = strtok(NULL, " ");
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ public:
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool HandleResetStatsOrLevelHelper(Player* player)
|
static bool HandleResetStatsOrLevelHelper(Player* player)
|
||||||
{
|
{
|
||||||
ChrClassesEntry const* classEntry = sChrClassesStore.LookupEntry(player->getClass());
|
ChrClassesEntry const* classEntry = sChrClassesStore.LookupEntry(player->getClass());
|
||||||
|
|||||||
+10
-10
@@ -219,25 +219,25 @@ public:
|
|||||||
{
|
{
|
||||||
switch (identifier)
|
switch (identifier)
|
||||||
{
|
{
|
||||||
case DATA_SELIN:
|
case DATA_SELIN:
|
||||||
return SelinGUID;
|
return SelinGUID;
|
||||||
case DATA_DELRISSA:
|
case DATA_DELRISSA:
|
||||||
return DelrissaGUID;
|
return DelrissaGUID;
|
||||||
case DATA_VEXALLUS_DOOR:
|
case DATA_VEXALLUS_DOOR:
|
||||||
return VexallusDoorGUID;
|
return VexallusDoorGUID;
|
||||||
case DATA_SELIN_DOOR:
|
case DATA_SELIN_DOOR:
|
||||||
return SelinDoorGUID;
|
return SelinDoorGUID;
|
||||||
case DATA_SELIN_ENCOUNTER_DOOR:
|
case DATA_SELIN_ENCOUNTER_DOOR:
|
||||||
return SelinEncounterDoorGUID;
|
return SelinEncounterDoorGUID;
|
||||||
case DATA_DELRISSA_DOOR:
|
case DATA_DELRISSA_DOOR:
|
||||||
return DelrissaDoorGUID;
|
return DelrissaDoorGUID;
|
||||||
case DATA_KAEL_DOOR:
|
case DATA_KAEL_DOOR:
|
||||||
return KaelDoorGUID;
|
return KaelDoorGUID;
|
||||||
case DATA_KAEL_STATUE_LEFT:
|
case DATA_KAEL_STATUE_LEFT:
|
||||||
return KaelStatue[0];
|
return KaelStatue[0];
|
||||||
case DATA_KAEL_STATUE_RIGHT:
|
case DATA_KAEL_STATUE_RIGHT:
|
||||||
return KaelStatue[1];
|
return KaelStatue[1];
|
||||||
case DATA_ESCAPE_ORB:
|
case DATA_ESCAPE_ORB:
|
||||||
return EscapeOrbGUID;
|
return EscapeOrbGUID;
|
||||||
|
|
||||||
case DATA_FEL_CRYSTAL:
|
case DATA_FEL_CRYSTAL:
|
||||||
|
|||||||
@@ -175,13 +175,13 @@ public:
|
|||||||
if (me->GetDistance(victim) > 10.0f)
|
if (me->GetDistance(victim) > 10.0f)
|
||||||
DoCast(victim, SPELL_MULTI_SHOT);
|
DoCast(victim, SPELL_MULTI_SHOT);
|
||||||
} else FadeTimer -= diff;
|
} else FadeTimer -= diff;
|
||||||
|
|
||||||
if (SummonSkeletonTimer <= diff)
|
if (SummonSkeletonTimer <= diff)
|
||||||
{
|
{
|
||||||
DoCast(me, SPELL_SUMMON_SKELETON);
|
DoCast(me, SPELL_SUMMON_SKELETON);
|
||||||
SummonSkeletonTimer = 20000 + rand()%10000;
|
SummonSkeletonTimer = 20000 + rand()%10000;
|
||||||
} else SummonSkeletonTimer -= diff;
|
} else SummonSkeletonTimer -= diff;
|
||||||
|
|
||||||
if (BlackArrowTimer <= diff)
|
if (BlackArrowTimer <= diff)
|
||||||
{
|
{
|
||||||
if (Unit* victim = me->getVictim())
|
if (Unit* victim = me->getVictim())
|
||||||
@@ -190,7 +190,7 @@ public:
|
|||||||
BlackArrowTimer = 15000 + rand()%5000;
|
BlackArrowTimer = 15000 + rand()%5000;
|
||||||
}
|
}
|
||||||
} else BlackArrowTimer -= diff;
|
} else BlackArrowTimer -= diff;
|
||||||
|
|
||||||
if (ShotTimer <= diff)
|
if (ShotTimer <= diff)
|
||||||
{
|
{
|
||||||
if (Unit* victim = me->getVictim())
|
if (Unit* victim = me->getVictim())
|
||||||
@@ -199,7 +199,7 @@ public:
|
|||||||
ShotTimer = 8000 + rand()%2000;
|
ShotTimer = 8000 + rand()%2000;
|
||||||
}
|
}
|
||||||
} else ShotTimer -= diff;
|
} else ShotTimer -= diff;
|
||||||
|
|
||||||
if (MultiShotTimer <= diff)
|
if (MultiShotTimer <= diff)
|
||||||
{
|
{
|
||||||
if (Unit* victim = me->getVictim())
|
if (Unit* victim = me->getVictim())
|
||||||
@@ -207,7 +207,7 @@ public:
|
|||||||
DoCast(victim, SPELL_MULTI_SHOT);
|
DoCast(victim, SPELL_MULTI_SHOT);
|
||||||
MultiShotTimer = 10000 + rand()%3000;
|
MultiShotTimer = 10000 + rand()%3000;
|
||||||
}
|
}
|
||||||
} else MultiShotTimer -= diff;
|
} else MultiShotTimer -= diff;
|
||||||
|
|
||||||
DoMeleeAttackIfReady();
|
DoMeleeAttackIfReady();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ enum Spells
|
|||||||
SPELL_BANSHEE_CURSE = 31651,
|
SPELL_BANSHEE_CURSE = 31651,
|
||||||
SPELL_BANSHEE_WAIL = 38183,
|
SPELL_BANSHEE_WAIL = 38183,
|
||||||
SPELL_ANTI_MAGIC_SHELL = 31662,
|
SPELL_ANTI_MAGIC_SHELL = 31662,
|
||||||
SPELL_WEB = 28991,
|
SPELL_WEB = 28991,
|
||||||
SPELL_MANA_BURN = 31729,
|
SPELL_MANA_BURN = 31729,
|
||||||
SPELL_FROST_BREATH = 31688,
|
SPELL_FROST_BREATH = 31688,
|
||||||
SPELL_GARGOYLE_STRIKE = 31664,
|
SPELL_GARGOYLE_STRIKE = 31664,
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ enum RuulSnowhoof
|
|||||||
NPC_THISTLEFUR_URSA = 3921,
|
NPC_THISTLEFUR_URSA = 3921,
|
||||||
NPC_THISTLEFUR_TOTEMIC = 3922,
|
NPC_THISTLEFUR_TOTEMIC = 3922,
|
||||||
NPC_THISTLEFUR_PATHFINDER = 3926,
|
NPC_THISTLEFUR_PATHFINDER = 3926,
|
||||||
|
|
||||||
QUEST_FREEDOM_TO_RUUL = 6482,
|
QUEST_FREEDOM_TO_RUUL = 6482,
|
||||||
|
|
||||||
GO_CAGE = 178147
|
GO_CAGE = 178147
|
||||||
|
|||||||
@@ -182,9 +182,9 @@ public:
|
|||||||
enum RizzleSprysprocketData
|
enum RizzleSprysprocketData
|
||||||
{
|
{
|
||||||
QUEST_CHASING_THE_MOONSTONE = 10994,
|
QUEST_CHASING_THE_MOONSTONE = 10994,
|
||||||
|
|
||||||
MOB_DEPTH_CHARGE = 23025,
|
MOB_DEPTH_CHARGE = 23025,
|
||||||
|
|
||||||
SPELL_RIZZLE_BLACKJACK = 39865,
|
SPELL_RIZZLE_BLACKJACK = 39865,
|
||||||
SPELL_RIZZLE_ESCAPE = 39871,
|
SPELL_RIZZLE_ESCAPE = 39871,
|
||||||
SPELL_RIZZLE_FROST_GRENADE = 40525,
|
SPELL_RIZZLE_FROST_GRENADE = 40525,
|
||||||
@@ -490,7 +490,7 @@ public:
|
|||||||
{
|
{
|
||||||
if (WeMustDieTimer <= diff)
|
if (WeMustDieTimer <= diff)
|
||||||
me->DespawnOrUnsummon();
|
me->DespawnOrUnsummon();
|
||||||
else
|
else
|
||||||
WeMustDieTimer -= diff;
|
WeMustDieTimer -= diff;
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -549,7 +549,7 @@ public:
|
|||||||
(*itr)->Respawn();
|
(*itr)->Respawn();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
sLog->outError(LOG_FILTER_TSCR, "SD2 ERROR: FlagList is empty!");
|
sLog->outError(LOG_FILTER_TSCR, "SD2 ERROR: FlagList is empty!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -560,7 +560,7 @@ public:
|
|||||||
if (EventStarted)
|
if (EventStarted)
|
||||||
SayTimer = NextStep(Step++);
|
SayTimer = NextStep(Step++);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
SayTimer -= diff;
|
SayTimer -= diff;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -40,10 +40,10 @@ EndContentData */
|
|||||||
enum RiverbreezeAndSilversky
|
enum RiverbreezeAndSilversky
|
||||||
{
|
{
|
||||||
SPELL_CENARION_BEACON = 15120,
|
SPELL_CENARION_BEACON = 15120,
|
||||||
|
|
||||||
NPC_ARATHANDRIS_SILVERSKY = 9528,
|
NPC_ARATHANDRIS_SILVERSKY = 9528,
|
||||||
NPC_MAYBESS_RIVERBREEZE = 9529,
|
NPC_MAYBESS_RIVERBREEZE = 9529,
|
||||||
|
|
||||||
QUEST_CLEASING_FELWOOD_A = 4101,
|
QUEST_CLEASING_FELWOOD_A = 4101,
|
||||||
QUEST_CLEASING_FELWOOD_H = 4102
|
QUEST_CLEASING_FELWOOD_H = 4102
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -200,7 +200,7 @@ public:
|
|||||||
JustCreated = false;
|
JustCreated = false;
|
||||||
} else CanAttack = true;
|
} else CanAttack = true;
|
||||||
|
|
||||||
|
|
||||||
for (uint8 i = 0; i < 4; ++i)
|
for (uint8 i = 0; i < 4; ++i)
|
||||||
if (Unit* remo = Unit::GetUnit(*me, ShieldGeneratorChannel[i]))
|
if (Unit* remo = Unit::GetUnit(*me, ShieldGeneratorChannel[i]))
|
||||||
remo->setDeathState(JUST_DIED);
|
remo->setDeathState(JUST_DIED);
|
||||||
@@ -354,7 +354,7 @@ public:
|
|||||||
// Static Charge
|
// Static Charge
|
||||||
// Used on random people (only 1 person at any given time) in Phases 1 and 3, it's a debuff doing 2775 to 3225 Nature damage to the target and everybody in about 5 yards around it, every 1 seconds for 30 seconds. It can be removed by Cloak of Shadows, Iceblock, Divine Shield, etc, but not by Cleanse or Dispel Magic.
|
// Used on random people (only 1 person at any given time) in Phases 1 and 3, it's a debuff doing 2775 to 3225 Nature damage to the target and everybody in about 5 yards around it, every 1 seconds for 30 seconds. It can be removed by Cloak of Shadows, Iceblock, Divine Shield, etc, but not by Cleanse or Dispel Magic.
|
||||||
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true);
|
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true);
|
||||||
if (target && !target->HasAura(SPELL_STATIC_CHARGE_TRIGGER))
|
if (target && !target->HasAura(SPELL_STATIC_CHARGE_TRIGGER))
|
||||||
DoCast(target, SPELL_STATIC_CHARGE_TRIGGER); // cast Static Charge every 2 seconds for 20 seconds
|
DoCast(target, SPELL_STATIC_CHARGE_TRIGGER); // cast Static Charge every 2 seconds for 20 seconds
|
||||||
|
|
||||||
StaticChargeTimer = 10000+rand()%20000;
|
StaticChargeTimer = 10000+rand()%20000;
|
||||||
|
|||||||
@@ -1177,7 +1177,7 @@ Warden.ClientCheckHoldOff = 30
|
|||||||
#
|
#
|
||||||
# Warden.ClientCheckFailAction
|
# Warden.ClientCheckFailAction
|
||||||
# Description: Default action being taken if a client check failed. Actions can be
|
# Description: Default action being taken if a client check failed. Actions can be
|
||||||
# overwritten for each single check via warden_action table in characters
|
# overwritten for each single check via warden_action table in characters
|
||||||
# database.
|
# database.
|
||||||
# Default: 0 - (Disabled, Logging only)
|
# Default: 0 - (Disabled, Logging only)
|
||||||
# 1 - (Kick)
|
# 1 - (Kick)
|
||||||
@@ -1940,9 +1940,9 @@ Rate.MoveSpeed = 1
|
|||||||
|
|
||||||
#
|
#
|
||||||
# Rate.InstanceResetTime
|
# Rate.InstanceResetTime
|
||||||
# Description: Multiplier for the rate between global raid/heroic instance resets
|
# Description: Multiplier for the rate between global raid/heroic instance resets
|
||||||
# (dbc value). Higher value increases the time between resets,
|
# (dbc value). Higher value increases the time between resets,
|
||||||
# lower value lowers the time, you need clean instance_reset in
|
# lower value lowers the time, you need clean instance_reset in
|
||||||
# characters db in order to let new values work.
|
# characters db in order to let new values work.
|
||||||
# Default: 1
|
# Default: 1
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user