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-13 18:48:47 -06:00
committed by GitHub
parent 8791645166 f01459553f
commit 76f4f741d8
11 changed files with 2403 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2288
data/sql/updates/db_world/2022_09_13_00.sql Normal file
View File

File diff suppressed because it is too large Load Diff

56
data/sql/updates/db_world/2022_09_13_01.sql Normal file
View File

@@ -0,0 +1,56 @@
-- DB update 2022_09_13_00 -> 2022_09_13_01
--
SET @NPC := 190247;
SET @PATH := @NPC * 10;
DELETE FROM `creature` WHERE `guid`=190247;
INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `equipment_id`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`) VALUES
(@NPC, 5595, 0, 0, 0, 1, 1, -4552.39, -896.782, 628.633, 3.34483, 300, 0, 2);
DELETE FROM `creature_addon` WHERE `guid` = @NPC;
INSERT INTO `creature_addon` (`guid`, `path_id`) VALUES (@NPC, @PATH);
DELETE FROM `waypoint_data` WHERE `id` = @PATH;
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`) VALUES
(@PATH, 1, -4552.39, -896.782, 628.633, 0, 0),
(@PATH, 2, -4571.39, -896.264, 651.567, 0, 0),
(@PATH, 3, -4589.99, -901.846, 676.836, 0, 0),
(@PATH, 4, -4610.82, -917.361, 706.62, 0, 0),
(@PATH, 5, -4635.23, -928.682, 738.215, 0, 0),
(@PATH, 6, -4652.98, -931.127, 758.215, 0, 0),
(@PATH, 7, -4671.22, -939.369, 776.936, 0, 0),
(@PATH, 8, -4693.6, -938.376, 787.811, 0, 0),
(@PATH, 9, -4709.45, -932.536, 794.806, 0, 0),
(@PATH, 10, -4736.27, -907.288, 796.935, 0, 0),
(@PATH, 11, -4756.81, -896.912, 801.729, 0, 0),
(@PATH, 12, -4777.11, -899.693, 814.528, 0, 0),
(@PATH, 13, -4804.58, -902.562, 829.09, 0, 0),
(@PATH, 14, -4824.69, -910.126, 830.965, 0, 0),
(@PATH, 15, -4841.75, -924.793, 844.143, 0, 0),
(@PATH, 16, -4852.96, -950.442, 845.615, 0, 0),
(@PATH, 17, -4852.99, -981.269, 849.042, 0, 0),
(@PATH, 18, -4845.49, -988.7, 858.542, 0, 0),
(@PATH, 19, -4833.08, -986.989, 873.707, 0, 0),
(@PATH, 20, -4825.01, -988.942, 880.082, 0, 0),
(@PATH, 21, -4808.79, -991.839, 890.707, 0, 0),
(@PATH, 22, -4801.89, -996.844, 893.207, 100, 3000),
(@PATH, 23, -4808.79, -991.839, 890.707, 0, 0),
(@PATH, 24, -4825.01, -988.942, 880.082, 0, 0),
(@PATH, 25, -4833.08, -986.989, 873.707, 0, 0),
(@PATH, 26, -4845.49, -988.7, 858.542, 0, 0),
(@PATH, 27, -4852.99, -981.269, 849.042, 0, 0),
(@PATH, 28, -4852.96, -950.442, 845.615, 0, 0),
(@PATH, 29, -4841.75, -924.793, 844.143, 0, 0),
(@PATH, 30, -4824.69, -910.126, 830.965, 0, 0),
(@PATH, 31, -4804.58, -902.562, 829.09, 0, 0),
(@PATH, 32, -4777.11, -899.693, 814.528, 0, 0),
(@PATH, 33, -4756.81, -896.912, 801.729, 0, 0),
(@PATH, 34, -4736.27, -907.288, 796.935, 0, 0),
(@PATH, 35, -4709.45, -932.536, 794.806, 0, 0),
(@PATH, 36, -4693.6, -938.376, 787.811, 0, 0),
(@PATH, 37, -4671.22, -939.369, 776.936, 0, 0),
(@PATH, 38, -4652.98, -931.127, 758.215, 0, 0),
(@PATH, 39, -4635.23, -928.682, 738.215, 0, 0),
(@PATH, 40, -4610.82, -917.361, 706.62, 0, 0),
(@PATH, 41, -4589.99, -901.846, 676.836, 0, 0),
(@PATH, 42, -4571.39, -896.264, 651.567, 0, 0);

24
data/sql/updates/db_world/2022_09_13_02.sql Normal file
View File

@@ -0,0 +1,24 @@
-- DB update 2022_09_13_01 -> 2022_09_13_02
--
SET @GOSSIP_MENU_ID1 := 6560; /* Hive'Ashi Glyphed Crystal */
SET @GOSSIP_MENU_ID2 := 6561; /* Hive'Regal Glyphed Crystal */
SET @GOSSIP_MENU_ID3 := 6559; /* Hive'Zora Glyphed Crystal */
SET @QUEST_ID := 8309; /* Glyph Chasing */
SET @RUBBING_KIT := 20453;
SET @ITEM_ID1 := 20455; /* Hive'Ashi Rubbing */
SET @ITEM_ID2 := 20456; /* Hive'Regal Rubbing */
SET @ITEM_ID3 := 20454; /* Hive'Zora Rubbing */
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (@GOSSIP_MENU_ID1, @GOSSIP_MENU_ID2, @GOSSIP_MENU_ID3);
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
(15, @GOSSIP_MENU_ID1, 0, 0, 0, 9, 0, @QUEST_ID, 0, 0, 0, 0, '', 'Requires Quest Taken'),
(15, @GOSSIP_MENU_ID1, 0, 0, 0, 2, 0, @ITEM_ID1, 1, 0, 1, 0, '', 'Requires Missing Item'),
(15, @GOSSIP_MENU_ID1, 0, 0, 0, 2, 0, @RUBBING_KIT, 1, 0, 0, 0, '', 'Requires Item'),
(15, @GOSSIP_MENU_ID2, 0, 0, 0, 9, 0, @QUEST_ID, 0, 0, 0, 0, '', 'Requires Quest Taken'),
(15, @GOSSIP_MENU_ID2, 0, 0, 0, 2, 0, @ITEM_ID2, 1, 0, 1, 0, '', 'Requires Missing Item'),
(15, @GOSSIP_MENU_ID2, 0, 0, 0, 2, 0, @RUBBING_KIT, 1, 0, 0, 0, '', 'Requires Item'),
(15, @GOSSIP_MENU_ID3, 0, 0, 0, 9, 0, @QUEST_ID, 0, 0, 0, 0, '', 'Requires Quest Taken'),
(15, @GOSSIP_MENU_ID3, 0, 0, 0, 2, 0, @ITEM_ID3, 1, 0, 1, 0, '', 'Requires Missing Item'),
(15, @GOSSIP_MENU_ID3, 0, 0, 0, 2, 0, @RUBBING_KIT, 1, 0, 0, 0, '', 'Requires Item');

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

@@ -0,0 +1,3 @@
-- DB update 2022_09_13_02 -> 2022_09_13_03
--
UPDATE `spell_proc_event` SET `SpellFamilyName`=11, `procFlags`=65536 WHERE `entry`=26119;

8
src/server/apps/worldserver/worldserver.conf.dist
View File

@@ -2148,6 +2148,14 @@ Visibility.Notify.Period.OnContinents = 1000
Visibility.Notify.Period.InInstances = 1000
Visibility.Notify.Period.InBGArenas = 1000
#
# Visibility.ObjectSparkles
# Description: Whether or not to display sparkles on gameobjects related to active quests.
# Default: 1 - (Show Sparkles)
# 0 - (Hide Sparkles)
Visibility.ObjectSparkles = 1
#
###################################################################################################

8
src/server/game/Entities/GameObject/GameObject.cpp
View File

@@ -2788,13 +2788,17 @@ void GameObject::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* t
case GAMEOBJECT_TYPE_CHEST:
case GAMEOBJECT_TYPE_GOOBER:
if (ActivateToQuest(target))
dynFlags |= GO_DYNFLAG_LO_ACTIVATE | GO_DYNFLAG_LO_SPARKLE;
{
dynFlags |= GO_DYNFLAG_LO_ACTIVATE;
if (sWorld->getBoolConfig(CONFIG_OBJECT_SPARKLES))
dynFlags |= GO_DYNFLAG_LO_SPARKLE;
}
else if (targetIsGM)
dynFlags |= GO_DYNFLAG_LO_ACTIVATE;
break;
case GAMEOBJECT_TYPE_SPELL_FOCUS:
case GAMEOBJECT_TYPE_GENERIC:
if (ActivateToQuest(target))
if (ActivateToQuest(target) && sWorld->getBoolConfig(CONFIG_OBJECT_SPARKLES))
dynFlags |= GO_DYNFLAG_LO_SPARKLE;
break;
case GAMEOBJECT_TYPE_TRANSPORT:

8
src/server/game/Entities/Pet/Pet.cpp
View File

@@ -1281,6 +1281,12 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
AddAura(SPELL_FERAL_SPIRIT_SCALING_01, this);
AddAura(SPELL_FERAL_SPIRIT_SCALING_02, this);
AddAura(SPELL_FERAL_SPIRIT_SCALING_03, this);
if (owner->getRace() == RACE_ORC)
{
CastSpell(this, SPELL_ORC_RACIAL_COMMAND_SHAMAN, true, nullptr, nullptr, owner->GetGUID());
}
break;
}
case NPC_MIRROR_IMAGE: // Mirror Image
@@ -1357,7 +1363,7 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
// xinef: fixes orc death knight command racial
if (owner->getRace() == RACE_ORC)
CastSpell(this, SPELL_ORC_RACIAL_COMMAND, true, nullptr, nullptr, owner->GetGUID());
CastSpell(this, SPELL_ORC_RACIAL_COMMAND_DK, true, nullptr, nullptr, owner->GetGUID());
// Avoidance, Night of the Dead
if (Aura* aur = AddAura(SPELL_NIGHT_OF_THE_DEAD_AVOIDANCE, this))

3
src/server/game/Entities/Pet/PetDefines.h
View File

@@ -162,6 +162,7 @@ enum PetScalingSpells
SPELL_EARTH_ELEMENTAL_SCALING_02 = 65226,
SPELL_EARTH_ELEMENTAL_SCALING_03 = 65227,
SPELL_EARTH_ELEMENTAL_SCALING_04 = 65228,
SPELL_ORC_RACIAL_COMMAND_SHAMAN = 65223,
// Priest
SPELL_SHADOWFIEND_SCALING_01 = 35661,
@@ -182,7 +183,7 @@ enum PetScalingSpells
SPELL_MAGE_PET_SCALING_04 = 35660,
// Death Knight
SPELL_ORC_RACIAL_COMMAND = 65221,
SPELL_ORC_RACIAL_COMMAND_DK = 65221,
SPELL_NIGHT_OF_THE_DEAD_AVOIDANCE = 62137,
SPELL_DK_PET_SCALING_01 = 51996,
SPELL_DK_PET_SCALING_02 = 54566,

6
src/server/game/Spells/SpellInfoCorrections.cpp
View File

@@ -4379,6 +4379,12 @@ void SpellMgr::LoadSpellInfoCorrections()
spellInfo->Attributes |= SPELL_ATTR0_ALLOW_WHILE_SITTING;
});
// Judgement (Paladin T2 8P Bonus)
ApplySpellFix({ 23591 }, [](SpellInfo* spellInfo)
{
spellInfo->ProcFlags = PROC_FLAG_DONE_SPELL_MELEE_DMG_CLASS;
});
for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i)
{
SpellInfo* spellInfo = mSpellInfoMap[i];

1
src/server/game/World/IWorld.h
View File

@@ -176,6 +176,7 @@ enum WorldBoolConfigs
CONFIG_MISS_CHANCE_MULTIPLIER_ONLY_FOR_PLAYERS,
CONFIG_LEAVE_GROUP_ON_LOGOUT,
CONFIG_VMAP_BLIZZLIKE_PVP_LOS,
CONFIG_OBJECT_SPARKLES,
BOOL_CONFIG_VALUE_COUNT
};

2
src/server/game/World/World.cpp
View File

@@ -942,6 +942,8 @@ void World::LoadConfigSettings(bool reload)
m_int_configs[CONFIG_GROUP_VISIBILITY] = sConfigMgr->GetOption<int32>("Visibility.GroupMode", 1);
m_bool_configs[CONFIG_OBJECT_SPARKLES] = sConfigMgr->GetOption<bool>("Visibility.ObjectSparkles", true);
m_int_configs[CONFIG_MAIL_DELIVERY_DELAY] = sConfigMgr->GetOption<int32>("MailDeliveryDelay", HOUR);
m_int_configs[CONFIG_UPTIME_UPDATE] = sConfigMgr->GetOption<int32>("UpdateUptimeInterval", 10);