From 26c267db1bd92ba6c18293e41340750e63fa9f6e Mon Sep 17 00:00:00 2001 From: Alex King <89047260+Kinglykrab@users.noreply.github.com> Date: Mon, 27 Mar 2023 17:55:37 -0400 Subject: [PATCH] [Cleanup] "equipped" not "equiped", "dual" not "duel". (#3149) * [Cleanup] "equipped" not "equiped", "dual" not "duel". # Notes - These are spelled incorrectly. * Update spdat.h * Formatting further. * Update api_service.cpp --- common/spdat.h | 4 +- zone/api_service.cpp | 342 +++++++++++++++++++-------------------- zone/attack.cpp | 10 +- zone/bonuses.cpp | 14 +- zone/bot.cpp | 4 +- zone/client.cpp | 36 ++--- zone/client.h | 2 +- zone/lua_mob.cpp | 12 +- zone/lua_mob.h | 4 +- zone/mob.cpp | 113 +++++++------ zone/mob.h | 24 +-- zone/perl_mob.cpp | 12 +- zone/special_attacks.cpp | 2 +- zone/spell_effects.cpp | 6 +- zone/tune.cpp | 4 +- 15 files changed, 293 insertions(+), 296 deletions(-) diff --git a/common/spdat.h b/common/spdat.h index 0a9ce18b9..882077c73 100644 --- a/common/spdat.h +++ b/common/spdat.h @@ -504,7 +504,7 @@ enum SpellRestriction HAS_NO_ILLUSIONS_OF_GRANDEUR_BUFF = 12519, // IS_HP_ABOVE_50_PCT = 16010, // IS_HP_UNDER_50_PCT = 16031, // - IS_OFF_HAND_EQUIPED = 27672, // You must be wielding a weapon or shield in your offhand to use this ability. + IS_OFF_HAND_EQUIPPED = 27672, // You must be wielding a weapon or shield in your offhand to use this ability. HAS_NO_PACT_OF_FATE_RECOURSE_BUFF = 29556, // This spell will not work while Pact of Fate Recourse is active. | caster restriction | HAS_NO_SHROUD_OF_PRAYER_BUFF = 32339, // Your target cannot receive another Quiet Prayer this soon. IS_MANA_BELOW_20_PCT = 38311, // This ability requires you to be at or below 20% of your maximum mana. @@ -1211,7 +1211,7 @@ typedef enum { #define SE_Double_Backstab_Front 473 // implemented - Chance to double backstab from front #define SE_Pet_Crit_Melee_Damage_Pct_Owner 474 // implemenetd - Critical damage mod applied to pets from owner #define SE_Trigger_Spell_Non_Item 475 // implemented - Trigger spell on cast only if not from item click. -#define SE_Weapon_Stance 476 // implemented, @Misc, Apply a specific spell buffs automatically depending 2Hander, Shield or Duel Wield is equiped, base: spellid, base: 0=2H 1=Shield 2=DW, max: none +#define SE_Weapon_Stance 476 // implemented, @Misc, Apply a specific spell buffs automatically depending 2Hander, Shield or Dual Wield is equipped, base: spellid, base: 0=2H 1=Shield 2=DW, max: none #define SE_Hatelist_To_Top_Index 477 // Implemented - Chance to be set to top of rampage list #define SE_Hatelist_To_Tail_Index 478 // Implemented - Chance to be set to bottom of rampage list #define SE_Ff_Value_Min 479 // implemented, @Ff, Minimum base value of a spell that can be focused, base: spells to be focused base1 value diff --git a/zone/api_service.cpp b/zone/api_service.cpp index 2b2119533..8002c302d 100644 --- a/zone/api_service.cpp +++ b/zone/api_service.cpp @@ -402,177 +402,177 @@ Json::Value ApiGetMobListDetail(EQ::Net::WebsocketServerConnection *connection, /** * Rest */ - row["ac"] = mob->GetAC(); - row["ac_softcap"] = mob->GetACSoftcap(); - row["ac_sum"] = mob->ACSum(); - row["active_light_type"] = mob->GetActiveLightType(); - row["aggro_range"] = mob->GetAggroRange(); - row["allow_beneficial"] = mob->GetAllowBeneficial(); - row["animation"] = mob->GetAnimation(); - row["assist_range"] = mob->GetAssistRange(); - row["aura_slots"] = mob->GetAuraSlots(); - row["base_fear_speed"] = mob->GetBaseFearSpeed(); - row["base_runspeed"] = mob->GetBaseRunspeed(); - row["base_size"] = mob->GetBaseSize(); - row["base_walkspeed"] = mob->GetBaseWalkspeed(); - row["beard"] = mob->GetBeard(); - row["beard_color"] = mob->GetBeardColor(); - row["best_melee_skill"] = mob->GetBestMeleeSkill(); - row["calc_fear_resist_chance"] = mob->CalcFearResistChance(); - row["calc_resist_chance_bonus"] = mob->CalcResistChanceBonus(); - row["can_block_spell"] = mob->CanBlockSpell(); - row["can_facestab"] = mob->CanFacestab(); - row["casted_spell_inv_slot"] = mob->GetCastedSpellInvSlot(); - row["casting_spell_id"] = mob->CastingSpellID(); - row["charmed"] = mob->Charmed(); - row["check_last_los_state"] = mob->CheckLastLosState(); - row["class"] = mob->GetClass(); - row["class_level_factor"] = mob->GetClassLevelFactor(); - row["class_race_ac_bonus"] = mob->GetClassRaceACBonus(); - row["compute_defense"] = mob->compute_defense(); - row["count_dispellable_buffs"] = mob->CountDispellableBuffs(); - row["cripp_blow_chance"] = mob->GetCrippBlowChance(); - row["cur_wp"] = mob->GetCurWp(); - row["cwp"] = mob->GetCWP(); - row["cwpp"] = mob->GetCWPP(); - row["divine_aura"] = mob->DivineAura(); - row["dont_buff_me_before"] = mob->DontBuffMeBefore(); - row["dont_cure_me_before"] = mob->DontCureMeBefore(); - row["dont_dot_me_before"] = mob->DontDotMeBefore(); - row["dont_heal_me_before"] = mob->DontHealMeBefore(); - row["dont_root_me_before"] = mob->DontRootMeBefore(); - row["dont_snare_me_before"] = mob->DontSnareMeBefore(); - row["drakkin_details"] = mob->GetDrakkinDetails(); - row["drakkin_heritage"] = mob->GetDrakkinHeritage(); - row["drakkin_tattoo"] = mob->GetDrakkinTattoo(); - row["emote_id"] = mob->GetEmoteID(); - row["equipment_light_type"] = mob->GetEquipmentLightType(); - row["eye_color1"] = mob->GetEyeColor1(); - row["eye_color2"] = mob->GetEyeColor2(); - row["fear_speed"] = mob->GetFearSpeed(); - row["flurry_chance"] = mob->GetFlurryChance(); - row["follow_can_run"] = mob->GetFollowCanRun(); - row["follow_distance"] = mob->GetFollowDistance(); - row["follow_id"] = mob->GetFollowID(); - row["gender"] = mob->GetGender(); - row["hair_color"] = mob->GetHairColor(); - row["hair_style"] = mob->GetHairStyle(); - row["has_active_song"] = mob->HasActiveSong(); - row["has_assist_aggro"] = mob->HasAssistAggro(); - row["has_died"] = mob->HasDied(); - row["has_disc_buff"] = mob->HasDiscBuff(); - row["has_endur_upkeep"] = mob->HasEndurUpkeep(); - row["has_free_aura_slots"] = mob->HasFreeAuraSlots(); - row["has_free_trap_slots"] = mob->HasFreeTrapSlots(); - row["has_mgb"] = mob->HasMGB(); - row["has_numhits"] = mob->HasNumhits(); - row["has_pet"] = mob->HasPet(); - row["has_pet_affinity"] = mob->HasPetAffinity(); - row["has_primary_aggro"] = mob->HasPrimaryAggro(); - row["has_project_illusion"] = mob->HasProjectIllusion(); - row["has_projectile_attack"] = mob->HasProjectileAttack(); - row["has_shield_equiped"] = mob->HasShieldEquiped(); - row["has_special_abilities"] = mob->HasSpecialAbilities(); - row["has_tar_reflection"] = mob->HasTargetReflection(); - row["has_temp_pets_active"] = mob->HasTempPetsActive(); - row["has_two_hand_blunt_equiped"] = mob->HasTwoHandBluntEquiped(); - row["has_two_hander_equipped"] = mob->HasTwoHanderEquipped(); - row["hate_summon"] = mob->HateSummon(); - row["helm_texture"] = mob->GetHelmTexture(); - row["hp"] = mob->GetHP(); - row["improved_taunt"] = mob->ImprovedTaunt(); - row["innate_light_type"] = mob->GetInnateLightType(); - row["is_ai_controlled"] = mob->IsAIControlled(); - row["is_amnesiad"] = mob->IsAmnesiad(); - row["is_animation"] = mob->IsAnimation(); - row["is_blind"] = mob->IsBlind(); - row["is_casting"] = mob->IsCasting(); - row["is_charmed"] = mob->IsCharmed(); - row["is_destructible_object"] = mob->IsDestructibleObject(); - row["is_engaged"] = mob->IsEngaged(); - row["is_enraged"] = mob->IsEnraged(); - row["is_familiar"] = mob->IsFamiliar(); - row["is_feared"] = mob->IsFeared(); - row["is_findable"] = mob->IsFindable(); - row["is_focused"] = mob->IsFocused(); - row["is_g_held"] = mob->IsGHeld(); - row["is_grouped"] = mob->IsGrouped(); - row["is_held"] = mob->IsHeld(); - row["is_looting"] = mob->IsLooting(); - row["is_melee_disabled"] = mob->IsMeleeDisabled(); - row["is_mezzed"] = mob->IsMezzed(); - row["is_moved"] = mob->IsMoved(); - row["is_moving"] = mob->IsMoving(); - row["is_no_cast"] = mob->IsNoCast(); - row["is_off_hand_atk"] = mob->IsOffHandAtk(); - row["is_pet_owner_client"] = mob->IsPetOwnerClient(); - row["is_pet_regroup"] = mob->IsPetRegroup(); - row["is_pet_stop"] = mob->IsPetStop(); - row["is_pseudo_rooted"] = mob->IsPseudoRooted(); - row["is_raid_grouped"] = mob->IsRaidGrouped(); - row["is_rare_spawn"] = mob->IsRareSpawn(); - row["is_roamer"] = mob->IsRoamer(); - row["is_rooted"] = mob->IsRooted(); - row["is_running"] = mob->IsRunning(); - row["is_silenced"] = mob->IsSilenced(); - row["is_stunned"] = mob->IsStunned(); - row["is_tar_lock_pet"] = mob->IsTargetLockPet(); - row["is_tarable"] = mob->IsTargetable(); - row["is_tared"] = mob->IsTargeted(); - row["is_temp_pet"] = mob->IsTempPet(); - row["is_trackable"] = mob->IsTrackable(); - row["item_hp_bonuses"] = mob->GetItemHPBonuses(); - row["last_name"] = mob->GetLastName(); - row["level"] = mob->GetLevel(); - row["luclin_face"] = mob->GetLuclinFace(); - row["mana"] = mob->GetMana(); - row["mana_percent"] = mob->GetManaPercent(); - row["mana_ratio"] = mob->GetManaRatio(); - row["max_hp"] = mob->GetMaxHP(); - row["max_mana"] = mob->GetMaxMana(); - row["melee_mitigation"] = mob->GetMeleeMitigation(); - row["mitigation_ac"] = mob->GetMitigationAC(); - row["movespeed"] = mob->GetMovespeed(); - row["name"] = mob->GetName(); - row["next_hp_event"] = mob->GetNextHPEvent(); - row["next_inc_hp_event"] = mob->GetNextIncHPEvent(); - row["npc_assist_cap"] = mob->NPCAssistCap(); - row["npc_type_id"] = mob->GetNPCTypeID(); - row["orig_level"] = mob->GetOrigLevel(); - row["orig_name"] = mob->GetOrigName(); - row["owner_id"] = mob->GetOwnerID(); - row["pet_id"] = mob->GetPetID(); - row["pet_power"] = mob->GetPetPower(); - row["pet_tar_lock_id"] = mob->GetPetTargetLockID(); - row["qglobal"] = mob->GetQglobal(); - row["race"] = mob->GetRace(); - row["run_anim_speed"] = mob->GetRunAnimSpeed(); - row["sanctuary"] = mob->Sanctuary(); - row["see_hide"] = mob->SeeHide(); - row["see_improved_hide"] = mob->SeeImprovedHide(); - row["see_invisible"] = mob->SeeInvisible(); - row["see_invisible_undead"] = mob->SeeInvisibleUndead(); - row["size"] = mob->GetSize(); - row["slow_mitigation"] = mob->GetSlowMitigation(); - row["snared_amount"] = mob->GetSnaredAmount(); - row["spawned"] = mob->Spawned(); - row["spell_hp_bonuses"] = mob->GetSpellHPBonuses(); - row["spell_light_type"] = mob->GetSpellLightType(); - row["spell_power_distance_mod"] = mob->GetSpellPowerDistanceMod(); - row["spell_x"] = mob->GetSpellX(); - row["spell_y"] = mob->GetSpellY(); - row["spell_z"] = mob->GetSpellZ(); - row["tar_ring_x"] = mob->GetTargetRingX(); - row["tar_ring_y"] = mob->GetTargetRingY(); - row["tar_ring_z"] = mob->GetTargetRingZ(); - row["temp_pet_count"] = mob->GetTempPetCount(); - row["texture"] = mob->GetTexture(); - row["trap_slots"] = mob->GetTrapSlots(); - row["try_death_save"] = mob->TryDeathSave(); - row["try_divine_save"] = mob->TryDivineSave(); - row["try_spell_on_death"] = mob->TrySpellOnDeath(); - row["update_active_light"] = mob->UpdateActiveLight(); - row["wander_type"] = mob->GetWanderType(); + row["ac"] = mob->GetAC(); + row["ac_softcap"] = mob->GetACSoftcap(); + row["ac_sum"] = mob->ACSum(); + row["active_light_type"] = mob->GetActiveLightType(); + row["aggro_range"] = mob->GetAggroRange(); + row["allow_beneficial"] = mob->GetAllowBeneficial(); + row["animation"] = mob->GetAnimation(); + row["assist_range"] = mob->GetAssistRange(); + row["aura_slots"] = mob->GetAuraSlots(); + row["base_fear_speed"] = mob->GetBaseFearSpeed(); + row["base_runspeed"] = mob->GetBaseRunspeed(); + row["base_size"] = mob->GetBaseSize(); + row["base_walkspeed"] = mob->GetBaseWalkspeed(); + row["beard"] = mob->GetBeard(); + row["beard_color"] = mob->GetBeardColor(); + row["best_melee_skill"] = mob->GetBestMeleeSkill(); + row["calc_fear_resist_chance"] = mob->CalcFearResistChance(); + row["calc_resist_chance_bonus"] = mob->CalcResistChanceBonus(); + row["can_block_spell"] = mob->CanBlockSpell(); + row["can_facestab"] = mob->CanFacestab(); + row["casted_spell_inv_slot"] = mob->GetCastedSpellInvSlot(); + row["casting_spell_id"] = mob->CastingSpellID(); + row["charmed"] = mob->Charmed(); + row["check_last_los_state"] = mob->CheckLastLosState(); + row["class"] = mob->GetClass(); + row["class_level_factor"] = mob->GetClassLevelFactor(); + row["class_race_ac_bonus"] = mob->GetClassRaceACBonus(); + row["compute_defense"] = mob->compute_defense(); + row["count_dispellable_buffs"] = mob->CountDispellableBuffs(); + row["cripp_blow_chance"] = mob->GetCrippBlowChance(); + row["cur_wp"] = mob->GetCurWp(); + row["cwp"] = mob->GetCWP(); + row["cwpp"] = mob->GetCWPP(); + row["divine_aura"] = mob->DivineAura(); + row["dont_buff_me_before"] = mob->DontBuffMeBefore(); + row["dont_cure_me_before"] = mob->DontCureMeBefore(); + row["dont_dot_me_before"] = mob->DontDotMeBefore(); + row["dont_heal_me_before"] = mob->DontHealMeBefore(); + row["dont_root_me_before"] = mob->DontRootMeBefore(); + row["dont_snare_me_before"] = mob->DontSnareMeBefore(); + row["drakkin_details"] = mob->GetDrakkinDetails(); + row["drakkin_heritage"] = mob->GetDrakkinHeritage(); + row["drakkin_tattoo"] = mob->GetDrakkinTattoo(); + row["emote_id"] = mob->GetEmoteID(); + row["equipment_light_type"] = mob->GetEquipmentLightType(); + row["eye_color1"] = mob->GetEyeColor1(); + row["eye_color2"] = mob->GetEyeColor2(); + row["fear_speed"] = mob->GetFearSpeed(); + row["flurry_chance"] = mob->GetFlurryChance(); + row["follow_can_run"] = mob->GetFollowCanRun(); + row["follow_distance"] = mob->GetFollowDistance(); + row["follow_id"] = mob->GetFollowID(); + row["gender"] = mob->GetGender(); + row["hair_color"] = mob->GetHairColor(); + row["hair_style"] = mob->GetHairStyle(); + row["has_active_song"] = mob->HasActiveSong(); + row["has_assist_aggro"] = mob->HasAssistAggro(); + row["has_died"] = mob->HasDied(); + row["has_disc_buff"] = mob->HasDiscBuff(); + row["has_endur_upkeep"] = mob->HasEndurUpkeep(); + row["has_free_aura_slots"] = mob->HasFreeAuraSlots(); + row["has_free_trap_slots"] = mob->HasFreeTrapSlots(); + row["has_mgb"] = mob->HasMGB(); + row["has_numhits"] = mob->HasNumhits(); + row["has_pet"] = mob->HasPet(); + row["has_pet_affinity"] = mob->HasPetAffinity(); + row["has_primary_aggro"] = mob->HasPrimaryAggro(); + row["has_project_illusion"] = mob->HasProjectIllusion(); + row["has_projectile_attack"] = mob->HasProjectileAttack(); + row["has_shield_equipped"] = mob->HasShieldEquipped(); + row["has_special_abilities"] = mob->HasSpecialAbilities(); + row["has_tar_reflection"] = mob->HasTargetReflection(); + row["has_temp_pets_active"] = mob->HasTempPetsActive(); + row["has_two_hand_blunt_equipped"] = mob->HasTwoHandBluntEquipped(); + row["has_two_hander_equipped"] = mob->HasTwoHanderEquipped(); + row["hate_summon"] = mob->HateSummon(); + row["helm_texture"] = mob->GetHelmTexture(); + row["hp"] = mob->GetHP(); + row["improved_taunt"] = mob->ImprovedTaunt(); + row["innate_light_type"] = mob->GetInnateLightType(); + row["is_ai_controlled"] = mob->IsAIControlled(); + row["is_amnesiad"] = mob->IsAmnesiad(); + row["is_animation"] = mob->IsAnimation(); + row["is_blind"] = mob->IsBlind(); + row["is_casting"] = mob->IsCasting(); + row["is_charmed"] = mob->IsCharmed(); + row["is_destructible_object"] = mob->IsDestructibleObject(); + row["is_engaged"] = mob->IsEngaged(); + row["is_enraged"] = mob->IsEnraged(); + row["is_familiar"] = mob->IsFamiliar(); + row["is_feared"] = mob->IsFeared(); + row["is_findable"] = mob->IsFindable(); + row["is_focused"] = mob->IsFocused(); + row["is_g_held"] = mob->IsGHeld(); + row["is_grouped"] = mob->IsGrouped(); + row["is_held"] = mob->IsHeld(); + row["is_looting"] = mob->IsLooting(); + row["is_melee_disabled"] = mob->IsMeleeDisabled(); + row["is_mezzed"] = mob->IsMezzed(); + row["is_moved"] = mob->IsMoved(); + row["is_moving"] = mob->IsMoving(); + row["is_no_cast"] = mob->IsNoCast(); + row["is_off_hand_atk"] = mob->IsOffHandAtk(); + row["is_pet_owner_client"] = mob->IsPetOwnerClient(); + row["is_pet_regroup"] = mob->IsPetRegroup(); + row["is_pet_stop"] = mob->IsPetStop(); + row["is_pseudo_rooted"] = mob->IsPseudoRooted(); + row["is_raid_grouped"] = mob->IsRaidGrouped(); + row["is_rare_spawn"] = mob->IsRareSpawn(); + row["is_roamer"] = mob->IsRoamer(); + row["is_rooted"] = mob->IsRooted(); + row["is_running"] = mob->IsRunning(); + row["is_silenced"] = mob->IsSilenced(); + row["is_stunned"] = mob->IsStunned(); + row["is_tar_lock_pet"] = mob->IsTargetLockPet(); + row["is_tarable"] = mob->IsTargetable(); + row["is_tared"] = mob->IsTargeted(); + row["is_temp_pet"] = mob->IsTempPet(); + row["is_trackable"] = mob->IsTrackable(); + row["item_hp_bonuses"] = mob->GetItemHPBonuses(); + row["last_name"] = mob->GetLastName(); + row["level"] = mob->GetLevel(); + row["luclin_face"] = mob->GetLuclinFace(); + row["mana"] = mob->GetMana(); + row["mana_percent"] = mob->GetManaPercent(); + row["mana_ratio"] = mob->GetManaRatio(); + row["max_hp"] = mob->GetMaxHP(); + row["max_mana"] = mob->GetMaxMana(); + row["melee_mitigation"] = mob->GetMeleeMitigation(); + row["mitigation_ac"] = mob->GetMitigationAC(); + row["movespeed"] = mob->GetMovespeed(); + row["name"] = mob->GetName(); + row["next_hp_event"] = mob->GetNextHPEvent(); + row["next_inc_hp_event"] = mob->GetNextIncHPEvent(); + row["npc_assist_cap"] = mob->NPCAssistCap(); + row["npc_type_id"] = mob->GetNPCTypeID(); + row["orig_level"] = mob->GetOrigLevel(); + row["orig_name"] = mob->GetOrigName(); + row["owner_id"] = mob->GetOwnerID(); + row["pet_id"] = mob->GetPetID(); + row["pet_power"] = mob->GetPetPower(); + row["pet_tar_lock_id"] = mob->GetPetTargetLockID(); + row["qglobal"] = mob->GetQglobal(); + row["race"] = mob->GetRace(); + row["run_anim_speed"] = mob->GetRunAnimSpeed(); + row["sanctuary"] = mob->Sanctuary(); + row["see_hide"] = mob->SeeHide(); + row["see_improved_hide"] = mob->SeeImprovedHide(); + row["see_invisible"] = mob->SeeInvisible(); + row["see_invisible_undead"] = mob->SeeInvisibleUndead(); + row["size"] = mob->GetSize(); + row["slow_mitigation"] = mob->GetSlowMitigation(); + row["snared_amount"] = mob->GetSnaredAmount(); + row["spawned"] = mob->Spawned(); + row["spell_hp_bonuses"] = mob->GetSpellHPBonuses(); + row["spell_light_type"] = mob->GetSpellLightType(); + row["spell_power_distance_mod"] = mob->GetSpellPowerDistanceMod(); + row["spell_x"] = mob->GetSpellX(); + row["spell_y"] = mob->GetSpellY(); + row["spell_z"] = mob->GetSpellZ(); + row["tar_ring_x"] = mob->GetTargetRingX(); + row["tar_ring_y"] = mob->GetTargetRingY(); + row["tar_ring_z"] = mob->GetTargetRingZ(); + row["temp_pet_count"] = mob->GetTempPetCount(); + row["texture"] = mob->GetTexture(); + row["trap_slots"] = mob->GetTrapSlots(); + row["try_death_save"] = mob->TryDeathSave(); + row["try_divine_save"] = mob->TryDivineSave(); + row["try_spell_on_death"] = mob->TrySpellOnDeath(); + row["update_active_light"] = mob->UpdateActiveLight(); + row["wander_type"] = mob->GetWanderType(); response.append(row); } diff --git a/zone/attack.cpp b/zone/attack.cpp index a87862506..c0f7f3cc3 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -592,7 +592,7 @@ bool Mob::AvoidDamage(Mob *other, DamageHitInfo &hit) } // Try Shield Block OR TwoHandBluntBlockCheck - if (HasShieldEquiped() && (aabonuses.ShieldBlock || spellbonuses.ShieldBlock || itembonuses.ShieldBlock) && (InFront || bBlockFromRear)) { + if (HasShieldEquipped() && (aabonuses.ShieldBlock || spellbonuses.ShieldBlock || itembonuses.ShieldBlock) && (InFront || bBlockFromRear)) { int chance = aabonuses.ShieldBlock + spellbonuses.ShieldBlock + itembonuses.ShieldBlock; if (counter_block || counter_all) { float counter = (counter_block + counter_all) / 100.0f; @@ -604,7 +604,7 @@ bool Mob::AvoidDamage(Mob *other, DamageHitInfo &hit) } } - if (HasTwoHandBluntEquiped() && (aabonuses.TwoHandBluntBlock || spellbonuses.TwoHandBluntBlock || itembonuses.TwoHandBluntBlock) && (InFront || bBlockFromRear)) { + if (HasTwoHandBluntEquipped() && (aabonuses.TwoHandBluntBlock || spellbonuses.TwoHandBluntBlock || itembonuses.TwoHandBluntBlock) && (InFront || bBlockFromRear)) { int chance = aabonuses.TwoHandBluntBlock + itembonuses.TwoHandBluntBlock + spellbonuses.TwoHandBluntBlock; if (counter_block || counter_all) { float counter = (counter_block + counter_all) / 100.0f; @@ -874,7 +874,7 @@ int Mob::ACSum(bool skip_caps) int ac = 0; // this should be base AC whenever shrouds come around ac += itembonuses.AC; // items + food + tribute int shield_ac = 0; - if (HasShieldEquiped() && IsOfClientBot()) { + if (HasShieldEquipped() && IsOfClientBot()) { auto inst = (IsClient()) ? GetInv().GetItem(EQ::invslot::slotSecondary) : CastToBot()->GetBotItem(EQ::invslot::slotSecondary); if (inst) { if (inst->GetItemRecommendedLevel(true) <= GetLevel()) { @@ -1555,7 +1555,7 @@ bool Mob::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool if (Hand == EQ::invslot::slotPrimary || Hand == EQ::invslot::slotSecondary) my_hit.base_damage = DoDamageCaps(my_hit.base_damage); auto shield_inc = spellbonuses.ShieldEquipDmgMod + itembonuses.ShieldEquipDmgMod + aabonuses.ShieldEquipDmgMod; - if (shield_inc > 0 && HasShieldEquiped() && Hand == EQ::invslot::slotPrimary) { + if (shield_inc > 0 && HasShieldEquipped() && Hand == EQ::invslot::slotPrimary) { my_hit.base_damage = my_hit.base_damage * (100 + shield_inc) / 100; hate = hate * (100 + shield_inc) / 100; } @@ -5995,7 +5995,7 @@ void Mob::DoShieldDamageOnShielder(Mob *shield_target, int64 hit_damage_done, EQ } int mitigation = shielder->GetShielderMitigation(); //Default shielder mitigates 25 pct of damage taken, this can be increased up to max 50 by equipping a shield item - if (shielder->IsClient() && shielder->HasShieldEquiped()) { + if (shielder->IsClient() && shielder->HasShieldEquipped()) { EQ::ItemInstance* inst = shielder->CastToClient()->GetInv().GetItem(EQ::invslot::slotSecondary); if (inst) { const EQ::ItemData* shield = inst->GetItem(); diff --git a/zone/bonuses.cpp b/zone/bonuses.cpp index b6921d108..1eccc779b 100644 --- a/zone/bonuses.cpp +++ b/zone/bonuses.cpp @@ -145,10 +145,10 @@ int Mob::CalcRecommendedLevelBonus(uint8 current_level, uint8 recommended_level, void Mob::CalcItemBonuses(StatBonuses* b) { ClearItemFactionBonuses(); - SetShieldEquiped(false); - SetTwoHandBluntEquiped(false); + SetShieldEquipped(false); + SetTwoHandBluntEquipped(false); SetTwoHanderEquipped(false); - SetDuelWeaponsEquiped(false); + SetDualWeaponsEquipped(false); int16 i; @@ -178,13 +178,13 @@ void Mob::CalcItemBonuses(StatBonuses* b) { item->ItemType == EQ::item::ItemTypeShield && i == EQ::invslot::slotSecondary ) { - SetShieldEquiped(true); + SetShieldEquipped(true); } else if ( item && item->ItemType == EQ::item::ItemType2HBlunt && i == EQ::invslot::slotPrimary ) { - SetTwoHandBluntEquiped(true); + SetTwoHandBluntEquipped(true); SetTwoHanderEquipped(true); } else if ( item && @@ -196,7 +196,7 @@ void Mob::CalcItemBonuses(StatBonuses* b) { } if (CanThisClassDualWield()) { - SetDuelWeaponsEquiped(true); + SetDualWeaponsEquipped(true); } if (IsOfClientBot()) { @@ -5864,4 +5864,4 @@ float Mob::CheckHeroicBonusesDataBuckets(std::string bucket_name) } return Strings::ToFloat(bucket_value); -} \ No newline at end of file +} diff --git a/zone/bot.cpp b/zone/bot.cpp index 1a742ec73..ec74648a0 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -1112,7 +1112,7 @@ void Bot::GenerateAppearance() { uint16 Bot::GetPrimarySkillValue() { EQ::skills::SkillType skill = EQ::skills::HIGHEST_SKILL; //because nullptr == 0, which is 1H Slashing, & we want it to return 0 from GetSkill - if (bool equiped = m_inv.GetItem(EQ::invslot::slotPrimary); !equiped) { + if (bool equipped = m_inv.GetItem(EQ::invslot::slotPrimary); !equipped) { skill = EQ::skills::SkillHandtoHand; } else { uint8 type = m_inv.GetItem(EQ::invslot::slotPrimary)->GetItem()->ItemType; //is this the best way to do this? @@ -4870,7 +4870,7 @@ int Bot::GetBaseSkillDamage(EQ::skills::SkillType skill, Mob *target) float skill_bonus = skill_level / 10.0f; float ac_bonus = 0.0f; const EQ::ItemInstance *inst = nullptr; - if (HasShieldEquiped()) + if (HasShieldEquipped()) inst = GetBotItem(EQ::invslot::slotSecondary); else if (HasTwoHanderEquipped()) inst = GetBotItem(EQ::invslot::slotPrimary); diff --git a/zone/client.cpp b/zone/client.cpp index 7b87af474..0b4104326 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -806,7 +806,7 @@ void Client::QueuePacket(const EQApplicationPacket* app, bool ack_req, CLIENT_CO AddPacket(app, ack_req); return; } - + // if the program doesnt care about the status or if the status isnt what we requested if (required_state != CLIENT_CONNECTINGALL && client_state != required_state) { // todo: save packets for later use @@ -825,7 +825,7 @@ void Client::FastQueuePacket(EQApplicationPacket** app, bool ack_req, CLIENT_CON return; } else { - if(eqs) + if(eqs) eqs->FastQueuePacket((EQApplicationPacket **)app, ack_req); else if (app && (*app)) delete *app; @@ -1328,7 +1328,7 @@ void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num cm->chan_num = chan_num; strcpy(&cm->message[0], buffer); - + QueuePacket(&app); bool senderCanTrainSelf = RuleB(Client, SelfLanguageLearning); @@ -4323,9 +4323,9 @@ bool Client::GroupFollow(Client* inviter) { uint16 Client::GetPrimarySkillValue() { EQ::skills::SkillType skill = EQ::skills::HIGHEST_SKILL; //because nullptr == 0, which is 1H Slashing, & we want it to return 0 from GetSkill - bool equiped = m_inv.GetItem(EQ::invslot::slotPrimary); + bool equipped = m_inv.GetItem(EQ::invslot::slotPrimary); - if (!equiped) + if (!equipped) skill = EQ::skills::SkillHandtoHand; else { @@ -10710,11 +10710,11 @@ void Client::ApplyWeaponsStance() FindBuff(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_2H])) { BuffFadeBySpellID(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_2H]); } - else if (!HasShieldEquiped() && IsBuffSpell(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD]) && + else if (!HasShieldEquipped() && IsBuffSpell(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD]) && FindBuff(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD])) { BuffFadeBySpellID(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD]); } - else if (!HasDualWeaponsEquiped() && + else if (!HasDualWeaponsEquipped() && IsBuffSpell(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD]) && FindBuff(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD])) { BuffFadeBySpellID(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD]); @@ -10726,14 +10726,14 @@ void Client::ApplyWeaponsStance() } weaponstance.spellbonus_buff_spell_id = spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_2H]; } - else if (HasShieldEquiped() && IsBuffSpell(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD])) { + else if (HasShieldEquipped() && IsBuffSpell(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD])) { if (!FindBuff(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD])) { SpellOnTarget(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD], this); } weaponstance.spellbonus_buff_spell_id = spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD]; } - else if (HasDualWeaponsEquiped() && IsBuffSpell(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD])) { + else if (HasDualWeaponsEquipped() && IsBuffSpell(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD])) { if (!FindBuff(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD])) { SpellOnTarget(spellbonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD], this); @@ -10776,11 +10776,11 @@ void Client::ApplyWeaponsStance() FindBuff(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_2H])) { BuffFadeBySpellID(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_2H]); } - else if (!HasShieldEquiped() && IsBuffSpell(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD]) && + else if (!HasShieldEquipped() && IsBuffSpell(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD]) && FindBuff(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD])) { BuffFadeBySpellID(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD]); } - else if (!HasDualWeaponsEquiped() && IsBuffSpell(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD]) && + else if (!HasDualWeaponsEquipped() && IsBuffSpell(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD]) && FindBuff(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD])) { BuffFadeBySpellID(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD]); } @@ -10793,14 +10793,14 @@ void Client::ApplyWeaponsStance() } weaponstance.itembonus_buff_spell_id = itembonuses.WeaponStance[WEAPON_STANCE_TYPE_2H]; } - else if (HasShieldEquiped() && IsBuffSpell(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD])) { + else if (HasShieldEquipped() && IsBuffSpell(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD])) { if (!FindBuff(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD])) { SpellOnTarget(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD], this); } weaponstance.itembonus_buff_spell_id = itembonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD]; } - else if (HasDualWeaponsEquiped() && IsBuffSpell(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD])) { + else if (HasDualWeaponsEquipped() && IsBuffSpell(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD])) { if (!FindBuff(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD])) { SpellOnTarget(itembonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD], this); } @@ -10833,12 +10833,12 @@ void Client::ApplyWeaponsStance() BuffFadeBySpellID(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_2H]); } - else if (!HasShieldEquiped() && IsBuffSpell(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD]) && + else if (!HasShieldEquipped() && IsBuffSpell(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD]) && FindBuff(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD])) { BuffFadeBySpellID(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD]); } - else if (!HasDualWeaponsEquiped() && IsBuffSpell(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD]) && + else if (!HasDualWeaponsEquipped() && IsBuffSpell(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD]) && FindBuff(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD])) { BuffFadeBySpellID(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD]); } @@ -10851,14 +10851,14 @@ void Client::ApplyWeaponsStance() weaponstance.aabonus_buff_spell_id = aabonuses.WeaponStance[WEAPON_STANCE_TYPE_2H]; } - else if (HasShieldEquiped() && IsBuffSpell(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD])) { + else if (HasShieldEquipped() && IsBuffSpell(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD])) { if (!FindBuff(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD])) { SpellOnTarget(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD], this); } weaponstance.aabonus_buff_spell_id = aabonuses.WeaponStance[WEAPON_STANCE_TYPE_SHIELD]; } - else if (HasDualWeaponsEquiped() && IsBuffSpell(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD])) { + else if (HasDualWeaponsEquipped() && IsBuffSpell(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD])) { if (!FindBuff(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD])) { SpellOnTarget(aabonuses.WeaponStance[WEAPON_STANCE_TYPE_DUAL_WIELD], this); @@ -12174,4 +12174,4 @@ void Client::PlayerTradeEventLog(Trade *t, Trade *t2) RecordPlayerEventLogWithClient(trader, PlayerEvent::TRADE, e); RecordPlayerEventLogWithClient(trader2, PlayerEvent::TRADE, e); -} \ No newline at end of file +} diff --git a/zone/client.h b/zone/client.h index db63a5b24..a5b124639 100644 --- a/zone/client.h +++ b/zone/client.h @@ -588,7 +588,7 @@ public: //This calculates total Attack Rating to match very close to what the client should show uint32 GetTotalATK(); uint32 GetATKRating(); - //This gets the skill value of the item type equiped in the Primary Slot + //This gets the skill value of the item type equipped in the Primary Slot uint16 GetPrimarySkillValue(); bool Flurry(); diff --git a/zone/lua_mob.cpp b/zone/lua_mob.cpp index 869c2e2dd..3fff021d6 100644 --- a/zone/lua_mob.cpp +++ b/zone/lua_mob.cpp @@ -2170,14 +2170,14 @@ bool Lua_Mob::IsTargetable() { return self->IsTargetable(); } -bool Lua_Mob::HasShieldEquiped() { +bool Lua_Mob::HasShieldEquipped() { Lua_Safe_Call_Bool(); - return self->HasShieldEquiped(); + return self->HasShieldEquipped(); } -bool Lua_Mob::HasTwoHandBluntEquiped() { +bool Lua_Mob::HasTwoHandBluntEquipped() { Lua_Safe_Call_Bool(); - return self->HasTwoHandBluntEquiped(); + return self->HasTwoHandBluntEquipped(); } bool Lua_Mob::HasTwoHanderEquipped() { @@ -3321,9 +3321,9 @@ luabind::scope lua_register_mob() { .def("HasOwner", (bool(Lua_Mob::*)(void))&Lua_Mob::HasOwner) .def("HasPet", (bool(Lua_Mob::*)(void))&Lua_Mob::HasPet) .def("HasProcs", &Lua_Mob::HasProcs) - .def("HasShieldEquiped", (bool(Lua_Mob::*)(void))&Lua_Mob::HasShieldEquiped) + .def("HasShieldEquipped", (bool(Lua_Mob::*)(void))&Lua_Mob::HasShieldEquipped) .def("HasTimer", &Lua_Mob::HasTimer) - .def("HasTwoHandBluntEquiped", (bool(Lua_Mob::*)(void))&Lua_Mob::HasTwoHandBluntEquiped) + .def("HasTwoHandBluntEquipped", (bool(Lua_Mob::*)(void))&Lua_Mob::HasTwoHandBluntEquipped) .def("HasTwoHanderEquipped", (bool(Lua_Mob::*)(void))&Lua_Mob::HasTwoHanderEquipped) .def("Heal", &Lua_Mob::Heal) .def("HealDamage", (void(Lua_Mob::*)(uint64))&Lua_Mob::HealDamage) diff --git a/zone/lua_mob.h b/zone/lua_mob.h index 832bc2ca2..cc833582e 100644 --- a/zone/lua_mob.h +++ b/zone/lua_mob.h @@ -431,8 +431,8 @@ public: uint8 GetNimbusEffect2(); uint8 GetNimbusEffect3(); bool IsTargetable(); - bool HasShieldEquiped(); - bool HasTwoHandBluntEquiped(); + bool HasShieldEquipped(); + bool HasTwoHandBluntEquipped(); bool HasTwoHanderEquipped(); uint32 GetHerosForgeModel(uint8 material_slot); uint32 IsEliteMaterialItem(uint8 material_slot); diff --git a/zone/mob.cpp b/zone/mob.cpp index e80fcda27..8a049a7dc 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -131,36 +131,40 @@ Mob::Mob( mMovementManager = &MobMovementManager::Get(); mMovementManager->AddMob(this); - targeted = 0; + targeted = 0; currently_fleeing = false; AI_Init(); SetMoving(false); - moved = false; - turning = false; - m_RewindLocation = glm::vec3(); + + moved = false; + turning = false; + m_RewindLocation = glm::vec3(); m_RelativePosition = glm::vec4(); - name[0] = 0; + name[0] = 0; orig_name[0] = 0; clean_name[0] = 0; lastname[0] = 0; + if (in_name) { strn0cpy(name, in_name, 64); strn0cpy(orig_name, in_name, 64); } + if (in_lastname) { strn0cpy(lastname, in_lastname, 64); } - current_hp = in_cur_hp; + + current_hp = in_cur_hp; max_hp = in_max_hp; base_hp = in_max_hp; gender = in_gender; race = in_race; base_gender = in_gender; base_race = in_race; - use_model = in_usemodel; + use_model = in_usemodel; class_ = in_class; bodytype = in_bodytype; orig_bodytype = in_bodytype; @@ -185,8 +189,7 @@ Mob::Mob( fearspeed = 0.625f; base_fearspeed = 25; // npcs - } - else { + } else { base_walkspeed = base_runspeed * 100 / 265; walkspeed = ((float) base_walkspeed) * 0.025f; base_fearspeed = base_runspeed * 100 / 127; @@ -200,7 +203,6 @@ Mob::Mob( m_PlayerState = 0; - // sanity check if (runspeed < 0 || runspeed > 20) { runspeed = 1.25f; @@ -220,38 +222,33 @@ Mob::Mob( feettexture = in_feettexture; multitexture = (armtexture || bracertexture || handtexture || legtexture || feettexture); - haircolor = in_haircolor; - beardcolor = in_beardcolor; - eyecolor1 = in_eyecolor1; - eyecolor2 = in_eyecolor2; - hairstyle = in_hairstyle; - luclinface = in_luclinface; - beard = in_beard; - drakkin_heritage = in_drakkin_heritage; - drakkin_tattoo = in_drakkin_tattoo; - drakkin_details = in_drakkin_details; - attack_speed = 0; - attack_delay = 0; - slow_mitigation = 0; - findable = false; - trackable = true; - has_shieldequiped = false; - has_twohandbluntequiped = false; - has_twohanderequipped = false; - has_duelweaponsequiped = false; - can_facestab = false; - has_numhits = false; - has_MGB = false; - has_ProjectIllusion = false; - SpellPowerDistanceMod = 0; - last_los_check = false; + haircolor = in_haircolor; + beardcolor = in_beardcolor; + eyecolor1 = in_eyecolor1; + eyecolor2 = in_eyecolor2; + hairstyle = in_hairstyle; + luclinface = in_luclinface; + beard = in_beard; + drakkin_heritage = in_drakkin_heritage; + drakkin_tattoo = in_drakkin_tattoo; + drakkin_details = in_drakkin_details; + attack_speed = 0; + attack_delay = 0; + slow_mitigation = 0; + findable = false; + trackable = true; + has_shield_equipped = false; + has_two_hand_blunt_equipped = false; + has_two_hander_equipped = false; + has_dual_weapons_equipped = false; + can_facestab = false; + has_numhits = false; + has_MGB = false; + has_ProjectIllusion = false; + SpellPowerDistanceMod = 0; + last_los_check = false; - if (in_aa_title > 0) { - aa_title = in_aa_title; - } - else { - aa_title = 0xFF; - } + aa_title = in_aa_title > 0 ? in_aa_title : 0xFF; AC = in_ac; ATK = in_atk; @@ -428,24 +425,24 @@ Mob::Mob( permarooted = (runspeed > 0) ? false : true; pause_timer_complete = false; - ForcedMovement = 0; - roamer = false; - rooted = false; - charmed = false; + ForcedMovement = 0; + roamer = false; + rooted = false; + charmed = false; - weaponstance.enabled = false; - weaponstance.spellbonus_enabled = false; //Set when bonus is applied - weaponstance.itembonus_enabled = false; //Set when bonus is applied - weaponstance.aabonus_enabled = false; //Controlled by function TogglePassiveAA + weaponstance.enabled = false; + weaponstance.spellbonus_enabled = false; //Set when bonus is applied + weaponstance.itembonus_enabled = false; //Set when bonus is applied + weaponstance.aabonus_enabled = false; //Controlled by function TogglePassiveAA weaponstance.spellbonus_buff_spell_id = 0; - weaponstance.itembonus_buff_spell_id = 0; - weaponstance.aabonus_buff_spell_id = 0; + weaponstance.itembonus_buff_spell_id = 0; + weaponstance.aabonus_buff_spell_id = 0; pStandingPetOrder = SPO_Follow; pseudo_rooted = false; nobuff_invisible = 0; - see_invis = 0; + see_invis = 0; innate_see_invis = GetSeeInvisibleLevelFromNPCStat(in_see_invis); see_invis_undead = GetSeeInvisibleLevelFromNPCStat(in_see_invis_undead); @@ -492,19 +489,19 @@ Mob::Mob( } for (int i = 0; i < MAX_APPEARANCE_EFFECTS; i++) { - appearance_effects_id[i] = 0; + appearance_effects_id[i] = 0; appearance_effects_slot[i] = 0; } emoteid = 0; endur_upkeep = false; degenerating_effects = false; - PrimaryAggro = false; - AssistAggro = false; - npc_assist_cap = 0; + PrimaryAggro = false; + AssistAggro = false; + npc_assist_cap = 0; use_double_melee_round_dmg_bonus = false; - dw_same_delay = 0; + dw_same_delay = 0; queue_wearchange_slot = -1; @@ -7141,4 +7138,4 @@ int Mob::DispatchZoneControllerEvent( } return ret; -} \ No newline at end of file +} diff --git a/zone/mob.h b/zone/mob.h index 9fc1cde6f..730278bd1 100644 --- a/zone/mob.h +++ b/zone/mob.h @@ -484,19 +484,19 @@ public: void TempName(const char *newname = nullptr); void SetTargetable(bool on); bool IsTargetable() const { return m_targetable; } - bool HasShieldEquiped() const { return has_shieldequiped; } - inline void SetShieldEquiped(bool val) { has_shieldequiped = val; } - bool HasTwoHandBluntEquiped() const { return has_twohandbluntequiped; } - inline void SetTwoHandBluntEquiped(bool val) { has_twohandbluntequiped = val; } - bool HasTwoHanderEquipped() { return has_twohanderequipped; } - void SetTwoHanderEquipped(bool val) { has_twohanderequipped = val; } - bool HasDualWeaponsEquiped() const { return has_duelweaponsequiped; } + bool HasShieldEquipped() const { return has_shield_equipped; } + inline void SetShieldEquipped(bool val) { has_shield_equipped = val; } + bool HasTwoHandBluntEquipped() const { return has_two_hand_blunt_equipped; } + inline void SetTwoHandBluntEquipped(bool val) { has_two_hand_blunt_equipped = val; } + bool HasTwoHanderEquipped() { return has_two_hander_equipped; } + void SetTwoHanderEquipped(bool val) { has_two_hander_equipped = val; } + bool HasDualWeaponsEquipped() const { return has_dual_weapons_equipped; } bool HasBowEquipped() const { return has_bowequipped; } void SetBowEquipped(bool val) { has_bowequipped = val; } bool HasArrowEquipped() const { return has_arrowequipped; } void SetArrowEquipped(bool val) { has_arrowequipped = val; } bool HasBowAndArrowEquipped() const { return HasBowEquipped() && HasArrowEquipped(); } - inline void SetDuelWeaponsEquiped(bool val) { has_duelweaponsequiped = val; } + inline void SetDualWeaponsEquipped(bool val) { has_dual_weapons_equipped = val; } bool CanFacestab() { return can_facestab; } void SetFacestab(bool val) { can_facestab = val; } virtual uint8 ConvertItemTypeToSkillID(uint8 item_type); @@ -1699,10 +1699,10 @@ protected: bool silenced; bool amnesiad; bool offhand; - bool has_shieldequiped; - bool has_twohandbluntequiped; - bool has_twohanderequipped; - bool has_duelweaponsequiped; + bool has_shield_equipped; + bool has_two_hand_blunt_equipped; + bool has_two_hander_equipped; + bool has_dual_weapons_equipped; bool has_bowequipped = false; bool has_arrowequipped = false; bool use_double_melee_round_dmg_bonus; diff --git a/zone/perl_mob.cpp b/zone/perl_mob.cpp index ae25aec8a..f2101ee93 100644 --- a/zone/perl_mob.cpp +++ b/zone/perl_mob.cpp @@ -2273,14 +2273,14 @@ bool Perl_Mob_IsTargetable(Mob* self) // @categories Stats and Attributes return self->IsTargetable(); } -bool Perl_Mob_HasShieldEquiped(Mob* self) // @categories Stats and Attributes +bool Perl_Mob_HasShieldEquipped(Mob* self) // @categories Stats and Attributes { - return self->HasShieldEquiped(); + return self->HasShieldEquipped(); } -bool Perl_Mob_HasTwoHandBluntEquiped(Mob* self) // @categories Stats and Attributes +bool Perl_Mob_HasTwoHandBluntEquipped(Mob* self) // @categories Stats and Attributes { - return self->HasTwoHandBluntEquiped(); + return self->HasTwoHandBluntEquipped(); } bool Perl_Mob_HasTwoHanderEquipped(Mob* self) // @categories Stats and Attributes @@ -3257,9 +3257,9 @@ void perl_register_mob() package.add("HasOwner", &Perl_Mob_HasOwner); package.add("HasPet", &Perl_Mob_HasPet); package.add("HasProcs", &Perl_Mob_HasProcs); - package.add("HasShieldEquiped", &Perl_Mob_HasShieldEquiped); + package.add("HasShieldEquipped", &Perl_Mob_HasShieldEquipped); package.add("HasTimer", &Perl_Mob_HasTimer); - package.add("HasTwoHandBluntEquiped", &Perl_Mob_HasTwoHandBluntEquiped); + package.add("HasTwoHandBluntEquipped", &Perl_Mob_HasTwoHandBluntEquipped); package.add("HasTwoHanderEquipped", &Perl_Mob_HasTwoHanderEquipped); package.add("HateSummon", &Perl_Mob_HateSummon); package.add("Heal", &Perl_Mob_Heal); diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp index 59048c765..e264f1add 100644 --- a/zone/special_attacks.cpp +++ b/zone/special_attacks.cpp @@ -133,7 +133,7 @@ int Mob::GetBaseSkillDamage(EQ::skills::SkillType skill, Mob *target) float ac_bonus = 0.0f; const EQ::ItemInstance *inst = nullptr; if (IsClient()) { - if (HasShieldEquiped()) { + if (HasShieldEquipped()) { inst = CastToClient()->GetInv().GetItem(EQ::invslot::slotSecondary); } else if (HasTwoHanderEquipped()) { inst = CastToClient()->GetInv().GetItem(EQ::invslot::slotPrimary); diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index a83240480..b0e1da70a 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -8075,8 +8075,8 @@ bool Mob::PassCastRestriction(int value) return true; break; - case IS_OFF_HAND_EQUIPED: - if (HasShieldEquiped() || CanThisClassDualWield()) + case IS_OFF_HAND_EQUIPPED: + if (HasShieldEquipped() || CanThisClassDualWield()) return true; break; @@ -9284,7 +9284,7 @@ void Mob::SendCastRestrictionMessage(int requirement_id, bool target_requirement case IS_HP_UNDER_50_PCT: Message(Chat::Red, fmt::format("{} This target must be at oe below 50 pct of its maximum hit points.", msg).c_str()); break; - case IS_OFF_HAND_EQUIPED: + case IS_OFF_HAND_EQUIPPED: Message(Chat::Red, fmt::format("{} You must be wielding a weapon or shield in your offhand to use this ability.", msg).c_str()); break; case HAS_NO_PACT_OF_FATE_RECOURSE_BUFF: diff --git a/zone/tune.cpp b/zone/tune.cpp index ad427146e..1880cbc39 100644 --- a/zone/tune.cpp +++ b/zone/tune.cpp @@ -920,7 +920,7 @@ int64 Mob::TuneClientAttack(Mob* other, bool no_avoid, bool no_hit_chance, int h if (Hand == EQ::invslot::slotPrimary || Hand == EQ::invslot::slotSecondary) my_hit.base_damage = CastToClient()->DoDamageCaps(my_hit.base_damage); auto shield_inc = spellbonuses.ShieldEquipDmgMod + itembonuses.ShieldEquipDmgMod + aabonuses.ShieldEquipDmgMod; - if (shield_inc > 0 && HasShieldEquiped() && Hand == EQ::invslot::slotPrimary) { + if (shield_inc > 0 && HasShieldEquipped() && Hand == EQ::invslot::slotPrimary) { my_hit.base_damage = my_hit.base_damage * (100 + shield_inc) / 100; hate = hate * (100 + shield_inc) / 100; } @@ -1040,7 +1040,7 @@ int64 Mob::TuneACSum(bool skip_caps, int ac_override, int add_ac) } int shield_ac = 0; - if (HasShieldEquiped() && IsOfClientBot()) { + if (HasShieldEquipped() && IsOfClientBot()) { auto inst = (IsClient()) ? GetInv().GetItem(EQ::invslot::slotSecondary) : CastToBot()->GetBotItem(EQ::invslot::slotSecondary); if (inst) { if (inst->GetItemRecommendedLevel(true) <= GetLevel()) {