diff options
Diffstat (limited to 'src')
75 files changed, 273 insertions, 273 deletions
diff --git a/src/bindings/interface/Readme.txt b/src/bindings/interface/Readme.txt index e152162de8e..821f2367be4 100644 --- a/src/bindings/interface/Readme.txt +++ b/src/bindings/interface/Readme.txt @@ -2,7 +2,7 @@ ** HOW TO SCRIPT IN C++ ** 1 - create a file myscript.cpp in scripts folder. -2 - copy the content of script_default.cpp, it as the structure on how the scripting fuctions are organized. +2 - copy the content of script_default.cpp, it as the structure on how the scripting fuctions are organized. dont forget to change the name of fuctions, like GossipHello_default to GossipHello_myscript. 3 - in fuction AddSC_default change to AddSC_myscript. @@ -14,7 +14,7 @@ add your AddSC_myscript in here // -- Scripts to be added -- extern void AddSC_default(); -// ------------------- +// ------------------- and here diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt index 0204845523d..d24a45f6011 100644 --- a/src/bindings/scripts/CMakeLists.txt +++ b/src/bindings/scripts/CMakeLists.txt @@ -67,19 +67,19 @@ SET(trinityscript_LIB_SRCS scripts/zone/black_temple/def_black_temple.h scripts/zone/black_temple/illidari_council.cpp scripts/zone/black_temple/instance_black_temple.cpp - scripts/zone/blackrock_depths/blackrock_depths.cpp - scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp - scripts/zone/blackrock_depths/boss_anubshiah.cpp - scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp - scripts/zone/blackrock_depths/boss_general_angerforge.cpp + scripts/zone/blackrock_depths/blackrock_depths.cpp + scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp + scripts/zone/blackrock_depths/boss_anubshiah.cpp + scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp + scripts/zone/blackrock_depths/boss_general_angerforge.cpp scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp - scripts/zone/blackrock_depths/boss_grizzle.cpp - scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp - scripts/zone/blackrock_depths/boss_magmus.cpp - scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp - scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp - scripts/zone/blackrock_depths/def_blackrock_depths.h - scripts/zone/blackrock_depths/instance_blackrock_depths.cpp + scripts/zone/blackrock_depths/boss_grizzle.cpp + scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp + scripts/zone/blackrock_depths/boss_magmus.cpp + scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp + scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp + scripts/zone/blackrock_depths/def_blackrock_depths.h + scripts/zone/blackrock_depths/instance_blackrock_depths.cpp scripts/zone/blackrock_spire/boss_drakkisath.cpp scripts/zone/blackrock_spire/boss_gyth.cpp scripts/zone/blackrock_spire/boss_halycon.cpp @@ -236,7 +236,7 @@ SET(trinityscript_LIB_SRCS scripts/zone/onyxias_lair/boss_onyxia.cpp scripts/zone/orgrimmar/orgrimmar.cpp scripts/zone/razorfen_downs/boss_amnennar_the_coldbringer.cpp - scripts/zone/razorfen_kraul/razorfen_kraul.cpp + scripts/zone/razorfen_kraul/razorfen_kraul.cpp scripts/zone/ruins_of_ahnqiraj/boss_ayamiss.cpp scripts/zone/ruins_of_ahnqiraj/boss_buru.cpp scripts/zone/ruins_of_ahnqiraj/boss_kurinnaxx.cpp diff --git a/src/bindings/scripts/Makefile.am b/src/bindings/scripts/Makefile.am index 81a1761101a..6798b1785dc 100644 --- a/src/bindings/scripts/Makefile.am +++ b/src/bindings/scripts/Makefile.am @@ -424,9 +424,9 @@ libtrinityscript_la_LIBFLAGS = -version-info 0:0:1 libtrinityscript_la_LIBADD = $(MYSQL_LIBS) $(POSTGRE_LIBS) ## Additional files to install -## sysconf_DATA = +## sysconf_DATA = -## EXTRA_DIST = +## EXTRA_DIST = ## Prevend overwrite of the config file, if its already installed install-data-hook: diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index 811a4a4080b..70974f9ea11 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -1190,7 +1190,7 @@ void LoadDatabase() } break; case CONDITION_ACTIVE_EVENT: - if (temp.event_param3 != + if (temp.event_param3 != (HOLIDAY_FIREWORKS_SPECTACULAR | HOLIDAY_FEAST_OF_WINTER_VEIL | HOLIDAY_NOBLEGARDEN | HOLIDAY_CHILDRENS_WEEK | HOLIDAY_CALL_TO_ARMS_AV | HOLIDAY_CALL_TO_ARMS_WG | HOLIDAY_CALL_TO_ARMS_AB | HOLIDAY_FISHING_EXTRAVAGANZA | HOLIDAY_HARVEST_FESTIVAL | diff --git a/src/bindings/scripts/docs/EventAI.txt b/src/bindings/scripts/docs/EventAI.txt index c759d40c5cd..ade6ec7fe1e 100644 --- a/src/bindings/scripts/docs/EventAI.txt +++ b/src/bindings/scripts/docs/EventAI.txt @@ -42,7 +42,7 @@ action3_param3 All params are signed 32 bit values (+/- 2147483647). If param specifies time then time is in milliseconds. If param specifies percentage then percentages are value/100 (ex: if param = 500 then that means 500%, -50 = -50%) -*Phase mask is a bit mask of which phases this event should not trigger in. Example: Phase mask value of 12 (1100) would mean that this event would trigger 0, 1 and all other phases except for 2 and 3 (0 counts as the first phase). +*Phase mask is a bit mask of which phases this event should not trigger in. Example: Phase mask value of 12 (1100) would mean that this event would trigger 0, 1 and all other phases except for 2 and 3 (0 counts as the first phase). ========================================= Event Types @@ -56,17 +56,17 @@ Events will not repeat until the creature exits combat unless EFLAG_REPEATABLE i ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 0 EVENT_T_TIMER InitialMin, InitialMax, RepeatMin, RepeatMax Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4). but only in combat. 1 EVENT_T_TIMER_OOC InitialMin, InitialMax, RepeatMin, RepeatMax Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4). but only out of combat. -2 EVENT_T_HP HPMax%, HPMin%, RepeatMin, RepeatMax Expires when HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4). -3 EVENT_T_MANA ManaMax%,ManaMin% RepeatMin, RepeatMax Expires once Mana% is between (Param1) and (Param2). Will repeat every (Param3) and (Param4). -4 EVENT_T_AGGRO NONE Expires upon initial aggro (does not repeat). +2 EVENT_T_HP HPMax%, HPMin%, RepeatMin, RepeatMax Expires when HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4). +3 EVENT_T_MANA ManaMax%,ManaMin% RepeatMin, RepeatMax Expires once Mana% is between (Param1) and (Param2). Will repeat every (Param3) and (Param4). +4 EVENT_T_AGGRO NONE Expires upon initial aggro (does not repeat). 5 EVENT_T_KILL RepeatMin, RepeatMax Expires upon killing a player. Will repeat between every (Param1) and (Param2). -6 EVENT_T_DEATH NONE Expires upon Death of the Creature. +6 EVENT_T_DEATH NONE Expires upon Death of the Creature. 7 EVENT_T_EVADE NONE Expires upon creature EnterEvadeMode(). 8 EVENT_T_SPELLHIT SpellID, School, RepeatMin, RepeatMax Expires upon Spell hit. If (param1) is set will only expire on that spell. If (param2) will only expire on spells of that school (-1 for all). Will repeat every (Param3) and (Param4) . 9 EVENT_T_RANGE MinDist, MaxDist, RepeatMin, RepeatMax Expires when the highest threat target distance is greater than (Param1) and less than (Param2). Will repeat every (Param3) and (Param4) . 10 EVENT_T_OOC_LOS Hostile-or-Not, MaxAllowedRange, RepeatMin, RepeatMax Expires when a Unit moves within distance(MaxAllowedRange) to creature. If Param1=0 it will expire if Unit are Hostile. If Param1=1 it will only expire if Unit are not Hostile(generally determined by faction). Will repeat every (Param3) and (Param4). Does not expire when the creature is in combat. 11 EVENT_T_SPAWNED NONE Expires at initial spawn and at creature respawn (useful for setting ranged movement type) -12 EVENT_T_TARGET_HP HPMax%, HPMin%, RepeatMin, RepeatMax Expires when Current Target's HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4) . +12 EVENT_T_TARGET_HP HPMax%, HPMin%, RepeatMin, RepeatMax Expires when Current Target's HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4) . 13 EVENT_T_TARGET_CASTING RepeatMin, RepeatatMax Expires when the current target is casting a spell. Will repeat every (Param1) and (Param2) . 14 EVENT_T_FRIENDLY_HP HPDeficit, Radius, RepeatMin, RepeatMax Expires when a friendly unit in radius has at least (param1) hp missing. Will repeat every (Param3) and (Param4) . 15 EVENT_T_FRIENDLY_IS_CC DispelType, Radius, RepeatMin, RepeatMax Expires when a friendly unit is Crowd controlled within the given radius (param2). Will repeat every (Param3) and (Param4) . @@ -95,7 +95,7 @@ Params are always read from Param1, then Param2, then Param3. 9 ACTION_T_RANDOM_SOUND SoundId1, SoundId2, SoundId3 Plays random sound between 3 params* 10 ACTION_T_RANDOM_EMOTE EmoteId1, EmoteId2, EmoteId3 Emotes random emote between 3 params 11 ACTION_T_CAST SpellId, Target, CastFlags Casts spell (param1) on target type (param2). Uses Cast Flags (specified below target types) -12 ACTION_T_SUMMON CreatureID, Target, Duration Summons creature (param1) to attack target (param2) for (param3) duration. Spawns on top of current creature. +12 ACTION_T_SUMMON CreatureID, Target, Duration Summons creature (param1) to attack target (param2) for (param3) duration. Spawns on top of current creature. 13 ACTION_T_THREAT_SINGLE_PCT Threat%, Target Modifies threat by (param1) on target type (param2) 14 ACTION_T_THREAT_ALL_PCT Threat% Modifies threat by (param1) on all targets (using -100% on all will result in full aggro dump) 15 ACTION_T_QUEST_EVENT QuestID, Target Calls AreaExploredOrEventHappens with (param1) for target type (Param2) @@ -115,7 +115,7 @@ Params are always read from Param1, then Param2, then Param3. 29 ACTION_T_RANGED_MOVEMENT Distance, Angle Changes the movement generator type to a ranged type. Note: Default melee type can still be done with this. Specify 0 angle and 0 distance. 30 ACTION_T_RANDOM_PHASE PhaseId1, PhaseId2, PhaseId3 Sets the phase to the id between 3 params* 31 ACTION_T_RANDOM_PHASE_RANGE PhaseMin, PhaseMax Sets the phase to a random id (Phase = PhaseMin + rnd % PhaseMin-PhaseMax). PhaseMax must be greater than PhaseMin. -32 ACTION_T_SUMMON CreatureID, Target, SummonID Summons creature (param1) to attack target (param2) at location specified by EventAI_Summons (param3). +32 ACTION_T_SUMMON CreatureID, Target, SummonID Summons creature (param1) to attack target (param2) at location specified by EventAI_Summons (param3). 33 ACTION_T_KILLED_MONSTER CreatureID, Target Calls KilledMonster (param1) for target of type (param2) 34 ACTION_T_SET_INST_DATA Field, Data Calls ScriptedInstance::SetData with field (param1) and data (param2) 35 ACTION_T_SET_INST_DATA64 Field, Target Calls ScriptedInstance::SetData64 with field (param1) and data (param2) target's GUID. @@ -136,7 +136,7 @@ BOTH - This event can trigger both in and out of combat. Events that do not have lables on them are events that are directly involved with the in and out of combat state. ------------------ -0 = EVENT_T_TIMER: +0 = EVENT_T_TIMER: ------------------ Parameter 1: InitialMin - Minumum Time used to calculate Random Initial Expire Parameter 2: InitialMax - Maximum Time used to calculate Random Initial Expire @@ -154,7 +154,7 @@ Parameter 2: InitialMax - Maximum Time used to calculate Random Initial Expire Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire -OUT OF COMBAT ONLY! - Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4) from then on. +OUT OF COMBAT ONLY! - Expires first between (Param1) and (Param2) and then between every (Param3) and (Param4) from then on. This is commonly used for events that occur and repeat outside of combat. --------------- @@ -165,7 +165,7 @@ Parameter 2: HPMin% - Minimum HP% That this Event will Expire Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire -BOTH - Expires when HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4). +BOTH - Expires when HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4). This is commonly used for events that trigger at a specific HP% (Such as Heal/Enrage Spells or NPC's that Flee). ----------------- @@ -176,7 +176,7 @@ Parameter 2: ManaMin% - Minimum Mana% That this Event will Expire Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire -BOTH - Expires once Mana% is between (Param1) and (Param2). Will repeat every (Param3) and (Param4). +BOTH - Expires once Mana% is between (Param1) and (Param2). Will repeat every (Param3) and (Param4). This is commonly used for events where an NPC low on Mana will do something (Such as stop casting spells and switch to melee). ------------------ @@ -190,7 +190,7 @@ This Event Expires upon initial aggro (does not repeat). Parameter 1: RepeatMin - Minimum Time used to calculate Random Repeat Expire Parameter 2: RepeatMax - Maximum Time used to calculate Random Repeat Expire -COMBAT ONLY! - Expires upon killing a player. Will repeat every (Param1) and (Param2). +COMBAT ONLY! - Expires upon killing a player. Will repeat every (Param1) and (Param2). This Event Expires upon killing a player. It is commonly used for NPC's who yell or do something after killing a player. ------------------ @@ -202,7 +202,7 @@ This is commonly used for NPC's who have a yell on death or cast some kind if su ------------------ 7 = EVENT_T_EVADE: ------------------ -This Event Expires upon the creature EnterEvadeMode(). +This Event Expires upon the creature EnterEvadeMode(). This is commonly used for NPC's who use phases, allows you to reset their phase to 0 upon evade to prevent possible strange behavior. --------------------- @@ -225,7 +225,7 @@ Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire COMBAT ONLY! - Expires when the highest threat target distance is greater than (Param1) and less than (Param2). Will repeat every (Param3) and (Param4). -This Event is commonly used for NPC's who have Ranged Combat and will Throw/Shoot between a certian distance. +This Event is commonly used for NPC's who have Ranged Combat and will Throw/Shoot between a certian distance. --------------------- 10 = EVENT_T_OOC_LOS: @@ -235,7 +235,7 @@ Parameter 2: NoFriendly - This Value is to Prevent this Action from Expiring Whe Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire -OUT OF COMBAT ONLY! - Expires when a Player moves within visible distance to the NPC. Does not expire for Hostile Players if (Param1) is not 0. Does not expire for Friendly Players if (Param2) is not 0. Will repeat every (Param3) and (Param4). Does not expire for creatures or pets when they are in combat. +OUT OF COMBAT ONLY! - Expires when a Player moves within visible distance to the NPC. Does not expire for Hostile Players if (Param1) is not 0. Does not expire for Friendly Players if (Param2) is not 0. Will repeat every (Param3) and (Param4). Does not expire for creatures or pets when they are in combat. This Event is commonly used for NPC's who Do Something or Say Something when you walk past them Out of Combat. --------------------- @@ -252,7 +252,7 @@ Parameter 2: HPMin% - Minimum HP% That this Event will Expire Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire -COMBAT ONLY! - Expires when Current NPC's Target's HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4). +COMBAT ONLY! - Expires when Current NPC's Target's HP is between (Param1) and (Param2). Will repeat every (Param3) and (Param4). This Event is commonly used for NPC's who have a special ability (Like Execute) that only casts when a Player HP is low. ---------------------------- @@ -261,7 +261,7 @@ This Event is commonly used for NPC's who have a special ability (Like Execute) Parameter 1: RepeatMin - Minimum Time used to calculate Random Repeat Expire Parameter 2: RepeatMax - Maximum Time used to calculate Random Repeat Expire -COMBAT ONLY! - Expires when the current target is casting a spell. Will repeat every (Param1) and (Param2). +COMBAT ONLY! - Expires when the current target is casting a spell. Will repeat every (Param1) and (Param2). This event is commonly used for NPC's who will cast a counter spell when their target starts to cast a spell. ------------------------- @@ -283,7 +283,7 @@ Parameter 2: Radius - This is the Range in Yards the NPC will scan for nearby Fr Parameter 3: RepeatMin - Minimum Time used to calculate Random Repeat Expire Parameter 4: RepeatMax - Maximum Time used to calculate Random Repeat Expire -COMBAT ONLY! - Expires when a friendly unit is Crowd controlled within the given radius (param2). Will repeat every (Param3) and (Param4). +COMBAT ONLY! - Expires when a friendly unit is Crowd controlled within the given radius (param2). Will repeat every (Param3) and (Param4). This is commonly used for NPC's who can come to the resule of other Friendly NPC's if being Crowd Controlled -------------------------- @@ -304,7 +304,7 @@ Parameter 1: CreatureId - The CreatureID that the NPC is watching to spawn to tr Parameter 2: RepeatMin - Minimum Time used to calculate Random Repeat Expire Parameter 3: RepeatMax - Maximum Time used to calculate Random Repeat Expire -BOTH - Expires after creature with entry(Param1) is spawned or for all spawns if param1 = 0. Will repeat every (Param2) and (Param3) . +BOTH - Expires after creature with entry(Param1) is spawned or for all spawns if param1 = 0. Will repeat every (Param2) and (Param3) . This is commonly used for NPC's who will do something special once another NPC is summoned. Usually used is Complex Scripts or Special Events. --------------------------- @@ -380,16 +380,16 @@ UNUSED Can be reused to create new action type -------------------------- Parameter 1: The Sound ID to be played as Random Choice #1. Parameter 2: The Sound ID to be played as Random Choice #2. -Parameter 3: The Sound ID to be played as Random Choice #3. +Parameter 3: The Sound ID to be played as Random Choice #3. -Similar to the ACTION_T_SOUND action, it will choose at random a sound to play. +Similar to the ACTION_T_SOUND action, it will choose at random a sound to play. --------------------------- 10 = ACTION_T_RANDOM_EMOTE: --------------------------- Parameter 1: The Emote ID to be played as Random Choice #1. Parameter 2: The Emote ID to be played as Random Choice #2. -Parameter 3: The Emote ID to be played as Random Choice #3. +Parameter 3: The Emote ID to be played as Random Choice #3. Similar to the ACTION_T_EMOTE action, it will choose at random an Emote to Visually Perform. @@ -400,26 +400,26 @@ Parameter 1: SpellId - The Spell ID to use for the NPC to cast. The value used i Parameter 2: Target - The Target Type defining who the creature should cast the spell at. The value in this field needs to be a valid Target Type as specified in the reference tables below. Parameter 3: CastFlags - See Table Below for Cast Flag Bitmask Values. If you are unsure what to set this value at leave it at 0. -The creature will cast a spell specified by a spell ID on a target specified by the target type. +The creature will cast a spell specified by a spell ID on a target specified by the target type. This is commonly used for NPC's who cast spells. --------------------- 12 = ACTION_T_SUMMON: --------------------- Parameter 1: CreatureID - The Creature Template ID to be Summoned. The value here needs to be a valid Creature Template ID. -Parameter 2: Target - The Target Type defining who the Summoned creature will attack once spawned. The value in this field needs to be a valid Target Type as specified in the reference tables below. -Parameter 3: Duration - The duration until the summoned creature should be unsummoned AFTER Combat ends. The value in this field is in milliseconds or 0. +Parameter 2: Target - The Target Type defining who the Summoned creature will attack once spawned. The value in this field needs to be a valid Target Type as specified in the reference tables below. +Parameter 3: Duration - The duration until the summoned creature should be unsummoned AFTER Combat ends. The value in this field is in milliseconds or 0. -The NPC will Summon another creature at the same spot as itself that will attack the specified target. +The NPC will Summon another creature at the same spot as itself that will attack the specified target. NOTE: Almost all Creature Summons have proper Summon Spells that should be used when possible. This Action is a powerful last resort option only to be used if nothing else works. NOTE: Using Target Type 0 will cause the Summoned creature to not attack anyone. -NOTE: If Duration is set at 0, then the summoned creature will not despawn until it has died. +NOTE: If Duration is set at 0, then the summoned creature will not despawn until it has died. This is used as a manual way to force an NPC to Summon. -------------------------------- 13 = ACTION_T_THREAT_SINGLE_PCT: -------------------------------- Parameter 1: Threat% - Threat percent that should be modified. The value in this field can range from -100 to +100. If it is negative, threat will be taken away and if positive, threat will be added. -Parameter 2: Target - The Target Type defining on whom the threat change should occur. The value in this field needs to be a valid target type as specified in the reference tables below. +Parameter 2: Target - The Target Type defining on whom the threat change should occur. The value in this field needs to be a valid target type as specified in the reference tables below. This action will modify the threat of a target in the creature's threat list by the specified percent. This is commonly used to allow an NPC to adjust the Threat to a single player. @@ -427,7 +427,7 @@ This is commonly used to allow an NPC to adjust the Threat to a single player. ----------------------------- 14 = ACTION_T_THREAT_ALL_PCT: ----------------------------- -Parameter 1: Threat% - The percent that should be used in modifying everyone's threat in the creature's threat list. The value here can range from -100 to +100. +Parameter 1: Threat% - The percent that should be used in modifying everyone's threat in the creature's threat list. The value here can range from -100 to +100. This action will modify the threat for everyone in the creature's threat list by the specified percent. NOTE: Using -100 will cause the creature to reset everyone's threat to 0 so that everyone has the same amount of threat. It will NOT remove anyone from the threat list. @@ -437,10 +437,10 @@ This is commonly used to allow an NPC to drop threat for all players to zero. 15 = ACTION_T_QUEST_EVENT: -------------------------- Parameter 1: QuestID - The Quest Template ID. The value here must be a valid quest template ID. Furthermore, the quest should have SpecialFlags | 2 as it would need to be completed by an external event which is the activation of this action. -Parameter 2: Target - The Target Type defining whom the quest should be completed for. The value in this field needs to be a valid target type as specified in the reference tables below. +Parameter 2: Target - The Target Type defining whom the quest should be completed for. The value in this field needs to be a valid target type as specified in the reference tables below. -This action will satisfy the external completion requirement for the quest for the specified target defined by the target type. -NOTE: This action can only be used with player targets so it must be ensured that the target type will point to a player. +This action will satisfy the external completion requirement for the quest for the specified target defined by the target type. +NOTE: This action can only be used with player targets so it must be ensured that the target type will point to a player. This is commonly used for Quests where only ONE player will gain credit for the quest. ----------------------------- @@ -448,9 +448,9 @@ This is commonly used for Quests where only ONE player will gain credit for the ----------------------------- Parameter 1: CreatureID - The Creature Template ID to be Summoned. The value here needs to be a valid Creature Template ID. Parameter 2: SpellId - The Spell ID to use to simulate the cast. The value used in this field needs to be a valid Spell ID. -Parameter 3: Target - The Target Type defining whom the quest credit should be given to. The value in this field needs to be a valid target type as specified in the reference tables below. +Parameter 3: Target - The Target Type defining whom the quest credit should be given to. The value in this field needs to be a valid target type as specified in the reference tables below. -This action will call CastedCreatureOrGO() function for the player. It can be used to give quest credit for casting a spell on the creature. +This action will call CastedCreatureOrGO() function for the player. It can be used to give quest credit for casting a spell on the creature. This is commonly used for NPC's who have a special requirement to have a Spell cast on them to complete a quest. ----------------------------- @@ -458,7 +458,7 @@ This is commonly used for NPC's who have a special requirement to have a Spell c ----------------------------- Parameter 1: Field_Number - The index of the Field Number to be changed. Use (http://wiki.udbforums.org/index.php/Character_data) for a list of indeces and what they control. Creatures only contain the OBJECT_FIELD_* and UNIT_FIELD_* fields. They do not contain the PLAYER_FIELD_* fields. Parameter 2: Value - The new value to be put in the field. -Parameter 3: Target - The Target Type defining for whom the unit field should be changed. The value in this field needs to be a valid target type as specified in the reference tables below. +Parameter 3: Target - The Target Type defining for whom the unit field should be changed. The value in this field needs to be a valid target type as specified in the reference tables below. When activated, this action can change the target's unit field values. More information on the field value indeces can be found at (http://wiki.udbforums.org/index.php/Character_data) @@ -466,31 +466,31 @@ When activated, this action can change the target's unit field values. More info 18 = ACTION_T_SET_UNIT_FLAG: ---------------------------- Parameter 1: Flags - The flag(s) to be set. Multiple flags can be set by using bitwise-OR on them (adding them together). -Parameter 2: Target - The Target Type defining for whom the flags should be changed. The value in this field needs to be a valid Target Type as specified in the reference tables below. +Parameter 2: Target - The Target Type defining for whom the flags should be changed. The value in this field needs to be a valid Target Type as specified in the reference tables below. -When activated, this action changes the target's flags by adding (turning on) more flags. For example, this action can make the creature unattackable/unselectable if the right flags are used. +When activated, this action changes the target's flags by adding (turning on) more flags. For example, this action can make the creature unattackable/unselectable if the right flags are used. ------------------------------- 19 = ACTION_T_REMOVE_UNIT_FLAG: ------------------------------- Parameter 1: Flags - The flag(s) to be removed. Multiple flags can be set by using bitwise-OR on them (adding them together). -Parameter 2: Target - The target type defining for whom the flags should be changed. The value in this field needs to be a valid Target Type as specified in the reference tables below. +Parameter 2: Target - The target type defining for whom the flags should be changed. The value in this field needs to be a valid Target Type as specified in the reference tables below. -When activated, this action changes the target's flags by removing (turning off) flags. For example, this action can make the creature normal after it was unattackable/unselectable if the right flags are used. +When activated, this action changes the target's flags by removing (turning off) flags. For example, this action can make the creature normal after it was unattackable/unselectable if the right flags are used. -------------------------- 20 = ACTION_T_AUTO_ATTACK: -------------------------- -Parameter 1: AllowAutoAttack - If zero, then the creature will stop its melee attacks. If non-zero, then the creature will either continue its melee attacks (the action would then have no effect) or it will start its melee attacks on the target with the top threat if its melee attacks were previously stopped. +Parameter 1: AllowAutoAttack - If zero, then the creature will stop its melee attacks. If non-zero, then the creature will either continue its melee attacks (the action would then have no effect) or it will start its melee attacks on the target with the top threat if its melee attacks were previously stopped. -This action controls whether or not the creature should stop or start the auto melee attack. +This action controls whether or not the creature should stop or start the auto melee attack. NOTE: The ACID Dev Team has conformed to using either 0 or 1 for the Param values (0 = Stop Melee, 1 = Start Melee). This is commonly used in combination with EVENT_T_RANGE and ACTION_T_COMBAT_MOVEMENT for Ranged Combat for Mages and Spell Casters. ------------------------------ 21 = ACTION_T_COMBAT_MOVEMENT: ------------------------------ -Parameter 1: If zero, then the creature will stop moving towards its victim (if its victim gets out of melee range) and will be stationary. If non-zero, then the creature will either continue to follow its victim (the action would have no effect) or it will start to follow the target with the top threat if its movement was disabled before. +Parameter 1: If zero, then the creature will stop moving towards its victim (if its victim gets out of melee range) and will be stationary. If non-zero, then the creature will either continue to follow its victim (the action would have no effect) or it will start to follow the target with the top threat if its movement was disabled before. This action controls whether or not the creature will always move towards its target. NOTE: The ACID Dev Team has conformed to using either 0 or 1 for the Param values. (0 = Stop Movement, 1 = Start Movement) @@ -499,7 +499,7 @@ This is commonly used with EVENT_T_RANGE and ACTION_T_AUTO_ATTACK for NPC's who ------------------------ 22 = ACTION_T_SET_PHASE: ------------------------ -Parameter 1: The new phase to set the creature in. This number must be an integer between 0 and 31. Numbers outside of that range will result in an error. +Parameter 1: The new phase to set the creature in. This number must be an integer between 0 and 31. Numbers outside of that range will result in an error. When activated, this action sets the creature's event to the specified value. NOTE: The creature's current Phase is NOT reset at creature evade. You must manually set the phase back to 0 at EVENT_T_RESET. @@ -509,20 +509,20 @@ This is commonly used for complex scripts with several phases and you need to sw ------------------------ 23 = ACTION_T_INC_PHASE: ------------------------ -Parameter 1: Value - The number of phases to increase or decrease. Use negative values to decrease the current phase. +Parameter 1: Value - The number of phases to increase or decrease. Use negative values to decrease the current phase. -When activated, this action will increase (or decrease) the current creature's phase. -NOTE: After increasing or decreasing the phase by this action, the current phase must NOT be lower than 0 or exceed 31. +When activated, this action will increase (or decrease) the current creature's phase. +NOTE: After increasing or decreasing the phase by this action, the current phase must NOT be lower than 0 or exceed 31. This can be used instead of ACTION_T_SET_PHASE to change phases in scripts. Just a user friendly option for changing phases. -------------------- 24 = ACTION_T_EVADE: -------------------- -When activated, the creature will immediately exit out of combat, clear its threat list, and move back to its spawn point. Basically, this action will reset the whole encounter. +When activated, the creature will immediately exit out of combat, clear its threat list, and move back to its spawn point. Basically, this action will reset the whole encounter. NOTE: All Param Values Are 0 for this Action. ------------------- -25 = ACTION_T_FLEE: +25 = ACTION_T_FLEE: ------------------- When activated, the creature will try to flee from combat. Currently this is done by it casting a fear-like spell on itself called "Run Away". A Better Flee system is in Development but will take time before it is implimented. NOTE: All Param Values Are 0 for this Action. @@ -530,47 +530,47 @@ NOTE: All Param Values Are 0 for this Action. ------------------------------ 26 = ACTION_T_QUEST_EVENT_ALL: ------------------------------ -Parameter 1: QuestId - The quest ID to finish for everyone. +Parameter 1: QuestId - The quest ID to finish for everyone. -This action does the same thing as the ACTION_T_QUEST_EVENT does but it does it for all players in the creature's threat list. -NOTE: If a player is not in the NPC's threat list for whatever reason, he/she won't get the quest completed. +This action does the same thing as the ACTION_T_QUEST_EVENT does but it does it for all players in the creature's threat list. +NOTE: If a player is not in the NPC's threat list for whatever reason, he/she won't get the quest completed. --------------------------------- 27 = ACTION_T_CASTCREATUREGO_ALL: --------------------------------- Parameter 1: QuestId - The quest template ID. -Parameter 2: SpellId - The spell ID used to simulate the cast. +Parameter 2: SpellId - The spell ID used to simulate the cast. -This action does the same thing as the ACTION_T_CASTCREATUREGO does but it does it for all players in the creature's threat list. -NOTE: If a player is not in its threat list for whatever reason, he/she won't receive the cast emulation. +This action does the same thing as the ACTION_T_CASTCREATUREGO does but it does it for all players in the creature's threat list. +NOTE: If a player is not in its threat list for whatever reason, he/she won't receive the cast emulation. ----------------------------------- 28 = ACTION_T_REMOVEAURASFROMSPELL: ----------------------------------- Parameter 1: Target - The target type defining for whom the unit field should be changed. The value in this field needs to be a valid target type as specified in the reference tables below. -Parameter 2: SpellId - The spell ID whose auras will be removed. +Parameter 2: SpellId - The spell ID whose auras will be removed. -This action will remove all auras from a specific spell from the target. +This action will remove all auras from a specific spell from the target. This is commonly used for NPC's who have an OOC Aura that is removed at combat start or a similar idea (Like Stealth or Shape Shift) ------------------------------ 29 = ACTION_T_RANGED_MOVEMENT: ------------------------------ Parameter 1: Distance - The distance the mob should keep between it and its target. -Parameter 2: Angle - The angle the mob should use. +Parameter 2: Angle - The angle the mob should use. -This action changes the movement type generator to ranged type using the specified values for angle and distance. -NOTE: Specifying zero angle and distance will make it just melee instead. -This is commonly used for NPC's who always attack at range and you can specify the distance they will maintain from the target. +This action changes the movement type generator to ranged type using the specified values for angle and distance. +NOTE: Specifying zero angle and distance will make it just melee instead. +This is commonly used for NPC's who always attack at range and you can specify the distance they will maintain from the target. --------------------------- 30 = ACTION_T_RANDOM_PHASE: --------------------------- Parameter 1: PhaseId1 - A possible random phase choice. Parameter 2: PhaseId2 - A possible random phase choice. -Parameter 3: PhaseId3 - A possible random phase choice. +Parameter 3: PhaseId3 - A possible random phase choice. -Randomly sets the phase to one from the three parameter choices. +Randomly sets the phase to one from the three parameter choices. NOTE: Use -1 to specify that if this param is picked to do nothing. Random is constant between actions within an event. So if you have a random Yell and a random Sound they will match up (ex: param2 with param2) NOTE 2: PLEASE NOTE THAT EACH OF THE PARAM VALUES ARE ACTUAL PHASE NUMBERS NOT THE INVERSE PHASE MASK VALUE. This is commonly used for Spellcasting NPC's who on Aggro may select at random a school of spells to use for the fight. Use this if you have up to 3 phases used, otherwise use Action 31 for more then 3 phases. @@ -579,9 +579,9 @@ This is commonly used for Spellcasting NPC's who on Aggro may select at random a 31 = ACTION_T_RANDOM_PHASE_RANGE: --------------------------------- Parameter 1: PhaseMin - The minimum of the phase range. -Parameter 2: PhaseMax - The maximum of the phase range. The number here must be greater than PhaseMin. +Parameter 2: PhaseMax - The maximum of the phase range. The number here must be greater than PhaseMin. -Randomly sets the phase between a range of phases controlled by the parameters. Sets the phase to a random id (Phase = PhaseMin + rnd % PhaseMin-PhaseMax). +Randomly sets the phase between a range of phases controlled by the parameters. Sets the phase to a random id (Phase = PhaseMin + rnd % PhaseMin-PhaseMax). NOTE: PhaseMax must be greater than PhaseMin. NOTE 2: PLEASE NOTE THAT EACH OF THE PARAM VALUES ARE ACTUAL PHASE NUMBERS NOT THE INVERSE PHASE MASK VALUE. This is commonly used for Spellcasting NPC's who on Aggro may select at random a school of spells to use for the fight. Use this if you have MORE then 3 phases used, otherwise use Action 30. @@ -591,9 +591,9 @@ This is commonly used for Spellcasting NPC's who on Aggro may select at random a --------------------- Parameter 1: CreatureID - The creature template ID to be summoned. The value here needs to be a valid creature template ID. Parameter 2: Target - The target type defining who the summoned creature will attack. The value in this field needs to be a valid target type as specified in the reference tables below. NOTE: Using target type 0 will cause the summoned creature to not attack anyone. -Parameter 3: SummonID - The summon ID from the eventai_summons table controlling the position (and spawntime) where the summoned mob should be spawned at. +Parameter 3: SummonID - The summon ID from the eventai_summons table controlling the position (and spawntime) where the summoned mob should be spawned at. -Summons creature (param1) to attack target (param2) at location specified by EventAI_Summons (param3). +Summons creature (param1) to attack target (param2) at location specified by EventAI_Summons (param3). NOTE: Param3 Value is the ID Value used for the entry used in EventAI_Summons for this action. You MUST have an EventAI_Summons entry to use this action. This is commonly used for NPC's who need to Summon a creature at a specific location. (Normally used for complex events) @@ -601,9 +601,9 @@ This is commonly used for NPC's who need to Summon a creature at a specific loca 33 = ACTION_T_KILLED_MONSTER: ----------------------------- Parameter 1: CreatureID - The creature template ID. The value here must be a valid creature template ID. -Parameter 2: Target - The target type defining whom the quest kill count should be given to. The value in this field needs to be a valid target type as specified in the reference tables below. +Parameter 2: Target - The target type defining whom the quest kill count should be given to. The value in this field needs to be a valid target type as specified in the reference tables below. -When activated, this action will call KilledMonster() function for the player. It can be used to give creature credit for killing a creature. In general if the quest is set to be accompished on different creatures (e.g. "Credit" templates). +When activated, this action will call KilledMonster() function for the player. It can be used to give creature credit for killing a creature. In general if the quest is set to be accompished on different creatures (e.g. "Credit" templates). NOTE: It can be ANY creature including certain quest specific triggers This is commonly used for giving the player Quest Credits for NPC kills (Many NPC's may use the same CreatureID for the Kill Credit) @@ -613,7 +613,7 @@ This is commonly used for giving the player Quest Credits for NPC kills (Many NP Parameter 1: Field - The field to change in the instance script. Again, this field needs to be a valid field that has been already defined in the instance's script. Parameter 2: Data - The value to put at that field index. -Sets data for the instance. Note that this will only work when the creature is inside an instantiable zone that has a valid script (ScriptedInstance) assigned. +Sets data for the instance. Note that this will only work when the creature is inside an instantiable zone that has a valid script (ScriptedInstance) assigned. NOTE: Param1 Value is located in "def_<instance name>.h" SD2 File and Param2 value is generally found in the "sc_instance.h" file in SD2 This is commonly used to link an ACID script with a SD2 C++ Script. You make make things happen like opening doors on specific events that happen. ACID Just triggers the C++ Script to function. @@ -621,30 +621,30 @@ This is commonly used to link an ACID script with a SD2 C++ Script. You make mak 35 = ACTION_T_SET_INST_DATA64: ------------------------------ Parameter 1: Field - The field to change in the instance script. Again, this field needs to be a valid field that has been already defined in the instance's script. -Parameter 2: Target - The target type to use to get the GUID that will be stored at the field index. The value in this field needs to be a valid target type as specified in the reference tables below. +Parameter 2: Target - The target type to use to get the GUID that will be stored at the field index. The value in this field needs to be a valid target type as specified in the reference tables below. -Sets GUID (64 bits) data for the instance based on the target. Note that this will only work when the creature is inside an instantiable zone that has a valid script (ScriptedInstance) assigned. +Sets GUID (64 bits) data for the instance based on the target. Note that this will only work when the creature is inside an instantiable zone that has a valid script (ScriptedInstance) assigned. Calls ScriptedInstance::SetData64 with field (param1) and data (param2) target's GUID. ------------------------------ 36 = ACTION_T_UPDATE_TEMPLATE: ------------------------------ Parameter 1: TemplateId - The creature template ID. The value here must be a valid creature template ID. -Parameter 2: Team - Use model_id from team : Alliance(0) or Horde (1). +Parameter 2: Team - Use model_id from team : Alliance(0) or Horde (1). -This function temporarily changes creature entry to new entry, display is changed, loot is changed, but AI is not changed. At respawn creature will be reverted to original entry. +This function temporarily changes creature entry to new entry, display is changed, loot is changed, but AI is not changed. At respawn creature will be reverted to original entry. Changes the creature to a new creature template of (param1) with team = Alliance if (param2) = false or Horde if (param2) = true ------------------ 37 = ACTION_T_DIE: ------------------ Kills the creature -This is commonly used if you need to Instakill the creature for one reason or another. +This is commonly used if you need to Instakill the creature for one reason or another. -------------------------------- 38 = ACTION_T_ZONE_COMBAT_PULSE: -------------------------------- -Places all players within the instance into combat with the creature. Only works in combat and only works inside of instances. +Places all players within the instance into combat with the creature. Only works in combat and only works inside of instances. ========================================= @@ -678,7 +678,7 @@ Another example: the number "5" (101 in Binary, selecting first and third option 4 16 CAST_FORCE_TARGET_SELF Forces the target to cast this spell on itself 5 32 CAST_AURA_NOT_PRESENT Only casts the spell on the target if the target does not have the aura from that spell on itself already. -NOTE: You can add the numbers in the decimal column to combine flags. +NOTE: You can add the numbers in the decimal column to combine flags. For example if you wanted to use CAST_NO_MELEE_IF_OOM(8) and CAST_TRIGGERED(2) you would simply use 10 in the cast flags field (8 + 2 = 10). ========================================= @@ -696,4 +696,4 @@ Below is the list of current Event Flags that EventAI can handle. Event flags ar 6 64 7 128 EFLAG_DEBUG_ONLY Prevents events from occuring on Release builds of ScriptDev2. Useful for testing new features. -NOTE: You can add the numbers in the decimal column to combine flags.
\ No newline at end of file +NOTE: You can add the numbers in the decimal column to combine flags.
\ No newline at end of file diff --git a/src/bindings/scripts/docs/Text-tables.txt b/src/bindings/scripts/docs/Text-tables.txt index 6db1ce9d852..2a539a72874 100644 --- a/src/bindings/scripts/docs/Text-tables.txt +++ b/src/bindings/scripts/docs/Text-tables.txt @@ -52,8 +52,8 @@ Below is the list of current Text types that texts tables can handle. These were ----------------------------------------------------------- 0 CHAT_TYPE_SAY This type sets the text to be displayed as a Say (Speech Bubble). 1 CHAT_TYPE_YELL This type sets the text to be displayed as a Yell (Red Speech Bubble) and usually has a matching Sound ID. -2 CHAT_TYPE_TEXT_EMOTE This type sets the text to be displayed as a text emote in orange in the chat log. -3 CHAT_TYPE_BOSS_EMOTE This type sets the text to be displayed as a text emote in orange in the chat log (Used only for specific Bosses). +2 CHAT_TYPE_TEXT_EMOTE This type sets the text to be displayed as a text emote in orange in the chat log. +3 CHAT_TYPE_BOSS_EMOTE This type sets the text to be displayed as a text emote in orange in the chat log (Used only for specific Bosses). 4 CHAT_TYPE_WHISPER This type sets the text to be displayed as a whisper to the player in the chat log. 5 CHAT_TYPE_BOSS_WHISPER This type sets the text to be displayed as a whisper to the player in the chat log (Used only for specific Bosses). @@ -65,7 +65,7 @@ Below is the list of current Language types that are allowed. This is the Race Language that the text is native to (So it will display properly) # Internal Name Description ------------------------------------------------------------ +----------------------------------------------------------- 0 UNIVERSAL Text in this language is understood by ALL Races. 1 ORCISH Text in this language is understood ONLY by Horde Races. 2 DARNASSIAN Text in this language is understood ONLY by the Night Elf Race. diff --git a/src/bindings/scripts/include/sc_gossip.h b/src/bindings/scripts/include/sc_gossip.h index 4f3188104eb..9665a7e1123 100644 --- a/src/bindings/scripts/include/sc_gossip.h +++ b/src/bindings/scripts/include/sc_gossip.h @@ -46,7 +46,7 @@ #define GOSSIP_TEXT_ARENA "Arena" #define GOSSIP_TEXT_EYEOFTHESTORM "Eye of The Storm" #define GOSSIP_TEXT_STRANDOFANCIENT "Strand of the Ancients" - + #define GOSSIP_TEXT_DEATH_KNIGHT "Death Knight" #define GOSSIP_TEXT_DRUID "Druid" #define GOSSIP_TEXT_HUNTER "Hunter" diff --git a/src/bindings/scripts/scripts/go/go_scripts.cpp b/src/bindings/scripts/scripts/go/go_scripts.cpp index bfa0eff3dd8..5613ccdd9b7 100644 --- a/src/bindings/scripts/scripts/go/go_scripts.cpp +++ b/src/bindings/scripts/scripts/go/go_scripts.cpp @@ -30,7 +30,7 @@ go_barov_journal go_field_repair_bot_74A go_orb_of_command go_tablet_of_madness -go_tablet_of_the_seven +go_tablet_of_the_seven EndContentData */ #include "precompiled.h" @@ -198,7 +198,7 @@ bool GOHello_go_jump_a_tron(Player *player, GameObject* _GO) /*###### ## go_ethereum_prison ######*/ - + float ethereum_NPC[2][7] = { {20785,20790,20789,20784,20786,20783,20788}, // hostile npc @@ -209,7 +209,7 @@ bool GOHello_go_ethereum_prison(Player *player, GameObject* _GO) { _GO->SetGoState(0); switch(rand()%2){ - case 0: + case 0: _GO->SummonCreature(ethereum_NPC[0][rand()%6],_GO->GetPositionX(),_GO->GetPositionY(),_GO->GetPositionZ()+0.3, 0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,10000); break; case 1: diff --git a/src/bindings/scripts/scripts/npc/npc_escortAI.h b/src/bindings/scripts/scripts/npc/npc_escortAI.h index 6e4f22e1c01..8e88f61b37b 100644 --- a/src/bindings/scripts/scripts/npc/npc_escortAI.h +++ b/src/bindings/scripts/scripts/npc/npc_escortAI.h @@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI // EscortAI functions void AddWaypoint(uint32 id, float x, float y, float z, uint32 WaitTimeMs = 0); - + void FillPointMovementListForCreature(); void Start(bool bAttack, bool bDefend, bool bRun, uint64 pGUID = 0); diff --git a/src/bindings/scripts/scripts/npc/npcs_special.cpp b/src/bindings/scripts/scripts/npc/npcs_special.cpp index 517cf391893..a9f20422223 100644 --- a/src/bindings/scripts/scripts/npc/npcs_special.cpp +++ b/src/bindings/scripts/scripts/npc/npcs_special.cpp @@ -332,7 +332,7 @@ struct TRINITY_DLL_DECL npc_injured_patientAI : public ScriptedAI //no regen health m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); - + //to make them lay with face down m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD); @@ -557,7 +557,7 @@ void npc_doctorAI::UpdateAI(const uint32 diff) if (Patient) { - //303, this flag appear to be required for client side item->spell to work (TARGET_SINGLE_FRIEND) + //303, this flag appear to be required for client side item->spell to work (TARGET_SINGLE_FRIEND) Patient->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE); Patients.push_back(Patient->GetGUID()); diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_elder_nadox.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_elder_nadox.cpp index 059500ad593..6ae0e551b6f 100644 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_elder_nadox.cpp +++ b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/boss_elder_nadox.cpp @@ -36,5 +36,5 @@ EndScriptData */ #define MOB_AHNKAHAR_SWARMER 30178 #define SPELL_SUMMON_SWARM_GUARD 56120//1x 30176 #define SPELL_DEADLY_POISON 56145// Proc trigger -#define H_SPELL_DEADLY_POISON 59479// Proc trigger +#define H_SPELL_DEADLY_POISON 59479// Proc trigger #define SPELL_GUARDIAN_AURA 56151 diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/instance_ahnkahet.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/instance_ahnkahet.cpp index 3da7f28d95f..544d504c5ae 100644 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/instance_ahnkahet.cpp +++ b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Ahn'kahet/instance_ahnkahet.cpp @@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance void OnCreatureCreate(Creature *creature, uint32 creature_entry) { switch(creature_entry) - { + { case 29309: Elder_Nadox = creature->GetGUID(); break; case 29308: Prince_Taldaram = creature->GetGUID(); break; case 29310: Jedoga_Shadowseeker = creature->GetGUID(); break; diff --git a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/instance_azjol_nerub.cpp b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/instance_azjol_nerub.cpp index 30acaa0c842..bd3fccd98d9 100644 --- a/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/instance_azjol_nerub.cpp +++ b/src/bindings/scripts/scripts/zone/Azjol-Nerub/Azjol-Nerub/instance_azjol_nerub.cpp @@ -67,7 +67,7 @@ struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance void OnCreatureCreate(Creature *creature, uint32 creature_entry) { switch(creature_entry) - { + { case 28684: Krikthir = creature->GetGUID(); break; case 28921: Hadronox = creature->GetGUID(); break; case 29120: Anubarak = creature->GetGUID(); break; diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp index 61d71ddb256..defaaa51a5d 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp @@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL boss_murmurAI : public Scripted_NoMovementAI } if (SonicBoom_Timer < diff) { - DoScriptText(EMOTE_SONIC_BOOM, m_creature); + DoScriptText(EMOTE_SONIC_BOOM, m_creature); DoCast(m_creature, SPELL_SONIC_BOOM_CAST); SonicBoom_Timer = 30000; SonicBoom = true; diff --git a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp index 83104539c6a..878865fec2c 100644 --- a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp +++ b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp @@ -121,7 +121,7 @@ struct TRINITY_DLL_DECL npc_taskmaster_fizzuleAI : public ScriptedAI m_creature->RemoveAllAuras(); m_creature->DeleteThreatList(); m_creature->CombatStop(); - + m_creature->StopMoving(); m_creature->GetMotionMaster()->MoveIdle(); diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp index 8fc92648130..5e362d29eb8 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp @@ -90,7 +90,7 @@ struct TRINITY_DLL_DECL mob_doom_blossomAI : public ScriptedAI Despawn(); CheckTeronTimer = 5000; - }else CheckTeronTimer -= diff; + }else CheckTeronTimer -= diff; if(ShadowBoltTimer < diff && InCombat) { diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp index 1d5b7934bd6..96a903a0795 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp @@ -383,11 +383,11 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI //alot will happen here, thrall and taretha talk, erozion appear at spot to explain m_creature->SummonCreature(EROZION_ENTRY,2646.47,680.416,55.38,4.16,TEMPSUMMON_TIMED_DESPAWN,120000); } - break; + break; case 108: - //last waypoint, just set Thrall invisible, respawn is turned off + //last waypoint, just set Thrall invisible, respawn is turned off m_creature->SetVisibility(VISIBILITY_OFF); - break; + break; } } diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp index 079c9fd42d1..43342a276aa 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_the_black_stalker.cpp @@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI target->AddAura(SPELL_SUSPENSION, target); LevitatedTarget = 0; } - else + else { target->CastSpell(target, SPELL_MAGNETIC_PULL, true); InAir = true; diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp index fdfb25a2e50..96986367077 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp @@ -120,7 +120,7 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI if(pInstance) { pInstance->SetData(DATA_GRUULEVENT, DONE); - + GameObject* EncounterDoor = GameObject::GetGameObject((*m_creature), pInstance->GetData64(DATA_GRUULDOOR)); if (EncounterDoor) EncounterDoor->SetGoState(0); // Open the encounter door diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp index 793efb598d4..e72c0adc8e9 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Boss_Warchief_Kargath_Bladefist SD%Complete: 90 -SDComment: +SDComment: SDCategory: Hellfire Citadel, Shattered Halls EndScriptData */ @@ -70,11 +70,11 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI uint32 Assassins_Timer; - uint32 summoned; + uint32 summoned; bool InBlade; uint32 target_num; - + void Reset() { removeAdds(); @@ -146,7 +146,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI if(id != 1) return; - + if(target_num > 0) // to prevent loops { Wait_Timer = 1; @@ -162,8 +162,8 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI { Unit* temp = Unit::GetUnit((*m_creature),*itr); if(temp && temp->isAlive()) - { - (*temp).GetMotionMaster()->Clear(true); + { + (*temp).GetMotionMaster()->Clear(true); m_creature->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); ((Creature*)temp)->RemoveCorpse(); } @@ -184,10 +184,10 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI } void SpawnAssassin() { - m_creature->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]+8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - m_creature->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]-8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + m_creature->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]+8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + m_creature->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]-8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); m_creature->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]+8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - m_creature->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]-8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); + m_creature->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]-8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); } void UpdateAI(const uint32 diff) @@ -279,18 +279,18 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI tempy = uint32(m_creature->GetPositionY()); if (tempx > 255 || tempx < 205) { - EnterEvadeMode(); + EnterEvadeMode(); } resetcheck_timer = 5000; - }else resetcheck_timer -= diff; + }else resetcheck_timer -= diff; } }; - + CreatureAI* GetAI_boss_warchief_kargath_bladefist(Creature *_Creature) { return new boss_warchief_kargath_bladefistAI (_Creature); -} - +} + void AddSC_boss_warchief_kargath_bladefist() { Script *newscript; diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp index 0c00ba7ba89..c71870b3232 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_curator.cpp @@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI return; else Evocating = false; - } + } if (!Enraged) { diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp index d9b69b8bddc..b35b6a98642 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp @@ -387,7 +387,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI Creature* Orb = DoSpawnCreature(CREATURE_ARCANE_SPHERE, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); if (Orb && target) - { + { //SetThreatList(Orb); Orb->AddThreat(target, 1.0f); Orb->AI()->AttackStart(target); @@ -456,8 +456,8 @@ struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI ScriptedInstance* pInstance; uint32 BurnTimer; uint32 Death_Timer; - bool Rebirth; - bool FakeDeath; + bool Rebirth; + bool FakeDeath; void Reset() { @@ -500,7 +500,7 @@ struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->ClearAllReactives(); - m_creature->SetUInt64Value(UNIT_FIELD_TARGET,0); + m_creature->SetUInt64Value(UNIT_FIELD_TARGET,0); m_creature->GetMotionMaster()->Clear(); m_creature->GetMotionMaster()->MoveIdle(); m_creature->SetStandState(UNIT_STAND_STATE_DEAD); @@ -519,21 +519,21 @@ struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI //If we are fake death, we cast revbirth and after that we kill the phoenix to spawn the egg. if (FakeDeath) - { + { if (!Rebirth) { DoCast(m_creature, SPELL_REBIRTH_DMG); Rebirth = true; } - if (Rebirth) + if (Rebirth) { - + if (Death_Timer < diff) { - DoSpawnCreature(CREATURE_PHOENIX_EGG, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000); + DoSpawnCreature(CREATURE_PHOENIX_EGG, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000); m_creature->setDeathState(JUST_DIED); - m_creature->RemoveCorpse(); + m_creature->RemoveCorpse(); Rebirth = false; }else Death_Timer -= diff; } @@ -563,9 +563,9 @@ struct TRINITY_DLL_DECL mob_felkael_phoenix_eggAI : public ScriptedAI uint32 HatchTimer; - void Reset() - { - HatchTimer = 10000; + void Reset() + { + HatchTimer = 10000; } diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp index 0c48b9b8bfd..236533b2489 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp @@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI } } } - + void KilledUnit(Unit* victim) { if (victim->GetTypeId() != TYPEID_PLAYER) diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp index 9a31ee6518d..351a72db2fc 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_bloodmage_thalnos.cpp @@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL boss_bloodmage_thalnosAI : public ScriptedAI DoCast(m_creature->getVictim(),SPELL_SHADOWBOLT); ShadowBolt_Timer = 2000; }else ShadowBolt_Timer -= diff; - + DoMeleeAttackIfReady(); } }; diff --git a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp index 08c7d637b02..bcc6d9ccbfe 100644 --- a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp +++ b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp @@ -255,7 +255,7 @@ bool GossipHello_npc_stormwind_harbor_taxi(Player *player, Creature *_Creature) bool GossipSelect_npc_stormwind_harbor_taxi(Player *player, Creature *_Creature, uint32 sender, uint32 action ) { if (action == GOSSIP_ACTION_INFO_DEF + 10) - { + { player->GetSession()->SendDoFlight(1149, 1041); } return true; diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp index 58fb27f90b5..e8806b62957 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp @@ -56,7 +56,7 @@ struct TRINITY_DLL_DECL instance_mechanar : public ScriptedInstance { switch(type) { - case DATA_NETHERMANCER_EVENT: return Encounters[0]; + case DATA_NETHERMANCER_EVENT: return Encounters[0]; } return false; diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp index 3dfa7008e9a..d6ffe70dc69 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp @@ -568,7 +568,7 @@ struct TRINITY_DLL_DECL cthunAI : public Scripted_NoMovementAI //Play random sound to the zone Map::PlayerList const &PlayerList = map->GetPlayers(); - + if (!PlayerList.isEmpty()) { for(Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp index ceda8c5f915..0899fa5a610 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp @@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI DoYell("I dont have enough buddies.", LANG_NEUTRAL, 0);*/ SendMyListToBuddies(); CallBuddiesToAttack(who); - + delete[] chosenAbilities; } diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp index 8a9310a7444..22e1b504446 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp @@ -73,7 +73,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI { - boss_ingvar_the_plundererAI(Creature *c) : ScriptedAI(c) + boss_ingvar_the_plundererAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = c->GetMap()->IsHeroic(); @@ -117,7 +117,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI pInstance->SetData(DATA_INGVAR_EVENT, NOT_STARTED); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit *done_by, uint32 &damage) { if( damage >= m_creature->GetHealth() && !undead) { @@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI m_creature->GetMotionMaster()->MoveIdle(); m_creature->SetStandState(UNIT_STAND_STATE_DEAD); // visuel hack end - + event_inProgress = true; undead = true; @@ -166,7 +166,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI pInstance->SetData(DATA_INGVAR_EVENT, IN_PROGRESS); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) { DoYell(YELL_DEAD_2,LANG_UNIVERSAL,NULL); DoPlaySoundToSet(m_creature,SOUND_DEAD_2); @@ -199,7 +199,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI if(SpawnResTimer) if(SpawnResTimer< diff) { - DoCast(m_creature,SPELL_SUMMON_BANSHEE); // Summons direktly on caster position + DoCast(m_creature,SPELL_SUMMON_BANSHEE); // Summons direktly on caster position //DoCast(m_creature,SPELL_SCOURG_RESURRECTION_EFFEKTSPAWN); // Dont needet ? SpawnResTimer = 0; }else SpawnResTimer -= diff; @@ -303,7 +303,7 @@ CreatureAI* GetAI_boss_ingvar_the_plunderer(Creature *_Creature) struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI { - mob_annhylde_the_callerAI(Creature *c) : ScriptedAI(c) + mob_annhylde_the_callerAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); } @@ -392,7 +392,7 @@ struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI Resurect_Phase++; } } - + }else Resurect_Timer -= diff; } }; @@ -407,7 +407,7 @@ CreatureAI* GetAI_mob_annhylde_the_caller(Creature *_Creature) struct TRINITY_DLL_DECL mob_ingvar_throw_dummyAI : public ScriptedAI { - mob_ingvar_throw_dummyAI(Creature *c) : ScriptedAI(c) + mob_ingvar_throw_dummyAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = c->GetMap()->IsHeroic(); diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp index a417decdb94..6e99f204666 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_keleseth.cpp @@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL mob_frost_tombAI : public ScriptedAI Unit* temp = Unit::GetUnit((*m_creature),FrostTombGUID); if((temp && temp->isAlive() && !temp->HasAura(SPELL_FROST_TOMB)) || !temp ) m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - } + } }; struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI @@ -98,7 +98,7 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI pInstance = ((ScriptedInstance*)c->GetInstanceData()); Heroic = c->GetMap()->IsHeroic(); } - + ScriptedInstance* pInstance; uint32 FrostTombTimer; @@ -109,7 +109,7 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI bool Skeletons; bool Heroic; bool RespawnSkeletons; - + void Reset() { ShadowboltTimer = 0; @@ -129,7 +129,7 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI DoScriptText(SAY_KILL, m_creature); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) { DoScriptText(SAY_DEATH, m_creature); @@ -137,7 +137,7 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI pInstance->SetData(DATA_PRINCEKELESETH_EVENT, DONE); } - void Aggro(Unit* who) + void Aggro(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); DoZoneInCombat(); @@ -152,7 +152,7 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI FrostTombTimer = 28000 + inc; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) { if (!UpdateVictim()) return; @@ -208,7 +208,7 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI { - mob_vrykul_skeletonAI(Creature *c) : ScriptedAI(c) + mob_vrykul_skeletonAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); } @@ -240,7 +240,7 @@ struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI } } - + void PretendToDie() { isDead = true; @@ -253,7 +253,7 @@ struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI }; void Resurrect() - { + { isDead = false; m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->SetStandState(UNIT_STAND_STATE_STAND); diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp index e107abde6c4..78bc29a770d 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp @@ -67,7 +67,7 @@ EndScriptData */ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI { - boss_skarvald_the_constructorAI(Creature *c) : ScriptedAI(c) + boss_skarvald_the_constructorAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); @@ -184,7 +184,7 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI } }else Check_Timer -= diff; - if(Response_Timer) + if(Response_Timer) if(Dalronn_isDead) if(Response_Timer < diff) { @@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI DoCast(m_creature->getVictim(), SPELL_STONE_STRIKE); StoneStrike_Timer = 5000+rand()%5000; }else StoneStrike_Timer -= diff; - + DoMeleeAttackIfReady(); } }; @@ -218,7 +218,7 @@ CreatureAI* GetAI_boss_skarvald_the_constructor(Creature *_Creature) struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI { - boss_dalronn_the_controllerAI(Creature *c) : ScriptedAI(c) + boss_dalronn_the_controllerAI(Creature *c) : ScriptedAI(c) { pInstance = ((ScriptedInstance*)c->GetInstanceData()); HeroicMode = m_creature->GetMap()->IsHeroic(); @@ -316,7 +316,7 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI { if(pInstance->GetData(DATA_SKARVALD_DALRONN_EVENT) != IN_PROGRESS) { - m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } } @@ -375,7 +375,7 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI Debilitate_Timer = 5000+rand()%5000; } }else Debilitate_Timer -= diff; - + if(HeroicMode) if(Summon_Timer < diff) { @@ -400,7 +400,7 @@ void AddSC_boss_skarvald_dalronn() newscript->Name="boss_skarvald_the_constructor"; newscript->GetAI = &GetAI_boss_skarvald_the_constructor; newscript->RegisterSelf(); - + newscript = new Script; newscript->Name="boss_dalronn_the_controller"; newscript->GetAI = &GetAI_boss_dalronn_the_controller; diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp index cafb755bcd3..e0e243cbed9 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp @@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance void OnCreatureCreate(Creature *creature, uint32 creature_entry) { switch(creature_entry) - { + { case 23953: Keleseth = creature->GetGUID(); break; case 24201: Dalronn = creature->GetGUID(); break; case 24200: Skarvald = creature->GetGUID(); break; diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp index 89168e812cc..6556672dfdf 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp @@ -397,7 +397,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI m_creature->AttackStop(); m_creature->GetMotionMaster()->Clear(); - DoTeleportTo(JanalainPos[0][0],JanalainPos[0][1],JanalainPos[0][2]); + DoTeleportTo(JanalainPos[0][0],JanalainPos[0][1],JanalainPos[0][2]); m_creature->StopMoving(); m_creature->CastSpell(m_creature, SPELL_HATCH_ALL, false); HatchAllEggs(2); diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index 9f1e9f6218d..9add7ed98da 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -795,7 +795,7 @@ void BattleGround::RewardMark(Player *plr,uint32 count) if(!plr || !count) return; - BattleGroundMarks mark; + BattleGroundMarks mark; switch(GetTypeID()) { case BATTLEGROUND_AV: @@ -807,7 +807,7 @@ void BattleGround::RewardMark(Player *plr,uint32 count) case BATTLEGROUND_AB: mark = ITEM_AB_MARK_OF_HONOR; break; - case BATTLEGROUND_EY: + case BATTLEGROUND_EY: mark = ITEM_EY_MARK_OF_HONOR; break; default: diff --git a/src/game/BattleGroundWS.h b/src/game/BattleGroundWS.h index 7c3edceddd8..906bccfe6ab 100644 --- a/src/game/BattleGroundWS.h +++ b/src/game/BattleGroundWS.h @@ -29,7 +29,7 @@ enum BG_WS_TimerOrScore BG_WS_FLAG_RESPAWN_TIME = 23000, BG_WS_FLAG_DROP_TIME = 10000, BG_WS_SPELL_FORCE_TIME = 600000, - BG_WS_SPELL_BRUTAL_TIME = 900000 + BG_WS_SPELL_BRUTAL_TIME = 900000 }; enum BG_WS_Sound diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index d8079ee8418..97f6c3bde6f 100644 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -205,7 +205,7 @@ SET(game_STAT_SRCS PointMovementGenerator.cpp PointMovementGenerator.h PoolHandler.cpp - PoolHandler.h + PoolHandler.h PossessedAI.cpp PossessedAI.h QueryHandler.cpp @@ -245,7 +245,7 @@ SET(game_STAT_SRCS TemporarySummon.h TicketHandler.cpp TicketMgr.cpp - TicketMgr.h + TicketMgr.h Tools.cpp Tools.h TotemAI.cpp diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index 48b6a195a14..1603d7b8fdf 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -1034,7 +1034,7 @@ int ChatHandler::ParseCommands(const char* text) if(!ExecuteCommandInTable(getCommandTable(), text, fullcmd)) { - if(m_session && m_session->GetSecurity() == SEC_PLAYER) + if(m_session && m_session->GetSecurity() == SEC_PLAYER) return 0; SendSysMessage(LANG_NO_CMD); } diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h index fa5036c56d2..c46de44bf1f 100644 --- a/src/game/DBCStructure.h +++ b/src/game/DBCStructure.h @@ -660,7 +660,7 @@ struct CinematicCameraEntry float start_x; // 3 float start_y; // 4 float start_z; // 5 - float unk6; // 6 speed? + float unk6; // 6 speed? }; */ diff --git a/src/game/GridNotifiersImpl.h b/src/game/GridNotifiersImpl.h index 97daafa6ced..7fc6c147f5b 100644 --- a/src/game/GridNotifiersImpl.h +++ b/src/game/GridNotifiersImpl.h @@ -128,7 +128,7 @@ Trinity::CreatureRelocationNotifier::Visit(PlayerMapType &m) continue; iter->getSource()->UpdateVisibilityOf(&i_creature); - + PlayerCreatureRelocationWorker(iter->getSource(), &i_creature); } } @@ -144,7 +144,7 @@ Trinity::CreatureRelocationNotifier::Visit(CreatureMapType &m) { if(iter->getSource()->m_Notified) continue; - + if(!iter->getSource()->isAlive()) continue; diff --git a/src/game/InstanceData.cpp b/src/game/InstanceData.cpp index bd8f510e594..808ebca2f59 100644 --- a/src/game/InstanceData.cpp +++ b/src/game/InstanceData.cpp @@ -30,8 +30,8 @@ void InstanceData::SaveToDB() CharacterDatabase.PExecute("UPDATE instance SET data = '%s' WHERE id = '%d'", data.c_str(), instance->GetInstanceId()); } -void InstanceData::HandleGameObject(uint64 GUID, bool open, GameObject *go) -{ +void InstanceData::HandleGameObject(uint64 GUID, bool open, GameObject *go) +{ if(!go) go = instance->GetGameObjectInMap(GUID); if(go) diff --git a/src/game/Language.h b/src/game/Language.h index aebcd93a008..b58a5b82b60 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -767,7 +767,7 @@ enum TrinityStrings LANG_RESET_PET_TALENTS_ONLINE = 1127, // Room for more level 3 1128-1199 not used - // AV + // AV LANG_BG_AV_ALLY = 1200, LANG_BG_AV_HORDE = 1201, LANG_BG_AV_TOWER_TAKEN = 1202, diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 29b7515750e..d6f06051c59 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -495,7 +495,7 @@ Map::Add(T *obj) AddToGrid(obj,grid,cell); obj->AddToWorld(); - + if(obj->isActiveObject()) AddToActive(obj); diff --git a/src/game/Map.h b/src/game/Map.h index 0719ec602ef..4d00a287b03 100644 --- a/src/game/Map.h +++ b/src/game/Map.h @@ -219,7 +219,7 @@ struct CreatureMover struct InstanceTemplate { uint32 map; - uint32 parent; + uint32 parent; uint32 maxPlayers; uint32 maxPlayersHeroic; uint32 reset_delay; // FIX ME: now exist normal/heroic raids with possible different time of reset. diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp index b2856b1fb1f..e083302e045 100644 --- a/src/game/MapManager.cpp +++ b/src/game/MapManager.cpp @@ -214,7 +214,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player) InstanceTemplate const* instance = objmgr.GetInstanceTemplate(mapid); if(!instance) return false; - + return player->Satisfy(objmgr.GetAccessRequirement(instance->access_id), mapid, true); } else diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index 81cdace92c8..ca2c5609692 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -566,12 +566,12 @@ void WorldSession::HandleAddFriendOpcodeCallBack(QueryResult *result, uint32 acc uint64 friendGuid; uint32 team; FriendsResult friendResult; - + WorldSession * session = sWorld.FindSession(accountId); if(!session || !session->GetPlayer()) return; - + friendResult = FRIEND_NOT_FOUND; friendGuid = 0; @@ -655,12 +655,12 @@ void WorldSession::HandleAddIgnoreOpcodeCallBack(QueryResult *result, uint32 acc { uint64 IgnoreGuid; FriendsResult ignoreResult; - + WorldSession * session = sWorld.FindSession(accountId); if(!session || !session->GetPlayer()) return; - + ignoreResult = FRIEND_IGNORE_NOT_FOUND; IgnoreGuid = 0; @@ -679,7 +679,7 @@ void WorldSession::HandleAddIgnoreOpcodeCallBack(QueryResult *result, uint32 acc else { ignoreResult = FRIEND_IGNORE_ADDED; - + // ignore list full if(!session->GetPlayer()->GetSocial()->AddToSocialList(GUID_LOPART(IgnoreGuid), true)) ignoreResult = FRIEND_IGNORE_FULL; diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 0fd7046a97f..b5f25596af3 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1170,8 +1170,8 @@ void WorldObject::SetWorldObject(bool on) { if(!IsInWorld()) return; - - GetMap()->AddObjectToSwitchList(this, on); + + GetMap()->AddObjectToSwitchList(this, on); } void WorldObject::setActive( bool on ) diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index f15e02118c6..a4128249468 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -5078,7 +5078,7 @@ void ObjectMgr::LoadAreaTriggerTeleports() uint32 count = 0; - // 0 1 2 3 4 5 6 + // 0 1 2 3 4 5 6 QueryResult *result = WorldDatabase.Query("SELECT id, access_id, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM areatrigger_teleport"); if( !result ) { @@ -5119,7 +5119,7 @@ void ObjectMgr::LoadAreaTriggerTeleports() sLog.outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.",Trigger_ID); continue; } - + MapEntry const* mapEntry = sMapStore.LookupEntry(at.target_mapId); if(!mapEntry) { @@ -5237,7 +5237,7 @@ void ObjectMgr::LoadAccessRequirements() ar.heroicQuest = 0; } } - + if(ar.quest) { QuestMap::iterator qReqItr = mQuestTemplates.find(ar.quest); diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 35222ca6ec5..1d45ed3a7fd 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -1148,7 +1148,7 @@ void Pet::_SaveAuras() { // skip all auras from spell that apply at cast SPELL_AURA_MOD_SHAPESHIFT or pet area auras. // do not save single target auras (unless they were cast by the player) - if (itr->second->IsPassive() + if (itr->second->IsPassive() || (itr->second->GetCasterGUID() != GetGUID() && itr->second->IsSingleTarget())) continue; SpellEntry const *spellInfo = itr->second->GetSpellProto(); @@ -1168,8 +1168,8 @@ void Pet::_SaveAuras() CharacterDatabase.PExecute("INSERT INTO pet_aura (guid,caster_guid,spell,effect_mask,stackcount,amount0, amount1, amount2,maxduration,remaintime,remaincharges) " "VALUES ('%u', '" I64FMTD "', '%u', '%u', '%u', '%u', '%u', '%d', '%d', '%d', '%d')", - m_charmInfo->GetPetNumber(), itr->second->GetCasterGUID(),(uint32)itr->second->GetId(), (uint32)itr->second->GetEffectMask(), - (uint32)itr->second->GetStackAmount(), amounts[0], amounts[1], amounts[2] + m_charmInfo->GetPetNumber(), itr->second->GetCasterGUID(),(uint32)itr->second->GetId(), (uint32)itr->second->GetEffectMask(), + (uint32)itr->second->GetStackAmount(), amounts[0], amounts[1], amounts[2] ,int(itr->second->GetAuraMaxDuration()),int(itr->second->GetAuraDuration()),int(itr->second->GetAuraCharges())); } } diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 8dcb28224f7..730a91a50c3 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -5960,7 +5960,7 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt { // Check if allowed to receive it in current map uint8 MapType = sWorld.getConfig(CONFIG_PVP_TOKEN_MAP_TYPE); - if( (MapType == 1 && !InBattleGround() && !HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP)) + if( (MapType == 1 && !InBattleGround() && !HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP)) || (MapType == 2 && !HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP)) || (MapType == 3 && !InBattleGround()) ) return true; @@ -15841,7 +15841,7 @@ void Player::_SaveAuras() { // skip all auras from spell that apply at cast SPELL_AURA_MOD_SHAPESHIFT or pet area auras. // do not save single target auras (unless they were cast by the player) - if (itr->second->IsPassive() + if (itr->second->IsPassive() || (itr->second->GetCasterGUID() != GetGUID() && itr->second->IsSingleTarget()) || itr->second->IsRemovedOnShapeLost()) continue; @@ -15861,8 +15861,8 @@ void Player::_SaveAuras() CharacterDatabase.PExecute("INSERT INTO character_aura (guid,caster_guid,spell,effect_mask,stackcount,amount0, amount1, amount2,maxduration,remaintime,remaincharges) " "VALUES ('%u', '" I64FMTD "', '%u', '%u', '%d', '%d', '%d', '%d', '%d', '%d', '%d')", - GetGUIDLow(), itr->second->GetCasterGUID(),(uint32)itr->second->GetId(), (uint32)itr->second->GetEffectMask(), - (uint32)itr->second->GetStackAmount(), (int32)amounts[0], (int32)amounts[1], (int32)amounts[2] + GetGUIDLow(), itr->second->GetCasterGUID(),(uint32)itr->second->GetId(), (uint32)itr->second->GetEffectMask(), + (uint32)itr->second->GetStackAmount(), (int32)amounts[0], (int32)amounts[1], (int32)amounts[2] ,int(itr->second->GetAuraMaxDuration()),int(itr->second->GetAuraDuration()),int(itr->second->GetAuraCharges())); } } @@ -16872,7 +16872,7 @@ void Player::CharmSpellInitialize() data << uint8(count); // cooldowns count data.hexlike(); - + GetSession()->SendPacket(&data); } diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index 64973bcd080..61c266854ff 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -143,7 +143,7 @@ enum Powers MAX_POWERS = 7, POWER_ALL = 127, // default for class? POWER_HEALTH = 0xFFFFFFFE // (-2 as signed value) -}; +}; enum SpellSchools { diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 8291056e15f..16cfe5b0e60 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -687,7 +687,7 @@ void Spell::prepareDataForTriggerSystem() if (m_spellInfo->SpellFamilyFlags[1] & 0x00000010 || m_spellInfo->SpellFamilyFlags[0] & 0x1001E000) m_canTrigger = true; break; case SPELLFAMILY_HUNTER: // Hunter Rapid Killing/Explosive Trap Effect/Immolation Trap Effect/Frost Trap Aura/Snake Trap Effect/Explosive Shot - if (m_spellInfo->SpellFamilyFlags[1] & 0x01002000 + if (m_spellInfo->SpellFamilyFlags[1] & 0x01002000 || m_spellInfo->SpellFamilyFlags[0] & 0x00000214 || m_spellInfo->SpellFamilyFlags[2] & 0x200) m_canTrigger = true; break; diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index d6108c3ea93..03274b4b74b 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -232,7 +232,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]= &AuraEffect::HandleNoImmediateEffect, //178 SPELL_AURA_MOD_DEBUFF_RESISTANCE implemented in Unit::MagicSpellHitResult &AuraEffect::HandleNoImmediateEffect, //179 SPELL_AURA_MOD_ATTACKER_SPELL_CRIT_CHANCE implemented in Unit::SpellCriticalBonus &AuraEffect::HandleNoImmediateEffect, //180 SPELL_AURA_MOD_FLAT_SPELL_DAMAGE_VERSUS implemented in Unit::SpellDamageBonus - &AuraEffect::HandleUnused, //181 unused (3.0.8a) old SPELL_AURA_MOD_FLAT_SPELL_CRIT_DAMAGE_VERSUS + &AuraEffect::HandleUnused, //181 unused (3.0.8a) old SPELL_AURA_MOD_FLAT_SPELL_CRIT_DAMAGE_VERSUS &AuraEffect::HandleAuraModResistenceOfStatPercent, //182 SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT &AuraEffect::HandleNULL, //183 SPELL_AURA_MOD_CRITICAL_THREAT only used in 28746 &AuraEffect::HandleNoImmediateEffect, //184 SPELL_AURA_MOD_ATTACKER_MELEE_HIT_CHANCE implemented in Unit::RollMeleeOutcomeAgainst @@ -367,7 +367,7 @@ m_auraSlot(MAX_AURAS), m_auraLevel(1), m_procCharges(0), m_stackAmount(1),m_aura { m_caster_guid = target->GetGUID(); //damage = m_currentBasePoints+1; // stored value-1 - m_maxduration = target->CalcSpellDuration(m_spellProto); + m_maxduration = target->CalcSpellDuration(m_spellProto); } else { @@ -423,7 +423,7 @@ m_auraSlot(MAX_AURAS), m_auraLevel(1), m_procCharges(0), m_stackAmount(1),m_aura } } - // Aura is positive when it is casted by friend and at least one aura is positive + // Aura is positive when it is casted by friend and at least one aura is positive // or when it is casted by enemy and at least one aura is negative bool swap=false; if (!caster || caster==target) @@ -526,7 +526,7 @@ AreaAuraEffect::AreaAuraEffect(Aura * parentAura, uint32 effIndex, int32 * curre if (m_spellProto->Effect[effIndex] == SPELL_EFFECT_APPLY_AREA_AURA_ENEMY) m_radius = GetSpellRadiusForHostile(sSpellRadiusStore.LookupEntry(GetSpellProto()->EffectRadiusIndex[m_effIndex])); - else + else m_radius = GetSpellRadiusForFriend(sSpellRadiusStore.LookupEntry(GetSpellProto()->EffectRadiusIndex[m_effIndex])); if(Player* modOwner = caster_ptr->GetSpellModOwner()) @@ -6166,7 +6166,7 @@ void AuraEffect::PeriodicTick() } // Anger Management - // amount = 1+ 16 = 17 = 3,4*5 = 10,2*5/3 + // amount = 1+ 16 = 17 = 3,4*5 = 10,2*5/3 // so 17 is rounded amount for 5 sec tick grow ~ 1 range grow in 3 sec if(pt == POWER_RAGE) m_target->ModifyPower(pt, m_amount*3/5); @@ -6748,8 +6748,8 @@ void AuraEffect::HandleModPossessPet(bool apply, bool Real) if(apply) { if(caster->GetGuardianPet() != m_target) - return; - + return; + m_target->SetCharmedOrPossessedBy(caster, true); } else @@ -6777,7 +6777,7 @@ void AuraEffect::HandleModCharm(bool apply, bool Real) { if(int32(m_target->getLevel()) > m_amount) return; - + m_target->SetCharmedOrPossessedBy(caster, false); } else diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index b5e6b36c463..7d56e3442b3 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -2716,7 +2716,7 @@ void Spell::DoCreateItem(uint32 i, uint32 itemtype) // we succeeded in creating at least one item, so a levelup is possible player->UpdateCraftSkill(m_spellInfo->Id); - } + } } void Spell::EffectCreateItem(uint32 i) @@ -3920,7 +3920,7 @@ void Spell::EffectSummonPet(uint32 i) Pet* pet = owner->SummonPet(petentry, x, y, z, owner->GetOrientation(), SUMMON_PET, 0); if(!pet) return; - + if(m_caster->GetTypeId() == TYPEID_UNIT) { if ( ((Creature*)m_caster)->isTotem() ) @@ -4572,7 +4572,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) { if(!unitTarget) return; - + switch(((Player*)unitTarget)->GetBaseSkillValue(762)) { case 75: unitTarget->CastSpell(unitTarget, 51621, true); break;; @@ -4607,7 +4607,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) int bag=19; int slot=0; Item* item = NULL; - + while (bag < 256) { item = ((Player*)m_caster)->GetItemByPos(bag,slot); diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 6a7b5b2e2af..a8bdcb1ad5d 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1691,7 +1691,7 @@ void SpellMgr::LoadSpellChains() bar.step(); RankErrorMap.insert(std::pair<char const *, std::multimap<SpellRankEntry, SpellRankValue>::iterator>(itr2->second.Rank,itr2)); } - + bool error=false; //if strict == true strict check is not needed if (!itr->second.strict) diff --git a/src/game/TicketHandler.cpp b/src/game/TicketHandler.cpp index 068a1592df1..ff920cab04b 100644 --- a/src/game/TicketHandler.cpp +++ b/src/game/TicketHandler.cpp @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2009 MaNGOS * - * Copyright (C) 2008-2009 Trinity + * Copyright (C) 2008-2009 Trinity * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/game/TicketMgr.cpp b/src/game/TicketMgr.cpp index 8d89bf9d20b..82079105aef 100644 --- a/src/game/TicketMgr.cpp +++ b/src/game/TicketMgr.cpp @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2009 MaNGOS * - * Copyright (C) 2008-2009 Trinity + * Copyright (C) 2008-2009 Trinity * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/game/TicketMgr.h b/src/game/TicketMgr.h index bee4d49fa0d..a180268a552 100644 --- a/src/game/TicketMgr.h +++ b/src/game/TicketMgr.h @@ -1,7 +1,7 @@ /* - * Copyright (C) 2005-2009 MaNGOS + * Copyright (C) 2005-2009 MaNGOS * - * Copyright (C) 2008-2009 Trinity + * Copyright (C) 2008-2009 Trinity * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 9d9dcd3ae7e..16623c00b69 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -3155,7 +3155,7 @@ uint32 Unit::GetWeaponSkillValue (WeaponAttackType attType, Unit const* target) if(attType != BASE_ATTACK && !item ) { if(attType == RANGED_ATTACK && getClass() == CLASS_PALADIN) //hammer - return GetMaxSkillValueForLevel(); + return GetMaxSkillValueForLevel(); return 0; } @@ -3232,7 +3232,7 @@ void Unit::_UpdateSpells( uint32 time ) if ((*i).second) { if ( !(*i).second->GetAuraDuration() && !((*i).second->IsPermanent() || ((*i).second->IsPassive())) ) - { + { RemoveAura(i, AURA_REMOVE_BY_EXPIRE); } else @@ -3761,7 +3761,7 @@ bool Unit::AddAura(Aura *Aur) m_interruptableAuras.push_back(Aur); AddInterruptMask(Aur->GetSpellProto()->AuraInterruptFlags); } - if((Aur->GetSpellProto()->Attributes & SPELL_ATTR_BREAKABLE_BY_DAMAGE + if((Aur->GetSpellProto()->Attributes & SPELL_ATTR_BREAKABLE_BY_DAMAGE && !Aur->IsAuraType(SPELL_AURA_MOD_POSSESS)) //only dummy aura is breakable || (Aur->GetSpellProto()->Mechanic==MECHANIC_KNOCKOUT && Aur->IsAuraType(SPELL_AURA_MOD_STUN))) { @@ -6071,7 +6071,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger return false; } // Totemic Power (The Earthshatterer set) - case 28823: + case 28823: { if( !pVictim ) return false; @@ -6437,7 +6437,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger Unit::AuraEffectList const& decSpeedList = pVictim->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE); for(Unit::AuraEffectList::const_iterator iter = decSpeedList.begin(); iter != decSpeedList.end(); ++iter) { - if((*iter)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_DEATHKNIGHT + if((*iter)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_DEATHKNIGHT && (*iter)->GetCasterGUID() == GetGUID() && (*iter)->GetSpellProto()->Dispel == DISPEL_DISEASE) { @@ -8091,7 +8091,7 @@ void Unit::SetCharm(Unit* charm, bool apply) if(!charm->RemoveUInt64Value(UNIT_FIELD_CHARMEDBY, GetGUID())) sLog.outCrash("Unit %u is being uncharmed, but it has another charmer %u", charm->GetEntry(), charm->GetCharmerGUID()); - + m_Controlled.erase(charm); } } @@ -8122,11 +8122,11 @@ void Unit::RemoveAllControlled() { target->RemoveCharmAuras(); } - else if(target->GetOwnerGUID() == GetGUID() + else if(target->GetOwnerGUID() == GetGUID() && target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->HasSummonMask(SUMMON_MASK_SUMMON)) { - + if(!((TempSummon*)target)->isPet()) ((TempSummon*)target)->UnSummon(); } diff --git a/src/shared/SystemConfig.h.in b/src/shared/SystemConfig.h.in index 85bbd8e19f0..ad8df37b5be 100644 --- a/src/shared/SystemConfig.h.in +++ b/src/shared/SystemConfig.h.in @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinitycore/CMakeLists.txt b/src/trinitycore/CMakeLists.txt index 2c7c4544577..7cd012d9f45 100644 --- a/src/trinitycore/CMakeLists.txt +++ b/src/trinitycore/CMakeLists.txt @@ -2,14 +2,14 @@ ########### next target ############### SET(trinity-core_SRCS -CliRunnable.cpp -CliRunnable.h -Main.cpp -Master.cpp -Master.h -RASocket.cpp -RASocket.h -WorldRunnable.cpp +CliRunnable.cpp +CliRunnable.h +Main.cpp +Master.cpp +Master.h +RASocket.cpp +RASocket.h +WorldRunnable.cpp WorldRunnable.h ) diff --git a/src/trinitycore/CliRunnable.h b/src/trinitycore/CliRunnable.h index e5f78bb5259..20ff58f27ba 100644 --- a/src/trinitycore/CliRunnable.h +++ b/src/trinitycore/CliRunnable.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinitycore/Main.cpp b/src/trinitycore/Main.cpp index 3ecde1c788a..7b00073026d 100644 --- a/src/trinitycore/Main.cpp +++ b/src/trinitycore/Main.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> @@ -138,7 +138,7 @@ extern int main(int argc, char **argv) return 1; } sLog.outString("Using configuration file %s.", cfg_file); - + uint32 confVersion = sConfig.GetIntDefault("ConfVersion", 0); if (confVersion < _TRINITY_CORE_CONFVER) { diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp index 7e5cbd381ec..a92ac0584f5 100644 --- a/src/trinitycore/Master.cpp +++ b/src/trinitycore/Master.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinitycore/Master.h b/src/trinitycore/Master.h index 3b2b38f32f4..967f497051a 100644 --- a/src/trinitycore/Master.h +++ b/src/trinitycore/Master.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp index 6583fb8a1ba..e49e4ad74b8 100644 --- a/src/trinitycore/WorldRunnable.cpp +++ b/src/trinitycore/WorldRunnable.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinitycore/WorldRunnable.h b/src/trinitycore/WorldRunnable.h index b967d0dac0b..8df3a6a0c89 100644 --- a/src/trinitycore/WorldRunnable.h +++ b/src/trinitycore/WorldRunnable.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinitycore/resource.h b/src/trinitycore/resource.h index 7e7d8e4b76f..7dc5cb9ef7b 100644 --- a/src/trinitycore/resource.h +++ b/src/trinitycore/resource.h @@ -4,7 +4,7 @@ // // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 diff --git a/src/trinitycore/run-mangosd b/src/trinitycore/run-mangosd index f307bd9e1ad..4a146804e81 100644 --- a/src/trinitycore/run-mangosd +++ b/src/trinitycore/run-mangosd @@ -6,7 +6,7 @@ while : do echo "TrinityCore daemon restarted" echo `date` >> crash.log & - ./mangosd | tail -n 20 >> crash.log + ./mangosd | tail -n 20 >> crash.log echo " " >> crash.log & pid=`ps ax | awk '($5 ~ /trinitycore/) { print $1 }'` wait $pid diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index 1411aed3091..018ddf378b5 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -25,7 +25,7 @@ ConfVersion=2009032201 # WorldDatabaseInfo # CharacterDatabaseInfo # Database connection settings for the world server. -# Default: +# Default: # ---MYSQL--- # hostname;port;username;password;database # .;somenumber;username;password;database - use named pipes at Windows @@ -1398,7 +1398,7 @@ Network.TcpNodelay = 1 ################################################################################################################### # AUCTION HOUSE BOT SETTINGS -# +# # AuctionHouseBot.EnableSeller # Enable/Disable the part of AHBot that puts items up for auction # Default 0 (disabled) @@ -1409,7 +1409,7 @@ Network.TcpNodelay = 1 # # Auction House Bot character data # AuctionHouseBot.Account is the account number (in realmd->account table) of the player you want to run as the auction bot. -# AuctionHouseBot.GUID is the GUID (in characters->characters table) of the player you want to run as the auction bot. +# AuctionHouseBot.GUID is the GUID (in characters->characters table) of the player you want to run as the auction bot. # Default: 0 (Auction House Bot disabled) # # AuctionHouseBot.VendorItems @@ -1436,7 +1436,7 @@ Network.TcpNodelay = 1 # Default 1 # Bind_Quest_Item # Default 0 -# +# # AuctionHouseBot.ItemsPerCycle # Number of Items to Add/Remove from the AH during mass operations # Default 200 diff --git a/src/trinityrealm/AuthCodes.h b/src/trinityrealm/AuthCodes.h index 9a38712af83..a85415ba849 100644 --- a/src/trinityrealm/AuthCodes.h +++ b/src/trinityrealm/AuthCodes.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinityrealm/CMakeLists.txt b/src/trinityrealm/CMakeLists.txt index 2a77fb5b074..a8f5a646924 100644 --- a/src/trinityrealm/CMakeLists.txt +++ b/src/trinityrealm/CMakeLists.txt @@ -1,11 +1,11 @@ ########### next target ############### SET(trinity-realm_SRCS -AuthCodes.h -AuthSocket.cpp -AuthSocket.h -Main.cpp -RealmList.cpp +AuthCodes.h +AuthSocket.cpp +AuthSocket.h +Main.cpp +RealmList.cpp RealmList.h ) @@ -21,13 +21,13 @@ ENDIF(DO_MYSQL) IF (DO_POSTGRE) SET(trinity-realm_LINK_FLAGS "${POSTGRE_LIBS} ${trinity-realm_LINK_FLAGS}") ENDIF(DO_POSTGRE) - + IF (CMAKE_SYSTEM_NAME MATCHES "Darwin") SET(trinity-realm_LINK_FLAGS "-framework Carbon ${trinity-realm_LINK_FLAGS}") ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin") SET_TARGET_PROPERTIES(trinity-realm PROPERTIES LINK_FLAGS "${trinity-realm_LINK_FLAGS}") - + target_link_libraries( trinity-realm shared diff --git a/src/trinityrealm/RealmList.cpp b/src/trinityrealm/RealmList.cpp index 490850a3631..6a3d6b47e0f 100644 --- a/src/trinityrealm/RealmList.cpp +++ b/src/trinityrealm/RealmList.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinityrealm/RealmList.h b/src/trinityrealm/RealmList.h index 2d0cee5e992..3663b2bd20d 100644 --- a/src/trinityrealm/RealmList.h +++ b/src/trinityrealm/RealmList.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/> diff --git a/src/trinityrealm/resource.h b/src/trinityrealm/resource.h index 7e7d8e4b76f..7dc5cb9ef7b 100644 --- a/src/trinityrealm/resource.h +++ b/src/trinityrealm/resource.h @@ -4,7 +4,7 @@ // // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 diff --git a/src/trinityrealm/trinityrealm.conf.dist b/src/trinityrealm/trinityrealm.conf.dist index 83871ae741d..363f98ae31c 100644 --- a/src/trinityrealm/trinityrealm.conf.dist +++ b/src/trinityrealm/trinityrealm.conf.dist @@ -17,7 +17,7 @@ ConfVersion=2007062001 # LogsDir # Logs directory setting. # Important: Logs dir must exists, or all logs be disable -# Default: "" - no log directory prefix, if used log names isn't absolute path then logs will be +# Default: "" - no log directory prefix, if used log names isn't absolute path then logs will be # stored in current directory for run program. # # MaxPingTime @@ -83,7 +83,7 @@ ConfVersion=2007062001 # # RealmsStateUpdateDelay # Realm list Update up delay (updated at realm list request if delay expired). -# Default: 20 +# Default: 20 # 0 (Disabled) # # WrongPass.MaxCount |