sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2025-04-09 23:35:21 +08:00
parent 95fc3f0932 b828f7a025
commit 97342b05e7
43 changed files with 3814 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Commands/cs_misc.cpp
+2 -6
View File
@@ -1456,14 +1456,10 @@ public:
{
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(7355);
if (!spellInfo)
{
return false;
}
if (Player* caster = handler->GetSession()->GetPlayer())
{
Spell::SendCastResult(caster, spellInfo, 0, SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW);
}
if (player)
Spell::SendCastResult(player, spellInfo, 0, SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW);
return false;
}
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+5 -5
View File
@@ -146,9 +146,9 @@ struct boss_sacrolash : public BossAI
DoCastVictim(SPELL_CONFOUNDING_BLOW);
}, 20s, 25s);
ScheduleTimedEvent(20s, [&] {
me->SummonCreature(NPC_SHADOW_IMAGE, me->GetPosition(), TEMPSUMMON_TIMED_DESPAWN, 12000);
}, 6s);
ScheduleTimedEvent(8s, 16s, [&] {
me->SummonCreature(NPC_SHADOW_IMAGE, me->GetPosition(), TEMPSUMMON_TIMED_DESPAWN, 10000);
}, 8s, 12s);
scheduler.Schedule(36s, GROUP_SPECIAL_ABILITY, [this](TaskContext context) {
Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 1, 100.0f);
@@ -253,9 +253,9 @@ struct boss_alythess : public BossAI
DoCastVictim(SPELL_BLAZE);
}, 3800ms);
ScheduleTimedEvent(15s, [&] {
ScheduleTimedEvent(21s, 34s, [&] {
DoCastSelf(SPELL_PYROGENICS);
}, 15s);
}, 21s, 34s);
ScheduleTimedEvent(10s, 15s, [&] {
me->CastCustomSpell(SPELL_FLAME_SEAR, SPELLVALUE_MAX_TARGETS, urand(4, 5), me, TRIGGERED_NONE);
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+18 -13
View File
@@ -107,7 +107,8 @@ const Position RightSideLanes[3] =
const Position RightSide = { 1458.5555f, 502.1995f, 59.899513f, 1.605702f };
const Position LeftSide = { 1469.0642f, 729.5854f, 59.823853f, 4.6774f };
const Position LandingPos = { 1476.77f, 665.094f, 20.6423f };
const Position LandingRightPos = { 1476.77f, 665.094f, 20.6423f };
const Position LandingLeftPos = { 1469.93f, 557.009f, 22.631699f };
class CorruptTriggers : public BasicEvent
{
@@ -212,18 +213,18 @@ struct boss_felmyst : public BossAI
DoCastVictim(SPELL_CLEAVE);
}, 7500ms);
ScheduleTimedEvent(12s, [&] {
DoCastVictim(SPELL_CORROSION);
}, 20s);
ScheduleTimedEvent(18s, [&] {
ScheduleTimedEvent(13s, 30s, [&] {
Talk(YELL_BREATH);
DoCastSelf(SPELL_GAS_NOVA);
}, 20s);
DoCastVictim(SPELL_CORROSION);
}, 30s, 39s);
ScheduleTimedEvent(25s, [&] {
ScheduleTimedEvent(18s, 43s, [&] {
DoCastSelf(SPELL_GAS_NOVA);
}, 18s, 43s);
ScheduleTimedEvent(26s, 53s, [&] {
DoCastRandomTarget(SPELL_ENCAPSULATE_CHANNEL, 0, 50.0f);
}, 25s);
}, 26s, 53s);
me->m_Events.AddEventAtOffset([&] {
Talk(YELL_TAKEOFF);
@@ -285,21 +286,25 @@ struct boss_felmyst : public BossAI
scheduler.Schedule(27s, GROUP_BREATH, [this](TaskContext)
{
me->GetMotionMaster()->MovePoint(POINT_AIR_UP, RightSide);
if (me->GetDistance(LeftSide) < me->GetDistance(RightSide))
me->GetMotionMaster()->MovePoint(POINT_AIR_UP, LeftSide);
else
me->GetMotionMaster()->MovePoint(POINT_AIR_UP, RightSide);
});
break;
case POINT_AIR_UP:
me->m_Events.AddEventAtOffset([&] {
bool isRightSide = me->FindNearestCreature(NPC_WORLD_TRIGGER_RIGHT, 30.0f);
if (_strafeCount >= 3)
{
_strafeCount = 0;
me->GetMotionMaster()->MoveLand(POINT_GROUND, LandingPos);
me->GetMotionMaster()->MoveLand(POINT_GROUND, isRightSide ? LandingRightPos : LandingLeftPos);
return;
}
++_strafeCount;
_currentLane = urand(0, 2);
if (me->FindNearestCreature(NPC_WORLD_TRIGGER_RIGHT, 30.0f))
if (isRightSide)
me->GetMotionMaster()->MovePoint(POINT_LANE, RightSideLanes[_currentLane], false);
else
me->GetMotionMaster()->MovePoint(POINT_LANE, LeftSideLanes[_currentLane], false);
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+25 -1
View File
@@ -61,7 +61,7 @@ struct boss_muru : public BossAI
void Reset() override
{
BossAI::Reset();
me->SetReactState(REACT_AGGRESSIVE);
me->SetReactState(REACT_PASSIVE);
me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
me->SetVisible(true);
me->m_Events.KillAllEvents(false);
@@ -352,6 +352,29 @@ class spell_entropius_negative_energy_periodic : public AuraScript
}
};
class spell_muru_blackhole : public SpellScript
{
PrepareSpellScript(spell_muru_blackhole);
void ChangeSummonPos(SpellEffIndex /*effIndex*/)
{
if (!GetCaster())
return;
WorldLocation summonPos = *GetExplTargetDest();
float destZ = summonPos.GetPositionZ() - GetCaster()->GetMapWaterOrGroundLevel(GetCaster()->GetPosition());
Position offset = { 0.0f, 0.0f, -destZ, 0.0f};
summonPos.RelocateOffset(offset);
SetExplTargetDest(summonPos);
GetHitDest()->RelocateOffset(offset);
}
void Register() override
{
OnEffectHit += SpellEffectFn(spell_muru_blackhole::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON);
}
};
void AddSC_boss_muru()
{
RegisterSunwellPlateauCreatureAI(boss_muru);
@@ -363,4 +386,5 @@ void AddSC_boss_muru()
RegisterSpellScript(spell_entropius_void_zone_visual_aura);
RegisterSpellScript(spell_entropius_black_hole_effect);
RegisterSpellScript(spell_entropius_negative_energy_periodic);
RegisterSpellScript(spell_muru_blackhole);
}
src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+35
View File
@@ -250,9 +250,44 @@ private:
ObjectGuid _protectorGUID;
};
enum SunwellTeleportSpells
{
SPELL_TELEPORT_TO_APEX_POINT = 46881,
SPELL_TELEPORT_TO_WITCHS_SANCTUM = 46883,
SPELL_TELEPORT_TO_SUNWELL_PLATEAU = 46884,
};
class spell_sunwell_teleport : public SpellScript
{
PrepareSpellScript(spell_sunwell_teleport);
public:
spell_sunwell_teleport(uint32 triggeredSpellId) : SpellScript(), _triggeredSpellId(triggeredSpellId) { }
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ _triggeredSpellId });
}
void HandleScript(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
if (Player* target = GetHitPlayer())
target->CastSpell(target, _triggeredSpellId, true);
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_sunwell_teleport::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
private:
uint32 _triggeredSpellId;
};
void AddSC_instance_sunwell_plateau()
{
new instance_sunwell_plateau();
RegisterSpellScript(spell_cataclysm_breath);
RegisterSunwellPlateauCreatureAI(npc_sunblade_scout);
RegisterSpellScriptWithArgs(spell_sunwell_teleport, "spell_teleport_to_apex_point", SPELL_TELEPORT_TO_APEX_POINT);
RegisterSpellScriptWithArgs(spell_sunwell_teleport, "spell_teleport_to_witchs_sanctum", SPELL_TELEPORT_TO_WITCHS_SANCTUM);
RegisterSpellScriptWithArgs(spell_sunwell_teleport, "spell_teleport_to_sunwell_plateau", SPELL_TELEPORT_TO_SUNWELL_PLATEAU);
}
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+8 -6
View File
@@ -160,9 +160,10 @@ static PlayerAbilityStruct PlayerAbility[13][3] =
{
// 0 UNK class (should never be set)
{
{ 0, ABILITY_TARGET_SELF, 0ms},
{ 0, ABILITY_TARGET_SELF, 0ms},
{ 0, ABILITY_TARGET_SELF, 0ms}
// Warrior as fallback behavior if for some reason UNK class
{ SPELL_WR_SPELL_REFLECT, ABILITY_TARGET_SELF, 10000ms },
{ SPELL_WR_WHIRLWIND, ABILITY_TARGET_SELF, 10000ms },
{ SPELL_WR_MORTAL_STRIKE, ABILITY_TARGET_VICTIM, 6000ms }
},
// 1 warrior
{ { SPELL_WR_SPELL_REFLECT, ABILITY_TARGET_SELF, 10000ms },
@@ -212,9 +213,10 @@ static PlayerAbilityStruct PlayerAbility[13][3] =
},
// 10 UNK class (should never be set)
{
{ 0, ABILITY_TARGET_SELF, 0ms},
{ 0, ABILITY_TARGET_SELF, 0ms},
{ 0, ABILITY_TARGET_SELF, 0ms}
// Warrior as fallback behavior if for some reason UNK class
{ SPELL_WR_SPELL_REFLECT, ABILITY_TARGET_SELF, 10000ms },
{ SPELL_WR_WHIRLWIND, ABILITY_TARGET_SELF, 10000ms },
{ SPELL_WR_MORTAL_STRIKE, ABILITY_TARGET_VICTIM, 6000ms }
},
// 11 druid
{ { SPELL_DR_LIFEBLOOM, ABILITY_TARGET_HEAL, 10000ms },
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+22
View File
@@ -39,6 +39,7 @@ enum ForestFrog
SPELL_SUMMON_AMANI_CHARM_CHEST_2 = 43756, // Amani Charm Box (186734)
SPELL_SUMMON_MONEY_BAG = 43774, // Money Bag (186736)
SPELL_STEALTH_ = 34189,
SPELL_FIXATE = 43360,
// Creatures
NPC_FOREST_FROG = 24396,
@@ -884,6 +885,26 @@ class spell_summon_amanishi_sentries : public SpellScript
}
};
class spell_call_of_the_beast : public SpellScript
{
PrepareSpellScript(spell_call_of_the_beast);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_FIXATE });
}
void HandleEffect(SpellEffIndex /*effIndex*/)
{
GetHitUnit()->CastSpell(GetHitUnit(), SPELL_FIXATE, true);
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_call_of_the_beast::HandleEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
void AddSC_zulaman()
{
RegisterZulAmanCreatureAI(npc_forest_frog);
@@ -896,4 +917,5 @@ void AddSC_zulaman()
RegisterZulAmanCreatureAI(npc_amanishi_scout);
RegisterSpellScript(spell_alert_drums);
RegisterSpellScript(spell_summon_amanishi_sentries);
RegisterSpellScript(spell_call_of_the_beast);
}
src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+103 -57
View File
@@ -102,7 +102,11 @@ struct boss_mother_shahraz : public BossAI
ScheduleTimedEvent(50s, [&] {
Talk(SAY_SPELL);
me->CastCustomSpell(SPELL_FATAL_ATTRACTION, SPELLVALUE_MAX_TARGETS, 3, me, false);
// weights for 1, 2, or 3 targets
static double chances[] = {5.0, 15.0, 80.0};
uint32 selectedIndex = urandweighted(3, chances);
uint32 numTargets = selectedIndex + 1;
me->CastCustomSpell(SPELL_FATAL_ATTRACTION, SPELLVALUE_MAX_TARGETS, numTargets, me, false);
}, 1min);
me->m_Events.AddEventAtOffset([&] {
@@ -197,26 +201,91 @@ class spell_mother_shahraz_saber_lash_aura : public AuraScript
}
};
const Position validTeleportStairsPos[9] =
constexpr float minTeleportDistSq = 30.f * 30.f;
constexpr float maxTeleportDistSq = 50.f * 50.f;
const Position teleportPositions[79] =
{
//Platform teleports
{945.00f, 149.17f, 197.07483},
{956.92f, 153.20f, 197.07483},
{933.69f, 154.15f, 197.07483},
//Floor teleports
{966.87f, 184.45f, 192.84f},
{927.22f, 187.04f, 192.84f},
{922.54f, 110.09f, 192.84f},
{958.01f, 110.47f, 192.84f},
{939.95f, 108.29f, 192.84f},
{945.68f, 205.74f, 192.84f}
};
constexpr float minTeleportDist = 30.f;
constexpr float maxTeleportDist = 50.f;
{918.581, 110.065, 192.849},
{943.493, 108.279, 192.847},
{964.335, 109.774, 192.836},
{971.987, 148.678, 192.820},
{956.107, 146.804, 197.075},
{934.990, 144.492, 197.075},
{916.477, 143.932, 192.829},
{921.147, 167.942, 192.827},
{925.678, 184.302, 192.838},
{940.993, 181.637, 192.463},
{948.525, 193.635, 191.906},
{965.403, 179.717, 192.832},
{966.440, 197.428, 192.840},
{959.519, 218.769, 192.846},
{943.849, 208.796, 191.209},
{931.741, 199.204, 192.846},
{931.808, 220.284, 192.845},
{945.203, 232.269, 191.208},
{966.960, 236.315, 192.842},
{966.079, 258.634, 192.822},
{945.193, 252.556, 191.208},
{924.433, 235.585, 192.842},
{919.422, 250.186, 192.820},
{923.024, 271.408, 192.368},
{928.982, 283.581, 192.368},
{923.807, 302.435, 192.854},
{925.547, 316.368, 192.830},
{922.124, 330.724, 192.842},
{926.061, 343.538, 192.848},
{947.211, 351.582, 191.208},
{965.287, 351.110, 192.850},
{964.311, 340.715, 192.850},
{971.435, 328.932, 192.850},
{979.385, 318.413, 192.843},
{962.361, 304.283, 192.839},
{964.359, 287.723, 192.835},
{961.600, 270.791, 192.829},
{945.802, 267.542, 191.208},
{948.130, 284.002, 191.208},
{940.823, 299.090, 191.208},
{949.039, 314.410, 191.208},
{941.133, 334.733, 191.208},
{956.045, 329.034, 192.834},
{956.605, 247.336, 192.828},
{931.937, 244.108, 192.819},
{938.510, 158.778, 197.075},
{928.364, 208.923, 192.847},
{962.436, 205.330, 192.847},
{955.670, 346.279, 192.849},
{931.286, 324.910, 192.819},
{962.375, 317.202, 192.838},
{956.159, 292.589, 192.834},
{934.550, 274.786, 192.368},
{921.056, 287.731, 192.368},
{956.248, 262.074, 192.829},
{955.738, 231.656, 192.836},
{934.566, 231.991, 192.838},
{956.050, 198.811, 192.841},
{939.707, 193.020, 191.923},
{940.500, 259.348, 191.208},
{948.237, 304.773, 191.208},
{923.764, 176.246, 192.832},
{960.474, 187.324, 192.833},
{968.408, 168.684, 192.825},
{967.788, 126.891, 192.822},
{930.301, 118.605, 192.847},
{952.902, 159.420, 197.075},
{931.728, 291.711, 192.368},
{950.031, 276.024, 191.208},
{943.486, 243.084, 191.208},
{950.499, 223.192, 191.208},
{940.605, 218.999, 191.208},
{949.264, 183.562, 192.380},
{950.100, 207.404, 191.241},
{969.982, 187.897, 192.837},
{931.661, 185.178, 192.831},
{924.498, 193.739, 192.847},
{966.774, 226.680, 192.847},
{953.118, 121.170, 192.822},
};
class spell_mother_shahraz_fatal_attraction : public SpellScript
{
@@ -234,43 +303,20 @@ class spell_mother_shahraz_fatal_attraction : public SpellScript
void SetDest(SpellDestination& dest)
{
Position finalDest;
// Check if the boss is near stairs to avoid players falling through the platform with random teleports.
if (GetCaster()->GetPositionY() < 194.f)
finalDest = validTeleportStairsPos[urand(0, 8)];
else
Position casterPos = GetCaster()->GetPosition();
std::vector<Position> validTeleportPositions;
std::copy_if(std::begin(teleportPositions), std::end(teleportPositions), std::back_inserter(validTeleportPositions),
[&](Position const& pos) {
float distanceSq = pos.GetExactDist2dSq(casterPos);
return minTeleportDistSq <= distanceSq && distanceSq <= maxTeleportDistSq;
});
if (validTeleportPositions.empty())
{
finalDest = GetCaster()->GetNearPosition(frand(minTeleportDist, maxTeleportDist), static_cast<float>(rand_norm()) * static_cast<float>(2 * M_PI), true);
// Maybe not necessary but just in case to avoid LOS issues with an object
if (!GetCaster()->IsWithinLOS(finalDest.GetPositionX(), finalDest.GetPositionY(), finalDest.GetPositionZ()))
finalDest = GetCaster()->GetNearPosition(frand(minTeleportDist, maxTeleportDist), static_cast<float>(rand_norm()) * static_cast<float>(2 * M_PI), true);
/* @note: To avoid teleporting players near a walls, we will define a safe area.
* As the boss have an area boudary around y: 320.f. We will limit the safe area to this value, avoiding wird issues.
* x limit: 932.f/960.f | y limit: 224.f/320.f
*/
if (finalDest.m_positionX < 932.f)
finalDest.m_positionX = 932.f;
else if (finalDest.m_positionX > 960.f)
finalDest.m_positionX = 960.f;
if (finalDest.m_positionY < 224.f)
finalDest.m_positionY = 224.f;
else if (finalDest.m_positionY > 320.f)
finalDest.m_positionY = 320.f;
// After relocate a finalDest outside the safe area, we need to recheck the distance with the boss
if (GetCaster()->GetExactDist2d(finalDest) < minTeleportDist)
{
if (finalDest.m_positionX == 932.f || finalDest.m_positionX == 960.f)
finalDest.m_positionY = finalDest.m_positionY + (minTeleportDist - GetCaster()->GetExactDist2d(finalDest));
else if (finalDest.m_positionY == 224.f || finalDest.m_positionY == 320.f)
finalDest.m_positionX = finalDest.m_positionX + (minTeleportDist - GetCaster()->GetExactDist2d(finalDest));
}
}
LOG_ERROR("scripts", "spell_mother_shahraz_fatal_attraction: No valid teleport positions found (Map: {} X: {} Y: {} Z: {})",
GetCaster()->GetMap()->GetId(), GetCaster()->GetPositionX(), GetCaster()->GetPositionY(), GetCaster()->GetPositionZ());
return;
}
Position finalDest = validTeleportPositions[urand(0, validTeleportPositions.size() - 1)];
dest.Relocate(finalDest);
}
@@ -283,7 +329,7 @@ class spell_mother_shahraz_fatal_attraction : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mother_shahraz_fatal_attraction::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_mother_shahraz_fatal_attraction::SetDest, EFFECT_1, TARGET_DEST_CASTER_RANDOM);
OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_mother_shahraz_fatal_attraction::SetDest, EFFECT_1, TARGET_DEST_CASTER);
OnEffectHitTarget += SpellEffectFn(spell_mother_shahraz_fatal_attraction::HandleTeleportUnits, EFFECT_1, SPELL_EFFECT_TELEPORT_UNITS);
}
};