Added Combat check option
This commit is contained in:
parent
618398720d
commit
1de1db66e4
@ -37,6 +37,15 @@ SwiftTravelForm.RequiredSpell = 0
|
|||||||
# SwiftTravelForm.MinLevel
|
# SwiftTravelForm.MinLevel
|
||||||
# Description: Sets the minimum level required to activate Swift Travel Form
|
# Description: Sets the minimum level required to activate Swift Travel Form
|
||||||
# Default: 60
|
# Default: 60
|
||||||
|
# 1-80
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
SwiftTravelForm.MinLevel = 60
|
SwiftTravelForm.MinLevel = 60
|
||||||
|
#
|
||||||
|
# SwiftTravelForm.NotInCombat
|
||||||
|
# Description: Blocks the speed increase when Travel Form is cast in combat
|
||||||
|
# Default: 1
|
||||||
|
# 1 for True, 0 for False
|
||||||
|
#
|
||||||
|
#
|
||||||
|
SwiftTravelForm.NotInCombat = 1
|
||||||
|
|||||||
@ -14,6 +14,7 @@ namespace
|
|||||||
uint32 sRequiredEquipId = 0;
|
uint32 sRequiredEquipId = 0;
|
||||||
uint32 sRequiredSpellId = 0;
|
uint32 sRequiredSpellId = 0;
|
||||||
uint32 sMinLevel = 60;
|
uint32 sMinLevel = 60;
|
||||||
|
bool sNotInCombat = true;
|
||||||
|
|
||||||
bool HasEquippedItem(Player* player, uint32 entry)
|
bool HasEquippedItem(Player* player, uint32 entry)
|
||||||
{
|
{
|
||||||
@ -45,6 +46,8 @@ namespace
|
|||||||
return false;
|
return false;
|
||||||
if (sRequiredSpellId && !player->HasSpell(sRequiredSpellId))
|
if (sRequiredSpellId && !player->HasSpell(sRequiredSpellId))
|
||||||
return false;
|
return false;
|
||||||
|
if (sNotInCombat && player->IsInCombat())
|
||||||
|
return false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -77,6 +80,7 @@ public:
|
|||||||
sRequiredEquipId = sConfigMgr->GetOption<uint32>("SwiftTravelForm.RequiredEquipment", 0u);
|
sRequiredEquipId = sConfigMgr->GetOption<uint32>("SwiftTravelForm.RequiredEquipment", 0u);
|
||||||
sRequiredSpellId = sConfigMgr->GetOption<uint32>("SwiftTravelForm.RequiredSpell", 0u);
|
sRequiredSpellId = sConfigMgr->GetOption<uint32>("SwiftTravelForm.RequiredSpell", 0u);
|
||||||
sMinLevel = sConfigMgr->GetOption<uint32>("SwiftTravelForm.MinLevel", 60u);
|
sMinLevel = sConfigMgr->GetOption<uint32>("SwiftTravelForm.MinLevel", 60u);
|
||||||
|
sNotInCombat = sConfigMgr->GetOption<bool>("SwiftTravelForm.NotInCombat", true);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -101,7 +105,7 @@ public:
|
|||||||
if (!RequirementsMet(player))
|
if (!RequirementsMet(player))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
player->m_Events.AddEvent(new SwiftTravelEvent(player, form), player->m_Events.CalculateTime(100));
|
player->m_Events.AddEvent(new SwiftTravelEvent(player, form), player->m_Events.CalculateTime(500));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user