From db360f0cfb5dde143ce0226e41399ea0e19daf43 Mon Sep 17 00:00:00 2001 From: acidmanifesto Date: Sat, 16 Apr 2022 11:00:38 -0400 Subject: [PATCH] Fix (Core\DB) Hostil to Hostile spelling fix (#11399) * Fix (Core) Hostil to Hostile spelling fix * sql cmd adjustment as well * AliGnZ * Further Hostil to Hostile Correction Per @Si1ker Research via https://github.com/azerothcore/azerothcore-wotlk/pull/11399#issuecomment-1099506373 --- .../rev_1649944595674185734.sql | 4 +++ .../game/AI/SmartScripts/SmartScript.cpp | 24 ++++++------- .../game/AI/SmartScripts/SmartScriptMgr.cpp | 10 +++--- .../game/AI/SmartScripts/SmartScriptMgr.h | 2 +- src/server/game/Combat/ThreatMgr.cpp | 36 +++++++++---------- src/server/game/Combat/ThreatMgr.h | 2 +- src/server/game/Entities/Unit/Unit.cpp | 2 +- src/server/scripts/Commands/cs_debug.cpp | 6 ++-- .../TempleOfAhnQiraj/boss_twinemperors.cpp | 2 +- 9 files changed, 46 insertions(+), 42 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1649944595674185734.sql diff --git a/data/sql/updates/pending_db_world/rev_1649944595674185734.sql b/data/sql/updates/pending_db_world/rev_1649944595674185734.sql new file mode 100644 index 000000000..329cd8e91 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1649944595674185734.sql @@ -0,0 +1,4 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1649944595674185734'); + +-- corrects hostil to hostile +UPDATE `command` SET `name`='debug hostile' WHERE `name`='debug hostil'; diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index d6610c887..8c7433ca8 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -3561,48 +3561,48 @@ ObjectList* SmartScript::GetTargets(SmartScriptHolder const& e, Unit* invoker /* case SMART_TARGET_HOSTILE_SECOND_AGGRO: if (me) { - if (e.target.hostilRandom.powerType) + if (e.target.hostileRandom.powerType) { - if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MaxThreat, 1, PowerUsersSelector(me, Powers(e.target.hostilRandom.powerType - 1), (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly))) + if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MaxThreat, 1, PowerUsersSelector(me, Powers(e.target.hostileRandom.powerType - 1), (float)e.target.hostileRandom.maxDist, e.target.hostileRandom.playerOnly))) l->push_back(u); } - else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MaxThreat, 1, (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly)) + else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MaxThreat, 1, (float)e.target.hostileRandom.maxDist, e.target.hostileRandom.playerOnly)) l->push_back(u); } break; case SMART_TARGET_HOSTILE_LAST_AGGRO: if (me) { - if (e.target.hostilRandom.powerType) + if (e.target.hostileRandom.powerType) { - if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MinThreat, 0, PowerUsersSelector(me, Powers(e.target.hostilRandom.powerType - 1), (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly))) + if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MinThreat, 0, PowerUsersSelector(me, Powers(e.target.hostileRandom.powerType - 1), (float)e.target.hostileRandom.maxDist, e.target.hostileRandom.playerOnly))) l->push_back(u); } - else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MinThreat, 0, (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly)) + else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MinThreat, 0, (float)e.target.hostileRandom.maxDist, e.target.hostileRandom.playerOnly)) l->push_back(u); } break; case SMART_TARGET_HOSTILE_RANDOM: if (me) { - if (e.target.hostilRandom.powerType) + if (e.target.hostileRandom.powerType) { - if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::Random, 0, PowerUsersSelector(me, Powers(e.target.hostilRandom.powerType - 1), (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly))) + if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::Random, 0, PowerUsersSelector(me, Powers(e.target.hostileRandom.powerType - 1), (float)e.target.hostileRandom.maxDist, e.target.hostileRandom.playerOnly))) l->push_back(u); } - else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::Random, 0, (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly)) + else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::Random, 0, (float)e.target.hostileRandom.maxDist, e.target.hostileRandom.playerOnly)) l->push_back(u); } break; case SMART_TARGET_HOSTILE_RANDOM_NOT_TOP: if (me) { - if (e.target.hostilRandom.powerType) + if (e.target.hostileRandom.powerType) { - if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::Random, 1, PowerUsersSelector(me, Powers(e.target.hostilRandom.powerType - 1), (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly))) + if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::Random, 1, PowerUsersSelector(me, Powers(e.target.hostileRandom.powerType - 1), (float)e.target.hostileRandom.maxDist, e.target.hostileRandom.playerOnly))) l->push_back(u); } - else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::Random, 1, (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly)) + else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::Random, 1, (float)e.target.hostileRandom.maxDist, e.target.hostileRandom.playerOnly)) l->push_back(u); } break; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 7e2ca667c..8868ffdb1 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -410,7 +410,7 @@ bool SmartAIMgr::IsTargetValid(SmartScriptHolder const& e) case SMART_TARGET_HOSTILE_LAST_AGGRO: case SMART_TARGET_HOSTILE_RANDOM: case SMART_TARGET_HOSTILE_RANDOM_NOT_TOP: - AC_SAI_IS_BOOLEAN_VALID(e, e.target.hostilRandom.playerOnly); + AC_SAI_IS_BOOLEAN_VALID(e, e.target.hostileRandom.playerOnly); break; case SMART_TARGET_FARTHEST: AC_SAI_IS_BOOLEAN_VALID(e, e.target.farthest.playerOnly); @@ -756,10 +756,10 @@ bool SmartAIMgr::CheckUnusedTargetParams(SmartScriptHolder const& e) case SMART_TARGET_NONE: return NO_PARAMS; case SMART_TARGET_SELF: return NO_PARAMS; case SMART_TARGET_VICTIM: return NO_PARAMS; - case SMART_TARGET_HOSTILE_SECOND_AGGRO: return sizeof(SmartTarget::hostilRandom); - case SMART_TARGET_HOSTILE_LAST_AGGRO: return sizeof(SmartTarget::hostilRandom); - case SMART_TARGET_HOSTILE_RANDOM: return sizeof(SmartTarget::hostilRandom); - case SMART_TARGET_HOSTILE_RANDOM_NOT_TOP: return sizeof(SmartTarget::hostilRandom); + case SMART_TARGET_HOSTILE_SECOND_AGGRO: return sizeof(SmartTarget::hostileRandom); + case SMART_TARGET_HOSTILE_LAST_AGGRO: return sizeof(SmartTarget::hostileRandom); + case SMART_TARGET_HOSTILE_RANDOM: return sizeof(SmartTarget::hostileRandom); + case SMART_TARGET_HOSTILE_RANDOM_NOT_TOP: return sizeof(SmartTarget::hostileRandom); case SMART_TARGET_ACTION_INVOKER: return NO_PARAMS; case SMART_TARGET_POSITION: return NO_PARAMS; //uses x,y,z,o case SMART_TARGET_CREATURE_RANGE: return sizeof(SmartTarget::unitRange); diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 5a17d4ce7..a9ffa16ad 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -1410,7 +1410,7 @@ struct SmartTarget uint32 maxDist; SAIBool playerOnly; uint32 powerType; - } hostilRandom; + } hostileRandom; struct { diff --git a/src/server/game/Combat/ThreatMgr.cpp b/src/server/game/Combat/ThreatMgr.cpp index d381bb4cc..ec106e79c 100644 --- a/src/server/game/Combat/ThreatMgr.cpp +++ b/src/server/game/Combat/ThreatMgr.cpp @@ -472,7 +472,7 @@ void ThreatMgr::modifyThreatPercent(Unit* victim, int32 percent) //============================================================ -Unit* ThreatMgr::getHostilTarget() +Unit* ThreatMgr::getHostileTarget() { iThreatContainer.update(); HostileReference* nextVictim = iThreatContainer.selectNextVictim(GetOwner()->ToCreature(), getCurrentVictim()); @@ -546,49 +546,49 @@ void ThreatMgr::processThreatEvent(ThreatRefStatusChangeEvent* threatRefStatusCh { threatRefStatusChangeEvent->setThreatMgr(this); // now we can set the threat manager - HostileReference* hostilRef = threatRefStatusChangeEvent->getReference(); + HostileReference* hostileRef = threatRefStatusChangeEvent->getReference(); switch (threatRefStatusChangeEvent->getType()) { case UEV_THREAT_REF_THREAT_CHANGE: - if ((getCurrentVictim() == hostilRef && threatRefStatusChangeEvent->getFValue() < 0.0f) || - (getCurrentVictim() != hostilRef && threatRefStatusChangeEvent->getFValue() > 0.0f)) + if ((getCurrentVictim() == hostileRef && threatRefStatusChangeEvent->getFValue() < 0.0f) || + (getCurrentVictim() != hostileRef && threatRefStatusChangeEvent->getFValue() > 0.0f)) setDirty(true); // the order in the threat list might have changed break; case UEV_THREAT_REF_ONLINE_STATUS: - if (!hostilRef->isOnline()) + if (!hostileRef->isOnline()) { - if (hostilRef == getCurrentVictim()) + if (hostileRef == getCurrentVictim()) { setCurrentVictim(nullptr); setDirty(true); } if (GetOwner() && GetOwner()->IsInWorld()) - if (Unit* target = ObjectAccessor::GetUnit(*GetOwner(), hostilRef->getUnitGuid())) + if (Unit* target = ObjectAccessor::GetUnit(*GetOwner(), hostileRef->getUnitGuid())) if (GetOwner()->IsInMap(target)) - GetOwner()->SendRemoveFromThreatListOpcode(hostilRef); - iThreatContainer.remove(hostilRef); - iThreatOfflineContainer.addReference(hostilRef); + GetOwner()->SendRemoveFromThreatListOpcode(hostileRef); + iThreatContainer.remove(hostileRef); + iThreatOfflineContainer.addReference(hostileRef); } else { - if (getCurrentVictim() && hostilRef->getThreat() > (1.1f * getCurrentVictim()->getThreat())) + if (getCurrentVictim() && hostileRef->getThreat() > (1.1f * getCurrentVictim()->getThreat())) setDirty(true); - iThreatContainer.addReference(hostilRef); - iThreatOfflineContainer.remove(hostilRef); + iThreatContainer.addReference(hostileRef); + iThreatOfflineContainer.remove(hostileRef); } break; case UEV_THREAT_REF_REMOVE_FROM_LIST: - if (hostilRef == getCurrentVictim()) + if (hostileRef == getCurrentVictim()) { setCurrentVictim(nullptr); setDirty(true); } - iOwner->SendRemoveFromThreatListOpcode(hostilRef); - if (hostilRef->isOnline()) - iThreatContainer.remove(hostilRef); + iOwner->SendRemoveFromThreatListOpcode(hostileRef); + if (hostileRef->isOnline()) + iThreatContainer.remove(hostileRef); else - iThreatOfflineContainer.remove(hostilRef); + iThreatOfflineContainer.remove(hostileRef); break; } } diff --git a/src/server/game/Combat/ThreatMgr.h b/src/server/game/Combat/ThreatMgr.h index f74dbfca0..180251f3d 100644 --- a/src/server/game/Combat/ThreatMgr.h +++ b/src/server/game/Combat/ThreatMgr.h @@ -221,7 +221,7 @@ public: [[nodiscard]] Unit* GetOwner() const { return iOwner; } - Unit* getHostilTarget(); + Unit* getHostileTarget(); void tauntApply(Unit* taunter); void tauntFadeOut(Unit* taunter); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 741d4beec..e259a75fc 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -14076,7 +14076,7 @@ Unit* Creature::SelectVictim() if (CanHaveThreatList()) { if (!target && !m_ThreatMgr.isThreatListEmpty()) - target = m_ThreatMgr.getHostilTarget(); + target = m_ThreatMgr.getHostileTarget(); } else if (!HasReactState(REACT_PASSIVE)) { diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index dda74b0c8..b33d0a614 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -78,7 +78,7 @@ public: { { "setbit", HandleDebugSet32BitCommand, SEC_ADMINISTRATOR, Console::No }, { "threat", HandleDebugThreatListCommand, SEC_ADMINISTRATOR, Console::No }, - { "hostil", HandleDebugHostileRefListCommand, SEC_ADMINISTRATOR, Console::No }, + { "hostile", HandleDebugHostileRefListCommand, SEC_ADMINISTRATOR, Console::No }, { "anim", HandleDebugAnimCommand, SEC_ADMINISTRATOR, Console::No }, { "arena", HandleDebugArenaCommand, SEC_ADMINISTRATOR, Console::No }, { "bg", HandleDebugBattlegroundCommand, SEC_ADMINISTRATOR, Console::No }, @@ -828,7 +828,7 @@ public: HostileReference* ref = target->getHostileRefMgr().getFirst(); uint32 count = 0; - handler->PSendSysMessage("Hostil reference list of %s (%s)", target->GetName().c_str(), target->GetGUID().ToString().c_str()); + handler->PSendSysMessage("Hostile reference list of %s (%s)", target->GetName().c_str(), target->GetGUID().ToString().c_str()); while (ref) { @@ -845,7 +845,7 @@ public: ref = ref->next(); } - handler->SendSysMessage("End of hostil reference list."); + handler->SendSysMessage("End of hostile reference list."); return true; } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 69b76553e..5ff71e9ba 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -415,7 +415,7 @@ public: void CastSpellOnBug(Creature* target) override { target->SetFaction(FACTION_MONSTER); - target->AI()->AttackStart(me->getThreatMgr().getHostilTarget()); + target->AI()->AttackStart(me->getThreatMgr().getHostileTarget()); target->AddAura(SPELL_MUTATE_BUG, target); target->SetFullHealth(); }