FIX: ICC - default return position for BQL (#1737)

* Heirloom quality auto-equip calculation implemented

src/factory/StatsWeightCalculator.cpp

@@ -92,10 +92,18 @@ float StatsWeightCalculator::CalculateItem(uint32 itemId, int32 randomPropertyId
     CalculateSocketBonus(player_, proto);
 
     if (enable_quality_blend_)
-        // Blend with item quality and level
+    {
-        weight_ *= PlayerbotFactory::CalcMixedGearScore(proto->ItemLevel, proto->Quality);
+        // Heirloom items scale with player level
+        // Use player level as effective item level for heirlooms - Quality EPIC
+        // Else - Blend with item quality and level for normal items
+        if (proto->Quality == ITEM_QUALITY_HEIRLOOM)
+            weight_ *= PlayerbotFactory::CalcMixedGearScore(lvl, ITEM_QUALITY_EPIC); 
+        else
+            weight_ *= PlayerbotFactory::CalcMixedGearScore(proto->ItemLevel, proto->Quality);
+
+        return weight_;
+    }
 
-    return weight_;
 }
 
 float StatsWeightCalculator::CalculateEnchant(uint32 enchantId)

src/strategy/raids/icecrown/RaidIccMultipliers.cpp

@@ -472,7 +472,6 @@ float IccBqlMultiplier::GetValue(Action* action)
         else
             return 0.0f;  // Cancel all other actions when we need to handle Swarming Shadows
     }
-    return 1.0f;
 
     if ((boss->GetExactDist2d(ICC_BQL_TANK_POSITION.GetPositionX(), ICC_BQL_TANK_POSITION.GetPositionY()) > 10.0f) &&
         botAI->IsRanged(bot) && !((boss->GetPositionZ() - bot->GetPositionZ()) > 5.0f))
@@ -481,6 +480,7 @@ float IccBqlMultiplier::GetValue(Action* action)
             return 0.0f;
     }
 
+    return 1.0f;
 }
 
 //VDW