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

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2022-09-03 10:17:45 -06:00
committed by GitHub
parent ac5bcfae12 31892275b0
commit 31f36b25f2
8 changed files with 71 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
data/sql/updates/db_world/2022_09_02_05.sql Normal file
View File

@@ -0,0 +1,36 @@
-- DB update 2022_09_02_04 -> 2022_09_02_05
--
DELETE FROM `gossip_menu` WHERE `MenuID` = 6644 AND `TextID` = 8701;
INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES
(6644, 8701);
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 14 AND `SourceGroup` = 6644 AND `SourceEntry` IN (7899, 8701, 8702);
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(14, 6644, 7899, 0, 0, 13, 0, 7, 3, 2, 1, 0, 0, '', 'Andorgos show text 7899 if Twin Emperors is not done'),
(14, 6644, 8701, 0, 0, 13, 0, 7, 3, 2, 0, 0, 0, '', 'Andorgos show text 8701 if Twin Emperors is done'),
(14, 6644, 8701, 0, 0, 13, 0, 8, 3, 2, 1, 0, 0, '', 'Andorgos show text 8701 gossip if Ouro is not done'),
(14, 6644, 8702, 0, 0, 13, 0, 8, 3, 2, 0, 0, 0, '', 'Andorgos show text 8702 gossip if Ouro is done');
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceGroup` = 6644 AND `SourceEntry` IN (0, 1);
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(15, 6644, 0, 0, 0, 13, 0, 7, 3, 2, 0, 0, 0, '', 'Andorgos show gossip if Twin Emperors is done'),
(15, 6644, 1, 0, 0, 13, 0, 8, 3, 2, 0, 0, 0, '', 'Andorgos show gossip if Ouro is done');
DELETE FROM `gossip_menu_option` WHERE (`MenuID`=6644 AND `OptionID` IN (0, 1));
INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextId`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES
(6644, 0, 0, 'Teleport me to the lair of the Twin Emperors, please.', 12849, 1, 1, 0, 0, 0, 0, NULL, 0, 0),
(6644, 1, 0, 'Please teleport me to the final chamber.', 12851, 1, 1, 0, 0, 0, 0, NULL, 0, 0);
DELETE FROM `spell_target_position` WHERE `ID` IN (29181, 29190);
INSERT INTO `spell_target_position` (`ID`, `EffectIndex`, `MapID`, `PositionX`, `PositionY`, `PositionZ`, `Orientation`, `VerifiedBuild`) VALUES
(29181, 0, 531, -8971.81, 1321.47, -104.249, 0, 0),
(29190, 0, 531, -8632.84, 2055.87, 108.86, 0, 0);
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 15502;
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 15502) AND (`source_type` = 0) AND (`id` IN (0, 1, 2, 3));
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(15502, 0, 0, 1, 62, 0, 100, 0, 6644, 0, 0, 0, 0, 11, 29182, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Andorgos - On Gossip Option 0 Selected - Cast \'Teleport to Twin Emperors\''),
(15502, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 85, 29181, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Andorgos - On Gossip Option 0 Selected - Invoker Cast \'Teleport to Twin Emps Effect DND\''),
(15502, 0, 2, 3, 62, 0, 100, 0, 6644, 1, 0, 0, 0, 11, 29188, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Andorgos - On Gossip Option 1 Selected - Cast \'Teleport to Final Chamber\''),
(15502, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 85, 29190, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Andorgos - On Gossip Option 1 Selected - Invoker Cast \'Teleport to Final Chamber Effect DND\'');

5
data/sql/updates/db_world/2022_09_03_00.sql Normal file
View File

@@ -0,0 +1,5 @@
-- DB update 2022_09_02_05 -> 2022_09_03_00
--
UPDATE `creature_loot_template` SET `QuestRequired`=0, `Chance`=2 WHERE `Item` BETWEEN 20858 AND 20865;
UPDATE `creature_loot_template` SET `QuestRequired`=0, `Chance`=4 WHERE `entry`=15335 AND `Item` BETWEEN 20858 AND 20865;
UPDATE `creature_loot_template` SET `QuestRequired`=0, `Chance`=6 WHERE `entry`=15333 AND `Item` BETWEEN 20858 AND 20865;

3
data/sql/updates/db_world/2022_09_03_01.sql Normal file
View File

@@ -0,0 +1,3 @@
-- DB update 2022_09_03_00 -> 2022_09_03_01
--
UPDATE `creature` SET `MovementType`=1, `wander_distance`=3 WHERE `id1`=15233 AND `map`=531 AND `guid` NOT IN (87595,87596);

9
data/sql/updates/db_world/2022_09_03_02.sql Normal file
View File

@@ -0,0 +1,9 @@
-- DB update 2022_09_03_01 -> 2022_09_03_02
-- General Angerforge
SET @BOSS=45954;
DELETE FROM `linked_respawn` WHERE `linkedGuid`=@BOSS AND `guid` IN (45955,45956,45958,45959);
INSERT INTO `linked_respawn` (`guid`, `linkedGuid`, `linkType`) VALUES
(45955, @BOSS, 0),
(45956, @BOSS, 0),
(45958, @BOSS, 0),
(45959, @BOSS, 0);

4
data/sql/updates/db_world/2022_09_03_03.sql Normal file
View File

@@ -0,0 +1,4 @@
-- DB update 2022_09_03_02 -> 2022_09_03_03
--
DELETE FROM `spell_script_names` WHERE `spell_id` = 26077 AND `ScriptName` = 'spell_itch_aq40';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES (26077, 'spell_itch_aq40');

26
src/server/game/Spells/Auras/SpellAuraEffects.cpp
View File

@@ -3953,20 +3953,11 @@ void AuraEffect::HandleAuraModBaseResistancePCT(AuraApplication const* aurApp, u
return;
Unit* target = aurApp->GetTarget();
// only players have base stats
if (target->GetTypeId() != TYPEID_PLAYER)
for (int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL; x++)
{
//pets only have base armor
if (target->IsPet() && (GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL))
target->HandleStatModifier(UNIT_MOD_ARMOR, BASE_PCT, float(GetAmount()), apply);
}
else
{
for (int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL; x++)
if (GetMiscValue() & int32(1 << x))
{
if (GetMiscValue() & int32(1 << x))
target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), BASE_PCT, float(GetAmount()), apply);
target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + x), BASE_PCT, float(GetAmount()), apply);
}
}
}
@@ -3998,16 +3989,11 @@ void AuraEffect::HandleModBaseResistance(AuraApplication const* aurApp, uint8 mo
return;
Unit* target = aurApp->GetTarget();
// only players and pets have base stats
if (target->IsPlayer() || target->IsPet())
for (uint8 i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++)
{
for (uint8 i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++)
if (GetMiscValue() & (1 << i))
{
if (GetMiscValue() & (1 << i))
{
target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + i), TOTAL_VALUE, float(GetAmount()), apply);
}
target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + i), TOTAL_VALUE, float(GetAmount()), apply);
}
}
}

10
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
View File

@@ -40,7 +40,7 @@ enum Spells
SPELL_CURSE_OF_TONGUES = 25195,
SPELL_ENVELOPING_WINDS = 25189,
SPELL_WAR_STOMP = 25188,
SPELL_STRENGHT_OF_OSSIRIAN = 25176,
SPELL_STRENGTH_OF_OSSIRIAN = 25176,
SPELL_SAND_STORM = 25160,
SPELL_SUMMON_CRYSTAL = 25192,
SPELL_SUMMON_SMALL_OBSIDIAN_CHUNK = 27627, // Server-side
@@ -148,7 +148,7 @@ struct boss_ossirian : public BossAI
{
if (spell->Id == weakness)
{
me->RemoveAurasDueToSpell(SPELL_STRENGHT_OF_OSSIRIAN);
me->RemoveAurasDueToSpell(SPELL_STRENGTH_OF_OSSIRIAN);
}
}
}
@@ -169,7 +169,7 @@ struct boss_ossirian : public BossAI
events.ScheduleEvent(EVENT_SILENCE, 30s);
events.ScheduleEvent(EVENT_CYCLONE, 20s);
events.ScheduleEvent(EVENT_STOMP, 30s);
DoCastSelf(SPELL_STRENGHT_OF_OSSIRIAN);
DoCastSelf(SPELL_STRENGTH_OF_OSSIRIAN);
Talk(SAY_AGGRO);
Map* map = me->GetMap();
@@ -253,7 +253,7 @@ struct boss_ossirian : public BossAI
events.Update(diff);
bool applySupreme = true;
if (me->HasAura(SPELL_STRENGHT_OF_OSSIRIAN))
if (me->HasAura(SPELL_STRENGTH_OF_OSSIRIAN))
{
applySupreme = false;
}
@@ -271,7 +271,7 @@ struct boss_ossirian : public BossAI
if (applySupreme)
{
DoCastSelf(SPELL_STRENGHT_OF_OSSIRIAN);
DoCastSelf(SPELL_STRENGTH_OF_OSSIRIAN);
Talk(SAY_SUPREME);
}

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

@@ -4478,7 +4478,8 @@ enum AQSpells
SPELL_CONSUME_LEECH_HEAL_AQ20 = 25378,
SPELL_CONSUME_SPIT_OUT = 25383,
SPELL_HIVEZARA_CATALYST = 25187
SPELL_HIVEZARA_CATALYST = 25187,
SPELL_VEKNISS_CATALYST = 26078
};
class spell_gen_consume : public AuraScript
@@ -4706,4 +4707,5 @@ void AddSC_generic_spell_scripts()
RegisterSpellScript(spell_gen_remove_impairing_auras);
RegisterSpellScriptWithArgs(spell_gen_consume, "spell_consume_aq20", SPELL_CONSUME_LEECH_AQ20, SPELL_CONSUME_LEECH_HEAL_AQ20);
RegisterSpellScriptWithArgs(spell_gen_apply_aura_after_expiration, "spell_itch_aq20", SPELL_HIVEZARA_CATALYST, EFFECT_0, SPELL_AURA_DUMMY);
RegisterSpellScriptWithArgs(spell_gen_apply_aura_after_expiration, "spell_itch_aq40", SPELL_VEKNISS_CATALYST, EFFECT_0, SPELL_AURA_DUMMY);
}