Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scripts/Events: Fix achievement in Love is in the air: "Lonely?"

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/d57dd854e975afc5413b056aa8c68c410770fa74)
This commit is contained in:
hondacrx
2022-05-25 13:51:51 -04:00
parent a59b3b8075
commit 3bf139e9c7
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/Spells/Holiday.cs
+14 -12
View File
@@ -159,21 +159,26 @@ namespace Scripts.Spells.Holiday
{ {
public const uint RibbonPole = 181605; public const uint RibbonPole = 181605;
} }
[Script] // 45102 Romantic Picnic [Script] // 45102 Romantic Picnic
class spell_love_is_in_the_air_romantic_picnic : AuraScript class spell_love_is_in_the_air_romantic_picnic : AuraScript
{ {
public override bool Validate(SpellInfo spellInfo)
{
return ValidateSpellInfo(SpellIds.BasketCheck, SpellIds.MealPeriodic, SpellIds.MealEatVisual, SpellIds.DrinkVisual, SpellIds.RomanticPicnicAchiev);
}
void OnApply(AuraEffect aurEff, AuraEffectHandleModes mode) void OnApply(AuraEffect aurEff, AuraEffectHandleModes mode)
{ {
Unit target = GetTarget(); Unit target = GetTarget();
target.SetStandState(UnitStandStateType.Sit); target.SetStandState(UnitStandStateType.Sit);
target.CastSpell(target, SpellIds.MealPeriodic, false); target.CastSpell(target, SpellIds.MealPeriodic);
} }
void OnPeriodic(AuraEffect aurEff) void OnPeriodic(AuraEffect aurEff)
{ {
// Every 5 seconds // Every 5 seconds
Unit target = GetTarget(); Unit target = GetTarget();
Unit caster = GetCaster();
// If our player is no longer sit, Remove all auras // If our player is no longer sit, Remove all auras
if (target.GetStandState() != UnitStandStateType.Sit) if (target.GetStandState() != UnitStandStateType.Sit)
@@ -183,8 +188,8 @@ namespace Scripts.Spells.Holiday
return; return;
} }
target.CastSpell(target, SpellIds.BasketCheck, false); // unknown use, it targets Romantic Basket target.CastSpell(target, SpellIds.BasketCheck); // unknown use, it targets Romantic Basket
target.CastSpell(target, RandomHelper.RAND(SpellIds.MealEatVisual, SpellIds.DrinkVisual), false); target.CastSpell(target, RandomHelper.RAND(SpellIds.MealEatVisual, SpellIds.DrinkVisual));
bool foundSomeone = false; bool foundSomeone = false;
// For nearby players, check if they have the same aura. If so, cast Romantic Picnic (45123) // For nearby players, check if they have the same aura. If so, cast Romantic Picnic (45123)
@@ -193,17 +198,14 @@ namespace Scripts.Spells.Holiday
AnyPlayerInObjectRangeCheck checker = new(target, SharedConst.InteractionDistance * 2); AnyPlayerInObjectRangeCheck checker = new(target, SharedConst.InteractionDistance * 2);
var searcher = new PlayerListSearcher(target, playerList, checker); var searcher = new PlayerListSearcher(target, playerList, checker);
Cell.VisitWorldObjects(target, searcher, SharedConst.InteractionDistance * 2); Cell.VisitWorldObjects(target, searcher, SharedConst.InteractionDistance * 2);
foreach (Player player in playerList) foreach (Player playerFound in playerList)
{ {
if (player != target && player.HasAura(GetId())) // && player.GetStandState() == UNIT_STAND_STATE_SIT) if (target != playerFound && playerFound.HasAura(GetId()))
{ {
if (caster) playerFound.CastSpell(playerFound, SpellIds.RomanticPicnicAchiev, true);
{ target.CastSpell(target, SpellIds.RomanticPicnicAchiev, true);
caster.CastSpell(player, SpellIds.RomanticPicnicAchiev, true);
caster.CastSpell(target, SpellIds.RomanticPicnicAchiev, true);
}
foundSomeone = true; foundSomeone = true;
// break; break;
} }
} }