Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 13:22:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '799bdc17105c566a705cb93b4f1d1813c23f2ba2' into 4.3.4

Browse Source 
Conflicts:
	sql/updates/world/2014_10_27_00_world.sql
	sql/updates/world/2014_10_27_01_world_335.sql
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
This commit is contained in:
Carbenium
2015-07-21 18:30:05 +02:00
parent 9f1d71a53f 799bdc1710
commit 68fd138476
10 changed files with 73 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/Commands/cs_ahbot.cpp
View File

@@ -146,11 +146,9 @@ public:
static bool HandleAHBotRebuildCommand(ChatHandler* /*handler*/, const char* args)
{
char* arg = strtok((char*)args, " ");
if (!arg)
return false;
bool all = false;
if (strcmp(arg, "all") == 0)
if (arg && strcmp(arg, "all") == 0)
all = true;
sAuctionBot->Rebuild(all);

24
src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
View File

@@ -78,6 +78,7 @@ class instance_ulduar : public InstanceMapScript
illusion = 0;
keepersCount = 0;
conSpeedAtory = false;
lumberjacked = false;
Unbroken = true;
IsDriveMeCrazyEligible = true;
_algalonSummoned = false;
@@ -102,6 +103,7 @@ class instance_ulduar : public InstanceMapScript
ObjectGuid ThorimGUID;
ObjectGuid FreyaGUID;
ObjectGuid ElderGUIDs[3];
ObjectGuid FreyaAchieveTriggerGUID;
ObjectGuid MimironGUID;
ObjectGuid MimironVehicleGUIDs[3];
ObjectGuid MimironComputerGUID;
@@ -141,6 +143,7 @@ class instance_ulduar : public InstanceMapScript
uint8 illusion;
uint8 keepersCount;
bool conSpeedAtory;
bool lumberjacked;
bool Unbroken;
bool IsDriveMeCrazyEligible;
@@ -321,7 +324,10 @@ class instance_ulduar : public InstanceMapScript
ElderGUIDs[2] = creature->GetGUID();
if (GetBossState(BOSS_FREYA) == DONE)
creature->DespawnOrUnsummon();
break;
break;
case NPC_FREYA_ACHIEVE_TRIGGER:
FreyaAchieveTriggerGUID = creature->GetGUID();
break;
// Mimiron
case NPC_MIMIRON:
@@ -606,6 +612,15 @@ class instance_ulduar : public InstanceMapScript
conSpeedAtory = true;
}
break;
case NPC_IRONBRANCH:
case NPC_STONEBARK:
case NPC_BRIGHTLEAF:
if (!lumberjacked)
{
DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, CRITERIA_LUMBERJACKED);
lumberjacked = true;
}
break;
default:
break;
}
@@ -669,6 +684,13 @@ class instance_ulduar : public InstanceMapScript
if (state == DONE)
instance->SummonCreature(NPC_FREYA_OBSERVATION_RING, ObservationRingKeepersPos[0]);
break;
case BOSS_IRONBRANCH:
case BOSS_STONEBARK:
case BOSS_BRIGHTLEAF:
if (GetBossState(BOSS_BRIGHTLEAF) == DONE && GetBossState(BOSS_IRONBRANCH) == DONE && GetBossState(BOSS_STONEBARK) == DONE && GetBossState(BOSS_FREYA) != DONE)
if (Creature* trigger = instance->GetCreature(FreyaAchieveTriggerGUID))
trigger->CastSpell(trigger, SPELL_LUMBERJACKED_CREDIT, true);
break;
case BOSS_KOLOGARN:
if (state == DONE)
{

5
src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
View File

@@ -129,6 +129,9 @@ enum UlduarNPCs
NPC_NATURES_BLADE = 33527,
NPC_GUARDIAN_OF_LIFE = 33528,
// Freya Achievement Trigger
NPC_FREYA_ACHIEVE_TRIGGER = 33406,
// Yogg-Saron
NPC_SARA = 33134,
NPC_GUARDIAN_OF_YOGG_SARON = 33136,
@@ -273,6 +276,7 @@ enum LeviathanActions
enum UlduarAchievementCriteriaIds
{
CRITERIA_CON_SPEED_ATORY = 21597,
CRITERIA_LUMBERJACKED = 21686,
CRITERIA_DISARMED = 21687,
CRITERIA_WAITS_DREAMING_STORMWIND_25 = 10321,
CRITERIA_WAITS_DREAMING_CHAMBER_25 = 10322,
@@ -362,6 +366,7 @@ enum UlduarAchievementData
DATA_UNBROKEN = 29052906, // 2905, 2906 are achievement IDs,
MAX_HERALD_ARMOR_ITEMLEVEL = 226,
MAX_HERALD_WEAPON_ITEMLEVEL = 232,
SPELL_LUMBERJACKED_CREDIT = 65296
};
enum UlduarEvents