Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Vehicle/Vehicle.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Spells/SpellMgr.cpp src/server/game/Weather/Weather.h src/server/shared/Database/Implementation/WorldDatabase.cpp src/tools/CMakeLists.txt
This commit is contained in:
commit
71eaceae5d
74 files changed
+1107
-570
No files matched your search
@@ -427,7 +427,6 @@ enum SMART_ACTION
|
||||
SMART_ACTION_SET_INVINCIBILITY_HP_LEVEL = 42, // MinHpValue(+pct, -flat)
|
||||
SMART_ACTION_MOUNT_TO_ENTRY_OR_MODEL = 43, // Creature_template entry(param1) OR ModelId (param2) (or 0 for both to dismount)
|
||||
SMART_ACTION_SET_INGAME_PHASE_MASK = 44, // mask
|
||||
|
||||
SMART_ACTION_SET_DATA = 45, // Field, Data (only creature TODO)
|
||||
SMART_ACTION_MOVE_FORWARD = 46, // distance
|
||||
SMART_ACTION_SET_VISIBILITY = 47, // on/off
|
||||
@@ -450,7 +449,6 @@ enum SMART_ACTION
|
||||
SMART_ACTION_STORE_TARGET_LIST = 64, // varID,
|
||||
SMART_ACTION_WP_RESUME = 65, // none
|
||||
SMART_ACTION_SET_ORIENTATION = 66, //
|
||||
|
||||
SMART_ACTION_CREATE_TIMED_EVENT = 67, // id, InitialMin, InitialMax, RepeatMin(only if it repeats), RepeatMax(only if it repeats), chance
|
||||
SMART_ACTION_PLAYMOVIE = 68, // entry
|
||||
SMART_ACTION_MOVE_TO_POS = 69, // PointId, xyz
|
||||
@@ -488,8 +486,11 @@ enum SMART_ACTION
|
||||
SMART_ACTION_SET_HOME_POS = 101, // none
|
||||
SMART_ACTION_SET_HEALTH_REGEN = 102, // 0/1
|
||||
SMART_ACTION_SET_ROOT = 103, // off/on
|
||||
SMART_ACTION_SET_GO_FLAG = 104, // Flags
|
||||
SMART_ACTION_ADD_GO_FLAG = 105, // Flags
|
||||
SMART_ACTION_REMOVE_GO_FLAG = 106, // Flags
|
||||
|
||||
SMART_ACTION_END = 104
|
||||
SMART_ACTION_END = 107
|
||||
};
|
||||
|
||||
struct SmartAction
|
||||
@@ -926,6 +927,11 @@ struct SmartAction
|
||||
uint32 root;
|
||||
} setRoot;
|
||||
|
||||
struct
|
||||
{
|
||||
uint32 flag;
|
||||
} goFlag;
|
||||
|
||||
//! Note for any new future actions
|
||||
//! All parameters must have type uint32
|
||||
|
||||
|
||||
Reference in new issue
Block a user