Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts: Move some speed values & UNIT_FLAG_NOT_SELECTABLE to DB

Browse Source 
(cherry picked from commit 3cb70ee62a)
This commit is contained in:
offl
2021-02-04 15:11:22 +02:00
committed by Shauren
parent 7463a2e4bf
commit ca76786faf
13 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
View File

@@ -676,7 +676,6 @@ public:
void Reset() override
{
me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
Initialize();
}

7
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
View File

@@ -526,11 +526,7 @@ public:
struct npc_felmyst_vaporAI : public ScriptedAI
{
npc_felmyst_vaporAI(Creature* creature) : ScriptedAI(creature)
{
me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
me->SetSpeedRate(MOVE_RUN, 0.8f);
}
npc_felmyst_vaporAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() override { }
void JustEngagedWith(Unit* /*who*/) override
@@ -562,7 +558,6 @@ public:
{
npc_felmyst_trailAI(Creature* creature) : ScriptedAI(creature)
{
me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
DoCast(me, SPELL_TRAIL_TRIGGER, true);
me->SetTarget(me->GetGUID());
me->SetBoundingRadius(0.01f); // core bug

2
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
View File

@@ -468,9 +468,7 @@ public:
summoned->CastSpell(summoned, SPELL_SHADOW_CHANNELING, false);
break;
case NPC_ANVEENA:
summoned->SetDisableGravity(true);
summoned->CastSpell(summoned, SPELL_ANVEENA_PRISON, true);
summoned->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
break;
case NPC_KILJAEDEN:
summoned->CastSpell(summoned, SPELL_REBIRTH, false);

3
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
View File

@@ -297,9 +297,6 @@ public:
TEMPSUMMON_CORPSE_DESPAWN);
if (temp)
{
temp->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
temp->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
if (Creature* boss = SummonedPortalBoss(temp))
{
if (boss->GetEntry() == NPC_AEONUS)

1
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
View File

@@ -667,7 +667,6 @@ public:
if (Creature* Cyclone = me->SummonCreature(CREATURE_CYCLONE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), float(rand32() % 5), TEMPSUMMON_TIMED_DESPAWN, 15s))
{
Cyclone->SetObjectScale(3.0f);
Cyclone->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
Cyclone->SetFaction(me->GetFaction());
Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_CYCLONE, true);
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))

2
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
View File

@@ -152,7 +152,6 @@ public:
{
beamer->CastSpell(me, SPELL_BLUE_BEAM, true);
beamer->SetDisplayId(11686); //invisible
beamer->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
beams[0] = beamer->GetGUID();
}
beamer = me->SummonCreature(ENTRY_BEAM_DUMMY, -219.918f, -371.308f, 22.0042f, 2.73072f, TEMPSUMMON_CORPSE_DESPAWN);
@@ -160,7 +159,6 @@ public:
{
beamer->CastSpell(me, SPELL_BLUE_BEAM, true);
beamer->SetDisplayId(11686); //invisible
beamer->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
beams[1] = beamer->GetGUID();
}
}

2
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
View File

@@ -846,8 +846,6 @@ public:
{
Initialize();
me->SetDisplayId(11686); // invisible
me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
}
void MoveInLineOfSight(Unit* /*who*/) override { }

2
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
View File

@@ -320,8 +320,6 @@ public:
{
Initialize();
me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
me->SetFaction(FACTION_MONSTER);
}

4
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
View File

@@ -207,10 +207,6 @@ class boss_grand_warlock_nethekurse : public CreatureScript
void JustSummoned(Creature* summoned) override
{
summoned->SetFaction(FACTION_MONSTER_2);
summoned->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
summoned->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
//triggered spell of consumption does not properly show it's SpellVisual, wrong spellid?
summoned->CastSpell(summoned, SPELL_TEMPORARY_VISUAL, true);
summoned->CastSpell(summoned, SPELL_CONSUMPTION, CastSpellExtraArgs().SetOriginalCaster(me->GetGUID()));

3
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
View File

@@ -1278,9 +1278,6 @@ class npc_kael_flamestrike : public CreatureScript
void Reset() override
{
Initialize();
me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
me->SetFaction(FACTION_MONSTER);
}
void MoveInLineOfSight(Unit* /*who*/) override { }

1
src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
View File

@@ -178,7 +178,6 @@ class npc_ragin_flames : public CreatureScript
void Reset() override
{
Initialize();
me->SetSpeedRate(MOVE_RUN, DUNGEON_MODE(0.5f, 0.7f));
}
void JustEngagedWith(Unit* /*who*/) override

2
src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
View File

@@ -169,8 +169,6 @@ class boss_warp_splinter : public CreatureScript
void Reset() override
{
Initialize();
me->SetSpeedRate(MOVE_RUN, 0.7f);
}
void JustEngagedWith(Unit* /*who*/) override