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

More refactoring of code.

Browse Source
This commit is contained in:
hondacrx
2019-09-23 21:41:13 -04:00
parent 2418715800
commit 570aebce26
176 changed files with 2261 additions and 2265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/Northrend/AzjolNerub/AzjolNerub/BossNadronox.cs
+2 -2
View File
@@ -182,10 +182,10 @@ namespace Scripts.Northrend.AzjolNerub.AzjolNerub.Nadronox
bool IsInCombatWithPlayer()
{
List<HostileReference> refs = me.GetThreatManager().getThreatList();
List<HostileReference> refs = me.GetThreatManager().GetThreatList();
foreach (HostileReference hostileRef in refs)
{
Unit target = hostileRef.getTarget();
Unit target = hostileRef.GetTarget();
if (target)
if (target.IsControlledByPlayer())
return true;
Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/GrandChampions.cs
+1 -1
View File
@@ -72,7 +72,7 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheChampion
}
[Script]
class generic_vehicleAI_toc5 : npc_escortAI
class generic_vehicleAI_toc5 : NpcEscortAI
{
public generic_vehicleAI_toc5(Creature creature) : base(creature)
{
Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/TrialOfTheCrusader.cs
+1 -1
View File
@@ -1313,7 +1313,7 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheCrusader
break;
case 400:
Talk(Texts.Stage_0_06);
me.GetThreatManager().clearReferences();
me.GetThreatManager().ClearReferences();
_updateTimer = 5 * Time.InMilliseconds;
_instance.SetData(DataTypes.Event, 0);
break;
Source/Scripts/Northrend/FrozenHalls/ForgeOfSouls/InstanceForgeOfSouls.cs
+2 -2
View File
@@ -220,7 +220,7 @@ namespace Scripts.Northrend.FrozenHalls.ForgeOfSouls
Initialize();
}
public override void sGossipSelect(Player player, uint menuId, uint gossipListId)
public override void GossipSelect(Player player, uint menuId, uint gossipListId)
{
if (menuId == Misc.MenuIdSylvanas && gossipListId == Misc.GossipOptionId)
{
@@ -304,7 +304,7 @@ namespace Scripts.Northrend.FrozenHalls.ForgeOfSouls
Initialize();
}
public override void sGossipSelect(Player player, uint menuId, uint gossipListId)
public override void GossipSelect(Player player, uint menuId, uint gossipListId)
{
if (menuId == Misc.MenuIdJaina && gossipListId == Misc.GossipOptionId)
{
Source/Scripts/Northrend/FrozenHalls/PitOfSaron/BossKrickAndIck.cs
+2 -2
View File
@@ -183,7 +183,7 @@ namespace Scripts.Northrend.FrozenHalls.PitOfSaron.BossKrickAndIck
if (!me.IsInCombat())
return;
if (!me.GetVictim() && me.GetThreatManager().isThreatListEmpty())
if (!me.GetVictim() && me.GetThreatManager().IsThreatListEmpty())
{
EnterEvadeMode(EvadeReason.NoHostiles);
return;
@@ -616,7 +616,7 @@ namespace Scripts.Northrend.FrozenHalls.PitOfSaron.BossKrickAndIck
{
ick.GetAI().Talk(TextIds.SayIckChase1, target);
ick.AddAura(GetSpellInfo().Id, target);
ick.GetAI<boss_ick>().SetTempThreat(ick.GetThreatManager().getThreat(target));
ick.GetAI<boss_ick>().SetTempThreat(ick.GetThreatManager().GetThreat(target));
ick.AddThreat(target, GetEffectValue());
target.AddThreat(ick, GetEffectValue());
}
Source/Scripts/Northrend/IcecrownCitadel/GunshipBattle.cs
+4 -4
View File
@@ -645,7 +645,7 @@ namespace Scripts.Northrend.IcecrownCitadel
AttackStart(victim);
return me.GetVictim();
}
else if (me.GetThreatManager().isThreatListEmpty())
else if (me.GetThreatManager().IsThreatListEmpty())
{
EnterEvadeMode(EvadeReason.Other);
return false;
@@ -955,7 +955,7 @@ namespace Scripts.Northrend.IcecrownCitadel
}
}
public override void sGossipSelect(Player player, uint menuId, uint gossipListId)
public override void GossipSelect(Player player, uint menuId, uint gossipListId)
{
me.RemoveNpcFlag(NPCFlags.Gossip);
me.GetTransport().EnableMovement(true);
@@ -1200,7 +1200,7 @@ namespace Scripts.Northrend.IcecrownCitadel
}
}
public override void sGossipSelect(Player player, uint menuId, uint gossipListId)
public override void GossipSelect(Player player, uint menuId, uint gossipListId)
{
me.RemoveNpcFlag(NPCFlags.Gossip);
me.GetTransport().EnableMovement(true);
@@ -1358,7 +1358,7 @@ namespace Scripts.Northrend.IcecrownCitadel
me.SetReactState(ReactStates.Passive);
}
public override void sGossipSelect(Player player, uint menuId, uint gossipListId)
public override void GossipSelect(Player player, uint menuId, uint gossipListId)
{
player.AddItem(GunshipMiscData.ItemGoblinRocketPack, 1);
player.PlayerTalkClass.SendCloseGossip();
Source/Scripts/Northrend/IcecrownCitadel/IcecrownCitadel.cs
+1 -1
View File
@@ -656,7 +656,7 @@ namespace Scripts.Northrend.IcecrownCitadel
}
[Script]
class npc_crok_scourgebane : npc_escortAI
class npc_crok_scourgebane : NpcEscortAI
{
public npc_crok_scourgebane(Creature creature) : base(creature)
{
Source/Scripts/Northrend/IcecrownCitadel/LadyDeathwhisper.cs
+2 -2
View File
@@ -380,7 +380,7 @@ namespace Scripts.Northrend.IcecrownCitadel
Group group = owner.GetGroup();
if (group)
{
for (GroupReference groupRefe = group.GetFirstMember(); groupRefe != null; groupRefe = groupRefe.next())
for (GroupReference groupRefe = group.GetFirstMember(); groupRefe != null; groupRefe = groupRefe.Next())
{
Player member = groupRefe.GetSource();
if (member)
@@ -857,7 +857,7 @@ namespace Scripts.Northrend.IcecrownCitadel
Group group = owner.GetGroup();
if (group)
{
for (GroupReference groupRefe = group.GetFirstMember(); groupRefe != null; groupRefe = groupRefe.next())
for (GroupReference groupRefe = group.GetFirstMember(); groupRefe != null; groupRefe = groupRefe.Next())
{
Player member = groupRefe.GetSource();
if (member)
Source/Scripts/Northrend/Nexus/EyeOfEternity/EyeOfEternity.cs
+2 -2
View File
@@ -235,7 +235,7 @@ namespace Scripts.Northrend.Nexus.EyeOfEternity
Creature malygos = instance.GetCreature(malygosGUID);
if (malygos)
{
var threatList = malygos.GetThreatManager().getThreatList();
var threatList = malygos.GetThreatManager().GetThreatList();
foreach (var guid in vortexTriggers)
{
if (threatList.Empty())
@@ -251,7 +251,7 @@ namespace Scripts.Northrend.Nexus.EyeOfEternity
if (counter >= 5)
break;
Unit target = refe.getTarget();
Unit target = refe.GetTarget();
if (target)
{
Player player = target.ToPlayer();
Source/Scripts/Northrend/Ulduar/FlameLeviathan.cs
+3 -3
View File
@@ -867,7 +867,7 @@ namespace Scripts.Northrend.Ulduar.FlameLeviathan
}
[Script]
class npc_mimirons_inferno : npc_escortAI
class npc_mimirons_inferno : NpcEscortAI
{
public npc_mimirons_inferno(Creature creature)
: base(creature)
@@ -893,7 +893,7 @@ namespace Scripts.Northrend.Ulduar.FlameLeviathan
{
base.UpdateAI(diff);
if (!HasEscortState(eEscortState.Escorting))
if (!HasEscortState(EscortState.Escorting))
Start(false, true, ObjectGuid.Empty, null, false, true);
else
{
@@ -1034,7 +1034,7 @@ namespace Scripts.Northrend.Ulduar.FlameLeviathan
}
}
public override void sGossipSelect(Player player, uint menuId, uint gossipListId)
public override void GossipSelect(Player player, uint menuId, uint gossipListId)
{
if (menuId == GossipIds.MenuLoreKeeper && gossipListId == GossipIds.OptionLoreKeeper)
{