diff options
Diffstat (limited to 'src/server/scripts')
4 files changed, 114 insertions, 26 deletions
diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index 101d522e85b..e2a29b62bea 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -61,6 +61,7 @@ public: { "customize", rbac::RBAC_PERM_COMMAND_CHARACTER_CUSTOMIZE, true, &HandleCharacterCustomizeCommand, "", }, { "changefaction", rbac::RBAC_PERM_COMMAND_CHARACTER_CHANGEFACTION, true, &HandleCharacterChangeFactionCommand, "", }, { "changerace", rbac::RBAC_PERM_COMMAND_CHARACTER_CHANGERACE, true, &HandleCharacterChangeRaceCommand, "", }, + { "changeaccount", rbac::RBAC_PERM_COMMAND_CHARACTER_CHANGEACCOUNT, true, &HandleCharacterChangeAccountCommand, "", }, { "deleted", rbac::RBAC_PERM_COMMAND_CHARACTER_DELETED, true, NULL, "", characterDeletedCommandTable }, { "erase", rbac::RBAC_PERM_COMMAND_CHARACTER_ERASE, true, &HandleCharacterEraseCommand, "", }, { "level", rbac::RBAC_PERM_COMMAND_CHARACTER_LEVEL, true, &HandleCharacterLevelCommand, "", }, @@ -551,6 +552,86 @@ public: return true; } + static bool HandleCharacterChangeAccountCommand(ChatHandler* handler, char const* args) + { + char* playerNameStr; + char* accountNameStr; + handler->extractOptFirstArg(const_cast<char*>(args), &playerNameStr, &accountNameStr); + if (!accountNameStr) + return false; + + ObjectGuid targetGuid; + std::string targetName; + if (!handler->extractPlayerTarget(playerNameStr, nullptr, &targetGuid, &targetName)) + return false; + + CharacterInfo const* characterInfo = sWorld->GetCharacterInfo(targetGuid); + if (!characterInfo) + { + handler->SendSysMessage(LANG_PLAYER_NOT_FOUND); + handler->SetSentErrorMessage(true); + return false; + } + + uint32 oldAccountId = characterInfo->AccountId; + uint32 newAccountId = oldAccountId; + + std::string accountName(accountNameStr); + if (!Utf8ToUpperOnlyLatin(accountName)) + { + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str()); + handler->SetSentErrorMessage(true); + return false; + } + + PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_ACCOUNT_ID_BY_NAME); + stmt->setString(0, accountName); + if (PreparedQueryResult result = LoginDatabase.Query(stmt)) + newAccountId = (*result)[0].GetUInt32(); + else + { + handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str()); + handler->SetSentErrorMessage(true); + return false; + } + + // nothing to do :) + if (newAccountId == oldAccountId) + return true; + + if (uint32 charCount = AccountMgr::GetCharactersCount(newAccountId)) + { + if (charCount >= sWorld->getIntConfig(CONFIG_CHARACTERS_PER_REALM)) + { + handler->PSendSysMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL, accountName.c_str(), newAccountId); + handler->SetSentErrorMessage(true); + return false; + } + } + + stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_ACCOUNT_BY_GUID); + stmt->setUInt32(0, newAccountId); + stmt->setUInt32(1, targetGuid.GetCounter()); + CharacterDatabase.DirectExecute(stmt); + + sWorld->UpdateRealmCharCount(oldAccountId); + sWorld->UpdateRealmCharCount(newAccountId); + + sWorld->UpdateCharacterInfoAccount(targetGuid, newAccountId); + + handler->PSendSysMessage(LANG_CHANGEACCOUNT_SUCCESS, targetName.c_str(), accountName.c_str()); + + std::string logString = Trinity::StringFormat("changed ownership of player %s (%s) from account %u to account %u", targetName.c_str(), targetGuid.ToString().c_str(), oldAccountId, newAccountId); + if (WorldSession* session = handler->GetSession()) + { + if (Player* player = session->GetPlayer()) + sLog->outCommand(session->GetAccountId(), "GM %s (Account: %u) %s", player->GetName().c_str(), session->GetAccountId(), logString.c_str()); + } + else + sLog->outCommand(0, "%s %s", handler->GetTrinityString(LANG_CONSOLE), logString.c_str()); + return true; + } + static bool HandleCharacterReputationCommand(ChatHandler* handler, char const* args) { Player* target; diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index c72893c77a9..06ebeb5eb71 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -51,7 +51,7 @@ struct EnumName #define CREATE_NAMED_ENUM(VALUE) { VALUE, STRINGIZE(VALUE) } #define NPC_FLAG_COUNT 24 -#define FLAGS_EXTRA_COUNT 19 +#define FLAGS_EXTRA_COUNT 20 EnumName<NPCFlags, uint32> const npcFlagTexts[NPC_FLAG_COUNT] = { @@ -193,6 +193,7 @@ EnumName<CreatureFlagsExtra> const flagsExtra[FLAGS_EXTRA_COUNT] = CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_NO_XP_AT_KILL), CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_TRIGGER), CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_NO_TAUNT), + CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_NO_MOVE_FLAGS_UPDATE), CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_WORLDEVENT), CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_GUARD), CREATE_NAMED_ENUM(CREATURE_FLAG_EXTRA_NO_CRIT), diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index f43052ebb0a..79a0f293fb2 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -20,6 +20,7 @@ #include "MotionMaster.h" #include "ruby_sanctum.h" #include "ScriptedCreature.h" +#include "SpellMgr.h" #include "SpellScript.h" enum Texts @@ -76,14 +77,14 @@ class boss_saviana_ragefire : public CreatureScript struct boss_saviana_ragefireAI : public BossAI { - boss_saviana_ragefireAI(Creature* creature) : BossAI(creature, DATA_SAVIANA_RAGEFIRE) - { - } + boss_saviana_ragefireAI(Creature* creature) : BossAI(creature, DATA_SAVIANA_RAGEFIRE) { } void Reset() override { _Reset(); me->SetReactState(REACT_AGGRESSIVE); + me->SetCanFly(false); + me->SetDisableGravity(false); } void EnterCombat(Unit* /*who*/) override @@ -91,15 +92,15 @@ class boss_saviana_ragefire : public CreatureScript _EnterCombat(); Talk(SAY_AGGRO); events.Reset(); - events.ScheduleEvent(EVENT_ENRAGE, 20000, EVENT_GROUP_LAND_PHASE); - events.ScheduleEvent(EVENT_FLAME_BREATH, 14000, EVENT_GROUP_LAND_PHASE); - events.ScheduleEvent(EVENT_FLIGHT, 60000); + events.ScheduleEvent(EVENT_ENRAGE, Seconds(20), EVENT_GROUP_LAND_PHASE); + events.ScheduleEvent(EVENT_FLAME_BREATH, Seconds(14), EVENT_GROUP_LAND_PHASE); + events.ScheduleEvent(EVENT_FLIGHT, Seconds(60), EVENT_GROUP_LAND_PHASE); } void JustDied(Unit* /*killer*/) override { _JustDied(); - me->PlayDirectSound(SOUND_ID_DEATH); + DoPlaySoundToSet(me, SOUND_ID_DEATH); } void MovementInform(uint32 type, uint32 point) override @@ -110,32 +111,32 @@ class boss_saviana_ragefire : public CreatureScript switch (point) { case POINT_FLIGHT: - events.ScheduleEvent(EVENT_CONFLAGRATION, 1000); + events.ScheduleEvent(EVENT_CONFLAGRATION, Seconds(1)); Talk(SAY_CONFLAGRATION); break; case POINT_LAND: - events.ScheduleEvent(EVENT_LAND_GROUND, 1); + events.ScheduleEvent(EVENT_LAND_GROUND, Milliseconds(1)); break; case POINT_LAND_GROUND: me->SetCanFly(false); me->SetDisableGravity(false); me->RemoveByteFlag(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_ANIM_TIER, UNIT_BYTE1_FLAG_ALWAYS_STAND | UNIT_BYTE1_FLAG_HOVER); me->SetReactState(REACT_AGGRESSIVE); - DoStartMovement(me->GetVictim()); + events.ScheduleEvent(EVENT_ENRAGE, Seconds(1), EVENT_GROUP_LAND_PHASE); + events.ScheduleEvent(EVENT_FLAME_BREATH, Seconds(2), Seconds(4), EVENT_GROUP_LAND_PHASE); + events.ScheduleEvent(EVENT_FLIGHT, Seconds(50), EVENT_GROUP_LAND_PHASE); break; case POINT_TAKEOFF: - events.ScheduleEvent(EVENT_AIR_MOVEMENT, 1); + events.ScheduleEvent(EVENT_AIR_MOVEMENT, Milliseconds(1)); break; default: break; } } - void JustReachedHome() override + void EnterEvadeMode(EvadeReason /*why*/) override { - _JustReachedHome(); - me->SetCanFly(false); - me->SetDisableGravity(false); + _DespawnAtEvade(); } void KilledUnit(Unit* victim) override @@ -169,21 +170,20 @@ class boss_saviana_ragefire : public CreatureScript pos.Relocate(me); pos.m_positionZ += 10.0f; me->GetMotionMaster()->MoveTakeoff(POINT_TAKEOFF, pos); - events.ScheduleEvent(EVENT_FLIGHT, 50000); - events.DelayEvents(12500, EVENT_GROUP_LAND_PHASE); + events.CancelEventGroup(EVENT_GROUP_LAND_PHASE); break; } case EVENT_CONFLAGRATION: - DoCast(me, SPELL_CONFLAGRATION, true); + DoCastSelf(SPELL_CONFLAGRATION, true); break; case EVENT_ENRAGE: - DoCast(me, SPELL_ENRAGE); + DoCastSelf(SPELL_ENRAGE); Talk(EMOTE_ENRAGED); - events.ScheduleEvent(EVENT_ENRAGE, urand(15000, 20000), EVENT_GROUP_LAND_PHASE); + events.Repeat(Seconds(24)); break; case EVENT_FLAME_BREATH: DoCastVictim(SPELL_FLAME_BREATH); - events.ScheduleEvent(EVENT_FLAME_BREATH, urand(20000, 30000), EVENT_GROUP_LAND_PHASE); + events.Repeat(Seconds(20), Seconds(30)); break; case EVENT_AIR_MOVEMENT: me->GetMotionMaster()->MovePoint(POINT_FLIGHT, SavianaRagefireFlyOutPos); @@ -220,6 +220,7 @@ class ConflagrationTargetSelector } }; +// 74452 - Conflagration class spell_saviana_conflagration_init : public SpellScriptLoader { public: @@ -229,6 +230,14 @@ class spell_saviana_conflagration_init : public SpellScriptLoader { PrepareSpellScript(spell_saviana_conflagration_init_SpellScript); + bool Validate(SpellInfo const* /*spell*/) override + { + if (!sSpellMgr->GetSpellInfo(SPELL_FLAME_BEACON) + || !sSpellMgr->GetSpellInfo(SPELL_CONFLAGRATION_2)) + return false; + return true; + } + void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(ConflagrationTargetSelector()); @@ -257,6 +266,7 @@ class spell_saviana_conflagration_init : public SpellScriptLoader } }; +// 74455 - Conflagration class spell_saviana_conflagration_throwback : public SpellScriptLoader { public: diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index a9c638c010d..f003260b8d1 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -252,10 +252,6 @@ class boss_blood_council_controller : public CreatureScript void EnterEvadeMode(EvadeReason /*why*/) override { - // Avoid do set boss state to fail with hotswap - if (instance->GetBossState(DATA_BLOOD_PRINCE_COUNCIL) == DONE) - return; - for (uint32 bossData : PrincesData) if (Creature* prince = ObjectAccessor::GetCreature(*me, instance->GetGuidData(bossData))) instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, prince); |