diff options
6 files changed, 42 insertions, 19 deletions
diff --git a/data/sql/updates/db_world/2025_11_20_01.sql b/data/sql/updates/db_world/2025_11_20_01.sql new file mode 100644 index 0000000000..ad17c2b25f --- /dev/null +++ b/data/sql/updates/db_world/2025_11_20_01.sql @@ -0,0 +1,4 @@ +-- DB update 2025_11_20_00 -> 2025_11_20_01 +-- +UPDATE `creature_addon` SET `bytes2` = 1, `auras` = '31261' WHERE `guid` IN (114372, 114373, 114381); +UPDATE `creature` SET `unit_flags` = `unit_flags`|256|512|536870912, `VerifiedBuild` = 64502 WHERE `guid` IN (114372, 114373, 114381) AND `id1` = 30148; diff --git a/data/sql/updates/db_world/2025_11_20_02.sql b/data/sql/updates/db_world/2025_11_20_02.sql new file mode 100644 index 0000000000..b8b12eb919 --- /dev/null +++ b/data/sql/updates/db_world/2025_11_20_02.sql @@ -0,0 +1,5 @@ +-- DB update 2025_11_20_01 -> 2025_11_20_02 +-- +UPDATE `creature_template` SET `speed_run` = 1.142857 WHERE `entry` = 31356; +UPDATE `creature_template` SET `speed_run` = 0.428571 WHERE `entry` = 31873; +UPDATE `creature_template` SET `speed_run` = 0.714285 WHERE `entry` = 31348; diff --git a/data/sql/updates/db_world/2025_11_20_03.sql b/data/sql/updates/db_world/2025_11_20_03.sql new file mode 100644 index 0000000000..5d252067d8 --- /dev/null +++ b/data/sql/updates/db_world/2025_11_20_03.sql @@ -0,0 +1,10 @@ +-- DB update 2025_11_20_02 -> 2025_11_20_03 +-- +UPDATE `creature_template` SET `AIName` = '', `npcflag` = 16777216 WHERE `entry` = 26809; +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 26809) AND (`source_type` = 0); + +DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` = 26809; +INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES +(26809, 47416, 2, 1); + +UPDATE `spell_dbc` SET `Effect_1` = 24, `EffectBasePoints_1` = 1, `ImplicitTargetA_1` = 25, `EffectItemType_1` = 36765 WHERE `id` = 47416; diff --git a/data/sql/updates/db_world/2025_11_20_04.sql b/data/sql/updates/db_world/2025_11_20_04.sql new file mode 100644 index 0000000000..3eafbca145 --- /dev/null +++ b/data/sql/updates/db_world/2025_11_20_04.sql @@ -0,0 +1,11 @@ +-- DB update 2025_11_20_03 -> 2025_11_20_04 +-- +DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 17) AND (`SourceGroup` = 0) AND (`SourceEntry` = 47431) AND (`SourceId` = 0) AND (`ElseGroup` = 0) AND (`ConditionTypeOrReference` = 29) AND (`ConditionTarget` = 1) AND (`ConditionValue1` = 26359) AND (`ConditionValue2` = 0) AND (`ConditionValue3` = 0); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(17, 0, 47431, 0, 0, 29, 1, 26359, 0, 0, 0, 0, 0, '', 'Capture Jormungar Spawn require Ice Heart Jormungar Spawn'); + +UPDATE `gameobject_template` SET `AIName` = 'SmartGameObjectAI' WHERE `entry` = 190510; + +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 190510) AND (`source_type` = 1) AND (`id` IN (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`, `event_param6`, `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 +(190510, 1, 0, 0, 63, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 1000, 0, 0, 0, 0, 0, 19, 26359, 5, 0, 0, 0, 0, 0, 0, 'Captured Jormungar Spawn - On Just Created - Despawn In 1000 ms'); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index bfe5e6db10..484a0ada74 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -218,29 +218,22 @@ public: switch (m_uiEventId) { case EVENT_OZ: - if (OzDialogue[count].textid) - text = OzDialogue[count].textid; - if (OzDialogue[count].timer) - TalkTimer = OzDialogue[count].timer; + text = OzDialogue[count].textid; + TalkTimer = OzDialogue[count].timer; break; - case EVENT_HOOD: - if (HoodDialogue[count].textid) - text = HoodDialogue[count].textid; - if (HoodDialogue[count].timer) - TalkTimer = HoodDialogue[count].timer; + text = HoodDialogue[count].textid; + TalkTimer = HoodDialogue[count].timer; break; - case EVENT_RAJ: - if (RAJDialogue[count].textid) - text = RAJDialogue[count].textid; - if (RAJDialogue[count].timer) - TalkTimer = RAJDialogue[count].timer; + text = RAJDialogue[count].textid; + TalkTimer = RAJDialogue[count].timer; break; + default: + return; } - if (text) - CreatureAI::Talk(text); + CreatureAI::Talk(text); } void PrepareEncounter() diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 9d44e3b25a..43547fcf0c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -1950,14 +1950,14 @@ public: currentStopPoint = 0; events.Reset(); } - void DoAction(int32 actionId) override + void DoAction(int32 actionId) override { switch (actionId) { case ACTION_START_INTRO: events.ScheduleEvent(EVENT_LK_SAY_AGGRO, 0ms); - events.ScheduleEvent(EVENT_LK_BATTLE_1, 2s +500ms); + events.ScheduleEvent(EVENT_LK_BATTLE_1, 2s + 500ms); events.ScheduleEvent(EVENT_LK_BATTLE_2, 3s); events.ScheduleEvent(me->GetEntry() == NPC_JAINA_PART2 ? EVENT_JAINA_IMMOBILIZE_LK : EVENT_SYLVANAS_IMMOBILIZE_JUMP, 9s); break; @@ -1989,7 +1989,7 @@ public: path.push_back(G3D::Vector3(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ())); for (uint8 i = WP_STOP[currentStopPoint - 1] + (currentStopPoint == 1 ? 0 : 1); i <= WP_STOP[currentStopPoint]; ++i) path.push_back(G3D::Vector3(PathWaypoints[i].GetPositionX(), PathWaypoints[i].GetPositionY(), PathWaypoints[i].GetPositionZ())); - me->GetMotionMaster()->MoveSplinePath(&path); + me->GetMotionMaster()->MoveSplinePath(&path, FORCED_MOVEMENT_RUN); } void MovementInform(uint32 type, uint32 /*id*/) override |