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

refactor(Scripts/Events): code cleanup (part 6) (#6924)

Browse Source
This commit is contained in:
Francesco Borzì
2021-07-20 09:55:31 +02:00
committed by GitHub
parent 8bb6fd4ed4
commit 172d33d507
6 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Events/brewfest.cpp
+7 -3
View File
@@ -1,4 +1,6 @@
// Scripted by Xinef /*
* Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
*/
#include "CellImpl.h" #include "CellImpl.h"
#include "GameEventMgr.h" #include "GameEventMgr.h"
@@ -1206,8 +1208,10 @@ public:
break; break;
} }
// just walking, fatiuge handling // just walking, fatiuge handling
if (Aura* aur = caster->GetAura(SPELL_RAM_FATIGUE)) if (Aura* fatigueAura = caster->GetAura(SPELL_RAM_FATIGUE))
aur->ModStackAmount(-4); {
fatigueAura->ModStackAmount(-4);
}
break; break;
case 1: case 1:
// One click to maintain speed, more to increase // One click to maintain speed, more to increase
src/server/scripts/Events/hallows_end.cpp
+3 -1
View File
@@ -1,4 +1,6 @@
// Scripted by Xinef /*
* Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
*/
#include "CellImpl.h" #include "CellImpl.h"
#include "GossipDef.h" #include "GossipDef.h"
src/server/scripts/Events/love_in_air.cpp
+3 -1
View File
@@ -1,4 +1,6 @@
// Scripted by Xinef /*
* Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
*/
#include "Cell.h" #include "Cell.h"
#include "CellImpl.h" #include "CellImpl.h"
src/server/scripts/Events/midsummer.cpp
+3 -1
View File
@@ -1,4 +1,6 @@
// Scripted by Xinef /*
* Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
*/
#include "Player.h" #include "Player.h"
#include "ScriptedCreature.h" #include "ScriptedCreature.h"
src/server/scripts/Events/pilgrims_bounty.cpp
+3 -1
View File
@@ -1,4 +1,6 @@
// Scripted by Xinef /*
* Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
*/
#include "CombatAI.h" #include "CombatAI.h"
#include "PassiveAI.h" #include "PassiveAI.h"
src/server/scripts/Events/winter_veil.cpp
+6 -6
View File
@@ -1,4 +1,6 @@
// Scripted by Xinef /*
* Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
*/
#include "GameEventMgr.h" #include "GameEventMgr.h"
#include "Player.h" #include "Player.h"
@@ -83,11 +85,9 @@ public:
if (target->HasAuraType(SPELL_AURA_TRANSFORM)) if (target->HasAuraType(SPELL_AURA_TRANSFORM))
return; return;
uint32 spellId = 0; uint32 spellId = target->getGender() == GENDER_MALE
if (target->getGender() == GENDER_MALE) ? RAND(SPELL_WINTER_WONDERVOLT_RED_MAN, SPELL_WINTER_WONDERVOLT_GREEN_MAN)
spellId = RAND(SPELL_WINTER_WONDERVOLT_RED_MAN, SPELL_WINTER_WONDERVOLT_GREEN_MAN); : RAND(SPELL_WINTER_WONDERVOLT_RED_WOMEN, SPELL_WINTER_WONDERVOLT_GREEN_WOMEN);
else
spellId = RAND(SPELL_WINTER_WONDERVOLT_RED_WOMEN, SPELL_WINTER_WONDERVOLT_GREEN_WOMEN);
// cast // cast
target->CastSpell(target, spellId, true); target->CastSpell(target, spellId, true);