aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeleqraph <nyrdeveloper@gmail.com>2023-08-19 20:09:52 +0200
committerGitHub <noreply@github.com>2023-08-19 20:09:52 +0200
commitf1c51e2a8d3e1cfe7cb8ebf08260d2c74b8b56cb (patch)
tree22ca2b7fe4c605f72d9f4b6bc9a2aeecb111e3d5
parentb82dc03cbf2f39844772005583d56fddf8388777 (diff)
Scripts/Spells: Implement Efflorescence and Spirit Blossoms (#29176)
Co-authored-by: Shauren <shauren.trinity@gmail.com>
-rw-r--r--sql/updates/world/master/2023_08_19_02_world.sql26
-rw-r--r--src/server/game/Spells/SpellInfo.cpp1
-rw-r--r--src/server/scripts/Spells/spell_druid.cpp98
3 files changed, 124 insertions, 1 deletions
diff --git a/sql/updates/world/master/2023_08_19_02_world.sql b/sql/updates/world/master/2023_08_19_02_world.sql
new file mode 100644
index 00000000000..c0246eceeff
--- /dev/null
+++ b/sql/updates/world/master/2023_08_19_02_world.sql
@@ -0,0 +1,26 @@
+DELETE FROM `areatrigger_template` WHERE `Id`=13091 AND `IsServerSide`=0;
+INSERT INTO `areatrigger_template` (`Id`,`IsServerSide`,`Data0`,`Data1`,`VerifiedBuild`) VALUES
+(13091,0,10,10,50585);
+
+DELETE FROM `areatrigger_create_properties` WHERE `Id`=9049;
+INSERT INTO `areatrigger_create_properties` (`Id`, `AreaTriggerId`, `MoveCurveId`, `ScaleCurveId`, `MorphCurveId`, `FacingCurveId`, `AnimId`, `AnimKitId`, `DecalPropertiesId`, `TimeToTarget`, `TimeToTargetScale`, `Shape`, `ShapeData0`, `ShapeData1`, `ShapeData2`, `ShapeData3`, `ShapeData4`, `ShapeData5`, `ShapeData6`, `ShapeData7`, `ScriptName`, `VerifiedBuild`) VALUES
+(9049, 13091, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, '', 50585);
+
+DELETE FROM `creature_template_addon` WHERE `entry`=47649;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `MountCreatureID`, `StandState`, `AnimTier`, `VisFlags`, `SheathState`, `PvPFlags`, `emote`, `aiAnimKit`, `movementAnimKit`, `meleeAnimKit`, `visibilityDistanceType`, `auras`) VALUES
+(47649, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, '');
+
+DELETE FROM `creature_template_difficulty` WHERE `Entry`=47649 AND `DifficultyID`!=0;
+
+DELETE FROM `creature_template_movement` WHERE `CreatureId`=47649;
+INSERT INTO `creature_template_movement` (`CreatureId`,`Flight`,`Rooted`) VALUES
+(47649,1,1);
+
+UPDATE `creature_template` SET `faction`=35,`speed_run`=1,`unit_flags`=0x2000200,`unit_flags2`=0x4000000,`unit_flags3`=0x1000000,`flags_extra`=0x80,`ScriptName`='npc_dru_efflorescence' WHERE `entry`=47649;
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_dru_efflorescence', 'spell_dru_efflorescence_dummy', 'spell_dru_efflorescence_heal', 'spell_dru_spring_blossoms');
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(145205, 'spell_dru_efflorescence'),
+(81262, 'spell_dru_efflorescence_dummy'),
+(81269, 'spell_dru_efflorescence_heal'),
+(81269, 'spell_dru_spring_blossoms');
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index 8c121dfc218..f43fbf07847 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -2527,6 +2527,7 @@ void SpellInfo::_LoadAuraState()
return AURA_STATE_VICTORIOUS;
case 71465: // Divine Surge
case 50241: // Evasive Charges
+ case 81262: // Efflorescence
return AURA_STATE_RAID_ENCOUNTER;
case 6950: // Faerie Fire
case 9806: // Phantom Strike
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index b2dff1985ea..19624b0b6e5 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -26,6 +26,7 @@
#include "Containers.h"
#include "DB2Stores.h"
#include "GridNotifiersImpl.h"
+#include "PassiveAI.h"
#include "Player.h"
#include "Spell.h"
#include "SpellAuraEffects.h"
@@ -61,6 +62,8 @@ enum DruidSpells
SPELL_DRUID_ECLIPSE_OOC = 329910,
SPELL_DRUID_ECLIPSE_SOLAR_AURA = 48517,
SPELL_DRUID_ECLIPSE_SOLAR_SPELL_CNT = 326053,
+ SPELL_DRUID_EFFLORESCENCE_AURA = 81262,
+ SPELL_DRUID_EFFLORESCENCE_HEAL = 81269,
SPELL_DRUID_ENTANGLING_ROOTS = 339,
SPELL_DRUID_EXHILARATE = 28742,
SPELL_DRUID_FORM_AQUATIC_PASSIVE = 276012,
@@ -103,6 +106,8 @@ enum DruidSpells
SPELL_DRUID_SHOOTING_STARS_DAMAGE = 202497,
SPELL_DRUID_SKULL_BASH_CHARGE = 221514,
SPELL_DRUID_SKULL_BASH_INTERRUPT = 93985,
+ SPELL_DRUID_SPRING_BLOSSOMS = 207385,
+ SPELL_DRUID_SPRING_BLOSSOMS_HEAL = 207386,
SPELL_DRUID_SUNFIRE_DAMAGE = 164815,
SPELL_DRUID_SURVIVAL_INSTINCTS = 50322,
SPELL_DRUID_TRAVEL_FORM = 783,
@@ -115,7 +120,7 @@ enum DruidSpells
};
// 774 - Rejuvenation
-// 155777 - Rejuventation (Germination)
+// 155777 - Rejuvenation (Germination)
class spell_dru_abundance : public AuraScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override
@@ -500,6 +505,72 @@ class spell_dru_eclipse_ooc : public AuraScript
}
};
+// 145205 - Efflorescence
+class spell_dru_efflorescence : public SpellScript
+{
+ void RemoveOldAreaTrigger(SpellEffIndex /*effIndex*/) const
+ {
+ // if caster has any Efflorescence areatrigger, we remove it.
+ GetCaster()->RemoveAreaTrigger(GetSpellInfo()->Id);
+ }
+
+ void Register() override
+ {
+ OnEffectLaunch += SpellEffectFn(spell_dru_efflorescence::RemoveOldAreaTrigger, EFFECT_2, SPELL_EFFECT_CREATE_AREATRIGGER);
+ }
+};
+
+struct npc_dru_efflorescence : public NullCreatureAI
+{
+ explicit npc_dru_efflorescence(Creature* creature) : NullCreatureAI(creature)
+ {
+ }
+
+ void InitializeAI() override
+ {
+ me->CastSpell(me, SPELL_DRUID_EFFLORESCENCE_AURA);
+ }
+};
+
+// 81262 - Efflorescence (Dummy)
+class spell_dru_efflorescence_dummy : public AuraScript
+{
+ bool Validate(SpellInfo const* /*spellInfo*/) override
+ {
+ return ValidateSpellInfo({ SPELL_DRUID_EFFLORESCENCE_HEAL });
+ }
+
+ void HandlePeriodicDummy(AuraEffect const* /*aurEff*/) const
+ {
+ Unit* target = GetTarget();
+ Unit* summoner = target->GetOwner();
+ if (!summoner)
+ return;
+
+ summoner->CastSpell(target, SPELL_DRUID_EFFLORESCENCE_HEAL, TRIGGERED_DONT_REPORT_CAST_ERROR);
+ }
+
+ void Register() override
+ {
+ OnEffectPeriodic += AuraEffectPeriodicFn(spell_dru_efflorescence_dummy::HandlePeriodicDummy, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
+ }
+};
+
+// 81269 - Efflorescence (Heal)
+class spell_dru_efflorescence_heal : public SpellScript
+{
+ void FilterTargets(std::list<WorldObject*>& targets) const
+ {
+ // Efflorescence became a smart heal which prioritizes players and their pets in their group before any unit outside their group.
+ Trinity::SelectRandomInjuredTargets(targets, 3, true, GetCaster());
+ }
+
+ void Register() override
+ {
+ OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_efflorescence_heal::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
+ }
+};
+
// 203974 - Earthwarden
class spell_dru_earthwarden : public AuraScript
{
@@ -1205,6 +1276,26 @@ class spell_dru_skull_bash : public SpellScript
}
};
+// 81269 - Efflorescence (Heal)
+class spell_dru_spring_blossoms : public SpellScript
+{
+ bool Validate(SpellInfo const* /*spellInfo*/) override
+ {
+ return ValidateSpellInfo({ SPELL_DRUID_SPRING_BLOSSOMS, SPELL_DRUID_SPRING_BLOSSOMS_HEAL });
+ }
+
+ void HandleOnHit(SpellEffIndex /*effIndex*/) const
+ {
+ if (GetCaster()->HasAura(SPELL_DRUID_SPRING_BLOSSOMS))
+ GetCaster()->CastSpell(GetHitUnit(), SPELL_DRUID_SPRING_BLOSSOMS_HEAL, TRIGGERED_DONT_REPORT_CAST_ERROR);
+ }
+
+ void Register() override
+ {
+ OnEffectHitTarget += SpellEffectFn(spell_dru_spring_blossoms::HandleOnHit, EFFECT_0, SPELL_EFFECT_HEAL);
+ }
+};
+
// 106898 - Stampeding Roar
class spell_dru_stampeding_roar : public spell_dru_base_transformer
{
@@ -1851,6 +1942,10 @@ void AddSC_druid_spell_scripts()
RegisterSpellScript(spell_dru_eclipse_aura);
RegisterSpellScript(spell_dru_eclipse_dummy);
RegisterSpellScript(spell_dru_eclipse_ooc);
+ RegisterCreatureAI(npc_dru_efflorescence);
+ RegisterSpellScript(spell_dru_efflorescence);
+ RegisterSpellScript(spell_dru_efflorescence_dummy);
+ RegisterSpellScript(spell_dru_efflorescence_heal);
RegisterSpellAndAuraScriptPair(spell_dru_entangling_roots, spell_dru_entangling_roots_aura);
RegisterSpellScript(spell_dru_ferocious_bite);
RegisterSpellScript(spell_dru_forms_trinket);
@@ -1873,6 +1968,7 @@ void AddSC_druid_spell_scripts()
RegisterSpellAndAuraScriptPair(spell_dru_savage_roar, spell_dru_savage_roar_aura);
RegisterSpellScript(spell_dru_shooting_stars);
RegisterSpellScript(spell_dru_skull_bash);
+ RegisterSpellScript(spell_dru_spring_blossoms);
RegisterSpellScript(spell_dru_stampeding_roar);
RegisterSpellScript(spell_dru_starfall_dummy);
RegisterSpellScript(spell_dru_sudden_ambush);