From 09adb057411281cef8e845071c24da50850bfb35 Mon Sep 17 00:00:00 2001 From: Drahy Date: Sun, 8 Feb 2009 16:21:33 +0100 Subject: [PATCH] * Fixed 3 sql files from 2.4.3_update directory * Added CMakeLists for this directory - Thx Zor * Small clean up --HG-- branch : trunk --- .../1248_mangos_7235_01_world_command.sql | 4 +- .../2.4.3_updates/686_world_scripts.sql | 2 +- .../2.4.3_updates/765_world_scripts.sql | 2 +- sql/updates/2.4.3_updates/884_world.sql | 2 +- sql/updates/2.4.3_updates/CMakeLists.txt | 168 ++++++++++++++++++ sql/updates/CMakeLists.txt | 2 + 6 files changed, 175 insertions(+), 5 deletions(-) create mode 100644 sql/updates/2.4.3_updates/CMakeLists.txt diff --git a/sql/updates/1248_mangos_7235_01_world_command.sql b/sql/updates/1248_mangos_7235_01_world_command.sql index 05c24480fc..0a28f49fc6 100644 --- a/sql/updates/1248_mangos_7235_01_world_command.sql +++ b/sql/updates/1248_mangos_7235_01_world_command.sql @@ -1,5 +1,5 @@ -ALTER TABLE db_version CHANGE COLUMN required_7230_02_mangos_spell_bonus_data required_7235_01_mangos_command bit; +/*ALTER TABLE db_version CHANGE COLUMN required_7230_02_mangos_spell_bonus_data required_7235_01_mangos_command bit;*/ DELETE FROM `command` WHERE `name` = 'reset achievements'; INSERT INTO `command` VALUES -('reset achievements',3,'Syntax: .reset achievements [$playername]\r\n\r\nReset achievements data for selected or named (online or offline) character. Achievements for persistance progress data like completed quests/etc re-filled at reset. Achievements for events like kills/casts/etc will lost.'); +('reset achievements',3,'Syntax: .reset achievements [$playername]\r\n\r\nReset achievements data for selected or named (online or offline) character. Achievements for persistance progress data like completed quests/etc re-filled at reset. Achievements for events like kills/casts/etc will lost.'); \ No newline at end of file diff --git a/sql/updates/2.4.3_updates/686_world_scripts.sql b/sql/updates/2.4.3_updates/686_world_scripts.sql index b793036e46..e67accb70b 100644 --- a/sql/updates/2.4.3_updates/686_world_scripts.sql +++ b/sql/updates/2.4.3_updates/686_world_scripts.sql @@ -1,6 +1,6 @@ UPDATE `creature_template` SET `Scriptname`='npc_willix' WHERE entry=4508; -DELETE FROM `script_texts` WHERE `entry` BETWEEN -1047000 and -1047010; +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1047010 and -1047000; INSERT INTO `script_texts` (entry, content_default, sound, type, language, comment) VALUES (-1047000, 'Phew! Finally,out here. However, it will not become easy. Detain your eyes after annoyance.', 0, 0, 0, 'Willix'), (-1047001, 'There on top resides Charlga Razorflank. The damned old Crone.', 0, 0, 0, 'Willix'), diff --git a/sql/updates/2.4.3_updates/765_world_scripts.sql b/sql/updates/2.4.3_updates/765_world_scripts.sql index 1283e75f66..54f84c9015 100644 --- a/sql/updates/2.4.3_updates/765_world_scripts.sql +++ b/sql/updates/2.4.3_updates/765_world_scripts.sql @@ -1,7 +1,7 @@ UPDATE `creature_template` SET `flags_extra`=0 WHERE `entry`=20129; -- Insert English and French dialogs in database -DELETE FROM `script_texts` WHERE entry BETWEEN -1000150 and -1000163; +DELETE FROM `script_texts` WHERE entry BETWEEN -1000163 and -1000150; INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc2`, `type`, `language`, `comment`) VALUES (-1000150, 'Greetings, $N. I will guide you through the cavern. Please try and keep up.', 'Salutations, $N. Je vais vous guider à travers cette grotte. Veuillez me suivre.', 4, 0, 'WHISPER_CUSTODIAN_1'), (-1000151, 'We do not know if the Caverns of Time have always been accessible to mortals. Truly, it is impossible to tell as the Timeless One is in perpetual motion, changing our timeways as he sees fit. What you see now may very well not exist tomorrow. You may wake up and have no memory of this place.', 'Nous ne savons pas si les Grottes du Temps ont toujours été accessibles aux mortels. Vraiment, c\'est impossible à dire étant donné que l\'Intemporel est en mouvement perpétuel, changeant nos spirales temporelles comme bon lui semble. Ce que vous voyez aujourd\'hui peut très bien ne plus exister demain. Vous pourriez vous réveiller sans aucun souvenir de cet endroit.', 4, 0, 'WHISPER_CUSTODIAN_2'), diff --git a/sql/updates/2.4.3_updates/884_world.sql b/sql/updates/2.4.3_updates/884_world.sql index 9924bf86f6..7d4588a711 100644 --- a/sql/updates/2.4.3_updates/884_world.sql +++ b/sql/updates/2.4.3_updates/884_world.sql @@ -1,4 +1,4 @@ -DELETE FROM `command` WHERE `name` IN ('gobject tempadd','npc tempadd'); +DELETE FROM `command` WHERE `name` IN ('gobject addtemp','npc addtemp'); INSERT INTO `command` (name, security, help) VALUES ('gobject addtemp','2','Adds a temporary gameobject that is not saved to DB.'), ('npc addtemp','2','Adds temporary NPC, not saved to database.'); \ No newline at end of file diff --git a/sql/updates/2.4.3_updates/CMakeLists.txt b/sql/updates/2.4.3_updates/CMakeLists.txt new file mode 100644 index 0000000000..cb37792879 --- /dev/null +++ b/sql/updates/2.4.3_updates/CMakeLists.txt @@ -0,0 +1,168 @@ +INSTALL(FILES +11_characters.sql +45_characters.sql +54_world.sql +57_world_scripts.sql +66_world_scripts.sql +68_world.sql +70_world_scripts.sql +78_world.sql +79_characters.sql +79_world.sql +82_world_scripts.sql +83_realmd.sql +84_world.sql +86_world_scripts.sql +90_world.sql +102_world.sql +112_world_scripts.sql +116_world.sql +117_world_scripts.sql +120_world.sql +123_world_scripts.sql +125_world_scripts.sql +133_world_scripts.sql +140_world.sql +145_world_scripts.sql +146_world.sql +147_world.sql +152_world.sql +153_world.sql +171_world.sql +172_world_scripts.sql +175_world_scripts.sql +176_world.sql +182_world.sql +212_world_scripts.sql +220_characters.sql +230_world_blacktemple.sql +230_world_scripts.sql +230_world_serpent_shrine.sql +230_world.sql +231_world_scripts.sql +233_world.sql +238_world.sql +240_world.sql +241_world.sql +247_world.sql +262_characters.sql +262_realmd.sql +262_world.sql +273_world_scripts.sql +285_world.sql +287_world_scripts.sql +329_world.sql +332_world.sql +333_world.sql +334_world.sql +341_world.sql +356_world.sql +373_world_scripts.sql +377_world_scripts.sql +389_world.sql +400_world.sql +410_characters.sql +426_world_scripts.sql +427_world_scripts.sql +444_world.sql +452_world.sql +455_world.sql +471_world.sql +480_world_scripts.sql +488_world_scripts.sql +502_world_scripts.sql +505_world.sql +506_world.sql +513_world_scripts.sql +519_world.sql +537_world.sql +541_characters.sql +541_world.sql +542_characters.sql +551_world.sql +566_world.sql +571_world.sql +572_world.sql +575_world_scripts.sql +583_world_scripts.sql +586_world_scripts.sql +588_world.sql +608_world.sql +615_world.sql +636_world_scripts.sql +640_world.sql +645_world_scripts.sql +667_world_scripts.sql +676_world.sql +679_world_scripts.sql +683_world_scripts.sql +686_world_scripts.sql +691_world_scripts.sql +692_world.sql +708_world_scripts.sql +722_world_script_texts.sql +724_world.sql +725_characters.sql +725_world.sql +728_world_scripts.sql +733_characters.sql +739_characters.sql +741_characters.sql +741_world.sql +747_world.sql +748_world_scripts.sql +758_world_scripts.sql +762_world.sql +764_world_scripts.sql +765_world_scripts.sql +773_world_scripts.sql +780_characters.sql +783_world.sql +785_world.sql +789_world.sql +807_world_scripts.sql +817_world_scripts.sql +822_world_scripts.sql +826_world_scripts.sql +833_world_scripts.sql +834_world_scripts.sql +837_world_scripts.sql +838_world_scripts.sql +839_world_scripts.sql +840_world_scripts.sql +841_world_scripts.sql +842_world.sql +850_world_scripts.sql +852_world_scripts.sql +857_world_scripts.sql +863_world_scripts.sql +871_world.sql +884_world.sql +905_world_scripts.sql +917_world.sql +919_world.sql +927_characters.sql +930_characters.sql +933_world_scripts.sql +935_world_scripts.sql +940_world_scripts.sql +945_world_scripts.sql +947_world_scripts.sql +948_world_scripts.sql +950_world_scripts.sql +951_world_scripts.sql +952_world_scripts.sql +953_world_scripts.sql +954_world_scripts.sql +955_world_scripts.sql +956_world_scripts.sql +957_world_scripts.sql +963_world_scripts.sql +965_world_scripts.sql +966_world_scripts.sql +970_world_scripts.sql +973_world_scripts.sql +1016_world.sql +1016_world_scripts.sql +1018_wrold.sql +DESTINATION share/trinity/sql/updates/2.4.3_updates) diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt index f409aaeefa..f4a2cbe311 100644 --- a/sql/updates/CMakeLists.txt +++ b/sql/updates/CMakeLists.txt @@ -1,3 +1,5 @@ +add_subdirectory(2.4.3_updates) + INSTALL(FILES 805_world_scripts 875_mangos_7047_01_characters_character_spell.sql