Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.h src/server/game/Achievements/AchievementMgr.h src/server/game/Battlegrounds/Battleground.h src/server/game/DataStores/DBCEnums.h src/server/game/Entities/Object/ObjectDefines.h src/server/game/Entities/Object/Updates/UpdateFields.h src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Entities/Unit/Unit.h src/server/game/Groups/Group.h src/server/game/Guilds/Guild.h src/server/game/Instances/InstanceScript.h src/server/game/Miscellaneous/SharedDefines.h src/server/game/Movement/Spline/MoveSplineFlag.h src/server/game/OutdoorPvP/OutdoorPvP.h src/server/game/Quests/QuestDef.h src/server/game/Spells/Spell.h src/server/game/Spells/SpellInfo.h
This commit is contained in:
commit
68e0ef8039
115 files changed
+616
-447
No files matched your search
@@ -55,7 +55,7 @@ enum SMART_EVENT_PHASE
|
||||
SMART_EVENT_PHASE_6 = 6,
|
||||
SMART_EVENT_PHASE_MAX = 7,
|
||||
|
||||
SMART_EVENT_PHASE_COUNT = 6,
|
||||
SMART_EVENT_PHASE_COUNT = 6
|
||||
};
|
||||
|
||||
enum SMART_EVENT_PHASE_BITS
|
||||
@@ -67,7 +67,7 @@ enum SMART_EVENT_PHASE_BITS
|
||||
SMART_EVENT_PHASE_4_BIT = 8,
|
||||
SMART_EVENT_PHASE_5_BIT = 16,
|
||||
SMART_EVENT_PHASE_6_BIT = 32,
|
||||
SMART_EVENT_PHASE_ALL = SMART_EVENT_PHASE_1_BIT + SMART_EVENT_PHASE_2_BIT + SMART_EVENT_PHASE_3_BIT + SMART_EVENT_PHASE_4_BIT + SMART_EVENT_PHASE_5_BIT + SMART_EVENT_PHASE_6_BIT,
|
||||
SMART_EVENT_PHASE_ALL = SMART_EVENT_PHASE_1_BIT + SMART_EVENT_PHASE_2_BIT + SMART_EVENT_PHASE_3_BIT + SMART_EVENT_PHASE_4_BIT + SMART_EVENT_PHASE_5_BIT + SMART_EVENT_PHASE_6_BIT
|
||||
};
|
||||
|
||||
const uint32 SmartPhaseMask[SMART_EVENT_PHASE_COUNT][2] =
|
||||
@@ -77,7 +77,7 @@ const uint32 SmartPhaseMask[SMART_EVENT_PHASE_COUNT][2] =
|
||||
{SMART_EVENT_PHASE_3, SMART_EVENT_PHASE_3_BIT },
|
||||
{SMART_EVENT_PHASE_4, SMART_EVENT_PHASE_4_BIT },
|
||||
{SMART_EVENT_PHASE_5, SMART_EVENT_PHASE_5_BIT },
|
||||
{SMART_EVENT_PHASE_6, SMART_EVENT_PHASE_6_BIT },
|
||||
{SMART_EVENT_PHASE_6, SMART_EVENT_PHASE_6_BIT }
|
||||
};
|
||||
|
||||
enum SMART_EVENT
|
||||
@@ -157,7 +157,7 @@ enum SMART_EVENT
|
||||
SMART_EVENT_ACTION_DONE = 72, // eventId (SharedDefines.EventId)
|
||||
SMART_EVENT_ON_SPELLCLICK = 73, // clicker (unit)
|
||||
|
||||
SMART_EVENT_END = 74,
|
||||
SMART_EVENT_END = 74
|
||||
};
|
||||
|
||||
struct SmartEvent
|
||||
@@ -377,7 +377,7 @@ enum SMART_SCRIPT_RESPAWN_CONDITION
|
||||
SMART_SCRIPT_RESPAWN_CONDITION_NONE = 0,
|
||||
SMART_SCRIPT_RESPAWN_CONDITION_MAP = 1,
|
||||
SMART_SCRIPT_RESPAWN_CONDITION_AREA = 2,
|
||||
SMART_SCRIPT_RESPAWN_CONDITION_END = 3,
|
||||
SMART_SCRIPT_RESPAWN_CONDITION_END = 3
|
||||
};
|
||||
|
||||
enum SMART_ACTION
|
||||
@@ -487,7 +487,7 @@ enum SMART_ACTION
|
||||
SMART_ACTION_SEND_TARGET_TO_TARGET = 100, // id
|
||||
SMART_ACTION_SET_HOME_POS = 101, // none
|
||||
|
||||
SMART_ACTION_END = 102,
|
||||
SMART_ACTION_END = 102
|
||||
};
|
||||
|
||||
struct SmartAction
|
||||
@@ -936,7 +936,7 @@ enum SMARTAI_TEMPLATE
|
||||
SMARTAI_TEMPLATE_PASSIVE = 3,
|
||||
SMARTAI_TEMPLATE_CAGED_GO_PART = 4, //creatureID, give credit at point end?,
|
||||
SMARTAI_TEMPLATE_CAGED_NPC_PART = 5, //gameObjectID, despawntime, run?, dist, TextGroupID
|
||||
SMARTAI_TEMPLATE_END = 6,
|
||||
SMARTAI_TEMPLATE_END = 6
|
||||
};
|
||||
|
||||
enum SMARTAI_TARGETS
|
||||
@@ -966,7 +966,7 @@ enum SMARTAI_TARGETS
|
||||
SMART_TARGET_ACTION_INVOKER_VEHICLE = 22, // Unit's vehicle who caused this Event to occur
|
||||
SMART_TARGET_OWNER_OR_SUMMONER = 23, // Unit's owner or summoner
|
||||
SMART_TARGET_THREAT_LIST = 24, // All units on creature's threat list
|
||||
SMART_TARGET_END = 25,
|
||||
SMART_TARGET_END = 25
|
||||
};
|
||||
|
||||
struct SmartTarget
|
||||
@@ -1059,12 +1059,12 @@ struct SmartTarget
|
||||
|
||||
enum eSmartAI
|
||||
{
|
||||
SMART_EVENT_PARAM_COUNT = 4,
|
||||
SMART_ACTION_PARAM_COUNT = 6,
|
||||
SMART_SUMMON_COUNTER = 0xFFFFFF,
|
||||
SMART_EVENT_PARAM_COUNT = 4,
|
||||
SMART_ACTION_PARAM_COUNT = 6,
|
||||
SMART_SUMMON_COUNTER = 0xFFFFFF,
|
||||
SMART_ESCORT_LAST_OOC_POINT = 0xFFFFFF,
|
||||
SMART_RANDOM_POINT = 0xFFFFFE,
|
||||
SMART_ESCORT_TARGETS = 0xFFFFFF
|
||||
SMART_RANDOM_POINT = 0xFFFFFE,
|
||||
SMART_ESCORT_TARGETS = 0xFFFFFF
|
||||
};
|
||||
|
||||
enum SmartScriptType
|
||||
@@ -1093,7 +1093,7 @@ enum SmartAITypeMaskId
|
||||
SMART_SCRIPT_TYPE_MASK_SPELL = 64,
|
||||
SMART_SCRIPT_TYPE_MASK_TRANSPORT = 128,
|
||||
SMART_SCRIPT_TYPE_MASK_INSTANCE = 256,
|
||||
SMART_SCRIPT_TYPE_MASK_TIMED_ACTIONLIST = 512,
|
||||
SMART_SCRIPT_TYPE_MASK_TIMED_ACTIONLIST = 512
|
||||
};
|
||||
|
||||
const uint32 SmartAITypeMask[SMART_SCRIPT_TYPE_MAX][2] =
|
||||
@@ -1185,7 +1185,7 @@ const uint32 SmartAIEventMask[SMART_EVENT_END][2] =
|
||||
{SMART_EVENT_GO_STATE_CHANGED, SMART_SCRIPT_TYPE_MASK_GAMEOBJECT },
|
||||
{SMART_EVENT_GO_EVENT_INFORM, SMART_SCRIPT_TYPE_MASK_GAMEOBJECT },
|
||||
{SMART_EVENT_ACTION_DONE, SMART_SCRIPT_TYPE_MASK_CREATURE },
|
||||
{SMART_EVENT_ON_SPELLCLICK, SMART_SCRIPT_TYPE_MASK_CREATURE },
|
||||
{SMART_EVENT_ON_SPELLCLICK, SMART_SCRIPT_TYPE_MASK_CREATURE }
|
||||
};
|
||||
|
||||
enum SmartEventFlags
|
||||
@@ -1211,14 +1211,15 @@ enum SmartCastFlags
|
||||
//CAST_FORCE_CAST = 0x04, //Forces cast even if creature is out of mana or out of range
|
||||
//CAST_NO_MELEE_IF_OOM = 0x08, //Prevents creature from entering melee if out of mana or out of range
|
||||
//CAST_FORCE_TARGET_SELF = 0x10, //Forces the target to cast this spell on itself
|
||||
SMARTCAST_AURA_NOT_PRESENT = 0x20, //Only casts the spell if the target does not have an aura from the spell
|
||||
SMARTCAST_AURA_NOT_PRESENT = 0x20 //Only casts the spell if the target does not have an aura from the spell
|
||||
};
|
||||
|
||||
// one line in DB is one event
|
||||
struct SmartScriptHolder
|
||||
{
|
||||
SmartScriptHolder() : timer(0), active(false), runOnce(false), link(0), entryOrGuid(0),
|
||||
event_id(0), enableTimed(false), source_type(SMART_SCRIPT_TYPE_CREATURE) {}
|
||||
SmartScriptHolder() : entryOrGuid(0), source_type(SMART_SCRIPT_TYPE_CREATURE)
|
||||
, event_id(0), link(0), timer(0), active(false), runOnce(false)
|
||||
, enableTimed(false) {}
|
||||
|
||||
int32 entryOrGuid;
|
||||
SmartScriptType source_type;
|
||||
|
||||
Reference in new issue
Block a user