Changeset 6 for trunk/src/game/StatSystem.cpp

Timestamp:

11/19/08 13:22:12 (17 years ago)

Author:

yumileroy

Message:

[svn] * Added ACE for Linux and Windows (Thanks Derex for Linux part and partial Windows part)
* Updated to 6721 and 676
* Fixed TrinityScript? logo
* Version updated to 0.2.6721.676

Original author: Neo2003
Date: 2008-10-04 06:17:19-05:00

Files:

• trunk/src/game/StatSystem.cpp (modified) (2 diffs)

trunk/src/game/StatSystem.cpp

@@ -432 +432 @@
 void Player::UpdateBlockPercentage()
 {
-    // Base value
-    float value = 5.0f;
-    // Modify value from defense skill
-    value += (int32(GetDefenseSkillValue()) - int32(GetMaxSkillValueForLevel())) * 0.04f;
-    // Increase from SPELL_AURA_MOD_BLOCK_PERCENT aura
-    value += GetTotalAuraModifier(SPELL_AURA_MOD_BLOCK_PERCENT);
-    // Increase from rating
-    value += GetRatingBonusValue(CR_BLOCK);
-    value = value < 0.0f ? 0.0f : value;
+    // No block
+    float value = 0.0f;
+    if(CanBlock())
+    {
+        // Base value
+        value = 5.0f;
+        // Modify value from defense skill
+        value += (int32(GetDefenseSkillValue()) - int32(GetMaxSkillValueForLevel())) * 0.04f;
+        // Increase from SPELL_AURA_MOD_BLOCK_PERCENT aura
+        value += GetTotalAuraModifier(SPELL_AURA_MOD_BLOCK_PERCENT);
+        // Increase from rating
+        value += GetRatingBonusValue(CR_BLOCK);
+        value = value < 0.0f ? 0.0f : value;
+    }
     SetStatFloatValue(PLAYER_BLOCK_PERCENTAGE, value);
 }
@@ -492 +497 @@
 void Player::UpdateParryPercentage()
 {
-    // Base parry
-    float value  = 5.0f;
-    // Modify value from defense skill
-    value += (int32(GetDefenseSkillValue()) - int32(GetMaxSkillValueForLevel())) * 0.04f;
-    // Parry from SPELL_AURA_MOD_PARRY_PERCENT aura
-    value += GetTotalAuraModifier(SPELL_AURA_MOD_PARRY_PERCENT);
-    // Parry from rating
-    value += GetRatingBonusValue(CR_PARRY);
-    value = value < 0.0f ? 0.0f : value;
+    // No parry
+    float value = 0.0f;
+    if (CanParry())
+    {
+        // Base parry
+        value  = 5.0f;
+        // Modify value from defense skill
+        value += (int32(GetDefenseSkillValue()) - int32(GetMaxSkillValueForLevel())) * 0.04f;
+        // Parry from SPELL_AURA_MOD_PARRY_PERCENT aura
+        value += GetTotalAuraModifier(SPELL_AURA_MOD_PARRY_PERCENT);
+        // Parry from rating
+        value += GetRatingBonusValue(CR_PARRY);
+        value = value < 0.0f ? 0.0f : value;
+    }
     SetStatFloatValue(PLAYER_PARRY_PERCENTAGE, value);
 }