diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc
index 9a446bea..882778a7 100644
--- a/server/gameserver/battledatacontext.cc
+++ b/server/gameserver/battledatacontext.cc
@@ -301,21 +301,23 @@ float BattleDataContext::GetWeaponAtk()
 
 bool BattleDataContext::IsCrit()
 {
-    return true;
+    int rnd = a8::RandEx(0, 1000 - 1);
+    return crit_ > rnd;;
 }
 
 
 bool BattleDataContext::IsDodge()
 {
-    return true;
+    int rnd = a8::RandEx(0, 1000 - 1);
+    return dodge_ > rnd;;
 }
 
 float BattleDataContext::GetCritRate()
 {
-    return 0;
+    return crit_damage_rate;
 }
 
 float BattleDataContext::GetDodgeRate()
 {
-    return 0;
+    return dodge_damage_rate;
 }