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/EasternKingdoms/Karazhan/AttumenMidnight.cs
+2 -2
View File
@@ -177,12 +177,12 @@ namespace Scripts.EasternKingdoms.Karazhan.Midnight
_scheduler.Schedule(TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(25), task =>
{
Unit target = null;
var t_list = me.GetThreatManager().getThreatList();
var t_list = me.GetThreatManager().GetThreatList();
List<Unit> target_list = new List<Unit>();
foreach (var itr in t_list)
{
target = Global.ObjAccessor.GetUnit(me, itr.getUnitGuid());
target = Global.ObjAccessor.GetUnit(me, itr.GetUnitGuid());
if (target && !target.IsWithinDist(me, 8.00f, false) && target.IsWithinDist(me, 25.0f, false))
target_list.Add(target);
Source/Scripts/EasternKingdoms/Karazhan/OperaEvent.cs
+3 -3
View File
@@ -692,7 +692,7 @@ namespace Scripts.EasternKingdoms.Karazhan.OperaEvent
{
public npc_grandmother(Creature creature) : base(creature) { }
public override void sGossipSelect(Player player, uint menuId, uint gossipListId)
public override void GossipSelect(Player player, uint menuId, uint gossipListId)
{
if (menuId == RedRidingHood.OptionWhatPhatLewtsYouHave && gossipListId == 0)
{
@@ -1378,7 +1378,7 @@ namespace Scripts.EasternKingdoms.Karazhan.OperaEvent
{
public npc_barnes() : base("npc_barnes") { }
class npc_barnesAI : npc_escortAI
class npc_barnesAI : NpcEscortAI
{
public npc_barnesAI(Creature creature) : base(creature)
{
@@ -1518,7 +1518,7 @@ namespace Scripts.EasternKingdoms.Karazhan.OperaEvent
{
base.UpdateAI(diff);
if (HasEscortState(eEscortState.Paused))
if (HasEscortState(EscortState.Paused))
{
if (TalkTimer <= diff)
{
Source/Scripts/EasternKingdoms/ScarletEnclave/Chapter1.cs
+2 -2
View File
@@ -681,7 +681,7 @@ namespace Scripts.EasternKingdoms
{
public npc_salanar_the_horseman(Creature creature) : base(creature) { }
public override void sGossipSelect(Player player, uint menuId, uint gossipListId)
public override void GossipSelect(Player player, uint menuId, uint gossipListId)
{
if (menuId == MiscConst.GossipSalanarMenu && gossipListId == MiscConst.GossipSalanarOption)
{
@@ -939,7 +939,7 @@ namespace Scripts.EasternKingdoms
}
[Script]
class npc_scarlet_miner : npc_escortAI
class npc_scarlet_miner : NpcEscortAI
{
public npc_scarlet_miner(Creature creature) : base(creature)
{
Source/Scripts/Kalimdor/ZoneAshenvale.cs
+7 -7
View File
@@ -111,7 +111,7 @@ namespace Scripts.Kalimdor.ZoneAshenvale
[Script]
class npc_ruul_snowhoof : npc_escortAI
class npc_ruul_snowhoof : NpcEscortAI
{
public npc_ruul_snowhoof(Creature creature) : base(creature) { }
@@ -129,7 +129,7 @@ namespace Scripts.Kalimdor.ZoneAshenvale
summoned.GetAI().AttackStart(me);
}
public override void sQuestAccept(Player player, Quest quest)
public override void QuestAccept(Player player, Quest quest)
{
if (quest.Id == QuestIds.FreedomToRuul)
{
@@ -170,7 +170,7 @@ namespace Scripts.Kalimdor.ZoneAshenvale
}
[Script]
public class npc_muglash : npc_escortAI
public class npc_muglash : NpcEscortAI
{
public npc_muglash(Creature creature) : base(creature)
{
@@ -194,7 +194,7 @@ namespace Scripts.Kalimdor.ZoneAshenvale
Player player = GetPlayerForEscort();
if (player)
{
if (HasEscortState(eEscortState.Paused))
if (HasEscortState(EscortState.Paused))
{
if (Convert.ToBoolean(RandomHelper.URand(0, 1)))
Talk(TextIds.SayMugOnGuard, player);
@@ -205,7 +205,7 @@ namespace Scripts.Kalimdor.ZoneAshenvale
public override void JustDied(Unit killer)
{
if (HasEscortState(eEscortState.Escorting))
if (HasEscortState(EscortState.Escorting))
{
Player player = GetPlayerForEscort();
if (player)
@@ -218,7 +218,7 @@ namespace Scripts.Kalimdor.ZoneAshenvale
summoned.GetAI().AttackStart(me);
}
public override void sQuestAccept(Player player, Quest quest)
public override void QuestAccept(Player player, Quest quest)
{
if (quest.Id == QuestIds.Vorsha)
{
@@ -292,7 +292,7 @@ namespace Scripts.Kalimdor.ZoneAshenvale
if (!me.GetVictim())
{
if (HasEscortState(eEscortState.Paused) && _isBrazierExtinguished)
if (HasEscortState(EscortState.Paused) && _isBrazierExtinguished)
{
if (eventTimer < diff)
{
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)
{
Source/Scripts/Outlands/HellfirePeninsula.cs
+4 -4
View File
@@ -115,7 +115,7 @@ namespace Scripts.Outlands
}
[Script]
class npc_ancestral_wolf : npc_escortAI
class npc_ancestral_wolf : NpcEscortAI
{
public npc_ancestral_wolf(Creature creature) : base(creature)
{
@@ -167,7 +167,7 @@ namespace Scripts.Outlands
}
[Script]
class npc_wounded_blood_elf : npc_escortAI
class npc_wounded_blood_elf : NpcEscortAI
{
public npc_wounded_blood_elf(Creature creature) : base(creature) { }
@@ -175,7 +175,7 @@ namespace Scripts.Outlands
public override void EnterCombat(Unit who)
{
if (HasEscortState(eEscortState.Escorting))
if (HasEscortState(EscortState.Escorting))
Talk(SAY_ELF_AGGRO);
}
@@ -184,7 +184,7 @@ namespace Scripts.Outlands
summoned.GetAI().AttackStart(me);
}
public override void sQuestAccept(Player player, Quest quest)
public override void QuestAccept(Player player, Quest quest)
{
if (quest.Id == QUEST_ROAD_TO_FALCON_WATCH)
{
Source/Scripts/Outlands/Zangarmarsh.cs
+2 -2
View File
@@ -267,7 +267,7 @@ namespace Scripts.Outlands
{
public npc_kayra_longmane() : base("npc_kayra_longmane") { }
class npc_kayra_longmaneAI : npc_escortAI
class npc_kayra_longmaneAI : NpcEscortAI
{
public npc_kayra_longmaneAI(Creature creature) : base(creature) { }
@@ -312,7 +312,7 @@ namespace Scripts.Outlands
{
creature.GetAI().Talk(SAY_START, player);
npc_escortAI pEscortAI = (npc_kayra_longmaneAI)creature.GetAI();
NpcEscortAI pEscortAI = (npc_kayra_longmaneAI)creature.GetAI();
if (pEscortAI != null)
pEscortAI.Start(false, false, player.GetGUID());
}
Source/Scripts/Pets/Mage.cs
+6 -6
View File
@@ -71,17 +71,17 @@ namespace Scripts.Pets
continue;
}
// else compare best fit unit with current unit
var triggers = unit.GetThreatManager().getThreatList();
var triggers = unit.GetThreatManager().GetThreatList();
foreach (var reference in triggers)
{
// Try to find threat referenced to owner
if (reference.getTarget() == owner)
if (reference.GetTarget() == owner)
{
// Check if best fit hostile unit hs lower threat than this current unit
if (highestThreat < reference.getThreat())
if (highestThreat < reference.GetThreat())
{
// If so, update best fit unit
highestThreat = reference.getThreat();
highestThreat = reference.GetThreat();
highestThreatUnit = unit;
break;
}
@@ -120,11 +120,11 @@ namespace Scripts.Pets
// Consider only units without CC
if (!unit.HasBreakableByDamageCrowdControlAura(unit))
{
var triggers = unit.GetThreatManager().getThreatList();
var triggers = unit.GetThreatManager().GetThreatList();
foreach (var reference in triggers)
{
// Try to find threat referenced to owner
if (reference.getTarget() == owner)
if (reference.GetTarget() == owner)
return true;
}
}
Source/Scripts/Spells/Warlock.cs
+1 -1
View File
@@ -953,7 +953,7 @@ namespace Scripts.Spells.Warlock
Unit caster = GetCaster();
Unit target = GetHitUnit();
if (target)
if (target.CanHaveThreatList() && target.GetThreatManager().getThreat(caster) > 0.0f)
if (target.CanHaveThreatList() && target.GetThreatManager().GetThreat(caster) > 0.0f)
caster.CastSpell(target, SpellIds.Soulshatter, true);
}
Source/Scripts/World/NpcSpecial.cs
+3 -3
View File
@@ -1170,7 +1170,7 @@ namespace Scripts.World.NpcSpecial
}
[Script]
class npc_garments_of_quests : npc_escortAI
class npc_garments_of_quests : NpcEscortAI
{
public npc_garments_of_quests(Creature creature) : base(creature)
{
@@ -1582,7 +1582,7 @@ namespace Scripts.World.NpcSpecial
{
Unit unit = Global.ObjAccessor.GetUnit(me, pair.Key);
if (unit)
unit.GetHostileRefManager().deleteReference(me);
unit.GetHostileRefManager().DeleteReference(me);
_damageTimes.Remove(pair.Key);
}
@@ -2222,7 +2222,7 @@ namespace Scripts.World.NpcSpecial
});
}
public override void sGossipSelect(Player player, uint menuId, uint gossipListId)
public override void GossipSelect(Player player, uint menuId, uint gossipListId)
{
switch (gossipListId)
{