Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Maps: Replaced spawnmask with difficulty list

Browse Source
This commit is contained in:
hondacrx
2018-09-17 12:08:48 -04:00
parent bc977cf274
commit 468b053946
29 changed files with 285 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/TrialOfTheCrusader.cs
+6 -6
View File
@@ -166,19 +166,19 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheCrusader
switch (go.GetEntry())
{
case GameObjectIds.CrusadersCache10:
if (instance.GetSpawnMode() == Difficulty.Raid10N)
if (instance.GetDifficultyID() == Difficulty.Raid10N)
CrusadersCacheGUID = go.GetGUID();
break;
case GameObjectIds.CrusadersCache25:
if (instance.GetSpawnMode() == Difficulty.Raid25N)
if (instance.GetDifficultyID() == Difficulty.Raid25N)
CrusadersCacheGUID = go.GetGUID();
break;
case GameObjectIds.CrusadersCache10H:
if (instance.GetSpawnMode() == Difficulty.Raid10HC)
if (instance.GetDifficultyID() == Difficulty.Raid10HC)
CrusadersCacheGUID = go.GetGUID();
break;
case GameObjectIds.CrusadersCache25H:
if (instance.GetSpawnMode() == Difficulty.Raid25HC)
if (instance.GetDifficultyID() == Difficulty.Raid25HC)
CrusadersCacheGUID = go.GetGUID();
break;
case GameObjectIds.ArgentColiseumFloor:
@@ -298,7 +298,7 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheCrusader
{
EventStage = 6000;
uint tributeChest = 0;
if (instance.GetSpawnMode() == Difficulty.Raid10HC)
if (instance.GetDifficultyID() == Difficulty.Raid10HC)
{
if (TrialCounter >= 50)
tributeChest = GameObjectIds.TributeChest10h99;
@@ -315,7 +315,7 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheCrusader
}
}
}
else if (instance.GetSpawnMode() == Difficulty.Raid25HC)
else if (instance.GetDifficultyID() == Difficulty.Raid25HC)
{
if (TrialCounter >= 50)
tributeChest = GameObjectIds.TributeChest25h99;
Source/Scripts/Northrend/IcecrownCitadel/InstanceIcecrownCitadel.cs
+3 -3
View File
@@ -362,7 +362,7 @@ namespace Scripts.Northrend.IcecrownCitadel
{
if (WeeklyQuestData[questIndex].creatureEntry == entry)
{
byte diffIndex = (byte)((int)instance.GetSpawnMode() & 1);
byte diffIndex = (byte)((int)instance.GetDifficultyID() & 1);
if (!Global.PoolMgr.IsSpawnedObject<Quest>(WeeklyQuestData[questIndex].questId[diffIndex]))
entry = 0;
break;
@@ -976,7 +976,7 @@ namespace Scripts.Northrend.IcecrownCitadel
case Bosses.ValithriaDreamwalker:
if (state == EncounterState.Done)
{
if (Global.PoolMgr.IsSpawnedObject<Quest>(WeeklyQuestData[8].questId[(int)instance.GetSpawnMode() & 1]))
if (Global.PoolMgr.IsSpawnedObject<Quest>(WeeklyQuestData[8].questId[(int)instance.GetDifficultyID() & 1]))
instance.SummonCreature(CreatureIds.ValithriaDreamwalkerQuest, ValithriaDreamwalker.ValithriaSpawnPos);
GameObject teleporter = instance.GetGameObject(TeleporterSindragosaGUID);
@@ -1106,7 +1106,7 @@ namespace Scripts.Northrend.IcecrownCitadel
break;
// 5 is the index of Blood Quickening
if (!Global.PoolMgr.IsSpawnedObject<Quest>(WeeklyQuestData[5].questId[(int)instance.GetSpawnMode() & 1]))
if (!Global.PoolMgr.IsSpawnedObject<Quest>(WeeklyQuestData[5].questId[(int)instance.GetDifficultyID() & 1]))
break;
switch ((EncounterState)data)
Source/Scripts/Northrend/IcecrownCitadel/LordMarrowgar.cs
+1 -1
View File
@@ -563,7 +563,7 @@ namespace Scripts.Northrend.IcecrownCitadel
if (marrowgar)
{
CreatureAI marrowgarAI = marrowgar.GetAI();
byte boneSpikeCount = (byte)(Convert.ToBoolean((int)GetCaster().GetMap().GetSpawnMode() & 1) ? 3 : 1);
byte boneSpikeCount = (byte)(Convert.ToBoolean((int)GetCaster().GetMap().GetDifficultyID() & 1) ? 3 : 1);
List<Unit> targets = marrowgarAI.SelectTargetList(new BoneSpikeTargetSelector(marrowgarAI), boneSpikeCount, SelectAggroTarget.Random);
if (targets.Empty())