Merge branch 'master' into 4.3.4
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.cpp src/server/game/AI/EventAI/CreatureEventAIMgr.cpp src/server/game/Achievements/AchievementMgr.cpp src/server/game/Battlegrounds/ArenaTeam.cpp src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Conditions/ConditionMgr.cpp src/server/game/DataStores/DBCStores.cpp src/server/game/DungeonFinding/LFGMgr.cpp src/server/game/Entities/DynamicObject/DynamicObject.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Object/Updates/UpdateData.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Guilds/Guild.cpp src/server/game/Guilds/GuildMgr.cpp src/server/game/Handlers/AuctionHouseHandler.cpp src/server/game/Handlers/BattleGroundHandler.cpp src/server/game/Handlers/BattlefieldHandler.cpp src/server/game/Handlers/CalendarHandler.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/Handlers/ChatHandler.cpp src/server/game/Handlers/GroupHandler.cpp src/server/game/Handlers/GuildHandler.cpp src/server/game/Handlers/ItemHandler.cpp src/server/game/Handlers/LFGHandler.cpp src/server/game/Handlers/MailHandler.cpp src/server/game/Handlers/MiscHandler.cpp src/server/game/Handlers/MovementHandler.cpp src/server/game/Handlers/NPCHandler.cpp src/server/game/Handlers/PetitionsHandler.cpp src/server/game/Handlers/QuestHandler.cpp src/server/game/Handlers/SpellHandler.cpp src/server/game/Handlers/TradeHandler.cpp src/server/game/Instances/InstanceScript.cpp src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Auras/SpellAuras.cpp src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellEffects.cpp src/server/game/Spells/SpellMgr.cpp src/server/game/Tools/PlayerDump.cpp src/server/game/World/World.cpp src/server/scripts/Commands/cs_modify.cpp src/server/scripts/Commands/cs_reload.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp src/server/scripts/Spells/spell_warlock.cpp src/server/worldserver/worldserver.conf.dist
This commit is contained in:
commit
ab2d26cb91
240 files changed
+4476
-4523
No files matched your search
+1
-1
@@ -211,7 +211,7 @@ public:
|
||||
{
|
||||
instance->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, NPC_GRIMSTONE, me);
|
||||
instance->SetData(TYPE_RING_OF_LAW, DONE);
|
||||
TC_LOG_DEBUG(LOG_FILTER_TSCR, "npc_grimstone: event reached end and set complete.");
|
||||
TC_LOG_DEBUG("scripts", "npc_grimstone: event reached end and set complete.");
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
+2
-2
@@ -214,7 +214,7 @@ public:
|
||||
|
||||
void SetData64(uint32 type, uint64 data) OVERRIDE
|
||||
{
|
||||
TC_LOG_DEBUG(LOG_FILTER_TSCR, "Instance Blackrock Depths: SetData64 update (Type: %u Data " UI64FMTD ")", type, data);
|
||||
TC_LOG_DEBUG("scripts", "Instance Blackrock Depths: SetData64 update (Type: %u Data " UI64FMTD ")", type, data);
|
||||
|
||||
switch (type)
|
||||
{
|
||||
@@ -230,7 +230,7 @@ public:
|
||||
|
||||
void SetData(uint32 type, uint32 data) OVERRIDE
|
||||
{
|
||||
TC_LOG_DEBUG(LOG_FILTER_TSCR, "Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data);
|
||||
TC_LOG_DEBUG("scripts", "Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data);
|
||||
|
||||
switch (type)
|
||||
{
|
||||
|
||||
@@ -1237,7 +1237,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
TC_LOG_ERROR(LOG_FILTER_TSCR, "boss_romuloAI: DamageTaken reach end of code, that should not happen.");
|
||||
TC_LOG_ERROR("scripts", "boss_romuloAI: DamageTaken reach end of code, that should not happen.");
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) OVERRIDE
|
||||
@@ -1483,7 +1483,7 @@ void boss_julianne::boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32 &dama
|
||||
|
||||
if (Phase == PHASE_ROMULO)
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_TSCR, "boss_julianneAI: cannot take damage in PHASE_ROMULO, why was i here?");
|
||||
TC_LOG_ERROR("scripts", "boss_julianneAI: cannot take damage in PHASE_ROMULO, why was i here?");
|
||||
damage = 0;
|
||||
return;
|
||||
}
|
||||
@@ -1517,7 +1517,7 @@ void boss_julianne::boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32 &dama
|
||||
return;
|
||||
}
|
||||
}
|
||||
TC_LOG_ERROR(LOG_FILTER_TSCR, "boss_julianneAI: DamageTaken reach end of code, that should not happen.");
|
||||
TC_LOG_ERROR("scripts", "boss_julianneAI: DamageTaken reach end of code, that should not happen.");
|
||||
}
|
||||
|
||||
void AddSC_bosses_opera()
|
||||
|
||||
@@ -247,7 +247,7 @@ public:
|
||||
|
||||
void PrepareEncounter()
|
||||
{
|
||||
TC_LOG_DEBUG(LOG_FILTER_TSCR, "Barnes Opera Event - Introduction complete - preparing encounter %d", m_uiEventId);
|
||||
TC_LOG_DEBUG("scripts", "Barnes Opera Event - Introduction complete - preparing encounter %d", m_uiEventId);
|
||||
uint8 index = 0;
|
||||
uint8 count = 0;
|
||||
|
||||
@@ -361,17 +361,17 @@ public:
|
||||
case GOSSIP_ACTION_INFO_DEF+3:
|
||||
player->CLOSE_GOSSIP_MENU();
|
||||
pBarnesAI->m_uiEventId = EVENT_OZ;
|
||||
TC_LOG_INFO(LOG_FILTER_TSCR, "player (GUID " UI64FMTD ") manually set Opera event to EVENT_OZ", player->GetGUID());
|
||||
TC_LOG_INFO("scripts", "player (GUID " UI64FMTD ") manually set Opera event to EVENT_OZ", player->GetGUID());
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF+4:
|
||||
player->CLOSE_GOSSIP_MENU();
|
||||
pBarnesAI->m_uiEventId = EVENT_HOOD;
|
||||
TC_LOG_INFO(LOG_FILTER_TSCR, "player (GUID " UI64FMTD ") manually set Opera event to EVENT_HOOD", player->GetGUID());
|
||||
TC_LOG_INFO("scripts", "player (GUID " UI64FMTD ") manually set Opera event to EVENT_HOOD", player->GetGUID());
|
||||
break;
|
||||
case GOSSIP_ACTION_INFO_DEF+5:
|
||||
player->CLOSE_GOSSIP_MENU();
|
||||
pBarnesAI->m_uiEventId = EVENT_RAJ;
|
||||
TC_LOG_INFO(LOG_FILTER_TSCR, "player (GUID " UI64FMTD ") manually set Opera event to EVENT_RAJ", player->GetGUID());
|
||||
TC_LOG_INFO("scripts", "player (GUID " UI64FMTD ") manually set Opera event to EVENT_RAJ", player->GetGUID());
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -62,5 +62,5 @@ enum OperaEvents
|
||||
EVENT_RAJ = 3
|
||||
};
|
||||
|
||||
#define ERROR_INST_DATA(a) TC_LOG_ERROR(LOG_FILTER_TSCR, "Instance Data for Karazhan not set properly. Encounter for Creature Entry %u may not work properly.", a->GetEntry());
|
||||
#define ERROR_INST_DATA(a) TC_LOG_ERROR("scripts", "Instance Data for Karazhan not set properly. Encounter for Creature Entry %u may not work properly.", a->GetEntry());
|
||||
#endif
|
||||
@@ -84,7 +84,7 @@ public:
|
||||
{
|
||||
instance->SetData64(DATA_FEL_CRYSTAL, i);
|
||||
uint64 guid = instance->GetData64(DATA_FEL_CRYSTAL);
|
||||
TC_LOG_DEBUG(LOG_FILTER_TSCR, "Selin: Adding Fel Crystal " UI64FMTD " to list", guid);
|
||||
TC_LOG_DEBUG("scripts", "Selin: Adding Fel Crystal " UI64FMTD " to list", guid);
|
||||
Crystals.push_back(guid);
|
||||
}
|
||||
}
|
||||
@@ -125,7 +125,7 @@ public:
|
||||
|
||||
// Set Inst data for encounter
|
||||
instance->SetData(DATA_SELIN_EVENT, NOT_STARTED);
|
||||
} else TC_LOG_ERROR(LOG_FILTER_TSCR, ERROR_INST_DATA);
|
||||
} else TC_LOG_ERROR("scripts", ERROR_INST_DATA);
|
||||
|
||||
DrainLifeTimer = urand(3000, 7000);
|
||||
DrainManaTimer = DrainLifeTimer + 5000;
|
||||
@@ -225,7 +225,7 @@ public:
|
||||
else
|
||||
{
|
||||
// Make an error message in case something weird happened here
|
||||
TC_LOG_ERROR(LOG_FILTER_TSCR, "Selin Fireheart unable to drain crystal as the crystal is either dead or despawned");
|
||||
TC_LOG_ERROR("scripts", "Selin Fireheart unable to drain crystal as the crystal is either dead or despawned");
|
||||
DrainingCrystal = false;
|
||||
}
|
||||
}
|
||||
@@ -361,7 +361,7 @@ public:
|
||||
}
|
||||
}
|
||||
}
|
||||
} else TC_LOG_ERROR(LOG_FILTER_TSCR, ERROR_INST_DATA);
|
||||
} else TC_LOG_ERROR("scripts", ERROR_INST_DATA);
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
@@ -291,7 +291,7 @@ public:
|
||||
case DATA_FEL_CRYSTAL:
|
||||
if (FelCrystals.size() < felCristalIndex)
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_TSCR, "Magisters Terrace: No Fel Crystals loaded in Inst Data");
|
||||
TC_LOG_ERROR("scripts", "Magisters Terrace: No Fel Crystals loaded in Inst Data");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -180,7 +180,7 @@ public:
|
||||
anchorGUID = anchor->GetGUID();
|
||||
}
|
||||
else
|
||||
TC_LOG_ERROR(LOG_FILTER_TSCR, "npc_unworthy_initiateAI: unable to find anchor!");
|
||||
TC_LOG_ERROR("scripts", "npc_unworthy_initiateAI: unable to find anchor!");
|
||||
|
||||
float dist = 99.0f;
|
||||
GameObject* prison = NULL;
|
||||
@@ -200,7 +200,7 @@ public:
|
||||
if (prison)
|
||||
prison->ResetDoorOrButton();
|
||||
else
|
||||
TC_LOG_ERROR(LOG_FILTER_TSCR, "npc_unworthy_initiateAI: unable to find prison!");
|
||||
TC_LOG_ERROR("scripts", "npc_unworthy_initiateAI: unable to find prison!");
|
||||
}
|
||||
break;
|
||||
case PHASE_TO_EQUIP:
|
||||
@@ -211,7 +211,7 @@ public:
|
||||
else
|
||||
{
|
||||
me->GetMotionMaster()->MovePoint(1, anchorX, anchorY, me->GetPositionZ());
|
||||
//TC_LOG_DEBUG(LOG_FILTER_TSCR, "npc_unworthy_initiateAI: move to %f %f %f", anchorX, anchorY, me->GetPositionZ());
|
||||
//TC_LOG_DEBUG("scripts", "npc_unworthy_initiateAI: move to %f %f %f", anchorX, anchorY, me->GetPositionZ());
|
||||
phase = PHASE_EQUIPING;
|
||||
wait_timer = 0;
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ class instance_stratholme : public InstanceMapScript
|
||||
return true;
|
||||
}
|
||||
|
||||
TC_LOG_DEBUG(LOG_FILTER_TSCR, "Instance Stratholme: Cannot open slaugther square yet.");
|
||||
TC_LOG_DEBUG("scripts", "Instance Stratholme: Cannot open slaugther square yet.");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ class instance_stratholme : public InstanceMapScript
|
||||
break;
|
||||
EncounterState[0] = data;
|
||||
events.ScheduleEvent(EVENT_BARON_RUN, 2700000);
|
||||
TC_LOG_DEBUG(LOG_FILTER_TSCR, "Instance Stratholme: Baron run in progress.");
|
||||
TC_LOG_DEBUG("scripts", "Instance Stratholme: Baron run in progress.");
|
||||
break;
|
||||
case FAIL:
|
||||
DoRemoveAurasDueToSpellOnPlayers(SPELL_BARON_ULTIMATUM);
|
||||
@@ -289,10 +289,10 @@ class instance_stratholme : public InstanceMapScript
|
||||
//UpdateGoState(ziggurat4GUID, 0, true);
|
||||
if (Creature* pBaron = instance->GetCreature(baronGUID))
|
||||
pBaron->SummonCreature(NPC_RAMSTEIN, 4032.84f, -3390.24f, 119.73f, 4.71f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 1800000);
|
||||
TC_LOG_DEBUG(LOG_FILTER_TSCR, "Instance Stratholme: Ramstein spawned.");
|
||||
TC_LOG_DEBUG("scripts", "Instance Stratholme: Ramstein spawned.");
|
||||
}
|
||||
else
|
||||
TC_LOG_DEBUG(LOG_FILTER_TSCR, "Instance Stratholme: %u Abomnation left to kill.", count);
|
||||
TC_LOG_DEBUG("scripts", "Instance Stratholme: %u Abomnation left to kill.", count);
|
||||
}
|
||||
|
||||
if (data == NOT_STARTED)
|
||||
@@ -301,7 +301,7 @@ class instance_stratholme : public InstanceMapScript
|
||||
if (data == DONE)
|
||||
{
|
||||
events.ScheduleEvent(EVENT_SLAUGHTER_SQUARE, 60000);
|
||||
TC_LOG_DEBUG(LOG_FILTER_TSCR, "Instance Stratholme: Slaugther event will continue in 1 minute.");
|
||||
TC_LOG_DEBUG("scripts", "Instance Stratholme: Slaugther event will continue in 1 minute.");
|
||||
}
|
||||
EncounterState[4] = data;
|
||||
break;
|
||||
@@ -437,7 +437,7 @@ class instance_stratholme : public InstanceMapScript
|
||||
case EVENT_BARON_RUN:
|
||||
if (GetData(TYPE_BARON_RUN) != DONE)
|
||||
SetData(TYPE_BARON_RUN, FAIL);
|
||||
TC_LOG_DEBUG(LOG_FILTER_TSCR, "Instance Stratholme: Baron run event reached end. Event has state %u.", GetData(TYPE_BARON_RUN));
|
||||
TC_LOG_DEBUG("scripts", "Instance Stratholme: Baron run event reached end. Event has state %u.", GetData(TYPE_BARON_RUN));
|
||||
break;
|
||||
case EVENT_SLAUGHTER_SQUARE:
|
||||
if (Creature* baron = instance->GetCreature(baronGUID))
|
||||
@@ -447,7 +447,7 @@ class instance_stratholme : public InstanceMapScript
|
||||
|
||||
HandleGameObject(ziggurat4GUID, true);
|
||||
HandleGameObject(ziggurat5GUID, true);
|
||||
TC_LOG_DEBUG(LOG_FILTER_TSCR, "Instance Stratholme: Black guard sentries spawned. Opening gates to baron.");
|
||||
TC_LOG_DEBUG("scripts", "Instance Stratholme: Black guard sentries spawned. Opening gates to baron.");
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
||||
@@ -167,7 +167,7 @@ public:
|
||||
else
|
||||
{
|
||||
//Madrigosa not found, end intro
|
||||
TC_LOG_ERROR(LOG_FILTER_TSCR, "Madrigosa was not found");
|
||||
TC_LOG_ERROR("scripts", "Madrigosa was not found");
|
||||
EndIntro();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -264,7 +264,7 @@ public:
|
||||
}
|
||||
else
|
||||
{
|
||||
TC_LOG_ERROR(LOG_FILTER_TSCR, "Didn't find Shathrowar. Kalecgos event reseted.");
|
||||
TC_LOG_ERROR("scripts", "Didn't find Shathrowar. Kalecgos event reseted.");
|
||||
EnterEvadeMode();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -748,7 +748,7 @@ public:
|
||||
if (pRandomPlayer)
|
||||
DoCast(pRandomPlayer, SPELL_LEGION_LIGHTNING, false);
|
||||
else
|
||||
TC_LOG_ERROR(LOG_FILTER_TSCR, "try to cast SPELL_LEGION_LIGHTNING on invalid target");
|
||||
TC_LOG_ERROR("scripts", "try to cast SPELL_LEGION_LIGHTNING on invalid target");
|
||||
|
||||
Timer[TIMER_LEGION_LIGHTNING] = (Phase == PHASE_SACRIFICE) ? 18000 : 30000; // 18 seconds in PHASE_SACRIFICE
|
||||
Timer[TIMER_SOUL_FLAY] = 2500;
|
||||
@@ -1406,7 +1406,7 @@ public:
|
||||
DoMeleeAttackIfReady();
|
||||
break;
|
||||
}
|
||||
TC_LOG_DEBUG(LOG_FILTER_TSCR, "Sinister-Timer");
|
||||
TC_LOG_DEBUG("scripts", "Sinister-Timer");
|
||||
for (uint8 i = 0; i < 3; ++i)
|
||||
uiTimer[i] -= diff;
|
||||
}
|
||||
|
||||
@@ -136,7 +136,7 @@ public:
|
||||
}
|
||||
}
|
||||
else
|
||||
TC_LOG_DEBUG(LOG_FILTER_TSCR, "Instance Sunwell Plateau: GetPlayerInMap, but PlayerList is empty!");
|
||||
TC_LOG_DEBUG("scripts", "Instance Sunwell Plateau: GetPlayerInMap, but PlayerList is empty!");
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user