Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Ahnkahet: small corrections to boss_prince_taldaram script

Browse Source 
(cherry picked from commit f8f50bef50)
This commit is contained in:
ccrs
2021-08-16 02:15:42 +02:00
committed by Shauren
parent a0736c4544
commit e1115e30c2
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
View File

@@ -15,7 +15,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "ScriptMgr.h"
#include "ahnkahet.h"
#include "GameObject.h"
#include "GameObjectAI.h"
@@ -25,9 +24,10 @@
#include "ObjectAccessor.h"
#include "Player.h"
#include "ScriptedCreature.h"
#include "ScriptMgr.h"
#include "SpellScript.h"
enum Spells
enum PrinceTaldaramSpells
{
SPELL_BLOODTHIRST = 55968, // Trigger Spell + add aura
SPELL_CONJURE_FLAME_SPHERE = 55931,
@@ -50,18 +50,14 @@ enum Spells
SPELL_HOVER_FALL = 60425
};
enum Misc
enum PrinceTaldaramMisc
{
DATA_EMBRACE_DMG = 20000,
H_DATA_EMBRACE_DMG = 40000,
SUMMON_GROUP_CONTROLLERS = 1
};
#define DATA_SPHERE_DISTANCE 25.0f
#define DATA_SPHERE_ANGLE_OFFSET float(M_PI) / 2
#define DATA_GROUND_POSITION_Z 11.30809f
enum Yells
enum PrinceTaldaramYells
{
SAY_1 = 0,
SAY_WARNING = 1,
@@ -72,7 +68,7 @@ enum Yells
SAY_VANISH = 6
};
enum Events
enum PrinceTaldaramEvents
{
EVENT_CONJURE_FLAME_SPHERES = 1,
EVENT_BLOODTHIRST,
@@ -85,6 +81,10 @@ enum Events
EVENT_DESPAWN
};
float constexpr PrinceTaldaramSphereDistance = 25.f;
float constexpr PrinceTaldaramSphereAngleOffset = float(M_PI) / 2.f;
float constexpr PrinceTaldaramGroundPositionZ = 11.30809f;
struct boss_prince_taldaram : public BossAI
{
boss_prince_taldaram(Creature* creature) : BossAI(creature, DATA_PRINCE_TALDARAM)
@@ -275,7 +275,7 @@ struct boss_prince_taldaram : public BossAI
me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
summons.DespawnEntry(NPC_JEDOGA_CONTROLLER);
me->RemoveAurasDueToSpell(SPELL_BEAM_VISUAL);
me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), DATA_GROUND_POSITION_Z, me->GetOrientation());
me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), PrinceTaldaramGroundPositionZ, me->GetOrientation());
DoCast(SPELL_HOVER_FALL);
me->SetDisableGravity(false);
me->GetMotionMaster()->MoveLand(0, me->GetHomePosition());
@@ -331,17 +331,17 @@ struct npc_prince_taldaram_flame_sphere : public ScriptedAI
/// @todo: find correct values
float angleOffset = 0.0f;
float distOffset = DATA_SPHERE_DISTANCE;
float distOffset = PrinceTaldaramSphereDistance;
switch (me->GetEntry())
{
case NPC_FLAME_SPHERE_1:
break;
case NPC_FLAME_SPHERE_2:
angleOffset = DATA_SPHERE_ANGLE_OFFSET;
angleOffset = PrinceTaldaramSphereAngleOffset;
break;
case NPC_FLAME_SPHERE_3:
angleOffset = -DATA_SPHERE_ANGLE_OFFSET;
angleOffset = -PrinceTaldaramSphereAngleOffset;
break;
default:
return;