Misc fixes

This commit is contained in:
hondacrx
2021-12-22 20:23:48 -05:00
parent c38509222c
commit 8510f01035
6 changed files with 26 additions and 4 deletions
+13 -2
View File
@@ -50,12 +50,14 @@ namespace Framework.Constants
/// BattlePets Const /// BattlePets Const
/// </summary> /// </summary>
public const int MaxBattlePetSpeciesId = 3159; public const int MaxBattlePetSpeciesId = 3159;
public const int MaxPetBattleSlots = 3;
public const int DefaultMaxBattlePetsPerSpecies = 3; public const int DefaultMaxBattlePetsPerSpecies = 3;
public const int BattlePetCageItemId = 82800; public const int BattlePetCageItemId = 82800;
public const int DefaultSummonBattlePetSpell = 118301;
public const int SpellVisualUncagePet = 222; public const int SpellVisualUncagePet = 222;
public const int SpellBattlePetTraining = 125610;
public const int SpellReviveBattlePets = 125439;
public const int SpellSummonBattlePet = 118301;
/// <summary> /// <summary>
/// Lfg Const /// Lfg Const
/// </summary> /// </summary>
@@ -2912,6 +2914,15 @@ namespace Framework.Constants
DisplayOverridden = 0x100 DisplayOverridden = 0x100
} }
public enum BattlePetSlots
{
Slot0 = 0,
Slot1 = 1,
Slot2 = 2,
Count
}
public enum SceneType public enum SceneType
{ {
Normal = 0, Normal = 0,
+2 -2
View File
@@ -181,8 +181,8 @@ namespace Framework.Constants
FriendlyMissingBuff = 16, // Spellid, Radius, Repeatmin, Repeatmax FriendlyMissingBuff = 16, // Spellid, Radius, Repeatmin, Repeatmax
SummonedUnit = 17, // Creatureid(0 All), Cooldownmin, Cooldownmax SummonedUnit = 17, // Creatureid(0 All), Cooldownmin, Cooldownmax
TargetManaPct = 18, // Manamin%, Manamax%, Repeatmin, Repeatmax TargetManaPct = 18, // Manamin%, Manamax%, Repeatmin, Repeatmax
AcceptedQuest = 19, // Questid(0any) AcceptedQuest = 19, // QuestID (0 = any), CooldownMin, CooldownMax
RewardQuest = 20, // Questid(0any) RewardQuest = 20, // QuestID (0 = any), CooldownMin, CooldownMax
ReachedHome = 21, // None ReachedHome = 21, // None
ReceiveEmote = 22, // Emoteid, Cooldownmin, Cooldownmax, Condition, Val1, Val2, Val3 ReceiveEmote = 22, // Emoteid, Cooldownmin, Cooldownmax, Condition, Val1, Val2, Val3
HasAura = 23, // Param1 = Spellid, Param2 = Stack Amount, Param3/4 Repeatmin, Repeatmax HasAura = 23, // Param1 = Spellid, Param2 = Stack Amount, Param3/4 Repeatmin, Repeatmax
@@ -3026,6 +3026,7 @@ namespace Game.Entities
{ {
m_shouldReacquireTarget = false; m_shouldReacquireTarget = false;
m_suppressedTarget = ObjectGuid.Empty; m_suppressedTarget = ObjectGuid.Empty;
SetTarget(ObjectGuid.Empty);
m_suppressedOrientation = 0.0f; m_suppressedOrientation = 0.0f;
} }
+3
View File
@@ -68,6 +68,9 @@ namespace Game.Entities
// Register the pet for guid lookup // Register the pet for guid lookup
base.AddToWorld(); base.AddToWorld();
InitializeAI(); InitializeAI();
ZoneScript zoneScript = GetZoneScript() != null ? GetZoneScript() : GetInstanceScript();
if (zoneScript != null)
zoneScript.OnCreatureCreate(this);
} }
// Prevent stuck pets when zoning. Pets default to "follow" when added to world // Prevent stuck pets when zoning. Pets default to "follow" when added to world
+6
View File
@@ -4251,6 +4251,12 @@ namespace Game.Entities
spellInfo.ProcChance = 10; spellInfo.ProcChance = 10;
}); });
// Baron Rivendare (Stratholme) - Unholy Aura
ApplySpellFix(new [] { 17466, 17467 }, spellInfo =>
{
spellInfo.AttributesEx3 |= SpellAttr3.NoInitialAggro;
});
// //
// FIRELANDS SPELLS // FIRELANDS SPELLS
// //
+1
View File
@@ -404,6 +404,7 @@ namespace Game
{ {
Fine = 0, Fine = 0,
Fog = 1, // Used in some instance encounters. Fog = 1, // Used in some instance encounters.
Drizzle = 2,
LightRain = 3, LightRain = 3,
MediumRain = 4, MediumRain = 4,
HeavyRain = 5, HeavyRain = 5,