Merge branch 'master' into 4.x
Conflicts: sql/base/auth_database.sql src/server/authserver/Server/AuthSocket.cpp src/server/game/AI/CoreAI/CombatAI.cpp src/server/game/AuctionHouse/AuctionHouseMgr.cpp src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp src/server/game/DataStores/DBCStructure.h src/server/game/DataStores/DBCfmt.h src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Vehicle/Vehicle.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Globals/ObjectMgr.h src/server/game/Handlers/AuctionHouseHandler.cpp src/server/game/Miscellaneous/SharedDefines.h src/server/game/Movement/MotionMaster.cpp src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp src/server/game/Quests/QuestDef.cpp src/server/game/Server/Protocol/Opcodes.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellEffects.cpp src/server/game/Spells/SpellInfo.cpp src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp src/server/scripts/Spells/spell_quest.cpp src/server/shared/Logging/Log.h src/server/worldserver/worldserver.conf.dist src/tools/vmap3_extractor/model.h src/tools/vmap4_extractor/CMakeLists.txt src/tools/vmap4_extractor/dbcfile.cpp src/tools/vmap4_extractor/dbcfile.h src/tools/vmap4_extractor/loadlib/loadlib.h
This commit is contained in:
commit
5cff9e0716
530 files changed
+42084
-9652
No files matched your search
@@ -155,7 +155,7 @@ enum SMART_EVENT
|
||||
SMART_EVENT_IS_BEHIND_TARGET = 67, //1 // cooldownMin, CooldownMax
|
||||
SMART_EVENT_GAME_EVENT_START = 68, //1 // game_event.Entry
|
||||
SMART_EVENT_GAME_EVENT_END = 69, //1 // game_event.Entry
|
||||
SMART_EVENT_GO_STATE_CHANGED = 70, // go state
|
||||
SMART_EVENT_GO_STATE_CHANGED = 70, // go state
|
||||
|
||||
SMART_EVENT_END = 71,
|
||||
};
|
||||
@@ -342,16 +342,16 @@ struct SmartEvent
|
||||
uint32 cooldownMax;
|
||||
} behindTarget;
|
||||
|
||||
struct
|
||||
struct
|
||||
{
|
||||
uint32 gameEventId;
|
||||
} gameEvent;
|
||||
|
||||
|
||||
struct
|
||||
{
|
||||
uint32 state;
|
||||
} goStateChanged;
|
||||
|
||||
|
||||
struct
|
||||
{
|
||||
uint32 param1;
|
||||
@@ -873,7 +873,7 @@ struct SmartAction
|
||||
{
|
||||
uint32 goRespawnTime;
|
||||
} RespawnTarget;
|
||||
|
||||
|
||||
struct
|
||||
{
|
||||
uint32 gossipMenuId;
|
||||
@@ -884,12 +884,12 @@ struct SmartAction
|
||||
{
|
||||
uint32 state;
|
||||
} setGoLootState;
|
||||
|
||||
|
||||
struct
|
||||
{
|
||||
uint32 id;
|
||||
} sendTargetToTarget;
|
||||
|
||||
|
||||
struct
|
||||
{
|
||||
uint32 param1;
|
||||
@@ -1181,7 +1181,7 @@ 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
|
||||
//CAST_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
|
||||
|
||||
Reference in new issue
Block a user