Merge pull request #4396 from w1sht0l1v3/master

Core/Achievements: Remove hardcoded script for Fa-la-la-la-Ogri'la and add proper achievement criteria data in DB
This commit is contained in:
Shocker
2011-12-19 09:30:36 -08:00
2 changed files with 11 additions and 8 deletions

View File

@@ -0,0 +1,11 @@
-- Achievement Fa-la-la-la-Ogri'la
DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (3936,3937,3938);
INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
-- requires aura
(3936, 5, 44827, 0, ''),
(3937, 5, 44825, 0, ''),
(3938, 5, 44824, 0, ''),
-- requires Holiday Winter Veil
(3936, 16, 141, 0, ''),
(3937, 16, 141, 0, ''),
(3938, 16, 141, 0, '');

View File

@@ -1069,14 +1069,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
continue;
}
if (achievement->ID == 1282)
{
// those requirements couldn't be found in the dbc
AchievementCriteriaDataSet const* data = sAchievementMgr->GetCriteriaDataSet(achievementCriteria);
if (!data || !data->Meets(GetPlayer(), unit))
continue;
}
SetCriteriaProgress(achievementCriteria, 1);
break;
}