Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
This commit is contained in:
commit
fca4a5448a
166 files changed
+3523
-3008
No files matched your search
@@ -410,7 +410,7 @@ enum SMART_ACTION
|
||||
SMART_ACTION_ACTIVATE_GOBJECT = 9, //
|
||||
SMART_ACTION_RANDOM_EMOTE = 10, // EmoteId1, EmoteId2, EmoteId3...
|
||||
SMART_ACTION_CAST = 11, // SpellId, CastFlags
|
||||
SMART_ACTION_SUMMON_CREATURE = 12, // CreatureID, summonType, duration in ms, storageID, attackInvoker,
|
||||
SMART_ACTION_SUMMON_CREATURE = 12, // CreatureID, summonType, duration in ms, attackInvoker
|
||||
SMART_ACTION_THREAT_SINGLE_PCT = 13, // Threat%
|
||||
SMART_ACTION_THREAT_ALL_PCT = 14, // Threat%
|
||||
SMART_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS = 15, // QuestID
|
||||
@@ -584,7 +584,6 @@ struct SmartAction
|
||||
uint32 creature;
|
||||
uint32 type;
|
||||
uint32 duration;
|
||||
uint32 storageID;
|
||||
uint32 attackInvoker;
|
||||
} summonCreature;
|
||||
|
||||
@@ -1023,8 +1022,8 @@ 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_CLOSEST_ENEMY = 25, // maxDist
|
||||
SMART_TARGET_CLOSEST_FRIENDLY = 26, // maxDist
|
||||
SMART_TARGET_CLOSEST_ENEMY = 25, // maxDist, playerOnly
|
||||
SMART_TARGET_CLOSEST_FRIENDLY = 26, // maxDist, playerOnly
|
||||
|
||||
SMART_TARGET_END = 27
|
||||
};
|
||||
@@ -1111,11 +1110,13 @@ struct SmartTarget
|
||||
struct
|
||||
{
|
||||
uint32 maxDist;
|
||||
uint32 playerOnly;
|
||||
} closestAttackable;
|
||||
|
||||
struct
|
||||
{
|
||||
uint32 maxDist;
|
||||
uint32 playerOnly;
|
||||
} closestFriendly;
|
||||
|
||||
struct
|
||||
@@ -1289,7 +1290,7 @@ enum SmartCastFlags
|
||||
struct SmartScriptHolder
|
||||
{
|
||||
SmartScriptHolder() : entryOrGuid(0), source_type(SMART_SCRIPT_TYPE_CREATURE)
|
||||
, event_id(0), link(0), timer(0), active(false), runOnce(false)
|
||||
, event_id(0), link(0), event(), action(), target(), timer(0), active(false), runOnce(false)
|
||||
, enableTimed(false) {}
|
||||
|
||||
int32 entryOrGuid;
|
||||
|
||||
Reference in new issue
Block a user