josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Conditions: Implemented CONDITION_MAP_DIFFICULTY

Browse Source
This commit is contained in:
Vincent-Michael
2012-09-15 20:27:01 +02:00
parent 7b3ea36c8c
commit 5305626214
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Conditions/ConditionMgr.cpp
+23 -2
View File
@@ -279,6 +279,18 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
condMeets = player->HasTitle(ConditionValue1); condMeets = player->HasTitle(ConditionValue1);
break; break;
} }
case CONDITION_MAP_DIFFICULTY:
{
if (Unit* unit = object->ToUnit())
{
if (unit->GetMap()->IsRaid())
if (unit->GetMap()->Is25ManRaid() != ((ConditionValue1 & RAID_DIFFICULTY_MASK_25MAN) != 0))
return false;
condMeets = unit->GetMap()->GetSpawnMode() >= ConditionValue1;
}
break;
}
default: default:
condMeets = false; condMeets = false;
break; break;
@@ -430,6 +442,9 @@ uint32 Condition::GetSearcherTypeMaskForCondition()
case CONDITION_TITLE: case CONDITION_TITLE:
mask |= GRID_MAP_TYPE_MASK_PLAYER; mask |= GRID_MAP_TYPE_MASK_PLAYER;
break; break;
case CONDITION_MAP_DIFFICULTY:
mask |= GRID_MAP_TYPE_MASK_ALL;
break;
default: default:
ASSERT(false && "Condition::GetSearcherTypeMaskForCondition - missing condition handling!"); ASSERT(false && "Condition::GetSearcherTypeMaskForCondition - missing condition handling!");
break; break;
@@ -1842,9 +1857,15 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
} }
break; break;
} }
case CONDITION_UNUSED_19: case CONDITION_MAP_DIFFICULTY:
sLog->outError(LOG_FILTER_SQL, "Found ConditionTypeOrReference = CONDITION_UNUSED_19 in `conditions` table - ignoring"); {
if (cond->ConditionValue1 >= MAX_DIFFICULTY)
{
sLog->outError(LOG_FILTER_SQL, "Map Difficulty condition has non existing map difficulty in value1 (%u), skipped", cond->ConditionValue1);
return false; return false;
}
break;
}
case CONDITION_UNUSED_20: case CONDITION_UNUSED_20:
sLog->outError(LOG_FILTER_SQL, "Found ConditionTypeOrReference = CONDITION_UNUSED_20 in `conditions` table - ignoring"); sLog->outError(LOG_FILTER_SQL, "Found ConditionTypeOrReference = CONDITION_UNUSED_20 in `conditions` table - ignoring");
return false; return false;
src/server/game/Conditions/ConditionMgr.h
+1 -1
View File
@@ -49,7 +49,7 @@ enum ConditionTypes
CONDITION_RACE = 16, // race 0 0 true if player's race is equal to race CONDITION_RACE = 16, // race 0 0 true if player's race is equal to race
CONDITION_ACHIEVEMENT = 17, // achievement_id 0 0 true if achievement is complete CONDITION_ACHIEVEMENT = 17, // achievement_id 0 0 true if achievement is complete
CONDITION_TITLE = 18, // title id 0 0 true if player has title CONDITION_TITLE = 18, // title id 0 0 true if player has title
CONDITION_UNUSED_19 = 19, // CONDITION_MAP_DIFFICULTY = 19, // difficulty 0 0
CONDITION_UNUSED_20 = 20, // CONDITION_UNUSED_20 = 20, //
CONDITION_UNUSED_21 = 21, // CONDITION_UNUSED_21 = 21, //
CONDITION_MAPID = 22, // map_id 0 0 true if in map_id CONDITION_MAPID = 22, // map_id 0 0 true if in map_id