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
2023-04-04 08:16:34 -06:00
committed by GitHub
parent a27f752dcc ed2c319280
commit c9186547dd
10 changed files with 135 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
data/sql/updates/db_world/2023_04_04_08.sql Normal file
View File

@@ -0,0 +1,18 @@
-- DB update 2023_04_04_07 -> 2023_04_04_08
--
DELETE FROM `areatrigger_scripts` WHERE `entry`=4295;
INSERT INTO `areatrigger_scripts` VALUES
(4295,'at_quagmirran_lair');
-- Pathing for Quagmirran Entry: 17942
SET @PATH := 1794200;
DELETE FROM `waypoint_data` WHERE `id`=@PATH;
INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
(@PATH,1,-272.12997,-671.50586,8.970236,NULL,0,0,0,100,0),
(@PATH,2,-261.6143,-675.77155,10.541557,NULL,0,0,0,100,0),
(@PATH,3,-246.73248,-683.1629,15.529007,NULL,0,0,0,100,0),
(@PATH,4,-238.07864,-686.42316,18.473059,NULL,0,0,0,100,0),
(@PATH,5,-227.73457,-690.909,22.025816,NULL,0,0,0,100,0),
(@PATH,6,-217.95325,-695.7503,26.769361,NULL,0,0,0,100,0),
(@PATH,7,-204.01328,-702.2695,37.230885,NULL,0,0,0,100,0),
(@PATH,8,-199.49352,-705.59766,37.802734,NULL,0,0,0,100,0);

3
data/sql/updates/db_world/2023_04_04_09.sql Normal file
View File

@@ -0,0 +1,3 @@
-- DB update 2023_04_04_08 -> 2023_04_04_09
-- damage modifier edit of Razormaw from 7.5 to 1.36 based on mangos values
UPDATE `creature_template` SET `DamageModifier` = 1.36 WHERE `entry` = 17592;

33
data/sql/updates/db_world/2023_04_04_10.sql Normal file
View File

@@ -0,0 +1,33 @@
-- DB update 2023_04_04_09 -> 2023_04_04_10
-- Quest: On Nethery Wings ID 10438
-- Void Conduit
DELETE FROM `smart_scripts` WHERE `entryorguid` = 20899 AND `source_type` = 0;
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
(20899, 0, 0, 1, 25, 0, 100, 0, 0, 0, 0, 0, 0, 102, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Void Conduit - On Reset - Set Health Regeneration Off'),
(20899, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Void Conduit - On Reset - Set ReactState Passive'),
(20899, 0, 2, 3, 6, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 19554, 100, 0, 0, 0, 0, 0, 0, 'Void Conduit - On Just Died - Say Line 0 (Dimensius the All-Devouring)'),
(20899, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 0, 1, 0, 0, 0, 0, 9, 20933, 0, 100, 0, 0, 0, 0, 0, 'Void Conduit - On Just Died - Set Data 0 1'),
(20899, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 19, 19565, 40, 0, 0, 0, 0, 0, 0, 'Void Conduit - On Just Died - Despawn Instant');
-- Camera Shakers Manaforge Ultris
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 20933;
DELETE FROM `smart_scripts` WHERE `entryorguid` = 20933 AND `source_type` = 0;
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
(20933, 0, 0, 1, 38, 0, 100, 0, 0, 1, 0, 0, 0, 11, 35761, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Camera Shakers Manaforge Ultris - On Data Set 0 1 - Cast Ultris Explosion'),
(20933, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 2093300, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Camera Shakers Manaforge Ultris - On Data Set 0 1 - Run Script');
DELETE FROM `smart_scripts` WHERE `entryorguid` = 2093300 AND `source_type` = 9;
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
(2093300, 9, 0, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 35763, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Camera Shakers Manaforge Ultris - Script - Cast Ultris Explosion'),
(2093300, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 35763, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Camera Shakers Manaforge Ultris - Script - Cast Ultris Explosion'),
(2093300, 9, 2, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 35763, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Camera Shakers Manaforge Ultris - Script - Cast Ultris Explosion'),
(2093300, 9, 3, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 35763, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Camera Shakers Manaforge Ultris - Script - Cast Ultris Explosion'),
(2093300, 9, 4, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 35763, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Camera Shakers Manaforge Ultris - Script - Cast Ultris Explosion');
-- Void Conduit Spell Focus
DELETE FROM `gameobject` WHERE `id` = 184643 AND `map` = 530;
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`) VALUES
(9381, 184643, 530, 0, 0, 1, 1, 3930.18, 2038.26, 383.501, 1.72, 0, 0, 0, 1, 180, 0, 1, '', 0),
(9385, 184643, 530, 0, 0, 1, 1, 3902.94, 1996.42, 383.644, 3.27509, 0, 0, 0, 1, 180, 0, 1, '', 0),
(9386, 184643, 530, 0, 0, 1, 1, 3943, 1970.1, 383.321, 5.10507, 0, 0, 0, 1, 180, 0, 1, '', 0),
(99956, 184643, 530, 0, 0, 1, 1, 3964.1, 2008.44, 383.941, 0.176697, 0, 0, 0, 1, 180, 0, 1, '', 0);

22
data/sql/updates/db_world/2023_04_04_11.sql Normal file
View File

@@ -0,0 +1,22 @@
-- DB update 2023_04_04_10 -> 2023_04_04_11
--
DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 22) AND (`SourceGroup` = 3) AND (`SourceEntry` = 20795) AND (`SourceId` = 0) AND (`ElseGroup` = 0) AND (`ConditionTypeOrReference` = 29) AND (`ConditionTarget` = 1) AND (`ConditionValue1` = 21027) AND (`ConditionValue2` = 35) AND (`ConditionValue3` = 0);
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(22, 3, 20795, 0, 0, 29, 1, 21027, 35, 0, 0, 0, 0, '', 'Only run if Earthmender Wilda (21027) is within 35y');
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` IN (-25120, -25121, -25122, -25123, -25124) AND `id` IN (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
(-25120, 0, 2, 3, 11, 0, 100, 512, 0, 0, 0, 0, 0, 11, 35929, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Cast \'Water Bubble\''),
(-25120, 0, 3, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 60, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Set Fly Off'),
(-25121, 0, 2, 3, 11, 0, 100, 512, 0, 0, 0, 0, 0, 11, 35929, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Cast \'Water Bubble\''),
(-25121, 0, 3, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 60, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Set Fly Off'),
(-25122, 0, 2, 3, 11, 0, 100, 512, 0, 0, 0, 0, 0, 11, 35929, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Cast \'Water Bubble\''),
(-25122, 0, 3, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 60, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Set Fly Off'),
(-25124, 0, 2, 3, 11, 0, 100, 512, 0, 0, 0, 0, 0, 11, 35929, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Cast \'Water Bubble\''),
(-25124, 0, 3, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 60, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Set Fly Off'),
(-25123, 0, 2, 3, 11, 0, 100, 512, 0, 0, 0, 0, 0, 11, 35929, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Cast \'Water Bubble\''),
(-25123, 0, 3, 0, 61, 0, 100, 512, 0, 0, 0, 0, 0, 60, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Captured Water Spirit - On Respawn - Set Fly Off');
UPDATE `smart_scripts` SET `action_param3` = 0 WHERE (`entryorguid` BETWEEN 2102900 AND 2102904) AND (`source_type` = 9) AND (`id` IN (3));
UPDATE `creature_template_movement` SET `Ground` = 1, `Flight` = 0 WHERE (`CreatureId` = 21029);

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

@@ -373,6 +373,7 @@ public:
if (me->isDead())
return;
instance->SetBossState(DATA_SINDRAGOSA, IN_PROGRESS);
me->setActive(true);
me->SetDisableGravity(true);
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
@@ -1704,7 +1705,7 @@ public:
if (Creature* rimefang = ObjectAccessor::GetCreature(*player, instance->GetGuidData(DATA_RIMEFANG)))
rimefang->AI()->DoAction(ACTION_START_FROSTWYRM);
if (!instance->GetData(DATA_SINDRAGOSA_FROSTWYRMS))
if (!instance->GetData(DATA_SINDRAGOSA_FROSTWYRMS) && instance->GetBossState(DATA_SINDRAGOSA) != IN_PROGRESS)
{
player->GetMap()->LoadGrid(SindragosaSpawnPos.GetPositionX(), SindragosaSpawnPos.GetPositionY());
if (Creature* sindragosa = ObjectAccessor::GetCreature(*player, instance->GetGuidData(DATA_SINDRAGOSA)))

8
src/server/scripts/Outland/CoilfangReservoir/SlavePens/instance_the_slave_pens.cpp
View File

@@ -28,6 +28,11 @@
#include "ScriptMgr.h"
#include "the_slave_pens.h"
ObjectData const creatureData[] =
{
{ NPC_QUAGMIRRAN, DATA_QUAGMIRRAN }
};
class instance_the_slave_pens : public InstanceMapScript
{
public:
@@ -38,6 +43,7 @@ public:
instance_the_slave_pens_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetHeaders(DataHeader);
LoadObjectData(creatureData, nullptr);
counter = DATA_FLAMECALLER_000;
}
@@ -82,6 +88,8 @@ public:
default:
break;
}
InstanceScript::OnCreatureCreate(creature);
}
void SetGuidData(uint32 data, ObjectGuid guid) override

44
src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.cpp Normal file
View File

@@ -0,0 +1,44 @@
/*
* This file is part of the AzerothCore Project. See AUTHORS file for Copyright information
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by the
* Free Software Foundation; either version 3 of the License, or (at your
* option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "the_slave_pens.h"
#include "Player.h"
#include "ScriptMgr.h"
class at_quagmirran_lair : public AreaTriggerScript
{
public:
at_quagmirran_lair() : AreaTriggerScript("at_quagmirran_lair") {}
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/) override
{
if (InstanceScript* instance = player->GetInstanceScript())
{
if (Creature* quagmirran = instance->GetCreature(DATA_QUAGMIRRAN))
{
quagmirran->GetMotionMaster()->MovePath(quagmirran->GetEntry() * 100, true);
}
}
return true;
}
};
void AddSC_the_slave_pens()
{
new at_quagmirran_lair();
}

3
src/server/scripts/Outland/CoilfangReservoir/SlavePens/the_slave_pens.h
View File

@@ -64,7 +64,8 @@ enum SPCreaturesIds
NPC_SHAMAN_BEAM_BUNNY_001 = 25965,
NPC_SHAMAN_BEAM_BUNNY_002 = 25966,
NPC_WHISP_DEST_BUNNY = 26120,
NPC_WHISP_SOURCE_BUNNY = 26121
NPC_WHISP_SOURCE_BUNNY = 26121,
NPC_QUAGMIRRAN = 17942
};
enum SPGameObjectIds

2
src/server/scripts/Outland/outland_script_loader.cpp
View File

@@ -56,6 +56,7 @@ void AddSC_boss_hungarfen();
void AddSC_boss_ghazan();
void AddSC_boss_the_black_stalker();
void AddSC_instance_the_underbog();
void AddSC_the_slave_pens(); // The Slave Pens
void AddSC_boss_ahune();
void AddSC_instance_the_slave_pens();
void AddSC_boss_gruul(); //Gruul's Lair
@@ -153,6 +154,7 @@ void AddOutlandScripts()
AddSC_boss_ghazan();
AddSC_boss_the_black_stalker();
AddSC_instance_the_underbog();
AddSC_the_slave_pens(); // The Slave Pens
AddSC_boss_ahune();
AddSC_instance_the_slave_pens();
AddSC_boss_gruul(); //Gruul's Lair

2
src/server/scripts/World/npc_taxi.cpp
View File

@@ -169,7 +169,7 @@ public:
{
case GOSSIP_ACTION_INFO_DEF + 1:
CloseGossipMenuFor(player);
player->ActivateTaxiPathTo(627); //TaxiPath 627 (possibly 627+628(152->153->154->155))
player->CastSpell(player, 35731, true); //TaxiPath 628
break;
case GOSSIP_ACTION_INFO_DEF + 3:
CloseGossipMenuFor(player);