Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Conditions: updated CONDITION_SPELL to allow to return false also

Browse Source
This commit is contained in:
Supabad
2011-04-09 10:12:45 +02:00
parent 46849c52e5
commit 6174703d45
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,7 +158,10 @@ bool Condition::Meets(Player * player, Unit* invoker)
break;
}
case CONDITION_SPELL:
condMeets = player->HasSpell(mConditionValue1);
if (mConditionValue2 == 0)
condMeets = player->HasSpell(mConditionValue1);
else
condMeets = !player->HasSpell(mConditionValue1);
break;
case CONDITION_NOITEM:
condMeets = !player->HasItemCount(mConditionValue1, 1, mConditionValue2 ? true : false);

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

@@ -52,7 +52,7 @@ enum ConditionType
CONDITION_MAPID = 22, // map_id 0 +referenceID true if in map_id
CONDITION_AREAID = 23, // area_id 0 +referenceID true if in area_id
CONDITION_ITEM_TARGET = 24, // ItemRequiredTargetType, TargetEntry, 0
CONDITION_SPELL = 25, // spell_id 0 +referenceID true if knows spell
CONDITION_SPELL = 25, // spell_id bool +referenceID bool 0 for true 1 for false
CONDITION_NOITEM = 26, // item_id bank +referenceID true if player does not have any of the item (if 'bank' is set it searches in bank slots too)
CONDITION_LEVEL = 27, // level opt +referenceID true if player's level is equal to param1 (param2 can modify the statement)
CONDITION_QUEST_COMPLETE = 28, // quest_id 0 +referenceID true if player has quest_id with all objectives complete, but not yet rewarded