Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Creatures: refactored sparring handling and added all data for 85% health sparring

Browse Source
This commit is contained in:
Ovahlord committed 2019-04-28 23:18:48 +02:00
1 parent 018bbfc13d
commit eefa94a5fe
8 files changed
+542 -81
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sql/updates/world/custom/custom_2019_04_28_04_world.sql
+478
View File
@@ -0,0 +1,478 @@
/*
TRUNCATE TABLE `creature_sparring_template`;
ALTER TABLE `creature_sparring_template`
DROP COLUMN `VictimEntry`,
CHANGE `AttackerEntry` `CreatureID` MEDIUMINT(8) UNSIGNED NOT NULL,
DROP PRIMARY KEY,
ADD PRIMARY KEY (`CreatureID`);
*/
INSERT INTO `creature_sparring_template` (`CreatureID`, `HealthLimitPct`) VALUES
(98, 85),
(123, 85),
(124, 85),
(125, 85),
(449, 85),
(452, 85),
(453, 85),
(501, 85),
(589, 85),
(594, 85),
(1036, 85),
(1726, 85),
(2694, 85),
(2952, 85),
(2991, 85),
(3374, 85),
(3375, 85),
(4294, 85),
(4298, 85),
(4300, 85),
(4301, 85),
(6190, 85),
(6195, 85),
(7275, 85),
(7604, 85),
(7605, 85),
(7606, 85),
(7607, 85),
(7608, 85),
(7787, 85),
(7788, 85),
(7789, 85),
(7796, 85),
(7855, 85),
(7856, 85),
(7858, 85),
(7939, 85),
(8876, 85),
(8877, 85),
(11858, 85),
(11910, 85),
(11911, 85),
(11912, 85),
(11913, 85),
(33082, 85),
(34486, 85),
(34511, 85),
(34689, 85),
(34696, 85),
(34835, 85),
(34850, 85),
(34876, 85),
(34877, 85),
(34878, 85),
(34884, 85),
(34913, 85),
(34916, 85),
(34957, 85),
(34958, 85),
(34959, 85),
(35118, 85),
(35203, 85),
(35204, 85),
(35232, 85),
(35333, 85),
(35334, 85),
(35504, 85),
(35627, 85),
(35839, 85),
(35872, 85),
(35893, 85),
(35894, 85),
(35915, 85),
(36057, 85),
(36103, 85),
(36104, 85),
(36115, 85),
(36117, 85),
(36140, 85),
(36211, 85),
(36236, 85),
(36454, 85),
(36455, 85),
(36464, 85),
(36488, 85),
(36491, 85),
(36492, 85),
(36602, 85),
(36634, 85),
(36653, 85),
(36671, 85),
(36690, 85),
(36752, 85),
(36795, 85),
(36809, 85),
(36810, 85),
(36815, 85),
(36816, 85),
(36830, 85),
(36882, 85),
(36925, 85),
(36942, 85),
(36943, 85),
(36954, 85),
(36988, 85),
(37067, 85),
(37070, 85),
(37078, 85),
(37161, 85),
(37170, 85),
(37175, 85),
(37177, 85),
(37178, 85),
(37216, 85),
(37499, 85),
(37580, 85),
(37581, 85),
(37591, 85),
(37592, 85),
(37692, 85),
(37699, 85),
(37700, 85),
(37701, 85),
(37716, 85),
(37733, 85),
(37735, 85),
(37784, 85),
(37884, 85),
(37885, 85),
(37914, 85),
(37946, 85),
(38022, 85),
(38027, 85),
(38037, 85),
(38038, 85),
(38196, 85),
(38242, 85),
(38243, 85),
(38244, 85),
(38245, 85),
(38246, 85),
(38247, 85),
(38268, 85),
(38272, 85),
(38278, 85),
(38279, 85),
(38280, 85),
(38281, 85),
(38282, 85),
(38300, 85),
(38324, 85),
(38326, 85),
(38345, 85),
(38624, 85),
(38646, 85),
(38648, 85),
(38649, 85),
(38650, 85),
(38658, 85),
(38661, 85),
(38664, 85),
(38719, 85),
(38823, 85),
(38824, 85),
(38857, 85),
(38896, 85),
(38902, 85),
(38913, 85),
(38915, 85),
(38917, 85),
(38926, 85),
(38934, 85),
(38951, 85),
(38952, 85),
(38997, 85),
(38998, 85),
(39028, 85),
(39044, 85),
(39065, 85),
(39066, 85),
(39068, 85),
(39128, 85),
(39140, 85),
(39147, 85),
(39153, 85),
(39157, 85),
(39226, 85),
(39294, 85),
(39339, 85),
(39344, 85),
(39390, 85),
(39410, 85),
(39411, 85),
(39582, 85),
(39589, 85),
(39591, 85),
(39594, 85),
(39595, 85),
(39596, 85),
(39608, 85),
(39625, 85),
(39637, 85),
(39641, 85),
(39645, 85),
(39650, 85),
(39749, 85),
(39828, 85),
(39867, 85),
(39869, 85),
(39871, 85),
(39874, 85),
(39877, 85),
(39882, 85),
(39895, 85),
(39915, 85),
(39916, 85),
(39923, 85),
(39924, 85),
(39925, 85),
(39939, 85),
(39946, 85),
(39947, 85),
(39949, 85),
(39951, 85),
(39963, 85),
(39972, 85),
(39992, 85),
(39993, 85),
(40025, 85),
(40065, 85),
(40080, 85),
(40108, 85),
(40123, 85),
(40139, 85),
(40147, 85),
(40148, 85),
(40149, 85),
(40150, 85),
(40177, 85),
(40178, 85),
(40185, 85),
(40227, 85),
(40229, 85),
(40230, 85),
(40238, 85),
(40278, 85),
(40313, 85),
(40319, 85),
(40360, 85),
(40398, 85),
(40463, 85),
(40482, 85),
(40504, 85),
(40535, 85),
(40537, 85),
(40583, 85),
(40590, 85),
(40593, 85),
(40632, 85),
(40635, 85),
(40636, 85),
(40642, 85),
(40643, 85),
(40688, 85),
(40689, 85),
(40702, 85),
(40705, 85),
(40709, 85),
(40729, 85),
(40730, 85),
(40731, 85),
(40732, 85),
(40733, 85),
(40734, 85),
(40735, 85),
(40736, 85),
(40737, 85),
(40738, 85),
(40739, 85),
(40740, 85),
(40741, 85),
(40742, 85),
(40744, 85),
(40746, 85),
(40755, 85),
(40767, 85),
(40775, 85),
(40780, 85),
(40816, 85),
(40833, 85),
(40841, 85),
(40843, 85),
(40882, 85),
(40934, 85),
(40960, 85),
(40972, 85),
(40978, 85),
(41008, 85),
(41015, 85),
(41035, 85),
(41046, 85),
(41047, 85),
(41049, 85),
(41050, 85),
(41095, 85),
(41115, 85),
(41138, 85),
(41146, 85),
(41158, 85),
(41175, 85),
(41181, 85),
(41182, 85),
(41237, 85),
(41243, 85),
(41256, 85),
(41281, 85),
(41360, 85),
(41367, 85),
(41368, 85),
(41369, 85),
(41370, 85),
(41392, 85),
(41407, 85),
(41421, 85),
(41431, 85),
(41439, 85),
(41444, 85),
(41446, 85),
(41447, 85),
(41448, 85),
(41452, 85),
(41455, 85),
(41456, 85),
(41457, 85),
(41509, 85),
(41523, 85),
(41524, 85),
(41541, 85),
(41553, 85),
(41554, 85),
(41556, 85),
(41558, 85),
(41559, 85),
(41560, 85),
(41562, 85),
(41586, 85),
(41588, 85),
(41589, 85),
(41592, 85),
(41593, 85),
(41601, 85),
(41611, 85),
(41642, 85),
(41763, 85),
(41769, 85),
(41771, 85),
(41772, 85),
(41773, 85),
(41774, 85),
(41775, 85),
(41777, 85),
(41779, 85),
(41783, 85),
(41784, 85),
(41793, 85),
(41794, 85),
(41796, 85),
(41797, 85),
(41798, 85),
(41799, 85),
(41800, 85),
(41897, 85),
(41898, 85),
(41899, 85),
(41902, 85),
(41909, 85),
(41911, 85),
(41912, 85),
(41914, 85),
(41915, 85),
(41924, 85),
(41980, 85),
(41985, 85),
(41995, 85),
(41999, 85),
(42008, 85),
(42010, 85),
(42012, 85),
(42048, 85),
(42049, 85),
(42053, 85),
(42065, 85),
(42066, 85),
(42068, 85),
(42071, 85),
(42072, 85),
(42073, 85),
(42074, 85),
(42075, 85),
(42160, 85),
(42284, 85),
(42295, 85),
(42307, 85),
(42320, 85),
(42359, 85),
(42367, 85),
(42369, 85),
(42370, 85),
(42397, 85),
(42398, 85),
(42407, 85),
(42516, 85),
(42518, 85),
(42519, 85),
(42536, 85),
(42554, 85),
(42555, 85),
(42561, 85),
(42564, 85),
(42566, 85),
(42567, 85),
(42568, 85),
(42571, 85),
(42574, 85),
(42577, 85),
(42608, 85),
(42618, 85),
(42619, 85),
(42653, 85),
(42730, 85),
(42731, 85),
(42788, 85),
(42801, 85),
(42806, 85),
(42820, 85),
(42821, 85),
(42847, 85),
(42848, 85),
(42885, 85),
(42946, 85),
(42964, 85),
(43007, 85),
(43016, 85),
(43018, 85),
(43026, 85),
(43089, 85),
(43092, 85),
(43100, 85),
(43134, 85),
(43138, 85),
(43153, 85),
(43169, 85),
(43170, 85),
(43174, 85),
(43184, 85),
(43213, 85),
(43215, 85),
(43218, 85),
(43228, 85),
(43232, 85),
(43233, 85),
(43234, 85),
(43237, 85),
(43248, 85),
(43249, 85),
(43250, 85),
(43276, 85);
src/server/game/Entities/Creature/Creature.cpp
+5 -21
View File
@@ -2862,27 +2862,6 @@ Unit* Creature::SelectNearestHostileUnitInAggroRange(bool useLOS) const
return target; return target;
} }
CreatureSparring const* Creature::GetSparringData(uint32 attackerEntry, uint32 victimEntry) const
{
return sObjectMgr->GetCreatureSparringInfo(attackerEntry, victimEntry);
}
bool Creature::CanSparrWith(Creature* victim) const
{
if (GetSparringData(GetEntry(), victim->GetEntry()))
return true;
return false;
}
float Creature::GetSparringHealthLimitPctFor(Creature* victim) const
{
if (CreatureSparring const* sparrData = GetSparringData(GetEntry(), victim->GetEntry()))
return sparrData->GetHealthLimitPct();
return 0.0f;
}
void Creature::UpdateMovementFlags() void Creature::UpdateMovementFlags()
{ {
// Do not update movement flags if creature is controlled by a player (charm/vehicle) // Do not update movement flags if creature is controlled by a player (charm/vehicle)
@@ -3169,3 +3148,8 @@ void Creature::MakeInterruptable(bool apply)
ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_INTERRUPT, !apply); ApplySpellImmune(0, IMMUNITY_MECHANIC, MECHANIC_INTERRUPT, !apply);
ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, !apply); ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_INTERRUPT_CAST, !apply);
} }
float Creature::GetSparringHealthLimit() const
{
return sObjectMgr->GetSparringHealthLimitFor(GetEntry());
}
src/server/game/Entities/Creature/Creature.h
+2 -4
View File
@@ -164,6 +164,8 @@ class TC_GAME_API Creature : public Unit, public GridObject<Creature>, public Ma
CreatureData const* GetCreatureData() const { return m_creatureData; } CreatureData const* GetCreatureData() const { return m_creatureData; }
CreatureAddon const* GetCreatureAddon() const; CreatureAddon const* GetCreatureAddon() const;
float GetSparringHealthLimit() const;
std::string const& GetAIName() const; std::string const& GetAIName() const;
std::string GetScriptName() const; std::string GetScriptName() const;
uint32 GetScriptId() const; uint32 GetScriptId() const;
@@ -215,10 +217,6 @@ class TC_GAME_API Creature : public Unit, public GridObject<Creature>, public Ma
Unit* SelectNearestTargetInAttackDistance(float dist = 0) const; Unit* SelectNearestTargetInAttackDistance(float dist = 0) const;
Unit* SelectNearestHostileUnitInAggroRange(bool useLOS = false) const; Unit* SelectNearestHostileUnitInAggroRange(bool useLOS = false) const;
CreatureSparring const* GetSparringData(uint32 attackerEntry, uint32 victimEntry) const;
bool CanSparrWith(Creature* victim) const;
float GetSparringHealthLimitPctFor(Creature* victim) const;
void DoFleeToGetAssistance(); void DoFleeToGetAssistance();
void CallForHelp(float fRadius); void CallForHelp(float fRadius);
void CallAssistance(); void CallAssistance();
src/server/game/Entities/Creature/CreatureData.h
+1 -14
View File
@@ -398,19 +398,6 @@ struct TC_GAME_API TrainerSpellData
TrainerSpell const* Find(uint32 spell_id) const; TrainerSpell const* Find(uint32 spell_id) const;
}; };
// `creature_sparring_template` table typedef std::unordered_map<uint32, float /*SparringHealthLimit*/> CreatureSparringTemplateMap;
struct CreatureSparring
{
CreatureSparring(uint32 _victimEntry, float _healthLimitPct)
: victimEntry(_victimEntry), healthLimitPct(_healthLimitPct) { }
uint32 victimEntry;
float healthLimitPct;
float GetHealthLimitPct() const { return healthLimitPct; }
};
typedef std::vector<CreatureSparring> CreatureSparringList;
typedef std::unordered_map<uint32, CreatureSparringList> CreatureSparringTemplateMap;
#endif // CreatureData_h__ #endif // CreatureData_h__
src/server/game/Entities/Unit/Unit.cpp
+33 -15
View File
@@ -735,15 +735,21 @@ void Unit::DealDamageMods(Unit const* victim, uint32 &damage, uint32* absorb) co
uint32 Unit::DealDamage(Unit* victim, uint32 damage, CleanDamage const* cleanDamage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask, SpellInfo const* spellProto, bool durabilityLoss) uint32 Unit::DealDamage(Unit* victim, uint32 damage, CleanDamage const* cleanDamage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask, SpellInfo const* spellProto, bool durabilityLoss)
{ {
// Sparring Checks // Sparring Checks
if (Creature* me = ToCreature()) if (Creature* target = victim->ToCreature())
if (Creature* target = victim->ToCreature()) {
if (me->CanSparrWith(target)) if (GetTypeId() == TYPEID_UNIT && !IsCharmedOwnedByPlayerOrPlayer())
{
float sparringLimitPct = target->GetSparringHealthLimit();
if (sparringLimitPct != 0.0f)
{ {
if (damage >= victim->GetHealth()) // safety check to prevent creatures getting accidentally killed when the percentage is small if (damage >= target->GetHealth()) // First check: if we have a sparring limit we will never allow creatures to kill the sparring victim
damage = victim->GetHealth() - 1; damage = target->GetHealth() - 1;
else if (target->GetHealthPct() <= me->GetSparringHealthLimitPctFor(target)) else if (target->GetHealthPct() <= sparringLimitPct) // Second check: stop incomming damage when we have surpassed the health limit
damage = 0; damage = 0;
} }
}
}
if (victim->getRace() == RACE_WORGEN && victim->ToPlayer()) if (victim->getRace() == RACE_WORGEN && victim->ToPlayer())
{ {
@@ -1986,11 +1992,17 @@ void Unit::CalcAbsorbResist(DamageInfo& damageInfo)
DealDamageMods(caster, splitDamage, &split_absorb); DealDamageMods(caster, splitDamage, &split_absorb);
// Sparring Checks // Sparring Checks
if (Creature* me = caster->ToCreature()) if (Creature* target = damageInfo.GetVictim()->ToCreature())
if (Creature* target = damageInfo.GetVictim()->ToCreature()) {
if (me->CanSparrWith(target)) if (caster->GetTypeId() == TYPEID_UNIT && !caster->IsCharmedOwnedByPlayerOrPlayer())
if (target->GetHealthPct() <= me->GetSparringHealthLimitPctFor(target)) {
float sparringLimitPct = target->GetSparringHealthLimit();
if (sparringLimitPct != 0.0f)
if (target->GetHealthPct() <= sparringLimitPct)
damageInfo.ModifyDamage(damageInfo.GetDamage() * -1); damageInfo.ModifyDamage(damageInfo.GetDamage() * -1);
}
}
SendSpellNonMeleeDamageLog(caster, (*itr)->GetSpellInfo()->Id, splitDamage, damageInfo.GetSchoolMask(), split_absorb, 0, false, 0, false); SendSpellNonMeleeDamageLog(caster, (*itr)->GetSpellInfo()->Id, splitDamage, damageInfo.GetSchoolMask(), split_absorb, 0, false, 0, false);
@@ -2100,11 +2112,17 @@ void Unit::AttackerStateUpdate(Unit* victim, WeaponAttackType attType, bool extr
DealDamageMods(victim, damageInfo.damage, &damageInfo.absorb); DealDamageMods(victim, damageInfo.damage, &damageInfo.absorb);
// Sparring Checks // Sparring Checks
if (Creature* me = ToCreature()) if (Creature* target = victim->ToCreature())
if (Creature* target = victim->ToCreature()) {
if (me->CanSparrWith(target)) if (GetTypeId() == TYPEID_UNIT && !IsCharmedOwnedByPlayerOrPlayer())
if (target->GetHealthPct() <= me->GetSparringHealthLimitPctFor(target)) {
damageInfo.HitInfo |= HITINFO_FAKE_DAMAGE; float sparringLimitPct = target->GetSparringHealthLimit();
if (sparringLimitPct != 0.0f)
if (target->GetHealthPct() <= sparringLimitPct)
damageInfo.HitInfo |= HITINFO_FAKE_DAMAGE;
}
}
SendAttackStateUpdate(&damageInfo); SendAttackStateUpdate(&damageInfo);
src/server/game/Globals/ObjectMgr.cpp
+6 -13
View File
@@ -677,8 +677,8 @@ void ObjectMgr::LoadCreatureSparringTemplate()
{ {
uint32 oldMSTime = getMSTime(); uint32 oldMSTime = getMSTime();
// 0 1 2 // 0 1
QueryResult result = WorldDatabase.Query("SELECT AttackerEntry, VictimEntry, HealthLimitPct FROM creature_sparring_template"); QueryResult result = WorldDatabase.Query("SELECT CreatureID, HealthLimitPct FROM creature_sparring_template");
if (!result) if (!result)
{ {
@@ -692,8 +692,7 @@ void ObjectMgr::LoadCreatureSparringTemplate()
Field* fields = result->Fetch(); Field* fields = result->Fetch();
uint32 entry = fields[0].GetUInt32(); uint32 entry = fields[0].GetUInt32();
uint32 victim = fields[1].GetUInt32(); float healthPct = fields[1].GetFloat();
float healthPct = fields[2].GetFloat();
if (!sObjectMgr->GetCreatureTemplate(entry)) if (!sObjectMgr->GetCreatureTemplate(entry))
{ {
@@ -701,25 +700,19 @@ void ObjectMgr::LoadCreatureSparringTemplate()
continue; continue;
} }
if (!sObjectMgr->GetCreatureTemplate(victim))
{
TC_LOG_ERROR("sql.sql", "Creature template (Entry: %u) does not exist but has a record in `creature_sparring_template`", entry);
continue;
}
if (healthPct > 100.0f) if (healthPct > 100.0f)
{ {
TC_LOG_ERROR("sql.sql", "Sparring entry (Entry: %u, Victim: %u) exceeds the health percentage limit. Setting to 100.", entry, victim); TC_LOG_ERROR("sql.sql", "Sparring entry (Entry: %u) exceeds the health percentage limit. Setting to 100.", entry);
healthPct = 100.0f; healthPct = 100.0f;
} }
if (healthPct <= 0.0f) if (healthPct <= 0.0f)
{ {
TC_LOG_ERROR("sql.sql", "Sparring entry (Entry: %u, Victim: %u) has a negative or too small health percentage. Setting to 0.1.", entry, victim); TC_LOG_ERROR("sql.sql", "Sparring entry (Entry: %u) has a negative or too small health percentage. Setting to 0.1.", entry);
healthPct = 0.1f; healthPct = 0.1f;
} }
_creatureSparringTemplateStore[entry].emplace_back(CreatureSparring(victim, healthPct)); _creatureSparringTemplateStore[entry] = healthPct;
} while (result->NextRow()); } while (result->NextRow());
TC_LOG_INFO("server.loading", ">> Loaded %u creature sparring templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); TC_LOG_INFO("server.loading", ">> Loaded %u creature sparring templates in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
src/server/game/Globals/ObjectMgr.h
+7 -9
View File
@@ -1404,17 +1404,15 @@ class TC_GAME_API ObjectMgr
return &itr->second; return &itr->second;
} }
CreatureSparring const* GetCreatureSparringInfo(uint32 attackerEntry, uint32 victimEntry) const float GetSparringHealthLimitFor(uint32 entry) const
{ {
auto itr = _creatureSparringTemplateStore.find(attackerEntry); auto itr = _creatureSparringTemplateStore.find(entry);
if (itr == _creatureSparringTemplateStore.end()) if (itr != _creatureSparringTemplateStore.end())
return nullptr; {
return itr->second;
}
for (CreatureSparring const& sparring : itr->second) return 0.0f;
if (sparring.victimEntry == victimEntry)
return &sparring;
return nullptr;
} }
TrinityString const* GetTrinityString(uint32 entry) const TrinityString const* GetTrinityString(uint32 entry) const
src/server/game/Spells/Spell.cpp
+10 -5
View File
@@ -2537,12 +2537,17 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target)
caster->CalculateSpellDamageTaken(&damageInfo, m_damage, m_spellInfo, m_attackType, target->crit); caster->CalculateSpellDamageTaken(&damageInfo, m_damage, m_spellInfo, m_attackType, target->crit);
caster->DealDamageMods(damageInfo.target, damageInfo.damage, &damageInfo.absorb); caster->DealDamageMods(damageInfo.target, damageInfo.damage, &damageInfo.absorb);
// Sparring Checks if (Creature* target = damageInfo.target->ToCreature())
if (Creature* me = caster->ToCreature()) {
if (Creature* target = damageInfo.target->ToCreature()) if (caster->GetTypeId() == TYPEID_UNIT && !caster->IsCharmedOwnedByPlayerOrPlayer())
if (me->CanSparrWith(target)) {
if (target->GetHealthPct() <= me->GetSparringHealthLimitPctFor(target)) float sparringLimitPct = target->GetSparringHealthLimit();
if (sparringLimitPct != 0.0f)
if (target->GetHealthPct() <= sparringLimitPct)
damageInfo.damage = 0; damageInfo.damage = 0;
}
}
// Send log damage message to client // Send log damage message to client
caster->SendSpellNonMeleeDamageLog(&damageInfo); caster->SendSpellNonMeleeDamageLog(&damageInfo);