[Warrior] Fix T20 bonus and hotfix

Assume Bladestorm ticks 0 and 3 as well as first Ravager tick.

engine/class_modules/sc_warrior.cpp

@@ -1616,7 +1616,8 @@ struct bladestorm_t: public warrior_attack_t
     {
       bladestorm_oh -> execute();
     }
-    if ( mortal_strike && d -> ticks_left() % 2 != 0)
+    // Hotfix as of 2014-12-05: 3 -> 2 ticks with an additional MS. Assume ticks 0 and 3.
+    if ( mortal_strike && (d -> current_tick == 0 || d -> current_tick == 3 ) )
     {
       auto t = select_random_target();
 
@@ -3393,7 +3394,9 @@ struct ravager_t: public warrior_attack_t
     warrior_attack_t::tick( d );
     ravager -> execute();
   // the 4pc occurs on the first and 4th tick
-  if (mortal_strike && (d->current_tick == 1 || d->current_tick == 4))
+  // if (mortal_strike && (d->current_tick == 1 || d->current_tick == 4))
+  // As of 2017-12-05, this was hotfixed to only one tick total. Assume first one.
+  if (mortal_strike && d -> current_tick == 1)
     {
       auto t = select_random_target();