pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-13 02:38:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

converted spell id's to integers and made the internal representation 322-bit

Browse Source
This commit is contained in:
dannuic
2026-04-26 23:53:57 -06:00
parent 05cb1921e8
commit 5de441fa20
134 changed files with 1644 additions and 1645 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/aa.cpp
+2 -2
View File
@@ -45,7 +45,7 @@
extern WorldServer worldserver;
extern QueryServ* QServ;
void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, uint32 duration_override, bool followme, bool sticktarg, uint16 *eye_id) {
void Mob::TemporaryPets(int32 spell_id, Mob *targ, const char *name_override, uint32 duration_override, bool followme, bool sticktarg, uint16 *eye_id) {
//It might not be a bad idea to put these into the database, eventually..
@@ -288,7 +288,7 @@ void Mob::TypesTemporaryPets(uint32 typesid, Mob *targ, const char *name_overrid
delete made_npc;
}
void Mob::WakeTheDead(uint16 spell_id, Corpse *corpse_to_use, Mob *tar, uint32 duration) {
void Mob::WakeTheDead(int32 spell_id, Corpse *corpse_to_use, Mob *tar, uint32 duration) {
/*
SPA 299 Wake The Dead, 'animateDead' should be temp pet, always spawns 1 pet from corpse, max value is duration
zone/aggro.cpp
+3 -3
View File
@@ -1348,7 +1348,7 @@ bool Mob::CheckPositioningLosFN(Mob* other, float x, float y, float z) {
}
//offensive spell aggro
int32 Mob::CheckAggroAmount(uint16 spell_id, Mob *target, bool is_proc)
int32 Mob::CheckAggroAmount(int32 spell_id, Mob *target, bool is_proc)
{
if (IsNoDetrimentalSpellAggroSpell(spell_id)) {
return 0;
@@ -1536,7 +1536,7 @@ int32 Mob::CheckAggroAmount(uint16 spell_id, Mob *target, bool is_proc)
}
//healing and buffing aggro
int32 Mob::CheckHealAggroAmount(uint16 spell_id, Mob *target, uint32 heal_possible)
int32 Mob::CheckHealAggroAmount(int32 spell_id, Mob *target, uint32 heal_possible)
{
int32 AggroAmount = 0;
auto target_level = target ? target->GetLevel() : 1;
@@ -1662,7 +1662,7 @@ bool Mob::IsOnFeignMemory(Mob *attacker) const
return feign_memory_list.find(attacker->GetID()) != feign_memory_list.end();
}
bool Mob::PassCharismaCheck(Mob* caster, uint16 spell_id) {
bool Mob::PassCharismaCheck(Mob* caster, int32 spell_id) {
/*
Charm formula is correct based on over 50 hours of personal live parsing - Kayen
zone/attack.cpp
+13 -13
View File
@@ -1774,7 +1774,7 @@ bool Mob::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
}
}
void Client::Damage(Mob* other, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special)
void Client::Damage(Mob* other, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special)
{
if (dead || IsCorpse())
return;
@@ -1811,7 +1811,7 @@ void Client::Damage(Mob* other, int64 damage, uint16 spell_id, EQ::skills::Skill
}
}
bool Client::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillType attack_skill, KilledByTypes killed_by, bool is_buff_tic)
bool Client::Death(Mob* killer_mob, int64 damage, int32 spell, EQ::skills::SkillType attack_skill, KilledByTypes killed_by, bool is_buff_tic)
{
if (!ClientFinishedLoading() || dead) {
return false;
@@ -2430,7 +2430,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
return has_hit;
}
void NPC::Damage(Mob* other, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) {
void NPC::Damage(Mob* other, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) {
if (spell_id == 0)
spell_id = SPELL_UNKNOWN;
@@ -2467,7 +2467,7 @@ void NPC::Damage(Mob* other, int64 damage, uint16 spell_id, EQ::skills::SkillTyp
CommonDamage(other, damage, spell_id, attack_skill, avoidable, buffslot, iBuffTic, special);
}
bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillType attack_skill, KilledByTypes killed_by, bool is_buff_tic)
bool NPC::Death(Mob* killer_mob, int64 damage, int32 spell, EQ::skills::SkillType attack_skill, KilledByTypes killed_by, bool is_buff_tic)
{
LogCombat(
"Fatal blow dealt by [{}] with [{}] damage, spell [{}], skill [{}]",
@@ -3051,7 +3051,7 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy
return true;
}
void Mob::AddToHateList(Mob* other, int64 hate /*= 0*/, int64 damage /*= 0*/, bool iYellForHelp /*= true*/, bool bFrenzy /*= false*/, bool iBuffTic /*= false*/, uint16 spell_id, bool pet_command)
void Mob::AddToHateList(Mob* other, int64 hate /*= 0*/, int64 damage /*= 0*/, bool iYellForHelp /*= true*/, bool bFrenzy /*= false*/, bool iBuffTic /*= false*/, int32 spell_id, bool pet_command)
{
if (!other)
return;
@@ -3312,7 +3312,7 @@ void Mob::DamageShield(Mob* attacker, bool spell_ds) {
int DS = 0;
int rev_ds = 0;
uint16 spellid = 0;
int32 spellid = 0;
if (!spell_ds)
{
@@ -3388,7 +3388,7 @@ void Mob::DamageShield(Mob* attacker, bool spell_ds) {
//Reverse DS
//this is basically a DS, but the spell is on the attacker, not the attackee
//if we've gotten to this point, we know we know "attacker" hit "this" (us) for damage & we aren't invulnerable
uint16 rev_ds_spell_id = SPELL_UNKNOWN;
int32 rev_ds_spell_id = SPELL_UNKNOWN;
if (IsValidSpell(spellbonuses.ReverseDamageShieldSpellID)) {
rev_ds_spell_id = spellbonuses.ReverseDamageShieldSpellID;
@@ -3676,7 +3676,7 @@ int64 Mob::ReduceDamage(int64 damage)
return(damage);
}
int64 Mob::AffectMagicalDamage(int64 damage, uint16 spell_id, const bool iBuffTic, Mob* attacker)
int64 Mob::AffectMagicalDamage(int64 damage, int32 spell_id, const bool iBuffTic, Mob* attacker)
{
if (damage <= 0)
return damage;
@@ -4020,7 +4020,7 @@ bool Mob::CheckDoubleAttack()
return zone->random.Int(1, 500) <= chance;
}
void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, const EQ::skills::SkillType skill_used, bool &avoidable, const int8 buffslot, const bool iBuffTic, eSpecialAttacks special) {
void Mob::CommonDamage(Mob* attacker, int64 &damage, const int32 spell_id, const EQ::skills::SkillType skill_used, bool &avoidable, const int8 buffslot, const bool iBuffTic, eSpecialAttacks special) {
#ifdef LUA_EQEMU
int64 lua_ret = 0;
bool ignore_default = false;
@@ -4776,7 +4776,7 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons
}
}
void Mob::HealDamage(uint64 amount, Mob* caster, uint16 spell_id)
void Mob::HealDamage(uint64 amount, Mob* caster, int32 spell_id)
{
#ifdef LUA_EQEMU
uint64 lua_ret = 0;
@@ -5266,7 +5266,7 @@ void Mob::TrySpellProc(const EQ::ItemInstance *inst, const EQ::ItemData *weapon,
if (poison_slot > -1) {
bool one_shot = !RuleB(Combat, UseExtendedPoisonProcs);
float chance = (one_shot) ? 100.0f : ProcChance * (static_cast<float>(SpellProcs[poison_slot].chance) / 100.0f);
uint16 spell_id = SpellProcs[poison_slot].spellID;
int32 spell_id = SpellProcs[poison_slot].spellID;
if (zone->random.Roll(chance)) {
LogCombat("Poison proc [{}] procing spell [{}] ([{}] percent chance)", poison_slot, spell_id, chance);
@@ -5986,8 +5986,8 @@ void Mob::TrySkillProc(Mob *on, EQ::skills::SkillType skill, uint16 ReuseTime, b
*/
bool CanProc = true;
uint16 base_spell_id = 0;
uint16 proc_spell_id = 0;
int32 base_spell_id = 0;
int32 proc_spell_id = 0;
float ProcMod = 0;
float chance = 0;
zone/aura.cpp
+2 -2
View File
@@ -871,7 +871,7 @@ void Aura::Depop(bool skip_strip)
p_depop = true;
}
void Mob::MakeAura(uint16 spell_id)
void Mob::MakeAura(int32 spell_id)
{
// TODO: verify room in AuraMgr
if (!IsValidSpell(spell_id)) {
@@ -944,7 +944,7 @@ void Mob::MakeAura(uint16 spell_id)
}
}
bool ZoneDatabase::GetAuraEntry(uint16 spell_id, AuraRecord& r)
bool ZoneDatabase::GetAuraEntry(int32 spell_id, AuraRecord& r)
{
const auto& l = AurasRepository::GetWhere(
*this,
zone/beacon.cpp
+1 -1
View File
@@ -148,7 +148,7 @@ bool Beacon::Process()
return true;
}
void Beacon::AELocationSpell(Mob *caster, uint16 cast_spell_id, int16 in_resist_adjust)
void Beacon::AELocationSpell(Mob *caster, int32 cast_spell_id, int16 in_resist_adjust)
{
if (!IsValidSpell(cast_spell_id) || !caster) {
return;
zone/beacon.h
+4 -4
View File
@@ -32,8 +32,8 @@ public:
~Beacon();
//abstract virtual function implementations requird by base abstract class
virtual bool Death(Mob* killer_mob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false) { return true; }
virtual void Damage(Mob* from, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) { return; }
virtual bool Death(Mob* killer_mob, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false) { return true; }
virtual void Damage(Mob* from, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) { return; }
virtual bool HasRaid() { return false; }
virtual bool HasGroup() { return false; }
virtual Raid* GetRaid() { return 0; }
@@ -44,13 +44,13 @@ public:
bool IsBeacon() const { return true; }
bool Process();
virtual void Depop(bool not_used = true) { remove_me = true; }
void AELocationSpell(Mob *caster, uint16 cast_spell_id, int16 in_resist_adjust);
void AELocationSpell(Mob *caster, int32 cast_spell_id, int16 in_resist_adjust);
protected:
Timer remove_timer;
bool remove_me;
uint16 spell_id;
int32 spell_id;
int16 resist_adjust;
int spell_iterations;
Timer spell_timer;
zone/bonuses.cpp
+3 -3
View File
@@ -1851,7 +1851,7 @@ void Mob::CalcSpellBonuses(StatBonuses* newbon)
newbon->ManaRegen = 0; // Bards do not get mana regen from spells.
}
void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *new_bonus, uint16 casterId,
void Mob::ApplySpellsBonuses(int32 spell_id, uint8 casterlevel, StatBonuses *new_bonus, uint16 casterId,
uint8 WornType, int32 ticsremaining, int buffslot, int instrument_mod,
bool IsAISpellEffect, uint16 effect_id, int32 se_base, int32 se_limit, int32 se_max)
{
@@ -4108,7 +4108,7 @@ bool Client::DoItemEnterZone(uint32 slot_x, uint32 slot_y) {
return changed;
}
uint8 Mob::IsFocusEffect(uint16 spell_id,int effect_index, bool AA,uint32 aa_effect)
uint8 Mob::IsFocusEffect(int32 spell_id,int effect_index, bool AA,uint32 aa_effect)
{
uint16 effect = 0;
@@ -4212,7 +4212,7 @@ uint8 Mob::IsFocusEffect(uint16 spell_id,int effect_index, bool AA,uint32 aa_eff
return 0;
}
void Mob::NegateSpellEffectBonuses(uint16 spell_id)
void Mob::NegateSpellEffectBonuses(int32 spell_id)
{
if (!IsValidSpell(spell_id))
return;
zone/bot.cpp
+55 -55
View File
@@ -509,7 +509,7 @@ void Bot::SetBotID(uint32 botID) {
npctype_id = botID;
}
void Bot::SetBotSpellID(uint32 newSpellID) {
void Bot::SetBotSpellID(int32 newSpellID) {
npc_spells_id = newSpellID;
}
@@ -1542,7 +1542,7 @@ bool Bot::LoadPet()
if (!pet_index)
return true;
uint32 saved_pet_spell_id = 0;
int32 saved_pet_spell_id = 0;
database.botdb.LoadPetSpellID(GetBotID(), saved_pet_spell_id);
if (!IsValidSpell(saved_pet_spell_id)) {
@@ -1554,7 +1554,7 @@ bool Bot::LoadPet()
std::string pet_name;
uint32 pet_mana = 0;
uint32 pet_hp = 0;
uint32 pet_spell_id = 0;
int32 pet_spell_id = 0;
if (!database.botdb.LoadPetStats(GetBotID(), pet_name, pet_mana, pet_hp, pet_spell_id)) {
return false;
@@ -2321,7 +2321,7 @@ void Bot::AI_Process()
}
if (!at_combat_range && RuleB(Bots, UseSpellPulling)) {
uint16 pull_spell_id = RuleI(Bots, PullSpellID);
int32 pull_spell_id = RuleI(Bots, PullSpellID);
if (IsValidSpell(pull_spell_id) && tar_distance <= spells[pull_spell_id].range) {
at_combat_range = true;
@@ -2363,7 +2363,7 @@ void Bot::AI_Process()
}
if (RuleB(Bots, UseSpellPulling)) {
uint16 pull_spell_id = RuleI(Bots, PullSpellID);
int32 pull_spell_id = RuleI(Bots, PullSpellID);
if (IsValidSpell(pull_spell_id) && tar_distance <= spells[pull_spell_id].range) {
StopMoving(CalculateHeadingToTarget(tar->GetX(), tar->GetY()));
@@ -4920,7 +4920,7 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client*
}
}
bool Bot::Death(Mob *killer_mob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by, bool is_buff_tic)
bool Bot::Death(Mob *killer_mob, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by, bool is_buff_tic)
{
if (!NPC::Death(killer_mob, damage, spell_id, attack_skill)) {
return false;
@@ -4966,7 +4966,7 @@ bool Bot::Death(Mob *killer_mob, int64 damage, uint16 spell_id, EQ::skills::Skil
return true;
}
void Bot::Damage(Mob *from, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) {
void Bot::Damage(Mob *from, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special) {
if (!from) {
return;
}
@@ -5598,7 +5598,7 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) {
classattack_timer.Start(reuse / HasteModifier);
}
void Bot::MakePet(uint16 spell_id, const char* pettype, const char *petname) {
void Bot::MakePet(int32 spell_id, const char* pettype, const char *petname) {
Mob::MakePet(spell_id, pettype, petname);
}
@@ -5800,7 +5800,7 @@ void Bot::SetAttackTimer() {
}
}
int32 Bot::GetActSpellDuration(uint16 spell_id, int32 duration) {
int32 Bot::GetActSpellDuration(int32 spell_id, int32 duration) {
int increase = 100;
increase += GetFocusEffect(focusSpellDuration, spell_id);
int64 tic_inc = 0;
@@ -5832,7 +5832,7 @@ int32 Bot::GetActSpellDuration(uint16 spell_id, int32 duration) {
return (((duration * increase) / 100) + tic_inc);
}
float Bot::GetAOERange(uint16 spell_id) {
float Bot::GetAOERange(int32 spell_id) {
float range;
range = spells[spell_id].aoe_range;
if (range == 0)
@@ -5849,7 +5849,7 @@ float Bot::GetAOERange(uint16 spell_id) {
return range;
}
bool Bot::SpellEffect(Mob* caster, uint16 spell_id, float partial) {
bool Bot::SpellEffect(Mob* caster, int32 spell_id, float partial) {
bool Result = false;
Result = Mob::SpellEffect(caster, spell_id, partial);
if (IsGrouped()) {
@@ -5871,7 +5871,7 @@ void Bot::DoBuffTic(const Buffs_Struct &buff, int slot, Mob* caster) {
}
bool Bot::CastSpell(
uint16 spell_id,
int32 spell_id,
uint16 target_id,
EQ::spells::CastingSlot slot,
int32 cast_time,
@@ -5951,7 +5951,7 @@ bool Bot::CastSpell(
}
bool Bot::SpellOnTarget(
uint16 spell_id,
int32 spell_id,
Mob *spelltar,
int reflect_effectiveness,
bool use_resist_adjust,
@@ -5988,7 +5988,7 @@ bool Bot::SpellOnTarget(
return false;
}
bool Bot::IsImmuneToSpell(uint16 spell_id, Mob *caster) {
bool Bot::IsImmuneToSpell(int32 spell_id, Mob *caster) {
bool Result = false;
if (!caster)
return false;
@@ -6018,7 +6018,7 @@ bool Bot::IsImmuneToSpell(uint16 spell_id, Mob *caster) {
return Result;
}
bool Bot::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction, EQ::spells::CastingSlot slot) {
bool Bot::DetermineSpellTargets(int32 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction, EQ::spells::CastingSlot slot) {
bool Result = false;
SpellTargetType target_type = spells[spell_id].target_type;
@@ -6034,7 +6034,7 @@ bool Bot::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
return Result;
}
bool Bot::DoCastSpell(uint16 spell_id, uint16 target_id, EQ::spells::CastingSlot slot, int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, uint32 item_slot, uint32 aa_id) {
bool Bot::DoCastSpell(int32 spell_id, uint16 target_id, EQ::spells::CastingSlot slot, int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, uint32 item_slot, uint32 aa_id) {
bool Result = false;
if (GetClass() == Class::Bard)
cast_time = 0;
@@ -6158,7 +6158,7 @@ void Bot::GenerateSpecialAttacks() {
SetSpecialAbility(SpecialAbility::TripleAttack, 1);
}
bool Bot::DoFinishedSpellSingleTarget(uint16 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool& stopLogic) {
bool Bot::DoFinishedSpellSingleTarget(int32 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool& stopLogic) {
if (
spellTarget &&
@@ -6252,7 +6252,7 @@ bool Bot::DoFinishedSpellSingleTarget(uint16 spell_id, Mob* spellTarget, EQ::spe
return true;
}
bool Bot::DoFinishedSpellGroupTarget(uint16 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool& stopLogic) {
bool Bot::DoFinishedSpellGroupTarget(int32 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool& stopLogic) {
bool isMainGroupMGB = false;
if (isMainGroupMGB && (GetClass() != Class::Bard)) {
@@ -7688,7 +7688,7 @@ void EntityList::ShowSpawnWindow(Client* client, int Distance, bool NamedOnly) {
return;
}
uint8 Bot::GetNumberNeedingHealedInGroup(Mob* tar, uint16 spell_type, uint16 spell_id, float range) {
uint8 Bot::GetNumberNeedingHealedInGroup(Mob* tar, uint16 spell_type, int32 spell_id, float range) {
if (!TargetValidation(tar)) {
return 0;
}
@@ -7871,7 +7871,7 @@ bool Bot::GetNeedsHateRedux(Mob *tar) {
return false;
}
bool Bot::HasOrMayGetAggro(bool sit_aggro, uint32 spell_id) {
bool Bot::HasOrMayGetAggro(bool sit_aggro, int32 spell_id) {
if (
!GetTarget() ||
!GetTarget()->GetHateTop()
@@ -7950,7 +7950,7 @@ void Bot::RaidGroupSay(const char* msg, ...) {
}
}
bool Bot::UseDiscipline(uint32 spell_id, uint32 target) {
bool Bot::UseDiscipline(int32 spell_id, uint32 target) {
if (!IsValidSpell(spell_id)) {
RaidGroupSay("Not a valid spell.");
return false;
@@ -8270,7 +8270,7 @@ void Bot::SetBotEnforceSpellSetting(bool enforceSpellSettings)
AI_AddBotSpells(GetBotSpellID());
}
bool Bot::AddBotSpellSetting(uint16 spell_id, BotSpellSetting* bs)
bool Bot::AddBotSpellSetting(int32 spell_id, BotSpellSetting* bs)
{
if (!IsValidSpell(spell_id) || !bs) {
return false;
@@ -8300,7 +8300,7 @@ bool Bot::AddBotSpellSetting(uint16 spell_id, BotSpellSetting* bs)
return true;
}
bool Bot::DeleteBotSpellSetting(uint16 spell_id)
bool Bot::DeleteBotSpellSetting(int32 spell_id)
{
if (!IsValidSpell(spell_id)) {
return false;
@@ -8323,7 +8323,7 @@ bool Bot::DeleteBotSpellSetting(uint16 spell_id)
return true;
}
BotSpellSetting* Bot::GetBotSpellSetting(uint16 spell_id)
BotSpellSetting* Bot::GetBotSpellSetting(int32 spell_id)
{
if (!IsValidSpell(spell_id) || !bot_spell_settings.count(spell_id)) {
return nullptr;
@@ -8464,7 +8464,7 @@ void Bot::LoadBotSpellSettings()
}
}
bool Bot::UpdateBotSpellSetting(uint16 spell_id, BotSpellSetting* bs)
bool Bot::UpdateBotSpellSetting(int32 spell_id, BotSpellSetting* bs)
{
if (!IsValidSpell(spell_id) || !bs) {
return false;
@@ -8669,7 +8669,7 @@ int32 Bot::GetRawItemAC()
return Total;
}
void Bot::SendSpellAnim(uint16 target_id, uint16 spell_id)
void Bot::SendSpellAnim(uint16 target_id, int32 spell_id)
{
if (!target_id || !IsValidSpell(spell_id)) {
return;
@@ -8866,7 +8866,7 @@ void Bot::AddBotStartingItems(uint16 race_id, uint8 class_id)
}
}
void Bot::SetSpellRecastTimer(uint16 spell_id, int32 recast_delay) {
void Bot::SetSpellRecastTimer(int32 spell_id, int32 recast_delay) {
if (!IsValidSpell(spell_id)) {
OwnerMessage("Failed to set spell recast timer.");
return;
@@ -8911,7 +8911,7 @@ void Bot::SetSpellRecastTimer(uint16 spell_id, int32 recast_delay) {
}
}
uint32 Bot::GetSpellRecastTimer(uint16 spell_id)
uint32 Bot::GetSpellRecastTimer(int32 spell_id)
{
uint32 result = 0;
@@ -8944,7 +8944,7 @@ uint32 Bot::GetSpellRecastTimer(uint16 spell_id)
return result;
}
uint32 Bot::GetSpellRecastRemainingTime(uint16 spell_id)
uint32 Bot::GetSpellRecastRemainingTime(int32 spell_id)
{
uint32 result = 0;
@@ -8955,7 +8955,7 @@ uint32 Bot::GetSpellRecastRemainingTime(uint16 spell_id)
return result;
}
bool Bot::CheckSpellRecastTimer(uint16 spell_id)
bool Bot::CheckSpellRecastTimer(int32 spell_id)
{
ClearExpiredTimers();
@@ -8971,7 +8971,7 @@ bool Bot::CheckSpellRecastTimer(uint16 spell_id)
return false;
}
void Bot::SetDisciplineReuseTimer(uint16 spell_id, int32 reuse_timer)
void Bot::SetDisciplineReuseTimer(int32 spell_id, int32 reuse_timer)
{
if (!IsValidSpell(spell_id)) {
OwnerMessage("Failed to set discipline reuse timer.");
@@ -9017,7 +9017,7 @@ void Bot::SetDisciplineReuseTimer(uint16 spell_id, int32 reuse_timer)
}
}
uint32 Bot::GetDisciplineReuseTimer(uint16 spell_id)
uint32 Bot::GetDisciplineReuseTimer(int32 spell_id)
{
uint32 result = 0;
@@ -9045,7 +9045,7 @@ uint32 Bot::GetDisciplineReuseTimer(uint16 spell_id)
return result;
}
uint32 Bot::GetDisciplineReuseRemainingTime(uint16 spell_id) {
uint32 Bot::GetDisciplineReuseRemainingTime(int32 spell_id) {
uint32 result = 0;
if (GetDisciplineReuseTimer(spell_id) > Timer::GetCurrentTime()) {
@@ -9055,7 +9055,7 @@ uint32 Bot::GetDisciplineReuseRemainingTime(uint16 spell_id) {
return result;
}
bool Bot::CheckDisciplineReuseTimer(uint16 spell_id)
bool Bot::CheckDisciplineReuseTimer(int32 spell_id)
{
ClearExpiredTimers();
@@ -9189,7 +9189,7 @@ uint32 Bot::GetItemReuseRemainingTime(uint32 item_id)
return result;
}
uint32 Bot::CalcSpellRecastTimer(uint16 spell_id)
uint32 Bot::CalcSpellRecastTimer(int32 spell_id)
{
uint32 result = 0;
@@ -9206,7 +9206,7 @@ uint32 Bot::CalcSpellRecastTimer(uint16 spell_id)
return result;
}
void Bot::ClearDisciplineReuseTimer(uint16 spell_id)
void Bot::ClearDisciplineReuseTimer(int32 spell_id)
{
if (spell_id && !IsValidSpell(spell_id)) {
OwnerMessage(
@@ -9283,7 +9283,7 @@ void Bot::ClearItemReuseTimer(uint32 item_id)
ClearExpiredTimers();
}
void Bot::ClearSpellRecastTimer(uint16 spell_id)
void Bot::ClearSpellRecastTimer(int32 spell_id)
{
if (spell_id && !IsValidSpell(spell_id)) {
OwnerMessage(
@@ -9546,7 +9546,7 @@ bool Bot::PrecastChecks(Mob* tar, uint16 spell_type) {
return true;
}
bool Bot::CastChecks(uint16 spell_id, Mob* tar, uint16 spell_type, bool prechecks, bool ae_check) {
bool Bot::CastChecks(int32 spell_id, Mob* tar, uint16 spell_type, bool prechecks, bool ae_check) {
if (prechecks) {
if (!tar || tar->GetAppearance() == eaDead || tar->GetHP() < 0) {
LogBotSpellChecksDetail("{} says, 'Cancelling cast due to CastChecks !tar.'", GetCleanName());
@@ -9866,7 +9866,7 @@ bool Bot::CastChecks(uint16 spell_id, Mob* tar, uint16 spell_type, bool precheck
return true;
}
bool Bot::CanCastSpellType(uint16 spell_type, uint16 spell_id, Mob* tar) {
bool Bot::CanCastSpellType(uint16 spell_type, int32 spell_id, Mob* tar) {
if (!spell_id || !tar) {
LogBotSpellChecksDetail("{} says, 'Cancelling cast of {} on {} due to failsafe checks.'", GetCleanName(), (spell_id ? GetSpellName(spell_id) : (spell_type ? GetSpellTypeNameByID(spell_type) : "Unknown")), (tar ? tar->GetCleanName() : "Unknown"));
return false;
@@ -10081,7 +10081,7 @@ bool Bot::CanCastSpellType(uint16 spell_type, uint16 spell_id, Mob* tar) {
return true;
}
bool Bot::BotHasEnoughMana(uint16 spell_id) {
bool Bot::BotHasEnoughMana(int32 spell_id) {
if (!IsValidSpell(spell_id)) {
return false;
}
@@ -10095,7 +10095,7 @@ bool Bot::BotHasEnoughMana(uint16 spell_id) {
return true;
}
bool Bot::IsTargetAlreadyReceivingSpell(Mob* tar, uint16 spell_id) {
bool Bot::IsTargetAlreadyReceivingSpell(Mob* tar, int32 spell_id) {
if (!tar || !spell_id) {
return true;
}
@@ -10126,7 +10126,7 @@ bool Bot::IsTargetAlreadyReceivingSpell(Mob* tar, uint16 spell_id) {
return false;
}
bool Bot::DoResistCheck(Mob* tar, uint16 spell_id, int32 resist_limit) {
bool Bot::DoResistCheck(Mob* tar, int32 spell_id, int32 resist_limit) {
if (!tar || spell_id == 0) {
return false;
@@ -10173,7 +10173,7 @@ bool Bot::DoResistCheck(Mob* tar, uint16 spell_id, int32 resist_limit) {
return true;
}
bool Bot::DoResistCheckBySpellType(Mob* tar, uint16 spell_id, uint16 spell_type) {
bool Bot::DoResistCheckBySpellType(Mob* tar, int32 spell_id, uint16 spell_type) {
if (!tar || !IsValidSpell(spell_id)) {
return false;
}
@@ -10185,7 +10185,7 @@ bool Bot::DoResistCheckBySpellType(Mob* tar, uint16 spell_id, uint16 spell_type)
return DoResistCheck(tar, spell_id, GetSpellTypeResistLimit(spell_type));
}
bool Bot::IsValidTargetType(uint16 spell_id, int target_type, uint8 body_type) {
bool Bot::IsValidTargetType(int32 spell_id, int target_type, uint8 body_type) {
if (!spell_id) {
return false;
}
@@ -10294,7 +10294,7 @@ bool Bot::IsMobEngagedByAnyone(Mob* tar) {
return false;
}
bool Bot::IsValidMezTarget(Mob* owner, Mob* npc, uint16 spell_id) {
bool Bot::IsValidMezTarget(Mob* owner, Mob* npc, int32 spell_id) {
if (npc->GetSpecialAbility(SpecialAbility::MesmerizeImmunity)) {
return false;
}
@@ -11326,7 +11326,7 @@ bool Bot::AttemptAICastSpell(uint16 spell_type, Mob* tar) {
return result;
}
bool Bot::AttemptAACastSpell(Mob* tar, uint16 spell_id, AA::Rank* rank) {
bool Bot::AttemptAACastSpell(Mob* tar, int32 spell_id, AA::Rank* rank) {
if (!IsValidSpell(spell_id)) {
return false;
}
@@ -11431,7 +11431,7 @@ bool Bot::AttemptAACastSpell(Mob* tar, uint16 spell_id, AA::Rank* rank) {
return true;
}
bool Bot::AttemptForcedCastSpell(Mob* tar, uint16 spell_id, bool is_disc) {
bool Bot::AttemptForcedCastSpell(Mob* tar, int32 spell_id, bool is_disc) {
if (!IsValidSpell(spell_id)) {
return false;
}
@@ -11636,7 +11636,7 @@ bool Bot::IsValidBotSpellType(uint16 spell_type) {
);
}
bool Bot::IsValidSpellTypeBySpellID(uint16 spell_type, uint16 spell_id) {
bool Bot::IsValidSpellTypeBySpellID(uint16 spell_type, int32 spell_id) {
if (IsAEBotSpellType(spell_type) && !IsAnyAESpell(spell_id)) {
return false;
}
@@ -12249,7 +12249,7 @@ bool Bot::HasRequiredLoSForPositioning(Mob* tar) {
return true;
}
bool Bot::HasValidAETarget(Bot* caster, uint16 spell_id, uint16 spell_type, Mob* tar) {
bool Bot::HasValidAETarget(Bot* caster, int32 spell_id, uint16 spell_type, Mob* tar) {
int spell_range = caster->GetActSpellRange(spell_id, spells[spell_id].range);
int spell_ae_range = caster->GetAOERange(spell_id);
int target_count = 0;
@@ -12474,7 +12474,7 @@ bool Bot::ValidStateCheck(Mob* other, bool same_raid_group) {
return true;
}
bool Bot::IsValidSpellTypeSubType(uint16 spell_type, uint16 sub_type, uint16 spell_id) {
bool Bot::IsValidSpellTypeSubType(uint16 spell_type, uint16 sub_type, int32 spell_id) {
if (sub_type == UINT16_MAX) {
return true;
}
@@ -12586,8 +12586,8 @@ bool Bot::IsValidSpellTypeSubType(uint16 spell_type, uint16 sub_type, uint16 spe
return false;
}
uint16 Bot::GetSpellByAA(int id, AA::Rank*& rank) {
uint16 spell_id = 0;
int32 Bot::GetSpellByAA(int id, AA::Rank*& rank) {
int32 spell_id = 0;
std::pair<AA::Ability*, AA::Rank*> aa_ability = std::make_pair(nullptr, nullptr);
AA::Ability* ability = zone->GetAlternateAdvancementAbility(id);
@@ -12612,7 +12612,7 @@ uint16 Bot::GetSpellByAA(int id, AA::Rank*& rank) {
return spell_id;
}
void Bot::SetBotBlockedBuff(uint16 spell_id, bool block)
void Bot::SetBotBlockedBuff(int32 spell_id, bool block)
{
if (!IsValidSpell(spell_id)) {
OwnerMessage("Failed to set blocked buff.");
@@ -12659,7 +12659,7 @@ bool Bot::IsBlockedBuff(int32 spell_id)
return result;
}
void Bot::SetBotBlockedPetBuff(uint16 spell_id, bool block)
void Bot::SetBotBlockedPetBuff(int32 spell_id, bool block)
{
if (!IsValidSpell(spell_id)) {
OwnerMessage("Failed to set blocked pet buff.");
@@ -13319,7 +13319,7 @@ uint8 Bot::GetUltimateSpellTypeMaxThreshold(uint16 spell_type, Mob* tar) {
return GetSpellTypeMaxThreshold(spell_type);
}
bool Bot::IsImmuneToBotSpell(uint16 spell_id, Mob* caster) {
bool Bot::IsImmuneToBotSpell(int32 spell_id, Mob* caster) {
int effect_index;
if (!caster) {
zone/bot.h
+60 -60
View File
@@ -270,8 +270,8 @@ public:
Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double totalPlayTime, uint32 lastZoneId, NPCType *npcTypeData);
//abstract virtual override function implementations requird by base abstract class
bool Death(Mob* killer_mob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false) override;
void Damage(Mob* from, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1,
bool Death(Mob* killer_mob, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false) override;
void Damage(Mob* from, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1,
bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) override;
bool HasRaid() final { return GetRaid() != nullptr; }
@@ -320,7 +320,7 @@ public:
void DoClassAttacks(Mob *target, bool IsRiposte=false);
void CalcBonuses() override;
void MakePet(uint16 spell_id, const char* pettype, const char *petname = nullptr) override;
void MakePet(int32 spell_id, const char* pettype, const char *petname = nullptr) override;
FACTION_VALUE GetReverseFactionCon(Mob* iOther) override;
inline bool IsPet() override { return false; }
bool IsNPC() const override { return false; }
@@ -331,8 +331,8 @@ public:
void SetAttackTimer() override;
uint64 GetClassHPFactor();
int64 CalcMaxHP() override;
bool DoFinishedSpellSingleTarget(uint16 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool &stopLogic);
bool DoFinishedSpellGroupTarget(uint16 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool &stopLogic);
bool DoFinishedSpellSingleTarget(int32 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool &stopLogic);
bool DoFinishedSpellGroupTarget(int32 spell_id, Mob* spellTarget, EQ::spells::CastingSlot slot, bool &stopLogic);
void Camp(bool save_to_database = true);
void SetTarget(Mob* mob) override;
void Zone();
@@ -361,11 +361,11 @@ public:
bool GetReturningFlag() const { return m_returning_flag; }
bool GetIsUsingItemClick() { return is_using_item_click; }
void SetIsUsingItemClick(bool flag = true) { is_using_item_click = flag; }
bool UseDiscipline(uint32 spell_id, uint32 target);
uint8 GetNumberNeedingHealedInGroup(Mob* tar, uint16 spell_type, uint16 spell_id, float range);
bool UseDiscipline(int32 spell_id, uint32 target);
uint8 GetNumberNeedingHealedInGroup(Mob* tar, uint16 spell_type, int32 spell_id, float range);
bool GetNeedsCured(Mob *tar);
bool GetNeedsHateRedux(Mob *tar);
bool HasOrMayGetAggro(bool SitAggro, uint32 spell_id = 0);
bool HasOrMayGetAggro(bool SitAggro, int32 spell_id = 0);
void SetDefaultBotStance();
void SetSurname(std::string_view bot_surname);
void SetTitle(std::string_view bot_title);
@@ -428,10 +428,10 @@ public:
EQ::ItemInstance* GetClickItem(uint16 slot_id);
void DoItemClick(const EQ::ItemData* inst, uint16 slot_id);
bool AI_AddBotSpells(uint32 bot_spell_id);
bool AI_AddBotSpells(int32 bot_spell_id);
void AddSpellToBotList(
int16 iPriority,
uint16 iSpellID,
int32 iSpellID,
uint32 iType,
int16 iManaCost,
int32 iRecastDelay,
@@ -447,7 +447,7 @@ public:
void AddSpellToBotEnforceList(
int16 iPriority,
uint16 iSpellID,
int32 iSpellID,
uint32 iType,
int16 iManaCost,
int32 iRecastDelay,
@@ -466,8 +466,8 @@ public:
// AI Methods
bool AICastSpell(Mob* tar, uint8 chance, uint16 spell_type, uint16 sub_target_type = UINT16_MAX, uint16 sub_type = UINT16_MAX);
bool AttemptAICastSpell(uint16 spell_type, Mob* tar = nullptr);
bool AttemptAACastSpell(Mob* tar, uint16 spell_id, AA::Rank* rank);
bool AttemptForcedCastSpell(Mob* tar, uint16 spell_id, bool is_disc = false);
bool AttemptAACastSpell(Mob* tar, int32 spell_id, AA::Rank* rank);
bool AttemptForcedCastSpell(Mob* tar, int32 spell_id, bool is_disc = false);
bool AttemptCloseBeneficialSpells(uint16 spell_type);
bool AI_EngagedCastCheck() override;
bool AI_PursueCastCheck() override;
@@ -483,7 +483,7 @@ public:
void SetGuardMode();
void SetHoldMode();
bool IsValidSpellRange(uint16 spell_id, Mob* tar);
bool IsValidSpellRange(int32 spell_id, Mob* tar);
// Bot AI Methods
void AI_Bot_Init();
@@ -495,14 +495,14 @@ public:
// Mob Spell Virtual Override Methods
void SpellProcess() override;
int32 GetActSpellDuration(uint16 spell_id, int32 duration) override;
float GetAOERange(uint16 spell_id) override;
virtual bool SpellEffect(Mob* caster, uint16 spell_id, float partial = 100);
int32 GetActSpellDuration(int32 spell_id, int32 duration) override;
float GetAOERange(int32 spell_id) override;
virtual bool SpellEffect(Mob* caster, int32 spell_id, float partial = 100);
void DoBuffTic(const Buffs_Struct &buff, int slot, Mob* caster = nullptr) override;
virtual bool CastSpell(uint16 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1, int32 mana_cost = -1, uint32* oSpellWillFinish = 0,
virtual bool CastSpell(int32 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1, int32 mana_cost = -1, uint32* oSpellWillFinish = 0,
uint32 item_slot = 0xFFFFFFFF, int16 *resist_adjust = nullptr, uint32 aa_id = 0);
bool SpellOnTarget(
uint16 spell_id,
int32 spell_id,
Mob* spelltar,
int reflect_effectiveness = 0,
bool use_resist_adjust = false,
@@ -512,11 +512,11 @@ public:
int duration_override = 0,
bool disable_buff_overwrite = false
) final;
bool IsImmuneToSpell(uint16 spell_id, Mob *caster) override;
virtual bool DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction, EQ::spells::CastingSlot slot);
virtual bool DoCastSpell(uint16 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1, int32 mana_cost = -1,
bool IsImmuneToSpell(int32 spell_id, Mob *caster) override;
virtual bool DetermineSpellTargets(int32 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction, EQ::spells::CastingSlot slot);
virtual bool DoCastSpell(int32 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1, int32 mana_cost = -1,
uint32* oSpellWillFinish = nullptr, uint32 item_slot = 0xFFFFFFFF, uint32 aa_id = 0);
inline int64 GetFocusEffect(focusType type, uint16 spell_id, Mob *caster = nullptr, bool from_buff_tic = false) override
inline int64 GetFocusEffect(focusType type, int32 spell_id, Mob *caster = nullptr, bool from_buff_tic = false) override
{ return Mob::GetFocusEffect(type, spell_id, caster, from_buff_tic); }
inline bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false,
bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr) override
@@ -536,21 +536,21 @@ public:
// Targeting
std::vector<Mob*> GatherSpellTargets(bool entireRaid = false, Mob* target = nullptr, bool no_clients = false, bool no_bots = false);
bool HasValidAETarget(Bot* caster, uint16 spell_id, uint16 spell_type, Mob* tar);
bool HasValidAETarget(Bot* caster, int32 spell_id, uint16 spell_type, Mob* tar);
void SetHasLoS(bool has_los) { _hasLoS = has_los; }
bool HasLoS() const { return _hasLoS; }
bool IsValidMezTarget(Mob* owner, Mob* npc, uint16 spell_id);
bool IsValidMezTarget(Mob* owner, Mob* npc, int32 spell_id);
// Cast checks
bool PrecastChecks(Mob* tar, uint16 spell_type);
bool CastChecks(uint16 spell_id, Mob* tar, uint16 spell_type, bool prechecks = false, bool ae_check = false);
bool IsImmuneToBotSpell(uint16 spell_id, Mob* caster);
bool CanCastSpellType(uint16 spell_type, uint16 spell_id, Mob* tar);
bool BotHasEnoughMana(uint16 spell_id);
bool IsTargetAlreadyReceivingSpell(Mob* tar, uint16 spell_id);
bool DoResistCheck(Mob* target, uint16 spell_id, int32 resist_limit);
bool DoResistCheckBySpellType(Mob* tar, uint16 spell_id, uint16 spell_type);
bool IsValidTargetType(uint16 spell_id, int target_type, uint8 body_type);
bool CastChecks(int32 spell_id, Mob* tar, uint16 spell_type, bool prechecks = false, bool ae_check = false);
bool IsImmuneToBotSpell(int32 spell_id, Mob* caster);
bool CanCastSpellType(uint16 spell_type, int32 spell_id, Mob* tar);
bool BotHasEnoughMana(int32 spell_id);
bool IsTargetAlreadyReceivingSpell(Mob* tar, int32 spell_id);
bool DoResistCheck(Mob* target, int32 spell_id, int32 resist_limit);
bool DoResistCheckBySpellType(Mob* tar, int32 spell_id, uint16 spell_type);
bool IsValidTargetType(int32 spell_id, int target_type, uint8 body_type);
// Spell checks
static bool IsValidBotSpellType(uint16 spell_type);
@@ -598,8 +598,8 @@ public:
void ClearBotBlockedBuffs() { bot_blocked_buffs.clear(); }
bool IsBlockedBuff(int32 spell_id) override;
bool IsBlockedPetBuff(int32 spell_id) override;
void SetBotBlockedBuff(uint16 spell_id, bool block);
void SetBotBlockedPetBuff(uint16 spell_id, bool block);
void SetBotBlockedBuff(int32 spell_id, bool block);
void SetBotBlockedPetBuff(int32 spell_id, bool block);
std::vector<BotBlockedBuffs> GetBotBlockedBuffs() { return bot_blocked_buffs; }
void SetBotBlockedBuffs(std::vector<BotBlockedBuffs> blocked_buffs) { bot_blocked_buffs = blocked_buffs; }
@@ -665,16 +665,16 @@ public:
// Spell lists
std::list<BotSpellTypeOrder> GetSpellTypesPrioritized(uint8 priority_type);
static uint16 GetParentSpellType(uint16 spell_type);
static bool IsValidSpellTypeBySpellID(uint16 spell_type, uint16 spell_id);
static bool IsValidSpellTypeBySpellID(uint16 spell_type, int32 spell_id);
inline uint16 GetCastedSpellType() const { return _castedSpellType; }
void SetCastedSpellType(uint16 spell_type);
bool IsValidSpellTypeSubType(uint16 spell_type, uint16 sub_type, uint16 spell_id);
bool IsValidSpellTypeSubType(uint16 spell_type, uint16 sub_type, int32 spell_id);
static bool IsValidBotSpellCategory(uint8 setting_type);
static std::string GetBotSpellCategoryName(uint8 setting_type);
static std::string GetBotSpellCategoryShortName(uint8 setting_type);
static uint16 GetBotSpellCategoryIDByShortName(std::string setting_string);
void AssignBotSpellsToTypes(std::vector<BotSpells>& AIBot_spells, std::unordered_map<uint16, std::vector<BotSpells_wIndex>>& AIBot_spells_by_type);
uint16 GetSpellByAA(int id, AA::Rank*& rank);
int32 GetSpellByAA(int id, AA::Rank*& rank);
// Spell Type
static uint16 GetSpellTypeIDByShortName(std::string spellType_string);
@@ -745,7 +745,7 @@ public:
static BotSpell GetBestBotSpellForGroupCompleteHeal(Bot* caster, Mob* tar, uint16 spell_type = BotSpellTypes::RegularHeal);
static BotSpell GetBestBotSpellForGroupHeal(Bot* caster, Mob* tar, uint16 spell_type = BotSpellTypes::RegularHeal);
static Mob* GetFirstIncomingMobToMez(Bot* caster, uint16 spell_id, uint16 spell_type, bool AE);
static Mob* GetFirstIncomingMobToMez(Bot* caster, int32 spell_id, uint16 spell_type, bool AE);
static BotSpell GetBestBotSpellForMez(Bot* caster, uint16 spell_type = BotSpellTypes::Mez);
static BotSpell GetBestBotMagicianPetSpell(Bot* caster, uint16 spell_type = BotSpellTypes::Pet);
static std::string GetBotMagicianPetType(Bot* caster);
@@ -778,7 +778,7 @@ public:
// "GET" Class Methods
uint32 GetBotID() const { return _botID; }
uint32 GetBotOwnerCharacterID() const { return _botOwnerCharacterID; }
uint32 GetBotSpellID() const { return npc_spells_id; }
int32 GetBotSpellID() const { return npc_spells_id; }
Mob* GetBotOwner() { return this->_botOwner; }
uint32 GetBotRangedValue();
EQ::ItemInstance* GetBotItem(uint16 slot_id);
@@ -889,8 +889,8 @@ public:
inline const InspectMessage_Struct& GetInspectMessage() const { return _botInspectMessage; }
// "Quest API" Methods
bool HasBotSpellEntry(uint16 spell_id);
bool CanUseBotSpell(uint16 spell_id);
bool HasBotSpellEntry(int32 spell_id);
bool CanUseBotSpell(int32 spell_id);
void ApplySpell(int spell_id, int duration = 0, int level = -1, ApplySpellType apply_type = ApplySpellType::Solo, bool allow_pets = false, bool is_raid_group_only = true);
void BreakInvis();
void Escape();
@@ -899,11 +899,11 @@ public:
int32 GetItemIDAt(int16 slot_id);
int32 GetAugmentIDAt(int16 slot_id, uint8 augslot);
int32 GetRawItemAC();
void SendSpellAnim(uint16 targetid, uint16 spell_id);
void SendSpellAnim(uint16 targetid, int32 spell_id);
void SetSpellDuration(int spell_id, int duration = 0, int level = -1, ApplySpellType apply_type = ApplySpellType::Solo, bool allow_pets = false, bool is_raid_group_only = true);
// "SET" Class Methods
void SetBotSpellID(uint32 newSpellID);
void SetBotSpellID(int32 newSpellID);
void SetSpawnStatus(bool spawnStatus) { _spawnStatus = spawnStatus; }
void SetPetChooserID(uint8 id) { _petChooserID = id; }
void SetBotRangedSetting(bool value) { _botRangedSetting = value; }
@@ -911,21 +911,21 @@ public:
void SetBotOwner(Mob* botOwner) { this->_botOwner = botOwner; }
void SetRangerAutoWeaponSelect(bool enable) { GetClass() == Class::Ranger ? _rangerAutoWeaponSelect = enable : _rangerAutoWeaponSelect = false; }
void SetBotStance(uint8 stance_id) { _botStance = Stance::IsValid(stance_id) ? stance_id : Stance::Passive; }
uint32 GetSpellRecastTimer(uint16 spell_id = 0);
bool CheckSpellRecastTimer(uint16 spell_id = 0);
uint32 GetSpellRecastRemainingTime(uint16 spell_id = 0);
void SetSpellRecastTimer(uint16 spell_id, int32 recast_delay = 0);
uint32 CalcSpellRecastTimer(uint16 spell_id);
uint32 GetDisciplineReuseTimer(uint16 spell_id = 0);
bool CheckDisciplineReuseTimer(uint16 spell_id = 0);
uint32 GetDisciplineReuseRemainingTime(uint16 spell_id = 0);
void SetDisciplineReuseTimer(uint16 spell_id, int32 reuse_timer = 0);
uint32 GetSpellRecastTimer(int32 spell_id = 0);
bool CheckSpellRecastTimer(int32 spell_id = 0);
uint32 GetSpellRecastRemainingTime(int32 spell_id = 0);
void SetSpellRecastTimer(int32 spell_id, int32 recast_delay = 0);
uint32 CalcSpellRecastTimer(int32 spell_id);
uint32 GetDisciplineReuseTimer(int32 spell_id = 0);
bool CheckDisciplineReuseTimer(int32 spell_id = 0);
uint32 GetDisciplineReuseRemainingTime(int32 spell_id = 0);
void SetDisciplineReuseTimer(int32 spell_id, int32 reuse_timer = 0);
uint32 GetItemReuseTimer(uint32 item_id = 0);
bool CheckItemReuseTimer(uint32 item_id = 0);
void SetItemReuseTimer(uint32 item_id, uint32 reuse_timer = 0);
void ClearDisciplineReuseTimer(uint16 spell_id = 0);
void ClearDisciplineReuseTimer(int32 spell_id = 0);
void ClearItemReuseTimer(uint32 item_id = 0);
void ClearSpellRecastTimer(uint16 spell_id = 0);
void ClearSpellRecastTimer(int32 spell_id = 0);
uint32 GetItemReuseRemainingTime(uint32 item_id = 0);
void ClearExpiredTimers();
void SetBeardColor(uint8 value) { beardcolor = value; }
@@ -947,12 +947,12 @@ public:
std::string GetHPString(int8 min_hp, int8 max_hp);
bool AddBotSpellSetting(uint16 spell_id, BotSpellSetting* bs);
bool DeleteBotSpellSetting(uint16 spell_id);
BotSpellSetting* GetBotSpellSetting(uint16 spell_id);
bool AddBotSpellSetting(int32 spell_id, BotSpellSetting* bs);
bool DeleteBotSpellSetting(int32 spell_id);
BotSpellSetting* GetBotSpellSetting(int32 spell_id);
void ListBotSpellSettings();
void LoadBotSpellSettings();
bool UpdateBotSpellSetting(uint16 spell_id, BotSpellSetting* bs);
bool UpdateBotSpellSetting(int32 spell_id, BotSpellSetting* bs);
void SetBotEnforceSpellSetting(bool enforceSpellSettings);
bool GetBotEnforceSpellSetting() { return _enforceSpellSettings; }
@@ -1257,4 +1257,4 @@ private:
int32 CalcItemATKCap() final;
};
bool IsSpellInBotList(DBbotspells_Struct* spell_list, uint16 spell_id);
bool IsSpellInBotList(DBbotspells_Struct* spell_list, int32 spell_id);
zone/bot_commands/bot_blocked_buffs.cpp
+2 -2
View File
@@ -87,7 +87,7 @@ void bot_command_blocked_buffs(Client* c, const Seperator* sep)
bool remove = false;
bool list = false;
bool wipe = false;
uint16 spell_id;
int32 spell_id;
if (!arg1.compare("add")) {
if (!sep->IsNumber(2) || !IsValidSpell(atoi(sep->arg[2])) || !IsBeneficialSpell(atoi(sep->arg[2]))) {
@@ -325,7 +325,7 @@ void bot_command_blocked_pet_buffs(Client* c, const Seperator* sep)
bool remove = false;
bool list = false;
bool wipe = false;
uint16 spell_id;
int32 spell_id;
if (!arg1.compare("add")) {
if (!sep->IsNumber(2) || !IsValidSpell(atoi(sep->arg[2])) || !IsBeneficialSpell(atoi(sep->arg[2]))) {
zone/bot_commands/bot_cast.cpp
+2 -2
View File
@@ -177,7 +177,7 @@ void bot_command_cast(Client* c, const Seperator* sep)
bool aa_type = false;
int aa_id = 0;
bool by_spell_id = false;
uint16 chosen_spell_id = UINT16_MAX;
int32 chosen_spell_id = -1;
if (!arg1.compare("aa") || !arg1.compare("harmtouch") || !arg1.compare("layonhands")) {
if (!RuleB(Bots, AllowCastAAs)) {
@@ -536,7 +536,7 @@ void bot_command_cast(Client* c, const Seperator* sep)
AA::Rank* temp_rank = nullptr;
AA::Rank*& rank = temp_rank;
uint16 spell_id = bot_iter->GetSpellByAA(aa_id, rank);
int32 spell_id = bot_iter->GetSpellByAA(aa_id, rank);
if (!IsValidSpell(spell_id)) {
continue;
zone/bot_commands/bot_discipline.cpp
+1 -1
View File
@@ -85,7 +85,7 @@ void bot_command_discipline(Client* c, const Seperator* sep)
bool aggressive = false;
bool defensive = false;
Mob* tar = c->GetTarget();
uint16 spell_id = UINT16_MAX;
int32 spell_id = -1;
if (!arg1.compare("aggressive")) {
aggressive = true;
zone/bot_database.cpp
+4 -4
View File
@@ -1252,7 +1252,7 @@ bool BotDatabase::LoadPetIndex(const uint32 bot_id, uint32& pet_index)
return true;
}
bool BotDatabase::LoadPetSpellID(const uint32 bot_id, uint32& pet_spell_id)
bool BotDatabase::LoadPetSpellID(const uint32 bot_id, int32& pet_spell_id)
{
if (!bot_id) {
return false;
@@ -1277,7 +1277,7 @@ bool BotDatabase::LoadPetSpellID(const uint32 bot_id, uint32& pet_spell_id)
return true;
}
bool BotDatabase::LoadPetStats(const uint32 bot_id, std::string& pet_name, uint32& pet_mana, uint32& pet_hp, uint32& pet_spell_id)
bool BotDatabase::LoadPetStats(const uint32 bot_id, std::string& pet_name, uint32& pet_mana, uint32& pet_hp, int32& pet_spell_id)
{
if (!bot_id) {
return false;
@@ -1315,7 +1315,7 @@ bool BotDatabase::LoadPetStats(const uint32 bot_id, std::string& pet_name, uint3
return true;
}
bool BotDatabase::SavePetStats(const uint32 bot_id, const std::string& pet_name, const uint32 pet_mana, const uint32 pet_hp, const uint32 pet_spell_id)
bool BotDatabase::SavePetStats(const uint32 bot_id, const std::string& pet_name, const uint32 pet_mana, const uint32 pet_hp, const int32 pet_spell_id)
{
if (!bot_id || pet_name.empty() || !pet_spell_id || pet_spell_id > SPDAT_RECORDS) {
return false;
@@ -2572,7 +2572,7 @@ bool BotDatabase::DeleteBotBlockedBuffs(const uint32 bot_id)
void BotDatabase::CheckBotSpells() {
auto spell_list = BotSpellsEntriesRepository::All(content_db);
uint16 spell_id;
int32 spell_id;
SPDat_Spell_Struct spell;
for (const auto& s : spell_list) {
zone/bot_database.h
+3 -3
View File
@@ -90,10 +90,10 @@ public:
/* Bot pet functions */
bool LoadPetIndex(const uint32 bot_id, uint32& pet_index);
bool LoadPetSpellID(const uint32 bot_id, uint32& pet_spell_id);
bool LoadPetSpellID(const uint32 bot_id, int32& pet_spell_id);
bool LoadPetStats(const uint32 bot_id, std::string& pet_name, uint32& pet_mana, uint32& pet_hp, uint32& pet_spell_id);
bool SavePetStats(const uint32 bot_id, const std::string& pet_name, const uint32 pet_mana, const uint32 pet_hp, const uint32 pet_spell_id);
bool LoadPetStats(const uint32 bot_id, std::string& pet_name, uint32& pet_mana, uint32& pet_hp, int32& pet_spell_id);
bool SavePetStats(const uint32 bot_id, const std::string& pet_name, const uint32 pet_mana, const uint32 pet_hp, const int32 pet_spell_id);
bool DeletePetStats(const uint32 bot_id);
bool LoadPetBuffs(const uint32 bot_id, SpellBuff_Struct* pet_buffs);
zone/bot_structs.h
+5 -5
View File
@@ -33,7 +33,7 @@ struct BotsAvailableList {
};
struct BotSpell {
uint16 SpellId;
int32 SpellId;
int SpellIndex;
int16 ManaCost;
};
@@ -64,7 +64,7 @@ struct BotSpellSetting {
struct BotSpells {
uint32 type; // 0 = never, must be one (and only one) of the defined values
uint16 spellid; // <= 0 = no spell
int32 spellid; // <= 0 = no spell
int16 manacost; // -1 = use spdat, -2 = no cast time
uint32 time_cancast; // when we can cast this spell next
int32 recast_delay;
@@ -82,7 +82,7 @@ struct BotSpells {
struct BotSpells_wIndex {
uint32 index; //index of AIBot_spells
uint32 type; // 0 = never, must be one (and only one) of the defined values
uint16 spellid; // <= 0 = no spell
int32 spellid; // <= 0 = no spell
int16 manacost; // -1 = use spdat, -2 = no cast time
uint32 time_cancast; // when we can cast this spell next
int32 recast_delay;
@@ -103,7 +103,7 @@ struct BotTimer {
uint32 recast_time;
bool is_spell;
bool is_disc;
uint16 spell_id;
int32 spell_id;
bool is_item;
uint32 item_id;
};
@@ -138,7 +138,7 @@ struct BotSpellTypeOrder {
struct BotBlockedBuffs {
uint32_t bot_id;
uint32_t spell_id;
int32_t spell_id;
uint8_t blocked;
uint8_t blocked_pet;
};
zone/botspellsai.cpp
+12 -12
View File
@@ -1335,7 +1335,7 @@ BotSpell Bot::GetBestBotSpellForGroupHeal(Bot* caster, Mob* tar, uint16 spell_ty
for (std::list<BotSpell>::iterator bot_spell_list_itr = bot_spell_list.begin(); bot_spell_list_itr != bot_spell_list.end(); ++bot_spell_list_itr) {
if (IsRegularGroupHealSpell(bot_spell_list_itr->SpellId)) {
uint16 spell_id = bot_spell_list_itr->SpellId;
int32 spell_id = bot_spell_list_itr->SpellId;
if (caster->TargetValidation(tar) && !caster->IsCommandedSpell() && caster->IsValidSpellRange(spell_id, tar)) {
target_count = caster->GetNumberNeedingHealedInGroup(tar, spell_type, spell_id, caster->GetAOERange(spell_id));
@@ -1373,7 +1373,7 @@ BotSpell Bot::GetBestBotSpellForGroupHealOverTime(Bot* caster, Mob* tar, uint16
for (std::list<BotSpell>::iterator bot_spell_list_itr = bot_spell_list.begin(); bot_spell_list_itr != bot_spell_list.end(); ++bot_spell_list_itr) {
if (IsGroupHealOverTimeSpell(bot_spell_list_itr->SpellId)) {
uint16 spell_id = bot_spell_list_itr->SpellId;
int32 spell_id = bot_spell_list_itr->SpellId;
if (caster->TargetValidation(tar) && !caster->IsCommandedSpell() && caster->IsValidSpellRange(spell_id, tar)) {
target_count = caster->GetNumberNeedingHealedInGroup(tar, spell_type, spell_id, caster->GetAOERange(spell_id));
@@ -1411,7 +1411,7 @@ BotSpell Bot::GetBestBotSpellForGroupCompleteHeal(Bot* caster, Mob* tar, uint16
for (std::list<BotSpell>::iterator bot_spell_list_itr = bot_spell_list.begin(); bot_spell_list_itr != bot_spell_list.end(); ++bot_spell_list_itr) {
if (IsGroupCompleteHealSpell(bot_spell_list_itr->SpellId)) {
uint16 spell_id = bot_spell_list_itr->SpellId;
int32 spell_id = bot_spell_list_itr->SpellId;
if (caster->TargetValidation(tar) && !caster->IsCommandedSpell() && caster->IsValidSpellRange(spell_id, tar)) {
target_count = caster->GetNumberNeedingHealedInGroup(tar, spell_type, spell_id, caster->GetAOERange(spell_id));
@@ -1459,7 +1459,7 @@ BotSpell Bot::GetBestBotSpellForMez(Bot* caster, uint16 spell_type) {
return result;
}
Mob* Bot::GetFirstIncomingMobToMez(Bot* caster, uint16 spell_id, uint16 spell_type, bool AE) {
Mob* Bot::GetFirstIncomingMobToMez(Bot* caster, int32 spell_id, uint16 spell_type, bool AE) {
Mob* result = nullptr;
if (caster && caster->GetOwner()) {
@@ -2184,7 +2184,7 @@ uint8 Bot::GetChanceToCastBySpellType(uint16 spell_type)
return RuleI(Bots, PercentChanceToCastOtherType);
}
bool Bot::AI_AddBotSpells(uint32 bot_spell_id) {
bool Bot::AI_AddBotSpells(int32 bot_spell_id) {
// ok, this function should load the list, and the parent list then shove them into the struct and sort
npc_spells_id = bot_spell_id;
AIBot_spells.clear();
@@ -2486,7 +2486,7 @@ bool Bot::AI_AddBotSpells(uint32 bot_spell_id) {
return true;
}
bool IsSpellInBotList(DBbotspells_Struct* spell_list, uint16 iSpellID) {
bool IsSpellInBotList(DBbotspells_Struct* spell_list, int32 iSpellID) {
auto it = std::find_if (
spell_list->entries.begin(),
spell_list->entries.end(),
@@ -2498,7 +2498,7 @@ bool IsSpellInBotList(DBbotspells_Struct* spell_list, uint16 iSpellID) {
return it != spell_list->entries.end();
}
DBbotspells_Struct* ZoneDatabase::GetBotSpells(uint32 bot_spell_id)
DBbotspells_Struct* ZoneDatabase::GetBotSpells(int32 bot_spell_id)
{
if (!bot_spell_id) {
return nullptr;
@@ -2591,7 +2591,7 @@ DBbotspells_Struct* ZoneDatabase::GetBotSpells(uint32 bot_spell_id)
// adds a spell to the list, taking into account priority and resorting list as needed.
void Bot::AddSpellToBotList(
int16 in_priority,
uint16 in_spell_id,
int32 in_spell_id,
uint32 in_type,
int16 in_mana_cost,
int32 in_recast_delay,
@@ -2637,7 +2637,7 @@ void Bot::AddSpellToBotList(
// adds spells to the list ^spells that are returned if ^enforce is enabled
void Bot::AddSpellToBotEnforceList(
int16 iPriority,
uint16 iSpellID,
int32 iSpellID,
uint32 iType,
int16 iManaCost,
int32 iRecastDelay,
@@ -2703,7 +2703,7 @@ void Bot::AI_Bot_Event_SpellCastFinished(bool iCastSucceeded, uint16 slot) {
}
}
bool Bot::HasBotSpellEntry(uint16 spell_id) {
bool Bot::HasBotSpellEntry(int32 spell_id) {
auto* spell_list = content_db.GetBotSpells(GetBotSpellID());
if (!spell_list) {
@@ -2720,7 +2720,7 @@ bool Bot::HasBotSpellEntry(uint16 spell_id) {
return false;
}
bool Bot::CanUseBotSpell(uint16 spell_id) {
bool Bot::CanUseBotSpell(int32 spell_id) {
if (AIBot_spells.empty()) {
return false;
}
@@ -2744,7 +2744,7 @@ bool Bot::CanUseBotSpell(uint16 spell_id) {
return false;
}
bool Bot::IsValidSpellRange(uint16 spell_id, Mob* tar) {
bool Bot::IsValidSpellRange(int32 spell_id, Mob* tar) {
if (!IsValidSpell(spell_id) || !tar) {
return false;
}
zone/client.cpp
+6 -6
View File
@@ -3344,7 +3344,7 @@ void Client::GMKill() {
safe_delete(outapp);
}
void Client::MemorizeSpell(uint32 slot, uint32 spell_id, uint32 scribing, uint32 reduction){
void Client::MemorizeSpell(uint32 slot, int32 spell_id, uint32 scribing, uint32 reduction){
if (
!EQ::ValueWithin(
slot,
@@ -4393,7 +4393,7 @@ void Client::Sacrifice(Mob *caster)
}
}
void Client::SendOPTranslocateConfirm(Mob *Caster, uint16 SpellID) {
void Client::SendOPTranslocateConfirm(Mob *Caster, int32 SpellID) {
if(!Caster || PendingTranslocate)
return;
@@ -6362,7 +6362,7 @@ void Client::SuspendMinion(int value)
}
else
{
uint16 SpellID = CurrentPet->GetPetSpellID();
int32 SpellID = CurrentPet->GetPetSpellID();
if(SpellID)
{
@@ -7103,7 +7103,7 @@ void Client::ConsentCorpses(std::string consent_name, bool deny)
}
}
void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_override, int pet_count, int pet_duration)
void Client::Doppelganger(int32 spell_id, Mob *target, const char *name_override, int pet_count, int pet_duration)
{
if(!target || !IsValidSpell(spell_id) || GetID() == target->GetID())
return;
@@ -10714,7 +10714,7 @@ void Client::Fling(float value, float target_x, float target_y, float target_z,
std::vector<int> Client::GetLearnableDisciplines(uint8 min_level, uint8 max_level) {
std::vector<int> learnable_disciplines;
for (uint16 spell_id = 0; spell_id < SPDAT_RECORDS; ++spell_id) {
for (int32 spell_id = 0; spell_id < SPDAT_RECORDS; ++spell_id) {
bool learnable = true;
if (!IsValidSpell(spell_id)) {
continue;
@@ -10785,7 +10785,7 @@ std::vector<int> Client::GetScribeableSpells(uint8 min_level, uint8 max_level) {
std::vector<int> scribeable_spells;
std::unordered_map<uint32, std::vector<uint16>> spell_group_cache = LoadSpellGroupCache(min_level, max_level);
for (uint16 spell_id = 0; spell_id < SPDAT_RECORDS; ++spell_id) {
for (int32 spell_id = 0; spell_id < SPDAT_RECORDS; ++spell_id) {
bool scribeable = true;
if (!IsValidSpell(spell_id)) {
continue;
zone/client.h
+28 -28
View File
@@ -277,8 +277,8 @@ public:
bool GotoPlayerRaid(const std::string& player_name);
//abstract virtual function implementations required by base abstract class
virtual bool Death(Mob* killer_mob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false);
virtual void Damage(Mob* from, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None);
virtual bool Death(Mob* killer_mob, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false);
virtual void Damage(Mob* from, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None);
virtual bool HasRaid() { return (GetRaid() ? true : false); }
virtual bool HasGroup() { return (GetGroup() ? true : false); }
virtual Raid* GetRaid() { return entity_list.GetRaidByClient(this); }
@@ -678,7 +678,7 @@ public:
inline virtual int32 GetDelayDeath() const { return aabonuses.DelayDeath + spellbonuses.DelayDeath + itembonuses.DelayDeath + 11; }
virtual bool CheckFizzle(uint16 spell_id);
virtual bool CheckFizzle(int32 spell_id);
virtual int GetCurrentBuffSlots() const;
virtual int GetCurrentSongSlots() const;
virtual int GetCurrentDiscSlots() const { return 1; }
@@ -928,8 +928,8 @@ public:
bool CanHaveSkill(EQ::skills::SkillType skill_id) const;
void SetSkill(EQ::skills::SkillType skill_num, uint16 value);
void AddSkill(EQ::skills::SkillType skillid, uint16 value);
void CheckSpecializeIncrease(uint16 spell_id);
void CheckSongSkillIncrease(uint16 spell_id);
void CheckSpecializeIncrease(int32 spell_id);
void CheckSongSkillIncrease(int32 spell_id);
bool CheckIncreaseSkill(EQ::skills::SkillType skillid, Mob *against_who, int chancemodi = 0);
void CheckLanguageSkillIncrease(uint8 language_id, uint8 teacher_skill);
void SetLanguageSkill(uint8 language_id, uint8 language_skill);
@@ -955,13 +955,13 @@ public:
inline void SetDuelTarget(uint32 set_id) { duel_target = set_id; }
inline void SetDueling(bool duel) { duelaccepted = duel; }
// use this one instead
void MemSpell(uint16 spell_id, int slot, bool update_client = true);
void MemSpell(int32 spell_id, int slot, bool update_client = true);
void UnmemSpell(int slot, bool update_client = true);
void UnmemSpellBySpellID(int32 spell_id);
void UnmemSpellAll(bool update_client = true);
int FindEmptyMemSlot();
uint16 FindMemmedSpellBySlot(int slot);
int FindMemmedSpellBySpellID(uint16 spell_id);
int FindMemmedSpellBySpellID(int32 spell_id);
int MemmedCount();
std::vector<int> GetLearnableDisciplines(uint8 min_level = 1, uint8 max_level = 0);
std::vector<int> GetLearnedDisciplines();
@@ -969,7 +969,7 @@ public:
std::vector<int> GetScribeableSpells(uint8 min_level = 1, uint8 max_level = 0);
std::vector<int> GetScribedSpells();
// defer save used when bulk saving
void ScribeSpell(uint16 spell_id, int slot, bool update_client = true, bool defer_save = false);
void ScribeSpell(int32 spell_id, int slot, bool update_client = true, bool defer_save = false);
void SaveSpells();
void SaveDisciplines();
@@ -985,12 +985,12 @@ public:
// defer save used when bulk saving
void UnscribeSpell(int slot, bool update_client = true, bool defer_save = false);
void UnscribeSpellAll(bool update_client = true);
void UnscribeSpellBySpellID(uint16 spell_id, bool update_client = true);
void UnscribeSpellBySpellID(int32 spell_id, bool update_client = true);
void UntrainDisc(int slot, bool update_client = true, bool defer_save = false);
void UntrainDiscAll(bool update_client = true);
void UntrainDiscBySpellID(uint16 spell_id, bool update_client = true);
bool SpellGlobalCheck(uint16 spell_id, uint32 char_id);
bool SpellBucketCheck(uint16 spell_id, uint32 char_id);
void UntrainDiscBySpellID(int32 spell_id, bool update_client = true);
bool SpellGlobalCheck(int32 spell_id, uint32 char_id);
bool SpellBucketCheck(int32 spell_id, uint32 char_id);
uint8 GetCharMaxLevelFromQGlobal();
uint8 GetCharMaxLevelFromBucket();
@@ -1013,7 +1013,7 @@ public:
inline bool AutoConsentRaidEnabled() const { return m_pp.raidAutoconsent != 0; }
inline bool AutoConsentGuildEnabled() const { return m_pp.guildAutoconsent != 0; }
void SummonHorse(uint16 spell_id);
void SummonHorse(int32 spell_id);
void SetHorseId(uint16 horseid_in);
inline void SetControlledMobId(uint16 mob_id_in) { controlled_mob_id = mob_id_in; }
uint16 GetControlledMobId() const{ return controlled_mob_id; }
@@ -1111,7 +1111,7 @@ public:
inline uint32 GetAAPercent() const { return m_epp.perAA; }
void SetAATitle(std::string title);
void SetTitleSuffix(std::string suffix);
void MemorizeSpell(uint32 slot, uint32 spell_id, uint32 scribing, uint32 reduction = 0);
void MemorizeSpell(uint32 slot, int32 spell_id, uint32 scribing, uint32 reduction = 0);
int GetAAEXPPercentage();
int GetEXPPercentage();
@@ -1243,15 +1243,15 @@ public:
void ResetDisciplineTimer(uint32 timer_id);
void SendDisciplineUpdate();
void SendDisciplineTimer(uint32 timer_id, uint32 duration);
bool UseDiscipline(uint32 spell_id, uint32 target);
bool HasDisciplineLearned(uint16 spell_id);
bool UseDiscipline(int32 spell_id, uint32 target);
bool HasDisciplineLearned(int32 spell_id);
void SetLinkedSpellReuseTimer(uint32 timer_id, uint32 duration);
bool IsLinkedSpellReuseTimerReady(uint32 timer_id);
void ResetCastbarCooldownBySlot(int slot);
void ResetAllCastbarCooldowns();
void ResetCastbarCooldownBySpellID(uint32 spell_id);
void ResetCastbarCooldownBySpellID(int32 spell_id);
bool CheckTitle(int title_set);
void EnableTitle(int title_set, bool insert = true);
@@ -1275,13 +1275,13 @@ public:
void ProcessInspectRequest(Client* requestee, Client* requester);
bool ClientFinishedLoading() { return (conn_state == ClientConnectFinished); }
int FindSpellBookSlotBySpellID(uint16 spellid);
uint32 GetSpellIDByBookSlot(int book_slot);
int FindSpellBookSlotBySpellID(int32 spellid);
int32 GetSpellIDByBookSlot(int book_slot);
int GetNextAvailableSpellBookSlot(int starting_slot = 0);
int GetNextAvailableDisciplineSlot(int starting_slot = 0);
inline uint32 GetSpellByBookSlot(int book_slot) { return m_pp.spell_book[book_slot]; }
inline int32 GetSpellByBookSlot(int book_slot) { return m_pp.spell_book[book_slot]; }
inline bool HasSpellScribed(int spellid) { return FindSpellBookSlotBySpellID(spellid) != -1; }
uint32 GetHighestScribedSpellinSpellGroup(uint32 spell_group);
int32 GetHighestScribedSpellinSpellGroup(uint32 spell_group);
std::unordered_map<uint32, std::vector<uint16>> LoadSpellGroupCache(uint8 min_level, uint8 max_level);
uint16 GetMaxSkillAfterSpecializationRules(EQ::skills::SkillType skillid, uint16 maxSkill);
void SendPopupToClient(const char *Title, const char *Text, uint32 PopupID = 0, uint32 Buttons = 0, uint32 Duration = 0);
@@ -1292,7 +1292,7 @@ public:
bool PendingSacrifice;
uint16 sacrifice_caster_id;
PendingTranslocate_Struct PendingTranslocateData;
void SendOPTranslocateConfirm(Mob *Caster, uint16 SpellID);
void SendOPTranslocateConfirm(Mob *Caster, int32 SpellID);
// Help Window
std::string SendBotCommandHelpWindow(const BotCommandHelpParams& params);
@@ -1665,7 +1665,7 @@ public:
}
void SuspendMinion(int value);
void Doppelganger(uint16 spell_id, Mob *target, const char *name_override, int pet_count, int pet_duration);
void Doppelganger(int32 spell_id, Mob *target, const char *name_override, int pet_count, int pet_duration);
void NotifyNewTitlesAvailable();
void Signal(int signal_id);
void SendPayload(int payload_id, std::string payload_value = std::string());
@@ -1698,7 +1698,7 @@ public:
bool RemoveRespawnOption(std::string option_name);
bool RemoveRespawnOption(uint8 position);
void ClearRespawnOptions() { respawn_options.clear(); }
void SetPendingRezzData(int XP, uint32 DBID, uint16 SpellID, const char *CorpseName) { PendingRezzXP = XP; PendingRezzDBID = DBID; PendingRezzSpellID = SpellID; PendingRezzCorpseName = CorpseName; }
void SetPendingRezzData(int XP, uint32 DBID, int32 SpellID, const char *CorpseName) { PendingRezzXP = XP; PendingRezzDBID = DBID; PendingRezzSpellID = SpellID; PendingRezzCorpseName = CorpseName; }
bool IsRezzPending() { return PendingRezzSpellID > 0; }
void ClearHover();
inline bool IsBlockedBuff(int32 SpellID) { return PlayerBlockedBuffs.find(SpellID) != PlayerBlockedBuffs.end(); }
@@ -1798,7 +1798,7 @@ public:
void SendWebLink(const char* website);
void SendMarqueeMessage(uint32 type, std::string message, uint32 duration = 3000);
void SendMarqueeMessage(uint32 type, uint32 priority, uint32 fade_in, uint32 fade_out, uint32 duration, std::string message);
void SendSpellAnim(uint16 targetid, uint16 spell_id);
void SendSpellAnim(uint16 targetid, int32 spell_id);
void DuplicateLoreMessage(uint32 ItemID);
void GarbleMessage(char *, uint8);
@@ -1956,7 +1956,7 @@ public:
protected:
friend class Mob;
void CalcEdibleBonuses(StatBonuses* newbon);
void MakeBuffFadePacket(uint16 spell_id, int slot_id, bool send_message = true);
void MakeBuffFadePacket(int32 spell_id, int slot_id, bool send_message = true);
bool client_data_loaded;
@@ -1989,7 +1989,7 @@ private:
eqFilterMode ClientFilters[_FilterCount];
int32 HandlePacket(const EQApplicationPacket *app);
void OPTGB(const EQApplicationPacket *app);
void OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 InstanceID, float x, float y, float z);
void OPRezzAnswer(uint32 Action, int32 SpellID, uint16 ZoneID, uint16 InstanceID, float x, float y, float z);
void OPMemorizeSpell(const EQApplicationPacket *app);
void OPMoveCoin(const EQApplicationPacket* app);
void MoveItemCharges(EQ::ItemInstance &from, int16 to_slot, uint8 type);
@@ -2309,7 +2309,7 @@ private:
bool PendingGuildInvitation;
int PendingRezzXP;
uint32 PendingRezzDBID;
uint16 PendingRezzSpellID; // Only used for resurrect while hovering.
int32 PendingRezzSpellID; // Only used for resurrect while hovering.
std::string PendingRezzCorpseName; // Only used for resurrect while hovering.
std::set<uint32> PlayerBlockedBuffs;
zone/client_mods.cpp
+1 -1
View File
@@ -1441,7 +1441,7 @@ int32 Client::CalcATK()
return (ATK);
}
uint32 Mob::GetInstrumentMod(uint16 spell_id)
uint32 Mob::GetInstrumentMod(int32 spell_id)
{
if (GetClass() != Class::Bard || spells[spell_id].is_discipline || spell_id == SPELL_AMPLIFICATION) {
//Other classes can get a base effects mod using SPA 413
zone/client_packet.cpp
+7 -7
View File
@@ -1560,7 +1560,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
m_pp.buffs[i].num_hits = buffs[i].hit_number;
}
else {
m_pp.buffs[i].spellid = SPELLBOOK_UNKNOWN;
m_pp.buffs[i].spellid = SPELL_UNKNOWN;
m_pp.buffs[i].bard_modifier = 10;
m_pp.buffs[i].effect_type = 0;
m_pp.buffs[i].player_id = 0;
@@ -4228,7 +4228,7 @@ void Client::Handle_OP_BuffRemoveRequest(const EQApplicationPacket *app)
if (brrs->SlotID > (uint32)m->GetMaxTotalSlots())
return;
uint16 SpellID = m->GetSpellIDFromSlot(brrs->SlotID);
int32 SpellID = m->GetSpellIDFromSlot(brrs->SlotID);
if (SpellID && (GetGM() || ((IsBeneficialSpell(SpellID) || IsEffectInSpell(SpellID, SpellEffect::BindSight)) && !spells[SpellID].no_remove))) {
m->BuffFadeBySlot(brrs->SlotID, true);
@@ -4419,9 +4419,9 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
if (inst && inst->IsClassCommon())
{
const EQ::ItemData* item = inst->GetItem();
if (item->Click.Effect != (uint32)castspell->spell_id)
if (item->Click.Effect != castspell->spell_id)
{
std::string message = fmt::format("OP_CastSpell with item, tried to cast a different spell than what was on item - item spell id [{}] attempted [{}]", item->Click.Effect, (uint32)castspell->spell_id);
std::string message = fmt::format("OP_CastSpell with item, tried to cast a different spell than what was on item - item spell id [{}] attempted [{}]", item->Click.Effect, castspell->spell_id);
RecordPlayerEventLog(PlayerEvent::POSSIBLE_HACK, PlayerEvent::PossibleHackEvent{.message = message});
InterruptSpell(castspell->spell_id); //CHEATER!!
return;
@@ -5841,8 +5841,8 @@ void Client::Handle_OP_DeleteSpell(const EQApplicationPacket *app)
if (dss->spell_slot < 0 || dss->spell_slot >= EQ::spells::DynamicLookup(ClientVersion(), GetGM())->SpellbookSize)
return;
if (m_pp.spell_book[dss->spell_slot] != SPELLBOOK_UNKNOWN) {
m_pp.spell_book[dss->spell_slot] = SPELLBOOK_UNKNOWN;
if (m_pp.spell_book[dss->spell_slot] != SPELL_UNKNOWN) {
m_pp.spell_book[dss->spell_slot] = SPELL_UNKNOWN;
database.DeleteCharacterSpell(CharacterID(), dss->spell_slot);
dss->success = 1;
}
@@ -15843,7 +15843,7 @@ void Client::Handle_OP_Translocate(const EQApplicationPacket *app)
}
if (its->Complete == 1) {
uint32 spell_id = PendingTranslocateData.spell_id;
int32 spell_id = PendingTranslocateData.spell_id;
bool in_translocate_zone = (
zone->GetZoneID() == PendingTranslocateData.zone_id &&
zone->GetInstanceID() == PendingTranslocateData.instance_id
zone/client_process.cpp
+3 -3
View File
@@ -1033,7 +1033,7 @@ uint8 Client::WithCustomer(uint16 NewCustomer){
return 0;
}
void Client::OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 InstanceID, float x, float y, float z)
void Client::OPRezzAnswer(uint32 Action, int32 SpellID, uint16 ZoneID, uint16 InstanceID, float x, float y, float z)
{
if(PendingRezzXP < 0) {
// pendingrezexp is set to -1 if we are not expecting an OP_RezzAnswer
@@ -1048,7 +1048,7 @@ void Client::OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 I
// corpse is in has shutdown since the rez spell was cast.
database.MarkCorpseAsResurrected(PendingRezzDBID);
LogSpells("Player [{}] got a [{}] Rezz spellid [{}] in zone[{}] instance id [{}]",
name, (uint16)spells[SpellID].base_value[0],
name, spells[SpellID].base_value[0],
SpellID, ZoneID, InstanceID);
const bool use_old_resurrection = (
@@ -1061,7 +1061,7 @@ void Client::OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 I
)
);
const uint16 resurrection_sickness_spell_id = (
const int32 resurrection_sickness_spell_id = (
use_old_resurrection ?
RuleI(Character, OldResurrectionSicknessSpellID) :
RuleI(Character, ResurrectionSicknessSpellID)
zone/common.h
+4 -4
View File
@@ -334,13 +334,13 @@ struct StatBonuses {
int32 Corrup;
int32 CorrupCapMod;
int32 HeroicCorrup;
uint16 DamageShieldSpellID;
int32 DamageShieldSpellID;
int DamageShield; // this is damage done to mobs that attack this
DmgShieldType DamageShieldType;
int SpellDamageShield;
int SpellShield;
int ReverseDamageShield; // this is damage done to the mob when it attacks
uint16 ReverseDamageShieldSpellID;
int32 ReverseDamageShieldSpellID;
DmgShieldType ReverseDamageShieldType;
int movementspeed;
int32 haste;
@@ -641,7 +641,7 @@ namespace SBIndex {
constexpr uint16 POSITION_FRONT = 1; // SPA 503-506
constexpr uint16 PET_RAMPAGE_CHANCE = 0; // SPA 464,465
constexpr uint16 PET_RAMPAGE_DMG_MOD = 1; // SPA 465,465
constexpr uint16 SKILLATK_PROC_SPELL_ID = 0; // SPA 288
constexpr int32 SKILLATK_PROC_SPELL_ID = 0; // SPA 288
constexpr uint16 SKILLATK_PROC_CHANCE = 1; // SPA 288
constexpr uint16 SKILLATK_PROC_SKILL = 2; // SPA 288
constexpr uint16 SLAYUNDEAD_DMG_MOD = 0; // SPA 219
@@ -660,7 +660,7 @@ namespace SBIndex {
constexpr uint16 REFLECT_RESISTANCE_MOD = 1; // SPA 158
constexpr uint16 REFLECT_DMG_EFFECTIVENESS = 2; // SPA 158
constexpr uint16 COMBAT_PROC_ORIGIN_ID = 0; // SPA
constexpr uint16 COMBAT_PROC_SPELL_ID = 1; // SPA
constexpr int32 COMBAT_PROC_SPELL_ID = 1; // SPA
constexpr uint16 COMBAT_PROC_RATE_MOD = 2; // SPA
constexpr uint16 COMBAT_PROC_REUSE_TIMER = 3; // SPA
constexpr uint16 SHIELD_TARGET_MITIGATION_PERCENT = 0; // SPA 463
zone/corpse.cpp
+1 -1
View File
@@ -2304,7 +2304,7 @@ void Corpse::CheckIsOwnerOnline()
}
}
void Corpse::CastRezz(uint16 spell_id, Mob *caster)
void Corpse::CastRezz(int32 spell_id, Mob *caster)
{
LogSpells(
"spell_id [{}] IsRezzed() [{}], rez_experience [{}], rez_timer enabled [{}]",
zone/corpse.h
+3 -3
View File
@@ -83,7 +83,7 @@ public:
virtual bool Death(
Mob *killer_mob,
int64 damage,
uint16 spell_id,
int32 spell_id,
EQ::skills::SkillType attack_skill,
KilledByTypes killed_by = KilledByTypes::Killed_NPC,
bool is_buff_tic = false
@@ -92,7 +92,7 @@ public:
virtual void Damage(
Mob *from,
int64 damage,
uint16 spell_id,
int32 spell_id,
EQ::skills::SkillType attack_skill,
bool avoidable = true,
int8 buffslot = -1,
@@ -205,7 +205,7 @@ public:
/* Corpse: Resurrection */
bool IsRezzed() { return m_rez; }
void IsRezzed(bool in_rez) { m_rez = in_rez; }
void CastRezz(uint16 spell_id, Mob *caster);
void CastRezz(int32 spell_id, Mob *caster);
void CompleteResurrection(bool timer_expired = false);
bool IsRezzable() { return m_is_rezzable; }
void SetRezTimer(bool initial_timer = false);
zone/effects.cpp
+12 -12
View File
@@ -27,7 +27,7 @@
#include "zone/worldserver.h"
#include "zone/zonedb.h"
float Mob::GetActSpellRange(uint16 spell_id, float range)
float Mob::GetActSpellRange(int32 spell_id, float range)
{
float extrange = 100;
@@ -36,7 +36,7 @@ float Mob::GetActSpellRange(uint16 spell_id, float range)
return (range * extrange) / 100;
}
int64 Mob::GetActSpellDamage(uint16 spell_id, int64 value, Mob* target) {
int64 Mob::GetActSpellDamage(int32 spell_id, int64 value, Mob* target) {
if (spells[spell_id].target_type == ST_Self) {
return value;
}
@@ -202,7 +202,7 @@ int64 Mob::GetActSpellDamage(uint16 spell_id, int64 value, Mob* target) {
return value;
}
int64 Mob::GetActReflectedSpellDamage(uint16 spell_id, int64 value, int effectiveness) {
int64 Mob::GetActReflectedSpellDamage(int32 spell_id, int64 value, int effectiveness) {
/*
Reflected spells use the spells base damage before any modifiers or formulas applied.
That value can then be modifier by the reflect spells 'max' value, defined here as effectiveness
@@ -237,7 +237,7 @@ int64 Mob::GetActReflectedSpellDamage(uint16 spell_id, int64 value, int effectiv
return value;
}
int64 Mob::GetActDoTDamage(uint16 spell_id, int64 value, Mob* target, bool from_buff_tic) {
int64 Mob::GetActDoTDamage(int32 spell_id, int64 value, Mob* target, bool from_buff_tic) {
if (target == nullptr)
return value;
@@ -362,7 +362,7 @@ int64 Mob::GetActDoTDamage(uint16 spell_id, int64 value, Mob* target, bool from_
return value;
}
int64 Mob::GetExtraSpellAmt(uint16 spell_id, int64 extra_spell_amt, int64 base_spell_dmg)
int64 Mob::GetExtraSpellAmt(int32 spell_id, int64 extra_spell_amt, int64 base_spell_dmg)
{
if (RuleB(Spells, FlatItemExtraSpellAmt)) {
@@ -401,7 +401,7 @@ int64 Mob::GetExtraSpellAmt(uint16 spell_id, int64 extra_spell_amt, int64 base_s
return extra_spell_amt;
}
int64 Mob::GetActSpellHealing(uint16 spell_id, int64 value, Mob* target, bool from_buff_tic) {
int64 Mob::GetActSpellHealing(int32 spell_id, int64 value, Mob* target, bool from_buff_tic) {
if (target == nullptr && IsBot()) {
target = this;
}
@@ -557,7 +557,7 @@ int64 Mob::GetActSpellHealing(uint16 spell_id, int64 value, Mob* target, bool fr
}
int32 Mob::GetActSpellCost(uint16 spell_id, int32 cost)
int32 Mob::GetActSpellCost(int32 spell_id, int32 cost)
{
//FrenziedDevastation doubles mana cost of all DD spells
int16 FrenziedDevastation = itembonuses.FrenziedDevastation + spellbonuses.FrenziedDevastation + aabonuses.FrenziedDevastation;
@@ -606,7 +606,7 @@ int32 Mob::GetActSpellCost(uint16 spell_id, int32 cost)
return cost;
}
int32 Mob::GetActSpellDuration(uint16 spell_id, int32 duration)
int32 Mob::GetActSpellDuration(int32 spell_id, int32 duration)
{
// focuses don't affect discipline duration (Except War Cries)
if (
@@ -849,7 +849,7 @@ void Client::SendDisciplineUpdate() {
QueuePacket(&app);
}
bool Client::UseDiscipline(uint32 spell_id, uint32 target) {
bool Client::UseDiscipline(int32 spell_id, uint32 target) {
// Dont let client waste a reuse timer if they can't use the disc
if ((IsStunned() && !IsCastNotStandingSpell(spell_id))||
IsFeared() ||
@@ -1001,7 +1001,7 @@ void Client::ResetAllDisciplineTimers() {
}
}
bool Client::HasDisciplineLearned(uint16 spell_id) {
bool Client::HasDisciplineLearned(int32 spell_id) {
bool has_learned = false;
for (auto index = 0; index < MAX_PP_DISCIPLINES; ++index) {
if (GetPP().disciplines.values[index] == spell_id) {
@@ -1063,7 +1063,7 @@ void EntityList::AETaunt(Client* taunter, float range, int bonus_hate)
void EntityList::AESpell(
Mob* caster_mob,
Mob* center_mob,
uint16 spell_id,
int32 spell_id,
bool affect_caster,
int16 resist_adjust,
int* max_targets,
@@ -1250,7 +1250,7 @@ void EntityList::AESpell(
void EntityList::MassGroupBuff(
Mob* caster,
Mob* center,
uint16 spell_id,
int32 spell_id,
bool affect_caster
)
{
zone/embparser.cpp
+6 -6
View File
@@ -527,7 +527,7 @@ int PerlembParser::EventSpell(
QuestEventID event_id,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any>* extra_pointers
@@ -606,7 +606,7 @@ bool PerlembParser::GlobalPlayerHasQuestSub(QuestEventID event_id)
return perl->SubExists("qst_global_player", QuestEventSubroutines[event_id]);
}
bool PerlembParser::SpellHasQuestSub(uint32 spell_id, QuestEventID event_id)
bool PerlembParser::SpellHasQuestSub(int32 spell_id, QuestEventID event_id)
{
if (!perl || event_id >= _LargestEventID) {
return false;
@@ -786,7 +786,7 @@ void PerlembParser::LoadItemScript(std::string filename, EQ::ItemInstance* inst)
item_quest_status_[inst->GetID()] = questLoaded;
}
void PerlembParser::LoadSpellScript(std::string filename, uint32 spell_id)
void PerlembParser::LoadSpellScript(std::string filename, int32 spell_id)
{
if (!perl) {
return;
@@ -986,7 +986,7 @@ void PerlembParser::ExportVar(const char* prefix, const char* variable_name, con
int PerlembParser::SendCommands(
const char* prefix,
const char* event_id,
uint32 object_id,
int32 object_id, // TODO: unused parameter? spell_id in header, object_id here
Mob* other,
Mob* mob,
EQ::ItemInstance* inst,
@@ -1917,8 +1917,8 @@ void PerlembParser::ExportEventVariables(
case EVENT_SPELL_BLOCKED: {
Seperator sep(data);
const uint32 blocking_spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const uint32 cast_spell_id = Strings::ToUnsignedInt(sep.arg[1]);
const int32 blocking_spell_id = Strings::ToInt(sep.arg[0]);
const int32 cast_spell_id = Strings::ToInt(sep.arg[1]);
ExportVar(package_name.c_str(), "blocking_spell_id", blocking_spell_id);
ExportVar(package_name.c_str(), "cast_spell_id", cast_spell_id);
zone/embparser.h
+4 -4
View File
@@ -111,7 +111,7 @@ public:
QuestEventID event_id,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any>* extra_pointers
@@ -173,7 +173,7 @@ public:
virtual bool HasGlobalQuestSub(QuestEventID event_id);
virtual bool PlayerHasQuestSub(QuestEventID event_id);
virtual bool GlobalPlayerHasQuestSub(QuestEventID event_id);
virtual bool SpellHasQuestSub(uint32 spell_id, QuestEventID event_id);
virtual bool SpellHasQuestSub(int32 spell_id, QuestEventID event_id);
virtual bool ItemHasQuestSub(EQ::ItemInstance* inst, QuestEventID event_id);
virtual bool BotHasQuestSub(QuestEventID event_id);
virtual bool GlobalBotHasQuestSub(QuestEventID event_id);
@@ -187,7 +187,7 @@ public:
virtual void LoadPlayerScript(std::string filename);
virtual void LoadGlobalPlayerScript(std::string filename);
virtual void LoadItemScript(std::string filename, EQ::ItemInstance* inst);
virtual void LoadSpellScript(std::string filename, uint32 spell_id);
virtual void LoadSpellScript(std::string filename, int32 spell_id);
virtual void LoadBotScript(std::string filename);
virtual void LoadGlobalBotScript(std::string filename);
virtual void LoadMercScript(std::string filename);
@@ -228,7 +228,7 @@ private:
int SendCommands(
const char* prefix,
const char* event,
uint32 spell_id,
int32 spell_id,
Mob* other,
Mob* mob,
EQ::ItemInstance* inst,
zone/embparser_api.cpp
+151 -151
View File
@@ -312,12 +312,12 @@ int Perl__getinventoryslotid(std::string identifier)
return result;
}
void Perl__castspell(uint16 spell_id, uint16 target_id)
void Perl__castspell(int32 spell_id, uint16 target_id)
{
quest_manager.castspell(spell_id, target_id);
}
void Perl__selfcast(uint16 spell_id)
void Perl__selfcast(int32 spell_id)
{
quest_manager.selfcast(spell_id);
}
@@ -542,12 +542,12 @@ std::string Perl__getracename(uint16 race_id)
return quest_manager.getracename(race_id);
}
std::string Perl__getspellname(uint32 spell_id)
std::string Perl__getspellname(int32 spell_id)
{
return quest_manager.getspellname(spell_id);
}
uint8 Perl__get_spell_level(uint16 spell_id, uint8 class_id)
uint8 Perl__get_spell_level(int32 spell_id, uint8 class_id)
{
const auto spell_level = GetSpellLevel(spell_id, class_id);
return spell_level > RuleI(Character, MaxLevel) ? UINT8_MAX : spell_level;
@@ -1736,437 +1736,437 @@ bool Perl__IsRunning()
return quest_manager.IsRunning();
}
bool Perl__IsEffectInSpell(uint16 spell_id, int effect_id)
bool Perl__IsEffectInSpell(int32 spell_id, int effect_id)
{
return IsEffectInSpell(spell_id, effect_id);
}
bool Perl__IsBeneficialSpell(uint16 spell_id)
bool Perl__IsBeneficialSpell(int32 spell_id)
{
return IsBeneficialSpell(spell_id);
}
bool Perl__IsDetrimentalSpell(uint16 spell_id)
bool Perl__IsDetrimentalSpell(int32 spell_id)
{
return IsDetrimentalSpell(spell_id);
}
bool Perl__IsTargetableAESpell(uint16 spell_id)
bool Perl__IsTargetableAESpell(int32 spell_id)
{
return IsTargetableAESpell(spell_id);
}
bool Perl__IsSacrificeSpell(uint16 spell_id)
bool Perl__IsSacrificeSpell(int32 spell_id)
{
return IsSacrificeSpell(spell_id);
}
bool Perl__IsLifetapSpell(uint16 spell_id)
bool Perl__IsLifetapSpell(int32 spell_id)
{
return IsLifetapSpell(spell_id);
}
bool Perl__IsMesmerizeSpell(uint16 spell_id)
bool Perl__IsMesmerizeSpell(int32 spell_id)
{
return IsMesmerizeSpell(spell_id);
}
bool Perl__IsStunSpell(uint16 spell_id)
bool Perl__IsStunSpell(int32 spell_id)
{
return IsStunSpell(spell_id);
}
bool Perl__IsSummonSpell(uint16 spell_id)
bool Perl__IsSummonSpell(int32 spell_id)
{
return IsSummonSpell(spell_id);
}
bool Perl__IsDamageSpell(uint16 spell_id)
bool Perl__IsDamageSpell(int32 spell_id)
{
return IsDamageSpell(spell_id);
}
bool Perl__IsFearSpell(uint16 spell_id)
bool Perl__IsFearSpell(int32 spell_id)
{
return IsFearSpell(spell_id);
}
bool Perl__IsCureSpell(uint16 spell_id)
bool Perl__IsCureSpell(int32 spell_id)
{
return IsCureSpell(spell_id);
}
bool Perl__IsHasteSpell(uint16 spell_id)
bool Perl__IsHasteSpell(int32 spell_id)
{
return IsHasteSpell(spell_id);
}
bool Perl__IsHarmonySpell(uint16 spell_id)
bool Perl__IsHarmonySpell(int32 spell_id)
{
return IsHarmonySpell(spell_id);
}
bool Perl__IsPercentalHealSpell(uint16 spell_id)
bool Perl__IsPercentalHealSpell(int32 spell_id)
{
return IsPercentalHealSpell(spell_id);
}
bool Perl__IsGroupOnlySpell(uint16 spell_id)
bool Perl__IsGroupOnlySpell(int32 spell_id)
{
return IsGroupOnlySpell(spell_id);
}
bool Perl__IsInvisibleSpell(uint16 spell_id)
bool Perl__IsInvisibleSpell(int32 spell_id)
{
return IsInvisibleSpell(spell_id);
}
bool Perl__IsInvulnerabilitySpell(uint16 spell_id)
bool Perl__IsInvulnerabilitySpell(int32 spell_id)
{
return IsInvulnerabilitySpell(spell_id);
}
bool Perl__IsCompleteHealDurationSpell(uint16 spell_id)
bool Perl__IsCompleteHealDurationSpell(int32 spell_id)
{
return IsCompleteHealDurationSpell(spell_id);
}
bool Perl__IsPoisonCounterSpell(uint16 spell_id)
bool Perl__IsPoisonCounterSpell(int32 spell_id)
{
return IsPoisonCounterSpell(spell_id);
}
bool Perl__IsDiseaseCounterSpell(uint16 spell_id)
bool Perl__IsDiseaseCounterSpell(int32 spell_id)
{
return IsDiseaseCounterSpell(spell_id);
}
bool Perl__IsSummonItemSpell(uint16 spell_id)
bool Perl__IsSummonItemSpell(int32 spell_id)
{
return IsSummonItemSpell(spell_id);
}
bool Perl__IsSummonSkeletonSpell(uint16 spell_id)
bool Perl__IsSummonSkeletonSpell(int32 spell_id)
{
return IsSummonSkeletonSpell(spell_id);
}
bool Perl__IsSummonPetSpell(uint16 spell_id)
bool Perl__IsSummonPetSpell(int32 spell_id)
{
return IsSummonPetSpell(spell_id);
}
bool Perl__IsPetSpell(uint16 spell_id)
bool Perl__IsPetSpell(int32 spell_id)
{
return IsPetSpell(spell_id);
}
bool Perl__IsSummonPCSpell(uint16 spell_id)
bool Perl__IsSummonPCSpell(int32 spell_id)
{
return IsSummonPCSpell(spell_id);
}
bool Perl__IsCharmSpell(uint16 spell_id)
bool Perl__IsCharmSpell(int32 spell_id)
{
return IsCharmSpell(spell_id);
}
bool Perl__IsBlindSpell(uint16 spell_id)
bool Perl__IsBlindSpell(int32 spell_id)
{
return IsBlindSpell(spell_id);
}
bool Perl__IsHealthSpell(uint16 spell_id)
bool Perl__IsHealthSpell(int32 spell_id)
{
return IsHealthSpell(spell_id);
}
bool Perl__IsCastTimeReductionSpell(uint16 spell_id)
bool Perl__IsCastTimeReductionSpell(int32 spell_id)
{
return IsCastTimeReductionSpell(spell_id);
}
bool Perl__IsIncreaseDurationSpell(uint16 spell_id)
bool Perl__IsIncreaseDurationSpell(int32 spell_id)
{
return IsIncreaseDurationSpell(spell_id);
}
bool Perl__IsManaCostReductionSpell(uint16 spell_id)
bool Perl__IsManaCostReductionSpell(int32 spell_id)
{
return IsManaCostReductionSpell(spell_id);
}
bool Perl__IsIncreaseRangeSpell(uint16 spell_id)
bool Perl__IsIncreaseRangeSpell(int32 spell_id)
{
return IsIncreaseRangeSpell(spell_id);
}
bool Perl__IsImprovedHealingSpell(uint16 spell_id)
bool Perl__IsImprovedHealingSpell(int32 spell_id)
{
return IsImprovedHealingSpell(spell_id);
}
bool Perl__IsImprovedDamageSpell(uint16 spell_id)
bool Perl__IsImprovedDamageSpell(int32 spell_id)
{
return IsImprovedDamageSpell(spell_id);
}
bool Perl__IsAEDurationSpell(uint16 spell_id)
bool Perl__IsAEDurationSpell(int32 spell_id)
{
return IsAEDurationSpell(spell_id);
}
bool Perl__IsPureNukeSpell(uint16 spell_id)
bool Perl__IsPureNukeSpell(int32 spell_id)
{
return IsPureNukeSpell(spell_id);
}
bool Perl__IsAENukeSpell(uint16 spell_id)
bool Perl__IsAENukeSpell(int32 spell_id)
{
return IsAENukeSpell(spell_id);
}
bool Perl__IsPBAENukeSpell(uint16 spell_id)
bool Perl__IsPBAENukeSpell(int32 spell_id)
{
return IsPBAENukeSpell(spell_id);
}
bool Perl__IsAERainNukeSpell(uint16 spell_id)
bool Perl__IsAERainNukeSpell(int32 spell_id)
{
return IsAERainNukeSpell(spell_id);
}
bool Perl__IsPartialResistableSpell(uint16 spell_id)
bool Perl__IsPartialResistableSpell(int32 spell_id)
{
return IsPartialResistableSpell(spell_id);
}
bool Perl__IsResistableSpell(uint16 spell_id)
bool Perl__IsResistableSpell(int32 spell_id)
{
return IsResistableSpell(spell_id);
}
bool Perl__IsGroupSpell(uint16 spell_id)
bool Perl__IsGroupSpell(int32 spell_id)
{
return IsGroupSpell(spell_id);
}
bool Perl__IsTGBCompatibleSpell(uint16 spell_id)
bool Perl__IsTGBCompatibleSpell(int32 spell_id)
{
return IsTGBCompatibleSpell(spell_id);
}
bool Perl__IsBardSong(uint16 spell_id)
bool Perl__IsBardSong(int32 spell_id)
{
return IsBardSong(spell_id);
}
bool Perl__IsPulsingBardSong(uint16 spell_id)
bool Perl__IsPulsingBardSong(int32 spell_id)
{
return IsPulsingBardSong(spell_id);
}
bool Perl__IsDisciplineBuff(uint16 spell_id)
bool Perl__IsDisciplineBuff(int32 spell_id)
{
return IsDisciplineBuff(spell_id);
}
bool Perl__IsDiscipline(uint16 spell_id)
bool Perl__IsDiscipline(int32 spell_id)
{
return IsDiscipline(spell_id);
}
bool Perl__IsCombatSkill(uint16 spell_id)
bool Perl__IsCombatSkill(int32 spell_id)
{
return IsCombatSkill(spell_id);
}
bool Perl__IsResurrectionEffects(uint16 spell_id)
bool Perl__IsResurrectionEffects(int32 spell_id)
{
return IsResurrectionEffects(spell_id);
}
bool Perl__IsRuneSpell(uint16 spell_id)
bool Perl__IsRuneSpell(int32 spell_id)
{
return IsRuneSpell(spell_id);
}
bool Perl__IsMagicRuneSpell(uint16 spell_id)
bool Perl__IsMagicRuneSpell(int32 spell_id)
{
return IsMagicRuneSpell(spell_id);
}
bool Perl__IsManaTapSpell(uint16 spell_id)
bool Perl__IsManaTapSpell(int32 spell_id)
{
return IsManaTapSpell(spell_id);
}
bool Perl__IsAllianceSpell(uint16 spell_id)
bool Perl__IsAllianceSpell(int32 spell_id)
{
return IsAllianceSpell(spell_id);
}
bool Perl__IsDeathSaveSpell(uint16 spell_id)
bool Perl__IsDeathSaveSpell(int32 spell_id)
{
return IsDeathSaveSpell(spell_id);
}
bool Perl__IsPartialDeathSaveSpell(uint16 spell_id)
bool Perl__IsPartialDeathSaveSpell(int32 spell_id)
{
return IsPartialDeathSaveSpell(spell_id);
}
bool Perl__IsFullDeathSaveSpell(uint16 spell_id)
bool Perl__IsFullDeathSaveSpell(int32 spell_id)
{
return IsFullDeathSaveSpell(spell_id);
}
bool Perl__IsShadowStepSpell(uint16 spell_id)
bool Perl__IsShadowStepSpell(int32 spell_id)
{
return IsShadowStepSpell(spell_id);
}
bool Perl__IsSuccorSpell(uint16 spell_id)
bool Perl__IsSuccorSpell(int32 spell_id)
{
return IsSuccorSpell(spell_id);
}
bool Perl__IsTeleportSpell(uint16 spell_id)
bool Perl__IsTeleportSpell(int32 spell_id)
{
return IsTeleportSpell(spell_id);
}
bool Perl__IsTranslocateSpell(uint16 spell_id)
bool Perl__IsTranslocateSpell(int32 spell_id)
{
return IsTranslocateSpell(spell_id);
}
bool Perl__IsGateSpell(uint16 spell_id)
bool Perl__IsGateSpell(int32 spell_id)
{
return IsGateSpell(spell_id);
}
bool Perl__IsIllusionSpell(uint16 spell_id)
bool Perl__IsIllusionSpell(int32 spell_id)
{
return IsIllusionSpell(spell_id);
}
bool Perl__IsLDoNObjectSpell(uint16 spell_id)
bool Perl__IsLDoNObjectSpell(int32 spell_id)
{
return IsLDoNObjectSpell(spell_id);
}
bool Perl__IsHealOverTimeSpell(uint16 spell_id)
bool Perl__IsHealOverTimeSpell(int32 spell_id)
{
return IsHealOverTimeSpell(spell_id);
}
bool Perl__IsCompleteHealSpell(uint16 spell_id)
bool Perl__IsCompleteHealSpell(int32 spell_id)
{
return IsCompleteHealSpell(spell_id);
}
bool Perl__IsFastHealSpell(uint16 spell_id)
bool Perl__IsFastHealSpell(int32 spell_id)
{
return IsFastHealSpell(spell_id);
}
bool Perl__IsVeryFastHealSpell(uint16 spell_id)
bool Perl__IsVeryFastHealSpell(int32 spell_id)
{
return IsVeryFastHealSpell(spell_id);
}
bool Perl__IsRegularSingleTargetHealSpell(uint16 spell_id)
bool Perl__IsRegularSingleTargetHealSpell(int32 spell_id)
{
return IsRegularSingleTargetHealSpell(spell_id);
}
bool Perl__IsRegularGroupHealSpell(uint16 spell_id)
bool Perl__IsRegularGroupHealSpell(int32 spell_id)
{
return IsRegularGroupHealSpell(spell_id);
}
bool Perl__IsGroupCompleteHealSpell(uint16 spell_id)
bool Perl__IsGroupCompleteHealSpell(int32 spell_id)
{
return IsGroupCompleteHealSpell(spell_id);
}
bool Perl__IsGroupHealOverTimeSpell(uint16 spell_id)
bool Perl__IsGroupHealOverTimeSpell(int32 spell_id)
{
return IsGroupHealOverTimeSpell(spell_id);
}
bool Perl__IsDebuffSpell(uint16 spell_id)
bool Perl__IsDebuffSpell(int32 spell_id)
{
return IsDebuffSpell(spell_id);
}
bool Perl__IsResistDebuffSpell(uint16 spell_id)
bool Perl__IsResistDebuffSpell(int32 spell_id)
{
return IsResistDebuffSpell(spell_id);
}
bool Perl__IsSelfConversionSpell(uint16 spell_id)
bool Perl__IsSelfConversionSpell(int32 spell_id)
{
return IsSelfConversionSpell(spell_id);
}
bool Perl__IsBuffSpell(uint16 spell_id)
bool Perl__IsBuffSpell(int32 spell_id)
{
return IsBuffSpell(spell_id);
}
bool Perl__IsPersistDeathSpell(uint16 spell_id)
bool Perl__IsPersistDeathSpell(int32 spell_id)
{
return IsPersistDeathSpell(spell_id);
}
bool Perl__IsSuspendableSpell(uint16 spell_id)
bool Perl__IsSuspendableSpell(int32 spell_id)
{
return IsSuspendableSpell(spell_id);
}
bool Perl__IsCastOnFadeDurationSpell(uint16 spell_id)
bool Perl__IsCastOnFadeDurationSpell(int32 spell_id)
{
return IsCastOnFadeDurationSpell(spell_id);
}
bool Perl__IsDistanceModifierSpell(uint16 spell_id)
bool Perl__IsDistanceModifierSpell(int32 spell_id)
{
return IsDistanceModifierSpell(spell_id);
}
bool Perl__IsRestAllowedSpell(uint16 spell_id)
bool Perl__IsRestAllowedSpell(int32 spell_id)
{
return IsRestAllowedSpell(spell_id);
}
bool Perl__IsNoDetrimentalSpellAggroSpell(uint16 spell_id)
bool Perl__IsNoDetrimentalSpellAggroSpell(int32 spell_id)
{
return IsNoDetrimentalSpellAggroSpell(spell_id);
}
bool Perl__IsStackableDOT(uint16 spell_id)
bool Perl__IsStackableDOT(int32 spell_id)
{
return IsStackableDOT(spell_id);
}
bool Perl__IsShortDurationBuff(uint16 spell_id)
bool Perl__IsShortDurationBuff(int32 spell_id)
{
return IsShortDurationBuff(spell_id);
}
bool Perl__IsTargetRequiredForSpell(uint16 spell_id)
bool Perl__IsTargetRequiredForSpell(int32 spell_id)
{
return IsTargetRequiredForSpell(spell_id);
}
bool Perl__IsVirusSpell(uint16 spell_id)
bool Perl__IsVirusSpell(int32 spell_id)
{
return IsVirusSpell(spell_id);
}
bool Perl__IsValidSpell(uint16 spell_id)
bool Perl__IsValidSpell(int32 spell_id)
{
return IsValidSpell(spell_id);
}
@@ -2186,147 +2186,147 @@ bool Perl__IsBardOnlyStackEffect(int effect_id)
return IsBardOnlyStackEffect(effect_id);
}
bool Perl__IsCastWhileInvisibleSpell(uint16 spell_id)
bool Perl__IsCastWhileInvisibleSpell(int32 spell_id)
{
return IsCastWhileInvisibleSpell(spell_id);
}
bool Perl__IsCastRestrictedSpell(uint16 spell_id)
bool Perl__IsCastRestrictedSpell(int32 spell_id)
{
return IsCastRestrictedSpell(spell_id);
}
bool Perl__IsCastNotStandingSpell(uint16 spell_id)
bool Perl__IsCastNotStandingSpell(int32 spell_id)
{
return IsCastNotStandingSpell(spell_id);
}
bool Perl__IsInstrumentModifierAppliedToSpellEffect(uint16 spell_id, int effect_id)
bool Perl__IsInstrumentModifierAppliedToSpellEffect(int32 spell_id, int effect_id)
{
return IsInstrumentModifierAppliedToSpellEffect(spell_id, effect_id);
}
bool Perl__IsBlankSpellEffect(uint16 spell_id, int effect_index)
bool Perl__IsBlankSpellEffect(int32 spell_id, int effect_index)
{
return IsBlankSpellEffect(spell_id, effect_index);
}
uint16 Perl__GetSpellTriggerSpellID(uint16 spell_id, int effect_id)
int32 Perl__GetSpellTriggerSpellID(int32 spell_id, int effect_id)
{
return GetSpellTriggerSpellID(spell_id, effect_id);
}
uint8 Perl__GetSpellMinimumLevel(uint16 spell_id)
uint8 Perl__GetSpellMinimumLevel(int32 spell_id)
{
return GetSpellMinimumLevel(spell_id);
}
int Perl__GetSpellResistType(uint16 spell_id)
int Perl__GetSpellResistType(int32 spell_id)
{
return GetSpellResistType(spell_id);
}
int Perl__GetSpellTargetType(uint16 spell_id)
int Perl__GetSpellTargetType(int32 spell_id)
{
return GetSpellTargetType(spell_id);
}
int Perl__GetSpellPartialMeleeRuneReduction(uint16 spell_id)
int Perl__GetSpellPartialMeleeRuneReduction(int32 spell_id)
{
return GetSpellPartialMeleeRuneReduction(spell_id);
}
int Perl__GetSpellPartialMagicRuneReduction(uint16 spell_id)
int Perl__GetSpellPartialMagicRuneReduction(int32 spell_id)
{
return GetSpellPartialMagicRuneReduction(spell_id);
}
int Perl__GetSpellPartialMeleeRuneAmount(uint16 spell_id)
int Perl__GetSpellPartialMeleeRuneAmount(int32 spell_id)
{
return GetSpellPartialMeleeRuneAmount(spell_id);
}
int Perl__GetSpellPartialMagicRuneAmount(uint16 spell_id)
int Perl__GetSpellPartialMagicRuneAmount(int32 spell_id)
{
return GetSpellPartialMagicRuneAmount(spell_id);
}
int Perl__GetSpellViralMinimumSpreadTime(uint16 spell_id)
int Perl__GetSpellViralMinimumSpreadTime(int32 spell_id)
{
return GetSpellViralMinimumSpreadTime(spell_id);
}
int Perl__GetSpellViralMaximumSpreadTime(uint16 spell_id)
int Perl__GetSpellViralMaximumSpreadTime(int32 spell_id)
{
return GetSpellViralMaximumSpreadTime(spell_id);
}
int Perl__GetSpellViralSpreadRange(uint16 spell_id)
int Perl__GetSpellViralSpreadRange(int32 spell_id)
{
return GetSpellViralSpreadRange(spell_id);
}
int Perl__GetSpellProcLimitTimer(uint16 spell_id, int proc_type)
int Perl__GetSpellProcLimitTimer(int32 spell_id, int proc_type)
{
return GetSpellProcLimitTimer(spell_id, proc_type);
}
int Perl__GetSpellEffectDescriptionNumber(uint16 spell_id)
int Perl__GetSpellEffectDescriptionNumber(int32 spell_id)
{
return GetSpellEffectDescriptionNumber(spell_id);
}
int Perl__GetSpellFuriousBash(uint16 spell_id)
int Perl__GetSpellFuriousBash(int32 spell_id)
{
return GetSpellFuriousBash(spell_id);
}
bool Perl__IsSpellUsableInThisZoneType(uint16 spell_id)
bool Perl__IsSpellUsableInThisZoneType(int32 spell_id)
{
return IsSpellUsableInThisZoneType(spell_id, zone->GetZoneType());
}
bool Perl__IsSpellUsableInThisZoneType(uint16 spell_id, uint8 zone_type)
bool Perl__IsSpellUsableInThisZoneType(int32 spell_id, uint8 zone_type)
{
return IsSpellUsableInThisZoneType(spell_id, zone_type);
}
int Perl__GetSpellEffectIndex(uint16 spell_id, int effect_id)
int Perl__GetSpellEffectIndex(int32 spell_id, int effect_id)
{
return GetSpellEffectIndex(spell_id, effect_id);
}
int Perl__CalculatePoisonCounters(uint16 spell_id)
int Perl__CalculatePoisonCounters(int32 spell_id)
{
return CalculatePoisonCounters(spell_id);
}
int Perl__CalculateDiseaseCounters(uint16 spell_id)
int Perl__CalculateDiseaseCounters(int32 spell_id)
{
return CalculateDiseaseCounters(spell_id);
}
int Perl__CalculateCurseCounters(uint16 spell_id)
int Perl__CalculateCurseCounters(int32 spell_id)
{
return CalculateCurseCounters(spell_id);
}
int Perl__CalculateCorruptionCounters(uint16 spell_id)
int Perl__CalculateCorruptionCounters(int32 spell_id)
{
return CalculateCorruptionCounters(spell_id);
}
int Perl__CalculateCounters(uint16 spell_id)
int Perl__CalculateCounters(int32 spell_id)
{
return CalculateCounters(spell_id);
}
int8 Perl__GetSpellResurrectionSicknessCheck(uint16 spell_id_one, uint16 spell_id_two)
int8 Perl__GetSpellResurrectionSicknessCheck(int32 spell_id_one, int32 spell_id_two)
{
return GetSpellResurrectionSicknessCheck(spell_id_one, spell_id_two);
}
int Perl__GetSpellNimbusEffect(uint16 spell_id)
int Perl__GetSpellNimbusEffect(int32 spell_id)
{
return GetSpellNimbusEffect(spell_id);
}
@@ -3049,12 +3049,12 @@ const int Perl__getitemstat(uint32 item_id, std::string identifier)
return quest_manager.getitemstat(item_id, identifier);
}
int Perl__getspellstat(uint32 spell_id, std::string stat_identifier)
int Perl__getspellstat(int32 spell_id, std::string stat_identifier)
{
return quest_manager.getspellstat(spell_id, stat_identifier);
}
int Perl__getspellstat(uint32 spell_id, std::string stat_identifier, uint8 slot)
int Perl__getspellstat(int32 spell_id, std::string stat_identifier, uint8 slot)
{
return quest_manager.getspellstat(spell_id, stat_identifier, slot);
}
@@ -3246,32 +3246,32 @@ void Perl__crosszoneassigntaskbyclientname(const char* client_name, uint32 task_
quest_manager.CrossZoneTaskUpdate(CZUpdateType_ClientName, CZTaskUpdateSubtype_AssignTask, update_identifier, task_id, task_subidentifier, update_count, enforce_level_requirement, client_name);
}
void Perl__crosszonecastspellbycharid(int character_id, uint32 spell_id)
void Perl__crosszonecastspellbycharid(int character_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Character, CZSpellUpdateSubtype_Cast, character_id, spell_id);
}
void Perl__crosszonecastspellbygroupid(int group_id, uint32 spell_id)
void Perl__crosszonecastspellbygroupid(int group_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Group, CZSpellUpdateSubtype_Cast, group_id, spell_id);
}
void Perl__crosszonecastspellbyraidid(int raid_id, uint32 spell_id)
void Perl__crosszonecastspellbyraidid(int raid_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Raid, CZSpellUpdateSubtype_Cast, raid_id, spell_id);
}
void Perl__crosszonecastspellbyguildid(int guild_id, uint32 spell_id)
void Perl__crosszonecastspellbyguildid(int guild_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Guild, CZSpellUpdateSubtype_Cast, guild_id, spell_id);
}
void Perl__crosszonecastspellbyexpeditionid(uint32 expedition_id, uint32 spell_id)
void Perl__crosszonecastspellbyexpeditionid(uint32 expedition_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Expedition, CZSpellUpdateSubtype_Cast, expedition_id, spell_id);
}
void Perl__crosszonecastspellbyclientname(const char* client_name, uint32 spell_id)
void Perl__crosszonecastspellbyclientname(const char* client_name, int32 spell_id)
{
int update_identifier = 0;
quest_manager.CrossZoneSpell(CZUpdateType_ClientName, CZSpellUpdateSubtype_Cast, update_identifier, spell_id, client_name);
@@ -4037,32 +4037,32 @@ void Perl__crosszoneremoveldonwinbyclientname(const char* client_name, uint32 th
quest_manager.CrossZoneLDoNUpdate(CZUpdateType_ClientName, CZLDoNUpdateSubtype_RemoveWin, update_identifier, theme_id, points, client_name);
}
void Perl__crosszoneremovespellbycharid(int character_id, uint32 spell_id)
void Perl__crosszoneremovespellbycharid(int character_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Character, CZSpellUpdateSubtype_Remove, character_id, spell_id);
}
void Perl__crosszoneremovespellbygroupid(int group_id, uint32 spell_id)
void Perl__crosszoneremovespellbygroupid(int group_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Group, CZSpellUpdateSubtype_Remove, group_id, spell_id);
}
void Perl__crosszoneremovespellbyraidid(int raid_id, uint32 spell_id)
void Perl__crosszoneremovespellbyraidid(int raid_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Raid, CZSpellUpdateSubtype_Remove, raid_id, spell_id);
}
void Perl__crosszoneremovespellbyguildid(int guild_id, uint32 spell_id)
void Perl__crosszoneremovespellbyguildid(int guild_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Guild, CZSpellUpdateSubtype_Remove, guild_id, spell_id);
}
void Perl__crosszoneremovespellbyexpeditionid(uint32 expedition_id, uint32 spell_id)
void Perl__crosszoneremovespellbyexpeditionid(uint32 expedition_id, int32 spell_id)
{
quest_manager.CrossZoneSpell(CZUpdateType_Expedition, CZSpellUpdateSubtype_Remove, expedition_id, spell_id);
}
void Perl__crosszoneremovespellbyclientname(const char* client_name, uint32 spell_id)
void Perl__crosszoneremovespellbyclientname(const char* client_name, int32 spell_id)
{
int update_identifier = 0;
quest_manager.CrossZoneSpell(CZUpdateType_ClientName, CZSpellUpdateSubtype_Remove, update_identifier, spell_id, client_name);
@@ -4394,17 +4394,17 @@ void Perl__worldwideassigntask(uint32 task_id, bool enforce_level_requirement, u
quest_manager.WorldWideTaskUpdate(WWTaskUpdateType_AssignTask, task_id, task_subidentifier, update_count, enforce_level_requirement, min_status, max_status);
}
void Perl__worldwidecastspell(uint32 spell_id)
void Perl__worldwidecastspell(int32 spell_id)
{
quest_manager.WorldWideSpell(WWSpellUpdateType_Cast, spell_id);
}
void Perl__worldwidecastspell(uint32 spell_id, uint8 min_status)
void Perl__worldwidecastspell(int32 spell_id, uint8 min_status)
{
quest_manager.WorldWideSpell(WWSpellUpdateType_Cast, spell_id, min_status);
}
void Perl__worldwidecastspell(uint32 spell_id, uint8 min_status, uint8 max_status)
void Perl__worldwidecastspell(int32 spell_id, uint8 min_status, uint8 max_status)
{
quest_manager.WorldWideSpell(WWSpellUpdateType_Cast, spell_id, min_status, max_status);
}
@@ -4586,17 +4586,17 @@ void Perl__worldwideremoveldonwin(uint32 theme_id, uint8 min_status, uint8 max_s
quest_manager.WorldWideLDoNUpdate(CZLDoNUpdateSubtype_RemoveWin, theme_id, points, min_status, max_status);
}
void Perl__worldwideremovespell(uint32 spell_id)
void Perl__worldwideremovespell(int32 spell_id)
{
quest_manager.WorldWideSpell(WWSpellUpdateType_Remove, spell_id);
}
void Perl__worldwideremovespell(uint32 spell_id, uint8 min_status)
void Perl__worldwideremovespell(int32 spell_id, uint8 min_status)
{
quest_manager.WorldWideSpell(WWSpellUpdateType_Remove, spell_id, min_status);
}
void Perl__worldwideremovespell(uint32 spell_id, uint8 min_status, uint8 max_status)
void Perl__worldwideremovespell(int32 spell_id, uint8 min_status, uint8 max_status)
{
quest_manager.WorldWideSpell(WWSpellUpdateType_Remove, spell_id, min_status, max_status);
}
@@ -4723,7 +4723,7 @@ uint32_t Perl__countspawnednpcs(perl::array npc_id_array)
return entity_list.CountSpawnedNPCs(npc_ids);
}
SPDat_Spell_Struct* Perl__getspell(uint32 spell_id)
SPDat_Spell_Struct* Perl__getspell(int32 spell_id)
{
// should be safe, it's read only in perl (could also use proxy lika lua)
return const_cast<SPDat_Spell_Struct*>(quest_manager.getspell(spell_id));
@@ -6320,8 +6320,8 @@ void perl_register_quest()
package.add("IsShadowStepSpell", &Perl__IsShadowStepSpell);
package.add("IsShortDurationBuff", &Perl__IsShortDurationBuff);
package.add("IsSnowing", &Perl__IsSnowing);
package.add("IsSpellUsableInThisZoneType", (bool(*)(uint16))&Perl__IsSpellUsableInThisZoneType);
package.add("IsSpellUsableInThisZoneType", (bool(*)(uint16, uint8))&Perl__IsSpellUsableInThisZoneType);
package.add("IsSpellUsableInThisZoneType", (bool(*)(int32))&Perl__IsSpellUsableInThisZoneType);
package.add("IsSpellUsableInThisZoneType", (bool(*)(int32, uint8))&Perl__IsSpellUsableInThisZoneType);
package.add("IsStackableDOT", &Perl__IsStackableDOT);
package.add("IsStunSpell", &Perl__IsStunSpell);
package.add("IsSuccorSpell", &Perl__IsSuccorSpell);
@@ -6585,9 +6585,9 @@ void perl_register_quest()
package.add("worldwideassigntask", (void(*)(uint32, bool))&Perl__worldwideassigntask);
package.add("worldwideassigntask", (void(*)(uint32, bool, uint8))&Perl__worldwideassigntask);
package.add("worldwideassigntask", (void(*)(uint32, bool, uint8, uint8))&Perl__worldwideassigntask);
package.add("worldwidecastspell", (void(*)(uint32))&Perl__worldwidecastspell);
package.add("worldwidecastspell", (void(*)(uint32, uint8))&Perl__worldwidecastspell);
package.add("worldwidecastspell", (void(*)(uint32, uint8, uint8 max_status))&Perl__worldwidecastspell);
package.add("worldwidecastspell", (void(*)(int32))&Perl__worldwidecastspell);
package.add("worldwidecastspell", (void(*)(int32, uint8))&Perl__worldwidecastspell);
package.add("worldwidecastspell", (void(*)(int32, uint8, uint8 max_status))&Perl__worldwidecastspell);
package.add("worldwidedialoguewindow", (void(*)(const char*))&Perl__worldwidedialoguewindow);
package.add("worldwidedialoguewindow", (void(*)(const char*, uint8))&Perl__worldwidedialoguewindow);
package.add("worldwidedialoguewindow", (void(*)(const char*, uint8, uint8))&Perl__worldwidedialoguewindow);
@@ -6618,9 +6618,9 @@ void perl_register_quest()
package.add("worldwideremoveldonwin", (void(*)(uint32))&Perl__worldwideremoveldonwin);
package.add("worldwideremoveldonwin", (void(*)(uint32, uint8))&Perl__worldwideremoveldonwin);
package.add("worldwideremoveldonwin", (void(*)(uint32, uint8, uint8))&Perl__worldwideremoveldonwin);
package.add("worldwideremovespell", (void(*)(uint32))&Perl__worldwideremovespell);
package.add("worldwideremovespell", (void(*)(uint32, uint8))&Perl__worldwideremovespell);
package.add("worldwideremovespell", (void(*)(uint32, uint8, uint8))&Perl__worldwideremovespell);
package.add("worldwideremovespell", (void(*)(int32))&Perl__worldwideremovespell);
package.add("worldwideremovespell", (void(*)(int32, uint8))&Perl__worldwideremovespell);
package.add("worldwideremovespell", (void(*)(int32, uint8, uint8))&Perl__worldwideremovespell);
package.add("worldwideremovetask", (void(*)(uint32))&Perl__worldwideremovetask);
package.add("worldwideremovetask", (void(*)(uint32, uint8))&Perl__worldwideremovetask);
package.add("worldwideremovetask", (void(*)(uint32, uint8, uint8))&Perl__worldwideremovetask);
@@ -6753,8 +6753,8 @@ void perl_register_quest()
package.add("getspell", &Perl__getspell);
package.add("getspellname", &Perl__getspellname);
package.add("get_spell_level", &Perl__get_spell_level);
package.add("getspellstat", (int(*)(uint32, std::string))&Perl__getspellstat);
package.add("getspellstat", (int(*)(uint32, std::string, uint8))&Perl__getspellstat);
package.add("getspellstat", (int(*)(int32, std::string))&Perl__getspellstat);
package.add("getspellstat", (int(*)(int32, std::string, uint8))&Perl__getspellstat);
package.add("getskillname", &Perl__getskillname);
package.add("get_timers", &Perl__get_timers);
package.add("getlevel", &Perl__getlevel);
zone/encounter.h
+2 -2
View File
@@ -32,8 +32,8 @@ public:
~Encounter();
//abstract virtual function implementations required by base abstract class
virtual bool Death(Mob* killer_mob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false) { return true; }
virtual void Damage(Mob* from, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) { return; }
virtual bool Death(Mob* killer_mob, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false) { return true; }
virtual void Damage(Mob* from, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) { return; }
bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false,
bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr) override {
return false;
zone/entity.h
+2 -2
View File
@@ -445,13 +445,13 @@ public:
void AESpell(
Mob* caster,
Mob* center,
uint16 spell_id,
int32 spell_id,
bool affect_caster = true,
int16 resist_adjust = 0,
int* max_targets = nullptr,
bool is_scripted = false
);
void MassGroupBuff(Mob* caster, Mob* center, uint16 spell_id, bool affect_caster = true);
void MassGroupBuff(Mob* caster, Mob* center, int32 spell_id, bool affect_caster = true);
//trap stuff
Mob* GetTrapTrigger(Trap* trap);
zone/gm_commands/castspell.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ void command_castspell(Client *c, const Seperator *sep)
t = c->GetTarget();
}
const uint16 spell_id = Strings::ToUnsignedInt(sep->arg[1]);
const int32 spell_id = Strings::ToInt(sep->arg[1]);
if (spell_id >= SPDAT_RECORDS) {
c->Message(Chat::White, "Invalid Spell ID.");
zone/gm_commands/npccast.cpp
+4 -4
View File
@@ -27,7 +27,7 @@ void command_npccast(Client *c, const Seperator *sep)
auto target = c->GetTarget()->CastToNPC();
if (!sep->IsNumber(1) && sep->arg[1] && sep->IsNumber(2)) {
std::string entity_name = sep->arg[1] ? sep->arg[1] : 0;
auto spell_id = sep->arg[2] ? Strings::ToUnsignedInt(sep->arg[2]) : 0;
int32 spell_id = sep->arg[2] ? Strings::ToInt(sep->arg[2]) : 0;
auto spell_target = entity_list.GetMob(entity_name.c_str());
if (spell_target && IsValidSpell(spell_id) && spell_id < SPDAT_RECORDS) {
c->Message(
@@ -35,7 +35,7 @@ void command_npccast(Client *c, const Seperator *sep)
fmt::format(
"{} casting {} ({}) on {}.",
c->GetTargetDescription(target),
GetSpellName(static_cast<uint16>(spell_id)),
GetSpellName(spell_id),
spell_id,
c->GetTargetDescription(spell_target)
).c_str()
@@ -63,7 +63,7 @@ void command_npccast(Client *c, const Seperator *sep)
}
} else if (sep->IsNumber(1) && sep->IsNumber(2)) {
uint16 entity_id = static_cast<uint16>(Strings::ToUnsignedInt(sep->arg[1]));
auto spell_id = Strings::ToUnsignedInt(sep->arg[2]);
int32 spell_id = Strings::ToInt(sep->arg[2]);
auto spell_target = entity_list.GetMob(entity_id);
if (spell_target && IsValidSpell(spell_id) && spell_id < SPDAT_RECORDS) {
c->Message(
@@ -71,7 +71,7 @@ void command_npccast(Client *c, const Seperator *sep)
fmt::format(
"{} casting {} ({}) on {}.",
c->GetTargetDescription(target),
GetSpellName(static_cast<uint16>(spell_id)),
GetSpellName(spell_id),
spell_id,
c->GetTargetDescription(spell_target)
).c_str()
zone/gm_commands/unscribespell.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ void command_unscribespell(Client *c, const Seperator *sep)
t = c->GetTarget()->CastToClient();
}
const uint16 spell_id = EQ::Clamp(Strings::ToInt(sep->arg[1]), 0, 65535);
const int32 spell_id = Strings::ToInt(sep->arg[1]);
if (!IsValidSpell(spell_id)) {
c->Message(
zone/gm_commands/untraindisc.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ void command_untraindisc(Client *c, const Seperator *sep)
target = c->GetTarget()->CastToClient();
}
uint16 spell_id = EQ::Clamp(Strings::ToInt(sep->arg[1]), 0, 65535);
int32 spell_id = Strings::ToInt(sep->arg[1]);
if (!IsValidSpell(spell_id)) {
c->Message(
zone/groups.cpp
+1 -1
View File
@@ -810,7 +810,7 @@ bool Group::DelMember(Mob* oldmember, bool ignoresender)
return true;
}
void Group::CastGroupSpell(Mob* caster, uint16 spell_id) {
void Group::CastGroupSpell(Mob* caster, int32 spell_id) {
uint32 z;
float range, distance;
zone/groups.h
+1 -1
View File
@@ -77,7 +77,7 @@ public:
bool IsGroupMember(const char* name);
bool Process();
void SendGroupJoinOOZ(Mob* NewMember);
void CastGroupSpell(Mob* caster,uint16 spellid);
void CastGroupSpell(Mob* caster,int32 spellid);
void SplitExp(ExpSource exp_source, const uint64 exp, Mob* other);
void GroupMessage(Mob* sender,uint8 language,uint8 lang_skill,const char* message);
void GroupMessageString(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);
zone/hate_list.cpp
+1 -1
View File
@@ -800,7 +800,7 @@ int HateList::AreaRampage(Mob *caster, Mob *target, int count, ExtraAttackOption
return hit_count;
}
void HateList::SpellCast(Mob *caster, uint32 spell_id, float range, Mob* ae_center)
void HateList::SpellCast(Mob *caster, int32 spell_id, float range, Mob* ae_center)
{
if (!caster)
return;
zone/hate_list.h
+1 -1
View File
@@ -92,7 +92,7 @@ public:
void PrintHateListToClient(Client *c);
void SetHateAmountOnEnt(Mob *other, int64 in_hate, uint64 in_damage);
void SetHateOwner(Mob *new_hate_owner) { hate_owner = new_hate_owner; }
void SpellCast(Mob *caster, uint32 spell_id, float range, Mob *ae_center = nullptr);
void SpellCast(Mob *caster, int32 spell_id, float range, Mob *ae_center = nullptr);
void WipeHateList(bool npc_only = false);
void RemoveStaleEntries(int time_ms, float dist);
zone/horse.cpp
+5 -5
View File
@@ -30,7 +30,7 @@ std::map<uint16, const NPCType *> Horse::horse_types;
Horse::Horse(
Client *c,
uint16 spell_id,
int32 spell_id,
const glm::vec4& position
) : NPC(
GetHorseType(spell_id),
@@ -52,12 +52,12 @@ void Horse::FillSpawnStruct(NewSpawn_Struct* ns, Mob* m) {
ns->spawn.runspeed = NPCTypedata->runspeed;
}
bool Horse::IsHorseSpell(uint16 spell_id)
bool Horse::IsHorseSpell(int32 spell_id)
{
return GetHorseType(spell_id);
}
const NPCType *Horse::GetHorseType(uint16 spell_id)
const NPCType *Horse::GetHorseType(int32 spell_id)
{
if (horse_types.count(spell_id)) {
return horse_types[spell_id];
@@ -70,7 +70,7 @@ const NPCType *Horse::GetHorseType(uint16 spell_id)
return n;
}
const NPCType *Horse::BuildHorseType(uint16 spell_id)
const NPCType *Horse::BuildHorseType(int32 spell_id)
{
const auto& l = HorsesRepository::GetWhere(
content_db,
@@ -119,7 +119,7 @@ const NPCType *Horse::BuildHorseType(uint16 spell_id)
return n;
}
void Client::SummonHorse(uint16 spell_id)
void Client::SummonHorse(int32 spell_id)
{
if (GetHorseId()) {
MessageString(Chat::Red, ALREADY_ON_A_MOUNT);
zone/horse.h
+4 -4
View File
@@ -29,15 +29,15 @@ struct NewSpawn_Struct;
class Horse : public NPC {
public:
Horse(Client* c, uint16 spell_id, const glm::vec4& position);
Horse(Client* c, int32 spell_id, const glm::vec4& position);
virtual void FillSpawnStruct(NewSpawn_Struct* ns, Mob* m);
static bool IsHorseSpell(uint16 spell_id);
static bool IsHorseSpell(int32 spell_id);
protected:
Client* owner;
static std::map<uint16, const NPCType*> horse_types;
static const NPCType* GetHorseType(uint16 spell_id);
static const NPCType* BuildHorseType(uint16 spell_id);
static const NPCType* GetHorseType(int32 spell_id);
static const NPCType* BuildHorseType(int32 spell_id);
};
zone/lua_bot.cpp
+18 -18
View File
@@ -143,7 +143,7 @@ void Lua_Bot::ReloadBotSpellSettings() {
self->LoadBotSpellSettings();
}
bool Lua_Bot::HasBotSpellEntry(uint16 spellid) {
bool Lua_Bot::HasBotSpellEntry(int32 spellid) {
Lua_Safe_Call_Bool();
return self->HasBotSpellEntry(spellid);
}
@@ -407,7 +407,7 @@ void Lua_Bot::ClearDisciplineReuseTimer() {
return self->ClearDisciplineReuseTimer();
}
void Lua_Bot::ClearDisciplineReuseTimer(uint16 spell_id) {
void Lua_Bot::ClearDisciplineReuseTimer(int32 spell_id) {
Lua_Safe_Call_Void();
return self->ClearDisciplineReuseTimer(spell_id);
}
@@ -427,7 +427,7 @@ void Lua_Bot::ClearSpellRecastTimer() {
return self->ClearSpellRecastTimer();
}
void Lua_Bot::ClearSpellRecastTimer(uint16 spell_id) {
void Lua_Bot::ClearSpellRecastTimer(int32 spell_id) {
Lua_Safe_Call_Void();
return self->ClearSpellRecastTimer(spell_id);
}
@@ -437,7 +437,7 @@ uint32 Lua_Bot::GetDisciplineReuseTimer() {
return self->GetDisciplineReuseRemainingTime();
}
uint32 Lua_Bot::GetDisciplineReuseTimer(uint16 spell_id) {
uint32 Lua_Bot::GetDisciplineReuseTimer(int32 spell_id) {
Lua_Safe_Call_Int();
return self->GetDisciplineReuseRemainingTime(spell_id);
}
@@ -457,17 +457,17 @@ uint32 Lua_Bot::GetSpellRecastTimer() {
return self->GetSpellRecastRemainingTime();
}
uint32 Lua_Bot::GetSpellRecastTimer(uint16 spell_id) {
uint32 Lua_Bot::GetSpellRecastTimer(int32 spell_id) {
Lua_Safe_Call_Int();
return self->GetSpellRecastRemainingTime(spell_id);
}
void Lua_Bot::SetDisciplineReuseTimer(uint16 spell_id) {
void Lua_Bot::SetDisciplineReuseTimer(int32 spell_id) {
Lua_Safe_Call_Void();
return self->SetDisciplineReuseTimer(spell_id);
}
void Lua_Bot::SetDisciplineReuseTimer(uint16 spell_id, uint32 reuse_timer) {
void Lua_Bot::SetDisciplineReuseTimer(int32 spell_id, uint32 reuse_timer) {
Lua_Safe_Call_Void();
return self->SetDisciplineReuseTimer(spell_id, reuse_timer);
}
@@ -482,12 +482,12 @@ void Lua_Bot::SetItemReuseTimer(uint32 item_id, uint32 reuse_timer) {
return self->SetItemReuseTimer(item_id, reuse_timer);
}
void Lua_Bot::SetSpellRecastTimer(uint16 spell_id) {
void Lua_Bot::SetSpellRecastTimer(int32 spell_id) {
Lua_Safe_Call_Void();
return self->SetSpellRecastTimer(spell_id);
}
void Lua_Bot::SetSpellRecastTimer(uint16 spell_id, uint32 recast_delay) {
void Lua_Bot::SetSpellRecastTimer(int32 spell_id, uint32 recast_delay) {
Lua_Safe_Call_Void();
return self->SetSpellRecastTimer(spell_id, recast_delay);
}
@@ -560,7 +560,7 @@ Lua_ItemInst Lua_Bot::GetItemAt(int16 slot_id) // @categories Inventory and Item
return Lua_ItemInst(self->GetInv().GetItem(slot_id));
}
void Lua_Bot::SendSpellAnim(uint16 target_id, uint16 spell_id)
void Lua_Bot::SendSpellAnim(uint16 target_id, int32 spell_id)
{
Lua_Safe_Call_Void();
self->SendSpellAnim(target_id, spell_id);
@@ -715,11 +715,11 @@ luabind::scope lua_register_bot() {
.def("Camp", (void(Lua_Bot::*)(void))&Lua_Bot::Camp)
.def("Camp", (void(Lua_Bot::*)(bool))&Lua_Bot::Camp)
.def("ClearDisciplineReuseTimer", (void(Lua_Bot::*)())&Lua_Bot::ClearDisciplineReuseTimer)
.def("ClearDisciplineReuseTimer", (void(Lua_Bot::*)(uint16))&Lua_Bot::ClearDisciplineReuseTimer)
.def("ClearDisciplineReuseTimer", (void(Lua_Bot::*)(int32))&Lua_Bot::ClearDisciplineReuseTimer)
.def("ClearItemReuseTimer", (void(Lua_Bot::*)())&Lua_Bot::ClearItemReuseTimer)
.def("ClearItemReuseTimer", (void(Lua_Bot::*)(uint32))&Lua_Bot::ClearItemReuseTimer)
.def("ClearSpellRecastTimer", (void(Lua_Bot::*)())&Lua_Bot::ClearSpellRecastTimer)
.def("ClearSpellRecastTimer", (void(Lua_Bot::*)(uint16))&Lua_Bot::ClearSpellRecastTimer)
.def("ClearSpellRecastTimer", (void(Lua_Bot::*)(int32))&Lua_Bot::ClearSpellRecastTimer)
.def("CountAugmentEquippedByID", (uint32(Lua_Bot::*)(uint32))&Lua_Bot::CountAugmentEquippedByID)
.def("CountBotItem", (uint32(Lua_Bot::*)(uint32))&Lua_Bot::CountBotItem)
.def("CountItemEquippedByID", (uint32(Lua_Bot::*)(uint32))&Lua_Bot::CountItemEquippedByID)
@@ -746,7 +746,7 @@ luabind::scope lua_register_bot() {
.def("GetBotItem", (Lua_ItemInst(Lua_Bot::*)(uint16))&Lua_Bot::GetBotItem)
.def("GetBotItemIDBySlot", (uint32(Lua_Bot::*)(uint16))&Lua_Bot::GetBotItemIDBySlot)
.def("GetDisciplineReuseTimer", (uint32(Lua_Bot::*)())&Lua_Bot::GetDisciplineReuseTimer)
.def("GetDisciplineReuseTimer", (uint32(Lua_Bot::*)(uint16))&Lua_Bot::GetDisciplineReuseTimer)
.def("GetDisciplineReuseTimer", (uint32(Lua_Bot::*)(int32))&Lua_Bot::GetDisciplineReuseTimer)
.def("GetBucket", (std::string(Lua_Bot::*)(std::string))&Lua_Bot::GetBucket)
.def("GetBucketExpires", (std::string(Lua_Bot::*)(std::string))&Lua_Bot::GetBucketExpires)
.def("GetBucketRemaining", (std::string(Lua_Bot::*)(std::string))&Lua_Bot::GetBucketRemaining)
@@ -764,7 +764,7 @@ luabind::scope lua_register_bot() {
.def("GetRawItemAC", (int(Lua_Bot::*)(void))&Lua_Bot::GetRawItemAC)
.def("GetSpellDamage", (int(Lua_Bot::*)(void))&Lua_Bot::GetSpellDamage)
.def("GetSpellRecastTimer", (uint32(Lua_Bot::*)())&Lua_Bot::GetSpellRecastTimer)
.def("GetSpellRecastTimer", (uint32(Lua_Bot::*)(uint16))&Lua_Bot::GetSpellRecastTimer)
.def("GetSpellRecastTimer", (uint32(Lua_Bot::*)(int32))&Lua_Bot::GetSpellRecastTimer)
.def("HasAugmentEquippedByID", (bool(Lua_Bot::*)(uint32))&Lua_Bot::HasAugmentEquippedByID)
.def("HasBotItem", (int16(Lua_Bot::*)(uint32))&Lua_Bot::HasBotItem)
.def("HasBotSpellEntry", (bool(Lua_Bot::*)(uint16))&Lua_Bot::HasBotSpellEntry)
@@ -782,8 +782,8 @@ luabind::scope lua_register_bot() {
.def("SetBucket", (void(Lua_Bot::*)(std::string,std::string))&Lua_Bot::SetBucket)
.def("SetBucket", (void(Lua_Bot::*)(std::string,std::string,std::string))&Lua_Bot::SetBucket)
.def("SetExpansionBitmask", (void(Lua_Bot::*)(int))&Lua_Bot::SetExpansionBitmask)
.def("SetDisciplineReuseTimer", (void(Lua_Bot::*)(uint16))&Lua_Bot::SetDisciplineReuseTimer)
.def("SetDisciplineReuseTimer", (void(Lua_Bot::*)(uint16, uint32))&Lua_Bot::SetDisciplineReuseTimer)
.def("SetDisciplineReuseTimer", (void(Lua_Bot::*)(int32))&Lua_Bot::SetDisciplineReuseTimer)
.def("SetDisciplineReuseTimer", (void(Lua_Bot::*)(int32, uint32))&Lua_Bot::SetDisciplineReuseTimer)
.def("SetItemReuseTimer", (void(Lua_Bot::*)(uint32))&Lua_Bot::SetItemReuseTimer)
.def("SetItemReuseTimer", (void(Lua_Bot::*)(uint32, uint32))&Lua_Bot::SetItemReuseTimer)
.def("SetSpellDuration", (void(Lua_Bot::*)(int))&Lua_Bot::SetSpellDuration)
@@ -799,8 +799,8 @@ luabind::scope lua_register_bot() {
.def("SetSpellDurationRaid", (void(Lua_Bot::*)(int,int,int))&Lua_Bot::SetSpellDurationRaid)
.def("SetSpellDurationRaid", (void(Lua_Bot::*)(int,int,int,bool))&Lua_Bot::SetSpellDurationRaid)
.def("SetSpellDurationRaid", (void(Lua_Bot::*)(int,int,int,bool,bool))&Lua_Bot::SetSpellDurationRaid)
.def("SetSpellRecastTimer", (void(Lua_Bot::*)(uint16))&Lua_Bot::SetSpellRecastTimer)
.def("SetSpellRecastTimer", (void(Lua_Bot::*)(uint16, uint32))&Lua_Bot::SetSpellRecastTimer)
.def("SetSpellRecastTimer", (void(Lua_Bot::*)(int32))&Lua_Bot::SetSpellRecastTimer)
.def("SetSpellRecastTimer", (void(Lua_Bot::*)(int32, uint32))&Lua_Bot::SetSpellRecastTimer)
.def("SendPayload", (void(Lua_Bot::*)(int))&Lua_Bot::SendPayload)
.def("SendPayload", (void(Lua_Bot::*)(int,std::string))&Lua_Bot::SendPayload)
.def("Signal", (void(Lua_Bot::*)(int))&Lua_Bot::Signal)
zone/lua_bot.h
+10 -10
View File
@@ -70,7 +70,7 @@ public:
void RemoveBotItem(uint32 item_id);
void SetExpansionBitmask(int expansion_bitmask);
void Signal(int signal_id);
bool HasBotSpellEntry(uint16 spellid);
bool HasBotSpellEntry(int32 spellid);
void SendPayload(int payload_id);
void SendPayload(int payload_id, std::string payload_value);
uint32 GetBotID();
@@ -82,7 +82,7 @@ public:
luabind::object GetAugmentIDsBySlotID(lua_State* L, int16 slot_id) const;
Lua_ItemInst GetItemAt(int16 slot_id);
int GetItemIDAt(int16 slot_id);
void SendSpellAnim(uint16 target_id, uint16 spell_id);
void SendSpellAnim(uint16 target_id, int32 spell_id);
std::string GetClassAbbreviation();
std::string GetRaceAbbreviation();
void DeleteBucket(std::string bucket_name);
@@ -125,23 +125,23 @@ public:
void SetSpellDurationRaid(int spell_id, int duration, int level, bool allow_pets, bool is_raid_group_only);
void ClearDisciplineReuseTimer();
void ClearDisciplineReuseTimer(uint16 spell_id);
void ClearDisciplineReuseTimer(int32 spell_id);
void ClearItemReuseTimer();
void ClearItemReuseTimer(uint32 item_id);
void ClearSpellRecastTimer();
void ClearSpellRecastTimer(uint16 spell_id);
void ClearSpellRecastTimer(int32 spell_id);
uint32 GetDisciplineReuseTimer();
uint32 GetDisciplineReuseTimer(uint16 spell_id);
uint32 GetDisciplineReuseTimer(int32 spell_id);
uint32 GetItemReuseTimer();
uint32 GetItemReuseTimer(uint32 item_id);
uint32 GetSpellRecastTimer();
uint32 GetSpellRecastTimer(uint16 spell_id);
void SetDisciplineReuseTimer(uint16 spell_id);
void SetDisciplineReuseTimer(uint16 spell_id, uint32 reuse_timer);
uint32 GetSpellRecastTimer(int32 spell_id);
void SetDisciplineReuseTimer(int32 spell_id);
void SetDisciplineReuseTimer(int32 spell_id, uint32 reuse_timer);
void SetItemReuseTimer(uint32 item_id);
void SetItemReuseTimer(uint32 item_id, uint32 reuse_timer);
void SetSpellRecastTimer(uint16 spell_id);
void SetSpellRecastTimer(uint16 spell_id, uint32 reuse_timer);
void SetSpellRecastTimer(int32 spell_id);
void SetSpellRecastTimer(int32 spell_id, uint32 reuse_timer);
uint32 CountAugmentEquippedByID(uint32 item_id);
uint32 CountItemEquippedByID(uint32 item_id);
zone/lua_buff.cpp
+1 -1
View File
@@ -107,7 +107,7 @@ int16 Lua_Buff::GetRootBreakChance()
return self->RootBreakChance;
}
uint16 Lua_Buff::GetSpellID()
int32 Lua_Buff::GetSpellID()
{
Lua_Safe_Call_Int();
return self->spellid;
zone/lua_buff.h
+1 -1
View File
@@ -56,7 +56,7 @@ public:
uint32 GetMeleeRune();
uint32 GetNumberOfHits();
int16 GetRootBreakChance();
uint16 GetSpellID();
int32 GetSpellID();
int GetTicsRemaining();
int GetVirusSpreadTime();
bool IsCasterClient();
zone/lua_client.cpp
+15 -15
View File
@@ -647,7 +647,7 @@ uint16 Lua_Client::FindMemmedSpellBySlot(int slot) {
return self->FindMemmedSpellBySlot(slot);
}
int Lua_Client::FindMemmedSpellBySpellID(uint16 spell_id) {
int Lua_Client::FindMemmedSpellBySpellID(int32 spell_id) {
Lua_Safe_Call_Int();
return self->FindMemmedSpellBySpellID(spell_id);
}
@@ -1083,7 +1083,7 @@ bool Lua_Client::UseDiscipline(int spell_id, int target_id) {
return self->UseDiscipline(spell_id, target_id);
}
bool Lua_Client::HasDisciplineLearned(uint16 spell_id) {
bool Lua_Client::HasDisciplineLearned(int32 spell_id) {
Lua_Safe_Call_Bool();
return self->HasDisciplineLearned(spell_id);
}
@@ -1377,7 +1377,7 @@ int Lua_Client::GetNextAvailableSpellBookSlot() {
return self->GetNextAvailableSpellBookSlot();
}
uint32 Lua_Client::GetSpellIDByBookSlot(int slot_id) {
int32 Lua_Client::GetSpellIDByBookSlot(int slot_id) {
Lua_Safe_Call_Int();
return self->GetSpellIDByBookSlot(slot_id);
}
@@ -2320,12 +2320,12 @@ int16 Lua_Client::GetGMStatus() {
return self->Admin();
}
void Lua_Client::UntrainDiscBySpellID(uint16 spell_id) {
void Lua_Client::UntrainDiscBySpellID(int32 spell_id) {
Lua_Safe_Call_Void();
self->UntrainDiscBySpellID(spell_id);
}
void Lua_Client::UntrainDiscBySpellID(uint16 spell_id, bool update_client) {
void Lua_Client::UntrainDiscBySpellID(int32 spell_id, bool update_client) {
Lua_Safe_Call_Void();
self->UntrainDiscBySpellID(spell_id, update_client);
}
@@ -2422,17 +2422,17 @@ void Lua_Client::ResetAllCastbarCooldowns() {
self->ResetAllCastbarCooldowns();
}
void Lua_Client::ResetCastbarCooldownBySpellID(uint32 spell_id) {
void Lua_Client::ResetCastbarCooldownBySpellID(int32 spell_id) {
Lua_Safe_Call_Void();
self->ResetCastbarCooldownBySpellID(spell_id);
}
void Lua_Client::UnscribeSpellBySpellID(uint16 spell_id) {
void Lua_Client::UnscribeSpellBySpellID(int32 spell_id) {
Lua_Safe_Call_Void();
self->UnscribeSpellBySpellID(spell_id);
}
void Lua_Client::UnscribeSpellBySpellID(uint16 spell_id, bool update_client) {
void Lua_Client::UnscribeSpellBySpellID(int32 spell_id, bool update_client) {
Lua_Safe_Call_Void();
self->UnscribeSpellBySpellID(spell_id, update_client);
}
@@ -3760,7 +3760,7 @@ luabind::scope lua_register_client() {
.def("FilteredMessage", &Lua_Client::FilteredMessage)
.def("FindEmptyMemSlot", (int(Lua_Client::*)(void))&Lua_Client::FindEmptyMemSlot)
.def("FindMemmedSpellBySlot", (uint16(Lua_Client::*)(int))&Lua_Client::FindMemmedSpellBySlot)
.def("FindMemmedSpellBySpellID", (int(Lua_Client::*)(uint16))&Lua_Client::FindMemmedSpellBySpellID)
.def("FindMemmedSpellBySpellID", (int(Lua_Client::*)(int32 ))&Lua_Client::FindMemmedSpellBySpellID)
.def("FindSpellBookSlotBySpellID", (int(Lua_Client::*)(int))&Lua_Client::FindSpellBookSlotBySpellID)
.def("Fling", (void(Lua_Client::*)(float,float,float))&Lua_Client::Fling)
.def("Fling", (void(Lua_Client::*)(float,float,float,bool))&Lua_Client::Fling)
@@ -3914,7 +3914,7 @@ luabind::scope lua_register_client() {
.def("GetSkillPoints", (int(Lua_Client::*)(void))&Lua_Client::GetSkillPoints)
.def("GetSkillTrainLevel", (uint8(Lua_Client::*)(int))&Lua_Client::GetSkillTrainLevel)
.def("GetSpellDamage", (int(Lua_Client::*)(void))&Lua_Client::GetSpellDamage)
.def("GetSpellIDByBookSlot", (uint32(Lua_Client::*)(int))&Lua_Client::GetSpellIDByBookSlot)
.def("GetSpellIDByBookSlot", (int32 (Lua_Client::*)(int))&Lua_Client::GetSpellIDByBookSlot)
.def("GetSpentAA", (int(Lua_Client::*)(void))&Lua_Client::GetSpentAA)
.def("GetStartZone", (int(Lua_Client::*)(void))&Lua_Client::GetStartZone)
.def("GetTargetRingX", (float(Lua_Client::*)(void))&Lua_Client::GetTargetRingX)
@@ -4065,7 +4065,7 @@ luabind::scope lua_register_client() {
.def("ResetAllCastbarCooldowns", (void(Lua_Client::*)(void))&Lua_Client::ResetAllCastbarCooldowns)
.def("ResetAlternateAdvancementRank", &Lua_Client::ResetAlternateAdvancementRank)
.def("ResetCastbarCooldownBySlot", (void(Lua_Client::*)(int))&Lua_Client::ResetCastbarCooldownBySlot)
.def("ResetCastbarCooldownBySpellID", (void(Lua_Client::*)(uint32))&Lua_Client::ResetCastbarCooldownBySpellID)
.def("ResetCastbarCooldownBySpellID", (void(Lua_Client::*)(int32 ))&Lua_Client::ResetCastbarCooldownBySpellID)
.def("ResetDisciplineTimer", (void(Lua_Client::*)(uint32))&Lua_Client::ResetDisciplineTimer)
.def("ResetItemCooldown", (void(Lua_Client::*)(uint32))&Lua_Client::ResetItemCooldown)
.def("ResetLeadershipAA", (void(Lua_Client::*)(void))&Lua_Client::ResetLeadershipAA)
@@ -4229,14 +4229,14 @@ luabind::scope lua_register_client() {
.def("UnscribeSpell", (void(Lua_Client::*)(int,bool))&Lua_Client::UnscribeSpell)
.def("UnscribeSpellAll", (void(Lua_Client::*)(bool))&Lua_Client::UnscribeSpellAll)
.def("UnscribeSpellAll", (void(Lua_Client::*)(void))&Lua_Client::UnscribeSpellAll)
.def("UnscribeSpellBySpellID", (void(Lua_Client::*)(uint16))&Lua_Client::UnscribeSpellBySpellID)
.def("UnscribeSpellBySpellID", (void(Lua_Client::*)(uint16,bool))&Lua_Client::UnscribeSpellBySpellID)
.def("UnscribeSpellBySpellID", (void(Lua_Client::*)(int32 ))&Lua_Client::UnscribeSpellBySpellID)
.def("UnscribeSpellBySpellID", (void(Lua_Client::*)(int32 ,bool))&Lua_Client::UnscribeSpellBySpellID)
.def("UntrainDisc", (void(Lua_Client::*)(int))&Lua_Client::UntrainDisc)
.def("UntrainDisc", (void(Lua_Client::*)(int,bool))&Lua_Client::UntrainDisc)
.def("UntrainDiscAll", (void(Lua_Client::*)(bool))&Lua_Client::UntrainDiscAll)
.def("UntrainDiscAll", (void(Lua_Client::*)(void))&Lua_Client::UntrainDiscAll)
.def("UntrainDiscBySpellID", (void(Lua_Client::*)(uint16))&Lua_Client::UntrainDiscBySpellID)
.def("UntrainDiscBySpellID", (void(Lua_Client::*)(uint16,bool))&Lua_Client::UntrainDiscBySpellID)
.def("UntrainDiscBySpellID", (void(Lua_Client::*)(int32 ))&Lua_Client::UntrainDiscBySpellID)
.def("UntrainDiscBySpellID", (void(Lua_Client::*)(int32 ,bool))&Lua_Client::UntrainDiscBySpellID)
.def("UpdateAdmin", (void(Lua_Client::*)(void))&Lua_Client::UpdateAdmin)
.def("UpdateAdmin", (void(Lua_Client::*)(bool))&Lua_Client::UpdateAdmin)
.def("UpdateGroupAAs", (void(Lua_Client::*)(int,uint32))&Lua_Client::UpdateGroupAAs)
zone/lua_client.h
+8 -8
View File
@@ -214,7 +214,7 @@ public:
void UnmemSpellAll(bool update_client);
int FindEmptyMemSlot();
uint16 FindMemmedSpellBySlot(int slot);
int FindMemmedSpellBySpellID(uint16 spell_id);
int FindMemmedSpellBySpellID(int32 spell_id);
int MemmedCount();
luabind::object GetLearnableDisciplines(lua_State* L);
luabind::object GetLearnableDisciplines(lua_State* L, uint8 min_level);
@@ -232,16 +232,16 @@ public:
void UnscribeSpell(int slot, bool update_client);
void UnscribeSpellAll();
void UnscribeSpellAll(bool update_client);
void UnscribeSpellBySpellID(uint16 spell_id);
void UnscribeSpellBySpellID(uint16 spell_id, bool update_client);
void UnscribeSpellBySpellID(int32 spell_id);
void UnscribeSpellBySpellID(int32 spell_id, bool update_client);
void TrainDisc(int itemid);
uint16 LearnDisciplines(uint8 min_level, uint8 max_level);
void TrainDiscBySpellID(int32 spell_id);
int GetDiscSlotBySpellID(int32 spell_id);
void UntrainDisc(int slot);
void UntrainDisc(int slot, bool update_client);
void UntrainDiscBySpellID(uint16 spell_id);
void UntrainDiscBySpellID(uint16 spell_id, bool update_client);
void UntrainDiscBySpellID(int32 spell_id);
void UntrainDiscBySpellID(int32 spell_id, bool update_client);
void UntrainDiscAll();
void UntrainDiscAll(bool update_client);
bool IsStanding();
@@ -294,10 +294,10 @@ public:
void ResetDisciplineTimer(uint32 timer_id);
void ResetCastbarCooldownBySlot(int slot);
void ResetAllCastbarCooldowns();
void ResetCastbarCooldownBySpellID(uint32 spell_id);
void ResetCastbarCooldownBySpellID(int32 spell_id);
void ResetAllDisciplineTimers();
bool UseDiscipline(int spell_id, int target_id);
bool HasDisciplineLearned(uint16 spell_id);
bool HasDisciplineLearned(int32 spell_id);
int GetCharacterFactionLevel(int faction_id);
void ClearZoneFlag(uint32 zone_id);
bool HasZoneFlag(uint32 zone_id);
@@ -369,7 +369,7 @@ public:
int GetNextAvailableSpellBookSlot(int start);
int GetNextAvailableDisciplineSlot();
int GetNextAvailableDisciplineSlot(int starting_slot);
uint32 GetSpellIDByBookSlot(int book_slot);
int32 GetSpellIDByBookSlot(int book_slot);
int FindSpellBookSlotBySpellID(int spell_id);
void UpdateTaskActivity(int task, int activity, int count);
void AssignTask(int task_id);
zone/lua_entity_list.cpp
+12 -12
View File
@@ -729,25 +729,25 @@ void Lua_EntityList::AreaAttack(Lua_Mob attacker, float distance, int16 slot_id,
self->AEAttack(attacker, distance, slot_id, count, is_from_spell, attack_rounds);
}
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id)
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id)
{
Lua_Safe_Call_Void();
self->AESpell(caster, center, spell_id);
}
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster)
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster)
{
Lua_Safe_Call_Void();
self->AESpell(caster, center, spell_id, affect_caster);
}
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust)
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust)
{
Lua_Safe_Call_Void();
self->AESpell(caster, center, spell_id, affect_caster, resist_adjust);
}
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust, int max_targets)
void Lua_EntityList::AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust, int max_targets)
{
Lua_Safe_Call_Void();
self->AESpell(caster, center, spell_id, affect_caster, resist_adjust, &max_targets);
@@ -771,13 +771,13 @@ void Lua_EntityList::AreaTaunt(Lua_Client caster, float range, int bonus_hate)
self->AETaunt(caster, range, bonus_hate);
}
void Lua_EntityList::MassGroupBuff(Lua_Mob caster, Lua_Mob center, uint16 spell_id)
void Lua_EntityList::MassGroupBuff(Lua_Mob caster, Lua_Mob center, int32 spell_id)
{
Lua_Safe_Call_Void();
self->MassGroupBuff(caster, center, spell_id);
}
void Lua_EntityList::MassGroupBuff(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster)
void Lua_EntityList::MassGroupBuff(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster)
{
Lua_Safe_Call_Void();
self->MassGroupBuff(caster, center, spell_id, affect_caster);
@@ -853,10 +853,10 @@ luabind::scope lua_register_entity_list() {
.def("AreaAttack", (void(Lua_EntityList::*)(Lua_Mob, float, int16, int))&Lua_EntityList::AreaAttack)
.def("AreaAttack", (void(Lua_EntityList::*)(Lua_Mob, float, int16, int, bool))&Lua_EntityList::AreaAttack)
.def("AreaAttack", (void(Lua_EntityList::*)(Lua_Mob, float, int16, int, bool, int))&Lua_EntityList::AreaAttack)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, uint16))&Lua_EntityList::AreaSpell)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, uint16, bool))&Lua_EntityList::AreaSpell)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, uint16, bool, int16))&Lua_EntityList::AreaSpell)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, uint16, bool, int16, int))&Lua_EntityList::AreaSpell)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, int32))&Lua_EntityList::AreaSpell)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, int32, bool))&Lua_EntityList::AreaSpell)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, int32, bool, int16))&Lua_EntityList::AreaSpell)
.def("AreaSpell", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, int32, bool, int16, int))&Lua_EntityList::AreaSpell)
.def("AreaTaunt", (void(Lua_EntityList::*)(Lua_Client))&Lua_EntityList::AreaTaunt)
.def("AreaTaunt", (void(Lua_EntityList::*)(Lua_Client, float))&Lua_EntityList::AreaTaunt)
.def("AreaTaunt", (void(Lua_EntityList::*)(Lua_Client, float, int))&Lua_EntityList::AreaTaunt)
@@ -936,8 +936,8 @@ luabind::scope lua_register_entity_list() {
.def("Marquee", (void(Lua_EntityList::*)(uint32, std::string))&Lua_EntityList::Marquee)
.def("Marquee", (void(Lua_EntityList::*)(uint32, std::string, uint32))&Lua_EntityList::Marquee)
.def("Marquee", (void(Lua_EntityList::*)(uint32, uint32, uint32, uint32, uint32, std::string))&Lua_EntityList::Marquee)
.def("MassGroupBuff", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, uint16))&Lua_EntityList::MassGroupBuff)
.def("MassGroupBuff", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, uint16, bool))&Lua_EntityList::MassGroupBuff)
.def("MassGroupBuff", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, int32))&Lua_EntityList::MassGroupBuff)
.def("MassGroupBuff", (void(Lua_EntityList::*)(Lua_Mob, Lua_Mob, int32, bool))&Lua_EntityList::MassGroupBuff)
.def("Message", (void(Lua_EntityList::*)(uint32, uint32, const char*))&Lua_EntityList::Message)
.def("MessageClose", (void(Lua_EntityList::*)(Lua_Mob, bool, float, uint32, const char*))&Lua_EntityList::MessageClose)
.def("MessageGroup", (void(Lua_EntityList::*)(Lua_Mob, bool, uint32, const char*))&Lua_EntityList::MessageGroup)
zone/lua_entity_list.h
+6 -6
View File
@@ -165,15 +165,15 @@ public:
void AreaAttack(Lua_Mob attacker, float distance, int16 slot_id, int count);
void AreaAttack(Lua_Mob attacker, float distance, int16 slot_id, int count, bool is_from_spell);
void AreaAttack(Lua_Mob attacker, float distance, int16 slot_id, int count, bool is_from_spell, int attack_rounds);
void AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id);
void AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster);
void AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust);
void AreaSpell(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust, int max_targets);
void AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id);
void AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster);
void AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust);
void AreaSpell(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust, int max_targets);
void AreaTaunt(Lua_Client caster);
void AreaTaunt(Lua_Client caster, float range);
void AreaTaunt(Lua_Client caster, float range, int bonus_hate);
void MassGroupBuff(Lua_Mob caster, Lua_Mob center, uint16 spell_id);
void MassGroupBuff(Lua_Mob caster, Lua_Mob center, uint16 spell_id, bool affect_caster);
void MassGroupBuff(Lua_Mob caster, Lua_Mob center, int32 spell_id);
void MassGroupBuff(Lua_Mob caster, Lua_Mob center, int32 spell_id, bool affect_caster);
Lua_NPC_List GetNPCsByIDs(luabind::adl::object npc_ids);
Lua_NPC_List GetNPCsByExcludedIDs(luabind::adl::object npc_ids);
};
zone/lua_general.cpp
+151 -151
View File
@@ -445,7 +445,7 @@ std::string lua_get_race_name(uint32 race_id) {
return quest_manager.getracename(race_id);
}
std::string lua_get_spell_name(uint32 spell_id) {
std::string lua_get_spell_name(int32 spell_id) {
return quest_manager.getspellname(spell_id);
}
@@ -2055,11 +2055,11 @@ const int lua_get_item_stat(uint32 item_id, std::string identifier) {
return quest_manager.getitemstat(item_id, identifier);
}
int lua_get_spell_stat(uint32 spell_id, std::string stat_identifier) {
int lua_get_spell_stat(int32 spell_id, std::string stat_identifier) {
return quest_manager.getspellstat(spell_id, stat_identifier);
}
int lua_get_spell_stat(uint32 spell_id, std::string stat_identifier, uint8 slot) {
int lua_get_spell_stat(int32 spell_id, std::string stat_identifier, uint8 slot) {
return quest_manager.getspellstat(spell_id, stat_identifier, slot);
}
@@ -2280,37 +2280,37 @@ void lua_cross_zone_assign_task_by_client_name(const char* client_name, uint32 t
quest_manager.CrossZoneTaskUpdate(update_type, update_subtype, update_identifier, task_id, task_subidentifier, update_count, enforce_level_requirement, client_name);
}
void lua_cross_zone_cast_spell_by_char_id(int character_id, uint32 spell_id) {
void lua_cross_zone_cast_spell_by_char_id(int character_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Character;
uint8 update_subtype = CZSpellUpdateSubtype_Cast;
quest_manager.CrossZoneSpell(update_type, update_subtype, character_id, spell_id);
}
void lua_cross_zone_cast_spell_by_group_id(int group_id, uint32 spell_id) {
void lua_cross_zone_cast_spell_by_group_id(int group_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Group;
uint8 update_subtype = CZSpellUpdateSubtype_Cast;
quest_manager.CrossZoneSpell(update_type, update_subtype, group_id, spell_id);
}
void lua_cross_zone_cast_spell_by_raid_id(int raid_id, uint32 spell_id) {
void lua_cross_zone_cast_spell_by_raid_id(int raid_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Raid;
uint8 update_subtype = CZSpellUpdateSubtype_Cast;
quest_manager.CrossZoneSpell(update_type, update_subtype, raid_id, spell_id);
}
void lua_cross_zone_cast_spell_by_guild_id(int guild_id, uint32 spell_id) {
void lua_cross_zone_cast_spell_by_guild_id(int guild_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Guild;
uint8 update_subtype = CZSpellUpdateSubtype_Cast;
quest_manager.CrossZoneSpell(update_type, update_subtype, guild_id, spell_id);
}
void lua_cross_zone_cast_spell_by_expedition_id(uint32 expedition_id, uint32 spell_id) {
void lua_cross_zone_cast_spell_by_expedition_id(uint32 expedition_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Expedition;
uint8 update_subtype = CZSpellUpdateSubtype_Cast;
quest_manager.CrossZoneSpell(update_type, update_subtype, expedition_id, spell_id);
}
void lua_cross_zone_cast_spell_by_client_name(const char* client_name, uint32 spell_id) {
void lua_cross_zone_cast_spell_by_client_name(const char* client_name, int32 spell_id) {
uint8 update_type = CZUpdateType_ClientName;
uint8 update_subtype = CZSpellUpdateSubtype_Cast;
int update_identifier = 0;
@@ -3071,37 +3071,37 @@ void lua_cross_zone_remove_ldon_win_by_client_name(const char* client_name, uint
quest_manager.CrossZoneLDoNUpdate(update_type, update_subtype, update_identifier, theme_id, points, client_name);
}
void lua_cross_zone_remove_spell_by_char_id(int character_id, uint32 spell_id) {
void lua_cross_zone_remove_spell_by_char_id(int character_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Character;
uint8 update_subtype = CZSpellUpdateSubtype_Remove;
quest_manager.CrossZoneSpell(update_type, update_subtype, character_id, spell_id);
}
void lua_cross_zone_remove_spell_by_group_id(int group_id, uint32 spell_id) {
void lua_cross_zone_remove_spell_by_group_id(int group_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Group;
uint8 update_subtype = CZSpellUpdateSubtype_Remove;
quest_manager.CrossZoneSpell(update_type, update_subtype, group_id, spell_id);
}
void lua_cross_zone_remove_spell_by_raid_id(int raid_id, uint32 spell_id) {
void lua_cross_zone_remove_spell_by_raid_id(int raid_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Raid;
uint8 update_subtype = CZSpellUpdateSubtype_Remove;
quest_manager.CrossZoneSpell(update_type, update_subtype, raid_id, spell_id);
}
void lua_cross_zone_remove_spell_by_guild_id(int guild_id, uint32 spell_id) {
void lua_cross_zone_remove_spell_by_guild_id(int guild_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Guild;
uint8 update_subtype = CZSpellUpdateSubtype_Remove;
quest_manager.CrossZoneSpell(update_type, update_subtype, guild_id, spell_id);
}
void lua_cross_zone_remove_spell_by_expedition_id(uint32 expedition_id, uint32 spell_id) {
void lua_cross_zone_remove_spell_by_expedition_id(uint32 expedition_id, int32 spell_id) {
uint8 update_type = CZUpdateType_Expedition;
uint8 update_subtype = CZSpellUpdateSubtype_Remove;
quest_manager.CrossZoneSpell(update_type, update_subtype, expedition_id, spell_id);
}
void lua_cross_zone_remove_spell_by_client_name(const char* client_name, uint32 spell_id) {
void lua_cross_zone_remove_spell_by_client_name(const char* client_name, int32 spell_id) {
uint8 update_type = CZUpdateType_ClientName;
uint8 update_subtype = CZSpellUpdateSubtype_Remove;
int update_identifier = 0;
@@ -3446,17 +3446,17 @@ void lua_world_wide_assign_task(uint32 task_id, bool enforce_level_requirement,
quest_manager.WorldWideTaskUpdate(update_type, task_id, task_subidentifier, update_count, enforce_level_requirement, min_status, max_status);
}
void lua_world_wide_cast_spell(uint32 spell_id) {
void lua_world_wide_cast_spell(int32 spell_id) {
uint8 update_type = WWSpellUpdateType_Cast;
quest_manager.WorldWideSpell(update_type, spell_id);
}
void lua_world_wide_cast_spell(uint32 spell_id, uint8 min_status) {
void lua_world_wide_cast_spell(int32 spell_id, uint8 min_status) {
uint8 update_type = WWSpellUpdateType_Cast;
quest_manager.WorldWideSpell(update_type, spell_id, min_status);
}
void lua_world_wide_cast_spell(uint32 spell_id, uint8 min_status, uint8 max_status) {
void lua_world_wide_cast_spell(int32 spell_id, uint8 min_status, uint8 max_status) {
uint8 update_type = WWSpellUpdateType_Cast;
quest_manager.WorldWideSpell(update_type, spell_id, min_status, max_status);
}
@@ -3629,17 +3629,17 @@ void lua_world_wide_remove_ldon_win(uint32 theme_id, uint8 min_status, uint8 max
quest_manager.WorldWideLDoNUpdate(update_type, theme_id, points, min_status, max_status);
}
void lua_world_wide_remove_spell(uint32 spell_id) {
void lua_world_wide_remove_spell(int32 spell_id) {
uint8 update_type = WWSpellUpdateType_Remove;
quest_manager.WorldWideSpell(update_type, spell_id);
}
void lua_world_wide_remove_spell(uint32 spell_id, uint8 min_status) {
void lua_world_wide_remove_spell(int32 spell_id, uint8 min_status) {
uint8 update_type = WWSpellUpdateType_Remove;
quest_manager.WorldWideSpell(update_type, spell_id, min_status);
}
void lua_world_wide_remove_spell(uint32 spell_id, uint8 min_status, uint8 max_status) {
void lua_world_wide_remove_spell(int32 spell_id, uint8 min_status, uint8 max_status) {
uint8 update_type = WWSpellUpdateType_Remove;
quest_manager.WorldWideSpell(update_type, spell_id, min_status, max_status);
}
@@ -3806,7 +3806,7 @@ uint32 lua_count_spawned_npcs(luabind::adl::object table) {
return entity_list.CountSpawnedNPCs(npc_ids);
}
Lua_Spell lua_get_spell(uint32 spell_id) {
Lua_Spell lua_get_spell(int32 spell_id) {
return Lua_Spell(spell_id);
}
@@ -4801,443 +4801,443 @@ void lua_send_channel_message(Lua_Client from, const char* to, uint8 channel_num
quest_manager.SendChannelMessage(from, to, channel_number, guild_id, language_id, language_skill, message);
}
uint8 lua_get_spell_level(uint16 spell_id, uint8 class_id)
uint8 lua_get_spell_level(int32 spell_id, uint8 class_id)
{
const auto spell_level = GetSpellLevel(spell_id, class_id);
return spell_level > RuleI(Character, MaxLevel) ? UINT8_MAX : spell_level;
}
bool lua_is_effect_in_spell(uint16 spell_id, int effect_id)
bool lua_is_effect_in_spell(int32 spell_id, int effect_id)
{
return IsEffectInSpell(spell_id, effect_id);
}
bool lua_is_beneficial_spell(uint16 spell_id)
bool lua_is_beneficial_spell(int32 spell_id)
{
return IsBeneficialSpell(spell_id);
}
bool lua_is_detrimental_spell(uint16 spell_id)
bool lua_is_detrimental_spell(int32 spell_id)
{
return IsDetrimentalSpell(spell_id);
}
bool lua_is_targetable_ae_spell(uint16 spell_id)
bool lua_is_targetable_ae_spell(int32 spell_id)
{
return IsTargetableAESpell(spell_id);
}
bool lua_is_sacrifice_spell(uint16 spell_id)
bool lua_is_sacrifice_spell(int32 spell_id)
{
return IsSacrificeSpell(spell_id);
}
bool lua_is_lifetap_spell(uint16 spell_id)
bool lua_is_lifetap_spell(int32 spell_id)
{
return IsLifetapSpell(spell_id);
}
bool lua_is_mesmerize_spell(uint16 spell_id)
bool lua_is_mesmerize_spell(int32 spell_id)
{
return IsMesmerizeSpell(spell_id);
}
bool lua_is_stun_spell(uint16 spell_id)
bool lua_is_stun_spell(int32 spell_id)
{
return IsStunSpell(spell_id);
}
bool lua_is_summon_spell(uint16 spell_id)
bool lua_is_summon_spell(int32 spell_id)
{
return IsSummonSpell(spell_id);
}
bool lua_is_damage_spell(uint16 spell_id)
bool lua_is_damage_spell(int32 spell_id)
{
return IsDamageSpell(spell_id);
}
bool lua_is_fear_spell(uint16 spell_id)
bool lua_is_fear_spell(int32 spell_id)
{
return IsFearSpell(spell_id);
}
bool lua_is_cure_spell(uint16 spell_id)
bool lua_is_cure_spell(int32 spell_id)
{
return IsCureSpell(spell_id);
}
bool lua_is_haste_spell(uint16 spell_id)
bool lua_is_haste_spell(int32 spell_id)
{
return IsHasteSpell(spell_id);
}
bool lua_is_harmony_spell(uint16 spell_id)
bool lua_is_harmony_spell(int32 spell_id)
{
return IsHarmonySpell(spell_id);
}
bool lua_is_percental_heal_spell(uint16 spell_id)
bool lua_is_percental_heal_spell(int32 spell_id)
{
return IsPercentalHealSpell(spell_id);
}
bool lua_is_group_only_spell(uint16 spell_id)
bool lua_is_group_only_spell(int32 spell_id)
{
return IsGroupOnlySpell(spell_id);
}
bool lua_is_invisible_spell(uint16 spell_id)
bool lua_is_invisible_spell(int32 spell_id)
{
return IsInvisibleSpell(spell_id);
}
bool lua_is_invulnerability_spell(uint16 spell_id)
bool lua_is_invulnerability_spell(int32 spell_id)
{
return IsInvulnerabilitySpell(spell_id);
}
bool lua_is_complete_heal_duration_spell(uint16 spell_id)
bool lua_is_complete_heal_duration_spell(int32 spell_id)
{
return IsCompleteHealDurationSpell(spell_id);
}
bool lua_is_poison_counter_spell(uint16 spell_id)
bool lua_is_poison_counter_spell(int32 spell_id)
{
return IsPoisonCounterSpell(spell_id);
}
bool lua_is_disease_counter_spell(uint16 spell_id)
bool lua_is_disease_counter_spell(int32 spell_id)
{
return IsDiseaseCounterSpell(spell_id);
}
bool lua_is_summon_item_spell(uint16 spell_id)
bool lua_is_summon_item_spell(int32 spell_id)
{
return IsSummonItemSpell(spell_id);
}
bool lua_is_summon_skeleton_spell(uint16 spell_id)
bool lua_is_summon_skeleton_spell(int32 spell_id)
{
return IsSummonSkeletonSpell(spell_id);
}
bool lua_is_summon_pet_spell(uint16 spell_id)
bool lua_is_summon_pet_spell(int32 spell_id)
{
return IsSummonPetSpell(spell_id);
}
bool lua_is_pet_spell(uint16 spell_id)
bool lua_is_pet_spell(int32 spell_id)
{
return IsPetSpell(spell_id);
}
bool lua_is_summon_pc_spell(uint16 spell_id)
bool lua_is_summon_pc_spell(int32 spell_id)
{
return IsSummonPCSpell(spell_id);
}
bool lua_is_charm_spell(uint16 spell_id)
bool lua_is_charm_spell(int32 spell_id)
{
return IsCharmSpell(spell_id);
}
bool lua_is_blind_spell(uint16 spell_id)
bool lua_is_blind_spell(int32 spell_id)
{
return IsBlindSpell(spell_id);
}
bool lua_is_health_spell(uint16 spell_id)
bool lua_is_health_spell(int32 spell_id)
{
return IsHealthSpell(spell_id);
}
bool lua_is_cast_time_reduction_spell(uint16 spell_id)
bool lua_is_cast_time_reduction_spell(int32 spell_id)
{
return IsCastTimeReductionSpell(spell_id);
}
bool lua_is_increase_duration_spell(uint16 spell_id)
bool lua_is_increase_duration_spell(int32 spell_id)
{
return IsIncreaseDurationSpell(spell_id);
}
bool lua_is_mana_cost_reduction_spell(uint16 spell_id)
bool lua_is_mana_cost_reduction_spell(int32 spell_id)
{
return IsManaCostReductionSpell(spell_id);
}
bool lua_is_increase_range_spell(uint16 spell_id)
bool lua_is_increase_range_spell(int32 spell_id)
{
return IsIncreaseRangeSpell(spell_id);
}
bool lua_is_improved_healing_spell(uint16 spell_id)
bool lua_is_improved_healing_spell(int32 spell_id)
{
return IsImprovedHealingSpell(spell_id);
}
bool lua_is_improved_damage_spell(uint16 spell_id)
bool lua_is_improved_damage_spell(int32 spell_id)
{
return IsImprovedDamageSpell(spell_id);
}
bool lua_is_ae_duration_spell(uint16 spell_id)
bool lua_is_ae_duration_spell(int32 spell_id)
{
return IsAEDurationSpell(spell_id);
}
bool lua_is_pure_nuke_spell(uint16 spell_id)
bool lua_is_pure_nuke_spell(int32 spell_id)
{
return IsPureNukeSpell(spell_id);
}
bool lua_is_ae_nuke_spell(uint16 spell_id)
bool lua_is_ae_nuke_spell(int32 spell_id)
{
return IsAENukeSpell(spell_id);
}
bool lua_is_pbae_nuke_spell(uint16 spell_id)
bool lua_is_pbae_nuke_spell(int32 spell_id)
{
return IsPBAENukeSpell(spell_id);
}
bool lua_is_ae_rain_nuke_spell(uint16 spell_id)
bool lua_is_ae_rain_nuke_spell(int32 spell_id)
{
return IsAERainNukeSpell(spell_id);
}
bool lua_is_partial_resistable_spell(uint16 spell_id)
bool lua_is_partial_resistable_spell(int32 spell_id)
{
return IsPartialResistableSpell(spell_id);
}
bool lua_is_resistable_spell(uint16 spell_id)
bool lua_is_resistable_spell(int32 spell_id)
{
return IsResistableSpell(spell_id);
}
bool lua_is_group_spell(uint16 spell_id)
bool lua_is_group_spell(int32 spell_id)
{
return IsGroupSpell(spell_id);
}
bool lua_is_tgb_compatible_spell(uint16 spell_id)
bool lua_is_tgb_compatible_spell(int32 spell_id)
{
return IsTGBCompatibleSpell(spell_id);
}
bool lua_is_bard_song(uint16 spell_id)
bool lua_is_bard_song(int32 spell_id)
{
return IsBardSong(spell_id);
}
bool lua_is_pulsing_bard_song(uint16 spell_id)
bool lua_is_pulsing_bard_song(int32 spell_id)
{
return IsPulsingBardSong(spell_id);
}
bool lua_is_discipline_buff(uint16 spell_id)
bool lua_is_discipline_buff(int32 spell_id)
{
return IsDisciplineBuff(spell_id);
}
bool lua_is_discipline(uint16 spell_id)
bool lua_is_discipline(int32 spell_id)
{
return IsDiscipline(spell_id);
}
bool lua_is_combat_skill(uint16 spell_id)
bool lua_is_combat_skill(int32 spell_id)
{
return IsCombatSkill(spell_id);
}
bool lua_is_resurrection_effects(uint16 spell_id)
bool lua_is_resurrection_effects(int32 spell_id)
{
return IsResurrectionEffects(spell_id);
}
bool lua_is_rune_spell(uint16 spell_id)
bool lua_is_rune_spell(int32 spell_id)
{
return IsRuneSpell(spell_id);
}
bool lua_is_magic_rune_spell(uint16 spell_id)
bool lua_is_magic_rune_spell(int32 spell_id)
{
return IsMagicRuneSpell(spell_id);
}
bool lua_is_mana_tap_spell(uint16 spell_id)
bool lua_is_mana_tap_spell(int32 spell_id)
{
return IsManaTapSpell(spell_id);
}
bool lua_is_alliance_spell(uint16 spell_id)
bool lua_is_alliance_spell(int32 spell_id)
{
return IsAllianceSpell(spell_id);
}
bool lua_is_death_save_spell(uint16 spell_id)
bool lua_is_death_save_spell(int32 spell_id)
{
return IsDeathSaveSpell(spell_id);
}
bool lua_is_partial_death_save_spell(uint16 spell_id)
bool lua_is_partial_death_save_spell(int32 spell_id)
{
return IsPartialDeathSaveSpell(spell_id);
}
bool lua_is_full_death_save_spell(uint16 spell_id)
bool lua_is_full_death_save_spell(int32 spell_id)
{
return IsFullDeathSaveSpell(spell_id);
}
bool lua_is_shadow_step_spell(uint16 spell_id)
bool lua_is_shadow_step_spell(int32 spell_id)
{
return IsShadowStepSpell(spell_id);
}
bool lua_is_succor_spell(uint16 spell_id)
bool lua_is_succor_spell(int32 spell_id)
{
return IsSuccorSpell(spell_id);
}
bool lua_is_teleport_spell(uint16 spell_id)
bool lua_is_teleport_spell(int32 spell_id)
{
return IsTeleportSpell(spell_id);
}
bool lua_is_translocate_spell(uint16 spell_id)
bool lua_is_translocate_spell(int32 spell_id)
{
return IsTranslocateSpell(spell_id);
}
bool lua_is_gate_spell(uint16 spell_id)
bool lua_is_gate_spell(int32 spell_id)
{
return IsGateSpell(spell_id);
}
bool lua_is_illusion_spell(uint16 spell_id)
bool lua_is_illusion_spell(int32 spell_id)
{
return IsIllusionSpell(spell_id);
}
bool lua_is_ldon_object_spell(uint16 spell_id)
bool lua_is_ldon_object_spell(int32 spell_id)
{
return IsLDoNObjectSpell(spell_id);
}
bool lua_is_heal_over_time_spell(uint16 spell_id)
bool lua_is_heal_over_time_spell(int32 spell_id)
{
return IsHealOverTimeSpell(spell_id);
}
bool lua_is_complete_heal_spell(uint16 spell_id)
bool lua_is_complete_heal_spell(int32 spell_id)
{
return IsCompleteHealSpell(spell_id);
}
bool lua_is_fast_heal_spell(uint16 spell_id)
bool lua_is_fast_heal_spell(int32 spell_id)
{
return IsFastHealSpell(spell_id);
}
bool lua_is_very_fast_heal_spell(uint16 spell_id)
bool lua_is_very_fast_heal_spell(int32 spell_id)
{
return IsVeryFastHealSpell(spell_id);
}
bool lua_is_regular_single_target_heal_spell(uint16 spell_id)
bool lua_is_regular_single_target_heal_spell(int32 spell_id)
{
return IsRegularSingleTargetHealSpell(spell_id);
}
bool lua_is_regular_group_heal_spell(uint16 spell_id)
bool lua_is_regular_group_heal_spell(int32 spell_id)
{
return IsRegularGroupHealSpell(spell_id);
}
bool lua_is_group_complete_heal_spell(uint16 spell_id)
bool lua_is_group_complete_heal_spell(int32 spell_id)
{
return IsGroupCompleteHealSpell(spell_id);
}
bool lua_is_group_heal_over_time_spell(uint16 spell_id)
bool lua_is_group_heal_over_time_spell(int32 spell_id)
{
return IsGroupHealOverTimeSpell(spell_id);
}
bool lua_is_debuff_spell(uint16 spell_id)
bool lua_is_debuff_spell(int32 spell_id)
{
return IsDebuffSpell(spell_id);
}
bool lua_is_resist_debuff_spell(uint16 spell_id)
bool lua_is_resist_debuff_spell(int32 spell_id)
{
return IsResistDebuffSpell(spell_id);
}
bool lua_is_self_conversion_spell(uint16 spell_id)
bool lua_is_self_conversion_spell(int32 spell_id)
{
return IsSelfConversionSpell(spell_id);
}
bool lua_is_buff_spell(uint16 spell_id)
bool lua_is_buff_spell(int32 spell_id)
{
return IsBuffSpell(spell_id);
}
bool lua_is_persist_death_spell(uint16 spell_id)
bool lua_is_persist_death_spell(int32 spell_id)
{
return IsPersistDeathSpell(spell_id);
}
bool lua_is_suspendable_spell(uint16 spell_id)
bool lua_is_suspendable_spell(int32 spell_id)
{
return IsSuspendableSpell(spell_id);
}
bool lua_is_cast_on_fade_duration_spell(uint16 spell_id)
bool lua_is_cast_on_fade_duration_spell(int32 spell_id)
{
return IsCastOnFadeDurationSpell(spell_id);
}
bool lua_is_distance_modifier_spell(uint16 spell_id)
bool lua_is_distance_modifier_spell(int32 spell_id)
{
return IsDistanceModifierSpell(spell_id);
}
bool lua_is_rest_allowed_spell(uint16 spell_id)
bool lua_is_rest_allowed_spell(int32 spell_id)
{
return IsRestAllowedSpell(spell_id);
}
bool lua_is_no_detrimental_spell_aggro_spell(uint16 spell_id)
bool lua_is_no_detrimental_spell_aggro_spell(int32 spell_id)
{
return IsNoDetrimentalSpellAggroSpell(spell_id);
}
bool lua_is_stackable_dot(uint16 spell_id)
bool lua_is_stackable_dot(int32 spell_id)
{
return IsStackableDOT(spell_id);
}
bool lua_is_short_duration_buff(uint16 spell_id)
bool lua_is_short_duration_buff(int32 spell_id)
{
return IsShortDurationBuff(spell_id);
}
bool lua_is_target_required_for_spell(uint16 spell_id)
bool lua_is_target_required_for_spell(int32 spell_id)
{
return IsTargetRequiredForSpell(spell_id);
}
bool lua_is_virus_spell(uint16 spell_id)
bool lua_is_virus_spell(int32 spell_id)
{
return IsVirusSpell(spell_id);
}
bool lua_is_valid_spell(uint16 spell_id)
bool lua_is_valid_spell(int32 spell_id)
{
return IsValidSpell(spell_id);
}
@@ -5257,147 +5257,147 @@ bool lua_is_bard_only_stack_effect(int effect_id)
return IsBardOnlyStackEffect(effect_id);
}
bool lua_is_cast_while_invisible_spell(uint16 spell_id)
bool lua_is_cast_while_invisible_spell(int32 spell_id)
{
return IsCastWhileInvisibleSpell(spell_id);
}
bool lua_is_cast_restricted_spell(uint16 spell_id)
bool lua_is_cast_restricted_spell(int32 spell_id)
{
return IsCastRestrictedSpell(spell_id);
}
bool lua_is_cast_not_standing_spell(uint16 spell_id)
bool lua_is_cast_not_standing_spell(int32 spell_id)
{
return IsCastNotStandingSpell(spell_id);
}
bool lua_is_instrument_modifier_applied_to_spell_effect(uint16 spell_id, int effect_id)
bool lua_is_instrument_modifier_applied_to_spell_effect(int32 spell_id, int effect_id)
{
return IsInstrumentModifierAppliedToSpellEffect(spell_id, effect_id);
}
bool lua_is_blank_spell_effect(uint16 spell_id, int effect_index)
bool lua_is_blank_spell_effect(int32 spell_id, int effect_index)
{
return IsBlankSpellEffect(spell_id, effect_index);
}
uint16 lua_get_spell_trigger_spell_id(uint16 spell_id, int effect_id)
int32 lua_get_spell_trigger_spell_id(int32 spell_id, int effect_id)
{
return GetSpellTriggerSpellID(spell_id, effect_id);
}
uint8 lua_get_spell_minimum_level(uint16 spell_id)
uint8 lua_get_spell_minimum_level(int32 spell_id)
{
return GetSpellMinimumLevel(spell_id);
}
int lua_get_spell_resist_type(uint16 spell_id)
int lua_get_spell_resist_type(int32 spell_id)
{
return GetSpellResistType(spell_id);
}
int lua_get_spell_target_type(uint16 spell_id)
int lua_get_spell_target_type(int32 spell_id)
{
return GetSpellTargetType(spell_id);
}
int lua_get_spell_partial_melee_rune_reduction(uint16 spell_id)
int lua_get_spell_partial_melee_rune_reduction(int32 spell_id)
{
return GetSpellPartialMeleeRuneReduction(spell_id);
}
int lua_get_spell_partial_magic_rune_reduction(uint16 spell_id)
int lua_get_spell_partial_magic_rune_reduction(int32 spell_id)
{
return GetSpellPartialMagicRuneReduction(spell_id);
}
int lua_get_spell_partial_melee_rune_amount(uint16 spell_id)
int lua_get_spell_partial_melee_rune_amount(int32 spell_id)
{
return GetSpellPartialMeleeRuneAmount(spell_id);
}
int lua_get_spell_partial_magic_rune_amount(uint16 spell_id)
int lua_get_spell_partial_magic_rune_amount(int32 spell_id)
{
return GetSpellPartialMagicRuneAmount(spell_id);
}
int lua_get_spell_viral_minimum_spread_time(uint16 spell_id)
int lua_get_spell_viral_minimum_spread_time(int32 spell_id)
{
return GetSpellViralMinimumSpreadTime(spell_id);
}
int lua_get_spell_viral_maximum_spread_time(uint16 spell_id)
int lua_get_spell_viral_maximum_spread_time(int32 spell_id)
{
return GetSpellViralMaximumSpreadTime(spell_id);
}
int lua_get_spell_viral_spread_range(uint16 spell_id)
int lua_get_spell_viral_spread_range(int32 spell_id)
{
return GetSpellViralSpreadRange(spell_id);
}
int lua_get_spell_proc_limit_timer(uint16 spell_id, int proc_type)
int lua_get_spell_proc_limit_timer(int32 spell_id, int proc_type)
{
return GetSpellProcLimitTimer(spell_id, proc_type);
}
int lua_get_spell_effect_description_number(uint16 spell_id)
int lua_get_spell_effect_description_number(int32 spell_id)
{
return GetSpellEffectDescriptionNumber(spell_id);
}
int lua_get_spell_furious_bash(uint16 spell_id)
int lua_get_spell_furious_bash(int32 spell_id)
{
return GetSpellFuriousBash(spell_id);
}
bool lua_is_spell_usable_in_this_zone_type(uint16 spell_id)
bool lua_is_spell_usable_in_this_zone_type(int32 spell_id)
{
return IsSpellUsableInThisZoneType(spell_id, zone->GetZoneType());
}
bool lua_is_spell_usable_in_this_zone_type(uint16 spell_id, uint8 zone_type)
bool lua_is_spell_usable_in_this_zone_type(int32 spell_id, uint8 zone_type)
{
return IsSpellUsableInThisZoneType(spell_id, zone_type);
}
int lua_get_spell_effect_index(uint16 spell_id, int effect_id)
int lua_get_spell_effect_index(int32 spell_id, int effect_id)
{
return GetSpellEffectIndex(spell_id, effect_id);
}
int lua_calculate_poison_counters(uint16 spell_id)
int lua_calculate_poison_counters(int32 spell_id)
{
return CalculatePoisonCounters(spell_id);
}
int lua_calculate_disease_counters(uint16 spell_id)
int lua_calculate_disease_counters(int32 spell_id)
{
return CalculateDiseaseCounters(spell_id);
}
int lua_calculate_curse_counters(uint16 spell_id)
int lua_calculate_curse_counters(int32 spell_id)
{
return CalculateCurseCounters(spell_id);
}
int lua_calculate_corruption_counters(uint16 spell_id)
int lua_calculate_corruption_counters(int32 spell_id)
{
return CalculateCorruptionCounters(spell_id);
}
int lua_calculate_counters(uint16 spell_id)
int lua_calculate_counters(int32 spell_id)
{
return CalculateCounters(spell_id);
}
int8 lua_get_spell_resurrection_sickness_check(uint16 spell_id_one, uint16 spell_id_two)
int8 lua_get_spell_resurrection_sickness_check(int32 spell_id_one, int32 spell_id_two)
{
return GetSpellResurrectionSicknessCheck(spell_id_one, spell_id_two);
}
int lua_get_spell_nimbus_effect(uint16 spell_id)
int lua_get_spell_nimbus_effect(int32 spell_id)
{
return GetSpellNimbusEffect(spell_id);
}
@@ -5425,12 +5425,12 @@ std::string lua_convert_money_to_string(luabind::adl::object table)
return Strings::Money(platinum, gold, silver, copper);
}
void lua_cast_spell(uint16 spell_id, uint16 target_id)
void lua_cast_spell(int32 spell_id, uint16 target_id)
{
quest_manager.castspell(spell_id, target_id);
}
void lua_self_cast(uint16 spell_id)
void lua_self_cast(int32 spell_id)
{
quest_manager.selfcast(spell_id);
}
@@ -6208,8 +6208,8 @@ luabind::scope lua_register_general() {
luabind::def("rename", &lua_rename),
luabind::def("get_data_remaining", &lua_get_data_remaining),
luabind::def("get_item_stat", &lua_get_item_stat),
luabind::def("get_spell_stat", (int(*)(uint32,std::string))&lua_get_spell_stat),
luabind::def("get_spell_stat", (int(*)(uint32,std::string,uint8))&lua_get_spell_stat),
luabind::def("get_spell_stat", (int(*)(int32,std::string))&lua_get_spell_stat),
luabind::def("get_spell_stat", (int(*)(int32,std::string,uint8))&lua_get_spell_stat),
luabind::def("is_npc_spawned", &lua_is_npc_spawned),
luabind::def("count_spawned_npcs", &lua_count_spawned_npcs),
luabind::def("get_spell", &lua_get_spell),
@@ -6504,8 +6504,8 @@ luabind::scope lua_register_general() {
luabind::def("get_spell_proc_limit_timer", &lua_get_spell_proc_limit_timer),
luabind::def("get_spell_effect_description_number", &lua_get_spell_effect_description_number),
luabind::def("get_spell_furious_bash", &lua_get_spell_furious_bash),
luabind::def("is_spell_usable_in_this_zone_type", (bool(*)(uint16))&lua_is_spell_usable_in_this_zone_type),
luabind::def("is_spell_usable_in_this_zone_type", (bool(*)(uint16,uint8))&lua_is_spell_usable_in_this_zone_type),
luabind::def("is_spell_usable_in_this_zone_type", (bool(*)(int32))&lua_is_spell_usable_in_this_zone_type),
luabind::def("is_spell_usable_in_this_zone_type", (bool(*)(int32,uint8))&lua_is_spell_usable_in_this_zone_type),
luabind::def("get_spell_effect_index", &lua_get_spell_effect_index),
luabind::def("calculate_poison_counters", &lua_calculate_poison_counters),
luabind::def("calculate_disease_counters", &lua_calculate_disease_counters),
@@ -6727,9 +6727,9 @@ luabind::scope lua_register_general() {
luabind::def("world_wide_assign_task", (void(*)(uint32,bool))&lua_world_wide_assign_task),
luabind::def("world_wide_assign_task", (void(*)(uint32,bool,uint8))&lua_world_wide_assign_task),
luabind::def("world_wide_assign_task", (void(*)(uint32,bool,uint8,uint8))&lua_world_wide_assign_task),
luabind::def("world_wide_cast_spell", (void(*)(uint32))&lua_world_wide_cast_spell),
luabind::def("world_wide_cast_spell", (void(*)(uint32,uint8))&lua_world_wide_cast_spell),
luabind::def("world_wide_cast_spell", (void(*)(uint32,uint8,uint8))&lua_world_wide_cast_spell),
luabind::def("world_wide_cast_spell", (void(*)(int32))&lua_world_wide_cast_spell),
luabind::def("world_wide_cast_spell", (void(*)(int32,uint8))&lua_world_wide_cast_spell),
luabind::def("world_wide_cast_spell", (void(*)(int32,uint8,uint8))&lua_world_wide_cast_spell),
luabind::def("world_wide_dialogue_window", (void(*)(const char*))&lua_world_wide_dialogue_window),
luabind::def("world_wide_dialogue_window", (void(*)(const char*,uint8))&lua_world_wide_dialogue_window),
luabind::def("world_wide_dialogue_window", (void(*)(const char*,uint8,uint8))&lua_world_wide_dialogue_window),
@@ -6760,9 +6760,9 @@ luabind::scope lua_register_general() {
luabind::def("world_wide_remove_ldon_win", (void(*)(uint32))&lua_world_wide_remove_ldon_win),
luabind::def("world_wide_remove_ldon_win", (void(*)(uint32,uint8))&lua_world_wide_remove_ldon_win),
luabind::def("world_wide_remove_ldon_win", (void(*)(uint32,uint8,uint8))&lua_world_wide_remove_ldon_win),
luabind::def("world_wide_remove_spell", (void(*)(uint32))&lua_world_wide_remove_spell),
luabind::def("world_wide_remove_spell", (void(*)(uint32,uint8))&lua_world_wide_remove_spell),
luabind::def("world_wide_remove_spell", (void(*)(uint32,uint8,uint8))&lua_world_wide_remove_spell),
luabind::def("world_wide_remove_spell", (void(*)(int32))&lua_world_wide_remove_spell),
luabind::def("world_wide_remove_spell", (void(*)(int32,uint8))&lua_world_wide_remove_spell),
luabind::def("world_wide_remove_spell", (void(*)(int32,uint8,uint8))&lua_world_wide_remove_spell),
luabind::def("world_wide_remove_task", (void(*)(uint32))&lua_world_wide_remove_task),
luabind::def("world_wide_remove_task", (void(*)(uint32,uint8))&lua_world_wide_remove_task),
luabind::def("world_wide_remove_task", (void(*)(uint32,uint8,uint8))&lua_world_wide_remove_task),
zone/lua_merc.cpp
+1 -1
View File
@@ -203,7 +203,7 @@ bool Lua_Merc::Suspend()
return self->Suspend();
}
bool Lua_Merc::UseDiscipline(uint16 spell_id, uint16 target_id)
bool Lua_Merc::UseDiscipline(int32 spell_id, uint16 target_id)
{
Lua_Safe_Call_Bool();
return self->UseDiscipline(spell_id, target_id);
zone/lua_merc.h
+1 -1
View File
@@ -73,7 +73,7 @@ public:
void Sit();
void Stand();
bool Suspend();
bool UseDiscipline(uint16 spell_id, uint16 target_id);
bool UseDiscipline(int32 spell_id, uint16 target_id);
};
#endif // LUA_EQEMU
zone/lua_mob.cpp
+36 -36
View File
@@ -334,12 +334,12 @@ void Lua_Mob::SetInvisible(int state) {
self->SetInvisible(state);
}
bool Lua_Mob::FindBuff(uint16 spell_id) {
bool Lua_Mob::FindBuff(int32 spell_id) {
Lua_Safe_Call_Bool();
return self->FindBuff(spell_id);
}
bool Lua_Mob::FindBuff(uint16 spell_id, uint16 caster_id) {
bool Lua_Mob::FindBuff(int32 spell_id, uint16 caster_id) {
Lua_Safe_Call_Bool();
return self->FindBuff(spell_id, caster_id);
}
@@ -2397,7 +2397,7 @@ int Lua_Mob::GetOrigBodyType()
return (int)self->GetOrigBodyType();
}
void Lua_Mob::CheckNumHitsRemaining(int type, int32 buff_slot, uint16 spell_id)
void Lua_Mob::CheckNumHitsRemaining(int type, int32 buff_slot, int32 spell_id)
{
Lua_Safe_Call_Void();
self->CheckNumHitsRemaining((NumHit)type, buff_slot, spell_id);
@@ -3010,62 +3010,62 @@ float Lua_Mob::GetDefaultRaceSize(int race_id, int gender_id) {
return self->GetDefaultRaceSize(race_id, gender_id);
}
float Lua_Mob::GetActSpellRange(uint16 spell_id, float range) {
float Lua_Mob::GetActSpellRange(int32 spell_id, float range) {
Lua_Safe_Call_Real();
return self->GetActSpellRange(spell_id, range);
}
int64 Lua_Mob::GetActSpellDamage(uint16 spell_id, int64 value) {
int64 Lua_Mob::GetActSpellDamage(int32 spell_id, int64 value) {
Lua_Safe_Call_Int();
return self->GetActSpellDamage(spell_id, value);
}
int64 Lua_Mob::GetActSpellDamage(uint16 spell_id, int64 value, Lua_Mob target) {
int64 Lua_Mob::GetActSpellDamage(int32 spell_id, int64 value, Lua_Mob target) {
Lua_Safe_Call_Int();
return self->GetActSpellDamage(spell_id, value, target);
}
int64 Lua_Mob::GetActDoTDamage(uint16 spell_id, int64 value, Lua_Mob target) {
int64 Lua_Mob::GetActDoTDamage(int32 spell_id, int64 value, Lua_Mob target) {
Lua_Safe_Call_Int();
return self->GetActDoTDamage(spell_id, value, target);
}
int64 Lua_Mob::GetActDoTDamage(uint16 spell_id, int64 value, Lua_Mob target, bool from_buff_tic) {
int64 Lua_Mob::GetActDoTDamage(int32 spell_id, int64 value, Lua_Mob target, bool from_buff_tic) {
Lua_Safe_Call_Int();
return self->GetActDoTDamage(spell_id, value, target, from_buff_tic);
}
int64 Lua_Mob::GetActSpellHealing(uint16 spell_id, int64 value) {
int64 Lua_Mob::GetActSpellHealing(int32 spell_id, int64 value) {
Lua_Safe_Call_Int();
return self->GetActSpellHealing(spell_id, value);
}
int64 Lua_Mob::GetActSpellHealing(uint16 spell_id, int64 value, Lua_Mob target) {
int64 Lua_Mob::GetActSpellHealing(int32 spell_id, int64 value, Lua_Mob target) {
Lua_Safe_Call_Int();
return self->GetActSpellHealing(spell_id, value, target);
}
int64 Lua_Mob::GetActSpellHealing(uint16 spell_id, int64 value, Lua_Mob target, bool from_buff_tic) {
int64 Lua_Mob::GetActSpellHealing(int32 spell_id, int64 value, Lua_Mob target, bool from_buff_tic) {
Lua_Safe_Call_Int();
return self->GetActSpellHealing(spell_id, value, target, from_buff_tic);
}
int Lua_Mob::GetActSpellCost(uint16 spell_id, int cost) {
int Lua_Mob::GetActSpellCost(int32 spell_id, int cost) {
Lua_Safe_Call_Int();
return self->GetActSpellCost(spell_id, cost);
}
int Lua_Mob::GetActSpellDuration(uint16 spell_id, int duration) {
int Lua_Mob::GetActSpellDuration(int32 spell_id, int duration) {
Lua_Safe_Call_Int();
return self->GetActSpellDuration(spell_id, duration);
}
int Lua_Mob::GetActSpellCasttime(uint16 spell_id, uint32 cast_time) {
int Lua_Mob::GetActSpellCasttime(int32 spell_id, uint32 cast_time) {
Lua_Safe_Call_Int();
return self->GetActSpellCasttime(spell_id, cast_time);
}
int64 Lua_Mob::GetActReflectedSpellDamage(uint16 spell_id, int64 value, int effectiveness) {
int64 Lua_Mob::GetActReflectedSpellDamage(int32 spell_id, int64 value, int effectiveness) {
Lua_Safe_Call_Int();
return self->GetActReflectedSpellDamage(spell_id, value, effectiveness);
}
@@ -3434,37 +3434,37 @@ void Lua_Mob::AreaAttack(float distance, int16 slot_id, int count, bool is_from_
entity_list.AEAttack(self, distance, slot_id, count, is_from_spell, attack_rounds);
}
void Lua_Mob::AreaSpell(Lua_Mob center, uint16 spell_id)
void Lua_Mob::AreaSpell(Lua_Mob center, int32 spell_id)
{
Lua_Safe_Call_Void();
entity_list.AESpell(self, center, spell_id);
}
void Lua_Mob::AreaSpell(Lua_Mob center, uint16 spell_id, bool affect_caster)
void Lua_Mob::AreaSpell(Lua_Mob center, int32 spell_id, bool affect_caster)
{
Lua_Safe_Call_Void();
entity_list.AESpell(self, center, spell_id, affect_caster);
}
void Lua_Mob::AreaSpell(Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust)
void Lua_Mob::AreaSpell(Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust)
{
Lua_Safe_Call_Void();
entity_list.AESpell(self, center, spell_id, affect_caster, resist_adjust);
}
void Lua_Mob::AreaSpell(Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust, int max_targets)
void Lua_Mob::AreaSpell(Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust, int max_targets)
{
Lua_Safe_Call_Void();
entity_list.AESpell(self, center, spell_id, affect_caster, resist_adjust, &max_targets);
}
void Lua_Mob::MassGroupBuff(Lua_Mob center, uint16 spell_id)
void Lua_Mob::MassGroupBuff(Lua_Mob center, int32 spell_id)
{
Lua_Safe_Call_Void();
entity_list.MassGroupBuff(self, center, spell_id);
}
void Lua_Mob::MassGroupBuff(Lua_Mob center, uint16 spell_id, bool affect_caster)
void Lua_Mob::MassGroupBuff(Lua_Mob center, int32 spell_id, bool affect_caster)
{
Lua_Safe_Call_Void();
entity_list.MassGroupBuff(self, center, spell_id, affect_caster);
@@ -3566,10 +3566,10 @@ luabind::scope lua_register_mob() {
.def("AreaAttack", (void(Lua_Mob::*)(float, int16, int))&Lua_Mob::AreaAttack)
.def("AreaAttack", (void(Lua_Mob::*)(float, int16, int, bool))&Lua_Mob::AreaAttack)
.def("AreaAttack", (void(Lua_Mob::*)(float, int16, int, bool, int))&Lua_Mob::AreaAttack)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, uint16))&Lua_Mob::AreaSpell)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, uint16, bool))&Lua_Mob::AreaSpell)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, uint16, bool, int16))&Lua_Mob::AreaSpell)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, uint16, bool, int16, int))&Lua_Mob::AreaSpell)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, int32))&Lua_Mob::AreaSpell)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, int32, bool))&Lua_Mob::AreaSpell)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, int32, bool, int16))&Lua_Mob::AreaSpell)
.def("AreaSpell", (void(Lua_Mob::*)(Lua_Mob, int32, bool, int16, int))&Lua_Mob::AreaSpell)
.def("Attack", (bool(Lua_Mob::*)(Lua_Mob))&Lua_Mob::Attack)
.def("Attack", (bool(Lua_Mob::*)(Lua_Mob,int))&Lua_Mob::Attack)
.def("Attack", (bool(Lua_Mob::*)(Lua_Mob,int,bool))&Lua_Mob::Attack)
@@ -3721,8 +3721,8 @@ luabind::scope lua_register_mob() {
.def("Emote", &Lua_Mob::Emote)
.def("EntityVariableExists", &Lua_Mob::EntityVariableExists)
.def("FaceTarget", (void(Lua_Mob::*)(Lua_Mob))&Lua_Mob::FaceTarget)
.def("FindBuff", (bool(Lua_Mob::*)(uint16))&Lua_Mob::FindBuff)
.def("FindBuff", (bool(Lua_Mob::*)(uint16,uint16))&Lua_Mob::FindBuff)
.def("FindBuff", (bool(Lua_Mob::*)(int32))&Lua_Mob::FindBuff)
.def("FindBuff", (bool(Lua_Mob::*)(int32,uint16))&Lua_Mob::FindBuff)
.def("FindBuffBySlot", (uint16(Lua_Mob::*)(int))&Lua_Mob::FindBuffBySlot)
.def("FindGroundZ", (double(Lua_Mob::*)(double,double))&Lua_Mob::FindGroundZ)
.def("FindGroundZ", (double(Lua_Mob::*)(double,double,double))&Lua_Mob::FindGroundZ)
@@ -3739,17 +3739,17 @@ luabind::scope lua_register_mob() {
.def("GetAC", &Lua_Mob::GetAC)
.def("GetAGI", &Lua_Mob::GetAGI)
.def("GetATK", &Lua_Mob::GetATK)
.def("GetActDoTDamage", (int64(Lua_Mob::*)(uint16,int64,Lua_Mob))&Lua_Mob::GetActDoTDamage)
.def("GetActDoTDamage", (int64(Lua_Mob::*)(uint16,int64,Lua_Mob,bool))&Lua_Mob::GetActDoTDamage)
.def("GetActDoTDamage", (int64(Lua_Mob::*)(int32,int64,Lua_Mob))&Lua_Mob::GetActDoTDamage)
.def("GetActDoTDamage", (int64(Lua_Mob::*)(int32,int64,Lua_Mob,bool))&Lua_Mob::GetActDoTDamage)
.def("GetActReflectedSpellDamage", &Lua_Mob::GetActReflectedSpellDamage)
.def("GetActSpellCasttime", &Lua_Mob::GetActSpellCasttime)
.def("GetActSpellCost", &Lua_Mob::GetActSpellCost)
.def("GetActSpellDuration", &Lua_Mob::GetActSpellDuration)
.def("GetActSpellDamage", (int64(Lua_Mob::*)(uint16,int64))&Lua_Mob::GetActSpellDamage)
.def("GetActSpellDamage", (int64(Lua_Mob::*)(uint16,int64,Lua_Mob))&Lua_Mob::GetActSpellDamage)
.def("GetActSpellHealing", (int64(Lua_Mob::*)(uint16,int64))&Lua_Mob::GetActSpellHealing)
.def("GetActSpellHealing", (int64(Lua_Mob::*)(uint16,int64,Lua_Mob))&Lua_Mob::GetActSpellHealing)
.def("GetActSpellHealing", (int64(Lua_Mob::*)(uint16,int64,Lua_Mob,bool))&Lua_Mob::GetActSpellHealing)
.def("GetActSpellDamage", (int64(Lua_Mob::*)(int32,int64))&Lua_Mob::GetActSpellDamage)
.def("GetActSpellDamage", (int64(Lua_Mob::*)(int32,int64,Lua_Mob))&Lua_Mob::GetActSpellDamage)
.def("GetActSpellHealing", (int64(Lua_Mob::*)(int32,int64))&Lua_Mob::GetActSpellHealing)
.def("GetActSpellHealing", (int64(Lua_Mob::*)(int32,int64,Lua_Mob))&Lua_Mob::GetActSpellHealing)
.def("GetActSpellHealing", (int64(Lua_Mob::*)(int32,int64,Lua_Mob,bool))&Lua_Mob::GetActSpellHealing)
.def("GetActSpellRange", &Lua_Mob::GetActSpellRange)
.def("GetAggroRange", (float(Lua_Mob::*)(void))&Lua_Mob::GetAggroRange)
.def("GetAllowBeneficial", (bool(Lua_Mob::*)(void))&Lua_Mob::GetAllowBeneficial)
@@ -3996,8 +3996,8 @@ luabind::scope lua_register_mob() {
.def("IsWarriorClass", &Lua_Mob::IsWarriorClass)
.def("IsWisdomCasterClass", &Lua_Mob::IsWisdomCasterClass)
.def("Kill", (void(Lua_Mob::*)(void))&Lua_Mob::Kill)
.def("MassGroupBuff", (void(Lua_Mob::*)(Lua_Mob, uint16))&Lua_Mob::MassGroupBuff)
.def("MassGroupBuff", (void(Lua_Mob::*)(Lua_Mob, uint16, bool))&Lua_Mob::MassGroupBuff)
.def("MassGroupBuff", (void(Lua_Mob::*)(Lua_Mob, int32))&Lua_Mob::MassGroupBuff)
.def("MassGroupBuff", (void(Lua_Mob::*)(Lua_Mob, int32, bool))&Lua_Mob::MassGroupBuff)
.def("Mesmerize", (void(Lua_Mob::*)(void))&Lua_Mob::Mesmerize)
.def("Message", &Lua_Mob::Message)
.def("MessageString", &Lua_Mob::MessageString)
zone/lua_mob.h
+21 -21
View File
@@ -109,8 +109,8 @@ public:
uint8 GetInvisibleUndeadLevel();
void SetSeeInvisibleLevel(uint8 invisible_level);
void SetSeeInvisibleUndeadLevel(uint8 invisible_level);
bool FindBuff(uint16 spell_id);
bool FindBuff(uint16 spell_id, uint16 caster_id);
bool FindBuff(int32 spell_id);
bool FindBuff(int32 spell_id, uint16 caster_id);
uint16 FindBuffBySlot(int slot);
uint32 BuffCount();
uint32 BuffCount(bool is_beneficial);
@@ -491,7 +491,7 @@ public:
bool TryFinishingBlow(Lua_Mob defender, int64 &damage);
int GetBodyType();
int GetOrigBodyType();
void CheckNumHitsRemaining(int type, int32 buff_slot, uint16 spell_id);
void CheckNumHitsRemaining(int type, int32 buff_slot, int32 spell_id);
void DeleteBucket(std::string bucket_name);
std::string GetBucket(std::string bucket_name);
std::string GetBucketExpires(std::string bucket_name);
@@ -552,18 +552,18 @@ public:
float GetDefaultRaceSize();
float GetDefaultRaceSize(int race_id);
float GetDefaultRaceSize(int race_id, int gender_id);
int64 GetActDoTDamage(uint16 spell_id, int64 value, Lua_Mob target);
int64 GetActDoTDamage(uint16 spell_id, int64 value, Lua_Mob target, bool from_buff_tic);
int64 GetActReflectedSpellDamage(uint16 spell_id, int64 value, int effectiveness);
int GetActSpellCasttime(uint16 spell_id, uint32 cast_time);
int GetActSpellCost(uint16 spell_id, int cost);
int64 GetActSpellDamage(uint16 spell_id, int64 value);
int64 GetActSpellDamage(uint16 spell_id, int64 value, Lua_Mob target);
int GetActSpellDuration(uint16 spell_id, int duration);
int64 GetActSpellHealing(uint16 spell_id, int64 value);
int64 GetActSpellHealing(uint16 spell_id, int64 value, Lua_Mob target);
int64 GetActSpellHealing(uint16 spell_id, int64 value, Lua_Mob target, bool from_buff_tic);
float GetActSpellRange(uint16 spell_id, float range);
int64 GetActDoTDamage(int32 spell_id, int64 value, Lua_Mob target);
int64 GetActDoTDamage(int32 spell_id, int64 value, Lua_Mob target, bool from_buff_tic);
int64 GetActReflectedSpellDamage(int32 spell_id, int64 value, int effectiveness);
int GetActSpellCasttime(int32 spell_id, uint32 cast_time);
int GetActSpellCost(int32 spell_id, int cost);
int64 GetActSpellDamage(int32 spell_id, int64 value);
int64 GetActSpellDamage(int32 spell_id, int64 value, Lua_Mob target);
int GetActSpellDuration(int32 spell_id, int duration);
int64 GetActSpellHealing(int32 spell_id, int64 value);
int64 GetActSpellHealing(int32 spell_id, int64 value, Lua_Mob target);
int64 GetActSpellHealing(int32 spell_id, int64 value, Lua_Mob target, bool from_buff_tic);
float GetActSpellRange(int32 spell_id, float range);
uint32 GetRemainingTimeMS(const char* timer_name);
uint32 GetTimerDurationMS(const char* timer_name);
bool HasTimer(const char* timer_name);
@@ -619,12 +619,12 @@ public:
void AreaAttack(float distance, int16 slot_id, int count);
void AreaAttack(float distance, int16 slot_id, int count, bool is_from_spell);
void AreaAttack(float distance, int16 slot_id, int count, bool is_from_spell, int attack_rounds);
void AreaSpell(Lua_Mob center, uint16 spell_id);
void AreaSpell(Lua_Mob center, uint16 spell_id, bool affect_caster);
void AreaSpell(Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust);
void AreaSpell(Lua_Mob center, uint16 spell_id, bool affect_caster, int16 resist_adjust, int max_targets);
void MassGroupBuff(Lua_Mob center, uint16 spell_id);
void MassGroupBuff(Lua_Mob center, uint16 spell_id, bool affect_caster);
void AreaSpell(Lua_Mob center, int32 spell_id);
void AreaSpell(Lua_Mob center, int32 spell_id, bool affect_caster);
void AreaSpell(Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust);
void AreaSpell(Lua_Mob center, int32 spell_id, bool affect_caster, int16 resist_adjust, int max_targets);
void MassGroupBuff(Lua_Mob center, int32 spell_id);
void MassGroupBuff(Lua_Mob center, int32 spell_id, bool affect_caster);
void BuffFadeBeneficial();
void BuffFadeDetrimental();
void BuffFadeDetrimentalByCaster(Lua_Mob caster);
zone/lua_mod.cpp
+4 -4
View File
@@ -810,7 +810,7 @@ void LuaMod::GetExperienceForKill(Client *self, Mob *against, uint64 &returnValu
}
}
void LuaMod::IsImmuneToSpell(Mob *self, Mob* caster, uint16 spell_id, bool &return_value, bool &ignore_default)
void LuaMod::IsImmuneToSpell(Mob *self, Mob* caster, int32 spell_id, bool &return_value, bool &ignore_default)
{
int start = lua_gettop(L);
@@ -862,7 +862,7 @@ void LuaMod::IsImmuneToSpell(Mob *self, Mob* caster, uint16 spell_id, bool &retu
}
}
void LuaMod::CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, uint16 spell_id, int ticsremaining, int64 &returnValue, bool &ignoreDefault)
void LuaMod::CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, int32 spell_id, int ticsremaining, int64 &returnValue, bool &ignoreDefault)
{
int start = lua_gettop(L);
int64 retval = 0;
@@ -989,7 +989,7 @@ void LuaMod::RegisterBug(Client *self, BaseBugReportsRepository::BugReports bug,
}
void LuaMod::CommonDamage(Mob *self, Mob* attacker, int64 value, uint16 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, int64 &return_value, bool &ignore_default)
void LuaMod::CommonDamage(Mob *self, Mob* attacker, int64 value, int32 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, int64 &return_value, bool &ignore_default)
{
int start = lua_gettop(L);
@@ -1048,7 +1048,7 @@ void LuaMod::CommonDamage(Mob *self, Mob* attacker, int64 value, uint16 spell_id
}
void LuaMod::HealDamage(Mob *self, Mob* caster, uint64 value, uint16 spell_id, uint64 &return_value, bool &ignore_default)
void LuaMod::HealDamage(Mob *self, Mob* caster, uint64 value, int32 spell_id, uint64 &return_value, bool &ignore_default)
{
int start = lua_gettop(L);
zone/lua_mod.h
+4 -4
View File
@@ -44,13 +44,13 @@ public:
void TryCriticalHit(Mob *self, Mob *defender, DamageHitInfo &hit, ExtraAttackOptions *opts, bool &ignoreDefault);
void GetRequiredAAExperience(Client *self, uint32 &returnValue, bool &ignoreDefault);
void GetEXPForLevel(Client *self, uint16 level, uint32 &returnValue, bool &ignoreDefault);
void IsImmuneToSpell(Mob *self, Mob* caster, uint16 spell_id, bool &return_value, bool &ignore_default);
void IsImmuneToSpell(Mob *self, Mob* caster, int32 spell_id, bool &return_value, bool &ignore_default);
void GetExperienceForKill(Client *self, Mob *against, uint64 &returnValue, bool &ignoreDefault);
void CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, uint16 spell_id, int ticsremaining, int64 &returnValue, bool &ignoreDefault);
void CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, int32 spell_id, int ticsremaining, int64 &returnValue, bool &ignoreDefault);
void UpdatePersonalFaction(Mob *self, int32 npc_value, int32 faction_id, int32 current_value, int32 temp, int32 this_faction_min, int32 this_faction_max, int32 &return_value, bool &ignore_default);
void RegisterBug(Client *self, BaseBugReportsRepository::BugReports bug, bool &ignore_default);
void CommonDamage(Mob *self, Mob* attacker, int64 value, uint16 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, int64 &return_value, bool &ignore_default);
void HealDamage(Mob *self, Mob* caster, uint64 value, uint16 spell_id, uint64 &return_value, bool &ignore_default);
void CommonDamage(Mob *self, Mob* attacker, int64 value, int32 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, int64 &return_value, bool &ignore_default);
void HealDamage(Mob *self, Mob* caster, uint64 value, int32 spell_id, uint64 &return_value, bool &ignore_default);
void SetEXP(Mob *self, ExpSource exp_source, uint64 current_exp, uint64 set_exp, bool is_rezz_exp, uint64 &return_value, bool &ignore_default);
void SetAAEXP(Mob *self, ExpSource exp_source, uint64 current_aa_exp, uint64 set_aa_exp, bool is_rezz_exp, uint64 &return_value, bool &ignore_default);
private:
zone/lua_npc.cpp
+4 -4
View File
@@ -736,12 +736,12 @@ void Lua_NPC::SetLDoNTrapType(uint8 trap_type) {
self->SetLDoNTrapType(trap_type);
}
uint16 Lua_NPC::GetLDoNTrapSpellID() {
int32 Lua_NPC::GetLDoNTrapSpellID() {
Lua_Safe_Call_Int();
return self->GetLDoNTrapSpellID();
}
void Lua_NPC::SetLDoNTrapSpellID(uint16 spell_id) {
void Lua_NPC::SetLDoNTrapSpellID(int32 spell_id) {
Lua_Safe_Call_Void();
self->SetLDoNTrapSpellID(spell_id);
}
@@ -1035,7 +1035,7 @@ luabind::scope lua_register_npc() {
.def("GetMinDMG", (uint32(Lua_NPC::*)(void))&Lua_NPC::GetMinDMG)
.def("GetLDoNLockedSkill", (uint16(Lua_NPC::*)(void))&Lua_NPC::GetLDoNLockedSkill)
.def("GetLDoNTrapType", (uint8(Lua_NPC::*)(void))&Lua_NPC::GetLDoNTrapType)
.def("GetLDoNTrapSpellID", (uint16(Lua_NPC::*)(void))&Lua_NPC::GetLDoNTrapSpellID)
.def("GetLDoNTrapSpellID", (int32 (Lua_NPC::*)(void))&Lua_NPC::GetLDoNTrapSpellID)
.def("GetNPCAggro", (bool(Lua_NPC::*)(void))&Lua_NPC::GetNPCAggro)
.def("GetNPCFactionID", (int(Lua_NPC::*)(void))&Lua_NPC::GetNPCFactionID)
.def("GetNPCHate", (int64(Lua_NPC::*)(Lua_Mob))&Lua_NPC::GetNPCHate)
@@ -1119,7 +1119,7 @@ luabind::scope lua_register_npc() {
.def("SetLDoNLockedSkill", (void(Lua_NPC::*)(uint16))&Lua_NPC::SetLDoNLockedSkill)
.def("SetLDoNTrapped", (void(Lua_NPC::*)(bool))&Lua_NPC::SetLDoNTrapped)
.def("SetLDoNTrapDetected", (void(Lua_NPC::*)(bool))&Lua_NPC::SetLDoNTrapDetected)
.def("SetLDoNTrapSpellID", (void(Lua_NPC::*)(uint16))&Lua_NPC::SetLDoNTrapSpellID)
.def("SetLDoNTrapSpellID", (void(Lua_NPC::*)(int32 ))&Lua_NPC::SetLDoNTrapSpellID)
.def("SetLDoNTrapType", (void(Lua_NPC::*)(uint8))&Lua_NPC::SetLDoNTrapType)
.def("SetNPCAggro", (void(Lua_NPC::*)(bool))&Lua_NPC::SetNPCAggro)
.def("SetNPCFactionID", (void(Lua_NPC::*)(int))&Lua_NPC::SetNPCFactionID)
zone/lua_npc.h
+2 -2
View File
@@ -183,8 +183,8 @@ public:
void SetLDoNTrapped(bool is_trapped);
uint8 GetLDoNTrapType();
void SetLDoNTrapType(uint8 trap_type);
uint16 GetLDoNTrapSpellID();
void SetLDoNTrapSpellID(uint16 spell_id);
int32 GetLDoNTrapSpellID();
void SetLDoNTrapSpellID(int32 spell_id);
bool IsLDoNLocked();
void SetLDoNLocked(bool is_locked);
uint16 GetLDoNLockedSkill();
zone/lua_parser.cpp
+9 -9
View File
@@ -757,7 +757,7 @@ int LuaParser::_EventItem(std::string package_name, QuestEventID evt, Client *cl
return 0;
}
int LuaParser::EventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data,
int LuaParser::EventSpell(QuestEventID evt, Mob* mob, Client *client, int32 spell_id, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
evt = ConvertLuaEvent(evt);
if(evt >= _LargestEventID) {
@@ -773,7 +773,7 @@ int LuaParser::EventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spe
return _EventSpell(package_name, evt, mob, client, spell_id, data, extra_data, extra_pointers);
}
int LuaParser::_EventSpell(std::string package_name, QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data,
int LuaParser::_EventSpell(std::string package_name, QuestEventID evt, Mob* mob, Client *client, int32 spell_id, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers, luabind::adl::object *l_func) {
const char *sub_name = LuaEvents[evt];
@@ -959,7 +959,7 @@ bool LuaParser::GlobalPlayerHasQuestSub(QuestEventID evt) {
return HasFunction(subname, "global_player");
}
bool LuaParser::SpellHasQuestSub(uint32 spell_id, QuestEventID evt) {
bool LuaParser::SpellHasQuestSub(int32 spell_id, QuestEventID evt) {
evt = ConvertLuaEvent(evt);
if(evt >= _LargestEventID) {
return false;
@@ -1026,7 +1026,7 @@ void LuaParser::LoadItemScript(std::string filename, EQ::ItemInstance *item) {
LoadScript(filename, package_name);
}
void LuaParser::LoadSpellScript(std::string filename, uint32 spell_id) {
void LuaParser::LoadSpellScript(std::string filename, int32 spell_id) {
std::string package_name = "spell_" + std::to_string(spell_id);
LoadScript(filename, package_name);
@@ -1533,7 +1533,7 @@ int LuaParser::DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInsta
return ret;
}
int LuaParser::DispatchEventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data,
int LuaParser::DispatchEventSpell(QuestEventID evt, Mob* mob, Client *client, int32 spell_id, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
evt = ConvertLuaEvent(evt);
if(evt >= _LargestEventID) {
@@ -1675,7 +1675,7 @@ uint64 LuaParser::GetExperienceForKill(Client *self, Mob *against, bool &ignoreD
}
int64 LuaParser::CommonDamage(Mob *self, Mob* attacker, int64 value, uint16 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, bool &ignore_default)
int64 LuaParser::CommonDamage(Mob *self, Mob* attacker, int64 value, int32 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, bool &ignore_default)
{
int64 retval = 0;
for (auto &mod : mods_) {
@@ -1684,7 +1684,7 @@ int64 LuaParser::CommonDamage(Mob *self, Mob* attacker, int64 value, uint16 spel
return retval;
}
uint64 LuaParser::HealDamage(Mob *self, Mob* caster, uint64 value, uint16 spell_id, bool &ignore_default)
uint64 LuaParser::HealDamage(Mob *self, Mob* caster, uint64 value, int32 spell_id, bool &ignore_default)
{
uint64 retval = 0;
for (auto &mod : mods_) {
@@ -1693,7 +1693,7 @@ uint64 LuaParser::HealDamage(Mob *self, Mob* caster, uint64 value, uint16 spell_
return retval;
}
bool LuaParser::IsImmuneToSpell(Mob *self, Mob *caster, uint16 spell_id, bool &ignore_default)
bool LuaParser::IsImmuneToSpell(Mob *self, Mob *caster, int32 spell_id, bool &ignore_default)
{
bool retval = false;
for (auto &mod : mods_) {
@@ -1702,7 +1702,7 @@ bool LuaParser::IsImmuneToSpell(Mob *self, Mob *caster, uint16 spell_id, bool &i
return retval;
}
int64 LuaParser::CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, uint16 spell_id, int ticsremaining, bool &ignoreDefault)
int64 LuaParser::CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, int32 spell_id, int ticsremaining, bool &ignoreDefault)
{
int64 retval = 0;
for (auto &mod : mods_) {
zone/lua_parser.h
+9 -9
View File
@@ -97,7 +97,7 @@ public:
QuestEventID evt,
Mob* mob,
Client *client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
@@ -160,7 +160,7 @@ public:
virtual bool HasGlobalQuestSub(QuestEventID evt);
virtual bool PlayerHasQuestSub(QuestEventID evt);
virtual bool GlobalPlayerHasQuestSub(QuestEventID evt);
virtual bool SpellHasQuestSub(uint32 spell_id, QuestEventID evt);
virtual bool SpellHasQuestSub(int32 spell_id, QuestEventID evt);
virtual bool ItemHasQuestSub(EQ::ItemInstance *itm, QuestEventID evt);
virtual bool EncounterHasQuestSub(std::string encounter_name, QuestEventID evt);
virtual bool HasEncounterSub(const std::string& package_name, QuestEventID evt);
@@ -176,7 +176,7 @@ public:
virtual void LoadPlayerScript(std::string filename);
virtual void LoadGlobalPlayerScript(std::string filename);
virtual void LoadItemScript(std::string filename, EQ::ItemInstance *item);
virtual void LoadSpellScript(std::string filename, uint32 spell_id);
virtual void LoadSpellScript(std::string filename, int32 spell_id);
virtual void LoadEncounterScript(std::string filename, std::string encounter_name);
virtual void LoadBotScript(std::string filename);
virtual void LoadGlobalBotScript(std::string filename);
@@ -220,7 +220,7 @@ public:
QuestEventID evt,
Mob* mob,
Client *client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
@@ -266,14 +266,14 @@ public:
uint32 GetRequiredAAExperience(Client *self, bool &ignoreDefault);
uint32 GetEXPForLevel(Client *self, uint16 level, bool &ignoreDefault);
uint64 GetExperienceForKill(Client *self, Mob *against, bool &ignoreDefault);
int64 CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, uint16 spell_id, int ticsremaining, bool &ignoreDefault);
int64 CalcSpellEffectValue_formula(Mob *self, uint32 formula, int64 base_value, int64 max_value, int caster_level, int32 spell_id, int ticsremaining, bool &ignoreDefault);
int32 UpdatePersonalFaction(Mob *self, int32 npc_value, int32 faction_id, int32 current_value, int32 temp, int32 this_faction_min, int32 this_faction_max, bool &ignore_default);
void RegisterBug(Client *self, BaseBugReportsRepository::BugReports bug, bool &ignore_default);
int64 CommonDamage(Mob *self, Mob* attacker, int64 value, uint16 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, bool &ignore_default);
uint64 HealDamage(Mob *self, Mob* caster, uint64 value, uint16 spell_id, bool &ignore_default);
int64 CommonDamage(Mob *self, Mob* attacker, int64 value, int32 spell_id, int skill_used, bool avoidable, int8 buff_slot, bool buff_tic, int special, bool &ignore_default);
uint64 HealDamage(Mob *self, Mob* caster, uint64 value, int32 spell_id, bool &ignore_default);
uint64 SetEXP(Mob *self, ExpSource exp_source, uint64 current_exp, uint64 set_exp, bool is_rezz_exp, bool &ignore_default);
uint64 SetAAEXP(Mob *self, ExpSource exp_source, uint64 current_aa_exp, uint64 set_aa_exp, bool is_rezz_exp, bool &ignore_default);
bool IsImmuneToSpell(Mob *self, Mob* caster, uint16 spell_id, bool &ignore_default);
bool IsImmuneToSpell(Mob *self, Mob* caster, int32 spell_id, bool &ignore_default);
private:
LuaParser();
LuaParser(const LuaParser&);
@@ -314,7 +314,7 @@ private:
QuestEventID evt,
Mob* mob,
Client *client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers,
zone/lua_parser_events.cpp
+15 -15
View File
@@ -327,7 +327,7 @@ void handle_npc_death(
lua_pushinteger(L, Strings::ToInt(sep.arg[1]));
lua_setfield(L, -2, "damage");
const uint32 spell_id = Strings::ToUnsignedInt(sep.arg[2]);
const int32 spell_id = Strings::ToInt(sep.arg[2]);
if (IsValidSpell(spell_id)) {
Lua_Spell l_spell(&spells[spell_id]);
luabind::adl::object l_spell_o = luabind::adl::object(L, l_spell);
@@ -384,7 +384,7 @@ void handle_npc_cast(
) {
Seperator sep(data.c_str());
const uint32 spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell(IsValidSpell(spell_id) ? &spells[spell_id] : nullptr);
luabind::adl::object l_spell_o = luabind::adl::object(L, l_spell);
l_spell_o.push(L);
@@ -669,14 +669,14 @@ void handle_npc_spell_blocked(
lua_pushinteger(L, Strings::ToUnsignedInt(sep.arg[1]));
lua_setfield(L, -2, "cast_spell_id");
const uint32 blocking_spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 blocking_spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell_one(IsValidSpell(blocking_spell_id) ? &spells[blocking_spell_id] : nullptr);
luabind::adl::object l_spell_one_o = luabind::adl::object(L, l_spell_one);
l_spell_one_o.push(L);
lua_setfield(L, -2, "blocking_spell");
const uint32 cast_spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 cast_spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell_two(IsValidSpell(cast_spell_id) ? &spells[cast_spell_id] : nullptr);
luabind::adl::object l_spell_two_o = luabind::adl::object(L, l_spell_two);
@@ -758,7 +758,7 @@ void handle_player_death(
lua_pushinteger(L, Strings::ToInt(sep.arg[1]));
lua_setfield(L, -2, "damage");
const uint32 spell_id = Strings::ToUnsignedInt(sep.arg[2]);
const int32 spell_id = Strings::ToInt(sep.arg[2]);
if (IsValidSpell(spell_id)) {
Lua_Spell l_spell(&spells[spell_id]);
luabind::adl::object l_spell_o = luabind::adl::object(L, l_spell);
@@ -1784,14 +1784,14 @@ void handle_player_spell_blocked(
lua_pushinteger(L, Strings::ToUnsignedInt(sep.arg[1]));
lua_setfield(L, -2, "cast_spell_id");
const uint32 blocking_spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 blocking_spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell_one(IsValidSpell(blocking_spell_id) ? &spells[blocking_spell_id] : nullptr);
luabind::adl::object l_spell_one_o = luabind::adl::object(L, l_spell_one);
l_spell_one_o.push(L);
lua_setfield(L, -2, "blocking_spell");
const uint32 cast_spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 cast_spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell_two(IsValidSpell(cast_spell_id) ? &spells[cast_spell_id] : nullptr);
luabind::adl::object l_spell_two_o = luabind::adl::object(L, l_spell_two);
@@ -2083,7 +2083,7 @@ void handle_spell_event(
lua_State* L,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
@@ -2132,7 +2132,7 @@ void handle_translocate_finish(
lua_State* L,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
@@ -2184,7 +2184,7 @@ void handle_spell_null(
lua_State* L,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
@@ -2460,7 +2460,7 @@ void handle_bot_cast(
) {
Seperator sep(data.c_str());
const uint32 spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell(IsValidSpell(spell_id) ? &spells[spell_id] : nullptr);
luabind::adl::object l_spell_o = luabind::adl::object(L, l_spell);
l_spell_o.push(L);
@@ -2524,7 +2524,7 @@ void handle_bot_death(
lua_pushinteger(L, Strings::ToInt(sep.arg[1]));
lua_setfield(L, -2, "damage");
const uint32 spell_id = Strings::ToUnsignedInt(sep.arg[2]);
const int32 spell_id = Strings::ToInt(sep.arg[2]);
if (IsValidSpell(spell_id)) {
Lua_Spell l_spell(&spells[spell_id]);
luabind::adl::object l_spell_o = luabind::adl::object(L, l_spell);
@@ -2907,14 +2907,14 @@ void handle_bot_spell_blocked(
lua_pushinteger(L, Strings::ToUnsignedInt(sep.arg[1]));
lua_setfield(L, -2, "cast_spell_id");
const uint32 blocking_spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 blocking_spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell_one(IsValidSpell(blocking_spell_id) ? &spells[blocking_spell_id] : nullptr);
luabind::adl::object l_spell_one_o = luabind::adl::object(L, l_spell_one);
l_spell_one_o.push(L);
lua_setfield(L, -2, "blocking_spell");
const uint32 cast_spell_id = Strings::ToUnsignedInt(sep.arg[0]);
const int32 cast_spell_id = Strings::ToInt(sep.arg[0]);
Lua_Spell l_spell_two(IsValidSpell(cast_spell_id) ? &spells[cast_spell_id] : nullptr);
luabind::adl::object l_spell_two_o = luabind::adl::object(L, l_spell_two);
@@ -2993,7 +2993,7 @@ void handle_zone_death(
lua_pushinteger(L, Strings::ToInt(sep.arg[1]));
lua_setfield(L, -2, "damage");
const uint32 spell_id = Strings::ToUnsignedInt(sep.arg[2]);
const int32 spell_id = Strings::ToInt(sep.arg[2]);
if (IsValidSpell(spell_id)) {
Lua_Spell l_spell(&spells[spell_id]);
luabind::adl::object l_spell_o = luabind::adl::object(L, l_spell);
zone/lua_parser_events.h
+4 -4
View File
@@ -43,7 +43,7 @@ namespace EQ
typedef void(*NPCArgumentHandler)(QuestInterface*, lua_State*, NPC*, Mob*, std::string, uint32, std::vector<std::any>*);
typedef void(*PlayerArgumentHandler)(QuestInterface*, lua_State*, Client*, std::string, uint32, std::vector<std::any>*);
typedef void(*ItemArgumentHandler)(QuestInterface*, lua_State*, Client*, EQ::ItemInstance*, Mob*, std::string, uint32, std::vector<std::any>*);
typedef void(*SpellArgumentHandler)(QuestInterface*, lua_State*, Mob*, Client*, uint32, std::string, uint32, std::vector<std::any>*);
typedef void(*SpellArgumentHandler)(QuestInterface*, lua_State*, Mob*, Client*, int32, std::string, uint32, std::vector<std::any>*);
typedef void(*EncounterArgumentHandler)(QuestInterface*, lua_State*, Encounter* encounter, std::string, uint32, std::vector<std::any>*);
typedef void(*BotArgumentHandler)(QuestInterface*, lua_State*, Bot*, Mob*, std::string, uint32, std::vector<std::any>*);
typedef void(*MercArgumentHandler)(QuestInterface*, lua_State*, Merc*, Mob*, std::string, uint32, std::vector<std::any>*);
@@ -1060,7 +1060,7 @@ void handle_spell_event(
lua_State* L,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
@@ -1071,7 +1071,7 @@ void handle_translocate_finish(
lua_State* L,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
@@ -1082,7 +1082,7 @@ void handle_spell_null(
lua_State* L,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
zone/lua_stat_bonuses.cpp
+2 -2
View File
@@ -269,7 +269,7 @@ int32 Lua_StatBonuses::GetHeroicCorrup() const {
return self->HeroicCorrup;
}
uint16 Lua_StatBonuses::GetDamageShieldSpellID() const {
int32 Lua_StatBonuses::GetDamageShieldSpellID() const {
Lua_Safe_Call_Int();
return self->DamageShieldSpellID;
}
@@ -299,7 +299,7 @@ int Lua_StatBonuses::GetReverseDamageShield() const {
return self->ReverseDamageShield;
}
uint16 Lua_StatBonuses::GetReverseDamageShieldSpellID() const {
int32 Lua_StatBonuses::GetReverseDamageShieldSpellID() const {
Lua_Safe_Call_Int();
return self->ReverseDamageShieldSpellID;
}
zone/lua_stat_bonuses.h
+2 -2
View File
@@ -91,13 +91,13 @@ public:
int32 GetCorrup() const;
int32 GetCorrupCapMod() const;
int32 GetHeroicCorrup() const;
uint16 GetDamageShieldSpellID() const;
int32 GetDamageShieldSpellID() const;
int GetDamageShield() const;
int GetDamageShieldType() const;
int GetSpellDamageShield() const;
int GetSpellShield() const;
int GetReverseDamageShield() const;
uint16 GetReverseDamageShieldSpellID() const;
int32 GetReverseDamageShieldSpellID() const;
int GetReverseDamageShieldType() const;
int Getmovementspeed() const;
int32 Gethaste() const;
zone/lua_zone.cpp
+1 -1
View File
@@ -624,7 +624,7 @@ bool Lua_Zone::IsSpecialBindLocation(float x, float y, float z, float heading)
return self->IsSpecialBindLocation(glm::vec4(x, y, z, heading));
}
bool Lua_Zone::IsSpellBlocked(uint32 spell_id, float x, float y, float z)
bool Lua_Zone::IsSpellBlocked(int32 spell_id, float x, float y, float z)
{
Lua_Safe_Call_Bool();
return self->IsSpellBlocked(spell_id, glm::vec3(x, y, z));
zone/lua_zone.h
+1 -1
View File
@@ -144,7 +144,7 @@ public:
bool IsRaining();
bool IsSnowing();
bool IsSpecialBindLocation(float x, float y, float z, float heading);
bool IsSpellBlocked(uint32 spell_id, float x, float y, float z);
bool IsSpellBlocked(int32 spell_id, float x, float y, float z);
bool IsStaticZone();
bool IsUCSServerAvailable();
bool IsWaterZone(float z);
zone/merc.cpp
+11 -11
View File
@@ -1568,7 +1568,7 @@ bool EntityList::Merc_AICheckCloseBeneficialSpells(Merc* caster, uint8 iChance,
return false;
}
bool Merc::AIDoSpellCast(uint16 spellid, Mob* tar, int32 mana_cost, uint32* oDontDoAgainBefore) {
bool Merc::AIDoSpellCast(int32 spellid, Mob* tar, int32 mana_cost, uint32* oDontDoAgainBefore) {
bool result = false;
MercSpell mercSpell = GetMercSpellBySpellID(this, spellid);
@@ -2136,7 +2136,7 @@ bool Merc::HasOrMayGetAggro() {
return mayGetAggro;
}
bool Merc::CheckAENuke(Merc* caster, Mob* tar, uint16 spell_id, uint8 &numTargets) {
bool Merc::CheckAENuke(Merc* caster, Mob* tar, int32 spell_id, uint8 &numTargets) {
std::list<NPC*> npc_list;
entity_list.GetNPCList(npc_list);
@@ -2160,7 +2160,7 @@ bool Merc::CheckAENuke(Merc* caster, Mob* tar, uint16 spell_id, uint8 &numTarget
return false;
}
int64 Merc::GetFocusEffect(focusType type, uint16 spell_id, bool from_buff_tic) {
int64 Merc::GetFocusEffect(focusType type, int32 spell_id, bool from_buff_tic) {
int32 realTotal = 0;
int32 realTotal2 = 0;
@@ -2526,7 +2526,7 @@ MercSpell Merc::GetFirstMercSpellBySpellType(Merc* caster, uint32 spellType) {
return result;
}
MercSpell Merc::GetMercSpellBySpellID(Merc* caster, uint16 spellid) {
MercSpell Merc::GetMercSpellBySpellID(Merc* caster, int32 spellid) {
MercSpell result;
result.spellid = 0;
@@ -3596,7 +3596,7 @@ bool Merc::UseDiscipline(int32 spell_id, int32 target) {
return(true);
}
void Merc::SetSpellRecastTimer(uint16 timer_id, uint16 spellid, uint32 recast_delay) {
void Merc::SetSpellRecastTimer(uint16 timer_id, int32 spellid, uint32 recast_delay) {
if(timer_id > 0) {
MercTimer timer;
timer.timerid = timer_id;
@@ -3617,7 +3617,7 @@ int32 Merc::GetSpellRecastTimer(Merc *caster, uint16 timer_id) {
return result;
}
bool Merc::CheckSpellRecastTimers(Merc *caster, uint16 spell_id) {
bool Merc::CheckSpellRecastTimers(Merc *caster, int32 spell_id) {
if(caster) {
MercSpell mercSpell = GetMercSpellBySpellID(caster, spell_id);
if(mercSpell.spellid > 0 && mercSpell.time_cancast < Timer::GetCurrentTime()) { //checks spell recast
@@ -3629,7 +3629,7 @@ bool Merc::CheckSpellRecastTimers(Merc *caster, uint16 spell_id) {
return false;
}
void Merc::SetDisciplineRecastTimer(uint16 timer_id, uint16 spellid, uint32 recast_delay) {
void Merc::SetDisciplineRecastTimer(uint16 timer_id, int32 spellid, uint32 recast_delay) {
if(timer_id > 0) {
MercTimer timer;
timer.timerid = timer_id;
@@ -3660,7 +3660,7 @@ int32 Merc::GetDisciplineRemainingTime(Merc *caster, uint16 timer_id) {
return result;
}
bool Merc::CheckDisciplineRecastTimers(Merc *caster, uint16 spell_id, uint16 timer_id) {
bool Merc::CheckDisciplineRecastTimers(Merc *caster, int32 spell_id, uint16 timer_id) {
if(caster) {
MercSpell mercSpell = GetMercSpellBySpellID(caster, spell_id);
if(mercSpell.spellid > 0 && mercSpell.time_cancast < Timer::GetCurrentTime()) { //checks spell recast
@@ -3673,7 +3673,7 @@ bool Merc::CheckDisciplineRecastTimers(Merc *caster, uint16 spell_id, uint16 tim
return false;
}
void Merc::SetSpellTimeCanCast(uint16 spellid, uint32 recast_delay) {
void Merc::SetSpellTimeCanCast(int32 spellid, uint32 recast_delay) {
for (int i = 0; i < merc_spells.size(); i++) {
if(merc_spells[i].spellid == spellid) {
merc_spells[i].time_cancast = Timer::GetCurrentTime() + recast_delay;
@@ -4046,7 +4046,7 @@ bool Merc::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, boo
return NPC::Attack(other, Hand, bRiposte, IsStrikethrough, IsFromSpell, opts);
}
void Merc::Damage(Mob* other, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special)
void Merc::Damage(Mob* other, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable, int8 buffslot, bool iBuffTic, eSpecialAttacks special)
{
if(IsDead() || IsCorpse())
return;
@@ -4087,7 +4087,7 @@ Mob* Merc::GetOwnerOrSelf() {
return Result;
}
bool Merc::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillType attack_skill, uint8 killed_by, bool is_buff_tic)
bool Merc::Death(Mob* killer_mob, int64 damage, int32 spell, EQ::skills::SkillType attack_skill, uint8 killed_by, bool is_buff_tic)
{
if (!NPC::Death(killer_mob, damage, spell, attack_skill)) {
return false;
zone/merc.h
+13 -13
View File
@@ -47,7 +47,7 @@ constexpr int MAXMERCS = 11;
const int MercAISpellRange = 100; // TODO: Write a method that calcs what the merc's spell range is based on spell, equipment, AA, whatever and replace this
struct MercSpell {
uint16 spellid; // <= 0 = no spell
int32 spellid; // <= 0 = no spell
uint32 type; // 0 = never, must be one (and only one) of the defined values
int16 stance; // 0 = all, + = only this stance, - = all except this stance
int16 slot;
@@ -58,7 +58,7 @@ struct MercSpell {
struct MercTimer {
uint16 timerid; // EndurTimerIndex
uint8 timertype; // 1 = spell, 2 = disc
uint16 spellid; // <= 0 = no spell
int32 spellid; // <= 0 = no spell
uint32 time_cancast; // when we can cast this spell next
};
@@ -68,8 +68,8 @@ public:
virtual ~Merc();
//abstract virtual function implementations requird by base abstract class
virtual bool Death(Mob* killer_mob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, uint8 killed_by = 0, bool is_buff_tic = false);
virtual void Damage(Mob* from, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None);
virtual bool Death(Mob* killer_mob, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, uint8 killed_by = 0, bool is_buff_tic = false);
virtual void Damage(Mob* from, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None);
virtual bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false,
bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr);
virtual bool HasRaid() { return false; }
@@ -84,7 +84,7 @@ public:
//virtual bool AICastSpell(Mob* tar, int8 iChance, uint32 iSpellTypes);
virtual bool AICastSpell(int8 iChance, uint32 iSpellTypes);
virtual bool AIDoSpellCast(uint16 spellid, Mob* tar, int32 mana_cost, uint32* oDontDoAgainBefore = 0);
virtual bool AIDoSpellCast(int32 spellid, Mob* tar, int32 mana_cost, uint32* oDontDoAgainBefore = 0);
virtual bool AI_EngagedCastCheck();
//virtual bool AI_PursueCastCheck();
virtual bool AI_IdleCastCheck();
@@ -100,20 +100,20 @@ public:
// Merc Spell Casting Methods
int8 GetChanceToCastBySpellType(uint32 spellType);
void SetSpellRecastTimer(uint16 timer_id, uint16 spellid, uint32 recast_delay);
void SetDisciplineRecastTimer(uint16 timer_id, uint16 spellid, uint32 recast_delay);
void SetSpellTimeCanCast(uint16 spellid, uint32 recast_delay);
void SetSpellRecastTimer(uint16 timer_id, int32 spellid, uint32 recast_delay);
void SetDisciplineRecastTimer(uint16 timer_id, int32 spellid, uint32 recast_delay);
void SetSpellTimeCanCast(int32 spellid, uint32 recast_delay);
static int32 GetSpellRecastTimer(Merc *caster, uint16 timer_id);
static bool CheckSpellRecastTimers(Merc *caster, uint16 spellid);
static bool CheckSpellRecastTimers(Merc *caster, int32 spellid);
static int32 GetDisciplineRecastTimer(Merc *caster, uint16 timer_id);
static bool CheckDisciplineRecastTimers(Merc *caster, uint16 spell_id, uint16 timer_id);
static bool CheckDisciplineRecastTimers(Merc *caster, int32 spell_id, uint16 timer_id);
static int32 GetDisciplineRemainingTime(Merc *caster, uint16 timer_id);
static std::list<MercSpell> GetMercSpellsForSpellEffect(Merc* caster, int spellEffect);
static std::list<MercSpell> GetMercSpellsForSpellEffectAndTargetType(Merc* caster, int spellEffect, SpellTargetType targetType);
static std::list<MercSpell> GetMercSpellsBySpellType(Merc* caster, uint32 spellType);
static MercSpell GetFirstMercSpellBySpellType(Merc* caster, uint32 spellType);
static MercSpell GetFirstMercSpellForSingleTargetHeal(Merc* caster);
static MercSpell GetMercSpellBySpellID(Merc* caster, uint16 spellid);
static MercSpell GetMercSpellBySpellID(Merc* caster, int32 spellid);
static MercSpell GetBestMercSpellForVeryFastHeal(Merc* caster);
static MercSpell GetBestMercSpellForFastHeal(Merc* caster);
static MercSpell GetBestMercSpellForHealOverTime(Merc* caster);
@@ -133,7 +133,7 @@ public:
static MercSpell GetBestMercSpellForAERainNuke(Merc* caster, Mob* target);
static MercSpell GetBestMercSpellForNuke(Merc* caster);
static MercSpell GetBestMercSpellForNukeByTargetResists(Merc* caster, Mob* target);
static bool CheckAENuke(Merc* caster, Mob* tar, uint16 spell_id, uint8 &numTargets);
static bool CheckAENuke(Merc* caster, Mob* tar, int32 spell_id, uint8 &numTargets);
static bool GetNeedsCured(Mob *tar);
bool HasOrMayGetAggro();
bool UseDiscipline(int32 spell_id, int32 target);
@@ -287,7 +287,7 @@ public:
bool FindTarget();
protected:
int64 GetFocusEffect(focusType type, uint16 spell_id, bool from_buff_tic = false);
int64 GetFocusEffect(focusType type, int32 spell_id, bool from_buff_tic = false);
std::vector<MercSpell> merc_spells;
std::map<uint32,MercTimer> timers;
zone/mob.cpp
+15 -15
View File
@@ -5262,7 +5262,7 @@ uint32 Mob::GetLevelHP(uint8 tlevel)
return multiplier;
}
int32 Mob::GetActSpellCasttime(uint16 spell_id, int32 casttime)
int32 Mob::GetActSpellCasttime(int32 spell_id, int32 casttime)
{
int32 cast_reducer = GetFocusEffect(focusSpellHaste, spell_id);
int32 cast_reducer_amt = GetFocusEffect(focusFcCastTimeAmt, spell_id);
@@ -5283,7 +5283,7 @@ int32 Mob::GetActSpellCasttime(uint16 spell_id, int32 casttime)
}
void Mob::ExecWeaponProc(const EQ::ItemInstance* inst, uint16 spell_id, Mob* on, int level_override)
void Mob::ExecWeaponProc(const EQ::ItemInstance* inst, int32 spell_id, Mob* on, int level_override)
{
// Changed proc targets to look up based on the spells goodEffect flag.
// This should work for the majority of weapons.
@@ -5828,7 +5828,7 @@ void Mob::SetNimbusEffect(uint32 nimbus_effect)
}
}
bool Mob::TrySpellTrigger(Mob *target, uint32 spell_id, int effect)
bool Mob::TrySpellTrigger(Mob *target, int32 spell_id, int effect)
{
if (!target || !IsValidSpell(spell_id))
return false;
@@ -5886,7 +5886,7 @@ bool Mob::TrySpellTrigger(Mob *target, uint32 spell_id, int effect)
return true;
}
else if (IsClient() && spells[spell_id].effect_id[effect_slot] == SpellEffect::Chance_Best_in_Spell_Grp) {
uint32 best_spell_id = CastToClient()->GetHighestScribedSpellinSpellGroup(spells[spell_id].limit_value[effect_slot]);
int32 best_spell_id = CastToClient()->GetHighestScribedSpellinSpellGroup(spells[spell_id].limit_value[effect_slot]);
if (IsValidSpell(best_spell_id)) {
SpellFinished(best_spell_id, target, EQ::spells::CastingSlot::Item, 0, -1, spells[best_spell_id].resist_difficulty);
}
@@ -5920,7 +5920,7 @@ void Mob::TryTriggerOnCastRequirement()
}
//Twincast Focus effects should stack across different types (Spell, AA - when implemented ect)
void Mob::TryTwincast(Mob *caster, Mob *target, uint32 spell_id)
void Mob::TryTwincast(Mob *caster, Mob *target, int32 spell_id)
{
if (!IsValidSpell(spell_id)) {
return;
@@ -5964,7 +5964,7 @@ void Mob::TryTwincast(Mob *caster, Mob *target, uint32 spell_id)
}
//Used for effects that should occur after the completion of the spell
void Mob::ApplyHealthTransferDamage(Mob *caster, Mob *target, uint16 spell_id)
void Mob::ApplyHealthTransferDamage(Mob *caster, Mob *target, int32 spell_id)
{
if (!IsValidSpell(spell_id))
return;
@@ -5992,7 +5992,7 @@ void Mob::ApplyHealthTransferDamage(Mob *caster, Mob *target, uint16 spell_id)
}
}
int32 Mob::GetVulnerability(Mob *caster, uint32 spell_id, uint32 ticsremaining, bool from_buff_tic)
int32 Mob::GetVulnerability(Mob *caster, int32 spell_id, uint32 ticsremaining, bool from_buff_tic)
{
/*
Modifies incoming spell damage by percent, to increase or decrease damage, can be limited to specific resists.
@@ -6184,7 +6184,7 @@ bool Mob::TryFadeEffect(int slot)
if (spells[buffs[slot].spellid].effect_id[i] == SpellEffect::CastOnFadeEffectAlways ||
spells[buffs[slot].spellid].effect_id[i] == SpellEffect::CastOnRuneFadeEffect)
{
uint16 spell_id = spells[buffs[slot].spellid].base_value[i];
int32 spell_id = spells[buffs[slot].spellid].base_value[i];
BuffFadeBySlot(slot);
if(spell_id)
@@ -6210,7 +6210,7 @@ bool Mob::TryFadeEffect(int slot)
return false;
}
void Mob::TrySympatheticProc(Mob* target, uint32 spell_id)
void Mob::TrySympatheticProc(Mob* target, int32 spell_id)
{
if (!target || !IsValidSpell(spell_id) || !IsOfClientBotMerc()) {
return;
@@ -6562,7 +6562,7 @@ void Mob::DoKnockback(Mob *caster, uint32 push_back, uint32 push_up)
}
}
void Mob::TrySpellOnKill(uint8 level, uint16 spell_id)
void Mob::TrySpellOnKill(uint8 level, int32 spell_id)
{
if (IsValidSpell(spell_id))
{
@@ -7110,7 +7110,7 @@ int16 Mob::GetModVulnerability(const uint8 resist)
return 0;
}
void Mob::CastOnCurer(uint32 spell_id)
void Mob::CastOnCurer(int32 spell_id)
{
for(int i = 0; i < EFFECT_COUNT; i++)
{
@@ -7124,7 +7124,7 @@ void Mob::CastOnCurer(uint32 spell_id)
}
}
void Mob::CastOnCure(uint32 spell_id)
void Mob::CastOnCure(int32 spell_id)
{
for(int i = 0; i < EFFECT_COUNT; i++)
{
@@ -7138,7 +7138,7 @@ void Mob::CastOnCure(uint32 spell_id)
}
}
void Mob::CastOnNumHitFade(uint32 spell_id)
void Mob::CastOnNumHitFade(int32 spell_id)
{
if(!IsValidSpell(spell_id))
return;
@@ -7250,7 +7250,7 @@ uint16 Mob::GetWeaponSpeedbyHand(uint16 hand) {
return weapon_speed;
}
int8 Mob::GetDecayEffectValue(uint16 spell_id, uint16 spelleffect) {
int8 Mob::GetDecayEffectValue(int32 spell_id, uint16 spelleffect) {
if (!IsValidSpell(spell_id))
return false;
@@ -7674,7 +7674,7 @@ uint8 Mob::GetSeeInvisibleLevelFromNPCStat(uint16 in_see_invis)
return std::min((see_invis_level - 1), MAX_INVISIBILTY_LEVEL);
}
int32 Mob::GetSpellStat(uint32 spell_id, const char *identifier, uint8 slot)
int32 Mob::GetSpellStat(int32 spell_id, const char *identifier, uint8 slot)
{
return GetSpellStatValue(spell_id, identifier, slot);
}
zone/mob.h
+99 -99
View File
@@ -348,47 +348,47 @@ public:
void SendSpellEffect(uint32 effect_id, uint32 duration, uint32 finish_delay, bool zone_wide,
uint32 unk020, bool perm_effect = false, Client *c = nullptr, uint32 caster_id = 0, uint32 target_id = 0);
bool IsBeneficialAllowed(Mob *target);
virtual int GetCasterLevel(uint16 spell_id);
void ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses* newbon, uint16 casterID = 0,
virtual int GetCasterLevel(int32 spell_id);
void ApplySpellsBonuses(int32 spell_id, uint8 casterlevel, StatBonuses* newbon, uint16 casterID = 0,
uint8 WornType = 0, int32 ticsremaining = 0, int buffslot = -1, int instrument_mod = 10,
bool IsAISpellEffect = false, uint16 effect_id = 0, int32 se_base = 0, int32 se_limit = 0, int32 se_max = 0);
void NegateSpellEffectBonuses(uint16 spell_id);
bool NegateSpellEffect(uint16 spell_id, int effect_id);
float GetActSpellRange(uint16 spell_id, float range);
int64 GetActSpellDamage(uint16 spell_id, int64 value, Mob* target = nullptr);
int64 GetActDoTDamage(uint16 spell_id, int64 value, Mob* target, bool from_buff_tic = true);
int64 GetActSpellHealing(uint16 spell_id, int64 value, Mob* target = nullptr, bool from_buff_tic = false);
int32 GetActSpellCost(uint16 spell_id, int32 cost);
virtual int32 GetActSpellDuration(uint16 spell_id, int32 duration);
int32 GetActSpellCasttime(uint16 spell_id, int32 casttime);
virtual int64 GetActReflectedSpellDamage(uint16 spell_id, int64 value, int effectiveness);
float ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use_resist_override = false,
void NegateSpellEffectBonuses(int32 spell_id);
bool NegateSpellEffect(int32 spell_id, int effect_id);
float GetActSpellRange(int32 spell_id, float range);
int64 GetActSpellDamage(int32 spell_id, int64 value, Mob* target = nullptr);
int64 GetActDoTDamage(int32 spell_id, int64 value, Mob* target, bool from_buff_tic = true);
int64 GetActSpellHealing(int32 spell_id, int64 value, Mob* target = nullptr, bool from_buff_tic = false);
int32 GetActSpellCost(int32 spell_id, int32 cost);
virtual int32 GetActSpellDuration(int32 spell_id, int32 duration);
int32 GetActSpellCasttime(int32 spell_id, int32 casttime);
virtual int64 GetActReflectedSpellDamage(int32 spell_id, int64 value, int effectiveness);
float ResistSpell(uint8 resist_type, int32 spell_id, Mob *caster, bool use_resist_override = false,
int resist_override = 0, bool CharismaCheck = false, bool CharmTick = false, bool IsRoot = false,
int level_override = -1);
int GetResist(uint8 resist_type);
int ResistPhysical(int level_diff, uint8 caster_level);
int ResistElementalWeaponDmg(const EQ::ItemInstance *item);
int CheckBaneDamage(const EQ::ItemInstance *item);
uint16 GetSpecializeSkillValue(uint16 spell_id) const;
uint16 GetSpecializeSkillValue(int32 spell_id) const;
void SendSpellBarDisable();
void SendSpellBarEnable(uint16 spellid);
void SendSpellBarEnable(int32 spellid);
void ZeroCastingVars();
virtual void SpellProcess();
virtual bool CastSpell(uint16 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1,
virtual bool CastSpell(int32 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1,
int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF,
uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, int16 *resist_adjust = nullptr,
uint32 aa_id = 0);
virtual bool DoCastSpell(uint16 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1,
virtual bool DoCastSpell(int32 spell_id, uint16 target_id, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int32 casttime = -1,
int32 mana_cost = -1, uint32* oSpellWillFinish = 0, uint32 item_slot = 0xFFFFFFFF,
uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, int16 resist_adjust = 0,
uint32 aa_id = 0);
void CastedSpellFinished(uint16 spell_id, uint32 target_id, EQ::spells::CastingSlot slot, int mana_used,
void CastedSpellFinished(int32 spell_id, uint32 target_id, EQ::spells::CastingSlot slot, int mana_used,
uint32 inventory_slot = 0xFFFFFFFF, int16 resist_adjust = 0);
bool SpellFinished(uint16 spell_id, Mob *target, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int mana_used = 0,
bool SpellFinished(int32 spell_id, Mob *target, EQ::spells::CastingSlot slot = EQ::spells::CastingSlot::Item, int mana_used = 0,
uint32 inventory_slot = 0xFFFFFFFF, int16 resist_adjust = 0, bool isproc = false, int level_override = -1, uint32 timer = 0xFFFFFFFF, uint32 timer_duration = 0, bool from_casted_spell = false, uint32 aa_id = 0);
void SendBeginCast(uint16 spell_id, uint32 casttime);
void SendBeginCast(int32 spell_id, uint32 casttime);
virtual bool SpellOnTarget(
uint16 spell_id,
int32 spell_id,
Mob* spelltar,
int reflect_effectiveness = 0,
bool use_resist_adjust = false,
@@ -398,31 +398,31 @@ public:
int duration_override = 0,
bool disable_buff_overwrite = false
);
virtual bool SpellEffect(Mob* caster, uint16 spell_id, float partial = 100, int level_override = -1, int reflect_effectiveness = 0, int32 duration_override = 0, bool disable_buff_overwrite = false);
virtual bool DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center,
virtual bool SpellEffect(Mob* caster, int32 spell_id, float partial = 100, int level_override = -1, int reflect_effectiveness = 0, int32 duration_override = 0, bool disable_buff_overwrite = false);
virtual bool DetermineSpellTargets(int32 spell_id, Mob *&spell_target, Mob *&ae_center,
CastAction_type &CastAction, EQ::spells::CastingSlot slot, bool isproc = false);
bool DoCastingChecksOnCaster(int32 spell_id, EQ::spells::CastingSlot slot);
bool DoCastingChecksZoneRestrictions(bool check_on_casting, int32 spell_id);
bool DoCastingChecksOnTarget(bool check_on_casting, int32 spell_id, Mob* spell_target);
virtual bool CheckFizzle(uint16 spell_id);
virtual bool CheckSpellLevelRestriction(Mob *caster, uint16 spell_id);
virtual bool IsImmuneToSpell(uint16 spell_id, Mob *caster);
virtual bool CheckFizzle(int32 spell_id);
virtual bool CheckSpellLevelRestriction(Mob *caster, int32 spell_id);
virtual bool IsImmuneToSpell(int32 spell_id, Mob *caster);
virtual float GetAOERange(uint16 spell_id);
void InterruptSpell(uint16 spellid = SPELL_UNKNOWN);
void InterruptSpell(uint16, uint16, uint16 spellid = SPELL_UNKNOWN);
virtual float GetAOERange(int32 spell_id);
void InterruptSpell(int32 spellid = SPELL_UNKNOWN);
void InterruptSpell(uint16, uint16, int32 spellid = SPELL_UNKNOWN);
void StopCasting();
void StopCastSpell(int32 spell_id, bool send_spellbar_enable);
inline bool IsCasting() const { return((casting_spell_id != 0)); }
uint16 CastingSpellID() const { return casting_spell_id; }
int32 CastingSpellID() const { return casting_spell_id; }
bool TryDispel(uint8 caster_level, uint8 buff_level, int level_modifier);
bool TrySpellProjectile(Mob* spell_target, uint16 spell_id, float speed = 1.5f);
void ResourceTap(int64 damage, uint16 spell_id);
bool TrySpellProjectile(Mob* spell_target, int32 spell_id, float speed = 1.5f);
void ResourceTap(int64 damage, int32 spell_id);
void TryTriggerThreshHold(int64 damage, int effect_id, Mob* attacker);
void CalcDestFromHeading(float heading, float distance, float MaxZDiff, float StartX, float StartY, float &dX, float &dY, float &dZ);
void BeamDirectional(uint16 spell_id, int16 resist_adjust);
void ConeDirectional(uint16 spell_id, int16 resist_adjust);
void ApplyHealthTransferDamage(Mob *caster, Mob *target, uint16 spell_id);
void BeamDirectional(int32 spell_id, int16 resist_adjust);
void ConeDirectional(int32 spell_id, int16 resist_adjust);
void ApplyHealthTransferDamage(Mob *caster, Mob *target, int32 spell_id);
void ApplySpellEffectIllusion(int32 spell_id, Mob* caster, int buffslot, int base, int limit, int max);
void ApplyIllusionToCorpse(int32 spell_id, Corpse* new_corpse);
void SendIllusionWearChange(Client* c);
@@ -437,13 +437,13 @@ public:
void ZeroBardPulseVars();
void DoBardCastingFromItemClick(bool is_casting_bard_song, uint32 cast_time, int32 spell_id, uint16 target_id, EQ::spells::CastingSlot slot, uint32 item_slot,
uint32 recast_type , uint32 recast_delay);
bool UseBardSpellLogic(uint16 spell_id = 0xffff, int slot = -1);
bool UseBardSpellLogic(int32 spell_id = 0xffff, int slot = -1);
//Buff
void BuffProcess();
virtual void DoBuffTic(const Buffs_Struct &buff, int slot, Mob* caster = nullptr);
void BuffFadeBySpellID(uint16 spell_id);
void BuffFadeBySpellIDAndCaster(uint16 spell_id, uint16 caster_id);
void BuffFadeBySpellID(int32 spell_id);
void BuffFadeBySpellIDAndCaster(int32 spell_id, uint16 caster_id);
void BuffFadeByEffect(int effect_id, int slot_to_skip = -1);
void BuffFadeAll();
void BuffFadeBeneficial();
@@ -455,10 +455,10 @@ public:
void BuffFadeSongs();
void BuffDetachCaster(Mob *caster);
bool IsAffectedByBuffByGlobalGroup(GlobalGroup group);
void BuffModifyDurationBySpellID(uint16 spell_id, int32 newDuration);
int AddBuff(Mob *caster, const uint16 spell_id, int duration = 0, int32 level_override = -1, bool disable_buff_overwrite = false);
int CanBuffStack(uint16 spellid, uint8 caster_level, bool iFailIfOverwrite = false);
int CalcBuffDuration(Mob *caster, Mob *target, uint16 spell_id, int32 caster_level_override = -1);
void BuffModifyDurationBySpellID(int32 spell_id, int32 newDuration);
int AddBuff(Mob *caster, const int32 spell_id, int duration = 0, int32 level_override = -1, bool disable_buff_overwrite = false);
int CanBuffStack(int32 spellid, uint8 caster_level, bool iFailIfOverwrite = false);
int CalcBuffDuration(Mob *caster, Mob *target, int32 spell_id, int32 caster_level_override = -1);
void SendPetBuffsToClient();
virtual int GetCurrentBuffSlots() const { return 0; }
virtual int GetCurrentSongSlots() const { return 0; }
@@ -477,14 +477,14 @@ public:
void DamageShield(Mob* other, bool spell_ds = false);
int32 RuneAbsorb(int64 damage, uint16 type);
std::vector<uint16> GetBuffSpellIDs();
bool FindBuff(uint16 spell_id, uint16 caster_id = 0);
bool FindBuff(int32 spell_id, uint16 caster_id = 0);
uint16 FindBuffBySlot(int slot);
uint32 BuffCount(bool is_beneficial = true, bool is_detrimental = true);
bool FindType(uint16 type, bool bOffensive = false, uint16 threshold = 100);
int16 GetBuffSlotFromType(uint16 type);
uint16 GetSpellIDFromSlot(uint8 slot);
int32 GetSpellIDFromSlot(uint8 slot);
int CountDispellableBuffs();
void CheckNumHitsRemaining(NumHit type, int32 buff_slot = -1, uint16 spell_id = SPELL_UNKNOWN);
void CheckNumHitsRemaining(NumHit type, int32 buff_slot = -1, int32 spell_id = SPELL_UNKNOWN);
bool HasNumhits() const { return has_numhits; }
inline void Numhits(bool val) { has_numhits = val; }
bool HasMGB() const { return has_MGB; }
@@ -547,12 +547,12 @@ public:
bool CanClassEquipItem(uint32 item_id);
bool CanRaceEquipItem(uint32 item_id);
bool AffectedBySpellExcludingSlot(int slot, int effect);
virtual bool Death(Mob* killer_mob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false) = 0;
virtual void Damage(Mob* from, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill,
virtual bool Death(Mob* killer_mob, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false) = 0;
virtual void Damage(Mob* from, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill,
bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None) = 0;
void SetHP(int64 hp);
inline void SetOOCRegen(int64 new_ooc_regen) { ooc_regen = new_ooc_regen; }
virtual void HealDamage(uint64 ammount, Mob* caster = nullptr, uint16 spell_id = SPELL_UNKNOWN);
virtual void HealDamage(uint64 ammount, Mob* caster = nullptr, int32 spell_id = SPELL_UNKNOWN);
virtual void SetMaxHP() { current_hp = max_hp; }
virtual inline uint16 GetBaseRace() const { return base_race; }
virtual inline uint8 GetBaseGender() const { return base_gender; }
@@ -755,7 +755,7 @@ public:
static uint32 GetLevelCon(uint8 mylevel, uint8 iOtherLevel);
inline uint32 GetLevelCon(uint8 iOtherLevel) const { return GetLevelCon(GetLevel(), iOtherLevel); }
void AddToHateList(Mob* other, int64 hate = 0, int64 damage = 0, bool iYellForHelp = true,
bool bFrenzy = false, bool iBuffTic = false, uint16 spell_id = SPELL_UNKNOWN, bool pet_comand = false);
bool bFrenzy = false, bool iBuffTic = false, int32 spell_id = SPELL_UNKNOWN, bool pet_comand = false);
bool RemoveFromHateList(Mob* mob);
void SetHateAmountOnEnt(Mob* other, int64 hate = 0, int64 damage = 0) { hate_list.SetHateAmountOnEnt(other,hate,damage);}
void HalveAggro(Mob *other) { int64 in_hate = GetHateAmount(other); SetHateAmountOnEnt(other, (in_hate > 1 ? in_hate / 2 : 1)); }
@@ -851,8 +851,8 @@ public:
static uint8 GetDefaultGender(uint16 in_race, uint8 in_gender = 0xFF);
EQ::skills::SkillType GetSkillByItemType(int ItemType);
uint8 GetItemTypeBySkill(EQ::skills::SkillType skill);
virtual void MakePet(uint16 spell_id, const char* pettype, const char *petname = nullptr);
virtual void MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower, const char *petname = nullptr, float in_size = 0.0f);
virtual void MakePet(int32 spell_id, const char* pettype, const char *petname = nullptr);
virtual void MakePoweredPet(int32 spell_id, const char* pettype, int16 petpower, const char *petname = nullptr, float in_size = 0.0f);
bool IsWarriorClass() const;
bool IsIntelligenceCasterClass() const;
bool IsPureMeleeClass() const;
@@ -868,7 +868,7 @@ public:
virtual int GetKillExpMod() const { return 100; }
// aura functions
void MakeAura(uint16 spell_id);
void MakeAura(int32 spell_id);
inline int GetAuraSlots() { return 1 + aabonuses.aura_slots + itembonuses.aura_slots + spellbonuses.aura_slots; }
inline int GetTrapSlots() { return 1 + aabonuses.trap_slots + itembonuses.trap_slots + spellbonuses.trap_slots; }
inline bool HasFreeAuraSlots() { return aura_mgr.count < GetAuraSlots(); }
@@ -882,18 +882,18 @@ public:
//Procs
void TriggerDefensiveProcs(Mob *on, uint16 hand = EQ::invslot::slotPrimary, bool FromSkillProc = false, int64 damage = 0);
bool AddRangedProc(uint16 spell_id, uint16 iChance = 3, uint16 base_spell_id = SPELL_UNKNOWN, uint32 proc_reuse_time = 0);
bool RemoveRangedProc(uint16 spell_id, bool bAll = false);
bool AddRangedProc(int32 spell_id, uint16 iChance = 3, int32 base_spell_id = SPELL_UNKNOWN, uint32 proc_reuse_time = 0);
bool RemoveRangedProc(int32 spell_id, bool bAll = false);
bool HasRangedProcs() const;
bool AddDefensiveProc(uint16 spell_id, uint16 iChance = 3, uint16 base_spell_id = SPELL_UNKNOWN, uint32 proc_reuse_time = 0);
bool RemoveDefensiveProc(uint16 spell_id, bool bAll = false);
bool AddDefensiveProc(int32 spell_id, uint16 iChance = 3, int32 base_spell_id = SPELL_UNKNOWN, uint32 proc_reuse_time = 0);
bool RemoveDefensiveProc(int32 spell_id, bool bAll = false);
bool HasDefensiveProcs() const;
bool HasSkillProcs() const;
bool HasSkillProcSuccess() const;
bool AddProcToWeapon(uint16 spell_id, bool bPerma = false, uint16 iChance = 3, uint16 base_spell_id = SPELL_UNKNOWN, int level_override = -1, uint32 proc_reuse_time = 0);
bool RemoveProcFromWeapon(uint16 spell_id, bool bAll = false);
bool AddProcToWeapon(int32 spell_id, bool bPerma = false, uint16 iChance = 3, int32 base_spell_id = SPELL_UNKNOWN, int level_override = -1, uint32 proc_reuse_time = 0);
bool RemoveProcFromWeapon(int32 spell_id, bool bAll = false);
bool HasProcs() const;
bool IsCombatProc(uint16 spell_id);
bool IsCombatProc(int32 spell_id);
//More stuff to sort:
virtual bool IsRaidTarget() const { return false; };
@@ -935,8 +935,8 @@ public:
void QuestJournalledSay(Client *QuestInitiator, const char *str, Journal::Options &opts);
const int GetItemStat(uint32 item_id, std::string identifier);
int64 CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, bool best_focus=false, uint16 casterid = 0, Mob *caster = nullptr);
uint8 IsFocusEffect(uint16 spellid, int effect_index, bool AA=false,uint32 aa_effect=0);
int64 CalcFocusEffect(focusType type, uint16 focus_id, int32 spell_id, bool best_focus=false, uint16 casterid = 0, Mob *caster = nullptr);
uint8 IsFocusEffect(int32 spellid, int effect_index, bool AA=false,uint32 aa_effect=0);
void SendIllusionPacket(const AppearanceStruct& a);
void CloneAppearance(Mob* other, bool clone_name = false);
void SetFaceAppearance(const FaceChange_Struct& face, bool skip_sender = false);
@@ -945,38 +945,38 @@ public:
virtual void UnStun();
inline void Silence(bool newval) { silenced = newval; }
inline void Amnesia(bool newval) { amnesiad = newval; }
void TemporaryPets(uint16 spell_id, Mob *target, const char *name_override = nullptr, uint32 duration_override = 0, bool followme=true, bool sticktarg=false, uint16 *controlled_pet_id = nullptr);
void TemporaryPets(int32 spell_id, Mob *target, const char *name_override = nullptr, uint32 duration_override = 0, bool followme=true, bool sticktarg=false, uint16 *controlled_pet_id = nullptr);
void TypesTemporaryPets(uint32 typesid, Mob *target, const char *name_override = nullptr, uint32 duration_override = 0, bool followme=true, bool sticktarg=false);
void WakeTheDead(uint16 spell_id, Corpse *corpse_to_use, Mob *target, uint32 duration);
void WakeTheDead(int32 spell_id, Corpse *corpse_to_use, Mob *target, uint32 duration);
void Spin();
void Kill();
bool PassCharismaCheck(Mob* caster, uint16 spell_id);
bool PassCharismaCheck(Mob* caster, int32 spell_id);
bool TryDeathSave();
bool TryDivineSave();
void TryTriggerOnCastFocusEffect(focusType type, uint16 spell_id);
bool TryTriggerOnCastProc(uint16 focusspellid, uint16 spell_id, uint16 proc_spellid);
bool TrySpellTrigger(Mob *target, uint32 spell_id, int effect);
void TryTriggerOnCastFocusEffect(focusType type, int32 spell_id);
bool TryTriggerOnCastProc(int32 focusspellid, int32 spell_id, int32 proc_spellid);
bool TrySpellTrigger(Mob *target, int32 spell_id, int effect);
void TryTriggerOnCastRequirement();
void TryTwincast(Mob *caster, Mob *target, uint32 spell_id);
void TrySympatheticProc(Mob *target, uint32 spell_id);
uint16 GetSympatheticFocusEffect(focusType type, uint16 spell_id);
void TryTwincast(Mob *caster, Mob *target, int32 spell_id);
void TrySympatheticProc(Mob *target, int32 spell_id);
int32 GetSympatheticFocusEffect(focusType type, int32 spell_id);
bool TryFadeEffect(int slot);
void DispelMagic(Mob* casterm, uint16 spell_id, int effect_value);
bool TrySpellEffectResist(uint16 spell_id);
int32 GetVulnerability(Mob *caster, uint32 spell_id, uint32 ticsremaining, bool from_buff_tic = false);
void DispelMagic(Mob* casterm, int32 spell_id, int effect_value);
bool TrySpellEffectResist(int32 spell_id);
int32 GetVulnerability(Mob *caster, int32 spell_id, uint32 ticsremaining, bool from_buff_tic = false);
int64 GetFcDamageAmtIncoming(Mob *caster, int32 spell_id, bool from_buff_tic = false);
int64 GetFocusIncoming(focusType type, int effect, Mob *caster, uint32 spell_id); //**** This can be removed when bot healing focus code is updated ****
int64 GetFocusIncoming(focusType type, int effect, Mob *caster, int32 spell_id); //**** This can be removed when bot healing focus code is updated ****
int32 GetSkillDmgTaken(const EQ::skills::SkillType skill_used, ExtraAttackOptions *opts = nullptr);
int32 GetPositionalDmgTaken(Mob *attacker);
int32 GetPositionalDmgTakenAmt(Mob *attacker);
void DoKnockback(Mob *caster, uint32 push_back, uint32 push_up);
int16 CalcResistChanceBonus();
int16 CalcFearResistChance();
void TrySpellOnKill(uint8 level, uint16 spell_id);
void TrySpellOnKill(uint8 level, int32 spell_id);
bool TrySpellOnDeath();
void CastOnCurer(uint32 spell_id);
void CastOnCure(uint32 spell_id);
void CastOnNumHitFade(uint32 spell_id);
void CastOnCurer(int32 spell_id);
void CastOnCure(int32 spell_id);
void CastOnNumHitFade(int32 spell_id);
void SlowMitigation(Mob* caster);
int16 GetCritDmgMod(uint16 skill, Mob* owner = nullptr);
int16 GetMeleeDamageMod_SE(uint16 skill);
@@ -989,18 +989,18 @@ public:
int16 GetPositionalDmgAmt(Mob* defender);
inline bool CanBlockSpell() const { return(spellbonuses.FocusEffects[focusBlockNextSpell]); }
bool DoHPToManaCovert(int32 mana_cost = 0);
int8 GetDecayEffectValue(uint16 spell_id, uint16 spelleffect);
int64 GetExtraSpellAmt(uint16 spell_id, int64 extra_spell_amt, int64 base_spell_dmg);
int8 GetDecayEffectValue(int32 spell_id, uint16 spelleffect);
int64 GetExtraSpellAmt(int32 spell_id, int64 extra_spell_amt, int64 base_spell_dmg);
void MeleeLifeTap(int64 damage);
bool PassCastRestriction(int value);
void SendCastRestrictionMessage(int requirement_id, bool is_target_requirement = true, bool is_discipline = false);
bool ImprovedTaunt();
bool TryRootFadeByDamage(int buffslot, Mob* attacker);
float GetSlowMitigation() const { return slow_mitigation; }
void CalcSpellPowerDistanceMod(uint16 spell_id, float range, Mob* caster = nullptr);
void CalcSpellPowerDistanceMod(int32 spell_id, float range, Mob* caster = nullptr);
inline int16 GetSpellPowerDistanceMod() const { return SpellPowerDistanceMod; };
inline void SetSpellPowerDistanceMod(int16 value) { SpellPowerDistanceMod = value; };
int32 GetSpellStat(uint32 spell_id, const char *identifier, uint8 slot = 0);
int32 GetSpellStat(int32 spell_id, const char *identifier, uint8 slot = 0);
bool HarmonySpellLevelCheck(int32 spell_id, Mob* target = nullptr);
bool PassCharmTargetRestriction(Mob *target);
bool CanFocusUseRandomEffectivenessByType(focusType type);
@@ -1156,7 +1156,7 @@ public:
inline bool IsAmnesiad() const { return amnesiad; }
int64 ReduceDamage(int64 damage);
int64 AffectMagicalDamage(int64 damage, uint16 spell_id, const bool iBuffTic, Mob* attacker);
int64 AffectMagicalDamage(int64 damage, int32 spell_id, const bool iBuffTic, Mob* attacker);
int64 ReduceAllDamage(int64 damage);
void DoSpecialAttackDamage(Mob *who, EQ::skills::SkillType skill, int base_damage, int min_damage = 0, int32 hate_override = -1, int ReuseTime = 10);
@@ -1298,13 +1298,13 @@ public:
static uint32 GetLevelHP(uint8 tlevel);
uint32 GetZoneID() const; //for perl
uint16 GetInstanceVersion() const; //for perl
virtual int32 CheckAggroAmount(uint16 spell_id, Mob *target, bool isproc = false);
virtual int32 CheckHealAggroAmount(uint16 spell_id, Mob *target, uint32 heal_possible = 0);
virtual int32 CheckAggroAmount(int32 spell_id, Mob *target, bool isproc = false);
virtual int32 CheckHealAggroAmount(int32 spell_id, Mob *target, uint32 heal_possible = 0);
uint32 GetInstrumentMod(uint16 spell_id);
int64 CalcSpellEffectValue(uint16 spell_id, int effect_id, int caster_level = 1, uint32 instrument_mod = 10, Mob *caster = nullptr, int ticsremaining = 0,uint16 casterid=0);
int64 CalcSpellEffectValue_formula(uint32 formula, int64 base_value, int64 max_value, int caster_level, uint16 spell_id, int ticsremaining = 0);
virtual int CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, int caster_level2, Mob* caster1 = nullptr, Mob* caster2 = nullptr, int buffslot = -1);
uint32 GetInstrumentMod(int32 spell_id);
int64 CalcSpellEffectValue(int32 spell_id, int effect_id, int caster_level = 1, uint32 instrument_mod = 10, Mob *caster = nullptr, int ticsremaining = 0,uint16 casterid=0);
int64 CalcSpellEffectValue_formula(uint32 formula, int64 base_value, int64 max_value, int caster_level, int32 spell_id, int ticsremaining = 0);
virtual int CheckStackConflict(int32 spellid1, int caster_level1, int32 spellid2, int caster_level2, Mob* caster1 = nullptr, Mob* caster2 = nullptr, int buffslot = -1);
uint32 GetCastedSpellInvSlot() const { return casting_spell_inventory_slot; }
// HP Event
@@ -1438,7 +1438,7 @@ public:
int GetAlternateAdvancementCooldownReduction(AA::Rank *rank_in);
void ExpendAlternateAdvancementCharge(uint32 aa_id);
void CalcAABonuses(StatBonuses* newbon);
int64 CalcAAFocus(focusType type, const AA::Rank &rank, uint16 spell_id);
int64 CalcAAFocus(focusType type, const AA::Rank &rank, int32 spell_id);
void ApplyAABonuses(const AA::Rank &rank, StatBonuses* newbon);
bool CheckAATimer(int timer);
@@ -1515,8 +1515,8 @@ public:
bool IsDestroying() const { return m_destroying; }
protected:
void CommonDamage(Mob* other, int64 &damage, const uint16 spell_id, const EQ::skills::SkillType attack_skill, bool &avoidable, const int8 buffslot, const bool iBuffTic, eSpecialAttacks specal = eSpecialAttacks::None);
static uint16 GetProcID(uint16 spell_id, uint8 effect_index);
void CommonDamage(Mob* other, int64 &damage, const int32 spell_id, const EQ::skills::SkillType attack_skill, bool &avoidable, const int8 buffslot, const bool iBuffTic, eSpecialAttacks specal = eSpecialAttacks::None);
static int32 GetProcID(int32 spell_id, uint8 effect_index);
int _GetWalkSpeed() const;
int _GetRunSpeed() const;
int _GetFearSpeed() const;
@@ -1652,21 +1652,21 @@ protected:
void TryWeaponProc(const EQ::ItemInstance* inst, const EQ::ItemData* weapon, Mob *on, uint16 hand = EQ::invslot::slotPrimary);
void TrySpellProc(const EQ::ItemInstance* inst, const EQ::ItemData* weapon, Mob *on, uint16 hand = EQ::invslot::slotPrimary);
void TryCombatProcs(const EQ::ItemInstance* weapon, Mob *on, uint16 hand = EQ::invslot::slotPrimary, const EQ::ItemData* weapon_data = nullptr);
void ExecWeaponProc(const EQ::ItemInstance* weapon, uint16 spell_id, Mob *on, int level_override = -1);
void ExecWeaponProc(const EQ::ItemInstance* weapon, int32 spell_id, Mob *on, int level_override = -1);
virtual float GetProcChances(float ProcBonus, uint16 hand = EQ::invslot::slotPrimary);
virtual float GetDefensiveProcChances(float &ProcBonus, float &ProcChance, uint16 hand = EQ::invslot::slotPrimary, Mob *on = nullptr);
virtual float GetSkillProcChances(uint16 ReuseTime, uint16 hand = 0); // hand = MainCharm?
uint16 GetWeaponSpeedbyHand(uint16 hand);
virtual int GetBaseSkillDamage(EQ::skills::SkillType skill, Mob *target = nullptr);
virtual int64 GetFocusEffect(focusType type, uint16 spell_id, Mob *caster = nullptr, bool from_buff_tic = false);
virtual int64 GetFocusEffect(focusType type, int32 spell_id, Mob *caster = nullptr, bool from_buff_tic = false);
virtual EQ::InventoryProfile& GetInv() { return m_inv; }
void CalculateNewFearpoint();
float FindGroundZ(float new_x, float new_y, float z_offset=0.0);
float FindDestGroundZ(glm::vec3 dest, float z_offset=0.0);
virtual float GetSympatheticProcChances(uint16 spell_id, int16 ProcRateMod, int32 ItemProcRate = 0);
int16 GetSympatheticSpellProcRate(uint16 spell_id);
uint16 GetSympatheticSpellProcID(uint16 spell_id);
virtual float GetSympatheticProcChances(int32 spell_id, int16 ProcRateMod, int32 ItemProcRate = 0);
int16 GetSympatheticSpellProcRate(int32 spell_id);
int32 GetSympatheticSpellProcID(int32 spell_id);
enum {MAX_PROCS = 10};
tProc PermaProcs[MAX_PROCS];
@@ -1724,7 +1724,7 @@ protected:
//spell casting vars
Timer spellend_timer;
uint16 casting_spell_id;
int32 casting_spell_id;
glm::vec3 m_SpellLocation;
int attacked_count;
bool delaytimer;
@@ -1945,6 +1945,6 @@ private:
void SetHeroicIntBonuses(StatBonuses* n);
void SetHeroicWisBonuses(StatBonuses* n);
void DoSpellInterrupt(uint16 spell_id, int32 mana_cost, int my_curmana);
void DoSpellInterrupt(int32 spell_id, int32 mana_cost, int my_curmana);
void HandleDoorOpen();
};
zone/mob_ai.cpp
+4 -4
View File
@@ -2379,7 +2379,7 @@ void NPC::CheckSignal() {
}
}
bool IsSpellInList(DBnpcspells_Struct* spell_list, uint16 iSpellID);
bool IsSpellInList(DBnpcspells_Struct* spell_list, int32 iSpellID);
bool IsSpellEffectInList(DBnpcspellseffects_Struct* spelleffect_list, uint16 iSpellEffectID, int32 base_value, int32 limit, int32 max_value);
bool NPC::AI_AddNPCSpells(uint32 iDBSpellsID) {
@@ -2678,14 +2678,14 @@ bool IsSpellEffectInList(DBnpcspellseffects_Struct* spelleffect_list, uint16 iSp
return false;
}
bool IsSpellInList(DBnpcspells_Struct* spell_list, uint16 iSpellID) {
bool IsSpellInList(DBnpcspells_Struct* spell_list, int32 iSpellID) {
auto it = std::find_if(spell_list->entries.begin(), spell_list->entries.end(),
[iSpellID](const DBnpcspells_entries_Struct &a) { return a.spellid == iSpellID; });
return it != spell_list->entries.end();
}
// adds a spell to the list, taking into account priority and resorting list as needed.
void NPC::AddSpellToNPCList(int16 iPriority, uint16 iSpellID, uint32 iType,
void NPC::AddSpellToNPCList(int16 iPriority, int32 iSpellID, uint32 iType,
int16 iManaCost, int32 iRecastDelay, int16 iResistAdjust, int8 min_hp, int8 max_hp)
{
@@ -2712,7 +2712,7 @@ void NPC::AddSpellToNPCList(int16 iPriority, uint16 iSpellID, uint32 iType,
AIautocastspell_timer->Start(RandomTimer(0, 300), false);
}
void NPC::RemoveSpellFromNPCList(uint16 spell_id)
void NPC::RemoveSpellFromNPCList(int32 spell_id)
{
auto iter = AIspells.begin();
while(iter != AIspells.end())
zone/npc.h
+13 -13
View File
@@ -45,7 +45,7 @@ struct NPCProximity {
struct AISpells_Struct {
uint32 type; // 0 = never, must be one (and only one) of the defined values
uint16 spellid; // <= 0 = no spell
int32 spellid; // <= 0 = no spell
int16 manacost; // -1 = use spdat, -2 = no cast time
uint32 time_cancast; // when we can cast this spell next
int32 recast_delay;
@@ -123,8 +123,8 @@ public:
static NPC * SpawnZonePointNodeNPC(std::string name, const glm::vec4 &position);
//abstract virtual function implementations requird by base abstract class
virtual bool Death(Mob* killer_mob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false);
virtual void Damage(Mob* from, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None);
virtual bool Death(Mob* killer_mob, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, KilledByTypes killed_by = KilledByTypes::Killed_NPC, bool is_buff_tic = false);
virtual void Damage(Mob* from, int64 damage, int32 spell_id, EQ::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None);
bool Attack(Mob* other, int Hand = EQ::invslot::slotPrimary, bool FromRiposte = false, bool IsStrikethrough = false,
bool IsFromSpell = false, ExtraAttackOptions *opts = nullptr) override;
virtual bool HasRaid() { return false; }
@@ -308,7 +308,7 @@ public:
float GetAttackSpeed() const {return attack_speed;}
int GetAttackDelay() const {return attack_delay;}
bool IsAnimal() const { return(bodytype == BodyType::Animal); }
uint16 GetPetSpellID() const {return pet_spell_id;}
int32 GetPetSpellID() const {return pet_spell_id;}
void SetPetSpellID(uint16 amt) {pet_spell_id = amt;}
uint32 GetMaxDamage(uint8 tlevel);
void SetTaunting(bool is_taunting);
@@ -433,7 +433,7 @@ public:
uint8 GetLDoNTrapType() const { return ldon_trap_type; }
void SetLDoNTrapType(uint8 n) { ldon_trap_type = n; }
uint16 GetLDoNTrapSpellID() const { return ldon_spell_id; }
int32 GetLDoNTrapSpellID() const { return ldon_spell_id; }
void SetLDoNTrapSpellID(uint16 n) { ldon_spell_id = n; }
bool IsLDoNLocked() const { return ldon_locked; }
@@ -465,9 +465,9 @@ public:
void NPCSlotTexture(uint8 slot, uint32 texture); // Sets new material values for slots
uint32 GetAdventureTemplate() const { return adventure_template_id; }
void AddSpellToNPCList(int16 iPriority, uint16 iSpellID, uint32 iType, int16 iManaCost, int32 iRecastDelay, int16 iResistAdjust, int8 min_hp, int8 max_hp);
void AddSpellToNPCList(int16 iPriority, int32 iSpellID, uint32 iType, int16 iManaCost, int32 iRecastDelay, int16 iResistAdjust, int8 min_hp, int8 max_hp);
void AddSpellEffectToNPCList(uint16 iSpellEffectID, int32 base_value, int32 limit, int32 max_value, bool apply_bonus = false);
void RemoveSpellFromNPCList(uint16 spell_id);
void RemoveSpellFromNPCList(int32 spell_id);
void RemoveSpellEffectFromNPCList(uint16 iSpellEffectID, bool apply_bonus = false);
bool HasAISpellEffect(uint16 spell_effect_id);
Timer *GetRefaceTimer() const { return reface_timer; }
@@ -494,7 +494,7 @@ public:
uint32 GetSpawnKillCount();
int GetScore();
void AISpellsList(Client *c);
uint16 GetInnateProcSpellID() const { return innate_proc_spell_id; }
int32 GetInnateProcSpellID() const { return innate_proc_spell_id; }
uint32 GetHeroForgeModel() const { return herosforgemodel; }
void SetHeroForgeModel(uint32 model) { herosforgemodel = model; }
@@ -680,7 +680,7 @@ protected:
Timer enraged_timer;
Timer *reface_timer;
uint32 npc_spells_id;
int32 npc_spells_id;
uint8 casting_spell_AIindex;
std::vector<AISpells_Struct> AIspells;
@@ -688,8 +688,8 @@ protected:
virtual bool AICastSpell(Mob* tar, uint8 iChance, uint32 iSpellTypes, bool bInnates = false);
virtual bool AIDoSpellCast(int32 i, Mob* tar, int32 mana_cost, uint32* oDontDoAgainBefore = 0);
AISpellsVar_Struct AISpellVar;
int64 GetFocusEffect(focusType type, uint16 spell_id, Mob *caster = nullptr, bool from_buff_tic = false) override;
uint16 innate_proc_spell_id;
int64 GetFocusEffect(focusType type, int32 spell_id, Mob *caster = nullptr, bool from_buff_tic = false) override;
int32 innate_proc_spell_id;
uint32 npc_spells_effects_id;
std::vector<AISpellsEffects_Struct> AIspellsEffects;
@@ -729,7 +729,7 @@ protected:
int charm_atk;
//pet crap:
uint16 pet_spell_id;
int32 pet_spell_id;
bool taunting;
Timer taunt_timer; //for pet taunting
@@ -764,7 +764,7 @@ protected:
bool ldon_trapped;
uint8 ldon_trap_type;
uint16 ldon_spell_id;
int32 ldon_spell_id;
bool ldon_locked;
uint16 ldon_locked_skill;
bool ldon_trap_detected;
zone/perl_bot.cpp
+19 -19
View File
@@ -213,7 +213,7 @@ bool Perl_Bot_IsSitting(Bot* self) // @categories Account and Character
return self->IsSitting();
}
void Perl_Bot_SendSpellAnim(Bot* self, uint16 target_id, uint16 spell_id)
void Perl_Bot_SendSpellAnim(Bot* self, uint16 target_id, int32 spell_id)
{
self->SendSpellAnim(target_id, spell_id);
}
@@ -278,7 +278,7 @@ uint32 Perl_Bot_GetSpellRecastTimer(Bot* self)
return self->GetSpellRecastRemainingTime();
}
uint32 Perl_Bot_GetSpellRecastTimer(Bot* self, uint16 spell_id)
uint32 Perl_Bot_GetSpellRecastTimer(Bot* self, int32 spell_id)
{
return self->GetSpellRecastRemainingTime(spell_id);
}
@@ -288,7 +288,7 @@ void Perl_Bot_ClearSpellRecastTimer(Bot* self)
return self->ClearSpellRecastTimer();
}
void Perl_Bot_ClearSpellRecastTimer(Bot* self, uint16 spell_id)
void Perl_Bot_ClearSpellRecastTimer(Bot* self, int32 spell_id)
{
return self->ClearSpellRecastTimer(spell_id);
}
@@ -298,7 +298,7 @@ uint32 Perl_Bot_GetDisciplineReuseTimer(Bot* self)
return self->GetDisciplineReuseRemainingTime();
}
uint32 Perl_Bot_GetDisciplineReuseTimer(Bot* self, uint16 spell_id)
uint32 Perl_Bot_GetDisciplineReuseTimer(Bot* self, int32 spell_id)
{
return self->GetDisciplineReuseRemainingTime(spell_id);
}
@@ -308,17 +308,17 @@ void Perl_Bot_ClearDisciplineReuseTimer(Bot* self)
return self->ClearDisciplineReuseTimer();
}
void Perl_Bot_ClearDisciplineReuseTimer(Bot* self, uint16 spell_id)
void Perl_Bot_ClearDisciplineReuseTimer(Bot* self, int32 spell_id)
{
return self->ClearDisciplineReuseTimer(spell_id);
}
void Perl_Bot_SetDisciplineReuseTimer(Bot* self, uint16 spell_id)
void Perl_Bot_SetDisciplineReuseTimer(Bot* self, int32 spell_id)
{
return self->SetDisciplineReuseTimer(spell_id);
}
void Perl_Bot_SetDisciplineReuseTimer(Bot* self, uint16 spell_id, uint32 recast_delay)
void Perl_Bot_SetDisciplineReuseTimer(Bot* self, int32 spell_id, uint32 recast_delay)
{
return self->SetDisciplineReuseTimer(spell_id);
}
@@ -333,12 +333,12 @@ void Perl_Bot_SetItemReuseTimer(Bot* self, uint32 item_id, uint32 reuse_timer)
return self->SetItemReuseTimer(item_id, reuse_timer);
}
void Perl_Bot_SetSpellRecastTimer(Bot* self, uint16 spell_id)
void Perl_Bot_SetSpellRecastTimer(Bot* self, int32 spell_id)
{
return self->SetSpellRecastTimer(spell_id);
}
void Perl_Bot_SetSpellRecastTimer(Bot* self, uint16 spell_id, uint32 recast_delay)
void Perl_Bot_SetSpellRecastTimer(Bot* self, int32 spell_id, uint32 recast_delay)
{
return self->SetSpellRecastTimer(spell_id, recast_delay);
}
@@ -423,7 +423,7 @@ int Perl_Bot_GetSpellDamage(Bot* self)
return self->GetSpellDmg();
}
int Perl_Bot_GetInstrumentMod(Bot* self, uint16 spell_id) // @categories Spells and Disciplines
int Perl_Bot_GetInstrumentMod(Bot* self, int32 spell_id) // @categories Spells and Disciplines
{
return self->GetInstrumentMod(spell_id);
}
@@ -528,7 +528,7 @@ void Perl_Bot_ReloadBotSpellSettings(Bot* self)
self->LoadBotSpellSettings();
}
bool Perl_Bot_HasBotSpellEntry(Bot* self, uint16 spellid)
bool Perl_Bot_HasBotSpellEntry(Bot* self, int32 spellid)
{
return self->HasBotSpellEntry(spellid);
}
@@ -671,11 +671,11 @@ void perl_register_bot()
package.add("Camp", (void(*)(Bot*))&Perl_Bot_Camp);
package.add("Camp", (void(*)(Bot*, bool))&Perl_Bot_Camp);
package.add("ClearDisciplineReuseTimer", (void(*)(Bot*))&Perl_Bot_ClearDisciplineReuseTimer);
package.add("ClearDisciplineReuseTimer", (void(*)(Bot*, uint16))&Perl_Bot_ClearDisciplineReuseTimer);
package.add("ClearDisciplineReuseTimer", (void(*)(Bot*, int32))&Perl_Bot_ClearDisciplineReuseTimer);
package.add("ClearItemReuseTimer", (void(*)(Bot*))&Perl_Bot_ClearItemReuseTimer);
package.add("ClearItemReuseTimer", (void(*)(Bot*, uint32))&Perl_Bot_ClearItemReuseTimer);
package.add("ClearSpellRecastTimer", (void(*)(Bot*))&Perl_Bot_ClearSpellRecastTimer);
package.add("ClearSpellRecastTimer", (void(*)(Bot*, uint16))&Perl_Bot_ClearSpellRecastTimer);
package.add("ClearSpellRecastTimer", (void(*)(Bot*, int32))&Perl_Bot_ClearSpellRecastTimer);
package.add("CountAugmentEquippedByID", &Perl_Bot_CountAugmentEquippedByID);
package.add("CountBotItem", &Perl_Bot_CountBotItem);
package.add("CountItemEquippedByID", &Perl_Bot_CountItemEquippedByID);
@@ -716,12 +716,12 @@ void perl_register_bot()
package.add("HasBotSpellEntry", &Perl_Bot_HasBotSpellEntry);
package.add("HasItemEquippedByID", &Perl_Bot_HasItemEquippedByID);
package.add("GetDisciplineReuseTimer", (uint32(*)(Bot*))&Perl_Bot_GetDisciplineReuseTimer);
package.add("GetDisciplineReuseTimer", (uint32(*)(Bot*, uint16))&Perl_Bot_GetDisciplineReuseTimer);
package.add("GetDisciplineReuseTimer", (uint32(*)(Bot*, int32))&Perl_Bot_GetDisciplineReuseTimer);
package.add("GetItemEquippedByID", &Perl_Bot_HasItemEquippedByID);
package.add("GetItemReuseTimer", (uint32(*)(Bot*))&Perl_Bot_GetItemReuseTimer);
package.add("GetItemReuseTimer", (uint32(*)(Bot*, uint32))&Perl_Bot_GetItemReuseTimer);
package.add("GetSpellRecastTimer", (uint32(*)(Bot*))&Perl_Bot_GetSpellRecastTimer);
package.add("GetSpellRecastTimer", (uint32(*)(Bot*, uint16))&Perl_Bot_GetSpellRecastTimer);
package.add("GetSpellRecastTimer", (uint32(*)(Bot*, int32))&Perl_Bot_GetSpellRecastTimer);
package.add("IsGrouped", &Perl_Bot_IsGrouped);
package.add("IsSitting", &Perl_Bot_IsSitting);
package.add("IsStanding", &Perl_Bot_IsStanding);
@@ -735,8 +735,8 @@ void perl_register_bot()
package.add("SendPayload", (void(*)(Bot*, int, std::string))&Perl_Bot_SendPayload);
package.add("SendSpellAnim", &Perl_Bot_SendSpellAnim);
package.add("SetExpansionBitmask", (void(*)(Bot*, int))&Perl_Bot_SetExpansionBitmask);
package.add("SetDisciplineReuseTimer", (void(*)(Bot*, uint16))&Perl_Bot_SetDisciplineReuseTimer);
package.add("SetDisciplineReuseTimer", (void(*)(Bot*, uint16, uint32))&Perl_Bot_SetDisciplineReuseTimer);
package.add("SetDisciplineReuseTimer", (void(*)(Bot*, int32))&Perl_Bot_SetDisciplineReuseTimer);
package.add("SetDisciplineReuseTimer", (void(*)(Bot*, int32, uint32))&Perl_Bot_SetDisciplineReuseTimer);
package.add("SetItemReuseTimer", (void(*)(Bot*, uint32))&Perl_Bot_SetItemReuseTimer);
package.add("SetItemReuseTimer", (void(*)(Bot*, uint32, uint32))&Perl_Bot_SetItemReuseTimer);
package.add("SetSpellDuration", (void(*)(Bot*, int))&Perl_Bot_SetSpellDuration);
@@ -752,8 +752,8 @@ void perl_register_bot()
package.add("SetSpellDurationRaid", (void(*)(Bot*, int, int, int))&Perl_Bot_SetSpellDurationRaid);
package.add("SetSpellDurationRaid", (void(*)(Bot*, int, int, int, bool))&Perl_Bot_SetSpellDurationRaid);
package.add("SetSpellDurationRaid", (void(*)(Bot*, int, int, int, bool, bool))&Perl_Bot_SetSpellDurationRaid);
package.add("SetSpellRecastTimer", (void(*)(Bot*, uint16))&Perl_Bot_SetSpellRecastTimer);
package.add("SetSpellRecastTimer", (void(*)(Bot*, uint16, uint32))&Perl_Bot_SetSpellRecastTimer);
package.add("SetSpellRecastTimer", (void(*)(Bot*, int32))&Perl_Bot_SetSpellRecastTimer);
package.add("SetSpellRecastTimer", (void(*)(Bot*, int32, uint32))&Perl_Bot_SetSpellRecastTimer);
package.add("Signal", &Perl_Bot_Signal);
package.add("Sit", &Perl_Bot_Sit);
package.add("Stand", &Perl_Bot_Stand);
zone/perl_buff.cpp
+1 -1
View File
@@ -92,7 +92,7 @@ int16 Perl_Buff_GetRootBreakChance(Buffs_Struct* self)
return self->RootBreakChance;
}
uint16 Perl_Buff_GetSpellID(Buffs_Struct* self)
int32 Perl_Buff_GetSpellID(Buffs_Struct* self)
{
return self->spellid;
}
zone/perl_client.cpp
+26 -26
View File
@@ -515,7 +515,7 @@ void Perl_Client_AddSkill(Client* self, int skill_id, uint16 value) // @categori
self->AddSkill(static_cast<EQ::skills::SkillType>(skill_id), value);
}
void Perl_Client_CheckSpecializeIncrease(Client* self, uint16 spell_id) // @categories Spells and Disciplines
void Perl_Client_CheckSpecializeIncrease(Client* self, int32 spell_id) // @categories Spells and Disciplines
{
self->CheckSpecializeIncrease(spell_id);
}
@@ -585,12 +585,12 @@ void Perl_Client_ResetAA(Client* self) // @categories Alternative Advancement
self->ResetAA();
}
void Perl_Client_MemSpell(Client* self, uint16 spell_id, int slot) // @categories Spells and Disciplines
void Perl_Client_MemSpell(Client* self, int32 spell_id, int slot) // @categories Spells and Disciplines
{
self->MemSpell(spell_id, slot);
}
void Perl_Client_MemSpell(Client* self, uint16 spell_id, int slot, bool update_client) // @categories Spells and Disciplines
void Perl_Client_MemSpell(Client* self, int32 spell_id, int slot, bool update_client) // @categories Spells and Disciplines
{
self->MemSpell(spell_id, slot, update_client);
}
@@ -630,7 +630,7 @@ int Perl_Client_FindMemmedSpellBySlot(Client* self, int slot) // @categories Acc
return self->FindMemmedSpellBySlot(slot);
}
int Perl_Client_FindMemmedSpellBySpellID(Client* self, uint16 spell_id) // @categories Account and Character, Spells and Disciplines
int Perl_Client_FindMemmedSpellBySpellID(Client* self, int32 spell_id) // @categories Account and Character, Spells and Disciplines
{
return self->FindMemmedSpellBySpellID(spell_id);
}
@@ -640,12 +640,12 @@ int Perl_Client_MemmedCount(Client* self) // @categories Spells and Disciplines
return self->MemmedCount();
}
void Perl_Client_ScribeSpell(Client* self, uint16 spell_id, int slot) // @categories Spells and Disciplines
void Perl_Client_ScribeSpell(Client* self, int32 spell_id, int slot) // @categories Spells and Disciplines
{
self->ScribeSpell(spell_id, slot);
}
void Perl_Client_ScribeSpell(Client* self, uint16 spell_id, int slot, bool update_client) // @categories Spells and Disciplines
void Perl_Client_ScribeSpell(Client* self, int32 spell_id, int slot, bool update_client) // @categories Spells and Disciplines
{
self->ScribeSpell(spell_id, slot, update_client);
}
@@ -915,7 +915,7 @@ bool Perl_Client_Thirsty(Client* self) // @categories Script Utility
return self->Thirsty();
}
int Perl_Client_GetInstrumentMod(Client* self, uint16 spell_id) // @categories Spells and Disciplines
int Perl_Client_GetInstrumentMod(Client* self, int32 spell_id) // @categories Spells and Disciplines
{
return self->GetInstrumentMod(spell_id);
}
@@ -970,7 +970,7 @@ void Perl_Client_ResetTrade(Client* self) // @categories Script Utility
self->ResetTrade();
}
bool Perl_Client_UseDiscipline(Client* self, uint32 spell_id, uint32 target) // @categories Spells and Disciplines
bool Perl_Client_UseDiscipline(Client* self, int32 spell_id, uint32 target) // @categories Spells and Disciplines
{
return self->UseDiscipline(spell_id, target);
}
@@ -1262,7 +1262,7 @@ void Perl_Client_SetEndurance(Client* self, int endurance) // @categories Accoun
self->SetEndurance(endurance);
}
void Perl_Client_SendOPTranslocateConfirm(Client* self, Mob* caster, uint16 spell_id) // @categories Script Utility
void Perl_Client_SendOPTranslocateConfirm(Client* self, Mob* caster, int32 spell_id) // @categories Script Utility
{
self->SendOPTranslocateConfirm(caster, spell_id);
}
@@ -1342,12 +1342,12 @@ int Perl_Client_GetFreeSpellBookSlot(Client* self, uint32 start_slot) // @catego
return self->GetNextAvailableSpellBookSlot(start_slot);
}
int Perl_Client_GetSpellBookSlotBySpellID(Client* self, uint32 spell_id) // @categories Spells and Disciplines
int Perl_Client_GetSpellBookSlotBySpellID(Client* self, int32 spell_id) // @categories Spells and Disciplines
{
return self->FindSpellBookSlotBySpellID(spell_id);
}
uint32_t Perl_Client_GetSpellIDByBookSlot(Client* self, int slot_id)
int32_t Perl_Client_GetSpellIDByBookSlot(Client* self, int slot_id)
{
return self->GetSpellIDByBookSlot(slot_id);
}
@@ -1617,7 +1617,7 @@ void Perl_Client_SendColoredText(Client* self, uint32 color, std::string msg) //
self->SendColoredText(color, std::move(msg));
}
void Perl_Client_SendSpellAnim(Client* self, uint16 targetid, uint16 spell_id)
void Perl_Client_SendSpellAnim(Client* self, uint16 targetid, int32 spell_id)
{
self->SendSpellAnim(targetid, spell_id);
}
@@ -2013,7 +2013,7 @@ void Perl_Client_Fling(Client* self, float value, float target_x, float target_y
self->Fling(value, target_x, target_y, target_z, ignore_los, clip_through_walls);
}
bool Perl_Client_HasDisciplineLearned(Client* self, uint16 spell_id)
bool Perl_Client_HasDisciplineLearned(Client* self, int32 spell_id)
{
return self->HasDisciplineLearned(spell_id);
}
@@ -2267,12 +2267,12 @@ void Perl_Client_ReadBookByName(Client* self, std::string book_name, uint8 book_
self->ReadBookByName(book_name, book_type);
}
void Perl_Client_UntrainDiscBySpellID(Client* self, uint16 spell_id) // @categories Spells and Disciplines
void Perl_Client_UntrainDiscBySpellID(Client* self, int32 spell_id) // @categories Spells and Disciplines
{
self->UntrainDiscBySpellID(spell_id);
}
void Perl_Client_UntrainDiscBySpellID(Client* self, uint16 spell_id, bool update_client) // @categories Spells and Disciplines
void Perl_Client_UntrainDiscBySpellID(Client* self, int32 spell_id, bool update_client) // @categories Spells and Disciplines
{
self->UntrainDiscBySpellID(spell_id, update_client);
}
@@ -2343,17 +2343,17 @@ void Perl_Client_ResetAllCastbarCooldowns(Client* self)
self->ResetAllCastbarCooldowns();
}
void Perl_Client_ResetCastbarCooldownBySpellID(Client* self, uint32 spell_id)
void Perl_Client_ResetCastbarCooldownBySpellID(Client* self, int32 spell_id)
{
self->ResetCastbarCooldownBySpellID(spell_id);
}
void Perl_Client_UnscribeSpellBySpellID(Client* self, uint16 spell_id)
void Perl_Client_UnscribeSpellBySpellID(Client* self, int32 spell_id)
{
self->UnscribeSpellBySpellID(spell_id);
}
void Perl_Client_UnscribeSpellBySpellID(Client* self, uint16 spell_id, bool update_client)
void Perl_Client_UnscribeSpellBySpellID(Client* self, int32 spell_id, bool update_client)
{
self->UnscribeSpellBySpellID(spell_id, update_client);
}
@@ -3727,8 +3727,8 @@ void perl_register_client()
package.add("MaxSkill", (int(*)(Client*, uint16, uint16))&Perl_Client_MaxSkill);
package.add("MaxSkill", (int(*)(Client*, uint16, uint16, uint16))&Perl_Client_MaxSkill);
package.add("MaxSkills", &Perl_Client_MaxSkills);
package.add("MemSpell", (void(*)(Client*, uint16, int))&Perl_Client_MemSpell);
package.add("MemSpell", (void(*)(Client*, uint16, int, bool))&Perl_Client_MemSpell);
package.add("MemSpell", (void(*)(Client*, int32, int))&Perl_Client_MemSpell);
package.add("MemSpell", (void(*)(Client*, int32, int, bool))&Perl_Client_MemSpell);
package.add("MemmedCount", &Perl_Client_MemmedCount);
package.add("MovePC", &Perl_Client_MovePC);
package.add("MovePCDynamicZone", (void(*)(Client*, perl::scalar))&Perl_Client_MovePCDynamicZone);
@@ -3804,8 +3804,8 @@ void perl_register_client()
package.add("ResetLeadershipAA", &Perl_Client_ResetLeadershipAA);
package.add("ResetTrade", &Perl_Client_ResetTrade);
package.add("Save", &Perl_Client_Save);
package.add("ScribeSpell", (void(*)(Client*, uint16, int))&Perl_Client_ScribeSpell);
package.add("ScribeSpell", (void(*)(Client*, uint16, int, bool))&Perl_Client_ScribeSpell);
package.add("ScribeSpell", (void(*)(Client*, int32, int))&Perl_Client_ScribeSpell);
package.add("ScribeSpell", (void(*)(Client*, int32, int, bool))&Perl_Client_ScribeSpell);
package.add("ScribeSpells", &Perl_Client_ScribeSpells);
package.add("SendColoredText", &Perl_Client_SendColoredText);
package.add("SendGMCommand", (bool(*)(Client*, std::string))&Perl_Client_SendGMCommand);
@@ -3966,14 +3966,14 @@ void perl_register_client()
package.add("UnscribeSpell", (void(*)(Client*, int, bool))&Perl_Client_UnscribeSpell);
package.add("UnscribeSpellAll", (void(*)(Client*))&Perl_Client_UnscribeSpellAll);
package.add("UnscribeSpellAll", (void(*)(Client*, bool))&Perl_Client_UnscribeSpellAll);
package.add("UnscribeSpellBySpellID", (void(*)(Client*, uint16))&Perl_Client_UnscribeSpellBySpellID);
package.add("UnscribeSpellBySpellID", (void(*)(Client*, uint16, bool))&Perl_Client_UnscribeSpellBySpellID);
package.add("UnscribeSpellBySpellID", (void(*)(Client*, int32 ))&Perl_Client_UnscribeSpellBySpellID);
package.add("UnscribeSpellBySpellID", (void(*)(Client*, int32, bool))&Perl_Client_UnscribeSpellBySpellID);
package.add("UntrainDisc", (void(*)(Client*, int))&Perl_Client_UntrainDisc);
package.add("UntrainDisc", (void(*)(Client*, int, bool))&Perl_Client_UntrainDisc);
package.add("UntrainDiscAll", (void(*)(Client*))&Perl_Client_UntrainDiscAll);
package.add("UntrainDiscAll", (void(*)(Client*, bool))&Perl_Client_UntrainDiscAll);
package.add("UntrainDiscBySpellID", (void(*)(Client*, uint16))&Perl_Client_UntrainDiscBySpellID);
package.add("UntrainDiscBySpellID", (void(*)(Client*, uint16, bool))&Perl_Client_UntrainDiscBySpellID);
package.add("UntrainDiscBySpellID", (void(*)(Client*, int32 ))&Perl_Client_UntrainDiscBySpellID);
package.add("UntrainDiscBySpellID", (void(*)(Client*, int32, bool))&Perl_Client_UntrainDiscBySpellID);
package.add("UpdateAdmin", (void(*)(Client*))&Perl_Client_UpdateAdmin);
package.add("UpdateAdmin", (void(*)(Client*, bool))&Perl_Client_UpdateAdmin);
package.add("UpdateGroupAAs", &Perl_Client_UpdateGroupAAs);
zone/perl_entity.cpp
+12 -12
View File
@@ -714,22 +714,22 @@ void Perl_EntityList_AreaAttack(EntityList* self, Mob* attacker, float distance,
self->AEAttack(attacker, distance, slot_id, count, is_from_spell, attack_rounds);
}
void Perl_EntityList_AreaSpell(EntityList* self, Mob* caster, Mob* center, uint16 spell_id)
void Perl_EntityList_AreaSpell(EntityList* self, Mob* caster, Mob* center, int32 spell_id)
{
self->AESpell(caster, center, spell_id);
}
void Perl_EntityList_AreaSpell(EntityList* self, Mob* caster, Mob* center, uint16 spell_id, bool affect_caster)
void Perl_EntityList_AreaSpell(EntityList* self, Mob* caster, Mob* center, int32 spell_id, bool affect_caster)
{
self->AESpell(caster, center, spell_id, affect_caster);
}
void Perl_EntityList_AreaSpell(EntityList* self, Mob* caster, Mob* center, uint16 spell_id, bool affect_caster, int16 resist_adjust)
void Perl_EntityList_AreaSpell(EntityList* self, Mob* caster, Mob* center, int32 spell_id, bool affect_caster, int16 resist_adjust)
{
self->AESpell(caster, center, spell_id, affect_caster, resist_adjust);
}
void Perl_EntityList_AreaSpell(EntityList* self, Mob* caster, Mob* center, uint16 spell_id, bool affect_caster, int16 resist_adjust, int max_targets)
void Perl_EntityList_AreaSpell(EntityList* self, Mob* caster, Mob* center, int32 spell_id, bool affect_caster, int16 resist_adjust, int max_targets)
{
self->AESpell(caster, center, spell_id, affect_caster, resist_adjust, &max_targets);
}
@@ -749,12 +749,12 @@ void Perl_EntityList_AreaTaunt(EntityList* self, Client* caster, float range, in
self->AETaunt(caster, range, bonus_hate);
}
void Perl_EntityList_MassGroupBuff(EntityList* self, Mob* caster, Mob* center, uint16 spell_id)
void Perl_EntityList_MassGroupBuff(EntityList* self, Mob* caster, Mob* center, int32 spell_id)
{
self->MassGroupBuff(caster, center, spell_id);
}
void Perl_EntityList_MassGroupBuff(EntityList* self, Mob* caster, Mob* center, uint16 spell_id, bool affect_caster)
void Perl_EntityList_MassGroupBuff(EntityList* self, Mob* caster, Mob* center, int32 spell_id, bool affect_caster)
{
self->MassGroupBuff(caster, center, spell_id, affect_caster);
}
@@ -807,10 +807,10 @@ void perl_register_entitylist()
package.add("AreaAttack", (void(*)(EntityList*, Mob*, float, int16, int))&Perl_EntityList_AreaAttack);
package.add("AreaAttack", (void(*)(EntityList*, Mob*, float, int16, int, bool))&Perl_EntityList_AreaAttack);
package.add("AreaAttack", (void(*)(EntityList*, Mob*, float, int16, int, bool, int))&Perl_EntityList_AreaAttack);
package.add("AreaSpell", (void(*)(EntityList*, Mob*, Mob*, uint16))&Perl_EntityList_AreaSpell);
package.add("AreaSpell", (void(*)(EntityList*, Mob*, Mob*, uint16, bool))&Perl_EntityList_AreaSpell);
package.add("AreaSpell", (void(*)(EntityList*, Mob*, Mob*, uint16, bool, int16))&Perl_EntityList_AreaSpell);
package.add("AreaSpell", (void(*)(EntityList*, Mob*, Mob*, uint16, bool, int16, int))&Perl_EntityList_AreaSpell);
package.add("AreaSpell", (void(*)(EntityList*, Mob*, Mob*, int32))&Perl_EntityList_AreaSpell);
package.add("AreaSpell", (void(*)(EntityList*, Mob*, Mob*, int32, bool))&Perl_EntityList_AreaSpell);
package.add("AreaSpell", (void(*)(EntityList*, Mob*, Mob*, int32, bool, int16))&Perl_EntityList_AreaSpell);
package.add("AreaSpell", (void(*)(EntityList*, Mob*, Mob*, int32, bool, int16, int))&Perl_EntityList_AreaSpell);
package.add("AreaTaunt", (void(*)(EntityList*, Client*))&Perl_EntityList_AreaTaunt);
package.add("AreaTaunt", (void(*)(EntityList*, Client*, float))&Perl_EntityList_AreaTaunt);
package.add("AreaTaunt", (void(*)(EntityList*, Client*, float, int))&Perl_EntityList_AreaTaunt);
@@ -889,8 +889,8 @@ void perl_register_entitylist()
package.add("Marquee", (void(*)(EntityList*, uint32, std::string))&Perl_EntityList_Marquee);
package.add("Marquee", (void(*)(EntityList*, uint32, std::string, uint32))&Perl_EntityList_Marquee);
package.add("Marquee", (void(*)(EntityList*, uint32, uint32, uint32, uint32, uint32, std::string))&Perl_EntityList_Marquee);
package.add("MassGroupBuff", (void(*)(EntityList*, Mob*, Mob*, uint16))&Perl_EntityList_MassGroupBuff);
package.add("MassGroupBuff", (void(*)(EntityList*, Mob*, Mob*, uint16, bool))&Perl_EntityList_MassGroupBuff);
package.add("MassGroupBuff", (void(*)(EntityList*, Mob*, Mob*, int32))&Perl_EntityList_MassGroupBuff);
package.add("MassGroupBuff", (void(*)(EntityList*, Mob*, Mob*, int32, bool))&Perl_EntityList_MassGroupBuff);
package.add("Message", &Perl_EntityList_Message);
package.add("MessageClose", &Perl_EntityList_MessageClose);
package.add("MessageGroup", &Perl_EntityList_MessageGroup);
zone/perl_groups.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ bool Perl_Group_IsGroupMember(Group* self, const char* name) // @categories Acco
return self->IsGroupMember(name);
}
void Perl_Group_CastGroupSpell(Group* self, Mob* caster, uint16 spell_id) // @categories Account and Character, Script Utility, Group
void Perl_Group_CastGroupSpell(Group* self, Mob* caster, int32 spell_id) // @categories Account and Character, Script Utility, Group
{
self->CastGroupSpell(caster, spell_id);
}
zone/perl_merc.cpp
+1 -1
View File
@@ -167,7 +167,7 @@ bool Perl_Merc_Suspend(Merc* self)
return self->Suspend();
}
bool Perl_Merc_UseDiscipline(Merc* self, uint16 spell_id, uint16 target_id)
bool Perl_Merc_UseDiscipline(Merc* self, int32 spell_id, uint16 target_id)
{
return self->UseDiscipline(spell_id, target_id);
}
zone/perl_mob.cpp
+95 -95
View File
@@ -242,22 +242,22 @@ bool Perl_Mob_Attack(Mob* self, Mob* other, int hand, bool from_riposte) // @cat
return self->Attack(other, hand, from_riposte);
}
void Perl_Mob_Damage(Mob* self, Mob* from, int64_t damage, uint16_t spell_id, int attack_skill) // @categories Script Utility
void Perl_Mob_Damage(Mob* self, Mob* from, int64_t damage, int32_t spell_id, int attack_skill) // @categories Script Utility
{
self->Damage(from, damage, spell_id, static_cast<EQ::skills::SkillType>(attack_skill));
}
void Perl_Mob_Damage(Mob* self, Mob* from, int64_t damage, uint16_t spell_id, int attack_skill, bool avoidable) // @categories Script Utility
void Perl_Mob_Damage(Mob* self, Mob* from, int64_t damage, int32_t spell_id, int attack_skill, bool avoidable) // @categories Script Utility
{
self->Damage(from, damage, spell_id, static_cast<EQ::skills::SkillType>(attack_skill), avoidable);
}
void Perl_Mob_Damage(Mob* self, Mob* from, int64_t damage, uint16_t spell_id, int attack_skill, bool avoidable, int8_t buffslot) // @categories Script Utility
void Perl_Mob_Damage(Mob* self, Mob* from, int64_t damage, int32_t spell_id, int attack_skill, bool avoidable, int8_t buffslot) // @categories Script Utility
{
self->Damage(from, damage, spell_id, static_cast<EQ::skills::SkillType>(attack_skill), avoidable, buffslot);
}
void Perl_Mob_Damage(Mob* self, Mob* from, int64_t damage, uint16_t spell_id, int attack_skill, bool avoidable, int8_t buffslot, bool buff_tic) // @categories Script Utility
void Perl_Mob_Damage(Mob* self, Mob* from, int64_t damage, int32_t spell_id, int attack_skill, bool avoidable, int8_t buffslot, bool buff_tic) // @categories Script Utility
{
self->Damage(from, damage, spell_id, static_cast<EQ::skills::SkillType>(attack_skill), avoidable, buffslot, buff_tic);
}
@@ -373,12 +373,12 @@ void Perl_Mob_SetSeeInvisibleUndeadLevel(Mob* self, uint8 see_invis_undead_level
self->SetSeeInvisibleUndead(see_invis_undead_level);
}
bool Perl_Mob_FindBuff(Mob* self, uint16 spell_id) // @categories Spells and Disciplines, Script Utility
bool Perl_Mob_FindBuff(Mob* self, int32 spell_id) // @categories Spells and Disciplines, Script Utility
{
return self->FindBuff(spell_id);
}
bool Perl_Mob_FindBuff(Mob* self, uint16 spell_id, uint16 caster_id) // @categories Spells and Disciplines, Script Utility
bool Perl_Mob_FindBuff(Mob* self, int32 spell_id, uint16 caster_id) // @categories Spells and Disciplines, Script Utility
{
return self->FindBuff(spell_id, caster_id);
}
@@ -408,37 +408,37 @@ int Perl_Mob_GetBuffSlotFromType(Mob* self, uint16 type) // @categories Spells a
return self->GetBuffSlotFromType(type);
}
void Perl_Mob_MakePet(Mob* self, uint16 spell_id, const char* pet_type) // @categories Pet
void Perl_Mob_MakePet(Mob* self, int32 spell_id, const char* pet_type) // @categories Pet
{
self->MakePet(spell_id, pet_type);
}
void Perl_Mob_MakePet(Mob* self, uint16 spell_id, const char* pet_type, const char* name) // @categories Pet
void Perl_Mob_MakePet(Mob* self, int32 spell_id, const char* pet_type, const char* name) // @categories Pet
{
self->MakePet(spell_id, pet_type, name);
}
void Perl_Mob_MakeTempPet(Mob* self, uint16 spell_id) // @categories Pet
void Perl_Mob_MakeTempPet(Mob* self, int32 spell_id) // @categories Pet
{
self->TemporaryPets(spell_id, nullptr);
}
void Perl_Mob_MakeTempPet(Mob* self, uint16 spell_id, const char* name) // @categories Pet
void Perl_Mob_MakeTempPet(Mob* self, int32 spell_id, const char* name) // @categories Pet
{
self->TemporaryPets(spell_id, nullptr, name);
}
void Perl_Mob_MakeTempPet(Mob* self, uint16 spell_id, const char* name, uint32 duration) // @categories Pet
void Perl_Mob_MakeTempPet(Mob* self, int32 spell_id, const char* name, uint32 duration) // @categories Pet
{
self->TemporaryPets(spell_id, nullptr, name, duration);
}
void Perl_Mob_MakeTempPet(Mob* self, uint16 spell_id, const char* name, uint32 duration, Mob* target) // @categories Pet
void Perl_Mob_MakeTempPet(Mob* self, int32 spell_id, const char* name, uint32 duration, Mob* target) // @categories Pet
{
self->TemporaryPets(spell_id, target, name, duration);
}
void Perl_Mob_MakeTempPet(Mob* self, uint16 spell_id, const char* name, uint32 duration, Mob* target, bool sticktarg) // @categories Pet
void Perl_Mob_MakeTempPet(Mob* self, int32 spell_id, const char* name, uint32 duration, Mob* target, bool sticktarg) // @categories Pet
{
self->TemporaryPets(spell_id, target, name, duration, true, sticktarg);
}
@@ -633,7 +633,7 @@ int Perl_Mob_GetRunspeed(Mob* self) // @categories Stats and Attributes
return self->GetRunspeed();
}
int Perl_Mob_GetCasterLevel(Mob* self, uint16_t spell_id) // @categories Stats and Attributes
int Perl_Mob_GetCasterLevel(Mob* self, int32_t spell_id) // @categories Stats and Attributes
{
return self->GetCasterLevel(spell_id);
}
@@ -778,72 +778,72 @@ int Perl_Mob_GetMaxCHA(Mob* self) // @categories Stats and Attributes
return self->GetMaxCHA();
}
float Perl_Mob_GetActSpellRange(Mob* self, uint16 spell_id, float range) // @categories Spells and Disciplines
float Perl_Mob_GetActSpellRange(Mob* self, int32 spell_id, float range) // @categories Spells and Disciplines
{
return self->GetActSpellRange(spell_id, range);
}
int64_t Perl_Mob_GetActSpellDamage(Mob* self, uint16 spell_id, int64 value) // @categories Spells and Disciplines
int64_t Perl_Mob_GetActSpellDamage(Mob* self, int32 spell_id, int64 value) // @categories Spells and Disciplines
{
return self->GetActSpellDamage(spell_id, value);
}
int64_t Perl_Mob_GetActSpellDamage(Mob* self, uint16 spell_id, int64 value, Mob* target) // @categories Spells and Disciplines
int64_t Perl_Mob_GetActSpellDamage(Mob* self, int32 spell_id, int64 value, Mob* target) // @categories Spells and Disciplines
{
return self->GetActSpellDamage(spell_id, value, target);
}
int64_t Perl_Mob_GetActDoTDamage(Mob* self, uint16 spell_id, int64 value, Mob* target) // @categories Spells and Disciplines
int64_t Perl_Mob_GetActDoTDamage(Mob* self, int32 spell_id, int64 value, Mob* target) // @categories Spells and Disciplines
{
return self->GetActDoTDamage(spell_id, value, target);
}
int64_t Perl_Mob_GetActDoTDamage(Mob* self, uint16 spell_id, int64 value, Mob* target, bool from_buff_tic) // @categories Spells and Disciplines
int64_t Perl_Mob_GetActDoTDamage(Mob* self, int32 spell_id, int64 value, Mob* target, bool from_buff_tic) // @categories Spells and Disciplines
{
return self->GetActDoTDamage(spell_id, value, target, from_buff_tic);
}
int64_t Perl_Mob_GetActSpellHealing(Mob* self, uint16 spell_id, int64 value) // @categories Spells and Disciplines
int64_t Perl_Mob_GetActSpellHealing(Mob* self, int32 spell_id, int64 value) // @categories Spells and Disciplines
{
return self->GetActSpellHealing(spell_id, value);
}
int64_t Perl_Mob_GetActSpellHealing(Mob* self, uint16 spell_id, int64 value, Mob* target) // @categories Spells and Disciplines
int64_t Perl_Mob_GetActSpellHealing(Mob* self, int32 spell_id, int64 value, Mob* target) // @categories Spells and Disciplines
{
return self->GetActSpellHealing(spell_id, value, target);
}
int64_t Perl_Mob_GetActSpellHealing(Mob* self, uint16 spell_id, int64 value, Mob* target, bool from_buff_tic) // @categories Spells and Disciplines
int64_t Perl_Mob_GetActSpellHealing(Mob* self, int32 spell_id, int64 value, Mob* target, bool from_buff_tic) // @categories Spells and Disciplines
{
return self->GetActSpellHealing(spell_id, value, target, from_buff_tic);
}
int Perl_Mob_GetActSpellCost(Mob* self, uint16 spell_id, int32 cost) // @categories Spells and Disciplines
int Perl_Mob_GetActSpellCost(Mob* self, int32 spell_id, int32 cost) // @categories Spells and Disciplines
{
return self->GetActSpellCost(spell_id, cost);
}
int Perl_Mob_GetActSpellDuration(Mob* self, uint16 spell_id, int32 duration) // @categories Spells and Disciplines
int Perl_Mob_GetActSpellDuration(Mob* self, int32 spell_id, int32 duration) // @categories Spells and Disciplines
{
return self->GetActSpellDuration(spell_id, duration);
}
int Perl_Mob_GetActSpellCasttime(Mob* self, uint16 spell_id, uint32 cast_time) // @categories Spells and Disciplines
int Perl_Mob_GetActSpellCasttime(Mob* self, int32 spell_id, uint32 cast_time) // @categories Spells and Disciplines
{
return self->GetActSpellCasttime(spell_id, cast_time);
}
int64 Perl_Mob_GetActReflectedSpellDamage(Mob* self, uint16 spell_id, int64 value, int effectiveness) // @categories Spells and Disciplines
int64 Perl_Mob_GetActReflectedSpellDamage(Mob* self, int32 spell_id, int64 value, int effectiveness) // @categories Spells and Disciplines
{
return self->GetActReflectedSpellDamage(spell_id, value, effectiveness);
}
float Perl_Mob_ResistSpell(Mob* self, uint8 resist_type, uint16 spell_id, Mob* caster) // @categories Spells and Disciplines, Script Utility
float Perl_Mob_ResistSpell(Mob* self, uint8 resist_type, int32 spell_id, Mob* caster) // @categories Spells and Disciplines, Script Utility
{
return self->ResistSpell(resist_type, spell_id, caster);
}
int Perl_Mob_GetSpecializeSkillValue(Mob* self, uint16 spell_id) // @categories Skills and Recipes, Spells and Disciplines
int Perl_Mob_GetSpecializeSkillValue(Mob* self, int32 spell_id) // @categories Skills and Recipes, Spells and Disciplines
{
return self->GetSpecializeSkillValue(spell_id);
}
@@ -972,65 +972,65 @@ void Perl_Mob_InterruptSpell(Mob* self) // @categories Script Utility
self->InterruptSpell();
}
void Perl_Mob_InterruptSpell(Mob* self, uint16 spell_id) // @categories Script Utility
void Perl_Mob_InterruptSpell(Mob* self, int32 spell_id) // @categories Script Utility
{
self->InterruptSpell(spell_id);
}
void Perl_Mob_CastSpell(Mob* self, uint16 spell_id, uint16 target_id) // @categories Spells and Disciplines
void Perl_Mob_CastSpell(Mob* self, int32 spell_id, uint16 target_id) // @categories Spells and Disciplines
{
self->CastSpell(spell_id, target_id);
}
void Perl_Mob_CastSpell(Mob* self, uint16 spell_id, uint16 target_id, int slot) // @categories Spells and Disciplines
void Perl_Mob_CastSpell(Mob* self, int32 spell_id, uint16 target_id, int slot) // @categories Spells and Disciplines
{
self->CastSpell(spell_id, target_id, static_cast<EQ::spells::CastingSlot>(slot));
}
void Perl_Mob_CastSpell(Mob* self, uint16 spell_id, uint16 target_id, int slot, int cast_time) // @categories Spells and Disciplines
void Perl_Mob_CastSpell(Mob* self, int32 spell_id, uint16 target_id, int slot, int cast_time) // @categories Spells and Disciplines
{
self->CastSpell(spell_id, target_id, static_cast<EQ::spells::CastingSlot>(slot), cast_time);
}
void Perl_Mob_CastSpell(Mob* self, uint16 spell_id, uint16 target_id, int slot, int cast_time, int mana_cost) // @categories Spells and Disciplines
void Perl_Mob_CastSpell(Mob* self, int32 spell_id, uint16 target_id, int slot, int cast_time, int mana_cost) // @categories Spells and Disciplines
{
self->CastSpell(spell_id, target_id, static_cast<EQ::spells::CastingSlot>(slot), cast_time, mana_cost);
}
// args differ from lua api (item_slot, timer, timer_duration not supported)
void Perl_Mob_CastSpell(Mob* self, uint16 spell_id, uint16 target_id, int slot, int cast_time, int mana_cost, int16 resist_adjust) // @categories Spells and Disciplines
void Perl_Mob_CastSpell(Mob* self, int32 spell_id, uint16 target_id, int slot, int cast_time, int mana_cost, int16 resist_adjust) // @categories Spells and Disciplines
{
int16 res = resist_adjust;
self->CastSpell(spell_id, target_id, static_cast<EQ::spells::CastingSlot>(slot), cast_time, mana_cost, nullptr, 0xFFFFFFFF, 0xFFFFFFFF, 0, &res);
}
// these don't match lua api for default resist difficulty
void Perl_Mob_SpellFinished(Mob* self, uint16 spell_id) // @categories Spells and Disciplines
void Perl_Mob_SpellFinished(Mob* self, int32 spell_id) // @categories Spells and Disciplines
{
self->SpellFinished(spell_id, self, EQ::spells::CastingSlot::Item, 0, -1, spells[spell_id].resist_difficulty);
}
void Perl_Mob_SpellFinished(Mob* self, uint16 spell_id, Mob* target) // @categories Spells and Disciplines
void Perl_Mob_SpellFinished(Mob* self, int32 spell_id, Mob* target) // @categories Spells and Disciplines
{
self->SpellFinished(spell_id, target, EQ::spells::CastingSlot::Item, 0, -1, spells[spell_id].resist_difficulty);
}
void Perl_Mob_SpellFinished(Mob* self, uint16 spell_id, Mob* target, int32 mana_cost) // @categories Spells and Disciplines
void Perl_Mob_SpellFinished(Mob* self, int32 spell_id, Mob* target, int32 mana_cost) // @categories Spells and Disciplines
{
self->SpellFinished(spell_id, target, EQ::spells::CastingSlot::Item, mana_cost, -1, spells[spell_id].resist_difficulty);
}
void Perl_Mob_SpellFinished(Mob* self, uint16 spell_id, Mob* target, int32 mana_cost, uint16 resist_diff) // @categories Spells and Disciplines
void Perl_Mob_SpellFinished(Mob* self, int32 spell_id, Mob* target, int32 mana_cost, uint16 resist_diff) // @categories Spells and Disciplines
{
self->SpellFinished(spell_id, target, EQ::spells::CastingSlot::Item, mana_cost, -1, resist_diff);
}
bool Perl_Mob_IsImmuneToSpell(Mob* self, uint16 spell_id, Mob* caster) // @categories Spells and Disciplines, Script Utility
bool Perl_Mob_IsImmuneToSpell(Mob* self, int32 spell_id, Mob* caster) // @categories Spells and Disciplines, Script Utility
{
return self->IsImmuneToSpell(spell_id, caster);
}
void Perl_Mob_BuffFadeBySpellID(Mob* self, uint16 spell_id) // @categories Script Utility, Spells and Disciplines
void Perl_Mob_BuffFadeBySpellID(Mob* self, int32 spell_id) // @categories Script Utility, Spells and Disciplines
{
self->BuffFadeBySpellID(spell_id);
}
@@ -1060,12 +1060,12 @@ void Perl_Mob_BuffFadeBySlot(Mob* self, int slot, bool recalc_bonuses) // @categ
self->BuffFadeBySlot(slot, recalc_bonuses);
}
bool Perl_Mob_CanBuffStack(Mob* self, uint16 spell_id, uint8 caster_level) // @categories Script Utility, Spells and Disciplines
bool Perl_Mob_CanBuffStack(Mob* self, int32 spell_id, uint8 caster_level) // @categories Script Utility, Spells and Disciplines
{
return self->CanBuffStack(spell_id, caster_level);
}
bool Perl_Mob_CanBuffStack(Mob* self, uint16 spell_id, uint8 caster_level, bool fail_if_overwritten) // @categories Script Utility, Spells and Disciplines
bool Perl_Mob_CanBuffStack(Mob* self, int32 spell_id, uint8 caster_level, bool fail_if_overwritten) // @categories Script Utility, Spells and Disciplines
{
return self->CanBuffStack(spell_id, caster_level, fail_if_overwritten);
}
@@ -1535,17 +1535,17 @@ uint32_t Perl_Mob_GetZoneID(Mob* self) // @categories Zones
return self->GetZoneID();
}
int Perl_Mob_CheckAggroAmount(Mob* self, uint16 spell_id) // @categories Hate and Aggro
int Perl_Mob_CheckAggroAmount(Mob* self, int32 spell_id) // @categories Hate and Aggro
{
return self->CheckAggroAmount(spell_id, nullptr);
}
int Perl_Mob_CheckHealAggroAmount(Mob* self, uint16 spell_id) // @categories Hate and Aggro
int Perl_Mob_CheckHealAggroAmount(Mob* self, int32 spell_id) // @categories Hate and Aggro
{
return self->CheckHealAggroAmount(spell_id, nullptr);
}
int Perl_Mob_CheckHealAggroAmount(Mob* self, uint16 spell_id, uint32 possible) // @categories Hate and Aggro
int Perl_Mob_CheckHealAggroAmount(Mob* self, int32 spell_id, uint32 possible) // @categories Hate and Aggro
{
return self->CheckHealAggroAmount(spell_id, nullptr, possible);
}
@@ -2431,12 +2431,12 @@ int Perl_Mob_GetFlurryChance(Mob* self) // @categories Stats and Attributes
return self->GetFlurryChance();
}
int Perl_Mob_GetSpellStat(Mob* self, uint32 spell_id, const char* stat) // @categories Spells and Disciplines
int Perl_Mob_GetSpellStat(Mob* self, int32 spell_id, const char* stat) // @categories Spells and Disciplines
{
return self->GetSpellStat(spell_id, stat);
}
int Perl_Mob_GetSpellStat(Mob* self, uint32 spell_id, const char* stat, uint8 slot) // @categories Spells and Disciplines
int Perl_Mob_GetSpellStat(Mob* self, int32 spell_id, const char* stat, uint8 slot) // @categories Spells and Disciplines
{
return self->GetSpellStat(spell_id, stat, slot);
}
@@ -3539,32 +3539,32 @@ void Perl_Mob_AreaAttack(Mob* self, float distance, int16 slot_id, int count, bo
entity_list.AEAttack(self, distance, slot_id, count, is_from_spell, attack_rounds);
}
void Perl_Mob_AreaSpell(Mob* self, Mob* center, uint16 spell_id)
void Perl_Mob_AreaSpell(Mob* self, Mob* center, int32 spell_id)
{
entity_list.AESpell(self, center, spell_id, true, 0, nullptr, true);
}
void Perl_Mob_AreaSpell(Mob* self, Mob* center, uint16 spell_id, bool affect_caster)
void Perl_Mob_AreaSpell(Mob* self, Mob* center, int32 spell_id, bool affect_caster)
{
entity_list.AESpell(self, center, spell_id, affect_caster, 0, nullptr, true);
}
void Perl_Mob_AreaSpell(Mob* self, Mob* center, uint16 spell_id, bool affect_caster, int16 resist_adjust)
void Perl_Mob_AreaSpell(Mob* self, Mob* center, int32 spell_id, bool affect_caster, int16 resist_adjust)
{
entity_list.AESpell(self, center, spell_id, affect_caster, resist_adjust, nullptr, true);
}
void Perl_Mob_AreaSpell(Mob* self, Mob* center, uint16 spell_id, bool affect_caster, int16 resist_adjust, int max_targets)
void Perl_Mob_AreaSpell(Mob* self, Mob* center, int32 spell_id, bool affect_caster, int16 resist_adjust, int max_targets)
{
entity_list.AESpell(self, center, spell_id, affect_caster, resist_adjust, &max_targets, true);
}
void Perl_Mob_MassGroupBuff(Mob* self, Mob* center, uint16 spell_id)
void Perl_Mob_MassGroupBuff(Mob* self, Mob* center, int32 spell_id)
{
entity_list.MassGroupBuff(self, center, spell_id);
}
void Perl_Mob_MassGroupBuff(Mob* self, Mob* center, uint16 spell_id, bool affect_caster)
void Perl_Mob_MassGroupBuff(Mob* self, Mob* center, int32 spell_id, bool affect_caster)
{
entity_list.MassGroupBuff(self, center, spell_id, affect_caster);
}
@@ -3644,10 +3644,10 @@ void perl_register_mob()
package.add("AreaAttack", (void(*)(Mob*, float, int16, int))&Perl_Mob_AreaAttack);
package.add("AreaAttack", (void(*)(Mob*, float, int16, int, bool))&Perl_Mob_AreaAttack);
package.add("AreaAttack", (void(*)(Mob*, float, int16, int, bool, int))&Perl_Mob_AreaAttack);
package.add("AreaSpell", (void(*)(Mob*, Mob*, uint16))&Perl_Mob_AreaSpell);
package.add("AreaSpell", (void(*)(Mob*, Mob*, uint16, bool))&Perl_Mob_AreaSpell);
package.add("AreaSpell", (void(*)(Mob*, Mob*, uint16, bool, int16))&Perl_Mob_AreaSpell);
package.add("AreaSpell", (void(*)(Mob*, Mob*, uint16, bool, int16, int))&Perl_Mob_AreaSpell);
package.add("AreaSpell", (void(*)(Mob*, Mob*, int32))&Perl_Mob_AreaSpell);
package.add("AreaSpell", (void(*)(Mob*, Mob*, int32, bool))&Perl_Mob_AreaSpell);
package.add("AreaSpell", (void(*)(Mob*, Mob*, int32, bool, int16))&Perl_Mob_AreaSpell);
package.add("AreaSpell", (void(*)(Mob*, Mob*, int32, bool, int16, int))&Perl_Mob_AreaSpell);
package.add("Attack", (bool(*)(Mob*, Mob*))&Perl_Mob_Attack);
package.add("Attack", (bool(*)(Mob*, Mob*, int))&Perl_Mob_Attack);
package.add("Attack", (bool(*)(Mob*, Mob*, int, bool))&Perl_Mob_Attack);
@@ -3675,8 +3675,8 @@ void perl_register_mob()
package.add("CameraEffect", (void(*)(Mob*, uint32, float))&Perl_Mob_CameraEffect);
package.add("CameraEffect", (void(*)(Mob*, uint32, float, Client*))&Perl_Mob_CameraEffect);
package.add("CameraEffect", (void(*)(Mob*, uint32, float, perl::nullable<Client*>, bool))&Perl_Mob_CameraEffect);
package.add("CanBuffStack", (bool(*)(Mob*, uint16, uint8))&Perl_Mob_CanBuffStack);
package.add("CanBuffStack", (bool(*)(Mob*, uint16, uint8, bool))&Perl_Mob_CanBuffStack);
package.add("CanBuffStack", (bool(*)(Mob*, int32, uint8))&Perl_Mob_CanBuffStack);
package.add("CanBuffStack", (bool(*)(Mob*, int32, uint8, bool))&Perl_Mob_CanBuffStack);
package.add("CanClassEquipItem", &Perl_Mob_CanClassEquipItem);
package.add("CanRaceEquipItem", &Perl_Mob_CanRaceEquipItem);
package.add("CanThisClassDodge", &Perl_Mob_CanThisClassDodge);
@@ -3684,11 +3684,11 @@ void perl_register_mob()
package.add("CanThisClassDualWield", &Perl_Mob_CanThisClassDualWield);
package.add("CanThisClassParry", &Perl_Mob_CanThisClassParry);
package.add("CanThisClassRiposte", &Perl_Mob_CanThisClassRiposte);
package.add("CastSpell", (void(*)(Mob*, uint16, uint16))&Perl_Mob_CastSpell);
package.add("CastSpell", (void(*)(Mob*, uint16, uint16, int))&Perl_Mob_CastSpell);
package.add("CastSpell", (void(*)(Mob*, uint16, uint16, int, int))&Perl_Mob_CastSpell);
package.add("CastSpell", (void(*)(Mob*, uint16, uint16, int, int, int))&Perl_Mob_CastSpell);
package.add("CastSpell", (void(*)(Mob*, uint16, uint16, int, int, int, int16))&Perl_Mob_CastSpell);
package.add("CastSpell", (void(*)(Mob*, int32, uint16))&Perl_Mob_CastSpell);
package.add("CastSpell", (void(*)(Mob*, int32, uint16, int))&Perl_Mob_CastSpell);
package.add("CastSpell", (void(*)(Mob*, int32, uint16, int, int))&Perl_Mob_CastSpell);
package.add("CastSpell", (void(*)(Mob*, int32, uint16, int, int, int))&Perl_Mob_CastSpell);
package.add("CastSpell", (void(*)(Mob*, int32, uint16, int, int, int, int16))&Perl_Mob_CastSpell);
package.add("CastToBot", &Perl_Mob_CastToBot);
package.add("CastToClient", &Perl_Mob_CastToClient);
package.add("CastToCorpse", &Perl_Mob_CastToCorpse);
@@ -3700,8 +3700,8 @@ void perl_register_mob()
package.add("Charmed", &Perl_Mob_Charmed);
package.add("CheckAggro", &Perl_Mob_CheckAggro);
package.add("CheckAggroAmount", &Perl_Mob_CheckAggroAmount);
package.add("CheckHealAggroAmount", (int(*)(Mob*, uint16))&Perl_Mob_CheckHealAggroAmount);
package.add("CheckHealAggroAmount", (int(*)(Mob*, uint16, uint32))&Perl_Mob_CheckHealAggroAmount);
package.add("CheckHealAggroAmount", (int(*)(Mob*, int32))&Perl_Mob_CheckHealAggroAmount);
package.add("CheckHealAggroAmount", (int(*)(Mob*, int32, uint32))&Perl_Mob_CheckHealAggroAmount);
package.add("CheckLoS", &Perl_Mob_CheckLoS);
package.add("CheckLoSToLoc", (bool(*)(Mob*, float, float, float))&Perl_Mob_CheckLoSToLoc);
package.add("CheckLoSToLoc", (bool(*)(Mob*, float, float, float, float))&Perl_Mob_CheckLoSToLoc);
@@ -3712,10 +3712,10 @@ void perl_register_mob()
package.add("CloneAppearance", (void(*)(Mob*, Mob*, bool))&Perl_Mob_CloneAppearance);
package.add("CombatRange", &Perl_Mob_CombatRange);
package.add("CopyHateList", &Perl_Mob_CopyHateList);
package.add("Damage", (void(*)(Mob*, Mob*, int64, uint16_t, int))&Perl_Mob_Damage);
package.add("Damage", (void(*)(Mob*, Mob*, int64, uint16_t, int, bool))&Perl_Mob_Damage);
package.add("Damage", (void(*)(Mob*, Mob*, int64, uint16_t, int, bool, int8_t))&Perl_Mob_Damage);
package.add("Damage", (void(*)(Mob*, Mob*, int64, uint16_t, int, bool, int8_t, bool))&Perl_Mob_Damage);
package.add("Damage", (void(*)(Mob*, Mob*, int64, int32_t, int))&Perl_Mob_Damage);
package.add("Damage", (void(*)(Mob*, Mob*, int64, int32_t, int, bool))&Perl_Mob_Damage);
package.add("Damage", (void(*)(Mob*, Mob*, int64, int32_t, int, bool, int8_t))&Perl_Mob_Damage);
package.add("Damage", (void(*)(Mob*, Mob*, int64, int32_t, int, bool, int8_t, bool))&Perl_Mob_Damage);
package.add("DamageArea", (void(*)(Mob*, int64))&Perl_Mob_DamageArea);
package.add("DamageArea", (void(*)(Mob*, int64, uint32))&Perl_Mob_DamageArea);
package.add("DamageAreaBots", (void(*)(Mob*, int64))&Perl_Mob_DamageAreaBots);
@@ -3776,8 +3776,8 @@ void perl_register_mob()
package.add("EntityVariableExists", &Perl_Mob_EntityVariableExists);
package.add("FaceTarget", (void(*)(Mob*))&Perl_Mob_FaceTarget);
package.add("FaceTarget", (void(*)(Mob*, Mob*))&Perl_Mob_FaceTarget);
package.add("FindBuff", (bool(*)(Mob*, uint16))&Perl_Mob_FindBuff);
package.add("FindBuff", (bool(*)(Mob*, uint16, uint16))&Perl_Mob_FindBuff);
package.add("FindBuff", (bool(*)(Mob*, int32))&Perl_Mob_FindBuff);
package.add("FindBuff", (bool(*)(Mob*, int32, uint16))&Perl_Mob_FindBuff);
package.add("FindBuffBySlot", &Perl_Mob_FindBuffBySlot);
package.add("FindGroundZ", (float(*)(Mob*, float, float))&Perl_Mob_FindGroundZ);
package.add("FindGroundZ", (float(*)(Mob*, float, float, float))&Perl_Mob_FindGroundZ);
@@ -3794,17 +3794,17 @@ void perl_register_mob()
package.add("GetAC", &Perl_Mob_GetAC);
package.add("GetAGI", &Perl_Mob_GetAGI);
package.add("GetATK", &Perl_Mob_GetATK);
package.add("GetActDoTDamage", (int64_t(*)(Mob*, uint16, int64, Mob*))&Perl_Mob_GetActDoTDamage);
package.add("GetActDoTDamage", (int64_t(*)(Mob*, uint16, int64, Mob*, bool))&Perl_Mob_GetActDoTDamage);
package.add("GetActDoTDamage", (int64_t(*)(Mob*, int32, int64, Mob*))&Perl_Mob_GetActDoTDamage);
package.add("GetActDoTDamage", (int64_t(*)(Mob*, int32, int64, Mob*, bool))&Perl_Mob_GetActDoTDamage);
package.add("GetActReflectedSpellDamage", &Perl_Mob_GetActReflectedSpellDamage);
package.add("GetActSpellCasttime", &Perl_Mob_GetActSpellCasttime);
package.add("GetActSpellCost", &Perl_Mob_GetActSpellCost);
package.add("GetActSpellDamage", (int64_t(*)(Mob*, uint16, int64))&Perl_Mob_GetActSpellDamage);
package.add("GetActSpellDamage", (int64_t(*)(Mob*, uint16, int64, Mob*))&Perl_Mob_GetActSpellDamage);
package.add("GetActSpellDamage", (int64_t(*)(Mob*, int32, int64))&Perl_Mob_GetActSpellDamage);
package.add("GetActSpellDamage", (int64_t(*)(Mob*, int32, int64, Mob*))&Perl_Mob_GetActSpellDamage);
package.add("GetActSpellDuration", &Perl_Mob_GetActSpellDuration);
package.add("GetActSpellHealing", (int64_t(*)(Mob*, uint16, int64))&Perl_Mob_GetActSpellHealing);
package.add("GetActSpellHealing", (int64_t(*)(Mob*, uint16, int64, Mob*))&Perl_Mob_GetActSpellHealing);
package.add("GetActSpellHealing", (int64_t(*)(Mob*, uint16, int64, Mob*, bool))&Perl_Mob_GetActSpellHealing);
package.add("GetActSpellHealing", (int64_t(*)(Mob*, int32, int64))&Perl_Mob_GetActSpellHealing);
package.add("GetActSpellHealing", (int64_t(*)(Mob*, int32, int64, Mob*))&Perl_Mob_GetActSpellHealing);
package.add("GetActSpellHealing", (int64_t(*)(Mob*, int32, int64, Mob*, bool))&Perl_Mob_GetActSpellHealing);
package.add("GetActSpellRange", &Perl_Mob_GetActSpellRange);
package.add("GetAggroRange", &Perl_Mob_GetAggroRange);
package.add("GetAllowBeneficial", &Perl_Mob_GetAllowBeneficial);
@@ -3974,8 +3974,8 @@ void perl_register_mob()
package.add("GetSpellBonuses", &Perl_Mob_GetSpellBonuses);
package.add("GetSpellHPBonuses", &Perl_Mob_GetSpellHPBonuses);
package.add("GetSpellIDFromSlot", &Perl_Mob_GetSpellIDFromSlot);
package.add("GetSpellStat", (int(*)(Mob*, uint32, const char*))&Perl_Mob_GetSpellStat);
package.add("GetSpellStat", (int(*)(Mob*, uint32, const char*, uint8))&Perl_Mob_GetSpellStat);
package.add("GetSpellStat", (int(*)(Mob*, int32, const char*))&Perl_Mob_GetSpellStat);
package.add("GetSpellStat", (int(*)(Mob*, int32, const char*, uint8))&Perl_Mob_GetSpellStat);
package.add("GetTarget", &Perl_Mob_GetTarget);
package.add("GetTexture", &Perl_Mob_GetTexture);
package.add("GetTimerDurationMS", &Perl_Mob_GetTimerDurationMS);
@@ -4009,7 +4009,7 @@ void perl_register_mob()
package.add("HealDamage", (void(*)(Mob*, int64_t))&Perl_Mob_HealDamage);
package.add("HealDamage", (void(*)(Mob*, int64_t, Mob*))&Perl_Mob_HealDamage);
package.add("InterruptSpell", (void(*)(Mob*))&Perl_Mob_InterruptSpell);
package.add("InterruptSpell", (void(*)(Mob*, uint16))&Perl_Mob_InterruptSpell);
package.add("InterruptSpell", (void(*)(Mob*, int32))&Perl_Mob_InterruptSpell);
package.add("IsAIControlled", &Perl_Mob_IsAIControlled);
package.add("IsAlwaysAggro", &Perl_Mob_IsAlwaysAggro);
package.add("IsAmnesiad", &Perl_Mob_IsAmnesiad);
@@ -4074,15 +4074,15 @@ void perl_register_mob()
package.add("IsWarriorClass", &Perl_Mob_IsWarriorClass);
package.add("IsWisdomCasterClass", &Perl_Mob_IsWisdomCasterClass);
package.add("Kill", &Perl_Mob_Kill);
package.add("MakePet", (void(*)(Mob*, uint16, const char*))&Perl_Mob_MakePet);
package.add("MakePet", (void(*)(Mob*, uint16, const char*, const char*))&Perl_Mob_MakePet);
package.add("MakeTempPet", (void(*)(Mob*, uint16))&Perl_Mob_MakeTempPet);
package.add("MakeTempPet", (void(*)(Mob*, uint16, const char*))&Perl_Mob_MakeTempPet);
package.add("MakeTempPet", (void(*)(Mob*, uint16, const char*, uint32))&Perl_Mob_MakeTempPet);
package.add("MakeTempPet", (void(*)(Mob*, uint16, const char*, uint32, Mob*))&Perl_Mob_MakeTempPet);
package.add("MakeTempPet", (void(*)(Mob*, uint16, const char*, uint32, Mob*, bool))&Perl_Mob_MakeTempPet);
package.add("MassGroupBuff", (void(*)(Mob*, Mob*, uint16))&Perl_Mob_MassGroupBuff);
package.add("MassGroupBuff", (void(*)(Mob*, Mob*, uint16, bool))&Perl_Mob_MassGroupBuff);
package.add("MakePet", (void(*)(Mob*, int32, const char*))&Perl_Mob_MakePet);
package.add("MakePet", (void(*)(Mob*, int32, const char*, const char*))&Perl_Mob_MakePet);
package.add("MakeTempPet", (void(*)(Mob*, int32))&Perl_Mob_MakeTempPet);
package.add("MakeTempPet", (void(*)(Mob*, int32, const char*))&Perl_Mob_MakeTempPet);
package.add("MakeTempPet", (void(*)(Mob*, int32, const char*, uint32))&Perl_Mob_MakeTempPet);
package.add("MakeTempPet", (void(*)(Mob*, int32, const char*, uint32, Mob*))&Perl_Mob_MakeTempPet);
package.add("MakeTempPet", (void(*)(Mob*, int32, const char*, uint32, Mob*, bool))&Perl_Mob_MakeTempPet);
package.add("MassGroupBuff", (void(*)(Mob*, Mob*, int32))&Perl_Mob_MassGroupBuff);
package.add("MassGroupBuff", (void(*)(Mob*, Mob*, int32, bool))&Perl_Mob_MassGroupBuff);
package.add("Mesmerize", &Perl_Mob_Mesmerize);
package.add("Message", &Perl_Mob_Message);
package.add("Message_StringID", (void(*)(Mob*, uint32, uint32))&Perl_Mob_Message_StringID);
@@ -4248,10 +4248,10 @@ void perl_register_mob()
package.add("SpellEffect", (void(*)(Mob*, uint32, uint32, uint32, bool, uint32, bool, Client*))&Perl_Mob_SpellEffect);
package.add("SpellEffect", (void(*)(Mob*, uint32, uint32, uint32, bool, uint32, bool, perl::nullable<Client*>, uint32))&Perl_Mob_SpellEffect);
package.add("SpellEffect", (void(*)(Mob*, uint32, uint32, uint32, bool, uint32, bool, perl::nullable<Client*>, uint32, uint32))&Perl_Mob_SpellEffect);
package.add("SpellFinished", (void(*)(Mob*, uint16))&Perl_Mob_SpellFinished);
package.add("SpellFinished", (void(*)(Mob*, uint16, Mob*))&Perl_Mob_SpellFinished);
package.add("SpellFinished", (void(*)(Mob*, uint16, Mob*, int32))&Perl_Mob_SpellFinished);
package.add("SpellFinished", (void(*)(Mob*, uint16, Mob*, int32, uint16))&Perl_Mob_SpellFinished);
package.add("SpellFinished", (void(*)(Mob*, int32))&Perl_Mob_SpellFinished);
package.add("SpellFinished", (void(*)(Mob*, int32, Mob*))&Perl_Mob_SpellFinished);
package.add("SpellFinished", (void(*)(Mob*, int32, Mob*, int32))&Perl_Mob_SpellFinished);
package.add("SpellFinished", (void(*)(Mob*, int32, Mob*, int32, uint16))&Perl_Mob_SpellFinished);
package.add("Spin", &Perl_Mob_Spin);
package.add("StartEnrage", &Perl_Mob_StartEnrage);
package.add("StopNavigation", &Perl_Mob_StopNavigation);
zone/perl_npc.cpp
+13 -13
View File
@@ -476,17 +476,17 @@ float Perl_NPC_GetNPCStat(NPC* self, std::string stat) // @categories Stats and
return self->GetNPCStat(stat);
}
void Perl_NPC_AddSpellToNPCList(NPC* self, int16 priority, uint16_t spell_id, uint32 type, int mana_cost, int recast_delay, int16 resist_adjust) // @categories Spells and Disciplines, Script Utility
void Perl_NPC_AddSpellToNPCList(NPC* self, int16 priority, int32_t spell_id, uint32 type, int mana_cost, int recast_delay, int16 resist_adjust) // @categories Spells and Disciplines, Script Utility
{
self->AddSpellToNPCList(priority, spell_id, type, mana_cost, recast_delay, resist_adjust, 0, 0);
}
void Perl_NPC_AddSpellToNPCList(NPC* self, int16 priority, uint16_t spell_id, uint32 type, int mana_cost, int recast_delay, int16 resist_adjust, int8 min_hp, int8 max_hp) // @categories Spells and Disciplines, Script Utility
void Perl_NPC_AddSpellToNPCList(NPC* self, int16 priority, int32_t spell_id, uint32 type, int mana_cost, int recast_delay, int16 resist_adjust, int8 min_hp, int8 max_hp) // @categories Spells and Disciplines, Script Utility
{
self->AddSpellToNPCList(priority, spell_id, type, mana_cost, recast_delay, resist_adjust, min_hp, max_hp);
}
void Perl_NPC_RemoveSpellFromNPCList(NPC* self, uint16_t spell_id) // @categories Spells and Disciplines
void Perl_NPC_RemoveSpellFromNPCList(NPC* self, int32_t spell_id) // @categories Spells and Disciplines
{
self->RemoveSpellFromNPCList(spell_id);
}
@@ -556,32 +556,32 @@ void Perl_NPC_MerchantCloseShop(NPC* self) // @categories Script Utility
self->MerchantCloseShop();
}
void Perl_NPC_AddMeleeProc(NPC* self, uint16_t spell_id, uint16_t chance) // @categories Script Utility
void Perl_NPC_AddMeleeProc(NPC* self, int32_t spell_id, uint16_t chance) // @categories Script Utility
{
self->AddProcToWeapon(spell_id, true, chance);
}
void Perl_NPC_AddRangedProc(NPC* self, uint16_t spell_id, uint16_t chance) // @categories Script Utility
void Perl_NPC_AddRangedProc(NPC* self, int32_t spell_id, uint16_t chance) // @categories Script Utility
{
self->AddRangedProc(spell_id, chance);
}
void Perl_NPC_AddDefensiveProc(NPC* self, uint16_t spell_id, uint16_t chance) // @categories Script Utility
void Perl_NPC_AddDefensiveProc(NPC* self, int32_t spell_id, uint16_t chance) // @categories Script Utility
{
self->AddDefensiveProc(spell_id, chance);
}
void Perl_NPC_RemoveMeleeProc(NPC* self, uint16_t spell_id) // @categories Script Utility
void Perl_NPC_RemoveMeleeProc(NPC* self, int32_t spell_id) // @categories Script Utility
{
self->RemoveProcFromWeapon(spell_id, false);
}
void Perl_NPC_RemoveRangedProc(NPC* self, uint16_t spell_id) // @categories Script Utility
void Perl_NPC_RemoveRangedProc(NPC* self, int32_t spell_id) // @categories Script Utility
{
self->RemoveRangedProc(spell_id, false);
}
void Perl_NPC_RemoveDefensiveProc(NPC* self, uint16_t spell_id) // @categories Script Utility
void Perl_NPC_RemoveDefensiveProc(NPC* self, int32_t spell_id) // @categories Script Utility
{
self->RemoveDefensiveProc(spell_id, false);
}
@@ -732,12 +732,12 @@ void Perl_NPC_SetLDoNTrapType(NPC* self, uint8 trap_type)
self->SetLDoNTrapType(trap_type);
}
uint16 Perl_NPC_GetLDoNTrapSpellID(NPC* self)
int32 Perl_NPC_GetLDoNTrapSpellID(NPC* self)
{
return self->GetLDoNTrapSpellID();
}
void Perl_NPC_SetLDoNTrapSpellID(NPC* self, uint16 spell_id)
void Perl_NPC_SetLDoNTrapSpellID(NPC* self, int32 spell_id)
{
self->SetLDoNTrapSpellID(spell_id);
}
@@ -920,8 +920,8 @@ void perl_register_npc()
package.add("AI_SetRoambox", (void(*)(NPC*, float, float, float, float, float))&Perl_NPC_AI_SetRoambox);
package.add("AI_SetRoambox", (void(*)(NPC*, float, float, float, float, float, uint32))&Perl_NPC_AI_SetRoambox);
package.add("AI_SetRoambox", (void(*)(NPC*, float, float, float, float, float, uint32, uint32))&Perl_NPC_AI_SetRoambox);
package.add("AddAISpell", (void(*)(NPC*, int16, uint16, uint32, int, int, int16))&Perl_NPC_AddSpellToNPCList);
package.add("AddAISpell", (void(*)(NPC*, int16, uint16, uint32, int, int, int16, int8, int8))&Perl_NPC_AddSpellToNPCList);
package.add("AddAISpell", (void(*)(NPC*, int16, int32, uint32, int, int, int16))&Perl_NPC_AddSpellToNPCList);
package.add("AddAISpell", (void(*)(NPC*, int16, int32, uint32, int, int, int16, int8, int8))&Perl_NPC_AddSpellToNPCList);
package.add("AddAISpellEffect", &Perl_NPC_AddAISpellEffect);
package.add("AddCash", &Perl_NPC_AddLootCash);
package.add("AddDefensiveProc", &Perl_NPC_AddDefensiveProc);
zone/perl_player_corpse.cpp
+1 -1
View File
@@ -142,7 +142,7 @@ void Perl_Corpse_Summon(Corpse* self, Client* client, bool is_spell) // @categor
self->Summon(client, is_spell, true);
}
void Perl_Corpse_CastRezz(Corpse* self, uint16_t spell_id, Mob* caster) // @categories Spells and Disciplines, Corpse
void Perl_Corpse_CastRezz(Corpse* self, int32_t spell_id, Mob* caster) // @categories Spells and Disciplines, Corpse
{
self->CastRezz(spell_id, caster);
}
zone/perl_raids.cpp
+1 -1
View File
@@ -34,7 +34,7 @@ bool Perl_Raid_IsRaidMember(Raid* self, Client* c) // @categories Raid
return self->IsRaidMember(c);
}
void Perl_Raid_CastGroupSpell(Raid* self, Mob* caster, uint16 spell_id, uint32 group_id) // @categories Group, Raid
void Perl_Raid_CastGroupSpell(Raid* self, Mob* caster, int32 spell_id, uint32 group_id) // @categories Group, Raid
{
self->CastGroupSpell(caster, spell_id, group_id);
}
zone/perl_stat_bonuses.cpp
+2 -2
View File
@@ -268,7 +268,7 @@ int32 Perl_StatBonuses_GetHeroicCorrup(StatBonuses* self)
return self->HeroicCorrup;
}
uint16 Perl_StatBonuses_GetDamageShieldSpellID(StatBonuses* self)
int32 Perl_StatBonuses_GetDamageShieldSpellID(StatBonuses* self)
{
return self->DamageShieldSpellID;
}
@@ -298,7 +298,7 @@ int Perl_StatBonuses_GetReverseDamageShield(StatBonuses* self)
return self->ReverseDamageShield;
}
uint16 Perl_StatBonuses_GetReverseDamageShieldSpellID(StatBonuses* self)
int32 Perl_StatBonuses_GetReverseDamageShieldSpellID(StatBonuses* self)
{
return self->ReverseDamageShieldSpellID;
}
zone/perl_zone.cpp
+1 -1
View File
@@ -477,7 +477,7 @@ bool Perl_Zone_IsSpecialBindLocation(Zone* self, float x, float y, float z, floa
return self->IsSpecialBindLocation(glm::vec4(x, y, z, heading));
}
bool Perl_Zone_IsSpellBlocked(Zone* self, uint32 spell_id, float x, float y, float z)
bool Perl_Zone_IsSpellBlocked(Zone* self, int32 spell_id, float x, float y, float z)
{
return self->IsSpellBlocked(spell_id, glm::vec3(x, y, z));
}
zone/pets.cpp
+5 -5
View File
@@ -68,7 +68,7 @@ void GetRandPetName(char *name)
strn0cpy(name, temp.c_str(), 64);
}
void Mob::MakePet(uint16 spell_id, const char* pettype, const char *petname) {
void Mob::MakePet(int32 spell_id, const char* pettype, const char *petname) {
// petpower of -1 is used to get the petpower based on whichever focus is currently
// equipped. This should replicate the old functionality for the most part.
MakePoweredPet(spell_id, pettype, -1, petname);
@@ -78,7 +78,7 @@ void Mob::MakePet(uint16 spell_id, const char* pettype, const char *petname) {
// making it possible for petpower to be retained without the focus item having to
// stay equipped when the character zones. petpower of -1 means that the currently equipped petfocus
// of a client is searched for and used instead.
void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower,
void Mob::MakePoweredPet(int32 spell_id, const char* pettype, int16 petpower,
const char *petname, float in_size) {
// Sanity and early out checking first.
if(HasPet() || pettype == nullptr)
@@ -345,7 +345,7 @@ void NPC::TryDepopTargetLockedPets(Mob* current_target) {
/* This is why the pets ghost - pets were being spawned too far away from its npc owner and some
into walls or objects (+10), this sometimes creates the "ghost" effect. I changed to +2 (as close as I
could get while it still looked good). I also noticed this can happen if an NPC is spawned on the same spot of another or in a related bad spot.*/
Pet::Pet(NPCType *type_data, Mob *owner, uint8 pet_type, uint16 spell_id, int16 power)
Pet::Pet(NPCType *type_data, Mob *owner, uint8 pet_type, int32 spell_id, int16 power)
: NPC(type_data, 0, owner->GetPosition() + glm::vec4(2.0f, 2.0f, 0.0f, 0.0f), GravityBehavior::Water)
{
GiveNPCTypeData(type_data);
@@ -553,7 +553,7 @@ void NPC::SetPetState(SpellBuff_Struct *pet_buffs, uint32 *items) {
case SpellEffect::NegateAttacks:
case SpellEffect::Illusion:
buffs[j1].spellid = SPELL_UNKNOWN;
pet_buffs[j1].spellid = SPELLBOOK_UNKNOWN;
pet_buffs[j1].spellid = SPELL_UNKNOWN;
pet_buffs[j1].effect_type = 0;
pet_buffs[j1].level = 0;
pet_buffs[j1].duration = 0;
@@ -649,7 +649,7 @@ bool ZoneDatabase::GetBasePetItems(int32 equipmentset, uint32 *items) {
return true;
}
bool Pet::CheckSpellLevelRestriction(Mob *caster, uint16 spell_id)
bool Pet::CheckSpellLevelRestriction(Mob *caster, int32 spell_id)
{
auto owner = GetOwner();
if (owner)
zone/pets.h
+2 -2
View File
@@ -22,6 +22,6 @@ struct NPCType;
class Pet : public NPC {
public:
Pet(NPCType *type_data, Mob *owner, uint8 pet_type, uint16 spell_id, int16 power);
virtual bool CheckSpellLevelRestriction(Mob *caster, uint16 spell_id);
Pet(NPCType *type_data, Mob *owner, uint8 pet_type, int32 spell_id, int16 power);
virtual bool CheckSpellLevelRestriction(Mob *caster, int32 spell_id);
};
zone/quest_interface.h
+4 -4
View File
@@ -94,7 +94,7 @@ public:
QuestEventID event_id,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any>* extra_pointers
@@ -204,7 +204,7 @@ public:
return false;
}
virtual bool SpellHasQuestSub(uint32 spell_id, QuestEventID event_id)
virtual bool SpellHasQuestSub(int32 spell_id, QuestEventID event_id)
{
return false;
}
@@ -259,7 +259,7 @@ public:
virtual void LoadPlayerScript(std::string filename) { }
virtual void LoadGlobalPlayerScript(std::string filename) { }
virtual void LoadItemScript(std::string filename, EQ::ItemInstance* inst) { }
virtual void LoadSpellScript(std::string filename, uint32 spell_id) { }
virtual void LoadSpellScript(std::string filename, int32 spell_id) { }
virtual void LoadEncounterScript(std::string filename, std::string encounter_name) { }
virtual void LoadBotScript(std::string filename) { }
virtual void LoadGlobalBotScript(std::string filename) { }
@@ -308,7 +308,7 @@ public:
QuestEventID event_id,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any>* extra_pointers
zone/quest_parser_collection.cpp
+5 -5
View File
@@ -238,13 +238,13 @@ bool QuestParserCollection::PlayerHasQuestSubGlobal(QuestEventID event_id)
return false;
}
bool QuestParserCollection::SpellHasEncounterSub(uint32 spell_id, QuestEventID event_id)
bool QuestParserCollection::SpellHasEncounterSub(int32 spell_id, QuestEventID event_id)
{
return HasEncounterSub(event_id, fmt::format("spell_{}", spell_id)) ||
HasEncounterSub(event_id, "spell_" + ENCOUNTER_NO_ENTITY_ID);
}
bool QuestParserCollection::SpellHasQuestSub(uint32 spell_id, QuestEventID event_id)
bool QuestParserCollection::SpellHasQuestSub(int32 spell_id, QuestEventID event_id)
{
if (SpellHasEncounterSub(spell_id, event_id)) {
return true;
@@ -716,7 +716,7 @@ int QuestParserCollection::EventSpell(
QuestEventID event_id,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any>* extra_pointers
@@ -1229,7 +1229,7 @@ QuestInterface* QuestParserCollection::GetQIByGlobalPlayerQuest(std::string& fil
return nullptr;
}
QuestInterface* QuestParserCollection::GetQIBySpellQuest(uint32 spell_id, std::string& filename)
QuestInterface* QuestParserCollection::GetQIBySpellQuest(int32 spell_id, std::string& filename)
{
if (!zone) {
return nullptr;
@@ -1703,7 +1703,7 @@ int QuestParserCollection::DispatchEventSpell(
QuestEventID event_id,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any>* extra_pointers
zone/quest_parser_collection.h
+5 -5
View File
@@ -63,7 +63,7 @@ public:
bool HasQuestSub(uint32 npc_id, QuestEventID event_id);
bool PlayerHasQuestSub(QuestEventID event_id);
bool SpellHasQuestSub(uint32 spell_id, QuestEventID event_id);
bool SpellHasQuestSub(int32 spell_id, QuestEventID event_id);
bool ItemHasQuestSub(EQ::ItemInstance* inst, QuestEventID event_id);
bool BotHasQuestSub(QuestEventID event_id);
bool MercHasQuestSub(QuestEventID event_id);
@@ -100,7 +100,7 @@ public:
QuestEventID event_id,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any>* extra_pointers = nullptr
@@ -206,7 +206,7 @@ private:
bool PlayerHasQuestSubLocal(QuestEventID event_id);
bool PlayerHasQuestSubGlobal(QuestEventID event_id);
bool PlayerHasEncounterSub(QuestEventID event_id);
bool SpellHasEncounterSub(uint32 spell_id, QuestEventID event_id);
bool SpellHasEncounterSub(int32 spell_id, QuestEventID event_id);
bool ItemHasEncounterSub(EQ::ItemInstance* inst, QuestEventID event_id);
bool HasEncounterSub(QuestEventID event_id, const std::string& package_name);
bool BotHasQuestSubLocal(QuestEventID event_id);
@@ -306,7 +306,7 @@ private:
QuestInterface* GetQIByGlobalNPCQuest(std::string& filename);
QuestInterface* GetQIByPlayerQuest(std::string& filename);
QuestInterface* GetQIByGlobalPlayerQuest(std::string& filename);
QuestInterface* GetQIBySpellQuest(uint32 spell_id, std::string& filename);
QuestInterface* GetQIBySpellQuest(int32 spell_id, std::string& filename);
QuestInterface* GetQIByItemQuest(std::string item_script, std::string& filename);
QuestInterface* GetQIByEncounterQuest(std::string encounter_name, std::string& filename);
QuestInterface* GetQIByBotQuest(std::string& filename);
@@ -347,7 +347,7 @@ private:
QuestEventID event_id,
Mob* mob,
Client* client,
uint32 spell_id,
int32 spell_id,
std::string data,
uint32 extra_data,
std::vector<std::any>* extra_pointers
zone/questmgr.cpp
+7 -7
View File
@@ -397,7 +397,7 @@ void QuestManager::incstat(int stat, int value) {
initiator->IncStats(stat, value);
}
void QuestManager::castspell(uint16 spell_id, uint16 target_id)
void QuestManager::castspell(int32 spell_id, uint16 target_id)
{
QuestManagerCurrentQuestVars();
@@ -416,7 +416,7 @@ void QuestManager::castspell(uint16 spell_id, uint16 target_id)
}
}
void QuestManager::selfcast(uint16 spell_id)
void QuestManager::selfcast(int32 spell_id)
{
QuestManagerCurrentQuestVars();
@@ -1242,7 +1242,7 @@ std::string QuestManager::getracename(uint16 race_id) {
return GetRaceIDName(race_id);
}
std::string QuestManager::getspellname(uint32 spell_id) {
std::string QuestManager::getspellname(int32 spell_id) {
if (!IsValidSpell(spell_id)) {
return "INVALID SPELL ID IN GETSPELLNAME";
}
@@ -4191,7 +4191,7 @@ const int QuestManager::getitemstat(uint32 item_id, std::string stat_identifier)
return EQ::InventoryProfile::GetItemStatValue(item_id, stat_identifier);
}
int QuestManager::getspellstat(uint32 spell_id, std::string stat_identifier, uint8 slot) {
int QuestManager::getspellstat(int32 spell_id, std::string stat_identifier, uint8 slot) {
QuestManagerCurrentQuestVars();
return GetSpellStatValue(spell_id, stat_identifier.c_str(), slot);
}
@@ -4294,7 +4294,7 @@ void QuestManager::CrossZoneSignal(uint8 update_type, int update_identifier, int
safe_delete(pack);
}
void QuestManager::CrossZoneSpell(uint8 update_type, uint8 update_subtype, int update_identifier, uint32 spell_id, const char* client_name) {
void QuestManager::CrossZoneSpell(uint8 update_type, uint8 update_subtype, int update_identifier, int32 spell_id, const char* client_name) {
auto pack = new ServerPacket(ServerOP_CZSpell, sizeof(CZSpell_Struct));
CZSpell_Struct* CZS = (CZSpell_Struct*)pack->pBuffer;
CZS->update_type = update_type;
@@ -4404,7 +4404,7 @@ void QuestManager::WorldWideSignal(uint8 update_type, int signal_id, uint8 min_s
safe_delete(pack);
}
void QuestManager::WorldWideSpell(uint8 update_type, uint32 spell_id, uint8 min_status, uint8 max_status) {
void QuestManager::WorldWideSpell(uint8 update_type, int32 spell_id, uint8 min_status, uint8 max_status) {
auto pack = new ServerPacket(ServerOP_WWSpell, sizeof(WWSpell_Struct));
WWSpell_Struct* WWS = (WWSpell_Struct*)pack->pBuffer;
WWS->update_type = update_type;
@@ -4429,7 +4429,7 @@ void QuestManager::WorldWideTaskUpdate(uint8 update_type, uint32 task_identifier
safe_delete(pack);
}
const SPDat_Spell_Struct* QuestManager::getspell(uint32 spell_id) {
const SPDat_Spell_Struct* QuestManager::getspell(int32 spell_id) {
if (spells[spell_id].id) {
return &spells[spell_id];
}
zone/questmgr.h
+7 -7
View File
@@ -77,8 +77,8 @@ public:
void disable_spawn2(uint32 spawn2_id);
void setstat(int stat, int value);
void incstat(int stat, int value);
void castspell(uint16 spell_id, uint16 target_id);
void selfcast(uint16 spell_id);
void castspell(int32 spell_id, uint16 target_id);
void selfcast(int32 spell_id);
void addloot(int item_id, int charges = 0, bool equipitem = true, int aug1 = 0, int aug2 = 0, int aug3 = 0, int aug4 = 0, int aug5 = 0, int aug6 = 0);
void Zone(const char *zone_name);
void ZoneGroup(const char *zone_name);
@@ -118,7 +118,7 @@ public:
void traindisc(uint32 discipline_tome_item_id);
bool isdisctome(uint32 item_id);
std::string getracename(uint16 race_id);
std::string getspellname(uint32 spell_id);
std::string getspellname(int32 spell_id);
std::string getskillname(int skill_id);
std::string getldonthemename(uint32 theme_id);
std::string getfactionname(int faction_id);
@@ -322,7 +322,7 @@ public:
void CrossZoneMove(const CZMove_Struct& m);
void CrossZoneSetEntityVariable(uint8 update_type, int update_identifier, const char* variable_name, const char* variable_value, const char* client_name = "");
void CrossZoneSignal(uint8 update_type, int update_identifier, int signal_id, const char* client_name = "");
void CrossZoneSpell(uint8 update_type, uint8 update_subtype, int update_identifier, uint32 spell_id, const char* client_name = "");
void CrossZoneSpell(uint8 update_type, uint8 update_subtype, int update_identifier, int32 spell_id, const char* client_name = "");
void CrossZoneTaskUpdate(uint8 update_type, uint8 update_subtype, int update_identifier, uint32 task_identifier, int task_subidentifier = -1, int update_count = 1, bool enforce_level_requirement = false, const char* client_name = "");
void WorldWideDialogueWindow(const char* message, uint8 min_status = AccountStatus::Player, uint8 max_status = AccountStatus::Player);
void WorldWideLDoNUpdate(uint8 update_type, uint32 theme_id, int points = 1, uint8 min_status = AccountStatus::Player, uint8 max_status = AccountStatus::Player);
@@ -331,7 +331,7 @@ public:
void WorldWideMove(uint8 update_type, const char* zone_short_name, uint16 instance_id = 0, uint8 min_status = AccountStatus::Player, uint8 max_status = AccountStatus::Player);
void WorldWideSetEntityVariable(uint8 update_type, const char* variable_name, const char* variable_value, uint8 min_status = AccountStatus::Player, uint8 max_status = AccountStatus::Player);
void WorldWideSignal(uint8 update_type, int signal_id, uint8 min_status = AccountStatus::Player, uint8 max_status = AccountStatus::Player);
void WorldWideSpell(uint8 update_type, uint32 spell_id, uint8 min_status = AccountStatus::Player, uint8 max_status = AccountStatus::Player);
void WorldWideSpell(uint8 update_type, int32 spell_id, uint8 min_status = AccountStatus::Player, uint8 max_status = AccountStatus::Player);
void WorldWideTaskUpdate(uint8 update_type, uint32 task_identifier, int task_subidentifier = -1, int update_count = 1, bool enforce_level_requirement = false, uint8 min_status = AccountStatus::Player, uint8 max_status = AccountStatus::Player);
bool EnableRecipe(uint32 recipe_id);
bool DisableRecipe(uint32 recipe_id);
@@ -346,8 +346,8 @@ public:
std::string getdeityname(uint32 deity_id);
std::string getinventoryslotname(int16 slot_id);
const int getitemstat(uint32 item_id, std::string stat_identifier);
int getspellstat(uint32 spell_id, std::string stat_identifier, uint8 slot = 0);
const SPDat_Spell_Struct *getspell(uint32 spell_id);
int getspellstat(int32 spell_id, std::string stat_identifier, uint8 slot = 0);
const SPDat_Spell_Struct *getspell(int32 spell_id);
std::string getenvironmentaldamagename(uint8 damage_type);
void TrackNPC(uint32 entity_id);
int GetRecipeMadeCount(uint32 recipe_id);
zone/raids.cpp
+1 -1
View File
@@ -655,7 +655,7 @@ Client *Raid::GetClientByIndex(uint16 index)
return members[index].member;
}
void Raid::CastGroupSpell(Mob* caster, uint16 spellid, uint32 gid)
void Raid::CastGroupSpell(Mob* caster, int32 spellid, uint32 gid)
{
float range, distance;
zone/raids.h
+1 -1
View File
@@ -163,7 +163,7 @@ public:
//Actual Implementation Stuff
void RaidMessageString(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);
void CastGroupSpell(Mob* caster,uint16 spellid, uint32 gid);
void CastGroupSpell(Mob* caster,int32 spellid, uint32 gid);
void SplitExp(ExpSource exp_source, const uint64 exp, Mob* other);
uint32 GetTotalRaidDamage(Mob* other);
void BalanceHP(int32 penalty, uint32 group_id, float range = 0, Mob* caster = nullptr, int32 limit = 0);
zone/spell_effects.cpp
+28 -28
View File
@@ -43,7 +43,7 @@ extern WorldServer worldserver;
// the spell can still fail here, if the buff can't stack
// in this case false will be returned, true otherwise
bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_override, int reflect_effectiveness, int32 duration_override, bool disable_buff_overwrite)
bool Mob::SpellEffect(Mob* caster, int32 spell_id, float partial, int level_override, int reflect_effectiveness, int32 duration_override, bool disable_buff_overwrite)
{
int caster_level, buffslot, effect, effect_value, i;
EQ::ItemInstance *SummonedItem=nullptr;
@@ -1611,7 +1611,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
GetPetType() != PetType::Charmed
)
{
uint16 pet_spellid = CastToNPC()->GetPetSpellID();
int32 pet_spellid = CastToNPC()->GetPetSpellID();
uint16 pet_ActSpellCost = caster->GetActSpellCost(pet_spellid, spells[pet_spellid].mana);
int16 ImprovedReclaimMod = caster->spellbonuses.ImprovedReclaimEnergy +
caster->itembonuses.ImprovedReclaimEnergy +
@@ -3021,7 +3021,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
break;
if (caster && zone->random.Roll(spells[spell_id].base_value[i])) {
uint32 best_spell_id = caster->CastToClient()->GetHighestScribedSpellinSpellGroup(spells[spell_id].limit_value[i]);
int32 best_spell_id = caster->CastToClient()->GetHighestScribedSpellinSpellGroup(spells[spell_id].limit_value[i]);
if (IsValidSpell(best_spell_id))
caster->SpellFinished(best_spell_id, this, EQ::spells::CastingSlot::Item, 0, -1, spells[best_spell_id].resist_difficulty);
@@ -3438,7 +3438,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
return true;
}
int64 Mob::CalcSpellEffectValue(uint16 spell_id, int effect_id, int caster_level, uint32 instrument_mod, Mob *caster,
int64 Mob::CalcSpellEffectValue(int32 spell_id, int effect_id, int caster_level, uint32 instrument_mod, Mob *caster,
int ticsremaining, uint16 caster_id)
{
if (!IsValidSpell(spell_id) || effect_id < 0 || effect_id >= EFFECT_COUNT)
@@ -3507,7 +3507,7 @@ int64 Mob::CalcSpellEffectValue(uint16 spell_id, int effect_id, int caster_level
}
// generic formula calculations
int64 Mob::CalcSpellEffectValue_formula(uint32 formula, int64 base_value, int64 max_value, int caster_level, uint16 spell_id, int ticsremaining)
int64 Mob::CalcSpellEffectValue_formula(uint32 formula, int64 base_value, int64 max_value, int caster_level, int32 spell_id, int ticsremaining)
{
#ifdef LUA_EQEMU
int64 lua_ret = 0;
@@ -4674,7 +4674,7 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses)
CalcBonuses();
}
int64 Mob::CalcAAFocus(focusType type, const AA::Rank &rank, uint16 spell_id)
int64 Mob::CalcAAFocus(focusType type, const AA::Rank &rank, int32 spell_id)
{
const SPDat_Spell_Struct &spell = spells[spell_id];
@@ -5427,7 +5427,7 @@ int64 Mob::CalcAAFocus(focusType type, const AA::Rank &rank, uint16 spell_id)
//given an item/spell's focus ID and the spell being cast, determine the focus ammount, if any
//assumes that spell_id is not a bard spell and that both ids are valid spell ids
int64 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, bool best_focus, uint16 casterid, Mob *caster)
int64 Mob::CalcFocusEffect(focusType type, uint16 focus_id, int32 spell_id, bool best_focus, uint16 casterid, Mob *caster)
{
/*
'this' is always the caster of the spell_id, most foci check for effects on the caster, however some check for effects on the target.
@@ -5449,7 +5449,7 @@ int64 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo
int lvlModifier = 100;
int spell_level = 0;
int lvldiff = 0;
uint32 Caston_spell_id = 0;
int32 Caston_spell_id = 0;
int index_id = -1;
uint32 focus_reuse_time = 0; //If this is set and all limits pass, start timer at end of script.
@@ -6243,7 +6243,7 @@ int64 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo
return (value * lvlModifier / 100);
}
void Mob::TryTriggerOnCastFocusEffect(focusType type, uint16 spell_id)
void Mob::TryTriggerOnCastFocusEffect(focusType type, int32 spell_id)
{
if (IsBardSong(spell_id)) {
return;
@@ -6344,7 +6344,7 @@ void Mob::TryTriggerOnCastFocusEffect(focusType type, uint16 spell_id)
}
}
bool Mob::TryTriggerOnCastProc(uint16 focusspellid, uint16 spell_id, uint16 proc_spellid)
bool Mob::TryTriggerOnCastProc(int32 focusspellid, int32 spell_id, int32 proc_spellid)
{
// We confirm spell_id and focuspellid are valid before passing into this.
if (IsValidSpell(proc_spellid) && spell_id != focusspellid && spell_id != proc_spellid) {
@@ -6362,12 +6362,12 @@ bool Mob::TryTriggerOnCastProc(uint16 focusspellid, uint16 spell_id, uint16 proc
return false;
}
uint16 Mob::GetSympatheticFocusEffect(focusType type, uint16 spell_id) {
int32 Mob::GetSympatheticFocusEffect(focusType type, int32 spell_id) {
if (IsBardSong(spell_id))
return 0;
uint16 proc_spellid = 0;
int32 proc_spellid = 0;
float ProcChance = 0.0f;
std::vector<int> SympatheticProcList;
@@ -6421,7 +6421,7 @@ uint16 Mob::GetSympatheticFocusEffect(focusType type, uint16 spell_id) {
//Spell Focus
if (spellbonuses.FocusEffects[type]){
uint16 focusspellid = 0;
int32 focusspellid = 0;
int buff_max = GetMaxTotalSlots();
for (int buff_slot = 0; buff_slot < buff_max; buff_slot++) {
@@ -6485,7 +6485,7 @@ uint16 Mob::GetSympatheticFocusEffect(focusType type, uint16 spell_id) {
return 0;
}
int64 Mob::GetFocusEffect(focusType type, uint16 spell_id, Mob *caster, bool from_buff_tic)
int64 Mob::GetFocusEffect(focusType type, int32 spell_id, Mob *caster, bool from_buff_tic)
{
if (IsBardSong(spell_id) && type != focusFcBaseEffects && type != focusSpellDuration && type != focusReduceRecastTime) {
return 0;
@@ -6859,7 +6859,7 @@ int64 Mob::GetFocusEffect(focusType type, uint16 spell_id, Mob *caster, bool fro
return realTotal + realTotal2 + realTotal3 + worneffect_bonus;
}
int64 NPC::GetFocusEffect(focusType type, uint16 spell_id, Mob* caster, bool from_buff_tic) {
int64 NPC::GetFocusEffect(focusType type, int32 spell_id, Mob* caster, bool from_buff_tic) {
int64 realTotal = 0;
int64 realTotal2 = 0;
@@ -6982,7 +6982,7 @@ int64 NPC::GetFocusEffect(focusType type, uint16 spell_id, Mob* caster, bool fro
return realTotal + realTotal2;
}
void Mob::CheckNumHitsRemaining(NumHit type, int32 buff_slot, uint16 spell_id)
void Mob::CheckNumHitsRemaining(NumHit type, int32 buff_slot, int32 spell_id)
{
/*
Field 175 = numhits type
@@ -7085,7 +7085,7 @@ void Mob::CheckNumHitsRemaining(NumHit type, int32 buff_slot, uint16 spell_id)
}
//for some stupid reason SK procs return theirs one base off...
uint16 Mob::GetProcID(uint16 spell_id, uint8 effect_index)
int32 Mob::GetProcID(int32 spell_id, uint8 effect_index)
{
if (!RuleB(Spells, SHDProcIDOffByOne)) // UF+ spell files
return spells[spell_id].base_value[effect_index];
@@ -7277,7 +7277,7 @@ bool Mob::AffectedBySpellExcludingSlot(int slot, int effect)
return false;
}
float Mob::GetSympatheticProcChances(uint16 spell_id, int16 ProcRateMod, int32 ItemProcRate) {
float Mob::GetSympatheticProcChances(int32 spell_id, int16 ProcRateMod, int32 ItemProcRate) {
float ProcChance = 0.0f;
int32 total_cast_time = 0;
@@ -7303,7 +7303,7 @@ float Mob::GetSympatheticProcChances(uint16 spell_id, int16 ProcRateMod, int32 I
return ProcChance;
}
int16 Mob::GetSympatheticSpellProcRate(uint16 spell_id)
int16 Mob::GetSympatheticSpellProcRate(int32 spell_id)
{
for (int i = 0; i < EFFECT_COUNT; i++){
if (spells[spell_id].effect_id[i] == SpellEffect::SympatheticProc)
@@ -7313,7 +7313,7 @@ int16 Mob::GetSympatheticSpellProcRate(uint16 spell_id)
return 0;
}
uint16 Mob::GetSympatheticSpellProcID(uint16 spell_id)
int32 Mob::GetSympatheticSpellProcID(int32 spell_id)
{
for (int i = 0; i < EFFECT_COUNT; i++){
if (spells[spell_id].effect_id[i] == SpellEffect::SympatheticProc)
@@ -7346,7 +7346,7 @@ int64 Mob::GetFcDamageAmtIncoming(Mob *caster, int32 spell_id, bool from_buff_ti
return dmg;
}
int64 Mob::GetFocusIncoming(focusType type, int effect, Mob *caster, uint32 spell_id) {
int64 Mob::GetFocusIncoming(focusType type, int effect, Mob *caster, int32 spell_id) {
//**** This can be removed when bot healing focus code is updated ****
@@ -7418,7 +7418,7 @@ bool Mob::PassLimitClass(uint32 Classes_, uint16 Class_)
return false;
}
void Mob::DispelMagic(Mob* caster, uint16 spell_id, int effect_value)
void Mob::DispelMagic(Mob* caster, int32 spell_id, int effect_value)
{
for (int slot = 0; slot < GetMaxTotalSlots(); slot++) {
if (
@@ -7434,7 +7434,7 @@ void Mob::DispelMagic(Mob* caster, uint16 spell_id, int effect_value)
}
}
bool Mob::TrySpellEffectResist(uint16 spell_id)
bool Mob::TrySpellEffectResist(int32 spell_id)
{
/*
SEResist variable
@@ -9591,7 +9591,7 @@ void Mob::SendCastRestrictionMessage(int requirement_id, bool target_requirement
}
}
bool Mob::TrySpellProjectile(Mob* spell_target, uint16 spell_id, float speed) {
bool Mob::TrySpellProjectile(Mob* spell_target, int32 spell_id, float speed) {
/*For mage 'Bolt' line and other various spells.
-This is mostly accurate for how the modern clients handle this effect.
@@ -9699,7 +9699,7 @@ bool Mob::TrySpellProjectile(Mob* spell_target, uint16 spell_id, float speed) {
return true;
}
void Mob::ResourceTap(int64 damage, uint16 spellid)
void Mob::ResourceTap(int64 damage, int32 spellid)
{
//'this' = caster
if (!IsValidSpell(spellid))
@@ -9751,7 +9751,7 @@ void Mob::TryTriggerThreshHold(int64 damage, int effect_id, Mob* attacker){
if (spells[buffs[slot].spellid].effect_id[i] == effect_id){
uint16 spell_id = spells[buffs[slot].spellid].base_value[i];
int32 spell_id = spells[buffs[slot].spellid].base_value[i];
if (damage > spells[buffs[slot].spellid].limit_value[i]){
@@ -9819,7 +9819,7 @@ void Mob::CastSpellOnLand(Mob* caster, int32 spell_id)
}
}
void Mob::CalcSpellPowerDistanceMod(uint16 spell_id, float range, Mob* caster)
void Mob::CalcSpellPowerDistanceMod(int32 spell_id, float range, Mob* caster)
{
if (IsDistanceModifierSpell(spell_id)){
@@ -10074,7 +10074,7 @@ int Mob::GetFocusRandomEffectivenessValue(int focus_base, int focus_base2, bool
return zone->random.Int(focus_base, focus_base2);
}
bool Mob::NegateSpellEffect(uint16 spell_id, int effect_id)
bool Mob::NegateSpellEffect(int32 spell_id, int effect_id)
{
/*
This works for most effects, anything handled purely by the client will bypass this (ie Gate, Shadowstep)
zone/spells.cpp
+56 -56
View File
@@ -145,7 +145,7 @@ void NPC::SpellProcess()
// the rule is you can cast one triggered (usually timed) spell at a time
// but things like SpellFinished() can run concurrent with a triggered cast
// to allow procs to work
bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
bool Mob::CastSpell(int32 spell_id, uint16 target_id, CastingSlot slot,
int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish, uint32 item_slot,
uint32 timer, uint32 timer_duration, int16 *resist_adjust,
uint32 aa_id)
@@ -291,7 +291,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
// this is the 2nd phase of CastSpell, broken up like this to make it easier
// to repeat a spell for bard songs
//
bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
bool Mob::DoCastSpell(int32 spell_id, uint16 target_id, CastingSlot slot,
int32 cast_time, int32 mana_cost, uint32* oSpellWillFinish,
uint32 item_slot, uint32 timer, uint32 timer_duration,
int16 resist_adjust, uint32 aa_id)
@@ -480,7 +480,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
return true;
}
void Mob::DoSpellInterrupt(uint16 spell_id, int32 mana_cost, int my_curmana) {
void Mob::DoSpellInterrupt(int32 spell_id, int32 mana_cost, int my_curmana) {
//The client will prevent spell casting if insufficient mana, this is only for serverside enforcement.
LogSpells("Not enough mana spell [{}] curmana [{}] cost [{}]\n", spell_id, my_curmana, mana_cost);
if (IsClient()) {
@@ -493,7 +493,7 @@ void Mob::DoSpellInterrupt(uint16 spell_id, int32 mana_cost, int my_curmana) {
ZeroCastingVars();
}
void Mob::SendBeginCast(uint16 spell_id, uint32 casttime)
void Mob::SendBeginCast(int32 spell_id, uint32 casttime)
{
auto outapp = new EQApplicationPacket(OP_BeginCast, sizeof(BeginCast_Struct));
auto begincast = (BeginCast_Struct *)outapp->pBuffer;
@@ -922,7 +922,7 @@ bool Mob::DoCastingChecksOnTarget(bool check_on_casting, int32 spell_id, Mob *sp
return true;
}
uint16 Mob::GetSpecializeSkillValue(uint16 spell_id) const {
uint16 Mob::GetSpecializeSkillValue(int32 spell_id) const {
switch(spells[spell_id].skill) {
case EQ::skills::SkillAbjuration:
return(GetSkill(EQ::skills::SkillSpecializeAbjure));
@@ -941,7 +941,7 @@ uint16 Mob::GetSpecializeSkillValue(uint16 spell_id) const {
return(0);
}
void Client::CheckSpecializeIncrease(uint16 spell_id) {
void Client::CheckSpecializeIncrease(int32 spell_id) {
// These are not active because CheckIncreaseSkill() already does so.
// It's such a rare occurance that adding them here is wasted..(ref only)
/*
@@ -973,7 +973,7 @@ void Client::CheckSpecializeIncrease(uint16 spell_id) {
}
}
void Client::CheckSongSkillIncrease(uint16 spell_id){
void Client::CheckSongSkillIncrease(int32 spell_id){
// These are not active because CheckIncreaseSkill() already does so.
// It's such a rare occurance that adding them here is wasted..(ref only)
/*
@@ -1039,12 +1039,12 @@ only works for clients, npcs shouldn't be fizzling..
new algorithm thats closer to live eq (i hope)
TODO: Add aa skills, item mods, reduced the chance to fizzle
*/
bool Mob::CheckFizzle(uint16 spell_id)
bool Mob::CheckFizzle(int32 spell_id)
{
return(true);
}
bool Client::CheckFizzle(uint16 spell_id)
bool Client::CheckFizzle(int32 spell_id)
{
// GMs don't fizzle
if (GetGM()) {
@@ -1228,7 +1228,7 @@ void Mob::ZeroBardPulseVars()
bardsong_timer.Disable();
}
void Mob::InterruptSpell(uint16 spellid)
void Mob::InterruptSpell(int32 spellid)
{
if (!IsValidSpell(spellid)) {
spellid = casting_spell_id;
@@ -1238,7 +1238,7 @@ void Mob::InterruptSpell(uint16 spellid)
}
// color not used right now
void Mob::InterruptSpell(uint16 message, uint16 color, uint16 spellid)
void Mob::InterruptSpell(uint16 message, uint16 color, int32 spellid)
{
uint16 message_other;
bool bard_song_mode = false; //has the bard song gone to auto repeat mode
@@ -1390,7 +1390,7 @@ void Mob::StopCastSpell(int32 spell_id, bool send_spellbar_enable)
// NOTE: do not put range checking, etc into this function. this should
// just check timed spell specific things before passing off to SpellFinished
// which figures out proper targets etc
void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slot,
void Mob::CastedSpellFinished(int32 spell_id, uint32 target_id, CastingSlot slot,
int32 mana_used, uint32 inventory_slot, int16 resist_adjust)
{
if (!IsValidSpell(spell_id))
@@ -1839,7 +1839,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
}
bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction, CastingSlot slot, bool isproc)
bool Mob::DetermineSpellTargets(int32 spell_id, Mob *&spell_target, Mob *&ae_center, CastAction_type &CastAction, CastingSlot slot, bool isproc)
{
/*
The basic types of spells:
@@ -2383,7 +2383,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
// only used from CastedSpellFinished, and procs
// we can't interrupt in this, or anything called from this!
// if you need to abort the casting, return false
bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, int32 mana_used,
bool Mob::SpellFinished(int32 spell_id, Mob *spell_target, CastingSlot slot, int32 mana_used,
uint32 inventory_slot, int16 resist_adjust, bool isproc, int level_override,
uint32 timer, uint32 timer_duration, bool from_casted_spell, uint32 aa_id)
{
@@ -2928,7 +2928,7 @@ bool Mob::ApplyBardPulse(int32 spell_id, Mob *spell_target, CastingSlot slot) {
// even be created depending on the types of mobs involved
//
// right now this is just an outline, working on this..
int Mob::CalcBuffDuration(Mob *caster, Mob *target, uint16 spell_id, int32 caster_level_override)
int Mob::CalcBuffDuration(Mob *caster, Mob *target, int32 spell_id, int32 caster_level_override)
{
int formula, duration;
@@ -3054,7 +3054,7 @@ int CalcBuffDuration_formula(int level, int formula, int duration)
// -1 if they can't stack and spellid2 should be stopped
//currently, a spell will not land if it would overwrite a better spell on any effect
//if all effects are better or the same, we overwrite, else we do nothing
int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, int caster_level2, Mob* caster1, Mob* caster2, int buffslot)
int Mob::CheckStackConflict(int32 spellid1, int caster_level1, int32 spellid2, int caster_level2, Mob* caster1, Mob* caster2, int buffslot)
{
const SPDat_Spell_Struct &sp1 = spells[spellid1];
const SPDat_Spell_Struct &sp2 = spells[spellid2];
@@ -3411,7 +3411,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
// spells 1-50: no restrictons
// 51-65: SpellLevel/2+15
// 66+ Group Spells 62, Single Target 61
bool Mob::CheckSpellLevelRestriction(Mob *caster, uint16 spell_id)
bool Mob::CheckSpellLevelRestriction(Mob *caster, int32 spell_id)
{
if (spells[spell_id].target_type == ST_Self) {
LogSpells("[CheckSpellLevelRestriction] Self Only spell - no restrictions");
@@ -3517,7 +3517,7 @@ bool Mob::HasDiscBuff()
// stacking problems, and -2 if this is not a buff
// if caster is null, the buff will be added with the caster level being
// the level of the mob
int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_override, bool disable_buff_overwrite)
int Mob::AddBuff(Mob *caster, int32 spell_id, int duration, int32 level_override, bool disable_buff_overwrite)
{
int buffslot, ret, caster_level, emptyslot = -1;
bool will_overwrite = false;
@@ -3760,7 +3760,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid
// note that this should not be used for determining which slot to place a
// buff into
// returns -1 on stack failure, -2 if all slots full, the slot number if the buff should overwrite another buff, or a free buff slot
int Mob::CanBuffStack(uint16 spellid, uint8 caster_level, bool iFailIfOverwrite)
int Mob::CanBuffStack(int32 spellid, uint8 caster_level, bool iFailIfOverwrite)
{
int i, ret, firstfree = -2;
@@ -3857,7 +3857,7 @@ int Mob::CanBuffStack(uint16 spellid, uint8 caster_level, bool iFailIfOverwrite)
// break stuff
//
bool Mob::SpellOnTarget(
uint16 spell_id,
int32 spell_id,
Mob *spelltar,
int reflect_effectiveness,
bool use_resist_adjust,
@@ -4717,11 +4717,11 @@ std::vector<uint16> Mob::GetBuffSpellIDs()
return l;
}
bool Mob::FindBuff(uint16 spell_id, uint16 caster_id)
bool Mob::FindBuff(int32 spell_id, uint16 caster_id)
{
const int buff_count = GetMaxTotalSlots();
for (int buff_slot = 0; buff_slot < buff_count; buff_slot++) {
const uint16 current_spell_id = buffs[buff_slot].spellid;
const int32 current_spell_id = buffs[buff_slot].spellid;
if (
IsValidSpell(current_spell_id) &&
current_spell_id == spell_id &&
@@ -4900,7 +4900,7 @@ void Mob::BuffFadeBySitModifier()
}
}
void Mob::BuffFadeBySpellID(uint16 spell_id)
void Mob::BuffFadeBySpellID(int32 spell_id)
{
bool recalc_bonus = false;
int buff_count = GetMaxTotalSlots();
@@ -4916,7 +4916,7 @@ void Mob::BuffFadeBySpellID(uint16 spell_id)
}
}
void Mob::BuffFadeBySpellIDAndCaster(uint16 spell_id, uint16 caster_id)
void Mob::BuffFadeBySpellIDAndCaster(int32 spell_id, uint16 caster_id)
{
bool recalc_bonus = false;
auto buff_count = GetMaxTotalSlots();
@@ -4961,7 +4961,7 @@ void Mob::BuffFadeSongs() {
int buff_count = GetMaxTotalSlots();
for (int buff_slot = 0; buff_slot < buff_count; buff_slot++) {
const uint16 current_spell_id = buffs[buff_slot].spellid;
const int32 current_spell_id = buffs[buff_slot].spellid;
if (IsBardSong(current_spell_id)) {
BuffFadeBySlot(buff_slot, false);
recalc_bonus = true;
@@ -5011,7 +5011,7 @@ void Mob::BuffDetachCaster(Mob *caster) {
// checks if 'this' can be affected by spell_id from caster
// returns true if the spell should fail, false otherwise
bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
bool Mob::IsImmuneToSpell(int32 spell_id, Mob *caster)
{
int effect_index;
@@ -5251,7 +5251,7 @@ int Mob::GetResist(uint8 resist_type)
// pvp_resist_base
// pvp_resist_calc
// pvp_resist_cap
float Mob::ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use_resist_override, int resist_override, bool CharismaCheck, bool CharmTick, bool IsRoot, int level_override)
float Mob::ResistSpell(uint8 resist_type, int32 spell_id, Mob *caster, bool use_resist_override, int resist_override, bool CharismaCheck, bool CharmTick, bool IsRoot, int level_override)
{
if(!caster)
@@ -5635,7 +5635,7 @@ int16 Mob::CalcFearResistChance()
return resist_chance;
}
float Mob::GetAOERange(uint16 spell_id)
float Mob::GetAOERange(int32 spell_id)
{
float range = spells[spell_id].aoe_range;
@@ -5721,7 +5721,7 @@ void Mob::SendSpellBarDisable()
}
// this puts the spell bar back into a usable state fast
void Mob::SendSpellBarEnable(uint16 spell_id)
void Mob::SendSpellBarEnable(int32 spell_id)
{
if(!IsClient())
return;
@@ -5814,7 +5814,7 @@ void Mob::Mesmerize()
StopNavigation();
}
void Client::MakeBuffFadePacket(uint16 spell_id, int slot_id, bool send_message)
void Client::MakeBuffFadePacket(int32 spell_id, int slot_id, bool send_message)
{
EQApplicationPacket* outapp = nullptr;
@@ -5861,7 +5861,7 @@ void Client::MakeBuffFadePacket(uint16 spell_id, int slot_id, bool send_message)
}
}
void Client::MemSpell(uint16 spell_id, int slot, bool update_client)
void Client::MemSpell(int32 spell_id, int slot, bool update_client)
{
if (slot >= EQ::spells::SPELL_GEM_COUNT || slot < 0) {
return;
@@ -5919,7 +5919,7 @@ void Client::UnmemSpellAll(bool update_client)
}
}
uint32 Client::GetSpellIDByBookSlot(int book_slot) {
int32 Client::GetSpellIDByBookSlot(int book_slot) {
if (book_slot <= EQ::spells::SPELLBOOK_SIZE) {
return GetSpellByBookSlot(book_slot);
}
@@ -5952,7 +5952,7 @@ int Client::MemmedCount() {
return memmed_count;
}
int Client::FindMemmedSpellBySpellID(uint16 spell_id) {
int Client::FindMemmedSpellBySpellID(int32 spell_id) {
for (int spell_gem = 0; spell_gem < EQ::spells::SPELL_GEM_COUNT; spell_gem++) {
if (IsValidSpell(m_pp.mem_spells[spell_gem]) && m_pp.mem_spells[spell_gem] == spell_id) {
return spell_gem;
@@ -5962,7 +5962,7 @@ int Client::FindMemmedSpellBySpellID(uint16 spell_id) {
}
void Client::ScribeSpell(uint16 spell_id, int slot, bool update_client, bool defer_save)
void Client::ScribeSpell(int32 spell_id, int slot, bool update_client, bool defer_save)
{
if (slot >= EQ::spells::SPELLBOOK_SIZE || slot < 0) {
return;
@@ -6030,7 +6030,7 @@ void Client::UnscribeSpellAll(bool update_client)
SaveSpells();
}
void Client::UnscribeSpellBySpellID(uint16 spell_id, bool update_client)
void Client::UnscribeSpellBySpellID(int32 spell_id, bool update_client)
{
for (int index = 0; index < EQ::spells::SPELLBOOK_SIZE; index++) {
if (IsValidSpell(m_pp.spell_book[index]) && m_pp.spell_book[index] == spell_id) {
@@ -6070,7 +6070,7 @@ void Client::UntrainDiscAll(bool update_client)
SaveDisciplines();
}
void Client::UntrainDiscBySpellID(uint16 spell_id, bool update_client)
void Client::UntrainDiscBySpellID(int32 spell_id, bool update_client)
{
for (int slot = 0; slot < MAX_PP_DISCIPLINES; slot++) {
if (m_pp.disciplines.values[slot] == spell_id) {
@@ -6089,7 +6089,7 @@ int Client::GetNextAvailableSpellBookSlot(int starting_slot) {
return -1; //default
}
int Client::FindSpellBookSlotBySpellID(uint16 spellid) {
int Client::FindSpellBookSlotBySpellID(int32 spellid) {
for(int i = 0; i < EQ::spells::SPELLBOOK_SIZE; i++) {
if(m_pp.spell_book[i] == spellid)
return i;
@@ -6098,12 +6098,12 @@ int Client::FindSpellBookSlotBySpellID(uint16 spellid) {
return -1; //default
}
uint32 Client::GetHighestScribedSpellinSpellGroup(uint32 spell_group)
int32 Client::GetHighestScribedSpellinSpellGroup(uint32 spell_group)
{
//Typical live spells follow 1/5/10 rank value for actual ranks 1/2/3, but this can technically be set as anything.
int highest_rank = 0; //highest ranked found in spellgroup
uint32 highest_spell_id = 0; //spell_id of the highest ranked spell you have scribed in that spell rank.
int32 highest_spell_id = 0; //spell_id of the highest ranked spell you have scribed in that spell rank.
for (int i = 0; i < EQ::spells::SPELLBOOK_SIZE; i++) {
@@ -6146,7 +6146,7 @@ std::unordered_map<uint32, std::vector<uint16>> Client::LoadSpellGroupCache(uint
return spell_group_cache;
}
bool Client::SpellGlobalCheck(uint16 spell_id, uint32 character_id) {
bool Client::SpellGlobalCheck(int32 spell_id, uint32 character_id) {
std::string query = fmt::format(
"SELECT qglobal, value FROM spell_globals WHERE spellid = {}",
spell_id
@@ -6223,7 +6223,7 @@ bool Client::SpellGlobalCheck(uint16 spell_id, uint32 character_id) {
return false;
}
bool Client::SpellBucketCheck(uint16 spell_id, uint32 character_id)
bool Client::SpellBucketCheck(int32 spell_id, uint32 character_id)
{
const auto& e = SpellBucketsRepository::FindOne(database, spell_id);
if (!e.spell_id || e.bucket_name.empty() || e.bucket_value.empty()) {
@@ -6253,7 +6253,7 @@ int16 Mob::GetBuffSlotFromType(uint16 type) {
return -1;
}
uint16 Mob::GetSpellIDFromSlot(uint8 slot)
int32 Mob::GetSpellIDFromSlot(uint8 slot)
{
if (IsValidSpell(buffs[slot].spellid)) {
return buffs[slot].spellid;
@@ -6293,7 +6293,7 @@ bool Mob::FindType(uint16 type, bool bOffensive, uint16 threshold) {
return false;
}
bool Mob::IsCombatProc(uint16 spell_id) {
bool Mob::IsCombatProc(int32 spell_id) {
if (RuleB(Spells, FocusCombatProcs)) {
return false;
@@ -6326,7 +6326,7 @@ bool Mob::IsCombatProc(uint16 spell_id) {
return false;
}
bool Mob::AddProcToWeapon(uint16 spell_id, bool bPerma, uint16 iChance, uint16 base_spell_id, int level_override, uint32 proc_reuse_time) {
bool Mob::AddProcToWeapon(int32 spell_id, bool bPerma, uint16 iChance, int32 base_spell_id, int level_override, uint32 proc_reuse_time) {
if(!IsValidSpell(spell_id)) {
return false;
}
@@ -6386,7 +6386,7 @@ bool Mob::AddProcToWeapon(uint16 spell_id, bool bPerma, uint16 iChance, uint16 b
return false;
}
bool Mob::RemoveProcFromWeapon(uint16 spell_id, bool bAll) {
bool Mob::RemoveProcFromWeapon(int32 spell_id, bool bAll) {
// Special case for Vampiric Embrace. If this is a Shadow Knight, the proc is different.
if (spell_id == SPELL_VAMPIRIC_EMBRACE && GetClass() == Class::ShadowKnight) {
spell_id = SPELL_VAMPIRIC_EMBRACE_OF_SHADOW;
@@ -6405,7 +6405,7 @@ bool Mob::RemoveProcFromWeapon(uint16 spell_id, bool bAll) {
return true;
}
bool Mob::AddDefensiveProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id, uint32 proc_reuse_time)
bool Mob::AddDefensiveProc(int32 spell_id, uint16 iChance, int32 base_spell_id, uint32 proc_reuse_time)
{
if(!IsValidSpell(spell_id))
return(false);
@@ -6425,7 +6425,7 @@ bool Mob::AddDefensiveProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id
return false;
}
bool Mob::RemoveDefensiveProc(uint16 spell_id, bool bAll)
bool Mob::RemoveDefensiveProc(int32 spell_id, bool bAll)
{
for (int i = 0; i < m_max_procs; i++) {
if (bAll || DefensiveProcs[i].spellID == spell_id) {
@@ -6439,7 +6439,7 @@ bool Mob::RemoveDefensiveProc(uint16 spell_id, bool bAll)
return true;
}
bool Mob::AddRangedProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id, uint32 proc_reuse_time)
bool Mob::AddRangedProc(int32 spell_id, uint16 iChance, int32 base_spell_id, uint32 proc_reuse_time)
{
if(!IsValidSpell(spell_id))
return(false);
@@ -6459,7 +6459,7 @@ bool Mob::AddRangedProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id, u
return false;
}
bool Mob::RemoveRangedProc(uint16 spell_id, bool bAll)
bool Mob::RemoveRangedProc(int32 spell_id, bool bAll)
{
for (int i = 0; i < m_max_procs; i++) {
if (bAll || RangedProcs[i].spellID == spell_id) {
@@ -6475,7 +6475,7 @@ bool Mob::RemoveRangedProc(uint16 spell_id, bool bAll)
// this is checked in a few places to decide wether special bard
// behavior should be used.
bool Mob::UseBardSpellLogic(uint16 spell_id, int slot)
bool Mob::UseBardSpellLogic(int32 spell_id, int slot)
{
if (!IsValidSpell(spell_id)) {
spell_id = casting_spell_id;
@@ -6494,7 +6494,7 @@ bool Mob::UseBardSpellLogic(uint16 spell_id, int slot)
);
}
int Mob::GetCasterLevel(uint16 spell_id) {
int Mob::GetCasterLevel(int32 spell_id) {
int level = GetLevel();
if (GetClass() == Class::Bard) {
// Bards receive effective casting level increases to resists/effect. They don't receive benefit from spells like intellectual superiority, however.
@@ -6599,7 +6599,7 @@ void Mob::SendPetBuffsToClient()
safe_delete(outapp);
}
void Mob::BuffModifyDurationBySpellID(uint16 spell_id, int32 newDuration)
void Mob::BuffModifyDurationBySpellID(int32 spell_id, int32 newDuration)
{
int buff_count = GetMaxTotalSlots();
for(int i = 0; i < buff_count; ++i)
@@ -6663,7 +6663,7 @@ void NPC::UninitializeBuffSlots()
safe_delete_array(buffs);
}
void Client::SendSpellAnim(uint16 target_id, uint16 spell_id)
void Client::SendSpellAnim(uint16 target_id, int32 spell_id)
{
if (!target_id || !IsValidSpell(spell_id)) {
return;
@@ -6886,7 +6886,7 @@ void Mob::CalcDestFromHeading(float heading, float distance, float MaxZDiff, flo
dZ = FindGroundZ(dX, dY, MaxZDiff);
}
void Mob::BeamDirectional(uint16 spell_id, int16 resist_adjust)
void Mob::BeamDirectional(int32 spell_id, int16 resist_adjust)
{
int maxtarget_count = 0;
bool beneficial_targets = false;
@@ -6970,7 +6970,7 @@ void Mob::BeamDirectional(uint16 spell_id, int16 resist_adjust)
}
}
void Mob::ConeDirectional(uint16 spell_id, int16 resist_adjust)
void Mob::ConeDirectional(int32 spell_id, int16 resist_adjust)
{
int maxtarget_count = 0;
bool beneficial_targets = false;
@@ -7150,7 +7150,7 @@ void Client::ResetAllCastbarCooldowns() {
}
}
void Client::ResetCastbarCooldownBySpellID(uint32 spell_id) {
void Client::ResetCastbarCooldownBySpellID(int32 spell_id) {
for (unsigned int i = 0; i < EQ::spells::SPELL_GEM_COUNT; ++i) {
if(IsValidSpell(m_pp.mem_spells[i]) && m_pp.mem_spells[i] == spell_id) {
m_pp.spellSlotRefresh[i] = 1;
zone/trap.h
+1 -1
View File
@@ -43,7 +43,7 @@ public:
virtual bool IsTrap() const { return true; }
void Trigger(Mob* trigger);
void SpellOnTarget(Mob* trigger, uint32 spell_id);
void SpellOnTarget(Mob* trigger, int32 spell_id);
NPC * GetHiddenTrigger() { return hiddenTrigger; }
void SetHiddenTrigger(NPC* n) { hiddenTrigger = n; }
zone/zone.cpp
+3 -3
View File
@@ -2277,7 +2277,7 @@ void Zone::ClearBlockedSpells()
zone_total_blocked_spells = 0;
}
bool Zone::IsSpellBlocked(uint32 spell_id, const glm::vec3 &location)
bool Zone::IsSpellBlocked(int32 spell_id, const glm::vec3 &location)
{
if (blocked_spells) {
bool exception = false;
@@ -2330,7 +2330,7 @@ bool Zone::IsSpellBlocked(uint32 spell_id, const glm::vec3 &location)
return false;
}
const char *Zone::GetSpellBlockedMessage(uint32 spell_id, const glm::vec3 &location)
const char *Zone::GetSpellBlockedMessage(int32 spell_id, const glm::vec3 &location)
{
if (blocked_spells) {
for (int x = 0; x < GetZoneTotalBlockedSpells(); x++) {
@@ -2379,7 +2379,7 @@ void Zone::LoadLDoNTraps()
t->id = e.id;
t->type = static_cast<LDoNChestTypes>(e.type);
t->spell_id = static_cast<uint32>(e.spell_id);
t->spell_id = e.spell_id;
t->skill = e.skill;
t->locked = e.locked;
zone/zone.h
+2 -2
View File
@@ -146,7 +146,7 @@ public:
bool IsHotzone() const { return (is_hotzone); }
bool IsLoaded();
bool IsPVPZone() { return pvpzone; }
bool IsSpellBlocked(uint32 spell_id, const glm::vec3 &location);
bool IsSpellBlocked(int32 spell_id, const glm::vec3 &location);
bool IsUCSServerAvailable() { return m_ucss_available; }
bool IsZone(uint32 zone_id, uint16 instance_id) const;
bool LoadGroundSpawns();
@@ -160,7 +160,7 @@ public:
char *adv_data;
const char *GetSpellBlockedMessage(uint32 spell_id, const glm::vec3 &location);
const char *GetSpellBlockedMessage(int32 spell_id, const glm::vec3 &location);
EQ::Random random;
EQTime zone_time;
zone/zonedb.cpp
+4 -4
View File
@@ -1221,7 +1221,7 @@ bool ZoneDatabase::SaveCharacterCurrency(uint32 character_id, PlayerProfile_Stru
);
}
bool ZoneDatabase::SaveCharacterMemorizedSpell(uint32 character_id, uint32 spell_id, uint32 slot_id){
bool ZoneDatabase::SaveCharacterMemorizedSpell(uint32 character_id, int32 spell_id, uint32 slot_id){
if (!IsValidSpell(spell_id)) {
return false;
}
@@ -1231,12 +1231,12 @@ bool ZoneDatabase::SaveCharacterMemorizedSpell(uint32 character_id, uint32 spell
CharacterMemmedSpellsRepository::CharacterMemmedSpells{
.id = character_id,
.slot_id = static_cast<uint16_t>(slot_id),
.spell_id = static_cast<uint16_t>(spell_id)
.spell_id = spell_id
}
);
}
bool ZoneDatabase::SaveCharacterSpell(uint32 character_id, uint32 spell_id, uint32 slot_id)
bool ZoneDatabase::SaveCharacterSpell(uint32 character_id, int32 spell_id, uint32 slot_id)
{
if (!IsValidSpell(spell_id)) {
return false;
@@ -1247,7 +1247,7 @@ bool ZoneDatabase::SaveCharacterSpell(uint32 character_id, uint32 spell_id, uint
CharacterSpellsRepository::CharacterSpells{
.id = character_id,
.slot_id = static_cast<uint16_t>(slot_id),
.spell_id = static_cast<uint16_t>(spell_id)
.spell_id = spell_id
}
);
}
zone/zonedb.h
+9 -9
View File
@@ -68,7 +68,7 @@ struct wplist {
#pragma pack(1)
struct DBnpcspells_entries_Struct {
uint16 spellid;
int32 spellid;
uint8 minlevel;
uint8 maxlevel;
uint32 type;
@@ -123,7 +123,7 @@ struct DBnpcspellseffects_Struct {
#pragma pack(1)
struct DBbotspells_entries_Struct {
uint16 spellid;
int32 spellid;
uint8 minlevel;
uint8 maxlevel;
uint32 type;
@@ -204,7 +204,7 @@ struct AuraRecord {
// Actual pet info for a client.
struct PetInfo {
uint16 SpellID;
int32 SpellID;
int16 petpower;
uint32 HP;
uint32 Mana;
@@ -216,7 +216,7 @@ struct PetInfo {
};
struct ZoneSpellsBlocked {
uint32 spellid;
int32 spellid;
int8 type;
glm::vec3 m_Location;
glm::vec3 m_Difference;
@@ -286,7 +286,7 @@ struct MercInfo {
struct MercSpellEntry {
uint8 proficiencyid;
uint16 spellid; // <= 0 = no spell
int32 spellid; // <= 0 = no spell
uint32 type; // 0 = never, must be one (and only one) of the defined values
int16 stance; // 0 = all, + = only this stance, - = all except this stance
uint8 minlevel;
@@ -470,10 +470,10 @@ public:
bool SaveCharacterLanguage(uint32 character_id, uint32 lang_id, uint32 value);
bool SaveCharacterLeadershipAbilities(uint32 character_id, PlayerProfile_Struct* pp);
bool SaveCharacterMaterialColor(uint32 character_id, uint8 slot_id, uint32 color);
bool SaveCharacterMemorizedSpell(uint32 character_id, uint32 spell_id, uint32 slot_id);
bool SaveCharacterMemorizedSpell(uint32 character_id, int32 spell_id, uint32 slot_id);
bool SaveCharacterPotionBelt(uint32 character_id, uint8 potion_id, uint32 item_id, uint32 icon);
bool SaveCharacterSkill(uint32 character_id, uint32 skill_id, uint32 value);
bool SaveCharacterSpell(uint32 character_id, uint32 spell_id, uint32 slot_id);
bool SaveCharacterSpell(uint32 character_id, int32 spell_id, uint32 slot_id);
void ZeroPlayerProfileCurrency(PlayerProfile_Struct* pp);
@@ -582,7 +582,7 @@ public:
bool GetBasePetItems(int32 equipmentset, uint32 *items);
BeastlordPetData::PetStruct GetBeastlordPetData(uint16 race_id);
uint32 GetMaxNPCSpellsEffectsID();
bool GetAuraEntry(uint16 spell_id, AuraRecord &record);
bool GetAuraEntry(int32 spell_id, AuraRecord &record);
void LoadGlobalLoot();
DBnpcspells_Struct* GetNPCSpells(uint32 npc_spells_id);
@@ -591,7 +591,7 @@ public:
const NPCType* LoadNPCTypesData(uint32 id, bool bulk_load = false);
/*Bots */
DBbotspells_Struct* GetBotSpells(uint32 bot_spell_id);
DBbotspells_Struct* GetBotSpells(int32 bot_spell_id);
void ClearBotSpells() { bot_spells_cache.clear(); bot_spells_loadtried.clear(); }
/* Mercs */