diff options
| author | Duarte Duarte <dnpd.dd@gmail.com> | 2015-07-19 14:22:47 -0700 |
|---|---|---|
| committer | Duarte Duarte <dnpd.dd@gmail.com> | 2015-07-19 14:22:47 -0700 |
| commit | b8d169f64f566ad3552301f7ee4f32aec1ce691d (patch) | |
| tree | 50cd27ef150ba22606c875a81ba9e694e888f395 | |
| parent | 673648ee6507597837bd2c8a7a78f425d139baea (diff) | |
| parent | 973934705cd4043d254278d3d96a688b2b4ae97a (diff) | |
Merge pull request #14946 from AriDEV/6.x
Core/Entities: Update for CombatRatings.
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 19 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 21 |
2 files changed, 25 insertions, 15 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 64bf9c66c2a..68c50d46267 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -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; } } diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 8ac08ba24dc..fe7fd3c306a 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -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 { |