mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10668] Implement CONDITION_*ITEM_WITH_BANK conditions.

Browse source 
Similar CONDITION_*ITEM but including character bank content in counting.
This commit is contained in:
VladimirMangos 2010-11-01 06:24:48 +03:00
parent ef5ea6f24f
commit 97ff7e6006
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/ObjectMgr.cpp
View file

@ -8191,6 +8191,10 @@ bool PlayerCondition::Meets(Player const * player) const
return true; return true;
return false; return false;
} }
case CONDITION_ITEM_WITH_BANK:
return player->HasItemCount(value1, value2, true);
case CONDITION_NOITEM_WITH_BANK:
return !player->HasItemCount(value1, value2, true);
default: default:
return false; return false;
} }
@ -8224,6 +8228,8 @@ bool PlayerCondition::IsValid(ConditionType condition, uint32 value1, uint32 val
} }
case CONDITION_ITEM: case CONDITION_ITEM:
case CONDITION_NOITEM: case CONDITION_NOITEM:
case CONDITION_ITEM_WITH_BANK:
case CONDITION_NOITEM_WITH_BANK:
{ {
ItemPrototype const *proto = ObjectMgr::GetItemPrototype(value1); ItemPrototype const *proto = ObjectMgr::GetItemPrototype(value1);
if (!proto) if (!proto)

10
src/game/ObjectMgr.h
View file

@ -594,7 +594,7 @@ enum ConditionType
{ // value1 value2 for the Condition enumed { // value1 value2 for the Condition enumed
CONDITION_NONE = 0, // 0 0 CONDITION_NONE = 0, // 0 0
CONDITION_AURA = 1, // spell_id effindex CONDITION_AURA = 1, // spell_id effindex
CONDITION_ITEM = 2, // item_id count CONDITION_ITEM = 2, // item_id count check present req. amount items in inventory
CONDITION_ITEM_EQUIPPED = 3, // item_id 0 CONDITION_ITEM_EQUIPPED = 3, // item_id 0
CONDITION_AREAID = 4, // area_id 0, 1 (0: in (sub)area, 1: not in (sub)area) CONDITION_AREAID = 4, // area_id 0, 1 (0: in (sub)area, 1: not in (sub)area)
CONDITION_REPUTATION_RANK = 5, // faction_id min_rank CONDITION_REPUTATION_RANK = 5, // faction_id min_rank
@ -608,16 +608,18 @@ enum ConditionType
CONDITION_AREA_FLAG = 13, // area_flag area_flag_not CONDITION_AREA_FLAG = 13, // area_flag area_flag_not
CONDITION_RACE_CLASS = 14, // race_mask class_mask CONDITION_RACE_CLASS = 14, // race_mask class_mask
CONDITION_LEVEL = 15, // player_level 0, 1 or 2 (0: equal to, 1: equal or higher than, 2: equal or less than) CONDITION_LEVEL = 15, // player_level 0, 1 or 2 (0: equal to, 1: equal or higher than, 2: equal or less than)
CONDITION_NOITEM = 16, // item_id count CONDITION_NOITEM = 16, // item_id count check not present req. amount items in inventory
CONDITION_SPELL = 17, // spell_id 0, 1 (0: has spell, 1: hasn't spell) CONDITION_SPELL = 17, // spell_id 0, 1 (0: has spell, 1: hasn't spell)
CONDITION_INSTANCE_SCRIPT = 18, // map_id instance_condition_id (instance script specific enum) CONDITION_INSTANCE_SCRIPT = 18, // map_id instance_condition_id (instance script specific enum)
CONDITION_QUESTAVAILABLE = 19, // quest_id 0 for case when loot/gossip possible only if player can start quest CONDITION_QUESTAVAILABLE = 19, // quest_id 0 for case when loot/gossip possible only if player can start quest
CONDITION_ACHIEVEMENT = 20, // ach_id 0, 1 (0: has achievement, 1: hasn't achievement) for player CONDITION_ACHIEVEMENT = 20, // ach_id 0, 1 (0: has achievement, 1: hasn't achievement) for player
CONDITION_ACHIEVEMENT_REALM = 21, // ach_id 0, 1 (0: has achievement, 1: hasn't achievement) for server CONDITION_ACHIEVEMENT_REALM = 21, // ach_id 0, 1 (0: has achievement, 1: hasn't achievement) for server
CONDITION_QUEST_NONE = 22 // quest_id 0 (quest did not take and not rewarded) CONDITION_QUEST_NONE = 22, // quest_id 0 (quest did not take and not rewarded)
CONDITION_ITEM_WITH_BANK = 23, // item_id count check present req. amount items in inventory or bank
CONDITION_NOITEM_WITH_BANK = 24, // item_id count check not present req. amount items in inventory or bank
}; };
#define MAX_CONDITION 23 // maximum value in ConditionType enum #define MAX_CONDITION 25 // maximum value in ConditionType enum
struct PlayerCondition struct PlayerCondition
{ {

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10667" #define REVISION_NR "10668"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__