From 846855698f85677380bdd4b467a38ed62b4c0e66 Mon Sep 17 00:00:00 2001 From: Drahy Date: Tue, 10 Feb 2009 23:01:26 +0100 Subject: [PATCH] * Renamed and fixed latest mangos update sqls * Fixed script name according to script code stormwind_harbor * Updated CMakeLists and world_scripts_full --HG-- branch : trunk --- ...ta.sql => 1288_mangos_7242_01_world_spell_bonus_data.sql} | 2 +- sql/updates/1293_mangos_7249_01_world_spell_proc_event.sql | 3 +++ ...gos_command.sql => 1296_mangos_7252_01_world_command.sql} | 4 ++-- ...ring.sql => 1296_mangos_7252_02_world_trinity_string.sql} | 4 ++-- ...ers.sql => 1299_mangos_7255_01_characters_characters.sql} | 5 ++--- sql/updates/1307_world.sql | 2 +- sql/updates/7249_01_mangos_spell_proc_event.sql | 3 --- sql/updates/CMakeLists.txt | 5 +++++ sql/world_scripts_full.sql | 1 + 9 files changed, 17 insertions(+), 12 deletions(-) rename sql/updates/{7242_01_mangos_spell_bonus_data.sql => 1288_mangos_7242_01_world_spell_bonus_data.sql} (70%) create mode 100644 sql/updates/1293_mangos_7249_01_world_spell_proc_event.sql rename sql/updates/{7252_01_mangos_command.sql => 1296_mangos_7252_01_world_command.sql} (74%) rename sql/updates/{7252_02_mangos_mangos_string.sql => 1296_mangos_7252_02_world_trinity_string.sql} (89%) rename sql/updates/{7255_01_characters_characters.sql => 1299_mangos_7255_01_characters_characters.sql} (68%) delete mode 100644 sql/updates/7249_01_mangos_spell_proc_event.sql diff --git a/sql/updates/7242_01_mangos_spell_bonus_data.sql b/sql/updates/1288_mangos_7242_01_world_spell_bonus_data.sql similarity index 70% rename from sql/updates/7242_01_mangos_spell_bonus_data.sql rename to sql/updates/1288_mangos_7242_01_world_spell_bonus_data.sql index 9a5e8673907..62ea0ef7771 100644 --- a/sql/updates/7242_01_mangos_spell_bonus_data.sql +++ b/sql/updates/1288_mangos_7242_01_world_spell_bonus_data.sql @@ -1,4 +1,4 @@ -ALTER TABLE db_version CHANGE COLUMN required_7235_01_mangos_command required_7242_01_mangos_spell_bonus_data bit; +/*ALTER TABLE db_version CHANGE COLUMN required_7235_01_mangos_command required_7242_01_mangos_spell_bonus_data bit;*/ DELETE FROM spell_bonus_data WHERE entry IN (34913, 43043, 43044); INSERT INTO spell_bonus_data VALUES diff --git a/sql/updates/1293_mangos_7249_01_world_spell_proc_event.sql b/sql/updates/1293_mangos_7249_01_world_spell_proc_event.sql new file mode 100644 index 00000000000..80ec0871971 --- /dev/null +++ b/sql/updates/1293_mangos_7249_01_world_spell_proc_event.sql @@ -0,0 +1,3 @@ +/*ALTER TABLE db_version CHANGE COLUMN required_7242_01_mangos_spell_bonus_data required_7249_01_mangos_spell_proc_event bit;*/ + +DELETE FROM `spell_proc_event` WHERE `entry`='60200'; diff --git a/sql/updates/7252_01_mangos_command.sql b/sql/updates/1296_mangos_7252_01_world_command.sql similarity index 74% rename from sql/updates/7252_01_mangos_command.sql rename to sql/updates/1296_mangos_7252_01_world_command.sql index 4d1ff984f96..ffbdda8cfc0 100644 --- a/sql/updates/7252_01_mangos_command.sql +++ b/sql/updates/1296_mangos_7252_01_world_command.sql @@ -1,6 +1,6 @@ -ALTER TABLE db_version CHANGE COLUMN required_7251_01_mangos_spell_chain required_7252_01_mangos_command bit; +/*ALTER TABLE db_version CHANGE COLUMN required_7251_01_mangos_spell_chain required_7252_01_mangos_command bit;*/ DELETE FROM `command` WHERE `name` IN ('debug arena','debug bg'); INSERT INTO `command` VALUES ('debug arena',3,'Syntax: .debug arena\r\n\r\nToggle debug mode for arenas. In debug mode GM can start arena with single player.'), -('debug bg',3,'Syntax: .debug bg\r\n\r\nToggle debug mode for battlegrounds. In debug mode GM can start battleground with single player.'); +('debug bg',3,'Syntax: .debug bg\r\n\r\nToggle debug mode for battlegrounds. In debug mode GM can start battleground with single player.'); \ No newline at end of file diff --git a/sql/updates/7252_02_mangos_mangos_string.sql b/sql/updates/1296_mangos_7252_02_world_trinity_string.sql similarity index 89% rename from sql/updates/7252_02_mangos_mangos_string.sql rename to sql/updates/1296_mangos_7252_02_world_trinity_string.sql index 3b5a2d5b6b1..a697afab17d 100644 --- a/sql/updates/7252_02_mangos_mangos_string.sql +++ b/sql/updates/1296_mangos_7252_02_world_trinity_string.sql @@ -1,4 +1,4 @@ -ALTER TABLE db_version CHANGE COLUMN required_7252_01_mangos_command required_7252_02_mangos_mangos_string bit; +/*ALTER TABLE db_version CHANGE COLUMN required_7252_01_mangos_command required_7252_02_mangos_mangos_string bit;*/ DELETE FROM `mangos_string` WHERE entry IN (737,738,739,740,741,742,743,744,745,746); INSERT INTO `mangos_string` VALUES @@ -11,4 +11,4 @@ INSERT INTO `mangos_string` VALUES (743,'Finished setting arena points for online players.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (744,'Modifying played count, arena points etc. for loaded arena teams, sending updated stats to online players...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (745,'Modification done.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(746,'Done flushing Arena points.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +(746,'Done flushing Arena points.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); \ No newline at end of file diff --git a/sql/updates/7255_01_characters_characters.sql b/sql/updates/1299_mangos_7255_01_characters_characters.sql similarity index 68% rename from sql/updates/7255_01_characters_characters.sql rename to sql/updates/1299_mangos_7255_01_characters_characters.sql index a8b946f3f32..236339bd5a3 100644 --- a/sql/updates/7255_01_characters_characters.sql +++ b/sql/updates/1299_mangos_7255_01_characters_characters.sql @@ -1,4 +1,4 @@ -ALTER TABLE character_db_version CHANGE COLUMN required_7251_02_characters_character_spell required_7255_01_characters_characters bit; +/*ALTER TABLE character_db_version CHANGE COLUMN required_7251_02_characters_character_spell required_7255_01_characters_characters bit;*/ ALTER TABLE `characters` ADD COLUMN `bgid` int(10) unsigned NOT NULL default '0' AFTER `latency`, @@ -7,5 +7,4 @@ ALTER TABLE `characters` ADD COLUMN `bgx` float NOT NULL default '0' AFTER `bgmap`, ADD COLUMN `bgy` float NOT NULL default '0' AFTER `bgx`, ADD COLUMN `bgz` float NOT NULL default '0' AFTER `bgy`, - ADD COLUMN `bgo` float NOT NULL default '0' AFTER `bgz`; - + ADD COLUMN `bgo` float NOT NULL default '0' AFTER `bgz`; \ No newline at end of file diff --git a/sql/updates/1307_world.sql b/sql/updates/1307_world.sql index ddb0b9732c9..ec7c218c0a1 100644 --- a/sql/updates/1307_world.sql +++ b/sql/updates/1307_world.sql @@ -1 +1 @@ -UPDATE `creature_template` SET `ScriptName`='npc_stormwindharbor_taxi' WHERE `entry`='29154'; \ No newline at end of file +UPDATE `creature_template` SET `ScriptName`='npc_stormwind_harbor_taxi' WHERE `entry`=29154; \ No newline at end of file diff --git a/sql/updates/7249_01_mangos_spell_proc_event.sql b/sql/updates/7249_01_mangos_spell_proc_event.sql deleted file mode 100644 index 612679e0598..00000000000 --- a/sql/updates/7249_01_mangos_spell_proc_event.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE db_version CHANGE COLUMN required_7242_01_mangos_spell_bonus_data required_7249_01_mangos_spell_proc_event bit; - -DELETE FROM `spell_proc_event` WHERE `entry`='60200'; diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt index 751629ef23c..6665a9db53b 100644 --- a/sql/updates/CMakeLists.txt +++ b/sql/updates/CMakeLists.txt @@ -27,5 +27,10 @@ INSTALL(FILES 1018_world.sql 1026_world.sql 1028_world_scripts.sql +1288_mangos_7242_01_world_spell_bonus_data +1293_mangos_7249_01_world_spell_proc_event +1296_mangos_7252_01_world_command +1296_mangos_7252_02_world_trinity_string +1299_mangos_7255_01_characters_characters 1307_world.sql DESTINATION share/trinity/sql/updates) \ No newline at end of file diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql index 0bff82169f9..142795f3556 100644 --- a/sql/world_scripts_full.sql +++ b/sql/world_scripts_full.sql @@ -742,6 +742,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_bartleby' WHERE `entry`=6090; UPDATE `creature_template` SET `ScriptName`='npc_dashel_stonefist' WHERE `entry`=4961; UPDATE `creature_template` SET `ScriptName`='npc_general_marcus_jonathan' WHERE `entry`=466; UPDATE `creature_template` SET `ScriptName`='npc_lady_katrana_prestor' WHERE `entry`=1749; +UPDATE `creature_template` SET `ScriptName`='npc_stormwind_harbor_taxi' WHERE `entry`=29154; /* STRANGLETHORN VALE */ UPDATE `creature_template` SET `ScriptName`='mob_yenniku' WHERE `entry`=2530;