Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 23:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Conditions: Convert CONDITION_MAP_DIFFICULTY in CONDITION_SPAWNMASK for more handling

Browse Source
This commit is contained in:
Vincent-Michael
2012-09-15 22:32:10 +02:00
parent 0d3554d4bf
commit 883db2af3e
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/updates/world/2012_09_16_01_world_conditions.sql Normal file
View File

@@ -0,0 +1,4 @@
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=10 AND `SourceGroup`=34379;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(10,34379,50452,0,0,19,0,8,0,0,0,0,'', 'Wodin''s Lucky Necklace only 25 heroic'),
(10,34379,50453,0,0,19,0,8,0,0,0,0,'', 'Ring of Rotting Sinew only 25 heroic');

17
src/server/game/Conditions/ConditionMgr.cpp
View File

@@ -279,16 +279,9 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
condMeets = player->HasTitle(ConditionValue1);
break;
}
case CONDITION_MAP_DIFFICULTY:
case CONDITION_SPAWNMASK:
{
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;
}
condMeets = ((1 << object->GetMap()->GetSpawnMode()) & ConditionValue1);
break;
}
default:
@@ -442,7 +435,7 @@ uint32 Condition::GetSearcherTypeMaskForCondition()
case CONDITION_TITLE:
mask |= GRID_MAP_TYPE_MASK_PLAYER;
break;
case CONDITION_MAP_DIFFICULTY:
case CONDITION_SPAWNMASK:
mask |= GRID_MAP_TYPE_MASK_ALL;
break;
default:
@@ -1857,9 +1850,9 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
}
break;
}
case CONDITION_MAP_DIFFICULTY:
case CONDITION_SPAWNMASK:
{
if (cond->ConditionValue1 >= MAX_DIFFICULTY)
if (cond->ConditionValue1 > SPAWNMASK_RAID_ALL)
{
sLog->outError(LOG_FILTER_SQL, "Map Difficulty condition has non existing map difficulty in value1 (%u), skipped", cond->ConditionValue1);
return false;

2
src/server/game/Conditions/ConditionMgr.h
View File

@@ -49,7 +49,7 @@ enum ConditionTypes
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_TITLE = 18, // title id 0 0 true if player has title
CONDITION_MAP_DIFFICULTY = 19, // difficulty 0 0
CONDITION_SPAWNMASK = 19, // spawnMask 0 0
CONDITION_UNUSED_20 = 20, //
CONDITION_UNUSED_21 = 21, //
CONDITION_MAPID = 22, // map_id 0 0 true if in map_id