* Merge.

--HG--
branch : trunk

9 files changed, 31 insertions, 7 deletions

diff --git a/sql/updates/1911_world.sql b/sql/updates/1911_world.sql
index 4a351fcaabc..9670819d7ea 100644
--- a/sql/updates/1911_world.sql
+++ b/sql/updates/1911_world.sql
@@ -1,4 +1,4 @@
 DELETE FROM `spell_proc_event` WHERE `entry` IN (44545, 44543);
 INSERT INTO `spell_proc_event` VALUES
 (44545, 0x00, 3, 1049120, 4096, 0x00000000, 0x0010000, 0x00000000, 15.000000, 0.000000, 0),
-(44543, 0x00, 3, 1049120, 4096, 0x00000000, 0x0010000, 0x00000000, 7.000000, 0.000000, 0);
+(44543, 0x00, 3, 1049120, 4096, 0x00000000, 0x0010000, 0x00000000, 7.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/1912_world.sql b/sql/updates/1912_world.sql
index defcec0ee70..4c8afaea8d9 100644
--- a/sql/updates/1912_world.sql
+++ b/sql/updates/1912_world.sql
@@ -2,4 +2,4 @@
 DELETE FROM `spell_proc_event` WHERE `entry` IN (53754, 53759);
 INSERT INTO `spell_proc_event` VALUES
 (53754, 0x00, 5, 0x00000000, 1024, 0x00000000, 0x00000000, 0x0006000, 0.000000, 0.000000, 0),
-(53759, 0x00, 5, 0x00000000, 1024, 0x00000000, 0x00000000, 0x0006000, 0.000000, 0.000000, 0);
+(53759, 0x00, 5, 0x00000000, 1024, 0x00000000, 0x00000000, 0x0006000, 0.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/1957_word.sql b/sql/updates/1957_word.sql
index 83f7dcf8105..acf7179f5ad 100644
--- a/sql/updates/1957_word.sql
+++ b/sql/updates/1957_word.sql
@@ -2,4 +2,4 @@
 DELETE FROM `spell_proc_event` WHERE `entry` IN (46910, 46911);
 INSERT INTO `spell_proc_event` VALUES
 (46910, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000001, 5.5000000, 0.000000, 0),
-(46911, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000001, 7.5000000, 0.000000, 0);
+(46911, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000001, 7.5000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/7472_01_mangos_mangos_string.sql b/sql/updates/1962_mangos_7472_01_world_trinity_string.sql
index e25ca96d12f..ddb575590c7 100644
--- a/sql/updates/7472_01_mangos_mangos_string.sql
+++ b/sql/updates/1962_mangos_7472_01_world_trinity_string.sql
@@ -1,7 +1,7 @@
-ALTER TABLE db_version CHANGE COLUMN required_7439_01_mangos_mangos_string required_7472_01_mangos_mangos_string bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7439_01_mangos_mangos_string required_7472_01_mangos_mangos_string bit;*/
 
-DELETE FROM mangos_string WHERE entry >= 667 and entry <= 687 or entry = 614 or entry = 615;
-INSERT INTO mangos_string VALUES
+DELETE FROM trinity_string WHERE entry >= 667 and entry <= 687 or entry = 614 or entry = 615;
+INSERT INTO trinity_string VALUES
 (614,'The Alliance flag is now placed at its base.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (615,'The Horde flag is now placed at its base.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (667,'The Alliance has taken control of the Mage Tower!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
diff --git a/sql/updates/2013_world.sql b/sql/updates/2013_world.sql
index 9fd2a1fc7fe..ac1179bd2c5 100644
--- a/sql/updates/2013_world.sql
+++ b/sql/updates/2013_world.sql
@@ -8,4 +8,4 @@ INSERT INTO `spell_proc_event` VALUES
 -- Master of subtlety
 (31221, 0x00, 8, 0x400000, 0x00000000, 0x00000000, 0x00014000, 0x0004001, 0.000000, 0.000000, 0),
 (31222, 0x00, 8, 0x400000, 0x00000000, 0x00000000, 0x00014000, 0x0004001, 0.000000, 0.000000, 0),
-(31223, 0x00, 8, 0x400000, 0x00000000, 0x00000000, 0x00014000, 0x0004001, 0.000000, 0.000000, 0);
+(31223, 0x00, 8, 0x400000, 0x00000000, 0x00000000, 0x00014000, 0x0004001, 0.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/2021_world.sql b/sql/updates/2021_world.sql
new file mode 100644
index 00000000000..38e86847763
--- /dev/null
+++ b/sql/updates/2021_world.sql
@@ -0,0 +1,6 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN (30293, 30295, 30296);
+INSERT INTO `spell_proc_event` VALUES
+-- Soul Leech
+(30293, 0x00, 5, 0x00000381, 0x200C0, 0x00000000, 0x0000000, 0x0000000, 0.000000, 0.000000, 0),
+(30295, 0x00, 5, 0x00000381, 0x200C0, 0x00000000, 0x0000000, 0x0000000, 0.000000, 0.000000, 0),
+(30296, 0x00, 5, 0x00000381, 0x200C0, 0x00000000, 0x0000000, 0x0000000, 0.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/2025_mangos_7493_01_world_command.sql b/sql/updates/2025_mangos_7493_01_world_command.sql
new file mode 100644
index 00000000000..ec319bd2728
--- /dev/null
+++ b/sql/updates/2025_mangos_7493_01_world_command.sql
@@ -0,0 +1,7 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7472_01_mangos_mangos_string required_7493_01_mangos_command bit;*/
+
+DELETE FROM `command` WHERE `name` IN ('gobject near','gobject phase','gobject setphase');
+
+INSERT INTO `command` VALUES
+('gobject near',2,'Syntax: .gobject near  [#distance]\r\n\r\nOutput gameobjects at distance #distance from player. Output gameobject guids and coordinates sorted by distance from character. If #distance not provided use 10 as default value.'),
+('gobject setphase',2,'Syntax: .gobject setphase #guid #phasemask\r\n\r\nGameobject with DB guid #guid phasemask changed to #phasemask with related world vision update for players. Gameobject state saved to DB and persistent.');
\ No newline at end of file
diff --git a/sql/updates/2025_mangos_7495_01_world_trinity_string.sql b/sql/updates/2025_mangos_7495_01_world_trinity_string.sql
new file mode 100644
index 00000000000..29859083cb2
--- /dev/null
+++ b/sql/updates/2025_mangos_7495_01_world_trinity_string.sql
@@ -0,0 +1,7 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7493_01_mangos_command required_7495_01_mangos_mangos_string bit;*/
+
+DELETE FROM `trinity_string` WHERE `entry` IN (276,277,524);
+INSERT INTO `trinity_string` VALUES
+(276,'Game Object |cffffffff|Hgameobject:%d|h[%s]|h|r (GUID: %u) turned',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(277,'Game Object |cffffffff|Hgameobject:%d|h[%s]|h|r (GUID: %u) moved',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(524,'Selected object:\n|cffffffff|Hgameobject:%d|h[%s]|h|r GUID: %u ID: %u\nX: %f Y: %f Z: %f MapId: %u\nOrientation: %f',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
\ No newline at end of file
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index 83d237c5eb2..bb0ce3205ee 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -86,5 +86,9 @@ INSTALL(FILES
 1927_world.sql
 1939_word.sql
 1957_word.sql
+1962_mangos_7472_01_world_trinity_string.sql
 2013_world.sql
+2021_world.sql
+2025_mangos_7493_01_world_command.sql
+2025_mangos_7495_01_world_trinity_string.sql
 DESTINATION share/trinity/sql/updates)
\ No newline at end of file