Dungeon Finder: Drop use of config value CONFIG_INSTANCE_IGNORE_LEVEL

--HG--
branch : trunk
This commit is contained in:
Spp
2010-08-17 10:24:52 +02:00
parent 407f39cbac
commit 46d06a859b
+18 -23
View File
@@ -1762,31 +1762,26 @@ LfgLockStatusSet* LFGMgr::GetPlayerLockStatusDungeons(Player *plr, LfgDungeonSet
locktype = LFG_LOCKSTATUS_RAID_LOCKED; locktype = LFG_LOCKSTATUS_RAID_LOCKED;
else if (dungeon->difficulty > DUNGEON_DIFFICULTY_NORMAL && plr->GetBoundInstance(dungeon->map, Difficulty(dungeon->difficulty))) else if (dungeon->difficulty > DUNGEON_DIFFICULTY_NORMAL && plr->GetBoundInstance(dungeon->map, Difficulty(dungeon->difficulty)))
locktype = LFG_LOCKSTATUS_RAID_LOCKED; locktype = LFG_LOCKSTATUS_RAID_LOCKED;
else else if (dungeon->minlevel > level)
locktype = LFG_LOCKSTATUS_TOO_LOW_LEVEL;
else if (dungeon->maxlevel < level)
locktype = LFG_LOCKSTATUS_TOO_HIGH_LEVEL;
else if (locktype == LFG_LOCKSTATUS_OK && ar)
{ {
if (!sWorld.getConfig(CONFIG_INSTANCE_IGNORE_LEVEL)) if (ar->achievement && !plr->GetAchievementMgr().HasAchieved(sAchievementStore.LookupEntry(ar->achievement)))
if (dungeon->minlevel > level) locktype = LFG_LOCKSTATUS_RAID_LOCKED; // FIXME: Check the correct lock value
locktype = LFG_LOCKSTATUS_TOO_LOW_LEVEL; else if (plr->GetTeam() == ALLIANCE && ar->quest_A && !plr->GetQuestRewardStatus(ar->quest_A))
else if (dungeon->maxlevel < level) locktype = LFG_LOCKSTATUS_QUEST_NOT_COMPLETED;
locktype = LFG_LOCKSTATUS_TOO_HIGH_LEVEL; else if (plr->GetTeam() == HORDE && ar->quest_H && !plr->GetQuestRewardStatus(ar->quest_H))
locktype = LFG_LOCKSTATUS_QUEST_NOT_COMPLETED;
if (locktype == LFG_LOCKSTATUS_OK && ar) else
{ if (ar->item)
if (ar->achievement && !plr->GetAchievementMgr().HasAchieved(sAchievementStore.LookupEntry(ar->achievement))) {
locktype = LFG_LOCKSTATUS_RAID_LOCKED; // FIXME: Check the correct lock value if (!plr->HasItemCount(ar->item, 1) && (!ar->item2 || !plr->HasItemCount(ar->item2, 1)))
else if (plr->GetTeam() == ALLIANCE && ar->quest_A && !plr->GetQuestRewardStatus(ar->quest_A))
locktype = LFG_LOCKSTATUS_QUEST_NOT_COMPLETED;
else if (plr->GetTeam() == HORDE && ar->quest_H && !plr->GetQuestRewardStatus(ar->quest_H))
locktype = LFG_LOCKSTATUS_QUEST_NOT_COMPLETED;
else
if (ar->item)
{
if (!plr->HasItemCount(ar->item, 1) && (!ar->item2 || !plr->HasItemCount(ar->item2, 1)))
locktype = LFG_LOCKSTATUS_MISSING_ITEM;
}
else if (ar->item2 && !plr->HasItemCount(ar->item2, 1))
locktype = LFG_LOCKSTATUS_MISSING_ITEM; locktype = LFG_LOCKSTATUS_MISSING_ITEM;
} }
else if (ar->item2 && !plr->HasItemCount(ar->item2, 1))
locktype = LFG_LOCKSTATUS_MISSING_ITEM;
} }
/* TODO VoA closed if WG is not under team control (LFG_LOCKSTATUS_RAID_LOCKED) /* TODO VoA closed if WG is not under team control (LFG_LOCKSTATUS_RAID_LOCKED)
locktype = LFG_LOCKSTATUS_TOO_LOW_GEAR_SCORE; locktype = LFG_LOCKSTATUS_TOO_LOW_GEAR_SCORE;