nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-26 07:06:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source 
# Conflicts:
#	src/server/game/World/IWorld.h
#	src/server/game/World/World.cpp
#	src/server/game/World/World.h
#	src/server/scripts/Commands/cs_server.cpp
This commit is contained in:
郑佩茹
2022-05-02 16:39:21 -06:00
parent 92841a35e1 0ffa270c94
commit 0326d8576d
99 changed files with 839 additions and 5304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/scripts/Commands/cs_server.cpp
View File

@@ -213,9 +213,6 @@ public:
handler->PSendSysMessage("Using %s DBC Locale as default. All available DBC locales: %s", localeNames[defaultLocale], availableLocales.c_str());
handler->PSendSysMessage("Using World DB: %s", sWorld->GetDBVersion());
handler->PSendSysMessage("Using World DB Revision: %s", sWorld->GetWorldDBRevision());
handler->PSendSysMessage("Using Character DB Revision: %s", sWorld->GetCharacterDBRevision());
handler->PSendSysMessage("Using Auth DB Revision: %s", sWorld->GetAuthDBRevision());
#ifdef MOD_PLAYERBOTS
handler->PSendSysMessage("Using Playerbots DB Revision: %s", sWorld->GetPlayerbotsDBRevision());
#endif

8
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
View File

@@ -33,8 +33,8 @@ enum Sartura
SAY_DEATH = 2,
SPELL_WHIRLWIND = 26083,
SPELL_ENRAGE = 28747, //Not sure if right ID.
SPELL_ENRAGEHARD = 28798,
SPELL_ENRAGE = 8269,
SPELL_BERSERK = 27680,
//Guard Spell
SPELL_WHIRLWINDADD = 26038,
@@ -166,7 +166,7 @@ public:
{
if (!HealthAbovePct(20) && !me->IsNonMeleeSpellCast(false))
{
DoCast(me, SPELL_ENRAGE);
DoCast(me, SPELL_ENRAGE, true);
Enraged = true;
}
}
@@ -176,7 +176,7 @@ public:
{
if (EnrageHard_Timer <= diff)
{
DoCast(me, SPELL_ENRAGEHARD);
DoCast(me, SPELL_BERSERK, true);
EnragedHard = true;
}
else EnrageHard_Timer -= diff;

2
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
View File

@@ -311,7 +311,7 @@ public:
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim() || !CheckInRoom())
if (!UpdateVictim())
return;
events.Update(diff);

2
src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
View File

@@ -189,7 +189,7 @@ public:
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim() || !CheckInRoom())
if (!UpdateVictim())
return;
events.Update(diff);

2
src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
View File

@@ -330,7 +330,7 @@ public:
void UpdateAI(uint32 diff) override
{
if ((!UpdateVictim() && !(events.GetPhaseMask() & PHASE_INTRO_MASK)) || !CheckInRoom())
if (!UpdateVictim() && !(events.GetPhaseMask() & PHASE_INTRO_MASK))
return;
events.Update(diff);

2
src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
View File

@@ -156,7 +156,7 @@ public:
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim() || !CheckInRoom())
if (!UpdateVictim())
return;
events.Update(diff);

2
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
View File

@@ -524,7 +524,7 @@ public:
return;
}
if (!UpdateVictim() || !CheckInRoom())
if (!UpdateVictim())
return;
events.Update(diff);

2
src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
View File

@@ -258,7 +258,7 @@ public:
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim() || !CheckInRoom())
if (!UpdateVictim())
return;
events.Update(diff);

2
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
View File

@@ -523,7 +523,7 @@ public:
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim() || !CheckInRoom())
if (!UpdateVictim())
return;
events.Update(diff);

2
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
View File

@@ -80,7 +80,7 @@ BossBoundaryData const boundaries =
{ DATA_SISTER_SVALNA, new RectangleBoundary(4291.0f, 4423.0f, 2438.0f, 2653.0f) },
{ DATA_VALITHRIA_DREAMWALKER, new RectangleBoundary(4112.5f, 4293.5f, 2385.0f, 2585.0f) },
{ DATA_SINDRAGOSA, new EllipseBoundary(Position(4408.6f, 2484.0f), 100.0, 75.0) }
{ DATA_SINDRAGOSA, new EllipseBoundary(Position(4418.6f, 2484.0f), 110.0, 75.0) }
};
DoorData const doorData[] =

2
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
View File

@@ -164,7 +164,7 @@ public:
break;
}
if (!UpdateVictim() || !CheckInRoom())
if (!UpdateVictim())
return;
events.Update(diff);

152
src/server/scripts/Spells/spell_generic.cpp
View File

@@ -218,12 +218,23 @@ class spell_gen_have_item_auras : public AuraScript
}
};
enum MineSweeper
{
SPELL_LAND_MINE_KNOCKBACK = 54402,
SPELL_LANDMINE_KNOCKBACK_ACHIEVEMENT = 57064,
};
/* 54355 - Detonation
57099 - Landmine Knockback Achievement Aura */
class spell_gen_mine_sweeper : public SpellScript
{
PrepareSpellScript(spell_gen_mine_sweeper);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_LAND_MINE_KNOCKBACK, SPELL_LANDMINE_KNOCKBACK_ACHIEVEMENT});
}
void HandleSchoolDMG(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -232,7 +243,7 @@ class spell_gen_mine_sweeper : public SpellScript
return;
target->RemoveAurasByType(SPELL_AURA_MOUNTED);
caster->CastSpell(target, 54402, true);
caster->CastSpell(target, SPELL_LAND_MINE_KNOCKBACK, true);
}
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
@@ -240,7 +251,7 @@ class spell_gen_mine_sweeper : public SpellScript
if (Unit* target = GetHitPlayer())
if (Aura* aur = target->GetAura(GetSpellInfo()->Id))
if (aur->GetStackAmount() >= 10)
target->CastSpell(target, 57064, true);
target->CastSpell(target, SPELL_LANDMINE_KNOCKBACK_ACHIEVEMENT, true);
}
void Register() override
@@ -1840,6 +1851,11 @@ class spell_gen_teleporting : public SpellScript
{
PrepareSpellScript(spell_gen_teleporting);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_TELEPORT_SPIRE_UP, SPELL_TELEPORT_SPIRE_DOWN });
}
void HandleScript(SpellEffIndex /* effIndex */)
{
Unit* target = GetHitUnit();
@@ -2268,6 +2284,11 @@ class spell_gen_turkey_marker : public AuraScript
{
PrepareAuraScript(spell_gen_turkey_marker);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_TURKEY_VENGEANCE });
}
bool Load() override
{
_applyTimes.clear();
@@ -2470,7 +2491,14 @@ class spell_gen_damage_reduction_aura : public AuraScript
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DAMAGE_REDUCTION_AURA });
return ValidateSpellInfo(
{
SPELL_DAMAGE_REDUCTION_AURA,
SPELL_BLESSING_OF_SANCTUARY,
SPELL_GREATER_BLESSING_OF_SANCTUARY,
SPELL_RENEWED_HOPE,
SPELL_VIGILANCE
});
}
void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
@@ -2665,26 +2693,17 @@ class spell_gen_dalaran_disguise : public SpellScript
{
PrepareSpellScript(spell_gen_dalaran_disguise);
bool Validate(SpellInfo const* spellInfo) override
bool Validate(SpellInfo const* /*spellInfo*/) override
{
switch (spellInfo->Id)
{
case SPELL_SUNREAVER_DISGUISE_TRIGGER:
return ValidateSpellInfo(
{
SPELL_SUNREAVER_DISGUISE_FEMALE,
SPELL_SUNREAVER_DISGUISE_MALE
});
case SPELL_SILVER_COVENANT_DISGUISE_TRIGGER:
return ValidateSpellInfo(
{
SPELL_SILVER_COVENANT_DISGUISE_FEMALE,
SPELL_SILVER_COVENANT_DISGUISE_MALE
});
default:
break;
}
return false;
return ValidateSpellInfo(
{
SPELL_SUNREAVER_DISGUISE_TRIGGER,
SPELL_SUNREAVER_DISGUISE_FEMALE,
SPELL_SUNREAVER_DISGUISE_MALE,
SPELL_SILVER_COVENANT_DISGUISE_TRIGGER,
SPELL_SILVER_COVENANT_DISGUISE_FEMALE,
SPELL_SILVER_COVENANT_DISGUISE_MALE
});
}
void HandleScript(SpellEffIndex /*effIndex*/)
@@ -2759,6 +2778,19 @@ class spell_gen_break_shield : public SpellScript
{
PrepareSpellScript(spell_gen_break_shield)
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
{
SPELL_BREAK_SHIELD_DAMAGE_2K,
SPELL_BREAK_SHIELD_DAMAGE_10K,
SPELL_BREAK_SHIELD_TRIGGER_FACTION_MOUNTS,
SPELL_BREAK_SHIELD_TRIGGER_CAMPAING_WARHORSE,
SPELL_BREAK_SHIELD_TRIGGER_UNK,
SPELL_BREAK_SHIELD_TRIGGER_SUNDERING_THURST
});
}
void HandleScriptEffect(SpellEffIndex effIndex)
{
Unit* target = GetHitUnit();
@@ -2876,6 +2908,24 @@ class spell_gen_mounted_charge : public SpellScript
{
PrepareSpellScript(spell_gen_mounted_charge)
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
{
SPELL_CHARGE_DAMAGE_8K5,
SPELL_CHARGE_DAMAGE_20K,
SPELL_CHARGE_DAMAGE_45K,
SPELL_CHARGE_CHARGING_EFFECT_8K5,
SPELL_CHARGE_CHARGING_EFFECT_20K_1,
SPELL_CHARGE_CHARGING_EFFECT_20K_2,
SPELL_CHARGE_CHARGING_EFFECT_45K_1,
SPELL_CHARGE_CHARGING_EFFECT_45K_2,
SPELL_CHARGE_TRIGGER_FACTION_MOUNTS,
SPELL_CHARGE_TRIGGER_TRIAL_CHAMPION,
SPELL_CHARGE_MISS_EFFECT
});
}
void HandleScriptEffect(SpellEffIndex effIndex)
{
Unit* target = GetHitUnit();
@@ -3250,6 +3300,49 @@ class spell_gen_on_tournament_mount : public AuraScript
{
PrepareAuraScript(spell_gen_on_tournament_mount);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
{
SPELL_PENNANT_STORMWIND_ASPIRANT,
SPELL_PENNANT_STORMWIND_VALIANT,
SPELL_PENNANT_STORMWIND_CHAMPION,
SPELL_PENNANT_GNOMEREGAN_ASPIRANT,
SPELL_PENNANT_GNOMEREGAN_VALIANT,
SPELL_PENNANT_GNOMEREGAN_CHAMPION,
SPELL_PENNANT_SEN_JIN_ASPIRANT,
SPELL_PENNANT_SEN_JIN_VALIANT,
SPELL_PENNANT_SEN_JIN_CHAMPION,
SPELL_PENNANT_SILVERMOON_ASPIRANT,
SPELL_PENNANT_SILVERMOON_VALIANT,
SPELL_PENNANT_SILVERMOON_CHAMPION,
SPELL_PENNANT_DARNASSUS_ASPIRANT,
SPELL_PENNANT_DARNASSUS_VALIANT,
SPELL_PENNANT_DARNASSUS_CHAMPION,
SPELL_PENNANT_EXODAR_ASPIRANT,
SPELL_PENNANT_EXODAR_VALIANT,
SPELL_PENNANT_EXODAR_CHAMPION,
SPELL_PENNANT_IRONFORGE_ASPIRANT,
SPELL_PENNANT_IRONFORGE_VALIANT,
SPELL_PENNANT_IRONFORGE_CHAMPION,
SPELL_PENNANT_UNDERCITY_ASPIRANT,
SPELL_PENNANT_UNDERCITY_VALIANT,
SPELL_PENNANT_UNDERCITY_CHAMPION,
SPELL_PENNANT_ORGRIMMAR_ASPIRANT,
SPELL_PENNANT_ORGRIMMAR_VALIANT,
SPELL_PENNANT_ORGRIMMAR_CHAMPION,
SPELL_PENNANT_THUNDER_BLUFF_ASPIRANT,
SPELL_PENNANT_THUNDER_BLUFF_VALIANT,
SPELL_PENNANT_THUNDER_BLUFF_CHAMPION,
SPELL_PENNANT_ARGENT_CRUSADE_ASPIRANT,
SPELL_PENNANT_ARGENT_CRUSADE_VALIANT,
SPELL_PENNANT_ARGENT_CRUSADE_CHAMPION,
SPELL_PENNANT_EBON_BLADE_ASPIRANT,
SPELL_PENNANT_EBON_BLADE_VALIANT,
SPELL_PENNANT_EBON_BLADE_CHAMPION
});
}
uint32 _pennantSpellId;
bool Load() override
@@ -3968,6 +4061,11 @@ class spell_gen_bonked : public SpellScript
{
PrepareSpellScript(spell_gen_bonked);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_BONKED, SPELL_FOAM_SWORD_DEFEAT, SPELL_ON_GUARD });
}
void HandleScript(SpellEffIndex /*effIndex*/)
{
if (Player* target = GetHitPlayer())
@@ -4051,6 +4149,11 @@ class spell_gen_replenishment : public SpellScript
{
PrepareSpellScript(spell_gen_replenishment);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_REPLENISHMENT, SPELL_INFINITE_REPLENISHMENT });
}
void RemoveInvalidTargets(std::list<WorldObject*>& targets)
{
// In arenas Replenishment may only affect the caster
@@ -4352,6 +4455,11 @@ class spell_gen_holiday_buff_food : public AuraScript
{
PrepareAuraScript(spell_gen_holiday_buff_food);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WELL_FED });
}
void TriggerFoodBuff(AuraEffect* aurEff)
{
if (aurEff->GetTickNumber() == 10 && GetUnitOwner())