josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14946 from AriDEV/6.x

Browse Source 
Core/Entities: Update for CombatRatings.
This commit is contained in:
Duarte Duarte
2015-07-19 14:22:47 -07:00
parent 673648ee65 973934705c
commit b8d169f64f
2 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+12 -7
View File
@@ -5509,7 +5509,7 @@ void Player::UpdateRating(CombatRating cr)
switch (cr)
{
case CR_WEAPON_SKILL:
case CR_UNUSED_1:
case CR_DEFENSE_SKILL:
break;
case CR_DODGE:
@@ -5545,19 +5545,19 @@ void Player::UpdateRating(CombatRating cr)
if (affectStats)
UpdateAllSpellCritChances();
break;
case CR_HIT_TAKEN_MELEE: // Deprecated since Cataclysm
case CR_HIT_TAKEN_RANGED: // Deprecated since Cataclysm
case CR_HIT_TAKEN_SPELL: // Deprecated since Cataclysm
case CR_MULTISTRIKE:
case CR_READINESS:
case CR_SPEED:
case CR_RESILIENCE_PLAYER_DAMAGE_TAKEN:
case CR_RESILIENCE_CRIT_TAKEN:
case CR_CRIT_TAKEN_SPELL: // Deprecated since Cataclysm
case CR_LIFESTEAL:
break;
case CR_HASTE_MELEE: // Implemented in Player::ApplyRatingMod
case CR_HASTE_RANGED:
case CR_HASTE_SPELL:
break;
case CR_WEAPON_SKILL_MAINHAND: // Implemented in Unit::RollMeleeOutcomeAgainst
case CR_WEAPON_SKILL_OFFHAND:
case CR_AVOIDANCE:
case CR_UNUSED_2:
case CR_WEAPON_SKILL_RANGED:
break;
case CR_EXPERTISE:
@@ -5574,6 +5574,11 @@ void Player::UpdateRating(CombatRating cr)
case CR_MASTERY:
UpdateMastery();
break;
case CR_UNUSED_3:
case CR_UNUSED_4:
case CR_VERSATILITY_DAMAGE_DONE:
case CR_VERSATILITY_DAMAGE_TAKEN:
break;
}
}
src/server/game/Entities/Unit/Unit.h
+13 -8
View File
@@ -615,7 +615,7 @@ enum WeaponAttackType : uint16
enum CombatRating
{
CR_WEAPON_SKILL = 0,
CR_UNUSED_1 = 0,
CR_DEFENSE_SKILL = 1, // Removed in 4.0.1
CR_DODGE = 2,
CR_PARRY = 3,
@@ -626,24 +626,29 @@ enum CombatRating
CR_CRIT_MELEE = 8,
CR_CRIT_RANGED = 9,
CR_CRIT_SPELL = 10,
CR_HIT_TAKEN_MELEE = 11, // Deprecated since Cataclysm
CR_HIT_TAKEN_RANGED = 12, // Deprecated since Cataclysm
CR_HIT_TAKEN_SPELL = 13, // Deprecated since Cataclysm
CR_MULTISTRIKE = 11,
CR_READINESS = 12,
CR_SPEED = 13,
CR_RESILIENCE_CRIT_TAKEN = 14,
CR_RESILIENCE_PLAYER_DAMAGE_TAKEN = 15,
CR_CRIT_TAKEN_SPELL = 16, // Deprecated since Cataclysm
CR_LIFESTEAL = 16,
CR_HASTE_MELEE = 17,
CR_HASTE_RANGED = 18,
CR_HASTE_SPELL = 19,
CR_WEAPON_SKILL_MAINHAND = 20,
CR_WEAPON_SKILL_OFFHAND = 21,
CR_AVOIDANCE = 20,
CR_UNUSED_2 = 21,
CR_WEAPON_SKILL_RANGED = 22,
CR_EXPERTISE = 23,
CR_ARMOR_PENETRATION = 24,
CR_MASTERY = 25,
CR_UNUSED_3 = 26,
CR_UNUSED_4 = 27,
CR_VERSATILITY_DAMAGE_DONE = 28,
// placeholder = 29,
CR_VERSATILITY_DAMAGE_TAKEN = 30
};
#define MAX_COMBAT_RATING 26
#define MAX_COMBAT_RATING 31
enum DamageEffectType
{